diff options
| author | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-11-23 20:28:00 +0000 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-11-23 20:31:44 +0000 |
| commit | f3c5e099d3f4d25fc032f2394d4b86b58b8974bd (patch) | |
| tree | a9921e5e97675ae90ee7b6d2d7cc7e2946cb20a8 /community/git-lfs | |
| parent | 12e0a8d3015cc77b3f2f1e829d5aad14fb7301c2 (diff) | |
| download | aports-f3c5e099d3f4d25fc032f2394d4b86b58b8974bd.tar.bz2 aports-f3c5e099d3f4d25fc032f2394d4b86b58b8974bd.tar.xz | |
community/git-lfs: fix go-ntlm dependency specification
The build fails due to the upgrade to go 1.13. Upstream fixed this in 2.9.0, so
we backport the patch to 2.8.0.
Diffstat (limited to 'community/git-lfs')
| -rw-r--r-- | community/git-lfs/APKBUILD | 4 | ||||
| -rw-r--r-- | community/git-lfs/fix-go-ntlm-version-spec.patch | 41 |
2 files changed, 44 insertions, 1 deletions
diff --git a/community/git-lfs/APKBUILD b/community/git-lfs/APKBUILD index 4190baec61..3ce7ad4670 100644 --- a/community/git-lfs/APKBUILD +++ b/community/git-lfs/APKBUILD @@ -14,6 +14,7 @@ install="$pkgname.post-install $pkgname.pre-deinstall" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/git-lfs/$pkgname/archive/v$pkgver.tar.gz makefile-extra_go_flags.patch + fix-go-ntlm-version-spec.patch " [ "$CARCH" = "x86" ] && options="!check" # tests broken on x85 @@ -55,4 +56,5 @@ cleanup_srcdir() { } sha512sums="02a4b2a090de66e1a4ccf41aa219f1f843bf5db731122fc4e89886ae0a8a358df2b0f33a551d2d635a890464df0932c493e4d105cb7921ac8a839b7bcba2242a git-lfs-2.8.0.tar.gz -2d793da75b37324936407948fdb634ff4c510c4dd4d3575c2459b81a0a6eb8f2464f5066ae99e88d5bf69e357fd60354b9d9d53e062cb6ba709f5f3a39858466 makefile-extra_go_flags.patch" +2d793da75b37324936407948fdb634ff4c510c4dd4d3575c2459b81a0a6eb8f2464f5066ae99e88d5bf69e357fd60354b9d9d53e062cb6ba709f5f3a39858466 makefile-extra_go_flags.patch +e1143c95b42e0363eda2161d5d3cf545720e46d9e009cf6db370167123def3e46f1bce5d79b26e2510f6792adff4e75ec3f3effb2ac36bbc0ba66cb19b2f4e8e fix-go-ntlm-version-spec.patch" diff --git a/community/git-lfs/fix-go-ntlm-version-spec.patch b/community/git-lfs/fix-go-ntlm-version-spec.patch new file mode 100644 index 0000000000..f160e49e9c --- /dev/null +++ b/community/git-lfs/fix-go-ntlm-version-spec.patch @@ -0,0 +1,41 @@ +From cd83f4224ce02398bdbf8b05830d92220d9b8e01 Mon Sep 17 00:00:00 2001 +From: "brian m. carlson" <bk2204@github.com> +Date: Wed, 4 Sep 2019 14:50:28 +0000 +Subject: [PATCH] go.mod: clean up for Go 1.13 + +Go 1.13 has become stricter and now requires that the timestamps in +go.mod reflect the commit timestamps. Update go.mod and go.sum to make +sure that Go 1.13 is happy. +--- + go.mod | 2 +- + go.sum | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/go.mod b/go.mod +index e71b1953e..99c682f3e 100644 +--- a/go.mod ++++ b/go.mod +@@ -4,7 +4,7 @@ require ( + github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858 + github.com/git-lfs/gitobj v1.4.0 + github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18 +- github.com/git-lfs/go-ntlm v0.0.0-20190307203151-c5056e7fa066 ++ github.com/git-lfs/go-ntlm v0.0.0-20190401175752-c5056e7fa066 + github.com/git-lfs/wildmatch v1.0.2 + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/mattn/go-isatty v0.0.4 +diff --git a/go.sum b/go.sum +index 78eba0b84..91a512658 100644 +--- a/go.sum ++++ b/go.sum +@@ -6,8 +6,8 @@ github.com/git-lfs/gitobj v1.4.0 h1:F7fKUUM/OTVu0ejnBA6x0trSYM8A9Zv7VGoBTsMmhHk= + github.com/git-lfs/gitobj v1.4.0/go.mod h1:EdPNGHVxXe1jTuNXzZT1+CdJCuASoDSLPQuvNOo9nGM= + github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18 h1:7Th0eBA4rT8WJNiM1vppjaIv9W5WJinhpbCJvRJxloI= + github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18/go.mod h1:70O4NAtvWn1jW8V8V+OKrJJYcxDLTmIozfi2fmSz5SI= +-github.com/git-lfs/go-ntlm v0.0.0-20190307203151-c5056e7fa066 h1:j7JwIEwLNQ/kBdKpHO3U1jjMXIPjSq7eCFvQIF3e8Fs= +-github.com/git-lfs/go-ntlm v0.0.0-20190307203151-c5056e7fa066/go.mod h1:YnCP1lAyul0ITv9nT/OqXseZmGeaqvMVa2uvl8ssQvE= ++github.com/git-lfs/go-ntlm v0.0.0-20190401175752-c5056e7fa066 h1:f5UyyCnv3o2EHy+zsqOyYa8jB5bZR/N9ZEideqeDYag= ++github.com/git-lfs/go-ntlm v0.0.0-20190401175752-c5056e7fa066/go.mod h1:YnCP1lAyul0ITv9nT/OqXseZmGeaqvMVa2uvl8ssQvE= + github.com/git-lfs/wildmatch v1.0.2 h1:Bt8fjbL2OjfhSTsmLPXSalpXgX9twSIFSVvupY2IdbE= + github.com/git-lfs/wildmatch v1.0.2/go.mod h1:SdHAGnApDpnFYQ0vAxbniWR0sn7yLJ3QXo9RRfhn2ew= + github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= |