.git-lfs.metadata

@@ -1,2 +1,2 @@
-48fcb41914f2b6c59c3c7b6d7bd3ab9b19575f2b SOURCES/git-lfs-v2.11.0.tar.gz
-b5130773f7fd073eadb302d7c76a59387d575c84 SOURCES/manpages.tgz
+e76897da8f89170b2e23db7723408a7bdd038ee8 SOURCES/git-lfs-v3.4.1.tar.gz
+8f640c97e9736385e8cad79c91c983de895d6053 SOURCES/manpages.tgz

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/git-lfs-v2.11.0.tar.gz
+SOURCES/git-lfs-v3.4.1.tar.gz
 SOURCES/manpages.tgz

SOURCES/gen-manpages.sh

@@ -1,16 +1,15 @@
-# As `ronn` package has not been packaged for RHEL7 yet, man pages need to be generated on Fedora when rebasing to a new version as follows:
+# As `asciidoctor` package has not been packaged to RHEL 8:
 
-# Pass package version(eg. `2.4.1`) as argument
+# Pass package version(eg. `3.4.0`) as argument
 
 VERSION=$1
 
-cd git-lfs-$VERSION/docs
+cd git-lfs-$VERSION
 
-ronn --roff man/*.ronn
+make man GIT_LFS_SHA=unused VERSION=unused PREFIX=unused
+rm -r man/html
 
-cd ..
-
-tar -czvf manpages.tgz docs/man/*.{1,5}
+tar -czvf manpages.tgz man/*
 
 cp manpages.tgz ../
 

SPECS/git-lfs.spec

@@ -5,7 +5,7 @@
 
 # https://github.com/git-lfs/git-lfs
 %global goipath         github.com/git-lfs/git-lfs
-Version:                2.11.0
+Version:                3.4.1
 
 # golang doesn't ship i686 binaries, we don't need the build
 # https://bugzilla.redhat.com/show_bug.cgi?id=1752991#c9
@@ -14,60 +14,70 @@ Version:                2.11.0
 
 %global gobuilddir %{_builddir}/%{name}-%{version}/_build
 
+# define gobuild macro to not lose hardening, because of macro conflict
+# https://bugzilla.redhat.com/show_bug.cgi?id=1919348
+%global gobuild CGO_CPPFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-all" go build -compiler gc -buildmode pie '-tags=rpm_crashtraceback libtrust_openssl ' -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}
+
 Name:           git-lfs
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Git extension for versioning large files
 
 License:        MIT
 URL:            https://git-lfs.github.io/
 Source0:        https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-v%{version}.tar.gz
 Source1:        manpages.tgz
-# See this script. Generating of manpages is performed on other distros due to some missing numerous dependencies on RHEL
+# See this script. Generating of manpages is performed on other distros due to some missing rubygem-asciidoctor on RHEL-8
 Source2:        gen-manpages.sh
 
-Provides:       bundled(golang)(github.com/alexbrainman/sspi) = 4729b3d4d8581b2db83864d1018926e4154f9406
-Provides:       bundled(golang)(github.com/avast/retry-go) = a322e24d96313ab405dec28ad5711f036c6d25a3
-Provides:       bundled(golang)(github.com/davecgh/go-spew) = 8991bc29aa16c548c550c7ff78260e27b9ab7c73
-Provides:       bundled(golang)(github.com/dpotapov/go-spnego) = c2c609116ad04b25367e2789f273aaf8d1c263da
-Provides:       bundled(golang)(github.com/git-lfs/gitobj) = c6c142b484a6cecc0e79bebe3d9e931c5c00e982
-Provides:       bundled(golang(github.com/git-lfs/go-netrc) = e0e9ca483a183481412e6f5a700ff20a36177503
-Provides:       bundled(golang(github.com/git-lfs/go-ntlm)) = c5056e7fa0664ea69eed654a9618fa5e342dc347
-Provides:       bundled(golang(github.com/git-lfs/wildmatch)) = 87c0f52cdf80ddb5b7de681298e5fee5898e8e16
-Provides:       bundled(golang(github.com/hashicorp/go-uuid)) = 4f571afc59f3043a65f8fe6bf46d887b10a01d43
-Provides:       bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
-Provides:       bundled(golang(github.com/jcmturner/gofork)) = dc7c13fece037a4a36e2b3c69db4991498d30692
-Provides:       bundled(golang(github.com/mattn/go-isatty)) = 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c
-Provides:       bundled(golang(github.com/olekukonko/ts)) = 78ecb04241c0121483589a30b0814836a746187d
-Provides:       bundled(golang(github.com/pkg/errors)) = c605e284fe17294bda444b34710735b29d1a9d90
-Provides:       bundled(golang(github.com/pmezard/go-difflib)) = 792786c7400a136282c1664665ae0a8db921c6c2
-Provides:       bundled(golang(github.com/rubyist/tracerx)) = 787959303086f44a8c361240dfac53d3e9d53ed2
-Provides:       bundled(golang(github.com/spf13/cobra)) = ef82de70bb3f60c65fb8eebacbb2d122ef517385
-Provides:       bundled(golang(github.com/spf13/pflag)) = 298182f68c66c05229eb03ac171abe6e309ee79a
-Provides:       bundled(golang(github.com/ssgelm/cookiejarparser)) = ead01002df3bee9f6d64bfde0c7387bd2368a2e0
-Provides:       bundled(golang(github.com/stretchr/testify)) = 3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9
-Provides:       bundled(golang(github.com/xeipuuv/gojsonpointer)) = 4e3ac2762d5f479393488629ee9370b50873b3a6
-Provides:       bundled(golang(github.com/xeipuuv/gojsonreference)) = bd5ef7bd5415a7ac448318e64f11a24cd21e594b
-Provides:       bundled(golang(github.com/xeipuuv/gojsonschema)) = 6b67b3fab74d992bd07f72550006ab2c6907c416
-Provides:       bundled(golang(golang.org/x/crypto)) = a29dc8fdc73485234dbef99ebedb95d2eced08de
-Provides:       bundled(golang(golang.org/x/net) = 83d349e8ac1aeaa6e5b8669cbd094dccb2a7661d
-Provides:       bundled(golang(golang.org/x/sync)) = 37e7f081c4d4c64e13b10787722085407fe5d15f
-Provides:       bundled(golang(golang.org/x/sys)) = 97732733099d6a942a73b889770774366de963ed
-Provides:       bundled(golang(golang.org/x/text)) = f21a4dfb5e38f5895301dc265a8def02365cc3d0
-Provides:       bundled(golang(gopkg.in/jcmturner/aescts.v1)) = f6abebb3171c4c1b1fea279cb7c7325020a26290
-Provides:       bundled(golang(gopkg.in/jcmturner/dnsutils.v1)) = 13eeb8d49ffb74d7a75784c35e4d900607a3943c
-Provides:       bundled(golang(gopkg.in/jcmturner/gokrb5.v5)) = 32ba44ca5b42f17a4a9f33ff4305e70665a1bc0
-Provides:       bundled(golang(gopkg.in/jcmturner/rpc.v0)) = 4480c480c9cd343b54b0acb5b62261cbd33d7adf
-Provides:       bundled(golang(gopkg.in/yaml.v2)) = 53403b58ad1b561927d19068c655246f2db79d48
+
+# Generated provides by vendor2provides.py
+# https://src.fedoraproject.org/rpms/syncthing/blob/603e4e03a92a7d704d199629dd85304018e8279d/f/vendor2provides.py
+Provides:       bundled(golang(github.com/alexbrainman/sspi)) = 909beea
+Provides:       bundled(golang(github.com/avast/retry-go)) = 2.4.2+incompatible
+Provides:       bundled(golang(github.com/davecgh/go-spew)) = 1.1.1
+Provides:       bundled(golang(github.com/dpotapov/go-spnego)) = 298b63a
+Provides:       bundled(golang(github.com/git-lfs/gitobj/v2)) = 2.1.1
+Provides:       bundled(golang(github.com/git-lfs/go-netrc)) = f0c862d
+Provides:       bundled(golang(github.com/git-lfs/pktline)) = 06e9096
+Provides:       bundled(golang(github.com/git-lfs/wildmatch/v2)) = 2.0.1
+Provides:       bundled(golang(github.com/hashicorp/go-uuid)) = 1.0.2
+Provides:       bundled(golang(github.com/inconshreveable/mousetrap)) = 1.0.1
+Provides:       bundled(golang(github.com/jcmturner/aescts/v2)) = 2.0.0
+Provides:       bundled(golang(github.com/jcmturner/dnsutils/v2)) = 2.0.0
+Provides:       bundled(golang(github.com/jcmturner/gofork)) = 1.0.0
+Provides:       bundled(golang(github.com/jcmturner/goidentity/v6)) = 6.0.1
+Provides:       bundled(golang(github.com/jcmturner/gokrb5/v8)) = 8.4.2
+Provides:       bundled(golang(github.com/jcmturner/rpc/v2)) = 2.0.3
+Provides:       bundled(golang(github.com/leonelquinteros/gotext)) = 1.5.0
+Provides:       bundled(golang(github.com/mattn/go-isatty)) = 0.0.4
+Provides:       bundled(golang(github.com/olekukonko/ts)) = 78ecb04
+Provides:       bundled(golang(github.com/pkg/errors)) = c605e28
+Provides:       bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0
+Provides:       bundled(golang(github.com/rubyist/tracerx)) = 7879593
+Provides:       bundled(golang(github.com/spf13/cobra)) = 1.6.0
+Provides:       bundled(golang(github.com/spf13/pflag)) = 1.0.5
+Provides:       bundled(golang(github.com/ssgelm/cookiejarparser)) = 1.0.1
+Provides:       bundled(golang(github.com/stretchr/testify)) = 1.6.1
+Provides:       bundled(golang(github.com/xeipuuv/gojsonpointer)) = 4e3ac27
+Provides:       bundled(golang(github.com/xeipuuv/gojsonreference)) = bd5ef7b
+Provides:       bundled(golang(github.com/xeipuuv/gojsonschema)) = 6b67b3f
+Provides:       bundled(golang(golang.org/x/crypto)) = 7b82a4e
+Provides:       bundled(golang(golang.org/x/net)) = 0.7.0
+Provides:       bundled(golang(golang.org/x/sync)) = 0.1.0
+Provides:       bundled(golang(golang.org/x/sys)) = 0.5.0
+Provides:       bundled(golang(golang.org/x/text)) = 0.7.0
+Provides:       bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
+
 
 %if 0%{?with_check}
 # For tests
 BuildRequires:  perl-Digest-SHA
 BuildRequires:  perl-Test-Harness
 # Tests require full git suite, but not generally needed.
-BuildRequires:  git >= 1.8.5
+BuildRequires:  git >= 2.32.0
 %endif
 
-Requires:       git-core >= 1.8.5
+Requires:       git-core >= 2.32.0
 
 %description
 Git Large File Storage (LFS) replaces large files such as audio samples,
@@ -87,9 +97,9 @@ ln -fs "$(pwd)" "%{gobuilddir}/src/%{goipath}"
 tar -xf %{SOURCE1}
 %endif
 
-# Modify Makefile so that it expects binaries where we build them.
+# Modify tests so that they expect binaries where we build them.
 sed -i -e 's!\.\./bin/!/%{gobuilddir}/bin/!g' t/Makefile
-
+sed -i -e 's!^BINPATH=.\+!BINPATH="%{gobuilddir}/bin"!g' t/testenv.sh
 
 %build
 export GOPATH=%{gobuilddir}:%{gopath}
@@ -99,7 +109,10 @@ export GO111MODULE=off
 pushd docs
 %gobuild -o mangen man/mangen.go
 ./mangen
-popd 
+# Removes unwanted source files
+# https://bugzilla.redhat.com/show_bug.cgi?id=1852842
+rm mangen man/mangen.go
+popd
 
 %gobuild -o %{gobuilddir}/bin/git-lfs %{goipath}
 
@@ -116,9 +129,15 @@ popd
 # In Fedora this is done by using %%gopkginstall
 install -Dpm0755 %{gobuilddir}/bin/git-lfs %{buildroot}%{_bindir}/%{name}
 install -d -p %{buildroot}%{_mandir}/man1/
-install -Dpm0644 docs/man/*.1 %{buildroot}%{_mandir}/man1/
+install -Dpm0644 man/man1/*.1 %{buildroot}%{_mandir}/man1/
 install -d -p %{buildroot}%{_mandir}/man5/
-install -Dpm0644 docs/man/*.5 %{buildroot}%{_mandir}/man5/
+install -Dpm0644 man/man5/*.5 %{buildroot}%{_mandir}/man5/
+install -d -p %{buildroot}%{_mandir}/man7/
+install -Dpm0644 man/man7/*.7 %{buildroot}%{_mandir}/man7/
+
+# Remove unwanted files from man folder
+# https://bugzilla.redhat.com/show_bug.cgi?id=1852842
+rm -r man/*
 
 
 %post
@@ -133,9 +152,10 @@ exit 0
 
 %if %{with check}
 %check
-# In Fedora this is done by using %%gochecks
 PATH=%{buildroot}%{_bindir}:%{gobuilddir}/bin:$PATH \
-    make -C t PROVE_EXTRA_ARGS="-j$(getconf _NPROCESSORS_ONLN)"
+# https://github.com/git-lfs/git-lfs/issues/5609
+# tests fails when running with low level of parallelism
+    make -C t PROVE_EXTRA_ARGS="-j40 -v"
 %endif
 
 
@@ -146,9 +166,41 @@ PATH=%{buildroot}%{_bindir}:%{gobuilddir}/bin:$PATH \
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}*.1*
 %{_mandir}/man5/%{name}*.5*
+%{_mandir}/man7/%{name}*.7*
 
 
 %changelog
+* Mon Apr 22 2024 Ondřej Pohořelský <opohorel@redhat.com> - 3.4.1-2
+- Rebuild with new Golang
+- Resolves: RHEL-32543, RHEL-28377, RHEL-28399, RHEL-28423
+
+* Mon Dec 18 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.4.1-1
+- Update to version 3.4.1
+- Resolves: RHEL-17102
+
+* Mon Jan 30 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.2.0-2
+- Rebuild with Golang-1.19.4
+- Resolves: #2163744
+
+* Mon Jan 09 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.2.0-1
+- Update to version 3.2.0
+- Resolves: #2139382
+
+* Mon Jan 17 2022 Ondrej Pohorelsky <opohorel@redhat.com> - 2.13.3-2
+- Define %%gobuild macro with proper ldflags
+- Related: rhbz#2021549
+
+* Tue Nov 23 2021 Ondrej Pohorelsky <opohorel@redhat.com> - 2.13.3-1
+- Update to version 2.13.3
+- Fixed round brackets in Provides
+- Moved manpages.tgz to look-a-side cache
+- Resolves: rhbz#2021549, rhbz#1870080, rhbz#1866441
+
+* Wed Jul 1 2020 Ondrej Pohorelsky <opohorel@redhat.com> - 2.11.0-2
+- Removed mangen source file
+- Cleaned docs/man folder
+- Resolves: rhbz#1852842
+
 * Wed Jun 10 2020 Ondrej Pohorelsky <opohorel@redhat.com> - 2.11.0-1
 - Update to version 2.11.0
 - Resolves: rhbz#1783391