CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 29 10:03:12 UTC 2026

Modified Files:
        pkgsrc/misc/libreoffice: Makefile
        pkgsrc/security/git-secret: Makefile
        pkgsrc/security/gpgme: buildlink3.mk options.mk
        pkgsrc/security/p5-GnuPG-Interface: options.mk
        pkgsrc/security/py-gnupg: Makefile
        pkgsrc/sysutils/duplicity: Makefile
        pkgsrc/sysutils/yadm: options.mk

Log Message:
*: allow gnupg2 version 2.4.9nb2 for the renamed binaries


To generate a diff of this commit:
cvs rdiff -u -r1.377 -r1.378 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/git-secret/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/security/gpgme/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/gpgme/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/p5-GnuPG-Interface/options.mk
cvs rdiff -u -r1.44 -r1.45 pkgsrc/security/py-gnupg/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/sysutils/duplicity/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/yadm/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/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.377 pkgsrc/misc/libreoffice/Makefile:1.378
--- pkgsrc/misc/libreoffice/Makefile:1.377      Wed Jan 28 10:48:09 2026
+++ pkgsrc/misc/libreoffice/Makefile    Thu Jan 29 10:03:11 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.377 2026/01/28 10:48:09 wiz Exp $
+# $NetBSD: Makefile,v 1.378 2026/01/29 10:03:11 wiz Exp $
 
 VERREL=                25.8.4
 VERRC=         2
@@ -179,7 +179,7 @@ WRKSRC=             ${WRKDIR}/${LO_BOOTSTRAP}
 
 TOOL_DEPENDS+=         p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
 DEPENDS+=              xdg-utils-[0-9]*:../../misc/xdg-utils
-DEPENDS+=              gnupg2>=2.5:../../security/gnupg2
+DEPENDS+=              gnupg2>=2.4.9nb2:../../security/gnupg2
 
 USE_LIBTOOL=           yes
 # Use GNU find from findutils.

Index: pkgsrc/security/git-secret/Makefile
diff -u pkgsrc/security/git-secret/Makefile:1.2 pkgsrc/security/git-secret/Makefile:1.3
--- pkgsrc/security/git-secret/Makefile:1.2     Wed Jan 28 10:48:48 2026
+++ pkgsrc/security/git-secret/Makefile Thu Jan 29 10:03:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2026/01/28 10:48:48 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2026/01/29 10:03:12 wiz Exp $
 
 DISTNAME=      git-secret-0.5.0
 PKGREVISION=   1
@@ -13,7 +13,7 @@ LICENSE=      mit
 
 DEPENDS+=      gawk-[0-9]*:../../lang/gawk
 DEPENDS+=      git-base-[0-9]*:../../devel/git-base
-DEPENDS+=      gnupg2>=2.5:../../security/gnupg2
+DEPENDS+=      gnupg2>=2.4.9nb2:../../security/gnupg2
 
 USE_TOOLS+=    bash:run
 

Index: pkgsrc/security/gpgme/buildlink3.mk
diff -u pkgsrc/security/gpgme/buildlink3.mk:1.36 pkgsrc/security/gpgme/buildlink3.mk:1.37
--- pkgsrc/security/gpgme/buildlink3.mk:1.36    Wed Jan 28 10:50:49 2026
+++ pkgsrc/security/gpgme/buildlink3.mk Thu Jan 29 10:03:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2026/01/28 10:50:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2026/01/29 10:03:12 wiz Exp $
 
 BUILDLINK_TREE+=       gpgme
 
@@ -18,7 +18,7 @@ pkgbase:=             gpgme
 .include "../../mk/pkg-build-options.mk"
 
 .if ${PKG_BUILD_OPTIONS.gpgme:Mgnupg2}
-DEPENDS+=              gnupg2>=2.5:../../security/gnupg2
+DEPENDS+=              gnupg2>=2.4.9nb2:../../security/gnupg2
 GPGME_GPG=             ${PREFIX}/bin/gpg
 .else
 DEPENDS+=              gnupg>=1.4.23nb28:../../security/gnupg

Index: pkgsrc/security/gpgme/options.mk
diff -u pkgsrc/security/gpgme/options.mk:1.13 pkgsrc/security/gpgme/options.mk:1.14
--- pkgsrc/security/gpgme/options.mk:1.13       Wed Jan 28 10:50:49 2026
+++ pkgsrc/security/gpgme/options.mk    Thu Jan 29 10:03:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2026/01/28 10:50:49 wiz Exp $
+# $NetBSD: options.mk,v 1.14 2026/01/29 10:03:12 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.gpgme
 PKG_OPTIONS_REQUIRED_GROUPS=   gnupg
@@ -8,8 +8,9 @@ PKG_SUGGESTED_OPTIONS=          gnupg2
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnupg2)
-DEPENDS+=              gnupg2>=2.5:../../security/gnupg2
+DEPENDS+=              gnupg2>=2.4.9nb2:../../security/gnupg2
 REPLACE_SH+=           tests/gpg/pinentry
+GPG_DEFAULT=           ${PREFIX}/bin/gpg
 MAKE_FLAGS+=           GPG=${GPG_DEFAULT}
 .else
 DEPENDS+=              gnupg>=1.4.23nb28:../../security/gnupg

Index: pkgsrc/security/p5-GnuPG-Interface/options.mk
diff -u pkgsrc/security/p5-GnuPG-Interface/options.mk:1.8 pkgsrc/security/p5-GnuPG-Interface/options.mk:1.9
--- pkgsrc/security/p5-GnuPG-Interface/options.mk:1.8   Wed Jan 28 10:52:27 2026
+++ pkgsrc/security/p5-GnuPG-Interface/options.mk       Thu Jan 29 10:03:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2026/01/28 10:52:27 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2026/01/29 10:03:12 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.p5_GnuPG_Interface
 PKG_OPTIONS_REQUIRED_GROUPS=   gnupg
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=          gnupg2
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnupg2)
-DEPENDS+=              gnupg2>=2.5:../../security/gnupg2
+DEPENDS+=              gnupg2>=2.4.9nb2:../../security/gnupg2
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnupg1)

Index: pkgsrc/security/py-gnupg/Makefile
diff -u pkgsrc/security/py-gnupg/Makefile:1.44 pkgsrc/security/py-gnupg/Makefile:1.45
--- pkgsrc/security/py-gnupg/Makefile:1.44      Wed Jan 28 10:43:31 2026
+++ pkgsrc/security/py-gnupg/Makefile   Thu Jan 29 10:03:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2026/01/28 10:43:31 adam Exp $
+# $NetBSD: Makefile,v 1.45 2026/01/29 10:03:12 wiz Exp $
 
 DISTNAME=      python_gnupg-0.5.6
 PKGREVISION=   1
@@ -14,7 +14,7 @@ LICENSE=      modified-bsd
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/_/-/}
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools
-DEPENDS+=      gnupg2>=2.5.17:../../security/gnupg2
+DEPENDS+=      gnupg2>=2.4.9nb2:../../security/gnupg2
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/sysutils/duplicity/Makefile
diff -u pkgsrc/sysutils/duplicity/Makefile:1.79 pkgsrc/sysutils/duplicity/Makefile:1.80
--- pkgsrc/sysutils/duplicity/Makefile:1.79     Wed Jan 28 10:53:53 2026
+++ pkgsrc/sysutils/duplicity/Makefile  Thu Jan 29 10:03:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2026/01/28 10:53:53 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2026/01/29 10:03:12 wiz Exp $
 
 DISTNAME=      duplicity-3.0.7
 PKGREVISION=   1
@@ -16,7 +16,7 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-setuptools
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=5.0.2:../../devel/py-setuptools_scm
 DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
 
-DEPENDS+=      gnupg2>=2.5:../../security/gnupg2
+DEPENDS+=      gnupg2>=2.4.9nb2:../../security/gnupg2
 DEPENDS+=      lftp-[0-9]*:../../net/lftp
 DEPENDS+=      ${PYPKGPREFIX}-boto3-[0-9]*:../../net/py-boto3
 DEPENDS+=      ${PYPKGPREFIX}-botocore-[0-9]*:../../net/py-botocore

Index: pkgsrc/sysutils/yadm/options.mk
diff -u pkgsrc/sysutils/yadm/options.mk:1.2 pkgsrc/sysutils/yadm/options.mk:1.3
--- pkgsrc/sysutils/yadm/options.mk:1.2 Wed Jan 28 10:54:37 2026
+++ pkgsrc/sysutils/yadm/options.mk     Thu Jan 29 10:03:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2026/01/28 10:54:37 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2026/01/29 10:03:12 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.yadm
 PKG_SUPPORTED_OPTIONS= openssl
@@ -27,7 +27,7 @@ DEPENDS+=     gnupg>=1.4.23nb28:../../securi
 YADM_PROGS+=   GPG_PROGRAM="${PREFIX}/bin/gpg1"
 
 .elif !empty(PKG_OPTIONS:Mgnupg2)
-DEPENDS+=      gnupg2>=2.5:../../security/gnupg2
+DEPENDS+=      gnupg2>=2.4.9nb2:../../security/gnupg2
 YADM_PROGS+=   GPG_PROGRAM="${PREFIX}/bin/gpg"
 
 .else