diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 76c2132742c2..452308c269a0 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,69 +1,69 @@ PORTNAME= gnupg -PORTVERSION= 2.2.27 +PORTVERSION= 2.3.0 CATEGORIES= security MASTER_SITES= GNUPG MAINTAINER= adamw@FreeBSD.org COMMENT= Complete and free PGP implementation LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING 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 RUN_DEPENDS= pinentry:security/pinentry USES= compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite tar:bzip2 CONFLICTS= gnupg-2.0.* dirmngr-[0-9]* CPE_VENDOR= gnupg CONFIGURE_ARGS= --disable-ntbtls --enable-gpg-is-gpg2 --enable-symcryptrun GNU_CONFIGURE= yes INFO= gnupg TEST_TARGET= check TEST_ARGS= TESTARGS=--parallel SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS GNUTLS LARGE_RSA LDAP NLS SCDAEMON SUID_GPG WKS_SERVER OPTIONS_DEFAULT=GNUTLS SCDAEMON WKS_SERVER OPTIONS_SUB= yes LARGE_RSA_DESC= Enable support for 8192-bit RSA keys LDAP_DESC= LDAP keyserver interface SCDAEMON_DESC= Enable Smartcard daemon (with libusb) -SUID_GPG_DESC= Install GPG with suid +SUID_GPG_DESC= Install GPG as SUID root WKS_SERVER_DESC=Install the Web Key Service server GNUTLS_CONFIGURE_ENABLE=gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls LARGE_RSA_CONFIGURE_ENABLE= large-secmem LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} LDAP_LIBS= -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext SCDAEMON_CONFIGURE_ENABLE= scdaemon WKS_SERVER_CONFIGURE_ENABLE= wks-tools # Touch the texinfo files to force makeinfo to run. This fixes Linuxisms in # the paths in the man pages. pre-build: ${TOUCH} ${WRKSRC}/doc/*.texi post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/gpgsplit ${STAGEDIR}${PREFIX}/bin/gpgsplit2 ${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR} .include diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index 094506df443f..61cff8e4eaa3 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1610426077 -SHA256 (gnupg-2.2.27.tar.bz2) = 34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399 -SIZE (gnupg-2.2.27.tar.bz2) = 7191555 +TIMESTAMP = 1617905248 +SHA256 (gnupg-2.3.0.tar.bz2) = 84c1ef39e8621cfb70f31463a5d1d8edeab44332bc1e0e1af9b78b6f9ed05bb4 +SIZE (gnupg-2.3.0.tar.bz2) = 7557228 diff --git a/security/gnupg/files/patch-doc_scdaemon.texi b/security/gnupg/files/patch-doc_scdaemon.texi deleted file mode 100644 index f44dc1142da2..000000000000 --- a/security/gnupg/files/patch-doc_scdaemon.texi +++ /dev/null @@ -1,14 +0,0 @@ ---- doc/scdaemon.texi.orig 2019-11-20 21:45:47 UTC -+++ doc/scdaemon.texi -@@ -300,6 +300,11 @@ Note that with the current version of Scdaemon the car - down immediately at the next timer tick for any value of @var{n} other - than 0. - -+@item --shared-access -+@opindex shared-access -+Open the smart card in shared mode, rather than exclusive. This will allow -+other applications like PKCS#11 libraries to use the smart card concurrently. -+ - @item --enable-pinpad-varlen - @opindex enable-pinpad-varlen - Please specify this option when the card reader supports variable diff --git a/security/gnupg/files/patch-scd_apdu.c b/security/gnupg/files/patch-scd_apdu.c deleted file mode 100644 index f3313b850367..000000000000 --- a/security/gnupg/files/patch-scd_apdu.c +++ /dev/null @@ -1,11 +0,0 @@ ---- scd/apdu.c.orig 2019-07-09 09:08:45 UTC -+++ scd/apdu.c -@@ -816,7 +816,7 @@ connect_pcsc_card (int slot) - - err = pcsc_connect (reader_table[slot].pcsc.context, - reader_table[slot].rdrname, -- PCSC_SHARE_EXCLUSIVE, -+ opt.shared_access ? PCSC_SHARE_SHARED : PCSC_SHARE_EXCLUSIVE, - PCSC_PROTOCOL_T0|PCSC_PROTOCOL_T1, - &reader_table[slot].pcsc.card, - &reader_table[slot].pcsc.protocol); diff --git a/security/gnupg/files/patch-scd_scdaemon.c b/security/gnupg/files/patch-scd_scdaemon.c deleted file mode 100644 index 4b2e62255de6..000000000000 --- a/security/gnupg/files/patch-scd_scdaemon.c +++ /dev/null @@ -1,36 +0,0 @@ ---- scd/scdaemon.c.orig 2019-07-09 09:08:45 UTC -+++ scd/scdaemon.c -@@ -99,6 +99,7 @@ enum cmd_and_opt_values - oDenyAdmin, - oDisableApplication, - oEnablePinpadVarlen, -+ oSharedAccess, - oListenBacklog, - - oNoop -@@ -164,6 +165,8 @@ static ARGPARSE_OPTS opts[] = { - /* Stubs for options which are implemented by 2.3 or later. */ - ARGPARSE_s_s (oNoop, "application-priority", "@"), - -+ ARGPARSE_s_n (oSharedAccess, "shared-access", N_("use PCSC_SHARE_SHARED for pcsc_connect")), -+ - ARGPARSE_end () - }; - -@@ -629,6 +632,8 @@ main (int argc, char **argv ) - - case oNoop: break; - -+ case oSharedAccess: opt.shared_access = 1; break; -+ - default: - pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR; - break; -@@ -727,6 +732,7 @@ main (int argc, char **argv ) - es_printf ("disable-pinpad:%lu:\n", GC_OPT_FLAG_NONE ); - es_printf ("card-timeout:%lu:%d:\n", GC_OPT_FLAG_DEFAULT, 0); - es_printf ("enable-pinpad-varlen:%lu:\n", GC_OPT_FLAG_NONE ); -+ es_printf ("shared-access:%lu:\n", GC_OPT_FLAG_NONE ); - - scd_exit (0); - } diff --git a/security/gnupg/files/patch-scd_scdaemon.h b/security/gnupg/files/patch-scd_scdaemon.h deleted file mode 100644 index 66748abf6bd6..000000000000 --- a/security/gnupg/files/patch-scd_scdaemon.h +++ /dev/null @@ -1,11 +0,0 @@ ---- scd/scdaemon.h.orig 2019-07-09 09:08:45 UTC -+++ scd/scdaemon.h -@@ -62,6 +62,8 @@ struct - strlist_t disabled_applications; /* Card applications we do not - want to use. */ - unsigned long card_timeout; /* Disconnect after N seconds of inactivity. */ -+ -+ int shared_access; - } opt; - - diff --git a/security/gnupg/files/patch-tools_gpgconf-comp.c b/security/gnupg/files/patch-tools_gpgconf-comp.c deleted file mode 100644 index 51bb3c1aca41..000000000000 --- a/security/gnupg/files/patch-tools_gpgconf-comp.c +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/gpgconf-comp.c.orig 2019-07-09 09:08:45 UTC -+++ tools/gpgconf-comp.c -@@ -653,6 +653,9 @@ static gc_option_t gc_options_scdaemon[] = - { "card-timeout", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC, - "gnupg", "|N|disconnect the card after N seconds of inactivity", - GC_ARG_TYPE_UINT32, GC_BACKEND_SCDAEMON }, -+ { "shared-access", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC, -+ "gnupg", "use PCSC_SHARE_SHARED for pcsc_connect", -+ GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON }, - - { "Debug", - GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED, diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist index fb5cc8ca273c..77c212e987bd 100644 --- a/security/gnupg/pkg-plist +++ b/security/gnupg/pkg-plist @@ -1,127 +1,133 @@ -bin/dirmngr -bin/dirmngr-client +%%GNUTLS%%bin/dirmngr +%%GNUTLS%%bin/dirmngr-client bin/gpg-agent +bin/gpg-card bin/gpg-connect-agent +bin/gpg-wks-client %%WKS_SERVER%%bin/gpg-wks-server %%SUID_GPG%%@(,,4555) bin/gpg2 %%NO_SUID_GPG%%bin/gpg2 bin/gpgconf bin/gpgparsemail bin/gpgscm bin/gpgsm bin/gpgsplit2 bin/gpgtar bin/gpgv2 bin/kbxutil bin/watchgnupg %%LDAP%%libexec/dirmngr_ldap libexec/gpg-check-pattern +libexec/gpg-pair-tool libexec/gpg-preset-passphrase libexec/gpg-protect-tool libexec/gpg-wks-client +libexec/keyboxd %%SCDAEMON%%libexec/scdaemon man/man1/dirmngr-client.1.gz man/man1/gpg-agent.1.gz +man/man1/gpg-card.1.gz +man/man1/gpg-check-pattern.1.gz man/man1/gpg-connect-agent.1.gz man/man1/gpg-preset-passphrase.1.gz man/man1/gpg-wks-client.1.gz %%WKS_SERVER%%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/gpgtar.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/Automatic.prf %%PORTDOCS%%%%DOCSDIR%%/examples/README %%PORTDOCS%%%%DOCSDIR%%/examples/VS-NfD.prf %%PORTDOCS%%%%DOCSDIR%%/examples/debug.prf %%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf %%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list +%%PORTDOCS%%%%DOCSDIR%%/examples/qualified.txt %%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%%/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 +%%GNUTLS%%%%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