On Mon, Dec 01, 2014 at 05:39:55PM +0100, Pierre-Emmanuel André wrote:
> Hi,
>
> This diff updates GnuPG-2 to it's latest version.
> Changelog is here:
> http://lists.gnupg.org/pipermail/gnupg-announce/2014q4/000358.html
>
> Works fine on @amd64.
> Comments, ok ?
>
> Regards,
Updated diff to the latest version: 2.1.1
Comments, ok ?
Regards,
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 Makefile
--- Makefile 1 Sep 2014 08:42:01 -0000 1.32
+++ Makefile 17 Dec 2014 13:32:39 -0000
@@ -2,7 +2,7 @@
COMMENT = GNU privacy guard - a free PGP replacement
-DISTNAME = gnupg-2.0.26
+DISTNAME = gnupg-2.1.1
CATEGORIES = security
MASTER_SITES = ${MASTER_SITES_GNUPG:=gnupg/}
@@ -14,9 +14,9 @@ MAINTAINER = Pierre-Emmanuel Andre <pea
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += assuan bz2 c crypto curl gcrypt
-WANTLIB += gpg-error idn ksba pth pthread
-WANTLIB += readline ssl termcap usb z
+WANTLIB += assuan bz2 c gcrypt gnutls gpg-error
+WANTLIB += ksba npth pthread readline
+WANTLIB += termcap usb z
EXTRACT_SUFX = .tar.bz2
@@ -27,11 +27,12 @@ FLAVOR ?=
LIB_DEPENDS = archivers/bzip2 \
devel/libusb-compat \
+ devel/npth \
+ security/gnutls \
security/libassuan \
security/libgcrypt \
security/libksba \
- net/curl \
- devel/pth
+ net/curl
.if ${FLAVOR:Mldap}
CONFIGURE_ARGS += --enable-ldap
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo 1 Sep 2014 08:42:01 -0000 1.12
+++ distinfo 17 Dec 2014 13:32:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.0.26.tar.bz2) = d1jjDcOCrnpxZ+1Bt/k2qlCvXqLW/M3vZjtbdQtluOA=
-SIZE (gnupg-2.0.26.tar.bz2) = 4303384
+SHA256 (gnupg-2.1.1.tar.bz2) = cOzQHSh122JiTJEcL9gVdC9QrvVJJpjrO/wJoIaQzkk=
+SIZE (gnupg-2.1.1.tar.bz2) = 4801472
Index: patches/patch-scd_Makefile_in
===================================================================
RCS file: patches/patch-scd_Makefile_in
diff -N patches/patch-scd_Makefile_in
--- patches/patch-scd_Makefile_in 20 Aug 2013 20:01:31 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-scd_Makefile_in,v 1.5 2013/08/20 20:01:31 pascal Exp $
-
-Link gnupg-pcsc-wrapper with -lpthread: recent pthread work enforces
-that a program dlopen()ing a library which uses pthread functions
-is itself linked with the thread library.
-
---- scd/Makefile.in.orig Fri May 10 15:56:29 2013
-+++ scd/Makefile.in Thu Jul 18 23:18:46 2013
-@@ -255,7 +255,7 @@ KSBA_CONFIG = @KSBA_CONFIG@
- KSBA_LIBS = @KSBA_LIBS@
- LDAPLIBS = @LDAPLIBS@
- LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -Wl,--export-dynamic
- LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
- LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
- LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
-@@ -500,7 +500,7 @@ clean-libexecPROGRAMS:
- -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
- gnupg-pcsc-wrapper$(EXEEXT): $(gnupg_pcsc_wrapper_OBJECTS)
$(gnupg_pcsc_wrapper_DEPENDENCIES) $(EXTRA_gnupg_pcsc_wrapper_DEPENDENCIES)
- @rm -f gnupg-pcsc-wrapper$(EXEEXT)
-- $(gnupg_pcsc_wrapper_LINK) $(gnupg_pcsc_wrapper_OBJECTS)
$(gnupg_pcsc_wrapper_LDADD) $(LIBS)
-+ $(gnupg_pcsc_wrapper_LINK) $(gnupg_pcsc_wrapper_OBJECTS)
$(gnupg_pcsc_wrapper_LDADD) -lpthread $(LIBS)
- scdaemon$(EXEEXT): $(scdaemon_OBJECTS) $(scdaemon_DEPENDENCIES)
$(EXTRA_scdaemon_DEPENDENCIES)
- @rm -f scdaemon$(EXEEXT)
- $(LINK) $(scdaemon_OBJECTS) $(scdaemon_LDADD) $(LIBS)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/gnupg2/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST 20 Aug 2013 20:01:31 -0000 1.9
+++ pkg/PLIST 17 Dec 2014 13:32:39 -0000
@@ -1,6 +1,9 @@
@comment $OpenBSD: PLIST,v 1.9 2013/08/20 20:01:31 pascal Exp $
@option no-default-conflict
@conflict gnupg->=2
+@bin bin/dirmngr
+@bin bin/dirmngr-client
+@bin bin/g13
@bin bin/gpg-agent
@bin bin/gpg-connect-agent
@bin bin/gpg2
@@ -14,14 +17,11 @@ bin/gpgsm-gencert.sh
@bin bin/kbxutil
@bin bin/watchgnupg
@info info/gnupg.info
-@bin libexec/gnupg-pcsc-wrapper
@bin libexec/gpg-check-pattern
@bin libexec/gpg-preset-passphrase
@bin libexec/gpg-protect-tool
-@bin libexec/gpg2keys_curl
-@bin libexec/gpg2keys_finger
-@bin libexec/gpg2keys_hkp
@bin libexec/scdaemon
+@man man/man1/dirmngr-client.1
@man man/man1/gpg-agent.1
@man man/man1/gpg-connect-agent.1
@man man/man1/gpg-preset-passphrase.1
@@ -35,11 +35,14 @@ bin/gpgsm-gencert.sh
@man man/man1/scdaemon.1
@man man/man1/symcryptrun.1
@man man/man1/watchgnupg.1
+@man man/man7/gnupg.7
@man man/man8/addgnupghome.8
@man man/man8/applygnupgdefaults.8
+@man man/man8/dirmngr.8
sbin/addgnupghome
sbin/applygnupgdefaults
share/doc/gnupg2/
+share/doc/gnupg2/DCO
share/doc/gnupg2/DETAILS
share/doc/gnupg2/FAQ
share/doc/gnupg2/HACKING
@@ -56,6 +59,7 @@ share/doc/gnupg2/examples/trustlist.txt
share/doc/pkg-readmes/${FULLPKGNAME}
share/gnupg/
share/gnupg/com-certs.pem
+share/gnupg/distsigkey.gpg
share/gnupg/gpg-conf.skel
share/gnupg/help.be.txt
share/gnupg/help.ca.txt
@@ -86,7 +90,6 @@ share/gnupg/help.txt
share/gnupg/help.zh_CN.txt
share/gnupg/help.zh_TW.txt
share/gnupg/qualified.txt
-share/locale/be/LC_MESSAGES/gnupg2.mo
share/locale/ca/LC_MESSAGES/gnupg2.mo
share/locale/cs/LC_MESSAGES/gnupg2.mo
share/locale/da/LC_MESSAGES/gnupg2.mo
@@ -107,7 +110,6 @@ share/locale/ja/LC_MESSAGES/gnupg2.mo
share/locale/nb/LC_MESSAGES/gnupg2.mo
share/locale/pl/LC_MESSAGES/gnupg2.mo
share/locale/pt/LC_MESSAGES/gnupg2.mo
-share/locale/pt_BR/LC_MESSAGES/gnupg2.mo
share/locale/ro/LC_MESSAGES/gnupg2.mo
share/locale/ru/LC_MESSAGES/gnupg2.mo
share/locale/sk/LC_MESSAGES/gnupg2.mo
