On Mon, Jul 05 2021, Stuart Henderson <[email protected]> wrote:
> There have been a few releases since the version in ports so I won't
> copy the whole lot here, but release notes are in
> https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=NEWS;h=e37d5aa5d46276e0e3e462b7619c9678e374ab69;hb=695a879af81e895741109874b9ac0712e1afc994
FWIW I pinged edd@ about this yesterday. He replied with a wip diff
which includes an update to 2.3.1. 2.2 is the current stable branch,
2.3 is the new devel branch (since 2021-04-07).
I have no opinion whether we should use the stable or devel branch, I'll
just note that we have used the 2.1 devel branch in the past.
> The doc/Makefile.in patch didn't apply, rather than updating it I just
> changed to rm'ing in post-install to save work for future updates.
Makes sense to me.
> OK?
make test passes on amd64 and sparc64.
ok jca@ fwiw but as I said Edd has a wip update to 2.3.1.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/gnupg/Makefile,v
> retrieving revision 1.119
> diff -u -p -r1.119 Makefile
> --- Makefile 17 Jan 2021 15:13:34 -0000 1.119
> +++ Makefile 5 Jul 2021 08:56:45 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT = GNU privacy guard - a free PGP replacement
>
> -DISTNAME = gnupg-2.2.23
> -REVISION = 2
> +DISTNAME = gnupg-2.2.29
> CATEGORIES = security
>
> MASTER_SITES = ${MASTER_SITE_GNUPG:=gnupg/}
> @@ -45,8 +44,8 @@ DEBUG_PACKAGES = ${BUILD_PACKAGES}
>
> RUN_DEPENDS = security/pinentry
>
> -TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
> -PORTHOME=${WRKDIR}
> +TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
> +PORTHOME = ${WRKDIR}
>
> USE_GMAKE = Yes
>
> @@ -60,5 +59,6 @@ CONFIGURE_ARGS += --enable-gpgtar \
> post-install:
> ln -sf gpg ${PREFIX}/bin/gpg2
> ln -sf gpgv ${PREFIX}/bin/gpgv2
> + rm -rf ${PREFIX}/share/doc/gnupg/examples/systemd-user
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/security/gnupg/distinfo,v
> retrieving revision 1.33
> diff -u -p -r1.33 distinfo
> --- distinfo 5 Oct 2020 19:46:17 -0000 1.33
> +++ distinfo 5 Jul 2021 08:56:45 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (gnupg-2.2.23.tar.bz2) = ELVeSdeLPknx7bWNdUHsva2S3a7riFtvSG7SPRzR2lw=
> -SIZE (gnupg-2.2.23.tar.bz2) = 7099806
> +SHA256 (gnupg-2.2.29.tar.bz2) = OdB820UkgY+evOSSlJMZdK9QRRnmp0dsUunTj8C9DMk=
> +SIZE (gnupg-2.2.29.tar.bz2) = 7215986
> Index: patches/patch-doc_Makefile_in
> ===================================================================
> RCS file: patches/patch-doc_Makefile_in
> diff -N patches/patch-doc_Makefile_in
> --- patches/patch-doc_Makefile_in 5 Oct 2020 19:46:17 -0000 1.11
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,20 +0,0 @@
> -$OpenBSD: patch-doc_Makefile_in,v 1.11 2020/10/05 19:46:17 jca Exp $
> -
> -Index: doc/Makefile.in
> ---- doc/Makefile.in.orig
> -+++ doc/Makefile.in
> -@@ -476,14 +476,6 @@ libcommontls = ../common/libcommontls.a
> - libcommontlsnpth = ../common/libcommontlsnpth.a
> - examples = examples/README examples/scd-event examples/trustlist.txt
> \
> - examples/vsnfd.prf examples/debug.prf \
> -- examples/systemd-user/README \
> -- examples/systemd-user/dirmngr.service \
> -- examples/systemd-user/dirmngr.socket \
> -- examples/systemd-user/gpg-agent.service \
> -- examples/systemd-user/gpg-agent.socket \
> -- examples/systemd-user/gpg-agent-ssh.socket \
> -- examples/systemd-user/gpg-agent-browser.socket \
> -- examples/systemd-user/gpg-agent-extra.socket \
> - examples/gpgconf.conf examples/pwpattern.list
> -
> - helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt \
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/security/gnupg/pkg/PLIST,v
> retrieving revision 1.32
> diff -u -p -r1.32 PLIST
> --- pkg/PLIST 5 Oct 2020 19:46:17 -0000 1.32
> +++ pkg/PLIST 5 Jul 2021 08:56:45 -0000
> @@ -38,7 +38,6 @@ bin/gpgv2
> @man man/man1/gpgtar.1
> @man man/man1/gpgv.1
> @man man/man1/scdaemon.1
> -@man man/man1/symcryptrun.1
> @man man/man1/watchgnupg.1
> @man man/man7/gnupg.7
> @man man/man8/addgnupghome.8
> @@ -56,13 +55,14 @@ share/doc/gnupg/OpenPGP
> share/doc/gnupg/README
> share/doc/gnupg/TRANSLATE
> share/doc/gnupg/examples/
> +share/doc/gnupg/examples/Automatic.prf
> share/doc/gnupg/examples/README
> +share/doc/gnupg/examples/VS-NfD.prf
> share/doc/gnupg/examples/debug.prf
> share/doc/gnupg/examples/gpgconf.conf
> share/doc/gnupg/examples/pwpattern.list
> share/doc/gnupg/examples/scd-event
> share/doc/gnupg/examples/trustlist.txt
> -share/doc/gnupg/examples/vsnfd.prf
> share/doc/pkg-readmes/${PKGSTEM}
> share/gnupg/
> share/gnupg/distsigkey.gpg
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
