From nobody Fri Mar 24 16:01:35 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 4Pjn5C31s1z41kM4; Fri, 24 Mar 2023 16:01:35 +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 4Pjn5C2G9Gz4KZY; Fri, 24 Mar 2023 16:01:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679673695; 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=UDUpUlU1IWulClm+2wi0qlUVI8/a00UdP8fgwR+njQ8=; b=oR+KW4pUEqYfBnjvQ0QZOasevHKrc8WZnhfqM3TQAb3IwnwAXCgojgbRUyTcwx8R1i4jLD KVyTEdipYB6/iJKIWQEWYan3ggiyXlDLHdag7sMgvC/BeaNBPAFrSt076wl3BR8lHj6WID ufwAc4/6uujXcFmke31JJgn2jCI5BwjTf0HDx/8WHGEnS1jJIE86a1x7yWc5tWUrNxYSta Fd90ugyqQoxIzN5nqvfMSEPbrW6AzfhtPCN8gDuENWZLnwb9D7m1MNK8Xp3hPG+qN+mpjX zUV8GleNDEcpbxpoI0IDVM426kuqkSb7ql6j8gbOucqcT+aER9siiaRBTV7xxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679673695; 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=UDUpUlU1IWulClm+2wi0qlUVI8/a00UdP8fgwR+njQ8=; b=tht/Zt8mbV7GRZpfHs/JBHsuhU8TQznOIQlV37nie2YWbZT1N301SjkYxJmUcc9VcR9zCu Pl3pKT1vZ43So/VXsO5vq2GVmpUAec4vnVk4kVnAmCULXwELLNjCibUkDsRhYUa4C3+kPg c1G40LEnTEZVLM8jMy2NnQevvRAIQJN62DhDTRKov/5N07vnAHZ2PIMU5xOMoSpUOGEkB+ 6HK1zB7Wcq8y3Bn2Dlsp+Scuxv/QB32csS7A75USMllTPwfQvQytylv6MMpxiOoaUiY8B3 FWC0GU9mxGgN1YUs8aM6CWjjonYZUpfDj9SiqKhxOKHp4eszxQqyzscX9kSD3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679673695; a=rsa-sha256; cv=none; b=d9KXNOPQPIKAzLkkHIFdj3U4ksegbu/LZvl4gFma3Mx6Ve4djklfsiGBVuCZB4z6W3PSMN SsIsSxXjF95qkAKtiBvDHWWCZm3kxY4EeeX9UH3a7Qm+jeZ13Ae3LUlHNzf7OQb+sEPdAP Sz6s+qrwxsKk5kxvHQoS5CkKczt8o5NXSmFHeD5BZZFFZeoP075CV68kyKneA0QhzhEYpv D+k3BCImmxbnIANJ3OYTSoMJjXnudfjF6dNlqq3Z9QcTyrMLuo/XidNNyW2Z3c4nmEk+vW cTwBVZLUMEhhnZe2yAKXDYIDuf2+wFtvouVFreuEHYLXt7HNpxV38Pyw10dOZA== 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 4Pjn5C1KhqzNY3; Fri, 24 Mar 2023 16:01:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32OG1ZgD008500; Fri, 24 Mar 2023 16:01:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OG1ZIM008499; Fri, 24 Mar 2023 16:01:35 GMT (envelope-from git) Date: Fri, 24 Mar 2023 16:01:35 GMT Message-Id: <202303241601.32OG1ZIM008499@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: be307c813ec5 - main - security/opensc: finally fix build on -CURRENT. 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: be307c813ec5a5607ac637d46e9310277b10ea8e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=be307c813ec5a5607ac637d46e9310277b10ea8e commit be307c813ec5a5607ac637d46e9310277b10ea8e Author: Alex Dupre AuthorDate: 2023-03-24 16:00:46 +0000 Commit: Alex Dupre CommitDate: 2023-03-24 16:01:25 +0000 security/opensc: finally fix build on -CURRENT. --- .../opensc/files/patch-src_tools_cardos-tool.c | 50 ++++++++++++++++++++++ .../opensc/files/patch-src_tools_netkey-tool.c | 26 +++++++++++ 2 files changed, 76 insertions(+) diff --git a/security/opensc/files/patch-src_tools_cardos-tool.c b/security/opensc/files/patch-src_tools_cardos-tool.c new file mode 100644 index 000000000000..3e0519b10d0d --- /dev/null +++ b/security/opensc/files/patch-src_tools_cardos-tool.c @@ -0,0 +1,50 @@ +--- 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 new file mode 100644 index 000000000000..069500a1d4a8 --- /dev/null +++ b/security/opensc/files/patch-src_tools_netkey-tool.c @@ -0,0 +1,26 @@ +--- 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");