Hi,
On Sun, Sep 06, 2020 at 02:33:12AM +0200, Jeremie Courreges-Anglas wrote:
> This doesn't catch everything.
Yeah, I realised shortly after. I think it's because the [^2] part of
the glob doesn't catch cases where the line ends after `security/gnupg`.
I spent a little time trying to figure out the right query, but resorted
to grep.
Interested to know how ajacoutot@'s script works. Does it use a sqlports
query?
> + security/p5-GPG (no consumer, not updated since import in 2001)
^ Shall we kill this one?
> As Edd notes, the migration path for consumer ports may be as easy as
> replacing security/gnupg with security/gnupg2 in BUILD, RUN and
> TEST_DEPENDS, and bump REVISION.
Below is my diff so far. This includes your latest diff to
security/gnupg2. An earlier version of this diff in a mini bulk didn't
break compilation of any of gpg's dependants.
I wasn't sure if we need to add a pkg spec to the updated RUN/BUILD
depends, or just updating the pkg path is sufficient.
`RUN_DEPENDS=gnupg->=2:security/gnupg2` vs. just `RUN_DEPENDS=security/gnupg2`.
We will also need to add a quirk to ensure that gnupg1 updates to
gnupg2 properly.
> Regarding the user migration path, the compat "gpg2" and "gpgv2"
> symlinks could be removed for 6.9, or this could be done post-release.
> I would go with the latter but I don't feel strongly about it.
I'm thinking post-release too. We are bound to encounter breakage, and
it'd be good to limit that to -current if possible.
Assuming the plan is to eventually retire bin/gpg2 in favour of bin/gpg,
we can incrementally fix things whilst the old gpg2 symlink is still
present. I imagine we can discover a fair chunk of breakage by running a
bulk where we've locally removed the symlink.
We should also grep the tree for patches containing `gpg`.
> Of course, runtime tests would be useful, if only to point out old
> software that should have been adapted to work with gnupg-2.X.
This is the part that worries me most. I think to some degree we will be
relying on users to tell us what's broken, as it'll be quite hard to
runtime test all the various modes of operation of the dependant ports.
So does the following diff look like we are heading in the right
direction?
Index: databases/mysql-zrm/Makefile
===================================================================
RCS file: /cvs/ports/databases/mysql-zrm/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- databases/mysql-zrm/Makefile 20 Mar 2020 16:44:22 -0000 1.25
+++ databases/mysql-zrm/Makefile 5 Sep 2020 12:54:28 -0000
@@ -5,7 +5,7 @@ COMMENT = MySQL backup scripts
V = 3.0
DISTNAME = MySQL-zrm-${V}-release
PKGNAME = mysql-zrm-${V}
-REVISION = 1
+REVISION = 2
CATEGORIES = databases perl5
HOMEPAGE = http://www.zmanda.com/
@@ -19,7 +19,7 @@ MASTER_SITES = http://www.zmanda.com/dow
RUN_DEPENDS = archivers/gtar \
databases/p5-DBD-mysql \
- security/gnupg \
+ security/gnupg2 \
textproc/p5-XML-RSS
WRKDIST = ${WRKDIR}
Index: mail/mailpile/Makefile
===================================================================
RCS file: /cvs/ports/mail/mailpile/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- mail/mailpile/Makefile 2 Oct 2019 08:16:33 -0000 1.13
+++ mail/mailpile/Makefile 5 Sep 2020 12:57:49 -0000
@@ -5,7 +5,7 @@ PKGNAME = ${DISTNAME:L}
GH_ACCOUNT = mailpile
GH_PROJECT = Mailpile
GH_TAGNAME = 1.0.0rc6
-REVISION=2
+REVISION=3
HOMEPAGE = https://www.mailpile.is/
@@ -25,7 +25,7 @@ RUN_DEPENDS = devel/py-appdirs \
devel/py-six \
net/py-idna \
security/py-asn1crypto \
- security/gnupg \
+ security/gnupg2 \
security/py-cryptodome \
security/py-cryptography \
security/py-pgpdump \
Index: mail/mutt/Makefile
===================================================================
RCS file: /cvs/ports/mail/mutt/Makefile,v
retrieving revision 1.140
diff -u -p -r1.140 Makefile
--- mail/mutt/Makefile 31 Aug 2020 16:52:03 -0000 1.140
+++ mail/mutt/Makefile 5 Sep 2020 15:11:05 -0000
@@ -4,6 +4,7 @@ COMMENT= tty-based e-mail client
DISTNAME= mutt-1.14.7
EPOCH= 3
+REVISION = 0
CATEGORIES= mail
HOMEPAGE= http://www.mutt.org/
@@ -97,7 +98,7 @@ post-install:
mv -f ${PREFIX}/share/doc/mutt/samples/* ${PREFIX}/share/examples/mutt
cd ${PREFIX}/share/examples/mutt; \
chmod +x *.sh *.pl mutt_xtitle markdown2html
- sed -i -e 's,gpg ,${LOCALBASE}/bin/gpg2 ,' \
+ sed -i -e 's,gpg ,${LOCALBASE}/bin/gpg ,' \
${PREFIX}/share/examples/mutt/gpg.rc
.include <bsd.port.mk>
Index: mail/p5-Mail-SpamAssassin/Makefile
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.115
diff -u -p -r1.115 Makefile
--- mail/p5-Mail-SpamAssassin/Makefile 30 Jan 2020 07:54:00 -0000 1.115
+++ mail/p5-Mail-SpamAssassin/Makefile 5 Sep 2020 12:54:57 -0000
@@ -3,6 +3,7 @@
COMMENT= mailfilter to identify and mark spam
VER= 3.4.4
+REVISION = 0
DISTNAME= Mail-SpamAssassin-${VER}
PKGNAME= p5-${DISTNAME}
RULESNAME= Mail-SpamAssassin-rules-${VER}.r1873061.tgz
@@ -39,7 +40,7 @@ RUN_DEPENDS= ${COMMON_DEPENDS} \
p5-GeoIP2-*|p5-IP-Country-DB_File-*|p5-IP-Country-*:net/p5-GeoIP2 \
net/p5-Net-LibIDN \
net/p5-Net-Patricia \
- security/gnupg \
+ security/gnupg2 \
textproc/p5-Encode-Detect \
curl-*|p5-libwww-*:net/curl \
www/p5-HTTP-Date
Index: mail/pine-pgp-filters/Makefile
===================================================================
RCS file: /cvs/ports/mail/pine-pgp-filters/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- mail/pine-pgp-filters/Makefile 12 Jul 2019 20:47:36 -0000 1.10
+++ mail/pine-pgp-filters/Makefile 5 Sep 2020 15:10:01 -0000
@@ -3,7 +3,7 @@
COMMENT= simple shell based filters to use GnuPG within (Al)Pine
DISTNAME= pine-pgp-filters-1.8
-REVISION= 3
+REVISION= 4
CATEGORIES= mail security
HOMEPAGE= http://dougbarton.us/PGP/ppf/index.html
@@ -13,8 +13,8 @@ PERMIT_PACKAGE= Yes
MASTER_SITES= http://dougbarton.us/PGP/ppf/
-BUILD_DEPENDS= security/gnupg
-RUN_DEPENDS= security/gnupg \
+BUILD_DEPENDS= security/gnupg2
+RUN_DEPENDS= security/gnupg2 \
mail/alpine,-main
CONFIGURE_STYLE=simple
Index: net/py-slixmpp/Makefile
===================================================================
RCS file: /cvs/ports/net/py-slixmpp/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- net/py-slixmpp/Makefile 11 Jul 2020 06:49:49 -0000 1.19
+++ net/py-slixmpp/Makefile 5 Sep 2020 13:02:25 -0000
@@ -26,6 +26,6 @@ RUN_DEPENDS = devel/py-asn1${MODPY_FLAV
devel/py-asn1-modules${MODPY_FLAVOR} \
net/py-aiodns${MODPY_FLAVOR} \
www/py-aiohttp
-TEST_DEPENDS = security/gnupg
+TEST_DEPENDS = security/gnupg2
.include <bsd.port.mk>
Index: security/clamav-unofficial-sigs/Makefile
===================================================================
RCS file: /cvs/ports/security/clamav-unofficial-sigs/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- security/clamav-unofficial-sigs/Makefile 12 Jul 2019 21:15:35 -0000
1.16
+++ security/clamav-unofficial-sigs/Makefile 5 Sep 2020 12:59:33 -0000
@@ -3,7 +3,7 @@
COMMENT = fetch and update unofficial signatures for ClamAV
V = 4.9.2
-REVISION = 2
+REVISION = 3
DISTNAME = clamav-unofficial-sigs-$V
DISTFILES = ${DISTNAME}{$V}.tar.gz
@@ -19,7 +19,7 @@ MASTER_SITES = https://github.com/extrem
RUN_DEPENDS = net/curl \
net/rsync \
security/clamav \
- security/gnupg \
+ security/gnupg2 \
shells/bash
NO_BUILD = Yes
Index: security/fwknop/Makefile
===================================================================
RCS file: /cvs/ports/security/fwknop/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- security/fwknop/Makefile 12 Jul 2019 20:49:02 -0000 1.6
+++ security/fwknop/Makefile 5 Sep 2020 12:55:22 -0000
@@ -3,7 +3,7 @@
COMMENT = firewall knock operator
DISTNAME = fwknop-2.6.10
-REVISION = 0
+REVISION = 1
SHARED_LIBS += fko 0.0 # 3.0
@@ -21,9 +21,9 @@ WANTLIB += assuan c gpg-error gpgme icon
MASTER_SITES = https://www.cipherdyne.org/fwknop/download/
BUILD_DEPENDS = net/wget \
- security/gnupg
+ security/gnupg2
RUN_DEPENDS = net/wget \
- security/gnupg
+ security/gnupg2
LIB_DEPENDS = devel/gettext,-runtime \
security/gpgme
Index: security/gnupg/Makefile
===================================================================
RCS file: security/gnupg/Makefile
diff -N security/gnupg/Makefile
--- security/gnupg/Makefile 5 Jul 2020 09:40:19 -0000 1.117
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,73 +0,0 @@
-# $OpenBSD: Makefile,v 1.117 2020/07/05 09:40:19 jca Exp $
-
-COMMENT= GNU privacy guard - a free PGP replacement
-
-DISTNAME= gnupg-1.4.23
-REVISION= 4
-CATEGORIES= security
-
-# restrict, not compatible with gnupg-2.
-PKGSPEC = gnupg-<2
-
-MASTER_SITES= ${MASTER_SITE_GNUPG:=gnupg/}
-
-HOMEPAGE= https://www.gnupg.org/
-
-# GPLv3
-PERMIT_PACKAGE= Yes
-
-WANTLIB += bz2 c crypto curses curl iconv intl nghttp2 readline ssl z
-
-LIB_DEPENDS= archivers/bzip2 \
- devel/gettext,-runtime \
- net/curl
-
-CONFIGURE_STYLE= gnu
-MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/scripts
-CONFIGURE_ARGS+= --disable-gnupg-iconv
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_FLAGS= LIBINTL="-L${LOCALBASE}/lib -lintl -liconv" \
- LIBICONV="-L${LOCALBASE}/lib -liconv"
-
-FLAVORS= card ldap
-FLAVOR?=
-
-.if ${FLAVOR:Mcard}
-LIB_DEPENDS+= devel/libusb-compat
-WANTLIB += usb
-.else
-CONFIGURE_ARGS+= --disable-card-support --without-libusb
-.endif
-
-.if ${FLAVOR:Mldap}
-CONFIGURE_ARGS+= --enable-ldap
-LIB_DEPENDS+= databases/openldap
-WANTLIB += ldap>=8
-.else
-CONFIGURE_ARGS+= --disable-ldap
-.endif
-
-
-GNUPGDOCFILES= README AUTHORS COPYING THANKS TODO BUGS \
- doc/DETAILS doc/FAQ doc/OpenPGP doc/HACKING
-
-.include <bsd.port.arch.mk>
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "mips64" || \
- ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "powerpc") \
- && ${PROPERTIES:Mclang}
-CFLAGS += -fheinous-gnu-extensions
-.endif
-
-.if ${MACHINE_ARCH} == "hppa"
-pre-configure:
- # mpi/hppa1.1/udiv-qrnnd.S is not PIE-safe
- mv ${WRKSRC}/mpi/hppa/udiv-qrnnd.S ${WRKSRC}/mpi/hppa1.1/
-.endif
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnupg
- cd ${WRKSRC}; ${INSTALL_DATA} ${GNUPGDOCFILES} \
- ${PREFIX}/share/doc/gnupg
-
-.include <bsd.port.mk>
Index: security/gnupg/distinfo
===================================================================
RCS file: security/gnupg/distinfo
diff -N security/gnupg/distinfo
--- security/gnupg/distinfo 13 Jun 2018 06:20:01 -0000 1.32
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-SHA256 (gnupg-1.4.23.tar.gz) = R9kgsK0Jm9yf/G4bNjK/YXN8Iv1todqZRCmvHF+pURo=
-SIZE (gnupg-1.4.23.tar.gz) = 5218622
Index: security/gnupg/patches/patch-cipher_Makefile_in
===================================================================
RCS file: security/gnupg/patches/patch-cipher_Makefile_in
diff -N security/gnupg/patches/patch-cipher_Makefile_in
--- security/gnupg/patches/patch-cipher_Makefile_in 19 Oct 2017 16:36:04
-0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-cipher_Makefile_in,v 1.12 2017/10/19 16:36:04 jca Exp $
-Index: cipher/Makefile.in
---- cipher/Makefile.in.orig
-+++ cipher/Makefile.in
-@@ -401,7 +401,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--AM_CPPFLAGS = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl \
-+AM_CPPFLAGS = -I.. -I$(top_srcdir)/include \
- -I$(top_srcdir)/mpi -I../mpi $(am__append_1)
- noinst_LIBRARIES = libcipher.a
- libcipher_a_SOURCES = cipher.c pubkey.c md.c dynload.c bithelp.h des.c \
Index: security/gnupg/patches/patch-doc_Makefile_in
===================================================================
RCS file: security/gnupg/patches/patch-doc_Makefile_in
diff -N security/gnupg/patches/patch-doc_Makefile_in
--- security/gnupg/patches/patch-doc_Makefile_in 1 Mar 2015 12:12:54
-0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.10 2015/03/01 12:12:54 jca Exp $
---- doc/Makefile.in.orig Fri Feb 27 09:37:51 2015
-+++ doc/Makefile.in Fri Feb 27 22:39:17 2015
-@@ -422,7 +422,7 @@ gnupg1_TEXINFOS = gnupg1.texi
-
- # Need this to avoid building of dvis with automake 1.4
- DVIS =
--pkgdata_DATA = FAQ
-+#pkgdata_DATA = FAQ
-
- # we can't add gpg.texi gpgv.texi here because automake does not like them to
- # be built files.
Index: security/gnupg/patches/patch-g10_Makefile_in
===================================================================
RCS file: security/gnupg/patches/patch-g10_Makefile_in
diff -N security/gnupg/patches/patch-g10_Makefile_in
--- security/gnupg/patches/patch-g10_Makefile_in 1 Mar 2015 12:12:54
-0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-g10_Makefile_in,v 1.11 2015/03/01 12:12:54 jca Exp $
---- g10/Makefile.in.orig Fri Feb 27 09:37:51 2015
-+++ g10/Makefile.in Fri Feb 27 22:39:17 2015
-@@ -461,7 +461,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/intl \
-+AM_CPPFLAGS = -I$(top_srcdir)/include \
- @LIBUSB_CPPFLAGS@ $(am__append_1)
- needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
- other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS)
Index: security/gnupg/patches/patch-keyserver_Makefile_in
===================================================================
RCS file: security/gnupg/patches/patch-keyserver_Makefile_in
diff -N security/gnupg/patches/patch-keyserver_Makefile_in
--- security/gnupg/patches/patch-keyserver_Makefile_in 1 Mar 2015 12:12:54
-0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-keyserver_Makefile_in,v 1.10 2015/03/01 12:12:54 jca Exp $
---- keyserver/Makefile.in.orig Fri Feb 27 09:37:52 2015
-+++ keyserver/Makefile.in Fri Feb 27 22:40:22 2015
-@@ -444,7 +444,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/intl
-+AM_CPPFLAGS = -I$(top_srcdir)/include
- EXTRA_SCRIPTS = gpgkeys_mailto
- gpglibexecdir = $(libexecdir)/@PACKAGE@
- gpglibexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_FINGER@
@GPGKEYS_CURL@
Index: security/gnupg/patches/patch-mpi_Makefile_in
===================================================================
RCS file: security/gnupg/patches/patch-mpi_Makefile_in
diff -N security/gnupg/patches/patch-mpi_Makefile_in
--- security/gnupg/patches/patch-mpi_Makefile_in 11 Nov 2018 21:14:33
-0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-mpi_Makefile_in,v 1.4 2018/11/11 21:14:33 naddy Exp $
-
-Index: mpi/Makefile.in
---- mpi/Makefile.in.orig
-+++ mpi/Makefile.in
-@@ -713,7 +713,7 @@ uninstall-am:
- # cancel the default rules used by libtool which do not really
- # work and add one to cpp .S files
- .S.o:
-- $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' > _$*.s
-+ $(CPP) $(INCLUDES) $(DEFS) -DPIC $< | grep -v '^#' > _$*.s
- $(COMPILE) $(AM_CCASFLAGS) -c _$*.s
- mv -f _$*.o $*.o
-
Index: security/gnupg/patches/patch-mpi_config_links
===================================================================
RCS file: security/gnupg/patches/patch-mpi_config_links
diff -N security/gnupg/patches/patch-mpi_config_links
--- security/gnupg/patches/patch-mpi_config_links 12 Apr 2020 18:29:01
-0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-mpi_config_links,v 1.7 2020/04/12 18:29:01 cwen Exp $
-
-Fix "error: unsupported argument '-mppc' to option 'Wa,'" with clang on macppc
-
-Index: mpi/config.links
---- mpi/config.links.orig
-+++ mpi/config.links
-@@ -234,7 +234,6 @@ case "${host}" in
- echo '/* configured for {Open,Net}BSD on powerpc */'
>>./mpi/asm-syntax.h
- echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
- cat $srcdir/mpi/powerpc32/syntax.h >>./mpi/asm-syntax.h
-- mpi_sflags="-Wa,-mppc"
- path="powerpc32"
- ;;
-
Index: security/gnupg/patches/patch-mpi_longlong_h
===================================================================
RCS file: security/gnupg/patches/patch-mpi_longlong_h
diff -N security/gnupg/patches/patch-mpi_longlong_h
--- security/gnupg/patches/patch-mpi_longlong_h 23 Jan 2018 13:54:54 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-mpi_longlong_h,v 1.3 2018/01/23 13:54:54 jca Exp $
-
-Index: mpi/longlong.h
---- mpi/longlong.h.orig
-+++ mpi/longlong.h
-@@ -184,8 +184,8 @@ extern UDItype __udiv_qrnnd ();
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("adds %1, %4, %5\n" \
- "adc %0, %2, %3" \
-- : "=r" ((USItype)(sh)), \
-- "=&r" ((USItype)(sl)) \
-+ : "=r" ((sh)), \
-+ "=&r" ((sl)) \
- : "%r" ((USItype)(ah)), \
- "rI" ((USItype)(bh)), \
- "%r" ((USItype)(al)), \
-@@ -193,8 +193,8 @@ extern UDItype __udiv_qrnnd ();
- #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("subs %1, %4, %5\n" \
- "sbc %0, %2, %3" \
-- : "=r" ((USItype)(sh)), \
-- "=&r" ((USItype)(sl)) \
-+ : "=r" ((sh)), \
-+ "=&r" ((sl)) \
- : "r" ((USItype)(ah)), \
- "rI" ((USItype)(bh)), \
- "r" ((USItype)(al)), \
-@@ -221,10 +221,10 @@ extern UDItype __udiv_qrnnd ();
- : "r0", "r1", "r2" __AND_CLOBBER_CC)
- #else
- #define umul_ppmm(xh, xl, a, b) \
-- __asm__ ("%@ Inlined umul_ppmm\n" \
-- "umull %r1, %r0, %r2, %r3" \
-- : "=&r" ((USItype)(xh)), \
-- "=r" ((USItype)(xl)) \
-+ __asm__ ("@ Inlined umul_ppmm\n" \
-+ "umull %1, %0, %2, %3" \
-+ : "=&r" ((xh)), \
-+ "=r" ((xl)) \
- : "r" ((USItype)(a)), \
- "r" ((USItype)(b)) \
- : "r0", "r1")
Index: security/gnupg/patches/patch-tools_Makefile_in
===================================================================
RCS file: security/gnupg/patches/patch-tools_Makefile_in
diff -N security/gnupg/patches/patch-tools_Makefile_in
--- security/gnupg/patches/patch-tools_Makefile_in 1 Mar 2015 12:12:54
-0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tools_Makefile_in,v 1.11 2015/03/01 12:12:54 jca Exp $
---- tools/Makefile.in.orig Fri Feb 27 09:37:52 2015
-+++ tools/Makefile.in Fri Feb 27 22:39:17 2015
-@@ -430,7 +430,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = lspgpot ring-a-party mail-signed-keys convert-from-106
--AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/intl \
-+AM_CPPFLAGS = -I$(top_srcdir)/include \
- $(am__append_1)
- needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
- other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
Index: security/gnupg/patches/patch-util_Makefile_in
===================================================================
RCS file: security/gnupg/patches/patch-util_Makefile_in
diff -N security/gnupg/patches/patch-util_Makefile_in
--- security/gnupg/patches/patch-util_Makefile_in 1 Mar 2015 12:12:54
-0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-util_Makefile_in,v 1.10 2015/03/01 12:12:54 jca Exp $
---- util/Makefile.in.orig Fri Feb 27 09:37:52 2015
-+++ util/Makefile.in Fri Feb 27 22:40:53 2015
-@@ -415,7 +415,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--AM_CPPFLAGS = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
-+AM_CPPFLAGS = -I.. -I$(top_srcdir)/include
- noinst_LIBRARIES = libutil.a libcompat.a
- libutil_a_SOURCES = logger.c fileutil.c miscutil.c strgutil.c ttyio.c \
- argparse.c memory.c secmem.c errors.c iobuf.c dotlock.c http.c \
Index: security/gnupg/patches/patch-util_secmem_c
===================================================================
RCS file: security/gnupg/patches/patch-util_secmem_c
diff -N security/gnupg/patches/patch-util_secmem_c
--- security/gnupg/patches/patch-util_secmem_c 13 Oct 2014 19:21:16 -0000
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-util_secmem_c,v 1.5 2014/10/13 19:21:16 sthen Exp $
---- util/secmem.c.orig Thu Dec 20 12:22:28 2012
-+++ util/secmem.c Sun Dec 30 23:27:38 2012
-@@ -36,6 +36,8 @@
- #include <sys/lock.h>
- #endif
- #endif
-+#include <sys/sysctl.h>
-+#include <uvm/uvm_swap_encrypt.h>
-
- #include "types.h"
- #include "memory.h"
-@@ -91,11 +93,23 @@ static int suspend_warning;
- static void
- print_warn(void)
- {
-- if (!no_warning)
-+ int mib[3], swapencrypt = 0;
-+ size_t len;
-+
-+ mib[0] = CTL_VM;
-+ mib[1] = VM_SWAPENCRYPT;
-+ mib[2] = SWPENC_ENABLE;
-+
-+ len = sizeof(swapencrypt);
-+
-+ if (sysctl(mib, 3, &swapencrypt, &len, NULL, 0) == -1)
-+ log_info("WARNING: Can't receive vm.swapencrypt.enable sysctl value\n");
-+
-+ if (!no_warning && !swapencrypt)
- {
-- log_info(_("WARNING: using insecure memory!\n"));
-- log_info(_("please see http://www.gnupg.org/documentation/faqs.html";
-- " for more information\n"));
-+ log_info("WARNING: Using insecure memory!\n");
-+ log_info("Please enable swap encryption via"
-+ " 'sysctl vm.swapencrypt.enable=1'.\n");
- }
- }
-
Index: security/gnupg/pkg/DESCR
===================================================================
RCS file: security/gnupg/pkg/DESCR
diff -N security/gnupg/pkg/DESCR
--- security/gnupg/pkg/DESCR 31 Dec 2012 16:34:35 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-GnuPG is a complete and free replacement for PGP. Because it does
-not use IDEA or RSA it can be used without any restrictions. GnuPG
-is nearly in compliance with RFC2440 (OpenPGP).
-
-Flavors:
- card - build with OpenPGP card support
- ldap - build with LDAP keyserver support
Index: security/gnupg/pkg/PFRAG.ldap
===================================================================
RCS file: security/gnupg/pkg/PFRAG.ldap
diff -N security/gnupg/pkg/PFRAG.ldap
--- security/gnupg/pkg/PFRAG.ldap 15 Sep 2009 13:44:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.ldap,v 1.2 2009/09/15 13:44:41 dhill Exp $
-@bin libexec/gnupg/gpgkeys_ldap
Index: security/gnupg/pkg/PLIST
===================================================================
RCS file: security/gnupg/pkg/PLIST
diff -N security/gnupg/pkg/PLIST
--- security/gnupg/pkg/PLIST 29 Jun 2016 16:14:44 -0000 1.31
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.31 2016/06/29 16:14:44 espie Exp $
-@option no-default-conflict
-@option is-branch
-@conflict gnupg-<2
-@pkgpath ${BASE_PKGPATH},idea
-@bin bin/gpg
-bin/gpg-zip
-@bin bin/gpgsplit
-@bin bin/gpgv
-@info info/gnupg1.info
-libexec/gnupg/
-@bin libexec/gnupg/gpgkeys_curl
-@bin libexec/gnupg/gpgkeys_finger
-@bin libexec/gnupg/gpgkeys_hkp
-@man man/man1/gpg-zip.1
-@man man/man1/gpg.1
-@man man/man1/gpgv.1
-share/doc/gnupg/
-share/doc/gnupg/AUTHORS
-share/doc/gnupg/BUGS
-share/doc/gnupg/COPYING
-share/doc/gnupg/DETAILS
-share/doc/gnupg/FAQ
-share/doc/gnupg/HACKING
-share/doc/gnupg/OpenPGP
-share/doc/gnupg/README
-share/doc/gnupg/THANKS
-share/doc/gnupg/TODO
-share/gnupg/
-share/gnupg/options.skel
-share/locale/be/LC_MESSAGES/gnupg.mo
-share/locale/ca/LC_MESSAGES/gnupg.mo
-share/locale/cs/LC_MESSAGES/gnupg.mo
-share/locale/da/LC_MESSAGES/gnupg.mo
-share/locale/de/LC_MESSAGES/gnupg.mo
-share/locale/el/LC_MESSAGES/gnupg.mo
-share/locale/en@boldquot/LC_MESSAGES/gnupg.mo
-share/locale/en@quot/LC_MESSAGES/gnupg.mo
-share/locale/eo/LC_MESSAGES/gnupg.mo
-share/locale/es/LC_MESSAGES/gnupg.mo
-share/locale/et/LC_MESSAGES/gnupg.mo
-share/locale/fi/LC_MESSAGES/gnupg.mo
-share/locale/fr/LC_MESSAGES/gnupg.mo
-share/locale/gl/LC_MESSAGES/gnupg.mo
-share/locale/hu/LC_MESSAGES/gnupg.mo
-share/locale/id/LC_MESSAGES/gnupg.mo
-share/locale/it/LC_MESSAGES/gnupg.mo
-share/locale/ja/LC_MESSAGES/gnupg.mo
-share/locale/nb/LC_MESSAGES/gnupg.mo
-share/locale/nl/LC_MESSAGES/gnupg.mo
-share/locale/pl/LC_MESSAGES/gnupg.mo
-share/locale/pt/LC_MESSAGES/gnupg.mo
-share/locale/pt_BR/LC_MESSAGES/gnupg.mo
-share/locale/ro/LC_MESSAGES/gnupg.mo
-share/locale/ru/LC_MESSAGES/gnupg.mo
-share/locale/sk/LC_MESSAGES/gnupg.mo
-share/locale/sv/LC_MESSAGES/gnupg.mo
-share/locale/tr/LC_MESSAGES/gnupg.mo
-share/locale/uk/LC_MESSAGES/gnupg.mo
-share/locale/zh_CN/LC_MESSAGES/gnupg.mo
-share/locale/zh_TW/LC_MESSAGES/gnupg.mo
-%%ldap%%
Index: security/gnupg2/Makefile
===================================================================
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- security/gnupg2/Makefile 5 Sep 2020 10:07:43 -0000 1.71
+++ security/gnupg2/Makefile 6 Sep 2020 09:57:24 -0000
@@ -3,12 +3,9 @@
COMMENT = GNU privacy guard - a free PGP replacement
DISTNAME = gnupg-2.2.23
-REVISION = 0
+REVISION = 1
CATEGORIES = security
-# don't mix up dependencies with gnupg1
-PKGSPEC = gnupg->=2
-
MASTER_SITES = ${MASTER_SITE_GNUPG:=gnupg/}
HOMEPAGE = https://www.gnupg.org/
@@ -56,12 +53,11 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS += docdir=${LOCALBASE}/share/doc/gnupg2 \
--enable-gpgtar \
- --enable-wks-tools \
- --enable-gpg-is-gpg2
+ --enable-wks-tools
-# Avoid conflict with gnupg-1.x
+# compat symlinks, remove for OpenBSD 7.0?
post-install:
- @mv ${PREFIX}/man/man7/gnupg.7 ${PREFIX}/man/man7/gnupg2.7
- @mv ${PREFIX}/bin/gpgsplit ${PREFIX}/bin/gpgsplit2
+ ln -sf gpg ${PREFIX}/bin/gpg2
+ ln -sf gpgv ${PREFIX}/bin/gpgv2
.include <bsd.port.mk>
Index: security/gnupg2/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/gnupg2/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -r1.22 PLIST
--- security/gnupg2/pkg/PLIST 5 Sep 2020 10:07:44 -0000 1.22
+++ security/gnupg2/pkg/PLIST 6 Sep 2020 09:57:24 -0000
@@ -1,20 +1,21 @@
@comment $OpenBSD: PLIST,v 1.22 2020/09/05 10:07:44 jca Exp $
-@option no-default-conflict
-@option is-branch
-@conflict gnupg->=2
+@conflict gnupg-<2.2.23p1
+@pkgpath security/gnupg
@bin bin/dirmngr
@bin bin/dirmngr-client
+@bin bin/gpg
@bin bin/gpg-agent
@bin bin/gpg-connect-agent
@bin bin/gpg-wks-server
-@bin bin/gpg2
+bin/gpg2
@bin bin/gpgconf
@bin bin/gpgparsemail
@bin bin/gpgscm
@bin bin/gpgsm
-@bin bin/gpgsplit2
+@bin bin/gpgsplit
@bin bin/gpgtar
-@bin bin/gpgv2
+@bin bin/gpgv
+bin/gpgv2
@bin bin/kbxutil
@bin bin/watchgnupg
@info info/gnupg.info
@@ -29,16 +30,16 @@
@man man/man1/gpg-preset-passphrase.1
@man man/man1/gpg-wks-client.1
@man man/man1/gpg-wks-server.1
-@man man/man1/gpg2.1
+@man man/man1/gpg.1
@man man/man1/gpgconf.1
@man man/man1/gpgparsemail.1
@man man/man1/gpgsm.1
@man man/man1/gpgtar.1
-@man man/man1/gpgv2.1
+@man man/man1/gpgv.1
@man man/man1/scdaemon.1
@man man/man1/symcryptrun.1
@man man/man1/watchgnupg.1
-@man man/man7/gnupg2.7
+@man man/man7/gnupg.7
@man man/man8/addgnupghome.8
@man man/man8/applygnupgdefaults.8
@man man/man8/dirmngr.8
Index: security/gpgme/Makefile
===================================================================
RCS file: /cvs/ports/security/gpgme/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- security/gpgme/Makefile 24 Aug 2020 16:28:30 -0000 1.57
+++ security/gpgme/Makefile 5 Sep 2020 13:07:48 -0000
@@ -4,6 +4,7 @@ COMMENT-main = GnuPG Made Easy
COMMENT-qt = Qt bindings for GPGme
VERSION = 1.14.0
+REVISION = 0
DISTNAME = gpgme-${VERSION}
PKGNAME-main = gpgme-${VERSION}
PKGNAME-qt = gpgme-qt-${VERSION}
@@ -38,12 +39,8 @@ NOT_FOR_ARCHS-qt = alpha mips64 sh
CONFIGURE_STYLE = gnu
-# Requires gpgsm (gnupg 2.x) during build, but can run with any gnupg.
BUILD_DEPENDS = gnupg->=2:security/gnupg2
-
-# gnupg-* is normally the default anyway, but gnupg1 overrides PKGSPEC
-# so we must be explicit here.
-RUN_DEPENDS = gnupg-*:security/gnupg
+RUN_DEPENDS = security/gnupg2
LIB_DEPENDS-main = ${LIB_DEPENDS:N*qt*} \
devel/gettext,-runtime \
security/libgpg-error>=1.4 \
Index: security/p5-GPG/Makefile
===================================================================
RCS file: /cvs/ports/security/p5-GPG/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- security/p5-GPG/Makefile 3 Jul 2020 21:45:42 -0000 1.24
+++ security/p5-GPG/Makefile 5 Sep 2020 13:09:22 -0000
@@ -5,11 +5,11 @@ COMMENT= perl5 interface to GnuPG using
MODULES= cpan
PKG_ARCH= *
DISTNAME= GPG-0.06
-REVISION= 3
+REVISION= 4
CATEGORIES= security
CPAN_AUTHOR= MILES
-RUN_DEPENDS= security/gnupg
+RUN_DEPENDS= security/gnupg2
BUILD_DEPENDS= ${RUN_DEPENDS}
PERMIT_PACKAGE= no license
Index: security/p5-GnuPG/Makefile
===================================================================
RCS file: /cvs/ports/security/p5-GnuPG/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- security/p5-GnuPG/Makefile 3 Jul 2020 21:45:42 -0000 1.25
+++ security/p5-GnuPG/Makefile 5 Sep 2020 13:12:00 -0000
@@ -6,11 +6,11 @@ MODULES= cpan
PKG_ARCH= *
DISTNAME= GnuPG-0.19
CATEGORIES= security
-REVISION= 0
+REVISION= 1
MAINTAINER= Gleydson Soares <[email protected]>
-RUN_DEPENDS= security/gnupg
+RUN_DEPENDS= security/gnupg2
# GPLv2+
PERMIT_PACKAGE= Yes
Index: security/p5-GnuPG-Interface/Makefile
===================================================================
RCS file: /cvs/ports/security/p5-GnuPG-Interface/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- security/p5-GnuPG-Interface/Makefile 3 Jul 2020 21:45:42 -0000
1.22
+++ security/p5-GnuPG-Interface/Makefile 5 Sep 2020 13:11:27 -0000
@@ -6,13 +6,13 @@ MODULES= cpan
PKG_ARCH= *
DISTNAME= GnuPG-Interface-0.44
CATEGORIES= security
-REVISION= 0
+REVISION= 1
# Perl
PERMIT_PACKAGE= Yes
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= devel/p5-Any-Moose \
- security/gnupg
+ security/gnupg2
.include <bsd.port.mk>
Index: security/p5-Module-Signature/Makefile
===================================================================
RCS file: /cvs/ports/security/p5-Module-Signature/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- security/p5-Module-Signature/Makefile 21 Aug 2020 14:49:51 -0000
1.31
+++ security/p5-Module-Signature/Makefile 5 Sep 2020 12:54:12 -0000
@@ -3,6 +3,7 @@
COMMENT = module signature file manipulation
DISTNAME = Module-Signature-0.87
+REVISION = 0
CATEGORIES = security
@@ -12,9 +13,9 @@ MAINTAINER = Alexander Bluhm <bluhm@open
PERMIT_PACKAGE = Yes
MODULES = cpan
-BUILD_DEPENDS = security/gnupg
+BUILD_DEPENDS = security/gnupg2
RUN_DEPENDS = textproc/p5-Text-Diff \
- security/gnupg
+ security/gnupg2
TEST_DEPENDS = devel/p5-IPC-Run
CONFIGURE_STYLE = modinst
Index: security/p5-PGP-Sign/Makefile
===================================================================
RCS file: /cvs/ports/security/p5-PGP-Sign/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- security/p5-PGP-Sign/Makefile 3 Jul 2020 21:45:43 -0000 1.28
+++ security/p5-PGP-Sign/Makefile 5 Sep 2020 13:12:41 -0000
@@ -5,7 +5,7 @@ COMMENT= perl module to create/verify PG
MODULES= cpan
PKG_ARCH= *
DISTNAME= PGP-Sign-0.20
-REVISION= 3
+REVISION= 4
CATEGORIES= security
# perl
@@ -18,7 +18,7 @@ FLAVOR?=
RUN_DEPENDS= pgp->=5,<6:security/pgp5
CONFIGURE_ARGS= PGPV="${LOCALBASE}/bin/pgpv"
PGPS="${LOCALBASE}/bin/pgps" PGPSTYLE="PGP5"
.else
-RUN_DEPENDS= security/gnupg
+RUN_DEPENDS= security/gnupg2
CONFIGURE_ARGS= PGP="${LOCALBASE}/bin/gpg" PGPSTYLE="GPG"
.endif
Index: security/py-gnupg/Makefile
===================================================================
RCS file: /cvs/ports/security/py-gnupg/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- security/py-gnupg/Makefile 3 Jul 2020 21:13:06 -0000 1.38
+++ security/py-gnupg/Makefile 5 Sep 2020 12:58:57 -0000
@@ -5,7 +5,7 @@ COMMENT= Python module for GnuPG interf
MODPY_EGG_VERSION= 0.4.3
DISTNAME= python-gnupg-${MODPY_EGG_VERSION}
PKGNAME= py-gnupg-${MODPY_EGG_VERSION}
-REVISION= 1
+REVISION= 2
CATEGORIES= security devel
@@ -21,8 +21,8 @@ MODULES= lang/python
FLAVORS = python3
FLAVOR ?=
-BUILD_DEPENDS= security/gnupg
-RUN_DEPENDS= security/gnupg
+BUILD_DEPENDS= security/gnupg2
+RUN_DEPENDS= security/gnupg2
do-test:
cd ${WRKSRC} && \
Index: security/tclgpg/Makefile
===================================================================
RCS file: /cvs/ports/security/tclgpg/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- security/tclgpg/Makefile 12 Jul 2019 20:49:37 -0000 1.9
+++ security/tclgpg/Makefile 5 Sep 2020 13:00:03 -0000
@@ -4,7 +4,7 @@ COMMENT = Tcl interface to GNU Privacy
DISTNAME = tclgpg-20160615
CATEGORIES = security
HOMEPAGE = https://chiselapp.com/user/sgolovan/repository/tclgpg/
-REVISION = 0
+REVISION = 1
# 2-clause BSD
PERMIT_PACKAGE = Yes
@@ -20,7 +20,7 @@ MODULES = lang/tcl
BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS} \
devel/tcllib
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS} \
- security/gnupg
+ security/gnupg2
TEST_DEPENDS = ${RUN_DEPENDS}
FAKE_FLAGS = INSTALL_PROGRAM='$${INSTALL_DATA}' \
Index: www/rt/Makefile
===================================================================
RCS file: /cvs/ports/www/rt/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- www/rt/Makefile 17 Oct 2019 06:32:20 -0000 1.47
+++ www/rt/Makefile 5 Sep 2020 12:56:01 -0000
@@ -5,7 +5,7 @@ COMMENT= industrial-grade ticketing sys
DISTNAME= rt-4.4.4
CATEGORIES= www
-REVISION= 1
+REVISION= 2
MAINTAINER= Robert Nagy <[email protected]>
@@ -63,7 +63,7 @@ RUN_DEPENDS= converters/p5-Convert-ASN1
net/p5-Net-CIDR \
net/p5-Net-IP \
net/p5-Regexp-Common-net-CIDR \
- security/gnupg \
+ security/gnupg2 \
security/p5-Crypt-Eksblowfish \
security/p5-Crypt-SSLeay \
security/p5-Crypt-X509 \
@@ -117,7 +117,7 @@ CONFIGURE_ARGS= --with-rt-group=bin \
--enable-graphviz \
--enable-gd
-BUILD_DEPENDS+= security/gnupg \
+BUILD_DEPENDS+= security/gnupg2 \
graphics/gd \
math/graphviz,-main
Index: www/weboob/Makefile
===================================================================
RCS file: /cvs/ports/www/weboob/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- www/weboob/Makefile 3 Jul 2020 21:13:21 -0000 1.16
+++ www/weboob/Makefile 5 Sep 2020 12:56:26 -0000
@@ -4,7 +4,7 @@ COMMENT = web out of browsers
MODPY_EGG_VERSION = 2.0
DISTNAME = weboob-${MODPY_EGG_VERSION}
-REVISION = 0
+REVISION = 1
CATEGORIES = www
HOMEPAGE = https://weboob.org
@@ -27,7 +27,7 @@ RUN_DEPENDS += converters/py-html2text${
devel/py-six${MODPY_FLAVOR} \
graphics/py-Pillow${MODPY_FLAVOR} \
net/curl \
- security/gnupg \
+ security/gnupg2 \
textproc/py-lxml${MODPY_FLAVOR} \
textproc/py-feedparser${MODPY_FLAVOR} \
textproc/py-prettytable${MODPY_FLAVOR} \
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
