svn commit: r426573 - in head/security/gnupg: . files

[Roman Bogorodskiy]

Author: novel
Date: Sun Nov 20 12:18:35 2016
New Revision: 426573
URL: https://svnweb.freebsd.org/changeset/ports/426573

Log:
  security/gnupg: update to 2.1.16
  
  This release fixes an issue that the previous gnupg release (2.1.15)
  was incompatible with libgpg-error 1.25 that caused gpg-agent failing
  to start.
  
  PR:		214568
  Submitted by:	cmt
  Tested by:	cmt
  Reported by:	many

Added:
  head/security/gnupg/files/patch-tools_Makefile.in   (contents, props changed)
Modified:
  head/security/gnupg/Makefile
  head/security/gnupg/distinfo
  head/security/gnupg/files/patch-doc-Makefile.in
  head/security/gnupg/pkg-plist

Modified: head/security/gnupg/Makefile
==============================================================================
--- head/security/gnupg/Makefile	Sun Nov 20 11:49:23 2016	(r426572)
+++ head/security/gnupg/Makefile	Sun Nov 20 12:18:35 2016	(r426573)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnupg
-PORTVERSION=	2.1.15
+PORTVERSION=	2.1.16
 #PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
@@ -32,7 +32,8 @@ USE_LDCONFIG=	YES
 # will be treated as $value/lib, so try using /usr instead.
 # Otherwise, $PREFIX/lib/libreadline.so.6 will be linked when
 # devel/readline is installed.
-CONFIGURE_ARGS+=	--disable-ntbtls --enable-symcryptrun --with-readline=/usr
+CONFIGURE_ARGS+=	--disable-ntbtls --enable-symcryptrun --with-readline=/usr \
+			--disable-wks-tools
 CONFLICTS=	gnupg-2.0.* dirmngr-*
 CPE_VENDOR=	gnupg
 

Modified: head/security/gnupg/distinfo
==============================================================================
--- head/security/gnupg/distinfo	Sun Nov 20 11:49:23 2016	(r426572)
+++ head/security/gnupg/distinfo	Sun Nov 20 12:18:35 2016	(r426573)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1472917461
-SHA256 (gnupg-2.1.15.tar.bz2) = c28c1a208f1b8ad63bdb6b88d252f6734ff4d33de6b54e38494b11d49e00ffdd
-SIZE (gnupg-2.1.15.tar.bz2) = 5723689
-SHA256 (gnupg-2.1.15.tar.bz2.sig) = b639df6de965f00327d8659e6540281bf56b0541a3c62d6a3fb36f59570d0e4e
-SIZE (gnupg-2.1.15.tar.bz2.sig) = 287
+TIMESTAMP = 1479551985
+SHA256 (gnupg-2.1.16.tar.bz2) = 49b9a6a6787ad00d4d2d69d8c7ee8905923782583f06078a064a0c80531d8844
+SIZE (gnupg-2.1.16.tar.bz2) = 5840687
+SHA256 (gnupg-2.1.16.tar.bz2.sig) = 91dd1279956a533a721f3e2dc06a092248cea8bd9a5259dc19f8d7573c1d3d12
+SIZE (gnupg-2.1.16.tar.bz2.sig) = 310

Modified: head/security/gnupg/files/patch-doc-Makefile.in
==============================================================================
--- head/security/gnupg/files/patch-doc-Makefile.in	Sun Nov 20 11:49:23 2016	(r426572)
+++ head/security/gnupg/files/patch-doc-Makefile.in	Sun Nov 20 12:18:35 2016	(r426573)
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	2016-05-04 23:00:20.000000000 +0900
-+++ doc/Makefile.in	2016-05-06 07:36:42.183921000 +0900
-@@ -514,7 +514,7 @@
+--- doc/Makefile.in.orig	2016-11-18 15:53:57 UTC
++++ doc/Makefile.in
+@@ -522,7 +522,7 @@ CLEANFILES = yat2m mkdefsinc defs.inc
  DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
                   gnupg-card-architecture.eps \
                   gnupg-module-overview.eps \

Added: head/security/gnupg/files/patch-tools_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/gnupg/files/patch-tools_Makefile.in	Sun Nov 20 12:18:35 2016	(r426573)
@@ -0,0 +1,11 @@
+--- tools/Makefile.in.orig	2016-11-19 11:06:10 UTC
++++ tools/Makefile.in
+@@ -669,7 +669,7 @@ gpg_wks_client_SOURCES = \
+ gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
+ gpg_wks_client_LDADD = $(libcommon) \
+ 		       $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+-		       $(LIBICONV)
++		       $(LIBICONV) $(LIBINTL)
+ 
+ all: all-am
+ 

Modified: head/security/gnupg/pkg-plist
==============================================================================
--- head/security/gnupg/pkg-plist	Sun Nov 20 11:49:23 2016	(r426572)
+++ head/security/gnupg/pkg-plist	Sun Nov 20 12:18:35 2016	(r426573)
@@ -18,6 +18,7 @@ bin/watchgnupg
 libexec/gpg-check-pattern
 libexec/gpg-preset-passphrase
 libexec/gpg-protect-tool
+libexec/gpg-wks-client
 %%SCDAEMON%%libexec/scdaemon
 %%PORTDOCS%%man/man1/dirmngr-client.1.gz
 %%PORTDOCS%%man/man1/gpg-agent.1.gz
@@ -49,6 +50,13 @@ sbin/applygnupgdefaults
 %%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf
 %%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list
 %%PORTDOCS%%%%DOCSDIR%%/examples/scd-event
+%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/README
+%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/dirmngr.service
+%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/dirmngr.socket
+%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-extra.socket
+%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-ssh.socket
+%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.service
+%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.socket
 %%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt
 %%DATADIR%%/dirmngr-conf.skel
 %%DATADIR%%/distsigkey.gpg