5 files changed, 37 insertions, 17 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 388c7c7645b0..a44541951100 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnupg
-PORTVERSION=	2.1.8
+PORTVERSION=	2.1.11
 #PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index 1fb45f584782..05e1f702648b 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gnupg-2.1.8.tar.bz2) = a3b8d01e4690715d42e8f289493c85413766f3fa935e4fe7e5ff5b0f6e2781a3
-SIZE (gnupg-2.1.8.tar.bz2) = 4900705
-SHA256 (gnupg-2.1.8.tar.bz2.sig) = 5c8eea954ec0da63589454e5fddcee9f66016c205be981bd000db6b6a782a70c
-SIZE (gnupg-2.1.8.tar.bz2.sig) = 574
+SHA256 (gnupg-2.1.11.tar.bz2) = b7b0fb2c8c5d47d7ec916d4a1097c0ddcb94a12bb1c0ac424ad86b1ee316b61a
+SIZE (gnupg-2.1.11.tar.bz2) = 5224007
+SHA256 (gnupg-2.1.11.tar.bz2.sig) = 058fddcf04cf538712938f4229d8fc7292901e5f235c18dc5b52e98e23b00b0b
+SIZE (gnupg-2.1.11.tar.bz2.sig) = 287
diff --git a/security/gnupg/files/patch-dirmngr-dns-stuff.c b/security/gnupg/files/patch-dirmngr-dns-stuff.c
new file mode 100644
index 000000000000..19af0b2d9b05
--- /dev/null
+++ b/security/gnupg/files/patch-dirmngr-dns-stuff.c
@@ -0,0 +1,20 @@
+--- dirmngr/dns-stuff.c.orig	2016-01-26 18:36:37.000000000 +0900
++++ dirmngr/dns-stuff.c	2016-02-19 11:20:58.885089458 +0900
+@@ -177,13 +177,17 @@
+     case EAI_BADFLAGS:  err = gpg_error (GPG_ERR_INV_FLAG); break;
+     case EAI_FAIL:      err = gpg_error (GPG_ERR_SERVER_FAILED); break;
+     case EAI_MEMORY:    err = gpg_error (GPG_ERR_ENOMEM); break;
++#ifdef EAI_NODATA 
+     case EAI_NODATA:    err = gpg_error (GPG_ERR_NO_DATA); break;
++#endif
+     case EAI_NONAME:    err = gpg_error (GPG_ERR_NO_NAME); break;
+     case EAI_SERVICE:   err = gpg_error (GPG_ERR_NOT_SUPPORTED); break;
+     case EAI_FAMILY:    err = gpg_error (GPG_ERR_EAFNOSUPPORT); break;
+     case EAI_SOCKTYPE:  err = gpg_error (GPG_ERR_ESOCKTNOSUPPORT); break;
+ #ifndef HAVE_W32_SYSTEM
++#ifdef EAI_ADDRFAMILY
+     case EAI_ADDRFAMILY:err = gpg_error (GPG_ERR_EADDRNOTAVAIL); break;
++#endif
+     case EAI_SYSTEM:    err = gpg_error_from_syserror (); break;
+ #endif
+     default:            err = gpg_error (GPG_ERR_UNKNOWN_ERRNO); break;
diff --git a/security/gnupg/files/patch-doc-Makefile.in b/security/gnupg/files/patch-doc-Makefile.in
index 81db9dc723e3..68e0ba7ac74e 100644
--- a/security/gnupg/files/patch-doc-Makefile.in
+++ b/security/gnupg/files/patch-doc-Makefile.in
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig	2015-08-11 20:57:21.000000000 +0900
-+++ doc/Makefile.in	2015-08-12 01:06:54.960781832 +0900
-@@ -498,7 +498,7 @@
- myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 gpgv2.1 \
-                 watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
- 		gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
--		applygnupgdefaults.8 gpg-zip.1 \
-+		applygnupgdefaults.8 \
- 		dirmngr-client.1
+--- doc/Makefile.in.orig	2016-01-26 12:54:48.000000000 +0000
++++ doc/Makefile.in	2016-02-19 01:59:17.000000000 +0000
+@@ -507,7 +507,7 @@
+ watchgnupg_SOURCE = gnupg.texi
+ CLEANFILES = yat2m mkdefsinc defs.inc
+ DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
+-		 $(myman_pages) gpg-zip.1 gnupg.7
++		 $(myman_pages) gnupg.7
  
- man_MANS = $(myman_pages) gnupg.7
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist
index 04adb6812a0e..c08a2c751a86 100644
--- a/security/gnupg/pkg-plist
+++ b/security/gnupg/pkg-plist
@@ -1,7 +1,6 @@
 bin/gpg-agent
 bin/dirmngr
 bin/dirmngr-client
-bin/g13
 bin/gpgsm
 bin/gpgtar
 bin/gpg-connect-agent
@@ -10,7 +9,6 @@ bin/kbxutil
 bin/gpg2
 %%SUID_GPG%%@mode
 bin/gpgconf
-bin/gpgkey2ssh
 bin/gpgparsemail
 bin/gpgv2
 bin/symcryptrun
@@ -52,6 +50,7 @@ sbin/applygnupgdefaults
 %%PORTDOCS%%%%DOCSDIR%%/examples/scd-event
 %%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt
 %%PORTDOCS%%%%DATADIR%%/com-certs.pem
+%%DATADIR%%/dirmngr-conf.skel
 %%DATADIR%%/distsigkey.gpg
 %%DATADIR%%/gpg-conf.skel
 %%PORTDOCS%%%%DATADIR%%/help.be.txt
@@ -83,6 +82,7 @@ sbin/applygnupgdefaults
 %%PORTDOCS%%%%DATADIR%%/help.zh_CN.txt
 %%PORTDOCS%%%%DATADIR%%/help.zh_TW.txt
 %%PORTDOCS%%%%DATADIR%%/qualified.txt
+%%DATADIR%%/sks-keyservers.netCA.pem
 %%NLS%%share/locale/ca/LC_MESSAGES/gnupg2.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gnupg2.mo
 %%NLS%%share/locale/da/LC_MESSAGES/gnupg2.mo