From 9dd4d0593b076ea9bfbfd20976344184799f1e61 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 1 Sep 2010 15:59:22 +0000 Subject: update to 0.11.13 This is basically to switch to libassuan2. other changes: minor fixes --- security/opensc/Makefile | 3 +- security/opensc/Makefile.common | 4 +- security/opensc/PLIST | 8 +++- security/opensc/distinfo | 14 +++--- security/opensc/patches/patch-aa | 11 ++--- security/opensc/patches/patch-ab | 8 ++-- security/opensc/patches/patch-ac | 99 ++++++++++++++++++++++++++++++++++++++++ security/opensc/patches/patch-ad | 13 ++++++ 8 files changed, 138 insertions(+), 22 deletions(-) create mode 100644 security/opensc/patches/patch-ac create mode 100644 security/opensc/patches/patch-ad (limited to 'security/opensc') diff --git a/security/opensc/Makefile b/security/opensc/Makefile index d29c5e743a0..6a3f649c8a2 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2010/01/17 12:02:42 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2010/09/01 15:59:22 drochner Exp $ COMMENT= Smart Card drivers and middleware -PKGREVISION= 3 LICENSE= gnu-lgpl-v2.1 .include "../../security/opensc/Makefile.common" diff --git a/security/opensc/Makefile.common b/security/opensc/Makefile.common index 39b2e99deec..4c1cfd03c53 100644 --- a/security/opensc/Makefile.common +++ b/security/opensc/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.4 2009/08/03 18:45:31 hasso Exp $ +# $NetBSD: Makefile.common,v 1.5 2010/09/01 15:59:22 drochner Exp $ # # used by security/opensc/Makefile # used by security/opensc-signer/Makefile -OPENSC_PKG_VERSION= 0.11.9 +OPENSC_PKG_VERSION= 0.11.13 DISTNAME= opensc-${OPENSC_PKG_VERSION} CATEGORIES= security MASTER_SITES= http://www.opensc-project.org/files/opensc/ diff --git a/security/opensc/PLIST b/security/opensc/PLIST index f8c369e945f..2cb40d5d029 100644 --- a/security/opensc/PLIST +++ b/security/opensc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/08/03 18:45:31 hasso Exp $ +@comment $NetBSD: PLIST,v 1.5 2010/09/01 15:59:22 drochner Exp $ bin/cardos-info bin/cardos-tool bin/cryptoflex-tool @@ -13,6 +13,7 @@ bin/pkcs15-crypt bin/pkcs15-init bin/pkcs15-tool bin/rutoken-tool +bin/westcos-tool include/opensc/asn1.h include/opensc/cardctl.h include/opensc/compression.h @@ -20,8 +21,8 @@ include/opensc/emv.h include/opensc/errors.h include/opensc/log.h include/opensc/opensc.h -include/opensc/pkcs11.h include/opensc/pkcs11-opensc.h +include/opensc/pkcs11.h include/opensc/pkcs15-init.h include/opensc/pkcs15.h include/opensc/scconf.h @@ -49,6 +50,7 @@ man/man1/pkcs11-tool.1 man/man1/pkcs15-crypt.1 man/man1/pkcs15-init.1 man/man1/pkcs15-tool.1 +man/man1/westcos-tool.1 man/man3/sc_app_info_t.3 man/man3/sc_append_record.3 man/man3/sc_asn1_decode.3 @@ -121,9 +123,11 @@ share/opensc/incrypto34.profile share/opensc/jcop.profile share/opensc/miocos.profile share/opensc/muscle.profile +share/opensc/myeid.profile share/opensc/oberthur.profile share/opensc/pkcs15.profile share/opensc/rutoken.profile share/opensc/rutoken_ecp.profile share/opensc/setcos.profile share/opensc/starcos.profile +share/opensc/westcos.profile diff --git a/security/opensc/distinfo b/security/opensc/distinfo index cfb66506884..43ca8e82f2f 100644 --- a/security/opensc/distinfo +++ b/security/opensc/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.5 2009/09/10 11:38:56 hasso Exp $ +$NetBSD: distinfo,v 1.6 2010/09/01 15:59:22 drochner Exp $ -SHA1 (opensc-0.11.9.tar.gz) = 8e047d8bd02ad3c48de11be85e8a1349d36b4bfb -RMD160 (opensc-0.11.9.tar.gz) = c2e9099b79106da447a4613bfdd19a5cd9fbae49 -Size (opensc-0.11.9.tar.gz) = 1448948 bytes -SHA1 (patch-aa) = 50d7f7a8320541d1d7286e4fd482d63eeb166e86 -SHA1 (patch-ab) = d21e3ba5e21090cea1389566a7ef2cd6ac4a1ac7 +SHA1 (opensc-0.11.13.tar.gz) = 408b374286004c3df15ec17856f69fd4c2a1aceb +RMD160 (opensc-0.11.13.tar.gz) = cd900866e51cd64fa7c5a3287cd58193dec26528 +Size (opensc-0.11.13.tar.gz) = 1513327 bytes +SHA1 (patch-aa) = ad1c02161590c43170137d1deeaf5e88e7fef1ce +SHA1 (patch-ab) = 6d3d055abd1b94c7024838b9b25cc6005af0d36a +SHA1 (patch-ac) = 6c77415312d1ab149a9cbae9c49f4cf31c950502 +SHA1 (patch-ad) = a618df0e8bc59af9ccea3f3b423b363e09ab0a4c diff --git a/security/opensc/patches/patch-aa b/security/opensc/patches/patch-aa index 7cd65532ded..acbd987a214 100644 --- a/security/opensc/patches/patch-aa +++ b/security/opensc/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/02/26 10:50:05 hasso Exp $ +$NetBSD: patch-aa,v 1.2 2010/09/01 15:59:23 drochner Exp $ ---- etc/Makefile.in.orig 2008-08-06 01:38:42 +0300 -+++ etc/Makefile.in 2008-08-06 01:39:11 +0300 -@@ -422,12 +422,8 @@ opensc.conf: opensc.conf.in force +--- etc/Makefile.in.orig 2010-02-16 09:32:17.000000000 +0000 ++++ etc/Makefile.in +@@ -471,12 +471,7 @@ opensc.conf: opensc.conf.in force -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ -e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \ < $< > $@ @@ -13,7 +13,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/02/26 10:50:05 hasso Exp $ - $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf"; \ - fi +install-exec-hook: -+ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/security/opensc/patches/patch-ab b/security/opensc/patches/patch-ab index 2f56e22ac55..7acb810b364 100644 --- a/security/opensc/patches/patch-ab +++ b/security/opensc/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1 2009/09/10 11:38:56 hasso Exp $ +$NetBSD: patch-ab,v 1.2 2010/09/01 15:59:23 drochner Exp $ ---- etc/opensc.conf.in.orig 2009-09-09 15:46:28 +0300 -+++ etc/opensc.conf.in 2009-09-09 15:49:29 +0300 +--- etc/opensc.conf.in.orig 2010-02-16 09:03:28.000000000 +0000 ++++ etc/opensc.conf.in @@ -47,6 +47,7 @@ app default { # last entry in reader_drivers list # @@ -25,6 +25,6 @@ $NetBSD: patch-ab,v 1.1 2009/09/10 11:38:56 hasso Exp $ # Default: no - # try_emulation_first = yes; + try_emulation_first = yes; - # + # Enable builtin emulators. # Default: yes diff --git a/security/opensc/patches/patch-ac b/security/opensc/patches/patch-ac new file mode 100644 index 00000000000..aa155db89aa --- /dev/null +++ b/security/opensc/patches/patch-ac @@ -0,0 +1,99 @@ +$NetBSD: patch-ac,v 1.1 2010/09/01 15:59:23 drochner Exp $ + +--- src/signer/dialog.c.orig 2010-02-16 09:03:25.000000000 +0000 ++++ src/signer/dialog.c +@@ -15,31 +15,31 @@ struct entry_parm_s { + char *buffer; + }; + +-static AssuanError ++static gpg_error_t + getpin_cb (void *opaque, const void *buffer, size_t length) + { + struct entry_parm_s *parm = (struct entry_parm_s *) opaque; + + /* we expect the pin to fit on one line */ + if (parm->lines || length >= parm->size) +- return ASSUAN_Too_Much_Data; ++ return gpg_error(GPG_ERR_ASS_TOO_MUCH_DATA); + + /* fixme: we should make sure that the assuan buffer is allocated in + secure memory or read the response byte by byte */ + memcpy(parm->buffer, buffer, length); + parm->buffer[length] = 0; + parm->lines++; +- return (AssuanError) 0; ++ return gpg_error(GPG_ERR_NO_ERROR); + } + + int ask_and_verify_pin_code(struct sc_pkcs15_card *p15card, + struct sc_pkcs15_object *pin) + { +- int r; ++ gpg_error_t r; + size_t len; + const char *argv[3]; + const char *pgmname = PIN_ENTRY; +- ASSUAN_CONTEXT ctx; ++ assuan_context_t ctx = NULL; + char buf[500]; + char errtext[100]; + struct entry_parm_s parm; +@@ -48,16 +48,26 @@ int ask_and_verify_pin_code(struct sc_pk + argv[0] = pgmname; + argv[1] = NULL; + +- r = assuan_pipe_connect(&ctx, pgmname, (char **) argv, NULL); ++ assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); ++ ++ r = assuan_new(&ctx); ++ if (r) { ++ printf("Can't initialize assuan context: %s\n)", ++ gpg_strerror(r)); ++ goto err; ++ } ++ ++ r = assuan_pipe_connect(ctx, pgmname, (const char **) argv, \ ++ NULL, NULL, NULL, 0); + if (r) { + printf("Can't connect to the PIN entry module: %s\n", +- assuan_strerror((AssuanError) r)); ++ gpg_strerror(r)); + goto err; + } + sprintf(buf, "SETDESC Enter PIN [%s] for digital signing ", pin->label); + r = assuan_transact(ctx, buf, NULL, NULL, NULL, NULL, NULL, NULL); + if (r) { +- printf("SETDESC: %s\n", assuan_strerror((AssuanError) r)); ++ printf("SETDESC: %s\n", gpg_strerror(r)); + goto err; + } + errtext[0] = 0; +@@ -71,12 +81,12 @@ int ask_and_verify_pin_code(struct sc_pk + parm.size = sizeof(buf); + parm.buffer = buf; + r = assuan_transact(ctx, "GETPIN", getpin_cb, &parm, NULL, NULL, NULL, NULL); +- if (r == ASSUAN_Canceled) { +- assuan_disconnect(ctx); ++ if (gpg_err_code(r) == GPG_ERR_ASS_CANCELED) { ++ assuan_release(ctx); + return -2; + } + if (r) { +- printf("GETPIN: %s\n", assuan_strerror((AssuanError) r)); ++ printf("GETPIN: %s\n", gpg_strerror(r)); + goto err; + } + len = strlen(buf); +@@ -104,9 +114,9 @@ int ask_and_verify_pin_code(struct sc_pk + break; + } + +- assuan_disconnect(ctx); ++ assuan_release(ctx); + return 0; + err: +- assuan_disconnect(ctx); ++ assuan_release(ctx); + return -1; + } diff --git a/security/opensc/patches/patch-ad b/security/opensc/patches/patch-ad new file mode 100644 index 00000000000..60ce19b89b1 --- /dev/null +++ b/security/opensc/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2010/09/01 15:59:23 drochner Exp $ + +--- configure.orig 2010-02-16 09:32:16.000000000 +0000 ++++ configure +@@ -14239,7 +14239,7 @@ fi + + + +- tmp=1:0.9.2 ++ tmp=2:2.0.0 + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` + min_libassuan_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` -- cgit v1.2.3