diff --git a/.gitignore b/.gitignore index 8fa4a76..b6667e2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /git-lfs-2.5.0.tar.gz /git-lfs-2.5.1.tar.gz /git-lfs-2.5.2.tar.gz +/git-lfs-2.6.1.tar.gz diff --git a/0001-Backport-PR-3377-to-fix-test-server.patch b/0001-Backport-PR-3377-to-fix-test-server.patch new file mode 100644 index 0000000..1627a9c --- /dev/null +++ b/0001-Backport-PR-3377-to-fix-test-server.patch @@ -0,0 +1,72 @@ +From 736c749ed730a1cc2f4c12f34de06ae9810ebe86 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Tue, 15 Jan 2019 01:08:23 -0500 +Subject: [PATCH 1/2] Backport PR 3377 to fix test server. + +Signed-off-by: Elliott Sales de Andrade +--- + t/git-lfs-test-server-api/main.go | 13 +++++++------ + t/git-lfs-test-server-api/testupload.go | 2 +- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/t/git-lfs-test-server-api/main.go b/t/git-lfs-test-server-api/main.go +index 3635df76..25a1e8ab 100644 +--- a/t/git-lfs-test-server-api/main.go ++++ b/t/git-lfs-test-server-api/main.go +@@ -13,6 +13,7 @@ import ( + "github.com/git-lfs/git-lfs/errors" + "github.com/git-lfs/git-lfs/fs" + "github.com/git-lfs/git-lfs/lfsapi" ++ "github.com/git-lfs/git-lfs/lfshttp" + t "github.com/git-lfs/git-lfs/t/cmd/util" + "github.com/git-lfs/git-lfs/tasklog" + "github.com/git-lfs/git-lfs/tq" +@@ -141,7 +142,7 @@ func buildManifest(r *t.Repo) (*tq.Manifest, error) { + // Configure the endpoint manually + finder := lfsapi.NewEndpointFinder(r) + +- var endp lfsapi.Endpoint ++ var endp lfshttp.Endpoint + if len(cloneUrl) > 0 { + endp = finder.NewEndpointFromCloneURL(cloneUrl) + } else { +@@ -160,18 +161,18 @@ func buildManifest(r *t.Repo) (*tq.Manifest, error) { + } + + type constantEndpoint struct { +- e lfsapi.Endpoint ++ e lfshttp.Endpoint + + lfsapi.EndpointFinder + } + +-func (c *constantEndpoint) NewEndpointFromCloneURL(rawurl string) lfsapi.Endpoint { return c.e } ++func (c *constantEndpoint) NewEndpointFromCloneURL(rawurl string) lfshttp.Endpoint { return c.e } + +-func (c *constantEndpoint) NewEndpoint(rawurl string) lfsapi.Endpoint { return c.e } ++func (c *constantEndpoint) NewEndpoint(rawurl string) lfshttp.Endpoint { return c.e } + +-func (c *constantEndpoint) Endpoint(operation, remote string) lfsapi.Endpoint { return c.e } ++func (c *constantEndpoint) Endpoint(operation, remote string) lfshttp.Endpoint { return c.e } + +-func (c *constantEndpoint) RemoteEndpoint(operation, remote string) lfsapi.Endpoint { return c.e } ++func (c *constantEndpoint) RemoteEndpoint(operation, remote string) lfshttp.Endpoint { return c.e } + + func buildTestData(repo *t.Repo, manifest *tq.Manifest) (oidsExist, oidsMissing []TestObject, err error) { + const oidCount = 50 +diff --git a/t/git-lfs-test-server-api/testupload.go b/t/git-lfs-test-server-api/testupload.go +index dde5e9ec..3bdbd4ba 100644 +--- a/t/git-lfs-test-server-api/testupload.go ++++ b/t/git-lfs-test-server-api/testupload.go +@@ -52,7 +52,7 @@ func uploadAllExists(manifest *tq.Manifest, oidsExist, oidsMissing []TestObject) + var errbuf bytes.Buffer + for _, o := range retobjs { + link, _ := o.Rel("upload") +- if link == nil { ++ if link != nil { + errbuf.WriteString(fmt.Sprintf("Upload link should not exist for %s, was %+v\n", o.Oid, link)) + } + } +-- +2.20.1 + diff --git a/0002-Trim-security-context-when-checking-permissions.patch b/0002-Trim-security-context-when-checking-permissions.patch new file mode 100644 index 0000000..b23d575 --- /dev/null +++ b/0002-Trim-security-context-when-checking-permissions.patch @@ -0,0 +1,31 @@ +From 43e2b130e74390f85e29de1c19da66ceccb9cee2 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Tue, 15 Jan 2019 01:10:39 -0500 +Subject: [PATCH 2/2] Trim security context when checking permissions. + +This fixes the umask tests on a file system that uses security context, +as that prints out an extra dot in the permissions. + +Signed-off-by: Elliott Sales de Andrade +--- + t/t-umask.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/t/t-umask.sh b/t/t-umask.sh +index fdbc2386..494d5420 100644 +--- a/t/t-umask.sh ++++ b/t/t-umask.sh +@@ -15,7 +15,9 @@ clean_setup () { + + perms_for () { + local file=$(echo "$1" | sed "s!^\(..\)\(..\)!.git/lfs/objects/\1/\2/\1\2!") +- ls -l "$file" | awk '{print $1}' ++ local perms=$(ls -l "$file" | awk '{print $1}') ++ # Trim extended attributes: ++ echo ${perms:0:10} + } + + begin_test "honors umask" +-- +2.20.1 + diff --git a/git-lfs.spec b/git-lfs.spec index 52f8796..700c2e6 100644 --- a/git-lfs.spec +++ b/git-lfs.spec @@ -1,20 +1,25 @@ %global goipath github.com/git-lfs/git-lfs -Version: 2.5.2 +Version: 2.6.1 %gometa Name: git-lfs -Release: 4%{?dist} +Release: 1%{?dist} Summary: Git extension for versioning large files License: MIT URL: https://git-lfs.github.io/ Source0: %{gosource} +# Simplified somewhat to work as a backport. +# https://github.com/git-lfs/git-lfs/pull/3377 +Patch0001: 0001-Backport-PR-3377-to-fix-test-server.patch +# https://github.com/git-lfs/git-lfs/pull/3476 +Patch0002: 0002-Trim-security-context-when-checking-permissions.patch BuildRequires: golang(github.com/ThomsonReutersEikon/go-ntlm/ntlm) -BuildRequires: golang(github.com/git-lfs/gitobj) +BuildRequires: golang(github.com/git-lfs/gitobj) >= 1.1.0 BuildRequires: golang(github.com/git-lfs/go-netrc/netrc) >= 0-0.1.20180827gite0e9ca4 -BuildRequires: golang(github.com/git-lfs/wildmatch) >= 0-0.3.20180815gitb31c344 +BuildRequires: golang(github.com/git-lfs/wildmatch) >= 1.0.0 BuildRequires: golang(github.com/kr/pty) BuildRequires: golang(github.com/olekukonko/ts) BuildRequires: golang(github.com/pkg/errors) @@ -51,7 +56,7 @@ which use import path with %{goipath} prefix. %prep -%forgesetup +%forgeautosetup -p1 rm -rf vendor @@ -88,11 +93,11 @@ install -Dpm0644 docs/man/*.5 %{buildroot}%{_mandir}/man5/ %post -%{_bindir}/%{name} install --system +%{_bindir}/%{name} install --system --skip-repo %preun if [ $1 -eq 0 ]; then - %{_bindir}/%{name} uninstall --system + %{_bindir}/%{name} uninstall --system --skip-repo fi exit 0 @@ -115,6 +120,9 @@ PATH=%{buildroot}%{_bindir}:$PWD/_bin:$PATH \ %changelog +* Tue Jan 15 2019 Elliott Sales de Andrade - 2.6.1-1 +- Update to latest version + * Mon Jan 14 2019 Elliott Sales de Andrade - 2.5.2-4 - Rebuilt for dependencies diff --git a/sources b/sources index f2875f7..4968b42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (git-lfs-2.5.2.tar.gz) = 58475f833e0ef69d37ece91f3792b43f2a589cce94d1eba22a0534aa40257b236f9f9aab633c8b800bec129eb86fbc38e9ab6b5e52144595a27cd13bee5cb33e +SHA512 (git-lfs-2.6.1.tar.gz) = 1f45d8da4f67d37e85b061c219423863ed41ed4723dd1030e7287e422d84cd615ddd820765bd32a147264c0f4bf9d5e84185970442fd110ae9656be97de78663