CVS commit: pkgsrc/security/gnupg2

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Oct 29 15:25:58 UTC 2024

Modified Files:
        pkgsrc/security/gnupg2: Makefile PLIST distinfo
Added Files:
        pkgsrc/security/gnupg2/patches: patch-doc_Makefile.in

Log Message:
security/gnupg2: Update to 2.4.6

* Update MASTER_SITES.
* Mark MAKE_JOBS_SAFE=no because yat2m-stamp target in doc directory fails.
* Handle --enable-gpg-is-gpg2 case for man pages.

Changelog:
Noteworthy changes in version 2.4.6
===================================

  * gpg: New command --quick-set-ownertrust.  [rG967678d972]

  * gpg: Indicate disabled keys in key listings and add list option
    "show-ownertrust".  [rG2a0a706eb2]

  * gpg: Make sure a DECRYPTION_OKAY is never issued for a bad OCB
    tag.  [T7042]

  * gpg: Do not allow to accidently set the RENC usage.  [T7072]

  * gpg: Accept armored files without CRC24 checksum.  [T7071]

  * gpg: New --import-option "only-pubkeys".  [T7146]

  * gpg: Repurpose the AKL mechanism "ldap" to work like the keyserver
    mechnism but only for LDAP keyservers.  [rG6551281ca3]

  * gpg: ADSKs are now configurable for new keys.  [T6882]

  * gpg: New option --proc-all-sigs.  [T7261]

  * gpg: Fix a wrong decryption failed status for signed and OCB
    encrypted messages without a signature verification key.  [T7042]

  * gpg: Make --no-literal work again for -c and --store.  [T5852]

  * gpg: Fix getting key by IPGP.  [T7288]

  * gpg: Validate the trustdb after the import of a trusted key.
    [T7200]

  * gpg: Exclude expired trusted keys from the key validation process.
    [T7200]

  * gpgsm: New option --assert-signer.  [T7286]

  * gpgsm: Emit user IDs with an empty Subject also in colon mode.
    [T7171]

  * keyboxd: Fix a race condition on the database handle.  [T7294]

  * agent: Consider an empty pattern file as valid.  [rGc27534de95]

  * agent: Fix error handling of READKEY.  [T6012]

  * agent: Avoid random errors when storing key in ephemeral mode.
    [T7129, rG19d93a239d]

  * agent: Make "SCD DEVINFO --watch" more robust.  [T7151]

  * agent: Fix detection of the yet unused trustflag de-vs.  [T5079]

  * scd: Improve KDF data object handling for OpenPGP cards.  [T7058]

  * scd: Avoid buffer overrun with more than 16 PC/SC readers.
    [T7129, rG524e3a9345]

  * scd: Fix how the scdaemon on its pipe connection finishes.
    [T7160]

  * gpgconf: Check readability of some files with -X and change its
    output format.  [rG759adb2493]

  * gpg-mail-tube: New tool to apply PGP/MIME encryption to a mail.
    [rGa564a9f66c]

  * Fix a race condition in creating the socket directory.  [T7332]

  * Fix some uninitialized variables and double frees in error code
    paths.  [T7129]


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 pkgsrc/security/gnupg2/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/gnupg2/PLIST
cvs rdiff -u -r1.86 -r1.87 pkgsrc/security/gnupg2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/gnupg2/patches/patch-doc_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/gnupg2/Makefile
diff -u pkgsrc/security/gnupg2/Makefile:1.155 pkgsrc/security/gnupg2/Makefile:1.156
--- pkgsrc/security/gnupg2/Makefile:1.155       Fri Aug  9 09:42:33 2024
+++ pkgsrc/security/gnupg2/Makefile     Tue Oct 29 15:25:58 2024
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.155 2024/08/09 09:42:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.156 2024/10/29 15:25:58 ryoon Exp $
 
-DISTNAME=      gnupg-2.4.5
+DISTNAME=      gnupg-2.4.6
 PKGNAME=       ${DISTNAME:S/gnupg-/gnupg2-/}
-PKGREVISION=   3
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gnupg/
+MASTER_SITES=  https://gnupg.org/ftp/gcrypt/gnupg/
 MASTER_SITES+= http://mirrors.dotsrc.org/gcrypt/gnupg/
 EXTRACT_SUFX=  .tar.bz2
 
@@ -18,6 +17,8 @@ DEPENDS+=     pinentry-[0-9]*:../../security
 CONFLICTS+=    dirmngr-[0-9]*
 SUPERSEDES+=   dirmngr-[0-9]*
 
+MAKE_JOBS_SAFE=                no # yat2m-stamp target in docs directory
+
 BUILD_DEFS+=           VARBASE
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            pkg-config makeinfo

Index: pkgsrc/security/gnupg2/PLIST
diff -u pkgsrc/security/gnupg2/PLIST:1.16 pkgsrc/security/gnupg2/PLIST:1.17
--- pkgsrc/security/gnupg2/PLIST:1.16   Fri Apr 28 16:33:41 2023
+++ pkgsrc/security/gnupg2/PLIST        Tue Oct 29 15:25:58 2024
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.16 2023/04/28 16:33:41 nikita Exp $
+@comment $NetBSD: PLIST,v 1.17 2024/10/29 15:25:58 ryoon Exp $
 ${PLIST.gnutls}bin/dirmngr
 ${PLIST.gnutls}bin/dirmngr-client
 bin/g13
 bin/gpg-agent
 bin/gpg-card
 bin/gpg-connect-agent
