On Tue, Jul 04 2023, Jeremie Courreges-Anglas <[email protected]> wrote:
> Here's a major update to gnupg-2.4.2. Changelog for 2.4.X:
> https://dev.gnupg.org/source/gnupg/browse/STABLE-BRANCH-2-4/NEWS
>
> Ports-wise:
> - use gmake so that the build system doesn't try to foolishly rebuild
> the .info files. Our old makeinfo was already too old to
> support --css-ref=..., it's now too old to grok the newer .texi files
> in this release. And I'd rather avoid a dep on print/texinfo for
> something that doesn't need to be rebuilt.
> - tests print gpgscm crap about unportable uses of /proc/self/something,
> but seem to cope.
> - the agent/protect.c patch needs refreshing, now this code path only
> uses OCB. Patch mechanically adapted.
>
> Tests (and oks) welcome.
gnupg-2.4.3 was released today, with one build regression in the default
(non-ldap) FLAVOR.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/gnupg/Makefile,v
retrieving revision 1.133
diff -u -p -r1.133 Makefile
--- Makefile 13 Apr 2023 12:29:15 -0000 1.133
+++ Makefile 5 Jul 2023 15:49:08 -0000
@@ -2,7 +2,7 @@ PORTROACH = limitw:1,even
COMMENT = GNU privacy guard - a free PGP replacement
-DISTNAME = gnupg-2.2.41
+DISTNAME = gnupg-2.4.3
CATEGORIES = security
@@ -23,6 +23,7 @@ EXTRACT_SUFX = .tar.bz2
FLAVORS = ldap
FLAVOR ?=
+USE_GMAKE = Yes
LIB_DEPENDS = archivers/bzip2 \
databases/sqlite3 \
devel/gettext,-runtime \
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/gnupg/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo 13 Apr 2023 12:29:15 -0000 1.42
+++ distinfo 5 Jul 2023 15:49:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.2.41.tar.bz2) = E/MpEAel6FRvy3vAxmEM5EqqmzmVBZ1PgUW6Cf1b4+E=
-SIZE (gnupg-2.2.41.tar.bz2) = 7313746
+SHA256 (gnupg-2.4.3.tar.bz2) = onGubXMvb02AwlitnuiN2clMj9wzw+RTKMTXwSa9IZ0=
+SIZE (gnupg-2.4.3.tar.bz2) = 7351327
Index: patches/patch-agent_protect_c
===================================================================
RCS file: /cvs/ports/security/gnupg/patches/patch-agent_protect_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-agent_protect_c
--- patches/patch-agent_protect_c 11 Mar 2022 19:53:24 -0000 1.2
+++ patches/patch-agent_protect_c 5 Jul 2023 15:49:08 -0000
@@ -1,7 +1,7 @@
Index: agent/protect.c
--- agent/protect.c.orig
+++ agent/protect.c
-@@ -563,24 +563,47 @@ do_encryption (const unsigned char *hashbegin, size_t
+@@ -513,24 +513,47 @@ do_encryption (const unsigned char *hashbegin, size_t
and dummy values as placeholders. */
{
char countbuf[35];
@@ -14,7 +14,7 @@ Index: agent/protect.c
- (int)strlen (modestr), modestr,
- &saltpos,
- (unsigned int)strlen (countbuf), countbuf,
-- use_ocb? 12 : blklen, &ivpos, use_ocb? 12 : blklen, "",
+- 12, &ivpos, 12, "",
- enclen, &encpos, enclen, "");
+
+#define FMT1 "(9:protected%d:%s((4:sha18:"
@@ -27,12 +27,12 @@ Index: agent/protect.c
+ saltpos = strlen(p1);
+
+ p2 = xtryasprintf (FMT2, (unsigned int)strlen (countbuf), countbuf,
-+ use_ocb? 12 : blklen);
++ 12);
+ if (!p2)
+ goto fail;
+ ivpos = saltpos + strlen(p2);
+
-+ p3 = xtryasprintf (FMT3, use_ocb? 12 : blklen, "", enclen);
++ p3 = xtryasprintf (FMT3, 12, "", enclen);
+ if (!p3)
+ goto fail;
+ encpos = ivpos + strlen(p3);
Index: patches/patch-dirmngr_server_c
===================================================================
RCS file: patches/patch-dirmngr_server_c
diff -N patches/patch-dirmngr_server_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-dirmngr_server_c 5 Jul 2023 15:49:08 -0000
@@ -0,0 +1,17 @@
+https://dev.gnupg.org/rG9ae3cfcabec9252c22d67b7a15c36f0a8cf22f0f
+dirmngr: Enable the call of ks_ldap_help_variables when USE_LDAP.
+9ae3cfcabec9
+
+Index: dirmngr/server.c
+--- dirmngr/server.c.orig
++++ dirmngr/server.c
+@@ -2776,7 +2776,9 @@ cmd_ad_query (assuan_context_t ctx, char *line)
+
+ if (opt_help)
+ {
++#if USE_LDAP
+ ks_ldap_help_variables (ctrl);
++#endif
+ err = 0;
+ goto leave;
+ }
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 30 Aug 2022 17:27:32 -0000 1.13
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-
-Don't use --css-ref (not supported by base texinfo)
-
-Index: doc/Makefile.in
---- doc/Makefile.in.orig
-+++ doc/Makefile.in
-@@ -527,7 +527,7 @@ gnupg_TEXINFOS = \
- howtos.texi howto-create-a-server-cert.texi
-
- DVIPS = TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" dvips
--AM_MAKEINFOFLAGS = -I $(srcdir) --css-ref=/share/site.css
-+AM_MAKEINFOFLAGS = -I $(srcdir)
- YAT2M_OPTIONS = -I $(srcdir) \
- --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.2"
-
Index: patches/patch-g10_keylist_c
===================================================================
RCS file: /cvs/ports/security/gnupg/patches/patch-g10_keylist_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-g10_keylist_c
--- patches/patch-g10_keylist_c 11 Mar 2022 19:53:24 -0000 1.2
+++ patches/patch-g10_keylist_c 5 Jul 2023 15:49:08 -0000
@@ -1,7 +1,7 @@
Index: g10/keylist.c
--- g10/keylist.c.orig
+++ g10/keylist.c
-@@ -255,12 +255,11 @@ print_card_key_info (estream_t fp, kbnode_t keyblock)
+@@ -329,12 +329,11 @@ print_card_key_info (estream_t fp, kbnode_t keyblock)
else
s2k_char = '#'; /* Key not found. */
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/gnupg/pkg/PLIST,v
retrieving revision 1.37
diff -u -p -r1.37 PLIST
--- pkg/PLIST 30 Aug 2022 17:27:32 -0000 1.37
+++ pkg/PLIST 5 Jul 2023 15:49:08 -0000
@@ -5,7 +5,9 @@
@bin bin/dirmngr-client
@bin bin/gpg
@bin bin/gpg-agent
+@bin bin/gpg-card
@bin bin/gpg-connect-agent
+@bin bin/gpg-wks-client
@bin bin/gpg-wks-server
@bin bin/gpgconf
@bin bin/gpgparsemail
@@ -17,13 +19,17 @@
@bin bin/kbxutil
@bin bin/watchgnupg
@info info/gnupg.info
+@bin libexec/gpg-auth
@bin libexec/gpg-check-pattern
+@bin libexec/gpg-pair-tool
@bin libexec/gpg-preset-passphrase
@bin libexec/gpg-protect-tool
-@bin libexec/gpg-wks-client
+libexec/gpg-wks-client
+@bin libexec/keyboxd
@bin libexec/scdaemon
@man man/man1/dirmngr-client.1
@man man/man1/gpg-agent.1
+@man man/man1/gpg-card.1
@man man/man1/gpg-check-pattern.1
@man man/man1/gpg-connect-agent.1
@man man/man1/gpg-preset-passphrase.1
@@ -53,13 +59,12 @@ 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/common.conf
share/doc/gnupg/examples/gpgconf.conf
share/doc/gnupg/examples/gpgconf.rnames
share/doc/gnupg/examples/pwpattern.list
+share/doc/gnupg/examples/qualified.txt
share/doc/gnupg/examples/scd-event
share/doc/gnupg/examples/trustlist.txt
share/doc/pkg-readmes/${PKGSTEM}
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
