Index: head/security/gnupg/Makefile =================================================================== --- head/security/gnupg/Makefile (revision 414710) +++ head/security/gnupg/Makefile (revision 414711) @@ -1,64 +1,64 @@ # $FreeBSD$ PORTNAME= gnupg -PORTVERSION= 2.1.11 -PORTREVISION= 2 +PORTVERSION= 2.1.12 +#PORTREVISION= 0 CATEGORIES= security MASTER_SITES= GNUPG DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= kuriyama@FreeBSD.org COMMENT= The GNU Privacy Guard LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LIB LIB_DEPENDS= libassuan.so:security/libassuan \ libgcrypt.so:security/libgcrypt \ libksba.so:security/libksba \ libnpth.so:devel/npth BUILD_DEPENDS= libgpg-error>=1.16:security/libgpg-error RUN_DEPENDS= pinentry>0:security/pinentry GNU_CONFIGURE= YES USES= cpe gmake iconv pkgconfig tar:bzip2 USE_LDCONFIG= YES # libreadline.so.8 is placed in /lib, but --with-readline argument # 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 CONFLICTS= gnupg-2.0.* dirmngr-* CPE_VENDOR= gnupg OPTIONS_DEFINE= GNUTLS LDAP SCDAEMON KDNS NLS DOCS SUID_GPG LDAP_DESC= LDAP keyserver interface SCDAEMON_DESC= Enable Smartcard daemon (with libusb) KDNS_DESC= Use DNS CERT helper SUID_GPG_DESC= Install GPG with suid OPTIONS_DEFAULT= GNUTLS NO_OPTIONS_SORT= YES OPTIONS_SUB= YES # In jail, SUID is required to avoid warning (security.bsd.unprivileged_mlock sysctl is not used in jail). DOCS_CONFIGURE_ENABLE= doc DOCS_INFO= gnupg GNUTLS_CONFIGURE_ENABLE=gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls KDNS_LIB_DEPENDS= libadns.so:dns/adns KDNS_CONFIGURE_ON= --with-adns=${LOCALBASE} LDAP_CONFIGURE_ENABLE= ldap LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} LDAP_LIBS= -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls SCDAEMON_CONFIGURE_ENABLE= scdaemon verify: checksum gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig .include Index: head/security/gnupg/distinfo =================================================================== --- head/security/gnupg/distinfo (revision 414710) +++ head/security/gnupg/distinfo (revision 414711) @@ -1,4 +1,4 @@ -SHA256 (gnupg-2.1.11.tar.bz2) = b7b0fb2c8c5d47d7ec916d4a1097c0ddcb94a12bb1c0ac424ad86b1ee316b61a -SIZE (gnupg-2.1.11.tar.bz2) = 5224007 -SHA256 (gnupg-2.1.11.tar.bz2.sig) = cf2ca28205a479ceac1fa5b6ac3d855c9461814c9cd231e4da2cf4f156f738f0 -SIZE (gnupg-2.1.11.tar.bz2.sig) = 574 +SHA256 (gnupg-2.1.12.tar.bz2) = ac34929d2400a58a349963865442ee6cdd75e500a8d5df083d29835e88bfc506 +SIZE (gnupg-2.1.12.tar.bz2) = 5510723 +SHA256 (gnupg-2.1.12.tar.bz2.sig) = 328280c08fc3d9414cdc7bff332e1b7ef81d5c674f23c31619b880f43575c49b +SIZE (gnupg-2.1.12.tar.bz2.sig) = 287 Index: head/security/gnupg/files/patch-dirmngr_Makefile.am =================================================================== --- head/security/gnupg/files/patch-dirmngr_Makefile.am (revision 414710) +++ head/security/gnupg/files/patch-dirmngr_Makefile.am (nonexistent) @@ -1,15 +0,0 @@ ---- dirmngr/Makefile.am.orig 2016-01-26 09:36:37 UTC -+++ dirmngr/Makefile.am -@@ -140,10 +140,10 @@ t_ldap_parse_uri_SOURCES = \ - t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \ - http.c dns-stuff.c \ - $(ldap_url) $(t_common_src) --t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 -+t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(LIBGCRYPT_FLAGS) - t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS) - --t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1 -+t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1 $(LIBGCRYPT_FLAGS) - t_dns_stuff_SOURCES = t-dns-stuff.c dns-stuff.c - t_dns_stuff_LDADD = $(t_common_ldadd) $(DNSLIBS) - Property changes on: head/security/gnupg/files/patch-dirmngr_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/gnupg/files/patch-dirmngr_Makefile.in =================================================================== --- head/security/gnupg/files/patch-dirmngr_Makefile.in (revision 414710) +++ head/security/gnupg/files/patch-dirmngr_Makefile.in (nonexistent) @@ -1,14 +0,0 @@ ---- dirmngr/Makefile.in.orig 2016-01-26 12:54:48 UTC -+++ dirmngr/Makefile.in -@@ -650,9 +650,9 @@ t_ldap_parse_uri_SOURCES = \ - http.c dns-stuff.c \ - $(ldap_url) $(t_common_src) - --t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 -+t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(LIBGCRYPT_CFLAGS) - t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS) --t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1 -+t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1 $(LIBGCRYPT_CFLAGS) - t_dns_stuff_SOURCES = t-dns-stuff.c dns-stuff.c - t_dns_stuff_LDADD = $(t_common_ldadd) $(DNSLIBS) - all: $(BUILT_SOURCES) Property changes on: head/security/gnupg/files/patch-dirmngr_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/gnupg/files/patch-dirmngr-dns-stuff.c =================================================================== --- head/security/gnupg/files/patch-dirmngr-dns-stuff.c (revision 414710) +++ head/security/gnupg/files/patch-dirmngr-dns-stuff.c (nonexistent) @@ -1,20 +0,0 @@ ---- 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; Property changes on: head/security/gnupg/files/patch-dirmngr-dns-stuff.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/gnupg/files/patch-doc-Makefile.in =================================================================== --- head/security/gnupg/files/patch-doc-Makefile.in (revision 414710) +++ head/security/gnupg/files/patch-doc-Makefile.in (revision 414711) @@ -1,11 +1,11 @@ ---- 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 +--- 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 @@ 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