From 70a311c4ea81c037be1fdba6b20286d147ac24e7 Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 23 Dec 2008 19:10:33 +0000 Subject: [PATCH] - update opensc to 0.11.6, includes a SECURITY FIX for SA31330 from Douglas Santos (MAINTAINER), with cleanups and tweaks by me --- security/opensc/Makefile | 23 ++-- security/opensc/distinfo | 10 +- security/opensc/patches/patch-configure | 8 +- security/opensc/patches/patch-doc_Makefile_in | 12 ++ security/opensc/pkg/PFRAG.shared | 10 +- security/opensc/pkg/PLIST | 117 ++++++++++++------ 6 files changed, 118 insertions(+), 62 deletions(-) create mode 100644 security/opensc/patches/patch-doc_Makefile_in diff --git a/security/opensc/Makefile b/security/opensc/Makefile index 4404a81afa2..e8c6020768e 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -1,15 +1,14 @@ -# $OpenBSD: Makefile,v 1.7 2007/09/15 23:29:59 merdely Exp $ +# $OpenBSD: Makefile,v 1.8 2008/12/23 19:10:33 jasper Exp $ COMMENT= set of libraries and utilities to access smart cards -DISTNAME= opensc-0.9.6 -PKGNAME= ${DISTNAME}p1 +DISTNAME= opensc-0.11.6 CATEGORIES= security -SHARED_LIBS= opensc 1.0 \ - pkcs15init 1.0 \ - scam 1.0 \ - scconf 1.0 \ - pkcs11 1.0 +SHARED_LIBS += scconf 2.0 # .1.0 +SHARED_LIBS += opensc 2.0 # .1.0 +SHARED_LIBS += pkcs15init 2.0 # .1.0 +SHARED_LIBS += opensc 2.0 # .1.0 +SHARED_LIBS += pkcs15init 2.0 # .1.0 MODGNU_SHARED_LIBS=opensc '' \ pkcs15init '' \ scam '' \ @@ -20,7 +19,7 @@ HOMEPAGE= http://www.opensc-project.org/ MAINTAINER= Douglas Santos -# GPL +# LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -28,7 +27,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}/files/opensc/ -WANTLIB= readline crypto termcap c pthread +WANTLIB= c crypto ltdl ncurses readline z LIB_DEPENDS= openct.>=1::security/openct @@ -40,7 +39,9 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --enable-static \ --sysconfdir=${SYSCONFDIR} \ --disable-ldap -CONFIGURE_ENV= PTHREAD_LIBS=-pthread +CONFIGURE_ENV= PTHREAD_LIBS=-pthread \ + LTLIB_CFLAGS="-I${LOCALBASE}/include" \ + LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/opensc diff --git a/security/opensc/distinfo b/security/opensc/distinfo index 50dac29bb53..bcc56f1f63f 100644 --- a/security/opensc/distinfo +++ b/security/opensc/distinfo @@ -1,5 +1,5 @@ -MD5 (opensc-0.9.6.tar.gz) = OP3WRWbMb8gzONZZ6Ba0+w== -RMD160 (opensc-0.9.6.tar.gz) = coLzBLEzTmrc1LiUbW+5fJ5q80Q= -SHA1 (opensc-0.9.6.tar.gz) = pC3iq8kxN5yArtdgT/UoFGvoUXA= -SHA256 (opensc-0.9.6.tar.gz) = U9fU/6RZmxPxgFgBgF2JE/7o7expoIL/npqinWGTpSY= -SIZE (opensc-0.9.6.tar.gz) = 1002151 +MD5 (opensc-0.11.6.tar.gz) = pCZ1nxE1DDKvLxelzU1ZOA== +RMD160 (opensc-0.11.6.tar.gz) = 3oONgnAw8Yf/pXAo269QE/bILmg= +SHA1 (opensc-0.11.6.tar.gz) = CqO2pXpzD44G8ThTciDDDucJA38= +SHA256 (opensc-0.11.6.tar.gz) = gB/bAFgsInbkdjXhcDmn+FRnwMsYTXTM56wxPSSsqgA= +SIZE (opensc-0.11.6.tar.gz) = 1452763 diff --git a/security/opensc/patches/patch-configure b/security/opensc/patches/patch-configure index b8856bf90a1..0e68409395b 100644 --- a/security/opensc/patches/patch-configure +++ b/security/opensc/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2005/11/27 11:01:14 alek Exp $ ---- configure.orig Sat Nov 26 19:09:05 2005 -+++ configure Sat Nov 26 19:09:10 2005 -@@ -20282,9 +20282,6 @@ fi +$OpenBSD: patch-configure,v 1.2 2008/12/23 19:10:33 jasper Exp $ +--- configure.orig Wed Aug 27 08:27:00 2008 ++++ configure Tue Dec 23 19:58:18 2008 +@@ -21306,9 +21306,6 @@ fi # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" diff --git a/security/opensc/patches/patch-doc_Makefile_in b/security/opensc/patches/patch-doc_Makefile_in new file mode 100644 index 00000000000..6371ab692cf --- /dev/null +++ b/security/opensc/patches/patch-doc_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-doc_Makefile_in,v 1.1 2008/12/23 19:10:33 jasper Exp $ +--- doc/Makefile.in.orig Tue Dec 23 20:00:55 2008 ++++ doc/Makefile.in Tue Dec 23 20:01:07 2008 +@@ -224,7 +224,7 @@ libdir = @libdir@ + libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ +-mandir = @mandir@ ++mandir = @prefix@/man/ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + openscincludedir = @openscincludedir@ diff --git a/security/opensc/pkg/PFRAG.shared b/security/opensc/pkg/PFRAG.shared index c318bb8d43b..dee1795612b 100644 --- a/security/opensc/pkg/PFRAG.shared +++ b/security/opensc/pkg/PFRAG.shared @@ -1,10 +1,10 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/25 15:52:38 sturm Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.3 2008/12/23 19:10:33 jasper Exp $ @lib lib/libopensc.so.${LIBopensc_VERSION} @lib lib/libpkcs15init.so.${LIBpkcs15init_VERSION} -@lib lib/libscam.so.${LIBscam_VERSION} @lib lib/libscconf.so.${LIBscconf_VERSION} -lib/opensc/engine_opensc.so -lib/opensc/engine_pkcs11.so -@lib lib/pkcs11/libpkcs11.so.${LIBpkcs11_VERSION} +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 diff --git a/security/opensc/pkg/PLIST b/security/opensc/pkg/PLIST index 183afaf33a5..91e602a4360 100644 --- a/security/opensc/pkg/PLIST +++ b/security/opensc/pkg/PLIST @@ -1,63 +1,55 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2005/11/27 11:01:14 alek Exp $ +@comment $OpenBSD: PLIST,v 1.2 2008/12/23 19:10:33 jasper Exp $ %%SHARED%% -bin/cardos-info -bin/cryptoflex-tool +@bin bin/cardos-info +@bin bin/cryptoflex-tool +@bin bin/eidenv +@bin bin/netkey-tool bin/opensc-config -bin/opensc-explorer -bin/opensc-tool -bin/pkcs11-tool -bin/pkcs15-crypt -bin/pkcs15-init -bin/pkcs15-tool +@bin bin/opensc-explorer +@bin bin/opensc-tool +@bin bin/piv-tool +@bin bin/pkcs11-tool +@bin bin/pkcs15-crypt +@bin bin/pkcs15-init +@bin bin/pkcs15-tool +@bin bin/rutoken-tool include/opensc/ include/opensc/asn1.h include/opensc/cardctl.h +include/opensc/compression.h include/opensc/emv.h include/opensc/errors.h include/opensc/log.h include/opensc/opensc.h +include/opensc/pkcs11-opensc.h include/opensc/pkcs11.h include/opensc/pkcs15-init.h include/opensc/pkcs15.h -include/opensc/rsaref/ -include/opensc/rsaref/pkcs11.h -include/opensc/rsaref/pkcs11f.h -include/opensc/rsaref/pkcs11t.h -include/opensc/rsaref/unix.h -include/opensc/rsaref/win32.h include/opensc/scconf.h -include/opensc/scldap.h include/opensc/types.h include/opensc/ui.h lib/libopensc.a lib/libopensc.la lib/libpkcs15init.a lib/libpkcs15init.la -lib/libscam.a -lib/libscam.la lib/libscconf.a lib/libscconf.la -lib/opensc/ -lib/opensc/engine_opensc.a -lib/opensc/engine_opensc.la -lib/opensc/engine_pkcs11.a -lib/opensc/engine_pkcs11.la +lib/mozilla/ +lib/mozilla/plugins/ +lib/onepin-opensc-pkcs11.a +lib/onepin-opensc-pkcs11.la +lib/opensc-pkcs11.a +lib/opensc-pkcs11.la lib/pkcs11/ -lib/pkcs11/libpkcs11.a -lib/pkcs11/libpkcs11.la -lib/pkcs11/opensc-pkcs11.a -lib/pkcs11/opensc-pkcs11.la -lib/pkcs11/pkcs11-spy.a -lib/pkcs11/pkcs11-spy.la +lib/pkcs11-spy.a +lib/pkcs11-spy.la lib/pkgconfig/ lib/pkgconfig/libopensc.pc lib/pkgconfig/libpkcs15init.pc -lib/pkgconfig/libscam.pc lib/pkgconfig/libscconf.pc -lib/pkgconfig/libscldap.pc -lib/security/ @man man/man1/cardos-info.1 @man man/man1/cryptoflex-tool.1 +@man man/man1/netkey-tool.1 @man man/man1/opensc-config.1 @man man/man1/opensc-explorer.1 @man man/man1/opensc-tool.1 @@ -65,35 +57,86 @@ lib/security/ @man man/man1/pkcs15-crypt.1 @man man/man1/pkcs15-init.1 @man man/man1/pkcs15-tool.1 +@man man/man3/sc_app_info_t.3 +@man man/man3/sc_append_record.3 +@man man/man3/sc_asn1_decode.3 +@man man/man3/sc_asn1_encode.3 +@man man/man3/sc_asn1_entry.3 +@man man/man3/sc_asn1_find_tag.3 +@man man/man3/sc_asn1_print_tags.3 +@man man/man3/sc_asn1_put_tag.3 +@man man/man3/sc_asn1_read_tag.3 +@man man/man3/sc_asn1_skip_tag.3 +@man man/man3/sc_asn1_verify_tag.3 +@man man/man3/sc_base64_decode.3 +@man man/man3/sc_base64_encode.3 +@man man/man3/sc_card_ctl.3 +@man man/man3/sc_card_t.3 +@man man/man3/sc_card_valid.3 +@man man/man3/sc_check_sw.3 @man man/man3/sc_connect_card.3 +@man man/man3/sc_copy_asn1_entry.3 +@man man/man3/sc_create_file.3 +@man man/man3/sc_delete_file.3 +@man man/man3/sc_delete_record.3 +@man man/man3/sc_der_clear.3 +@man man/man3/sc_der_copy.3 @man man/man3/sc_detect_card_presence.3 @man man/man3/sc_disconnect_card.3 +@man man/man3/sc_enum_apps.3 @man man/man3/sc_establish_context.3 -@man man/man3/sc_file.3 +@man man/man3/sc_file_dup.3 @man man/man3/sc_file_free.3 @man man/man3/sc_file_new.3 +@man man/man3/sc_file_t.3 +@man man/man3/sc_find_app_by_aid.3 +@man man/man3/sc_find_pkcs15_app.3 +@man man/man3/sc_format_apdu.3 +@man man/man3/sc_format_asn1_entry.3 +@man man/man3/sc_free_apps.3 +@man man/man3/sc_get_cache_dir.3 +@man man/man3/sc_get_challenge.3 +@man man/man3/sc_get_data.3 @man man/man3/sc_list_files.3 @man man/man3/sc_lock.3 -@man man/man3/sc_pkcs15_compute_signature.3 +@man man/man3/sc_make_cache_dir.3 +@man man/man3/sc_put_data.3 @man man/man3/sc_read_binary.3 @man man/man3/sc_read_record.3 @man man/man3/sc_release_context.3 @man man/man3/sc_select_file.3 +@man man/man3/sc_set_card_driver.3 +@man man/man3/sc_strerror.3 +@man man/man3/sc_transmit_apdu.3 +@man man/man3/sc_unlock.3 +@man man/man3/sc_update_binary.3 +@man man/man3/sc_update_dir.3 +@man man/man3/sc_update_record.3 +@man man/man3/sc_wait_for_event.3 +@man man/man3/sc_write_binary.3 +@man man/man3/sc_write_record.3 @man man/man5/pkcs15-profile.5 -@man man/man7/opensc.7 -@man man/man7/pkcs15.7 +share/doc/opensc/ +share/doc/opensc/NEWS +share/doc/opensc/README share/examples/opensc/ share/examples/opensc/opensc.conf @mode 644 @sample ${SYSCONFDIR}/opensc.conf @mode share/opensc/ +share/opensc/asepcos.profile +share/opensc/cardos.profile share/opensc/cyberflex.profile -share/opensc/etoken.profile +share/opensc/entersafe.profile share/opensc/flex.profile share/opensc/gpk.profile +share/opensc/incrypto34.profile share/opensc/jcop.profile share/opensc/miocos.profile +share/opensc/muscle.profile share/opensc/oberthur.profile share/opensc/pkcs15.profile +share/opensc/rutoken.profile +share/opensc/setcos.profile share/opensc/starcos.profile