.git-lfs.metadata

@@ -1 +1,2 @@
-6f1dec9f66fe3acab25aedb2b2628cbe88ed53fd SOURCES/git-lfs-v2.13.3.tar.gz
+e76897da8f89170b2e23db7723408a7bdd038ee8 SOURCES/git-lfs-v3.4.1.tar.gz
+8f640c97e9736385e8cad79c91c983de895d6053 SOURCES/manpages.tgz

.gitignore

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

SOURCES/README.Fedora

@@ -1,11 +0,0 @@
-git-lfs on Fedora
-=================
-
-By default, the package will run a post-install/post-uninstall task to
-enable/disable git-lfs filters in the system git configuration.
-
-If you wish to enable/disable git-lfs manually, you can set the following
-option in the system git config, and package install/uninstall will no longer
-do this:
-
-# git config --system 'fedora.git-lfs.no-modify-config' true

SOURCES/gen-manpages.sh

@@ -0,0 +1,15 @@
+# As `asciidoctor` package has not been packaged to RHEL 8:
+
+# Pass package version(eg. `3.4.0`) as argument
+
+VERSION=$1
+
+cd git-lfs-$VERSION
+
+make man GIT_LFS_SHA=unused VERSION=unused PREFIX=unused
+rm -r man/html
+
+tar -czvf manpages.tgz man/*
+
+cp manpages.tgz ../
+

SPECS/git-lfs.spec

@@ -1,69 +1,83 @@
+# Build man pages
+%global with_manpages 1
+
 %bcond_without check
 
 # https://github.com/git-lfs/git-lfs
 %global goipath         github.com/git-lfs/git-lfs
-Version:                2.13.3
+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
+%global golang_arches %(echo %{golang_arches} | sed "s|%{ix86}||")
 %gometa
 
 %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:        5%{?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:        README.Fedora
-
-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)) = cb39e779dc0b7949ea39318ff9345598d030d3b3
-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)) = 5f4716e94777e714bc2fb3e3a44599cb40817aac
-Provides:       bundled(golang(golang.org/x/sync)) = 37e7f081c4d4c64e13b10787722085407fe5d15f
-Provides:       bundled(golang(golang.org/x/sys)) = f84b799fce68db3cb46a8f6f819c1e56377181df
-Provides:       bundled(golang(golang.org/x/text)) = 23ae387dee1f90d29a23c0e87ee0b46038fbed0e
-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
-
-# Generate man pages
-BuildRequires:  /usr/bin/ronn
+Source1:        manpages.tgz
+# See this script. Generating of manpages is performed on other distros due to some missing rubygem-asciidoctor on RHEL-8
+Source2:        gen-manpages.sh
 
 
-%if %{with check}
-# Tests
+# 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,
@@ -78,9 +92,14 @@ install -m 0755 -vd %{gobuilddir}/bin
 install -m 0755 -vd "$(dirname %{gobuilddir}/src/%{goipath})"
 ln -fs "$(pwd)" "%{gobuilddir}/src/%{goipath}"
 
-# Modify Makefile so that it expects binaries where we build them.
-sed -i -e 's!\.\./bin/!/%{gobuilddir}/bin/!g' t/Makefile
+%if %{?with_manpages}
+# Unpack manpages generated by %%{SOURCE2}
+tar -xf %{SOURCE1}
+%endif
 
+# 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}
@@ -88,9 +107,11 @@ export GO111MODULE=off
 
 # Build manpages first (some embedding in the executable is done.)
 pushd docs
-ronn --roff man/*.ronn
-%gobuild -o %{gobuilddir}/bin/mangen man/mangen.go
-%{gobuilddir}/bin/mangen
+%gobuild -o mangen man/mangen.go
+./mangen
+# 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}
@@ -103,17 +124,21 @@ done
 %gobuild -o "%{gobuilddir}/bin/git-lfs-test-server-api" t/git-lfs-test-server-api/*.go
 popd
 
-# Move man pages out of docs so they don't get installed twice.
-mv docs/man .
-
 
 %install
 # 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 man/*.1 %{buildroot}%{_mandir}/man1/
+install -Dpm0644 man/man1/*.1 %{buildroot}%{_mandir}/man1/
 install -d -p %{buildroot}%{_mandir}/man5/
-install -Dpm0644 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
 %{_bindir}/%{name} install --system --skip-repo
@@ -127,9 +152,10 @@ exit 0
 
 %if %{with check}
 %check
-# In Fedora this is done by using %%gocheck
 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
 
 
@@ -138,121 +164,52 @@ PATH=%{buildroot}%{_bindir}:%{gobuilddir}/bin:$PATH \
 %doc README.md CHANGELOG.md docs
 %license LICENSE.md
 %{_bindir}/%{name}
-%{_mandir}/man1/%%{name}*.1*
-%{_mandir}/man5/%%{name}*.5*
+%{_mandir}/man1/%{name}*.1*
+%{_mandir}/man5/%{name}*.5*
+%{_mandir}/man7/%{name}*.7*
 
 
 %changelog
-* Thu Mar 24 2022 Ondřej Pohořelský <opohorel@redhat.com> - 2.13.3-5
-- Rebuilt for golang-1.17.7-1
-  Related: rhbz#1975396
+* 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 Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.13.3-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Mon Dec 18 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.4.1-1
+- Update to version 3.4.1
+- Resolves: RHEL-17102
 
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 2.13.3-3
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
+* Mon Jan 30 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.2.0-2
+- Rebuild with Golang-1.19.4
+- Resolves: #2163744
 
-* Wed May 05 2021 Ondřej Pohořelský <opohorel@redhat.com> - 2.13.3-2
-- Fixed name of source tarball
-- Fixed date in the latest changelog entry 
-- Related: #1952517
+* Mon Jan 09 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.2.0-1
+- Update to version 3.2.0
+- Resolves: #2139382
 
-* Thu Apr 22 2021 Ondřej Pohořelský <opohorel@redhat.com> - 2.13.3-1
-- Update to latest version
-- Resolves: #1952517
+* Mon Jan 17 2022 Ondrej Pohorelsky <opohorel@redhat.com> - 2.13.3-2
+- Define %%gobuild macro with proper ldflags
+- Related: rhbz#2021549
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.13.0-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* 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 Jan 06 2021 Ondřej Pohořelský <opohorel@redhat.com> - 2.13.0-1
-- Enable bundling
-- Update to latest version
+* Wed Jul 1 2020 Ondrej Pohorelsky <opohorel@redhat.com> - 2.11.0-2
+- Removed mangen source file
+- Cleaned docs/man folder
+- Resolves: rhbz#1852842
 
-* Mon Nov 09 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.12.1-1
-- Update to latest version (#1894780)
+* Wed Jun 10 2020 Ondrej Pohorelsky <opohorel@redhat.com> - 2.11.0-1
+- Update to version 2.11.0
+- Resolves: rhbz#1783391
 
-* Thu Sep 03 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.12.0-1
-- Update to latest version (#1874604)
-- Remove duplicate docs/man directory (#1852765)
-- Add an option to disable modifying the git filter config (#1768060)
+* Thu Jul 19 2018 Sebastian Kisela <skisela@redhat.com> - 2.4.1-3
+- Add pregenerated manpages, due to missing dependency 'ronn' in rhel7.
 
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.0-3
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun May 10 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.11.0-1
-- Update to latest version
-
-* Thu Feb 20 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.10.0-1
-- Update to latest version
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 07 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.9.2-1
-- Update to latest version
-
-* Wed Jan 01 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.9.0-1
-- Update to latest version
-
-* Fri Aug 30 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.8.0-4
-- Customize vendor information in version
-
-* Fri Aug 30 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.8.0-3
-- Update to latest version
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jul 10 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.7.2-2
-- Update to latest Go macros
-
-* Wed Apr 24 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.7.2-1
-- Update to latest version
-
-* Wed Feb 27 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.7.1-1
-- Update to latest version
-
-* Thu Feb 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.7.0-1
-- Update to latest version
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 15 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.6.1-1
-- Update to latest version
-
-* Mon Jan 14 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.5.2-4
-- Rebuilt for dependencies
-
-* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org>
-- 2.5.2-3
-- redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as it’s just an alias
-- https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/RWD5YATAYAFWKIDZBB7EB6N5DAO4ZKFM/
-
-* Fri Oct 12 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.5.2-2
-- rebuilt
-
-* Wed Oct 10 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.5.2-1
-- Update to latest version
-
-* Tue Sep 04 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.5.1-1
-- Update to latest version
-
-* Mon Sep 03 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.5.0-1
-- Update to 2.5.0
-
-* Wed Aug 29 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.4.2-1
-- Update to 2.4.2
-
-* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 2.4.1-3
-- Rebuild with fixed binutils
+* Wed Jul 18 2018 Sebastian Kisela <skisela@redhat.com> - 2.4.1-2
+- Initial build for rh-git218-git-lfs-2.4.1
 
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild