From: Stuart Henderson <stu@spacehopper.org>
Subject: Re: remove or update devel/git-lfs
To: Marco van Hulten <marco@hulten.org>, ports@openbsd.org
Date: Mon, 10 Nov 2025 13:52:11 +0000

On 2025/11/07 16:05, Stuart Henderson wrote:
> On 2025/11/07 15:58, Marco van Hulten wrote:
> > Could you bump the version to 3.7.1 and generate the vendor dist
> > package?  The patch release addresses security problems.
> 
> can you test this please? i have no desire to learn how to use this.

ping?

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/git-lfs/Makefile,v
> diff -u -p -r1.20 Makefile
> --- Makefile	11 Mar 2022 18:50:06 -0000	1.20
> +++ Makefile	7 Nov 2025 16:05:18 -0000
> @@ -1,34 +1,64 @@
>  COMMENT =		Git extension for versioning large files
>  
> -GH_PROJECT =		git-lfs
> -GH_ACCOUNT =		git-lfs
> -GH_TAGNAME =		v2.13.2
> +V =			3.7.1
> +DISTNAME =		git-lfs-$V
> +DISTFILES =		git-lfs-v$V.tar.gz
> +PKGNAME =		git-lfs-$V
>  
>  CATEGORIES =		devel
>  
>  HOMEPAGE =		https://git-lfs.github.com/
> +SITES =			https://github.com/git-lfs/git-lfs/releases/download/v$V/
> +
> +# to generate for a new version, bump V, comment-out DISTFILES.v,
> +# make makesum, make dist, copy out, uncomment DISTFILES.v
> +SITES.v =		https://spacehopper.org/mirrors/
> +DISTFILES.v =		git-lfs-$V-vendor.tar.gz
>  
>  # MIT
>  PERMIT_PACKAGE =	Yes
>  
>  WANTLIB +=		c pthread
>  
> -MODULES =		lang/go \
> -			lang/ruby
> -MODRUBY_BUILDDEP =	No
> -MODRUBY_RUNDEP =	No
> -
> -BUILD_DEPENDS =		textproc/groff \
> -			textproc/ruby-ronn
> +MODULES =		lang/go
> +BUILD_DEPENDS =		textproc/asciidoctor
>  RUN_DEPENDS =		devel/git
> +ALL_TARGET =		github.com/git-lfs/git-lfs/v3
> +
> +dist:
> +	tmp=`mktemp -d`; \
> +	cd $$tmp; \
> +	tar xzf ${FULLDISTDIR}/${DISTFILES}; \
> +	cd git-lfs-$V; \
> +	go mod tidy; \
> +	go mod vendor; \
> +	cd ..; \
> +	tar cvzf ../git-lfs-$V-vendor.tar.gz git-lfs-$V/vendor; \
> +	ls -l /tmp/git-lfs-$V-vendor.tar.gz
> +
> +post-configure:
> +	cd ${MODGO_WORKSPACE}/src; \
> +	mkdir -p github.com/git-lfs/; \
> +	mv ${ALL_TARGET}/vendor/github.com/git-lfs/* github.com/git-lfs/; \
> +	rmdir ${ALL_TARGET}/vendor/github.com/git-lfs
> +
> +	cd ${MODGO_WORKSPACE}/src; \
> +	mv ${ALL_TARGET}/vendor/github.com/* github.com/; \
> +	rmdir ${ALL_TARGET}/vendor/github.com
> +
> +	cd ${MODGO_WORKSPACE}/src; \
> +	mv ${ALL_TARGET}/vendor/* ./; \
> +	rmdir ${ALL_TARGET}/vendor
> +
> +	cd ${WRKSRC}; \
> +	${MAKE_ENV} GOOS= GOARCH= go generate github.com/git-lfs/git-lfs/v3/{commands,tr}
>  
> -# Convert the manpages with ronn instead of mangen.go
>  post-build:
> -	cd ${WRKSRC}/docs/man/ && \
> -		for m in *.ronn; do ronn${MODRUBY_BINREV} -r $$m; done
> +	cd ${WRKSRC}/docs/man/; asciidoctor -b manpage *.adoc
>  
>  post-install:
>  	${INSTALL_MAN} ${WRKSRC}/docs/man/*.1 ${PREFIX}/man/man1/
>  	${INSTALL_MAN} ${WRKSRC}/docs/man/*.5 ${PREFIX}/man/man5/
> +	mv ${PREFIX}/bin/v3 ${PREFIX}/bin/git-lfs
>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/git-lfs/distinfo,v
> diff -u -p -r1.16 distinfo
> --- distinfo	5 Jun 2021 13:08:03 -0000	1.16
> +++ distinfo	7 Nov 2025 16:05:18 -0000
> @@ -1,2 +1,4 @@
> -SHA256 (git-lfs-2.13.2.tar.gz) = eC5idd+co3BzCUURLhaguMZLmBnwth+uUroeu8jc4tU=
> -SIZE (git-lfs-2.13.2.tar.gz) = 2527736
> +SHA256 (git-lfs-3.7.1-vendor.tar.gz) = S2cg0ApsrgXDIcKTAgsL+4hQu3df0lTYygKovOzSAas=
> +SHA256 (git-lfs-v3.7.1.tar.gz) = j1YFhiLt/qHREeUOmETvL1zmcLLb5NVdSOdlyUOvQ1E=
> +SIZE (git-lfs-3.7.1-vendor.tar.gz) = 3134588
> +SIZE (git-lfs-v3.7.1.tar.gz) = 713503
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/git-lfs/pkg/PLIST,v
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST	11 Mar 2022 18:50:06 -0000	1.7
> +++ pkg/PLIST	7 Nov 2025 16:05:18 -0000
> @@ -2,6 +2,7 @@
>  @man man/man1/git-lfs-checkout.1
>  @man man/man1/git-lfs-clean.1
>  @man man/man1/git-lfs-clone.1
> +@man man/man1/git-lfs-completion.1
>  @man man/man1/git-lfs-dedup.1
>  @man man/man1/git-lfs-env.1
>  @man man/man1/git-lfs-ext.1
> @@ -13,6 +14,7 @@
>  @man man/man1/git-lfs-locks.1
>  @man man/man1/git-lfs-logs.1
>  @man man/man1/git-lfs-ls-files.1
> +@man man/man1/git-lfs-merge-driver.1
>  @man man/man1/git-lfs-migrate.1
>  @man man/man1/git-lfs-pointer.1
>  @man man/man1/git-lfs-post-checkout.1
>