On Mon, 04 Jul 2016, Boyd Waters wrote:
> Will clean this up and post again after some testing here. No worries re 6.0
> timing. Thanks!
>
> > On Jul 4, 2016, at 5:35 PM, Stuart Henderson <[email protected]> wrote:
> >
> > I think it's probably a bit late to get enough testing of this before
> > 6.0 lock, if it doesn't make it then please mention it again on ports@
> > if it gets forgotten later :)
Here's my version.
Works well for me, and I've also tested smartcard support with my
Gemalto Gemplus USB SmartCard Reader.
Ciao!
David
Index: gnupg2/Makefile
===================================================================
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- gnupg2/Makefile 29 Jun 2016 16:14:44 -0000 1.42
+++ gnupg2/Makefile 5 Jul 2016 10:43:25 -0000
@@ -2,9 +2,8 @@
COMMENT = GNU privacy guard - a free PGP replacement
-DISTNAME = gnupg-2.1.9
+DISTNAME = gnupg-2.1.13
CATEGORIES = security
-REVISION = 0
MASTER_SITES = ${MASTER_SITES_GNUPG:=gnupg/}
@@ -15,9 +14,9 @@ MAINTAINER = Pierre-Emmanuel Andre <pea
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += assuan bz2 c gcrypt gnutls gpg-error
-WANTLIB += ksba npth pthread readline
-WANTLIB += termcap usb z
+WANTLIB += assuan>=1.2 bz2 c gcrypt gnutls gpg-error
+WANTLIB += ksba npth pthread readline sqlite3
+WANTLIB += termcap usb-1.0 z
EXTRACT_SUFX = .tar.bz2
@@ -27,10 +26,10 @@ FLAVORS = ldap
FLAVOR ?=
LIB_DEPENDS = archivers/bzip2 \
- devel/libusb-compat \
+ devel/libusb1 \
devel/npth \
security/gnutls \
- security/libassuan \
+ security/libassuan>=2.4.2 \
security/libgcrypt \
security/libksba
@@ -53,12 +52,12 @@ CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS += docdir=${LOCALBASE}/share/doc/gnupg2 \
+ --enable-g13 \
--enable-gpgtar \
--with-adns=no
# Avoid conflict with gnupg-1.x
post-install:
- @mv ${PREFIX}/man/man1/gpg-zip.1 ${PREFIX}/man/man1/gpg2-zip.1
@mv ${PREFIX}/man/man7/gnupg.7 ${PREFIX}/man/man7/gnupg2.7
.include <bsd.port.mk>
Index: gnupg2/distinfo
===================================================================
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- gnupg2/distinfo 20 Oct 2015 09:20:50 -0000 1.18
+++ gnupg2/distinfo 5 Jul 2016 10:43:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.1.9.tar.bz2) = HLdjOlcZC+tm+SSct0RmAyKbJz1NiTMbdcZS+kop97Y=
-SIZE (gnupg-2.1.9.tar.bz2) = 4925167
+SHA256 (gnupg-2.1.13.tar.bz2) = T52DpiIdqmATD6efCx031sIP/90DILZAx6WXxbYhlnU=
+SIZE (gnupg-2.1.13.tar.bz2) = 5545361
Index: gnupg2/patches/patch-doc_Makefile_in
===================================================================
RCS file: gnupg2/patches/patch-doc_Makefile_in
diff -N gnupg2/patches/patch-doc_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnupg2/patches/patch-doc_Makefile_in 5 Jul 2016 10:43:25 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/Makefile.in.orig Tue Jul 5 08:34:21 2016
++++ doc/Makefile.in Tue Jul 5 08:34:39 2016
+@@ -514,7 +514,7 @@ CLEANFILES = yat2m mkdefsinc defs.inc
+ DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
+ gnupg-card-architecture.eps \
+ gnupg-module-overview.eps \
+- $(myman_pages) gpg-zip.1 gnupg.7
++ $(myman_pages) gnupg.7
+
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
Index: gnupg2/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/gnupg2/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 PLIST
--- gnupg2/pkg/PLIST 29 Jun 2016 16:14:44 -0000 1.14
+++ gnupg2/pkg/PLIST 5 Jul 2016 10:43:25 -0000
@@ -9,7 +9,6 @@
@bin bin/gpg-connect-agent
@bin bin/gpg2
@bin bin/gpgconf
-@bin bin/gpgkey2ssh
@bin bin/gpgparsemail
@bin bin/gpgsm
@bin bin/gpgtar
@@ -25,7 +24,6 @@
@man man/man1/gpg-agent.1
@man man/man1/gpg-connect-agent.1
@man man/man1/gpg-preset-passphrase.1
-@man man/man1/gpg2-zip.1
@man man/man1/gpg2.1
@man man/man1/gpgconf.1
@man man/man1/gpgparsemail.1
@@ -40,6 +38,7 @@
@man man/man8/dirmngr.8
sbin/addgnupghome
sbin/applygnupgdefaults
+@bin sbin/g13-syshelp
share/doc/gnupg2/
share/doc/gnupg2/DCO
share/doc/gnupg2/DETAILS
@@ -90,6 +89,7 @@ share/gnupg/help.txt
share/gnupg/help.zh_CN.txt
share/gnupg/help.zh_TW.txt
share/gnupg/qualified.txt
+share/gnupg/sks-keyservers.netCA.pem
share/locale/ca/LC_MESSAGES/gnupg2.mo
share/locale/cs/LC_MESSAGES/gnupg2.mo
share/locale/da/LC_MESSAGES/gnupg2.mo
Index: libassuan/Makefile
===================================================================
RCS file: /cvs/ports/security/libassuan/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- libassuan/Makefile 17 Sep 2013 11:10:01 -0000 1.14
+++ libassuan/Makefile 5 Jul 2016 10:43:26 -0000
@@ -2,10 +2,10 @@
COMMENT= IPC library used by GnuPG and gpgme
-DISTNAME= libassuan-2.1.1
+DISTNAME= libassuan-2.4.2
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS += assuan 1.1 # 2.0
+SHARED_LIBS += assuan 1.2 # 7.2
CATEGORIES= security devel
Index: libassuan/distinfo
===================================================================
RCS file: /cvs/ports/security/libassuan/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- libassuan/distinfo 17 Sep 2013 11:10:02 -0000 1.8
+++ libassuan/distinfo 5 Jul 2016 10:43:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (libassuan-2.1.1.tar.bz2) = I+LWd3m4jpDSn+HfaxVxCfHCpkfQ8bKg9Clbs8CyA50=
-SIZE (libassuan-2.1.1.tar.bz2) = 538155
+SHA256 (libassuan-2.4.2.tar.bz2) = uwbcgTgLdL8bZNWEm+XAQJozbztMRfIKxojobRtbyyA=
+SIZE (libassuan-2.4.2.tar.bz2) = 587631
Index: libassuan/patches/patch-configure
===================================================================
RCS file: /cvs/ports/security/libassuan/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-configure
--- libassuan/patches/patch-configure 17 Sep 2013 11:10:02 -0000 1.3
+++ libassuan/patches/patch-configure 5 Jul 2016 10:43:26 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2013/09/17 11:10:02 ajacoutot Exp $
---- configure.orig Mon Jun 24 07:14:16 2013
-+++ configure Tue Sep 17 13:06:46 2013
-@@ -14355,11 +14355,12 @@ if ${assuan_cv_sys_so_peercred+:} false; then :
+--- configure.orig Wed Dec 2 14:15:59 2015
++++ configure Tue Jul 5 07:54:57 2016
+@@ -14577,11 +14577,12 @@ if ${assuan_cv_sys_so_peercred+:} false; then :
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
Index: libassuan/patches/patch-src_assuan-socket_c
===================================================================
RCS file: libassuan/patches/patch-src_assuan-socket_c
diff -N libassuan/patches/patch-src_assuan-socket_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libassuan/patches/patch-src_assuan-socket_c 5 Jul 2016 10:43:26 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- src/assuan-socket.c.orig Tue Jul 5 08:10:30 2016
++++ src/assuan-socket.c Tue Jul 5 08:15:13 2016
+@@ -49,6 +49,13 @@
+ #include "assuan-defs.h"
+ #include "debug.h"
+
++/* Hack for OpenBSD. */
++#if defined(__OpenBSD__)
++# if !defined(EPROTO) && defined(ENOPROTOOPT)
++# define EPROTO ENOPROTOOPT
++# endif
++#endif
++
+ /* Hacks for Slowaris. */
+ #ifndef PF_LOCAL
+ # ifdef PF_UNIX
