Skip to content
Permalink
Browse files

Update to git 2.20.0

  • Loading branch information...
mhart committed Dec 31, 2018
1 parent 22fb19a commit 45571c6a2127f580f2feb499fe78ec4eb9a0ee60
Showing with 8,648 additions and 27 deletions.
  1. +2 −5 Dockerfile
  2. +4 −6 actions/build.js
  3. +26 −12 build/git/Dockerfile
  4. +6 −3 build/git/build.sh
  5. +0 −1 utils/config.js
  6. BIN vendor/bin/fipscheck
  7. BIN vendor/bin/fipshmac
  8. BIN vendor/bin/git
  9. +4 −0 vendor/bin/git-cvsserver
  10. +1 −0 vendor/bin/git-receive-pack
  11. BIN vendor/bin/git-shell
  12. +1 −0 vendor/bin/git-upload-archive
  13. +1 −0 vendor/bin/git-upload-pack
  14. BIN vendor/bin/scp
  15. BIN vendor/bin/sftp
  16. +1 −0 vendor/bin/slogin
  17. BIN vendor/bin/ssh
  18. BIN vendor/bin/ssh-add
  19. BIN vendor/bin/ssh-agent
  20. +303 −0 vendor/bin/ssh-copy-id
  21. BIN vendor/bin/ssh-keygen
  22. BIN vendor/bin/ssh-keyscan
  23. BIN vendor/git-2.13.5.tar
  24. +1 −0 vendor/lib/fipscheck/fipscheck.hmac
  25. +1 −0 vendor/lib/fipscheck/libfipscheck.so.1.1.0.hmac
  26. +1 −0 vendor/lib/fipscheck/libfipscheck.so.1.hmac
  27. +1 −0 vendor/lib/fipscheck/ssh.hmac
  28. +1 −0 vendor/lib/libedit.so.0
  29. BIN vendor/lib/libedit.so.0.0.27
  30. +1 −0 vendor/lib/libfipscheck.so.1
  31. BIN vendor/lib/libfipscheck.so.1.1.0
  32. +1 −0 vendor/libexec/git-core/git
  33. +1 −0 vendor/libexec/git-core/git-add
  34. +4 −0 vendor/libexec/git-core/git-add--interactive
  35. +1 −0 vendor/libexec/git-core/git-am
  36. +1 −0 vendor/libexec/git-core/git-annotate
  37. +1 −0 vendor/libexec/git-core/git-apply
  38. +4 −0 vendor/libexec/git-core/git-archimport
  39. +1 −0 vendor/libexec/git-core/git-archive
  40. +628 −0 vendor/libexec/git-core/git-bisect
  41. +1 −0 vendor/libexec/git-core/git-bisect--helper
  42. +1 −0 vendor/libexec/git-core/git-blame
  43. +1 −0 vendor/libexec/git-core/git-branch
  44. +1 −0 vendor/libexec/git-core/git-bundle
  45. +1 −0 vendor/libexec/git-core/git-cat-file
  46. +1 −0 vendor/libexec/git-core/git-check-attr
  47. +1 −0 vendor/libexec/git-core/git-check-ignore
  48. +1 −0 vendor/libexec/git-core/git-check-mailmap
  49. +1 −0 vendor/libexec/git-core/git-check-ref-format
  50. +1 −0 vendor/libexec/git-core/git-checkout
  51. +1 −0 vendor/libexec/git-core/git-checkout-index
  52. +1 −0 vendor/libexec/git-core/git-cherry
  53. +1 −0 vendor/libexec/git-core/git-cherry-pick
  54. +1 −0 vendor/libexec/git-core/git-clean
  55. +1 −0 vendor/libexec/git-core/git-clone
  56. +1 −0 vendor/libexec/git-core/git-column
  57. +1 −0 vendor/libexec/git-core/git-commit
  58. +1 −0 vendor/libexec/git-core/git-commit-graph
  59. +1 −0 vendor/libexec/git-core/git-commit-tree
  60. +1 −0 vendor/libexec/git-core/git-config
  61. +1 −0 vendor/libexec/git-core/git-count-objects
  62. +1 −0 vendor/libexec/git-core/git-credential
  63. BIN vendor/libexec/git-core/git-credential-cache
  64. BIN vendor/libexec/git-core/git-credential-cache--daemon
  65. BIN vendor/libexec/git-core/git-credential-store
  66. +4 −0 vendor/libexec/git-core/git-cvsexportcommit
  67. +4 −0 vendor/libexec/git-core/git-cvsimport
  68. +1 −0 vendor/libexec/git-core/git-cvsserver
  69. BIN vendor/libexec/git-core/git-daemon
  70. +1 −0 vendor/libexec/git-core/git-describe
  71. +1 −0 vendor/libexec/git-core/git-diff
  72. +1 −0 vendor/libexec/git-core/git-diff-files
  73. +1 −0 vendor/libexec/git-core/git-diff-index
  74. +1 −0 vendor/libexec/git-core/git-diff-tree
  75. +1 −0 vendor/libexec/git-core/git-difftool
  76. +105 −0 vendor/libexec/git-core/git-difftool--helper
  77. +1 −0 vendor/libexec/git-core/git-fast-export
  78. BIN vendor/libexec/git-core/git-fast-import
  79. +1 −0 vendor/libexec/git-core/git-fetch
  80. +1 −0 vendor/libexec/git-core/git-fetch-pack
  81. +662 −0 vendor/libexec/git-core/git-filter-branch
  82. +1 −0 vendor/libexec/git-core/git-fmt-merge-msg
  83. +1 −0 vendor/libexec/git-core/git-for-each-ref
  84. +1 −0 vendor/libexec/git-core/git-format-patch
  85. +1 −0 vendor/libexec/git-core/git-fsck
  86. +1 −0 vendor/libexec/git-core/git-fsck-objects
  87. +1 −0 vendor/libexec/git-core/git-gc
  88. +1 −0 vendor/libexec/git-core/git-get-tar-commit-id
  89. +1 −0 vendor/libexec/git-core/git-grep
  90. +1 −0 vendor/libexec/git-core/git-hash-object
  91. +1 −0 vendor/libexec/git-core/git-help
  92. BIN vendor/libexec/git-core/git-http-backend
  93. BIN vendor/libexec/git-core/git-http-fetch
  94. BIN vendor/libexec/git-core/git-http-push
  95. BIN vendor/libexec/git-core/git-imap-send
  96. +1 −0 vendor/libexec/git-core/git-index-pack
  97. +1 −0 vendor/libexec/git-core/git-init
  98. +1 −0 vendor/libexec/git-core/git-init-db
  99. +4 −0 vendor/libexec/git-core/git-instaweb
  100. +1 −0 vendor/libexec/git-core/git-interpret-trailers
  101. +759 −0 vendor/libexec/git-core/git-legacy-rebase
  102. +1 −0 vendor/libexec/git-core/git-log
  103. +1 −0 vendor/libexec/git-core/git-ls-files
  104. +1 −0 vendor/libexec/git-core/git-ls-remote
  105. +1 −0 vendor/libexec/git-core/git-ls-tree
  106. +1 −0 vendor/libexec/git-core/git-mailinfo
  107. +1 −0 vendor/libexec/git-core/git-mailsplit
  108. +1 −0 vendor/libexec/git-core/git-merge
  109. +1 −0 vendor/libexec/git-core/git-merge-base
  110. +1 −0 vendor/libexec/git-core/git-merge-file
  111. +1 −0 vendor/libexec/git-core/git-merge-index
  112. +112 −0 vendor/libexec/git-core/git-merge-octopus
  113. +167 −0 vendor/libexec/git-core/git-merge-one-file
  114. +1 −0 vendor/libexec/git-core/git-merge-ours
  115. +1 −0 vendor/libexec/git-core/git-merge-recursive
  116. +54 −0 vendor/libexec/git-core/git-merge-resolve
  117. +1 −0 vendor/libexec/git-core/git-merge-subtree
  118. +1 −0 vendor/libexec/git-core/git-merge-tree
  119. +516 −0 vendor/libexec/git-core/git-mergetool
  120. +439 −0 vendor/libexec/git-core/git-mergetool--lib
  121. +1 −0 vendor/libexec/git-core/git-mktag
  122. +1 −0 vendor/libexec/git-core/git-mktree
  123. +1 −0 vendor/libexec/git-core/git-multi-pack-index
  124. +1 −0 vendor/libexec/git-core/git-mv
  125. +1 −0 vendor/libexec/git-core/git-name-rev
  126. +1 −0 vendor/libexec/git-core/git-notes
  127. +4 −0 vendor/libexec/git-core/git-p4
  128. +1 −0 vendor/libexec/git-core/git-pack-objects
  129. +1 −0 vendor/libexec/git-core/git-pack-redundant
  130. +1 −0 vendor/libexec/git-core/git-pack-refs
  131. +101 −0 vendor/libexec/git-core/git-parse-remote
  132. +1 −0 vendor/libexec/git-core/git-patch-id
  133. +1 −0 vendor/libexec/git-core/git-prune
  134. +1 −0 vendor/libexec/git-core/git-prune-packed
  135. +1 −0 vendor/libexec/git-core/git-pull
  136. +1 −0 vendor/libexec/git-core/git-push
  137. +151 −0 vendor/libexec/git-core/git-quiltimport
  138. +1 −0 vendor/libexec/git-core/git-range-diff
  139. +1 −0 vendor/libexec/git-core/git-read-tree
  140. +1 −0 vendor/libexec/git-core/git-rebase
  141. +85 −0 vendor/libexec/git-core/git-rebase--am
  142. +68 −0 vendor/libexec/git-core/git-rebase--common
  143. +1 −0 vendor/libexec/git-core/git-rebase--interactive
  144. +164 −0 vendor/libexec/git-core/git-rebase--merge
  145. +1,012 −0 vendor/libexec/git-core/git-rebase--preserve-merges
  146. +1 −0 vendor/libexec/git-core/git-receive-pack
  147. +1 −0 vendor/libexec/git-core/git-reflog
  148. +1 −0 vendor/libexec/git-core/git-remote
  149. +1 −0 vendor/libexec/git-core/git-remote-ext
  150. +1 −0 vendor/libexec/git-core/git-remote-fd
  151. +1 −0 vendor/libexec/git-core/git-remote-ftp
  152. +1 −0 vendor/libexec/git-core/git-remote-ftps
  153. BIN vendor/libexec/git-core/git-remote-http
  154. +1 −0 vendor/libexec/git-core/git-remote-https
  155. BIN vendor/libexec/git-core/git-remote-testsvn
  156. +1 −0 vendor/libexec/git-core/git-repack
  157. +1 −0 vendor/libexec/git-core/git-replace
  158. +160 −0 vendor/libexec/git-core/git-request-pull
  159. +1 −0 vendor/libexec/git-core/git-rerere
  160. +1 −0 vendor/libexec/git-core/git-reset
  161. +1 −0 vendor/libexec/git-core/git-rev-list
  162. +1 −0 vendor/libexec/git-core/git-rev-parse
  163. +1 −0 vendor/libexec/git-core/git-revert
  164. +1 −0 vendor/libexec/git-core/git-rm
  165. +4 −0 vendor/libexec/git-core/git-send-email
  166. +1 −0 vendor/libexec/git-core/git-send-pack
  167. +1 −0 vendor/libexec/git-core/git-serve
  168. +109 −0 vendor/libexec/git-core/git-sh-i18n
  169. BIN vendor/libexec/git-core/git-sh-i18n--envsubst
  170. +397 −0 vendor/libexec/git-core/git-sh-setup
  171. +1 −0 vendor/libexec/git-core/git-shell
  172. +1 −0 vendor/libexec/git-core/git-shortlog
  173. +1 −0 vendor/libexec/git-core/git-show
  174. +1 −0 vendor/libexec/git-core/git-show-branch
  175. +1 −0 vendor/libexec/git-core/git-show-index
  176. +1 −0 vendor/libexec/git-core/git-show-ref
  177. +1 −0 vendor/libexec/git-core/git-stage
  178. +752 −0 vendor/libexec/git-core/git-stash
  179. +1 −0 vendor/libexec/git-core/git-status
  180. +1 −0 vendor/libexec/git-core/git-stripspace
  181. +1,036 −0 vendor/libexec/git-core/git-submodule
  182. +1 −0 vendor/libexec/git-core/git-submodule--helper
  183. +4 −0 vendor/libexec/git-core/git-svn
  184. +1 −0 vendor/libexec/git-core/git-symbolic-ref
  185. +1 −0 vendor/libexec/git-core/git-tag
  186. +1 −0 vendor/libexec/git-core/git-unpack-file
  187. +1 −0 vendor/libexec/git-core/git-unpack-objects
  188. +1 −0 vendor/libexec/git-core/git-update-index
  189. +1 −0 vendor/libexec/git-core/git-update-ref
  190. +1 −0 vendor/libexec/git-core/git-update-server-info
  191. +1 −0 vendor/libexec/git-core/git-upload-archive
  192. +1 −0 vendor/libexec/git-core/git-upload-pack
  193. +1 −0 vendor/libexec/git-core/git-var
  194. +1 −0 vendor/libexec/git-core/git-verify-commit
  195. +1 −0 vendor/libexec/git-core/git-verify-pack
  196. +1 −0 vendor/libexec/git-core/git-verify-tag
  197. +196 −0 vendor/libexec/git-core/git-web--browse
  198. +1 −0 vendor/libexec/git-core/git-whatchanged
  199. +1 −0 vendor/libexec/git-core/git-worktree
  200. +1 −0 vendor/libexec/git-core/git-write-tree
  201. +18 −0 vendor/libexec/git-core/mergetools/araxis
  202. +23 −0 vendor/libexec/git-core/mergetools/bc
  203. +1 −0 vendor/libexec/git-core/mergetools/bc3
  204. +23 −0 vendor/libexec/git-core/mergetools/codecompare
  205. +25 −0 vendor/libexec/git-core/mergetools/deltawalker
  206. +18 −0 vendor/libexec/git-core/mergetools/diffmerge
  207. +15 −0 vendor/libexec/git-core/mergetools/diffuse
  208. +14 −0 vendor/libexec/git-core/mergetools/ecmerge
  209. +26 −0 vendor/libexec/git-core/mergetools/emerge
  210. +16 −0 vendor/libexec/git-core/mergetools/examdiff
  211. +18 −0 vendor/libexec/git-core/mergetools/guiffy
  212. +1 −0 vendor/libexec/git-core/mergetools/gvimdiff
  213. +1 −0 vendor/libexec/git-core/mergetools/gvimdiff2
  214. +1 −0 vendor/libexec/git-core/mergetools/gvimdiff3
  215. +27 −0 vendor/libexec/git-core/mergetools/kdiff3
  216. +11 −0 vendor/libexec/git-core/mergetools/kompare
  217. +36 −0 vendor/libexec/git-core/mergetools/meld
  218. +14 −0 vendor/libexec/git-core/mergetools/opendiff
  219. +36 −0 vendor/libexec/git-core/mergetools/p4merge
  220. +16 −0 vendor/libexec/git-core/mergetools/tkdiff
  221. +32 −0 vendor/libexec/git-core/mergetools/tortoisemerge
  222. +48 −0 vendor/libexec/git-core/mergetools/vimdiff
  223. +1 −0 vendor/libexec/git-core/mergetools/vimdiff2
  224. +1 −0 vendor/libexec/git-core/mergetools/vimdiff3
  225. +15 −0 vendor/libexec/git-core/mergetools/winmerge
  226. +23 −0 vendor/libexec/git-core/mergetools/xxdiff
  227. BIN vendor/libexec/openssh/ctr-cavstest
  228. BIN vendor/libexec/openssh/ssh-keysign
  229. BIN vendor/libexec/openssh/ssh-pkcs11-helper
