upgrade git-backup and dependencies

software/gitlab/gowork.cfg

@@ -6,6 +6,7 @@ depends_gitfetch  =
     ${go_github.com_pkg_errors:recipe}
     ${go_lab.nexedi.com_kirr_git-backup:recipe}
     ${go_lab.nexedi.com_kirr_go123:recipe}
+    ${go_golang.org_x_crypto:recipe}
 
 
 [go_github.com_libgit2_git2go]
@@ -13,7 +14,7 @@ depends_gitfetch  =
 go.importpath = github.com/libgit2/git2go
 repository    = https://github.com/libgit2/git2go.git
 # branch 'next' is required by git-backup
-revision = next-g5d0a4c752a74258a5f42e40fccd2908ac4e336b8
+revision = cbca5b82b8c22c08c183a1f44cad4b8b51ba6f25
 
 [go_github.com_pkg_errors]
 <= go-git-package
@@ -25,10 +26,17 @@ revision      = v0.8.0-12-g816c908556
 <= go-git-package
 go.importpath = lab.nexedi.com/kirr/git-backup
 repository    = https://lab.nexedi.com/kirr/git-backup.git
-revision      = da754af24da351291c99caa421a103db09e7a4c4
+revision      = c9db60e801fb1496cbb0b0ca145242c139d63d06
 
 [go_lab.nexedi.com_kirr_go123]
 <= go-git-package
 go.importpath = lab.nexedi.com/kirr/go123
 repository    = https://lab.nexedi.com/kirr/go123.git
-revision      = 95433de34f
+revision      = 8299741f
+
+
+[go_golang.org_x_crypto]
+<= go-git-package
+go.importpath = golang.org/x/crypto
+repository    = https://go.googlesource.com/crypto.git
+revision      = 75b288015ac94e66e3d6715fb68a9b41bf046ec2

software/gitlab/software.cfg

@@ -157,8 +157,8 @@ git-executable = ${git:location}/bin/git
 [gitlab-repository]
 <= git-repository
 repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
-#revision = v12.10.14-12-g7ce27b49193
-branch = v13.12.15-nxd
+revision = cb950ba0162151e3b7932dad03f7adce1e8df5ed
+#branch = v13.12.15-nxd
 location = ${buildout:parts-directory}/gitlab
 
 [gitlab-shell-repository]
@@ -225,8 +225,7 @@ configure-command = :
 make-binary =
 make-targets= cd ${go_github.com_libgit2_git2go:location}
               && git submodule update --init
-              && sed -i 's/.*--build.*/cmake --build . --target install/' script/build-libgit2-static.sh
-              && make install
+              && make install-static
 environment =
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
   PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${git:location}/bin:${golang1.15:location}/bin:${buildout:bin-directory}:%(PATH)s
@@ -234,7 +233,7 @@ environment =
 
 [gowork.goinstall]
 git2go = ${go_github.com_libgit2_git2go_prepare:path}/vendor/libgit2/install
-command = bash -c ". ${gowork:env.sh} && CGO_CFLAGS=-I${:git2go}/include CGO_LDFLAGS='-L${:git2go}/lib -lgit2' go install ${gowork:buildflags} -v $(echo -n '${gowork:install}' |tr '\n' ' ')"
+command = bash -c ". ${gowork:env.sh} && CGO_CFLAGS=-I${:git2go}/include CGO_LDFLAGS='-L${:git2go}/lib -lgit2' go install ${gowork:buildflags} -v $(echo -n '${gowork:install}' |tr '\n' ' ')  && go test -v lab.nexedi.com/kirr/git-backup"
 
 [gowork]
 golang  = ${golang1.15:location}