From nobody Thu Dec 14 11:20:45 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SrVJs6yHVz53qX7; Thu, 14 Dec 2023 11:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SrVJs4kvSz4WTV; Thu, 14 Dec 2023 11:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702552845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SIBJyTXWnj37RrtCHi5wzyMCjhK5/50tEwY1qK9LCzM=; b=IjTI4Uox81w+WSA6QUEmQzjmtl4nI4YVeE8WsMIB0YC8eiodWUzUy8594JFEO8ll2rUmzo Y6sDL6FGdjozUSDuyqQhQm88qRZgmDIz42NOCsNmn777BAe7iV3DEnHzU687T36ut9P8YG CZXipMg4KE2p6FGzRSHtVo744sUt0X1EI46v0PyZnJjeLe286AWKYVFg6M8c46r4OmkCIF tsxZvUczUoHxUaq2AIb35A/MzguUZb1x1bf9gLGylUXmkbIMexTe+PVCfsRnA2FnRuIFzV yS6k2YuHi69sHFPCVQV9Z9bdyXxTtQyiNIXudnNmHjIqpj95I/qr5LUOGyb4Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702552845; a=rsa-sha256; cv=none; b=pzjenWuCOgCoId65LwH4SVwcRNdl6MVNUNlNXsvPVNtqJvUOFQTcLSo4WLpqMNT5n9oAYE M22IVUUrAiJJqtwTXJo0SgYe7rQILMbFCS7D8PL5/sVI662VfkiHtQp3HQdJ0r74b0otI1 B+C8dZBoiVJJ0XCmeZsTfzTaWNVEMCVQt4mhhzd4NcTi/oQP1G4enNp/3uB8LMqyHTp3Vg U2BCebgS6PFkMqYPl/ySnpAQ02o4BZt7CiVeQWckcL6sWI0/ym7HEIoeD37gowtYPHppDc +mwzkOj6pNbc7Q8cvwXXqfC4kA64nA3uxm6NhXt7H/Oi4JBk0ffeCM6ugB4gWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702552845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SIBJyTXWnj37RrtCHi5wzyMCjhK5/50tEwY1qK9LCzM=; b=dshQ4PYGCo3c139R8NyglYFGa2O9VcklvWEkqpj7wzgYz/PRNvuVcBNlummOwlOn8c7VyV 2TbVT+wSFb7O9bV34wenf+kN7S+vOSNDVvMRc12rXlvHf/WYtrYzmdVAqCbYtnRTK++8QH qipnfVq/Y46d6ps9XKUxJveQ84cb6XwDDR5Z9m6HZ4JTwmyn3Ix/Sn/T5R10O0SN2BACdB nDcJXOGj/K/INHV/0lWOJO9oNOsKa8pCX+pH4dFupyBIGdc9dzURlo0GyccuxAOKfQ+KiW 5jheA77Wl1rBINce3vbYsG8FOYduJARSOGi6rZNOCGjiQjjorNRPQClXdtA6MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SrVJs3phGz9Xh; Thu, 14 Dec 2023 11:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BEBKjAd037020; Thu, 14 Dec 2023 11:20:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEBKjBe037017; Thu, 14 Dec 2023 11:20:45 GMT (envelope-from git) Date: Thu, 14 Dec 2023 11:20:45 GMT Message-Id: <202312141120.3BEBKjBe037017@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: 3ca1841aed9a - main - security/opensc: update to 0.24.0 release. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ca1841aed9ae3a4cdb09e95e7072d79f3138923 Auto-Submitted: auto-generated The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ca1841aed9ae3a4cdb09e95e7072d79f3138923 commit 3ca1841aed9ae3a4cdb09e95e7072d79f3138923 Author: Alex Dupre AuthorDate: 2023-12-14 11:20:18 +0000 Commit: Alex Dupre CommitDate: 2023-12-14 11:20:42 +0000 security/opensc: update to 0.24.0 release. --- security/opensc/Makefile | 2 +- security/opensc/distinfo | 6 +-- security/opensc/files/patch-configure.ac | 13 ------ .../files/patch-src_libopensc_card-openpgp.c | 20 --------- .../opensc/files/patch-src_tools_cardos-tool.c | 50 ---------------------- .../opensc/files/patch-src_tools_netkey-tool.c | 26 ----------- .../opensc/files/patch-src_tools_pkcs11-tool.c | 19 -------- security/opensc/pkg-plist | 5 +-- 8 files changed, 6 insertions(+), 135 deletions(-) diff --git a/security/opensc/Makefile b/security/opensc/Makefile index 485819609e76..a4118112ab53 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -1,5 +1,5 @@ PORTNAME= opensc -DISTVERSION= 0.23.0 +DISTVERSION= 0.24.0 CATEGORIES= security devel MAINTAINER= ale@FreeBSD.org 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 @@ -44,14 +44,13 @@ 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