@@ -4,10 +4,8 @@ WORKDIR /tmp/lambci/build

ENV HOME=/tmp/lambci/home
ENV PATH=$HOME/.local/bin:$HOME/usr/bin:/var/task/vendor/bin:/var/task/node_modules/.bin:$PATH \
LD_LIBRARY_PATH=$HOME/usr/lib64:$LD_LIBRARY_PATH \
LD_LIBRARY_PATH=$HOME/usr/lib64:/var/task/vendor/lib:$LD_LIBRARY_PATH \
PYTHONPATH=/var/task/vendor/lib/python2.7/site-packages \
GIT_TEMPLATE_DIR=$HOME/usr/share/git-core/templates \
GIT_EXEC_PATH=$HOME/usr/libexec/git-core \
SHELL=/var/task/vendor/bin/bash \
TERM=xterm-256color \
FORCE_COLOR=true \
@@ -23,8 +21,7 @@ RUN chown -R slicer:497 /var/task && chown -R sbx_user1051:495 /tmp
USER sbx_user1051

RUN mkdir -p $HOME && \
cp -r /var/task/home/. $HOME && \
tar -C $HOME -xf /var/task/vendor/git-2.13.5.tar
cp -r /var/task/home/. $HOME

ENTRYPOINT []
CMD /var/task/vendor/bin/bash
@@ -250,26 +250,24 @@ function dockerBuild(build, cb) {
function prepareLambdaConfig(buildConfig) {

var vendorDir = path.join(__dirname, '../vendor')
var usrDir = path.join(config.HOME_DIR, 'usr')
var defaultLambdaConfig = {
env: {
HOME: config.HOME_DIR,
SHELL: path.join(vendorDir, '/bin/bash'),
SHELL: path.join(vendorDir, 'bin/bash'),
PATH: [
path.join(config.HOME_DIR, '.local/bin'),
path.join(usrDir, 'bin'),
path.join(config.HOME_DIR, 'usr/bin'),
path.join(vendorDir, 'bin'),
path.join(__dirname, '../node_modules/.bin'),
process.env.PATH,
].join(':'),
LD_LIBRARY_PATH: [
path.join(usrDir, 'lib64'),
path.join(config.HOME_DIR, 'usr/lib64'),
path.join(vendorDir, 'lib'),
process.env.LD_LIBRARY_PATH,
].join(':'),
NODE_PATH: process.env.NODE_PATH,
PYTHONPATH: path.join(vendorDir, 'lib/python2.7/site-packages'),
GIT_TEMPLATE_DIR: path.join(usrDir, 'share/git-core/templates'),
GIT_EXEC_PATH: path.join(usrDir, 'libexec/git-core'),

// To try to get colored output
TERM: 'xterm-256color',
@@ -1,7 +1,18 @@
FROM lambci/lambda-base

RUN find /usr ! -type d | sort > fs.txt && \
yum list openssh-clients && \
yum install -y openssh-clients && \
bash -c 'comm -13 fs.txt <(find /usr ! -type d | sort)' | \
grep -v ^/usr/share | \
tar -c -T - | \
tar -x --strip-components=1 -C /opt && \
mv /opt/lib64 /opt/lib


FROM lambci/lambda-base:build

RUN yum list openssh && \
yum install -y yum-utils rpm-build; \
RUN yum install -y yum-utils rpm-build expat-devel libcurl-devel && \
yumdownloader --source openssh && \
yum-builddep -y openssh && \
rpm -ivh *.rpm
@@ -13,17 +24,20 @@ RUN cd /usr/src/rpm/SPECS && \
patch openssh.spec < /tmp/openssh.spec.patch && \
rpmbuild -bi openssh.spec

ARG PREFIX=/opt

FROM lambci/lambda-base
COPY --from=0 /opt $PREFIX

RUN find /usr ! -type d | sort > fs.txt && \
yum list git && \
yum install -y git; \
rm -rf /usr/share/git-core/templates/*
RUN cp /usr/src/rpm/BUILDROOT/openssh*/usr/bin/ssh $PREFIX/bin/

COPY --from=0 /usr/src/rpm/BUILDROOT/openssh*/usr/bin/ssh /usr/bin/
ARG GIT_VERSION

CMD bash -c 'comm -13 fs.txt <(find /usr ! -type d | sort)' | \
grep -v ^/usr/share | \
bash -c 'cat - <(echo /usr/share/git-core/templates)' | \
tar -c -T -
ENV NO_GETTEXT=1 NO_PERL=1 NO_TCLTK=1 NO_PYTHON=1 INSTALL_SYMLINKS=1

RUN curl https://mirrors.edge.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.xz | tar -xJ && \
cd git-${GIT_VERSION} && \
make prefix=$PREFIX && \
make prefix=$PREFIX strip && \
make prefix=$PREFIX install && \
rm -rf $PREFIX/share/git-core/templates/* && \
find $PREFIX ! -perm -o=r -exec chmod +400 {} \;
@@ -1,4 +1,7 @@
#!/bin/bash -e
#!/bin/sh -e

docker build --pull -t lambda-git .
docker run --rm lambda-git > ../../vendor/git-2.13.5.tar
export GIT_VERSION=2.20.0
export PREFIX=/var/task/vendor

docker build --pull --build-arg GIT_VERSION --build-arg PREFIX -t lambci-git .
docker run --rm -w /var/task/vendor lambci-git sh -c 'tar -cz *' | tar -zx -C ../../vendor
@@ -85,7 +85,6 @@ exports.initSync = function(config) {
if ! [ -d ${exports.HOME_DIR} ]; then
mkdir -p ${exports.HOME_DIR}
cp -r ${__dirname}/../home/. ${exports.HOME_DIR}
tar -C ${exports.HOME_DIR} -xf ${__dirname}/../vendor/git-2.13.5.tar
fi
`)
}
BIN +10.8 KB vendor/bin/fipscheck
Binary file not shown.
BIN +9.57 KB vendor/bin/fipshmac
Binary file not shown.
BIN +2.37 MB vendor/bin/git
Binary file not shown.
@@ -0,0 +1,4 @@
#!/bin/sh

echo >&2 "fatal: git was built without support for $(basename $0) (NO_PERL=1)."
exit 128
BIN +1.33 MB vendor/bin/git-shell
Binary file not shown.
BIN +66.1 KB vendor/bin/scp
Binary file not shown.
BIN +118 KB vendor/bin/sftp
Binary file not shown.
BIN +643 KB vendor/bin/ssh
Binary file not shown.
BIN +326 KB vendor/bin/ssh-add
Binary file not shown.
BIN +294 KB vendor/bin/ssh-agent
Binary file not shown.

0 comments on commit 45571c6

Please sign in to comment.
You can’t perform that action at this time.