diff --git a/0001-use-vendor-dir-for-build.patch b/0001-use-vendor-dir-for-build.patch index 6ba7f6543b540ccfb4df37e79955b572ea0c07ba..946ff45eb102b7ee5bfccc98f080cac0dff20b09 100644 --- a/0001-use-vendor-dir-for-build.patch +++ b/0001-use-vendor-dir-for-build.patch @@ -1,46 +1,47 @@ -From f17333fb29d81d5061c96931c0cd5135dec0ba02 Mon Sep 17 00:00:00 2001 -From: zhoukang -Date: Tue, 12 Jul 2022 21:21:58 +0800 -Subject: [PATCH] use vendor dir for build +From dba04ce4b8b749198c6ff99550bcaf6c37dd97e3 Mon Sep 17 00:00:00 2001 +From: liuzhilin +Date: Tue, 3 Dec 2024 15:53:27 +0800 +Subject: [PATCH] use-vendor-dir-for-build --- - Makefile | 20 +++++++------------- - 1 file changed, 7 insertions(+), 13 deletions(-) + Makefile | 21 +++++++-------------- + 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile -index 0b73d9e..a185116 100644 +index eeaa86f..e0078e2 100644 --- a/Makefile +++ b/Makefile -@@ -24,7 +24,7 @@ GO_TEST_EXTRA_ARGS = +@@ -28,7 +28,7 @@ GO_TEST_EXTRA_ARGS = # BUILTIN_LD_FLAGS are the internal flags used to pass to the linker. By default # the config.GitCommit variable is always set via this variable, and # DWARF-stripping is enabled unless DWARF=YesPlease. -BUILTIN_LD_FLAGS = +BUILTIN_LD_FLAGS = "-linkmode=external" ifneq ("$(VENDOR)","") - BUILTIN_LD_FLAGS += -X github.com/git-lfs/git-lfs/config.Vendor=$(VENDOR) + BUILTIN_LD_FLAGS += -X 'github.com/git-lfs/git-lfs/v3/config.Vendor=$(VENDOR)' endif -@@ -194,8 +194,8 @@ endif +@@ -202,8 +202,8 @@ endif # # It uses BUILD_MAIN as defined above to specify the entrypoint for building Git # LFS. -BUILD = GOOS=$(1) GOARCH=$(2) \ - $(GO) build \ +BUILD = GO111MODULE=on GOOS=$(1) GOARCH=$(2) \ -+ $(GO) build -mod=vendor \ ++ $(GO) build -mod=vendor \ -ldflags="$(LD_FLAGS)" \ -gcflags="$(GC_FLAGS)" \ -trimpath \ -@@ -227,7 +227,7 @@ mangen : commands/mancontent_gen.go +@@ -237,8 +237,7 @@ mangen : commands/mancontent_gen.go # 'commands' of Git LFS. It depends upon the contents of the 'docs' directory # and converts those manpages into code. - commands/mancontent_gen.go : $(wildcard docs/man/*.ronn) + commands/mancontent_gen.go : $(wildcard docs/man/*.adoc) - GOOS= GOARCH= $(GO) generate github.com/git-lfs/git-lfs/v3/commands +- + @echo "delete this step" - # trgen is a shorthand for ensuring that tr/tr_gen.go is kept up-to-date with # the contents of po/build/*.mo. -@@ -238,7 +238,7 @@ trgen : tr/tr_gen.go + .PHONY : trgen +@@ -248,7 +247,7 @@ trgen : tr/tr_gen.go # 'tr' of Git LFS. It depends upon the contents of the 'po' directory # and converts the .mo files. tr/tr_gen.go : $(MO) @@ -49,7 +50,7 @@ index 0b73d9e..a185116 100644 po/build: mkdir -p po/build -@@ -597,7 +597,7 @@ vendor : go.mod +@@ -628,7 +627,7 @@ vendor : go.mod .PHONY : fmt ifeq ($(shell test -x "`command -v $(GOIMPORTS)`"; echo $$?),0) fmt : $(SOURCES) | lint @@ -58,7 +59,7 @@ index 0b73d9e..a185116 100644 else fmt : $(SOURCES) | lint @echo "git-lfs: skipping fmt, no goimports found at \`$(GOIMPORTS)\` ..." -@@ -607,13 +607,7 @@ endif +@@ -638,13 +637,7 @@ endif # are vendored in via vendor (see: above). .PHONY : lint lint : $(SOURCES) @@ -71,8 +72,8 @@ index 0b73d9e..a185116 100644 - | $(GREP) "." + @echo "delete this step" - # generate index.txt for ronn HTML man page link generation - .PHONY : index.txt + # MAN_ROFF_TARGETS is a list of all ROFF-style targets in the man pages. + MAN_ROFF_TARGETS = man/man1/git-lfs-checkout.1 \ -- -2.33.0 +2.25.1 diff --git a/git-lfs-v3.2.0.tar.gz b/git-lfs-v3.2.0.tar.gz deleted file mode 100644 index 3231343f3c9329fd48aba9f7b13913687cc46d21..0000000000000000000000000000000000000000 Binary files a/git-lfs-v3.2.0.tar.gz and /dev/null differ diff --git a/git-lfs-v3.6.0.tar.gz b/git-lfs-v3.6.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d826d8532e98207e16239a70d20506e85ca2c852 Binary files /dev/null and b/git-lfs-v3.6.0.tar.gz differ diff --git a/git-lfs.spec b/git-lfs.spec index e2c471a2ecf48205acbf7b0e926763a18ae82214..381e1665c5eb788b1706c31e5d6f8023e4325b78 100644 --- a/git-lfs.spec +++ b/git-lfs.spec @@ -3,7 +3,7 @@ # https://github.com/git-lfs/git-lfs Name: git-lfs -Version: 3.2.0 +Version: 3.6.0 Release: 1 Summary: Git extension for versioning large files @@ -53,5 +53,15 @@ install -Dpm0755 src/github.com/git-lfs/git-lfs/bin/git-lfs %{buildroot}%{_bindi %changelog +* Tue Dec 03 2024 liuzhilin - 3.6.0-1 +- Update package version to 3.6.0 +- Fix crash during pure SSH object transfer with multiple objects. +- ssh: fix connection creation "leaking" connections. +- fix: fix slice init length. +- Fix panic caused by accessing non-existent header. +- Avoid deadlocking on log scanning with lots of output on stderr. +- checkout: gracefully handle files deleted from the index. +- Fix logScanner fails to parse pointer file containing unicode chars. + * Tue Jul 12 2022 zhoukang - 3.2.0-1 - Initial package