Index: head/security/gnupg/Makefile =================================================================== --- head/security/gnupg/Makefile (revision 447408) +++ head/security/gnupg/Makefile (revision 447409) @@ -1,61 +1,61 @@ # $FreeBSD$ PORTNAME= gnupg -PORTVERSION= 2.1.21 -PORTREVISION= 2 +PORTVERSION= 2.1.22 CATEGORIES= security MASTER_SITES= GNUPG MAINTAINER= adamw@FreeBSD.org COMMENT= The GNU Privacy Guard (modern version) LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING -LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LIB +LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPL3 LIB_DEPENDS= libassuan.so:security/libassuan \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libksba.so:security/libksba \ libnpth.so:devel/npth BUILD_DEPENDS= libassuan>=2.4.3:security/libassuan \ libgpg-error>=1.16:security/libgpg-error RUN_DEPENDS= pinentry:security/pinentry CONFLICTS= gnupg-2.0.* dirmngr-[0-9]* CPE_VENDOR= gnupg USES= compiler:c11 cpe gmake iconv pkgconfig readline sqlite tar:bzip2 CONFIGURE_ARGS= --disable-ntbtls --enable-symcryptrun --disable-wks-tools GNU_CONFIGURE= yes USE_LDCONFIG= yes INFO= gnupg +TEST_TARGET= check-all OPTIONS_DEFINE= GNUTLS LDAP SCDAEMON NLS DOCS SUID_GPG OPTIONS_DEFAULT=GNUTLS SCDAEMON NO_OPTIONS_SORT=yes OPTIONS_SUB= yes LDAP_DESC= LDAP keyserver interface SCDAEMON_DESC= Enable Smartcard daemon (with libusb) SUID_GPG_DESC= Install GPG with suid # In jail, SUID is required to avoid warning (security.bsd.unprivileged_mlock sysctl is not used in jail). GNUTLS_CONFIGURE_ENABLE=gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} LDAP_LIBS= -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes LDAP_USES= readline NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext SCDAEMON_CONFIGURE_ENABLE= scdaemon post-install: @${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR} .include Index: head/security/gnupg/distinfo =================================================================== --- head/security/gnupg/distinfo (revision 447408) +++ head/security/gnupg/distinfo (revision 447409) @@ -1,3 +1,3 @@ -TIMESTAMP = 1494886846 -SHA256 (gnupg-2.1.21.tar.bz2) = 7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd -SIZE (gnupg-2.1.21.tar.bz2) = 6472887 +TIMESTAMP = 1501953654 +SHA256 (gnupg-2.1.22.tar.bz2) = 46716faf9e1b92cfca86609f3bfffbf5bb4b6804df90dc853ff7061cfcfb4ad7 +SIZE (gnupg-2.1.22.tar.bz2) = 6530433 Index: head/security/gnupg/files/patch-scdaemon =================================================================== --- head/security/gnupg/files/patch-scdaemon (revision 447408) +++ head/security/gnupg/files/patch-scdaemon (nonexistent) @@ -1,84 +0,0 @@ -From a8dd96826f8484c0ae93c954035b95c2a75c80f2 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Wed, 17 May 2017 09:46:06 +0900 -Subject: [PATCH] g10: Suppress error for card availability check. - -* g10/call-agent.c (start_agent): Add semantics for card; Suppress -error for card check. -(warn_version_mismatch): Ignore an error for scdaemon. -(agent_scd_serialno): Call start_agent with -FLAG_FOR_CARD_SUPPRESS_ERRORS. - --- - -GnuPG-bug-id: 3165 -Fixes-commit: 97a2394ecafaa6f58e4a1f70ecfd04408dc15606 -Signed-off-by: NIIBE Yutaka ---- - g10/call-agent.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/g10/call-agent.c b/g10/call-agent.c -index be8c33d74..4698a25a7 100644 ---- g10/call-agent.c -+++ g10/call-agent.c -@@ -184,7 +184,8 @@ default_inq_cb (void *opaque, const char *line) - - - /* Print a warning if the server's version number is less than our -- version number. Returns an error code on a connection problem. */ -+ version number. Returns an error code on a connection problem. -+ Ignore an error for scdaemon (MODE==2). */ - static gpg_error_t - warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode) - { -@@ -193,7 +194,7 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode) - const char *myversion = strusage (13); - - err = get_assuan_server_version (ctx, mode, &serverversion); -- if (err) -+ if (err && mode != 2) - log_error (_("error getting version from '%s': %s\n"), - servername, gpg_strerror (err)); - else if (compare_version_strings (serverversion, myversion) < 0) -@@ -217,10 +218,12 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode) - } - - -+#define FLAG_FOR_CARD_SUPPRESS_ERRORS 2 -+ - /* Try to connect to the agent via socket or fork it off and work by - pipes. Handle the server's initial greeting */ - static int --start_agent (ctrl_t ctrl, int for_card) -+start_agent (ctrl_t ctrl, int flag_for_card) - { - int rc; - -@@ -280,7 +283,7 @@ start_agent (ctrl_t ctrl, int for_card) - } - } - -- if (!rc && for_card && !did_early_card_test) -+ if (!rc && flag_for_card && !did_early_card_test) - { - /* Request the serial number of the card for an early test. */ - struct agent_card_info_s info; -@@ -292,7 +295,7 @@ start_agent (ctrl_t ctrl, int for_card) - rc = assuan_transact (agent_ctx, "SCD SERIALNO openpgp", - NULL, NULL, NULL, NULL, - learn_status_cb, &info); -- if (rc) -+ if (rc && !(flag_for_card & FLAG_FOR_CARD_SUPPRESS_ERRORS)) - { - switch (gpg_err_code (rc)) - { -@@ -1023,7 +1026,7 @@ agent_scd_serialno (char **r_serialno, const char *demand) - char *serialno = NULL; - char line[ASSUAN_LINELENGTH]; - -- err = start_agent (NULL, 1); -+ err = start_agent (NULL, 1 | FLAG_FOR_CARD_SUPPRESS_ERRORS); - if (err) - return err; - Property changes on: head/security/gnupg/files/patch-scdaemon ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/security/gnupg/pkg-plist (revision 447408) +++ head/security/gnupg/pkg-plist (revision 447409) @@ -1,122 +1,124 @@ bin/gpg-agent bin/dirmngr bin/dirmngr-client bin/gpgscm bin/gpgsm bin/gpgtar bin/gpg-connect-agent bin/kbxutil %%SUID_GPG%%@(,,4555) bin/gpg2 %%NO_SUID_GPG%%bin/gpg2 bin/gpgconf bin/gpgparsemail bin/gpgv2 bin/symcryptrun bin/watchgnupg %%LDAP%%libexec/dirmngr_ldap libexec/gpg-check-pattern libexec/gpg-preset-passphrase libexec/gpg-protect-tool libexec/gpg-wks-client %%SCDAEMON%%libexec/scdaemon man/man1/dirmngr-client.1.gz man/man1/gpg-agent.1.gz man/man1/gpg-connect-agent.1.gz man/man1/gpg-preset-passphrase.1.gz +man/man1/gpg-wks-client.1.gz +man/man1/gpg-wks-server.1.gz man/man1/gpg2.1.gz man/man1/gpgconf.1.gz man/man1/gpgparsemail.1.gz man/man1/gpgsm.1.gz man/man1/gpgv2.1.gz man/man1/scdaemon.1.gz man/man1/symcryptrun.1.gz man/man1/watchgnupg.1.gz man/man7/gnupg.7.gz man/man8/addgnupghome.8.gz man/man8/applygnupgdefaults.8.gz 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 %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TRANSLATE %%PORTDOCS%%%%DOCSDIR%%/examples/README %%PORTDOCS%%%%DOCSDIR%%/examples/debug.prf %%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-browser.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 %%PORTDOCS%%%%DOCSDIR%%/examples/vsnfd.prf %%PORTDOCS%%%%DOCSDIR%%/help.be.txt %%PORTDOCS%%%%DOCSDIR%%/help.ca.txt %%PORTDOCS%%%%DOCSDIR%%/help.cs.txt %%PORTDOCS%%%%DOCSDIR%%/help.da.txt %%PORTDOCS%%%%DOCSDIR%%/help.de.txt %%PORTDOCS%%%%DOCSDIR%%/help.el.txt %%PORTDOCS%%%%DOCSDIR%%/help.eo.txt %%PORTDOCS%%%%DOCSDIR%%/help.es.txt %%PORTDOCS%%%%DOCSDIR%%/help.et.txt %%PORTDOCS%%%%DOCSDIR%%/help.fi.txt %%PORTDOCS%%%%DOCSDIR%%/help.fr.txt %%PORTDOCS%%%%DOCSDIR%%/help.gl.txt %%PORTDOCS%%%%DOCSDIR%%/help.hu.txt %%PORTDOCS%%%%DOCSDIR%%/help.id.txt %%PORTDOCS%%%%DOCSDIR%%/help.it.txt %%PORTDOCS%%%%DOCSDIR%%/help.ja.txt %%PORTDOCS%%%%DOCSDIR%%/help.nb.txt %%PORTDOCS%%%%DOCSDIR%%/help.pl.txt %%PORTDOCS%%%%DOCSDIR%%/help.pt.txt %%PORTDOCS%%%%DOCSDIR%%/help.pt_BR.txt %%PORTDOCS%%%%DOCSDIR%%/help.ro.txt %%PORTDOCS%%%%DOCSDIR%%/help.ru.txt %%PORTDOCS%%%%DOCSDIR%%/help.sk.txt %%PORTDOCS%%%%DOCSDIR%%/help.sv.txt %%PORTDOCS%%%%DOCSDIR%%/help.tr.txt %%PORTDOCS%%%%DOCSDIR%%/help.txt %%PORTDOCS%%%%DOCSDIR%%/help.zh_CN.txt %%PORTDOCS%%%%DOCSDIR%%/help.zh_TW.txt %%DATADIR%%/distsigkey.gpg %%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 %%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 @postexec [ -e %D/bin/gpg ] || ln -sf gpg2 %D/bin/gpg @postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg