Index: head/security/gnupg/Makefile =================================================================== --- head/security/gnupg/Makefile (revision 393982) +++ head/security/gnupg/Makefile (revision 393983) @@ -1,64 +1,64 @@ # $FreeBSD$ PORTNAME= gnupg -PORTVERSION= 2.1.6 +PORTVERSION= 2.1.7 #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:${PORTSDIR}/security/libassuan \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libksba.so:${PORTSDIR}/security/libksba \ libnpth.so:${PORTSDIR}/devel/npth BUILD_DEPENDS= libgpg-error>=1.16:${PORTSDIR}/security/libgpg-error RUN_DEPENDS= pinentry>0:${PORTSDIR}/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:${PORTSDIR}/security/gnutls KDNS_LIB_DEPENDS= libadns.so:${PORTSDIR}/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 393982) +++ head/security/gnupg/distinfo (revision 393983) @@ -1,4 +1,4 @@ -SHA256 (gnupg-2.1.6.tar.bz2) = 5e599ad542199f3bd733eed2b88a539d1b4c3beda2dbab0ff69f1896f52e92fd -SIZE (gnupg-2.1.6.tar.bz2) = 4917722 -SHA256 (gnupg-2.1.6.tar.bz2.sig) = 44ca68757e7ae6dc8d5c2c1122015b195b366c32e06537b4d29ccdc3e5139c7b -SIZE (gnupg-2.1.6.tar.bz2.sig) = 287 +SHA256 (gnupg-2.1.7.tar.bz2) = c18a3776d47fec98892d51d28b6574ef16bf0a25eabb0956231058aaf2e7846e +SIZE (gnupg-2.1.7.tar.bz2) = 4918583 +SHA256 (gnupg-2.1.7.tar.bz2.sig) = 242db38327b5520b45a9243735b8584d0d319cca4131db6f1522abb6350228bc +SIZE (gnupg-2.1.7.tar.bz2.sig) = 287 Index: head/security/gnupg/files/patch-agent_agent.h =================================================================== --- head/security/gnupg/files/patch-agent_agent.h (revision 393982) +++ head/security/gnupg/files/patch-agent_agent.h (nonexistent) @@ -1,41 +0,0 @@ -From b3286af36d452fc801be573a057b0838d53a2edd Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Fri, 10 Jul 2015 09:21:32 +0900 -Subject: [PATCH] agent: Support non-NLS build. - -* agent/agent.h: Use ENABLE_NLS and define L_() macro. - --- - -GnuPG-bug-id: 2032 - -This is a fix for e76d4c05b24211f3981ab69cddb3fccc17d21e0e. ---- - agent/agent.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git agent/agent.h agent/agent.h -index 2948bff..5a09254 100644 ---- agent/agent.h -+++ agent/agent.h -@@ -300,6 +300,7 @@ typedef int (*lookup_ttl_t)(const char *hexgrip); - and uses that to translate a string according to the locale set for - the connection. The macro LunderscoreIMPL is used by i18n to - actually define the inline function when needed. */ -+#ifdef ENABLE_NLS - #define L_(a) agent_Lunderscore (ctrl, (a)) - #define LunderscorePROTO \ - static inline const char *agent_Lunderscore (ctrl_t ctrl, \ -@@ -312,6 +313,9 @@ typedef int (*lookup_ttl_t)(const char *hexgrip); - return ctrl? i18n_localegettext (ctrl->lc_messages, string) \ - /* */: gettext (string); \ - } -+#else -+#define L_(a) (a) -+#endif - - - /*-- gpg-agent.c --*/ --- -2.1.4 - Property changes on: head/security/gnupg/files/patch-agent_agent.h ___________________________________________________________________ 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 393982) +++ head/security/gnupg/files/patch-doc-Makefile.in (revision 393983) @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig 2014-11-22 17:40:32.499461775 +0900 -+++ doc/Makefile.in 2014-11-22 17:41:10.997462066 +0900 -@@ -415,7 +415,7 @@ +--- 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 \ -- gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1 \ -+ gpgsm-gencert.sh.1 applygnupgdefaults.8 \ +- applygnupgdefaults.8 gpg-zip.1 \ ++ applygnupgdefaults.8 \ dirmngr-client.1 man_MANS = $(myman_pages) gnupg.7 Index: head/security/gnupg/pkg-plist =================================================================== --- head/security/gnupg/pkg-plist (revision 393982) +++ head/security/gnupg/pkg-plist (revision 393983) @@ -1,116 +1,114 @@ bin/gpg-agent bin/dirmngr bin/dirmngr-client bin/g13 bin/gpgsm bin/gpgtar bin/gpg-connect-agent bin/kbxutil %%SUID_GPG%%@mode 4555 bin/gpg2 %%SUID_GPG%%@mode bin/gpgconf bin/gpgkey2ssh bin/gpgparsemail -bin/gpgsm-gencert.sh bin/gpgv2 bin/symcryptrun bin/watchgnupg %%LDAP%%libexec/dirmngr_ldap libexec/gpg-check-pattern libexec/gpg-preset-passphrase libexec/gpg-protect-tool %%SCDAEMON%%libexec/scdaemon %%PORTDOCS%%man/man1/dirmngr-client.1.gz %%PORTDOCS%%man/man1/gpg-agent.1.gz %%PORTDOCS%%man/man1/gpg-connect-agent.1.gz %%PORTDOCS%%man/man1/gpg-preset-passphrase.1.gz %%PORTDOCS%%man/man1/gpg2.1.gz %%PORTDOCS%%man/man1/gpgconf.1.gz %%PORTDOCS%%man/man1/gpgparsemail.1.gz -%%PORTDOCS%%man/man1/gpgsm-gencert.sh.1.gz %%PORTDOCS%%man/man1/gpgsm.1.gz %%PORTDOCS%%man/man1/gpgv2.1.gz %%PORTDOCS%%man/man1/scdaemon.1.gz %%PORTDOCS%%man/man1/symcryptrun.1.gz %%PORTDOCS%%man/man1/watchgnupg.1.gz %%PORTDOCS%%man/man7/gnupg.7.gz %%PORTDOCS%%man/man8/addgnupghome.8.gz %%PORTDOCS%%man/man8/applygnupgdefaults.8.gz %%PORTDOCS%%man/man8/dirmngr.8.gz sbin/addgnupghome sbin/applygnupgdefaults %%PORTDOCS%%%%DOCSDIR%%/DCO %%PORTDOCS%%%%DOCSDIR%%/DETAILS %%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%%%DOCSDIR%%/HACKING %%PORTDOCS%%%%DOCSDIR%%/KEYSERVER %%PORTDOCS%%%%DOCSDIR%%/OpenPGP %%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TRANSLATE %%PORTDOCS%%%%DOCSDIR%%/examples/README %%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf %%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list %%PORTDOCS%%%%DOCSDIR%%/examples/scd-event %%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt %%PORTDOCS%%%%DATADIR%%/com-certs.pem %%DATADIR%%/distsigkey.gpg %%DATADIR%%/gpg-conf.skel %%PORTDOCS%%%%DATADIR%%/help.be.txt %%PORTDOCS%%%%DATADIR%%/help.ca.txt %%PORTDOCS%%%%DATADIR%%/help.cs.txt %%PORTDOCS%%%%DATADIR%%/help.da.txt %%PORTDOCS%%%%DATADIR%%/help.de.txt %%PORTDOCS%%%%DATADIR%%/help.el.txt %%PORTDOCS%%%%DATADIR%%/help.eo.txt %%PORTDOCS%%%%DATADIR%%/help.es.txt %%PORTDOCS%%%%DATADIR%%/help.et.txt %%PORTDOCS%%%%DATADIR%%/help.fi.txt %%PORTDOCS%%%%DATADIR%%/help.fr.txt %%PORTDOCS%%%%DATADIR%%/help.gl.txt %%PORTDOCS%%%%DATADIR%%/help.hu.txt %%PORTDOCS%%%%DATADIR%%/help.id.txt %%PORTDOCS%%%%DATADIR%%/help.it.txt %%PORTDOCS%%%%DATADIR%%/help.ja.txt %%PORTDOCS%%%%DATADIR%%/help.nb.txt %%PORTDOCS%%%%DATADIR%%/help.pl.txt %%PORTDOCS%%%%DATADIR%%/help.pt.txt %%PORTDOCS%%%%DATADIR%%/help.pt_BR.txt %%PORTDOCS%%%%DATADIR%%/help.ro.txt %%PORTDOCS%%%%DATADIR%%/help.ru.txt %%PORTDOCS%%%%DATADIR%%/help.sk.txt %%PORTDOCS%%%%DATADIR%%/help.sv.txt %%PORTDOCS%%%%DATADIR%%/help.tr.txt %%PORTDOCS%%%%DATADIR%%/help.txt %%PORTDOCS%%%%DATADIR%%/help.zh_CN.txt %%PORTDOCS%%%%DATADIR%%/help.zh_TW.txt %%PORTDOCS%%%%DATADIR%%/qualified.txt %%NLS%%share/locale/ca/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/cs/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/da/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/de/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/el/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/en@quot/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/eo/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/es/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/et/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/fi/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/fr/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/gl/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/hu/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/id/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/it/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/ja/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/nb/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/pl/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/pt/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/ro/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/ru/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/sk/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/sv/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/tr/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/uk/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg2.mo @unexec [ -L %D/bin/gpg ] && rm -f %D/bin/gpg || true