Index: head/security/gnupg/Makefile =================================================================== --- head/security/gnupg/Makefile (revision 518434) +++ head/security/gnupg/Makefile (revision 518435) @@ -1,72 +1,72 @@ # $FreeBSD$ PORTNAME= gnupg PORTVERSION= 2.2.17 -PORTREVISION= 3 +PORTREVISION= 4 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 BUILD_DEPENDS= libassuan>=2.5.1:security/libassuan \ libgpg-error>=1.16:security/libgpg-error 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 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 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}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR} .include Index: head/security/gnupg/files/patch-doc_scdaemon.texi =================================================================== --- head/security/gnupg/files/patch-doc_scdaemon.texi (nonexistent) +++ head/security/gnupg/files/patch-doc_scdaemon.texi (revision 518435) @@ -0,0 +1,14 @@ +--- 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 Property changes on: head/security/gnupg/files/patch-doc_scdaemon.texi ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gnupg/files/patch-scd_apdu.c =================================================================== --- head/security/gnupg/files/patch-scd_apdu.c (nonexistent) +++ head/security/gnupg/files/patch-scd_apdu.c (revision 518435) @@ -0,0 +1,11 @@ +--- 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); Property changes on: head/security/gnupg/files/patch-scd_apdu.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gnupg/files/patch-scd_scdaemon.c =================================================================== --- head/security/gnupg/files/patch-scd_scdaemon.c (nonexistent) +++ head/security/gnupg/files/patch-scd_scdaemon.c (revision 518435) @@ -0,0 +1,36 @@ +--- 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); + } Property changes on: head/security/gnupg/files/patch-scd_scdaemon.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gnupg/files/patch-scd_scdaemon.h =================================================================== --- head/security/gnupg/files/patch-scd_scdaemon.h (nonexistent) +++ head/security/gnupg/files/patch-scd_scdaemon.h (revision 518435) @@ -0,0 +1,11 @@ +--- 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; + + Property changes on: head/security/gnupg/files/patch-scd_scdaemon.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gnupg/files/patch-tools_gpgconf-comp.c =================================================================== --- head/security/gnupg/files/patch-tools_gpgconf-comp.c (nonexistent) +++ head/security/gnupg/files/patch-tools_gpgconf-comp.c (revision 518435) @@ -0,0 +1,12 @@ +--- 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, Property changes on: head/security/gnupg/files/patch-tools_gpgconf-comp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property