CVS commit: pkgsrc/security/gnupg

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 28 09:28:12 UTC 2026

Modified Files:
        pkgsrc/security/gnupg: DESCR Makefile PLIST options.mk

Log Message:
gnupg: install binaries with '1' suffix

update DESCR to note that this is the old, unsupported version
Remove readline option since readline/bl3.mk is included unconditionally
in the Makefile anyway.
Clean some pkglint.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/gnupg/DESCR
cvs rdiff -u -r1.176 -r1.177 pkgsrc/security/gnupg/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/security/gnupg/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/gnupg/options.mk

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

Modified files:

Index: pkgsrc/security/gnupg/DESCR
diff -u pkgsrc/security/gnupg/DESCR:1.2 pkgsrc/security/gnupg/DESCR:1.3
--- pkgsrc/security/gnupg/DESCR:1.2     Sat Feb  9 15:49:55 2013
+++ pkgsrc/security/gnupg/DESCR Wed Jan 28 09:28:12 2026
@@ -1,4 +1,11 @@
-GNU Privacy Guard
+GnuPG is GNU's tool for secure communication and data storage. It
+can be used to encrypt data and to create digital signatures. It
+includes an advanced key management facility and is compliant with
+the proposed OpenPGP Internet standard as described in RFC 4880.
 
-GnuPG is a complete and free replacement for PGP. GnuPG is nearly in
-compliance with RFC2440 (OpenPGP).
+The gnupg1 package provides GnuPG 1.4, the "classic" standalone,
+non-modularized version. It is provided mainly for people with the
+need to use archaic cryptographic objects like PGPv3 keys to access
+archived messages. It does not support more recent cryptographic
+primitives like ECDSA or EdDSA. Please use the gnupg2 package instead
+unless you know for sure that you need GnuPG 1.x.

Index: pkgsrc/security/gnupg/Makefile
diff -u pkgsrc/security/gnupg/Makefile:1.176 pkgsrc/security/gnupg/Makefile:1.177
--- pkgsrc/security/gnupg/Makefile:1.176        Wed Jan  7 08:48:39 2026
+++ pkgsrc/security/gnupg/Makefile      Wed Jan 28 09:28:12 2026
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.176 2026/01/07 08:48:39 wiz Exp $
+# $NetBSD: Makefile,v 1.177 2026/01/28 09:28:12 wiz Exp $
 
 DISTNAME=      gnupg-1.4.23
-PKGREVISION=   27
+PKGREVISION=   28
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GNUPG:=gnupg/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.gnupg.org/
-COMMENT=       GNU Privacy Guard, public-Key encryption and digital signatures
+COMMENT=       GNU Privacy Guard, public-Key encryption and digital signatures (old 1.x branch)
 LICENSE=       gnu-gpl-v3
 
 GNU_CONFIGURE=         yes
@@ -17,6 +17,7 @@ USE_TOOLS+=           gmake msgfmt
 CONFIGURE_ARGS+=       --with-mailprog=/usr/sbin/sendmail
 TEST_TARGET=           check
 INFO_FILES=            yes
+CONFIGURE_ARGS+=       --program-suffix=1
 
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 
@@ -33,13 +34,15 @@ CONFIGURE_ARGS+=    --disable-asm
 CONFIGURE_ARGS+=       --disable-asm
 .endif
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if ${USE_CROSS_COMPILE:U:tl} == yes
 CONFIGURE_ENV+=                CC_FOR_BUILD=${NATIVE_CC:Q}
 .endif
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/doc/DETAILS \
            ${DESTDIR}${PREFIX}/share/gnupg
+       ${MV} ${DESTDIR}${PREFIX}/share/gnupg \
+           ${DESTDIR}${PREFIX}/share/gnupg1
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/security/gnupg/PLIST
diff -u pkgsrc/security/gnupg/PLIST:1.29 pkgsrc/security/gnupg/PLIST:1.30
--- pkgsrc/security/gnupg/PLIST:1.29    Mon Sep  7 13:08:28 2020
+++ pkgsrc/security/gnupg/PLIST Wed Jan 28 09:28:12 2026
@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.29 2020/09/07 13:08:28 gdt Exp $
-bin/gpg
-bin/gpg-zip
-bin/gpgv
+@comment $NetBSD: PLIST,v 1.30 2026/01/28 09:28:12 wiz Exp $
+bin/gpg-zip1
+bin/gpg1
+bin/gpgv1
 info/gnupg1.info
-libexec/gnupg/gpgkeys_curl
-libexec/gnupg/gpgkeys_finger
-libexec/gnupg/gpgkeys_hkp
-${PLIST.ldap}libexec/gnupg/gpgkeys_ldap
-man/man1/gpg-zip.1
-man/man1/gpg.1
-man/man1/gpgv.1
-share/gnupg/DETAILS
-share/gnupg/FAQ
-share/gnupg/options.skel
+libexec/gnupg/gpgkeys_curl1
+libexec/gnupg/gpgkeys_finger1
+libexec/gnupg/gpgkeys_hkp1
+${PLIST.ldap}libexec/gnupg/gpgkeys_ldap1
+man/man1/gpg-zip1.1
+man/man1/gpg1.1
+man/man1/gpgv1.1
+share/gnupg1/DETAILS
+share/gnupg1/FAQ
+share/gnupg1/options.skel
 share/locale/be/LC_MESSAGES/gnupg.mo
 share/locale/ca/LC_MESSAGES/gnupg.mo
 share/locale/cs/LC_MESSAGES/gnupg.mo

Index: pkgsrc/security/gnupg/options.mk
diff -u pkgsrc/security/gnupg/options.mk:1.17 pkgsrc/security/gnupg/options.mk:1.18
--- pkgsrc/security/gnupg/options.mk:1.17       Mon Jul 15 02:02:27 2013
+++ pkgsrc/security/gnupg/options.mk    Wed Jan 28 09:28:12 2026
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.17 2013/07/15 02:02:27 ryoon Exp $
+# $NetBSD: options.mk,v 1.18 2026/01/28 09:28:12 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnupg
-PKG_SUPPORTED_OPTIONS= curl ldap readline
+PKG_SUPPORTED_OPTIONS= curl ldap
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH:Mi386}
+.if ${MACHINE_ARCH} == i386
 PKG_SUPPORTED_OPTIONS+=        i586-optimized
 .endif
 
-.if ${MACHINE_ARCH:Mm68k}
+.if ${MACHINE_ARCH} == m68k
 PKG_SUPPORTED_OPTIONS+=        m68060-optimized
 .endif
 
@@ -40,10 +40,3 @@ CONFIGURE_ARGS+=     --disable-ldap
 CONFIGURE_ENV+=                M68060=${M68060:Q}
 CFLAGS+=               -m68060
 .endif
-
-.if !empty(PKG_OPTIONS:Mreadline)
-.include "../../devel/readline/buildlink3.mk"
-CONFIGURE_ARGS+=  --with-readline=${BUILDLINK_PREFIX.readline}
-.else
-CONFIGURE_ARGS+=       --without-readline
-.endif