+bin/gpg-mail-tube
 bin/gpg-wks-client
 bin/gpg-wks-server
 bin/gpg2
@@ -32,6 +33,7 @@ man/man1/gpg-agent.1
 man/man1/gpg-card.1
 man/man1/gpg-check-pattern.1
 man/man1/gpg-connect-agent.1
+man/man1/gpg-mail-tube.1
 man/man1/gpg-preset-passphrase.1
 man/man1/gpg-wks-client.1
 man/man1/gpg-wks-server.1
@@ -47,6 +49,7 @@ man/man7/gnupg.7
 man/man8/addgnupghome.8
 man/man8/applygnupgdefaults.8
 man/man8/dirmngr.8
+man/manh/gnupg.7.html
 sbin/addgnupghome
 sbin/applygnupgdefaults
 sbin/g13-syshelp
@@ -114,6 +117,7 @@ share/locale/id/LC_MESSAGES/gnupg2.mo
 share/locale/it/LC_MESSAGES/gnupg2.mo
 share/locale/ja/LC_MESSAGES/gnupg2.mo
 share/locale/nb/LC_MESSAGES/gnupg2.mo
+share/locale/nl/LC_MESSAGES/gnupg2.mo
 share/locale/pl/LC_MESSAGES/gnupg2.mo
 share/locale/pt/LC_MESSAGES/gnupg2.mo
 share/locale/ro/LC_MESSAGES/gnupg2.mo

Index: pkgsrc/security/gnupg2/distinfo
diff -u pkgsrc/security/gnupg2/distinfo:1.86 pkgsrc/security/gnupg2/distinfo:1.87
--- pkgsrc/security/gnupg2/distinfo:1.86        Sat Mar  9 07:58:32 2024
+++ pkgsrc/security/gnupg2/distinfo     Tue Oct 29 15:25:58 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.86 2024/03/09 07:58:32 adam Exp $
+$NetBSD: distinfo,v 1.87 2024/10/29 15:25:58 ryoon Exp $
 
-BLAKE2s (gnupg-2.4.5.tar.bz2) = 3fa773e399865165c4814ba7a5a31a98715995ec0c812fcb623eacf4aab26ae8
-SHA512 (gnupg-2.4.5.tar.bz2) = 4d54744f09399c5899144d0cb5fdc2756e45b058db41b9ea9df3be03e80b914509e16ef35aa0248e7561185b80f7a5f9fd6afcab8ccff75ff82ed555448a38ff
-Size (gnupg-2.4.5.tar.bz2) = 7889060 bytes
+BLAKE2s (gnupg-2.4.6.tar.bz2) = 58a2095d27b93331d50402ebacd9054c32667fb873709e8e04db785b83553bcd
+SHA512 (gnupg-2.4.6.tar.bz2) = 192ae6cb18547e9c5fc4263dc968b548c1ce563ceb8cc2e651b264d4e5afa1cd99a2c1cdd80906faf5e0b0ca99cef76e003b1f7e73238f311a74a1de6c35b5cb
+Size (gnupg-2.4.6.tar.bz2) = 8011304 bytes
 SHA1 (patch-common_sysutils.c) = 569c12e21172c1521284922244b2f4f361c945d6
+SHA1 (patch-doc_Makefile.in) = 69bb70932d79e96d11922c9207d6d229695b449d

Added files:

Index: pkgsrc/security/gnupg2/patches/patch-doc_Makefile.in
diff -u /dev/null pkgsrc/security/gnupg2/patches/patch-doc_Makefile.in:1.1
--- /dev/null   Tue Oct 29 15:25:58 2024
+++ pkgsrc/security/gnupg2/patches/patch-doc_Makefile.in        Tue Oct 29 15:25:58 2024
@@ -0,0 +1,30 @@
+$NetBSD: patch-doc_Makefile.in,v 1.1 2024/10/29 15:25:58 ryoon Exp $
+
+* Handle --enable-gpg-is-gpg2 case.
+
+--- doc/Makefile.in.orig       2024-10-29 15:14:22.312728237 +0000
++++ doc/Makefile.in
+@@ -517,18 +517,21 @@ AM_MAKEINFOFLAGS = -I $(srcdir) --css-re
+ YAT2M_OPTIONS = -I $(srcdir) \
+         --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.4"
+ 
++@USE_GPG2_HACK_TRUE@GPG2_SUFFIX = 2
++@USE_GPG2_HACK_FALSE@GPG2_SUFFIX =
++
+ myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
+               dirmngr.texi scdaemon.texi tools.texi wks.texi \
+                 gpg-card.texi
+ 
+-myman_pages = gpg.1 gpgv.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \
++myman_pages = gpg${GPG2_SUFFIX}.1 gpgv${GPG2_SUFFIX}.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \
+                 watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
+               gpg-connect-agent.1 gpgparsemail.1 gpgtar.1 gpg-mail-tube.1 \
+               applygnupgdefaults.8 gpg-wks-client.1 gpg-wks-server.1 \
+               dirmngr-client.1 gpg-card.1 gpg-check-pattern.1
+ 
+ myhtmlman_pages = \
+-                gpg.1.html gpgv.1.html gpgsm.1.html \
++                gpg${GPG2_SUFFIX}.1.html gpgv${GPG2_SUFFIX}.1.html gpgsm.1.html \
+                 gpg-agent.1.html dirmngr.8.html scdaemon.1.html \
+                 watchgnupg.1.html gpgconf.1.html addgnupghome.8.html \
+                 gpg-preset-passphrase.1.html \