diff --git a/security/opensc/Makefile b/security/opensc/Makefile index 485819609e76..a4118112ab53 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -1,71 +1,71 @@ PORTNAME= opensc -DISTVERSION= 0.23.0 +DISTVERSION= 0.24.0 CATEGORIES= security devel MAINTAINER= ale@FreeBSD.org COMMENT= Libraries and utilities to access smart cards WWW= https://github.com/OpenSC/OpenSC/wiki LICENSE= LGPL21 USES= autoreconf compiler:c11 cpe gmake libtool pkgconfig ssl CPE_VENDOR= ${PORTNAME}_project OPTIONS_SINGLE= BACKEND OPTIONS_SINGLE_BACKEND=PCSC OPENCT CTAPI OPTIONS_DEFINE= SM NOTIFY DOCS MANPAGES OPTIONS_DEFAULT=PCSC SM NOTIFY MANPAGES OPTIONS_SUB= yes PCSC_DESC= Use PC/SC backend OPENCT_DESC= Use OpenCT backend CTAPI_DESC= Use CT-API backend SM_DESC= Enable secure messaging support NOTIFY_DESC= Enable notification support USE_GITHUB= yes GH_ACCOUNT= OpenSC GH_PROJECT= ${GH_ACCOUNT} GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip CONFIGURE_ENV= \ OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" CONFIGURE_ARGS= --with-completiondir=${PREFIX}/etc/bash_completion.d PORTDOCS= * MANPAGES_CONFIGURE_ENABLE= man OPENCT_LIB_DEPENDS= libopenct.so:security/openct OPENCT_CONFIGURE_ENABLE= openct PCSC_LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite PCSC_CONFIGURE_ENABLE= pcsc CTAPI_CONFIGURE_ENABLE= ctapi SM_CONFIGURE_ENABLE= sm NOTIFY_USES= gnome NOTIFY_USE= GNOME=glib20 NOTIFY_CONFIGURE_ENABLE= notify DOCS_CONFIGURE_ENABLE= doc .include .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES} BUILD_DEPENDS+= xsltproc:textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl CONFIGURE_ENV+= XSLTPROC="${LOCALBASE}/bin/xsltproc" CONFIGURE_ARGS+=--with-xsl-stylesheetsdir=${LOCALBASE}/share/xsl/docbook .else CONFIGURE_ENV+= XSLTPROC="${FALSE}" CONFIGURE_ARGS+=--without-xsl-stylesheetsdir .endif .include diff --git a/security/opensc/distinfo b/security/opensc/distinfo index 4a1db05592e2..c60cad13d4c6 100644 --- a/security/opensc/distinfo +++ b/security/opensc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669793318 -SHA256 (OpenSC-OpenSC-0.23.0_GH0.tar.gz) = a08b475834e3c3b0efd9bfc46adfcc3440d3975c2fb3ab2ef29342b879d41370 -SIZE (OpenSC-OpenSC-0.23.0_GH0.tar.gz) = 1965145 +TIMESTAMP = 1702551303 +SHA256 (OpenSC-OpenSC-0.24.0_GH0.tar.gz) = e89c3136227babb0b389a8107c7726916efa4c7edcd5d46f234396dc9a20d552 +SIZE (OpenSC-OpenSC-0.24.0_GH0.tar.gz) = 2030987 diff --git a/security/opensc/files/patch-configure.ac b/security/opensc/files/patch-configure.ac deleted file mode 100644 index 4a74f468d85e..000000000000 --- a/security/opensc/files/patch-configure.ac +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.ac.orig 2022-11-30 08:14:31 UTC -+++ configure.ac -@@ -554,10 +554,6 @@ case "${host}" in - have_notify="no" - have_gio2="no" ]) - LIBS="$saved_LIBS" -- if test "${have_gio2}" = "yes"; then -- # we do not need lglib-2.0 -- GIO2_LIBS="-lgio-2.0 -lgobject-2.0" -- fi - ;; - esac - diff --git a/security/opensc/files/patch-src_libopensc_card-openpgp.c b/security/opensc/files/patch-src_libopensc_card-openpgp.c deleted file mode 100644 index 7c840b899a44..000000000000 --- a/security/opensc/files/patch-src_libopensc_card-openpgp.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/libopensc/card-openpgp.c.orig 2023-03-13 11:54:48 UTC -+++ src/libopensc/card-openpgp.c -@@ -129,7 +129,7 @@ static pgp_ec_curves_t ec_curves_gnuk[] = { - - static int pgp_get_card_features(sc_card_t *card); - static int pgp_finish(sc_card_t *card); --static void pgp_iterate_blobs(pgp_blob_t *, void (*func)()); -+static void pgp_iterate_blobs(pgp_blob_t *, void (*func)(pgp_blob_t *)); - - static int pgp_get_blob(sc_card_t *card, pgp_blob_t *blob, - unsigned int id, pgp_blob_t **ret); -@@ -1150,7 +1150,7 @@ pgp_free_blob(pgp_blob_t *blob) - * Internal: iterate through the blob tree, calling a function for each blob. - */ - static void --pgp_iterate_blobs(pgp_blob_t *blob, void (*func)()) -+pgp_iterate_blobs(pgp_blob_t *blob, void (*func)(pgp_blob_t *)) - { - if (blob) { - pgp_blob_t *child = blob->files; diff --git a/security/opensc/files/patch-src_tools_cardos-tool.c b/security/opensc/files/patch-src_tools_cardos-tool.c deleted file mode 100644 index 3e0519b10d0d..000000000000 --- a/security/opensc/files/patch-src_tools_cardos-tool.c +++ /dev/null @@ -1,50 +0,0 @@ ---- src/tools/cardos-tool.c.orig 2023-03-24 14:20:46 UTC -+++ src/tools/cardos-tool.c -@@ -1143,7 +1143,6 @@ int main(int argc, char *argv[]) - int do_info = 0; - int do_format = 0; - int do_change_startkey = 0; -- int action_count = 0; - const char *opt_startkey = NULL; - const char *opt_change_startkey = NULL; - sc_context_param_t ctx_param; -@@ -1155,11 +1154,9 @@ int main(int argc, char *argv[]) - util_print_usage_and_die(app_name, options, option_help, NULL); - case 'i': - do_info = 1; -- action_count++; - break; - case 'f': - do_format = 1; -- action_count++; - break; - case 's': - opt_startkey = optarg; -@@ -1167,7 +1164,6 @@ int main(int argc, char *argv[]) - case 'S': - do_change_startkey = 1; - opt_change_startkey = optarg; -- action_count++; - break; - case 'r': - opt_reader = optarg; -@@ -1217,19 +1213,16 @@ int main(int argc, char *argv[]) - if ((err = cardos_info())) { - goto end; - } -- action_count--; - } - if (do_change_startkey) { - if ((err = cardos_change_startkey(opt_change_startkey))) { - goto end; - } -- action_count--; - } - if (do_format) { - if ((err = cardos_format(opt_startkey))) { - goto end; - } -- action_count--; - } - end: - if (card) { diff --git a/security/opensc/files/patch-src_tools_netkey-tool.c b/security/opensc/files/patch-src_tools_netkey-tool.c deleted file mode 100644 index 069500a1d4a8..000000000000 --- a/security/opensc/files/patch-src_tools_netkey-tool.c +++ /dev/null @@ -1,26 +0,0 @@ ---- src/tools/netkey-tool.c.orig 2023-03-24 14:58:28 UTC -+++ src/tools/netkey-tool.c -@@ -443,13 +443,12 @@ int main( - int do_help=0, do_unblock=0, do_change=0, do_nullpin=0, do_readcert=0, do_writecert=0; - u8 newpin[32]; - char *certfile=NULL, *p; -- int r, oerr=0, reader=0, debug=0, pin_nr=-1, cert_nr=-1; -+ int r, oerr=0, reader=0, pin_nr=-1, cert_nr=-1; - size_t i, newlen=0; - -- while ((r = getopt_long(argc, argv, "hvr:p:u:0:1:", options, NULL)) != -1) { -+ while ((r = getopt_long(argc, argv, "hr:p:u:0:1:", options, NULL)) != -1) { - switch (r) { - case 'h': ++do_help; break; -- case 'v': ++debug; break; - case 'r': reader=atoi(optarg); break; - case 'p': set_pin(pinlist[0].value, &pinlist[0].len, optarg); break; - case 'u': set_pin(pinlist[1].value, &pinlist[1].len, optarg); break; -@@ -462,7 +461,6 @@ int main( - fprintf(stderr,"This is netkey-tool V1.0, May 15 2005, Copyright Peter Koch \n"); - fprintf(stderr,"usage: %s command\n", argv[0]); - fprintf(stderr,"\nOptions:\n"); -- fprintf(stderr," -v : verbose, may be specified several times\n"); - fprintf(stderr," --reader , -r : use reader num (default 0)\n"); - fprintf(stderr," --pin , -p : current value of global PIN\n"); - fprintf(stderr," --puk , -u : current value of global PUK\n"); diff --git a/security/opensc/files/patch-src_tools_pkcs11-tool.c b/security/opensc/files/patch-src_tools_pkcs11-tool.c deleted file mode 100644 index 41f40d4461a8..000000000000 --- a/security/opensc/files/patch-src_tools_pkcs11-tool.c +++ /dev/null @@ -1,19 +0,0 @@ ---- src/tools/pkcs11-tool.c.orig 2023-03-20 10:54:36 UTC -+++ src/tools/pkcs11-tool.c -@@ -7301,7 +7301,6 @@ static int test_random(CK_SESSION_HANDLE session) - CK_BYTE buf1[100], buf2[100]; - CK_BYTE seed1[100]; - CK_RV rv; -- int errors = 0; - - printf("C_SeedRandom() and C_GenerateRandom():\n"); - -@@ -7344,7 +7343,7 @@ static int test_random(CK_SESSION_HANDLE session) - - if (memcmp(buf1, buf2, 100) == 0) { - printf(" ERR: C_GenerateRandom returned twice the same value!!!\n"); -- errors++; -+ return 1; - } - - printf(" seems to be OK\n"); diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist index 163da89738aa..e2213342fc00 100644 --- a/security/opensc/pkg-plist +++ b/security/opensc/pkg-plist @@ -1,117 +1,116 @@ bin/cardos-tool bin/cryptoflex-tool bin/dnie-tool bin/egk-tool bin/eidenv bin/gids-tool bin/goid-tool bin/iasecc-tool bin/netkey-tool bin/openpgp-tool bin/opensc-asn1 bin/opensc-explorer bin/opensc-notify bin/opensc-tool bin/piv-tool bin/pkcs11-register bin/pkcs11-tool bin/pkcs15-crypt bin/pkcs15-init bin/pkcs15-tool bin/sc-hsm-tool bin/westcos-tool etc/bash_completion.d/cardos-tool etc/bash_completion.d/cryptoflex-tool etc/bash_completion.d/dnie-tool etc/bash_completion.d/egk-tool etc/bash_completion.d/eidenv etc/bash_completion.d/gids-tool etc/bash_completion.d/goid-tool etc/bash_completion.d/iasecc-tool etc/bash_completion.d/netkey-tool etc/bash_completion.d/npa-tool etc/bash_completion.d/opensc-asn1 etc/bash_completion.d/openpgp-tool etc/bash_completion.d/opensc-explorer etc/bash_completion.d/opensc-notify etc/bash_completion.d/opensc-tool etc/bash_completion.d/piv-tool etc/bash_completion.d/pkcs11-register etc/bash_completion.d/pkcs11-tool etc/bash_completion.d/pkcs15-crypt etc/bash_completion.d/pkcs15-init etc/bash_completion.d/pkcs15-tool etc/bash_completion.d/sc-hsm-tool etc/bash_completion.d/westcos-tool @sample etc/opensc.conf.sample -etc/xdg/autostart/pkcs11-register.desktop lib/libopensc.a lib/libopensc.so lib/libopensc.so.8 -lib/libopensc.so.8.1.0 +lib/libopensc.so.8.2.1 %%SM%%lib/libsmm-local.so %%SM%%lib/libsmm-local.so.8 -%%SM%%lib/libsmm-local.so.8.1.0 +%%SM%%lib/libsmm-local.so.8.2.1 lib/onepin-opensc-pkcs11.so lib/opensc-pkcs11.so lib/pkcs11-spy.so lib/pkcs11/onepin-opensc-pkcs11.so lib/pkcs11/opensc-pkcs11.so lib/pkcs11/pkcs11-spy.so libdata/pkgconfig/opensc-pkcs11.pc share/applications/org.opensc.notify.desktop %%DATADIR%%/asepcos.profile %%DATADIR%%/authentic.profile %%DATADIR%%/cardos.profile %%DATADIR%%/cyberflex.profile %%DATADIR%%/entersafe.profile %%DATADIR%%/epass2003.profile %%DATADIR%%/flex.profile %%DATADIR%%/gids.profile %%DATADIR%%/gpk.profile %%DATADIR%%/ias_adele_admin1.profile %%DATADIR%%/ias_adele_admin2.profile %%DATADIR%%/ias_adele_common.profile %%DATADIR%%/iasecc_admin_eid.profile %%DATADIR%%/iasecc_generic_oberthur.profile %%DATADIR%%/iasecc_generic_pki.profile %%DATADIR%%/iasecc.profile %%DATADIR%%/incrypto34.profile %%DATADIR%%/isoApplet.profile %%DATADIR%%/muscle.profile %%DATADIR%%/myeid.profile %%DATADIR%%/oberthur.profile %%DATADIR%%/openpgp.profile %%DATADIR%%/pkcs15.profile %%DATADIR%%/rutoken.profile %%DATADIR%%/rutoken_ecp.profile %%DATADIR%%/rutoken_lite.profile %%DATADIR%%/sc-hsm.profile %%DATADIR%%/setcos.profile %%DATADIR%%/starcos.profile %%DATADIR%%/westcos.profile %%MANPAGES%%man/man1/cardos-tool.1.gz %%MANPAGES%%man/man1/cryptoflex-tool.1.gz %%MANPAGES%%man/man1/dnie-tool.1.gz %%MANPAGES%%man/man1/egk-tool.1.gz %%MANPAGES%%man/man1/eidenv.1.gz %%MANPAGES%%man/man1/gids-tool.1.gz %%MANPAGES%%man/man1/goid-tool.1.gz %%MANPAGES%%man/man1/iasecc-tool.1.gz %%MANPAGES%%man/man1/netkey-tool.1.gz %%MANPAGES%%man/man1/npa-tool.1.gz %%MANPAGES%%man/man1/openpgp-tool.1.gz %%MANPAGES%%man/man1/opensc-asn1.1.gz %%MANPAGES%%man/man1/opensc-explorer.1.gz %%MANPAGES%%man/man1/opensc-notify.1.gz %%MANPAGES%%man/man1/opensc-tool.1.gz %%MANPAGES%%man/man1/piv-tool.1.gz %%MANPAGES%%man/man1/pkcs11-register.1.gz %%MANPAGES%%man/man1/pkcs11-tool.1.gz %%MANPAGES%%man/man1/pkcs15-crypt.1.gz %%MANPAGES%%man/man1/pkcs15-init.1.gz %%MANPAGES%%man/man1/pkcs15-tool.1.gz %%MANPAGES%%man/man1/sc-hsm-tool.1.gz %%MANPAGES%%man/man1/westcos-tool.1.gz %%MANPAGES%%man/man5/opensc.conf.5.gz %%MANPAGES%%man/man5/pkcs15-profile.5.gz