mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

security/opensc: update to 0.24.0 release.

Browse source
This commit is contained in:
Alex Dupre 2023-12-14 12:20:18 +01:00
parent cf22efd769
commit 3ca1841aed
8 changed files with 6 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
security/opensc/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= opensc
DISTVERSION= 0.23.0
DISTVERSION= 0.24.0
CATEGORIES= security devel
MAINTAINER= ale@FreeBSD.org

6
security/opensc/distinfo
View file

@ -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

13
security/opensc/files/patch-configure.ac
View file

@ -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

20
security/opensc/files/patch-src_libopensc_card-openpgp.c
View file

@ -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;

50
security/opensc/files/patch-src_tools_cardos-tool.c
View file

@ -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) {

26
security/opensc/files/patch-src_tools_netkey-tool.c
View file

@ -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 <pk_opensc@web.de>\n");
fprintf(stderr,"usage: %s <options> command\n", argv[0]);
fprintf(stderr,"\nOptions:\n");
- fprintf(stderr," -v : verbose, may be specified several times\n");
fprintf(stderr," --reader <num>, -r <num> : use reader num (default 0)\n");
fprintf(stderr," --pin <pin>, -p <pin> : current value of global PIN\n");
fprintf(stderr," --puk <pin>, -u <pin> : current value of global PUK\n");

19
security/opensc/files/patch-src_tools_pkcs11-tool.c
View file

@ -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");

5
security/opensc/pkg-plist
View file

@ -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