cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to opensc-0.15.0

Browse Source
This commit is contained in:
dcoppa 2015-04-24 12:53:23 +00:00
parent 06d6cb8462
commit 9fd2aa9565
8 changed files with 41 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/opensc/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.27 2015/03/20 22:47:41 naddy Exp $
# $OpenBSD: Makefile,v 1.28 2015/04/24 12:53:23 dcoppa Exp $
SHARED_ONLY= Yes
COMMENT= set of libraries and utilities to access smart cards
DISTNAME= opensc-0.14.0
REVISION= 2
DISTNAME= opensc-0.15.0
CATEGORIES= security
SHARED_LIBS += opensc 3.0 # 3.0
SHARED_LIBS += opensc 4.0 # 3.0
SHARED_LIBS += smm-local 0.0 # 3.0
HOMEPAGE= https://github.com/OpenSC/OpenSC/wiki

4
security/opensc/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (opensc-0.14.0.tar.gz) = +s3KIV902Zmyhq4katqNj8uXzljwpt0w2LHBgBAem/A=
SIZE (opensc-0.14.0.tar.gz) = 2039158
SHA256 (opensc-0.15.0.tar.gz) = CH3DRaUA9WnpE+OtTkFb59+H0EsST9U29advNrCOOqM=
SIZE (opensc-0.15.0.tar.gz) = 2086370

8
security/opensc/patches/patch-configure_ac
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure_ac,v 1.2 2014/08/13 06:18:47 dcoppa Exp $
$OpenBSD: patch-configure_ac,v 1.3 2015/04/24 12:53:24 dcoppa Exp $
libdl is not required on OpenBSD
--- configure.ac.orig Wed Aug 13 07:35:15 2014
+++ configure.ac Wed Aug 13 07:36:15 2014
@@ -331,11 +331,6 @@ AC_CHECK_LIB(
--- configure.ac.orig Wed Apr 8 18:11:06 2015
+++ configure.ac Fri Apr 24 13:21:34 2015
@@ -338,11 +338,6 @@ AC_CHECK_LIB(
)
if test "${WIN32}" = "no"; then

15
security/opensc/patches/patch-doc_tools_Makefile_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-doc_tools_Makefile_in,v 1.1 2015/04/24 12:53:24 dcoppa Exp $
Do not install bash completion files
--- doc/tools/Makefile.in.orig Fri Apr 24 13:35:33 2015
+++ doc/tools/Makefile.in Fri Apr 24 13:36:14 2015
@@ -507,7 +507,7 @@ info: info-am
info-am:
-install-data-am: install-completionDATA install-htmlDATA install-man
+install-data-am: install-htmlDATA install-man
install-dvi: install-dvi-am

46
security/opensc/patches/patch-src_libopensc_pkcs15-sc-hsm_c
View File

@ -1,46 +0,0 @@
$OpenBSD: patch-src_libopensc_pkcs15-sc-hsm_c,v 1.1 2014/10/24 13:44:00 dcoppa Exp $
commit 5279bfa2d14d2186b31189748bcf89d908f00512
Author: Andreas Schwier <andreas.schwier@cardcontact.de>
Date: Wed Jul 9 14:22:51 2014 +0200
sc-hsm: Prevent double-free crash if key generation fails
--- src/libopensc/pkcs15-sc-hsm.c.orig Mon Jun 30 20:37:44 2014
+++ src/libopensc/pkcs15-sc-hsm.c Fri Oct 24 15:31:26 2014
@@ -421,27 +421,35 @@ void sc_pkcs15emu_sc_hsm_free_cvc(sc_cvc_t *cvc)
{
if (cvc->signature) {
free(cvc->signature);
+ cvc->signature = NULL;
}
if (cvc->primeOrModulus) {
free(cvc->primeOrModulus);
+ cvc->primeOrModulus = NULL;
}
if (cvc->coefficientAorExponent) {
free(cvc->coefficientAorExponent);
+ cvc->coefficientAorExponent = NULL;
}
if (cvc->coefficientB) {
free(cvc->coefficientB);
+ cvc->coefficientB = NULL;
}
if (cvc->basePointG) {
free(cvc->basePointG);
+ cvc->basePointG = NULL;
}
if (cvc->order) {
free(cvc->order);
+ cvc->order = NULL;
}
if (cvc->publicPoint) {
free(cvc->publicPoint);
+ cvc->publicPoint = NULL;
}
if (cvc->cofactor) {
free(cvc->cofactor);
+ cvc->cofactor = NULL;
}
}

20
security/opensc/patches/patch-src_pkcs11_Makefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_pkcs11_Makefile_in,v 1.2 2014/08/13 06:18:47 dcoppa Exp $
$OpenBSD: patch-src_pkcs11_Makefile_in,v 1.3 2015/04/24 12:53:24 dcoppa Exp $
Do not install shared modules under ${PREFIX}/lib/ and avoid the
nasty symlink dance
@ -6,8 +6,8 @@ nasty symlink dance
Use --tag=disable-static to disable libtool static archives for
modules
--- src/pkcs11/Makefile.in.orig Mon Jun 30 20:38:01 2014
+++ src/pkcs11/Makefile.in Wed Aug 13 07:42:08 2014
--- src/pkcs11/Makefile.in.orig Wed Apr 8 18:11:24 2015
+++ src/pkcs11/Makefile.in Fri Apr 24 13:21:34 2015
@@ -77,7 +77,7 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
@ -17,7 +17,7 @@ modules
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
am__DEPENDENCIES_2 = $(top_builddir)/src/libopensc/libopensc.la \
@@ -212,6 +212,7 @@ LIBOBJS = @LIBOBJS@
@@ -213,6 +213,7 @@ LIBOBJS = @LIBOBJS@
LIBRARY_BITNESS = @LIBRARY_BITNESS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@ -25,7 +25,7 @@ modules
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -423,25 +424,25 @@ versioninfo-pkcs11-spy.rc: $(top_builddir)/config.stat
@@ -424,25 +425,25 @@ versioninfo-pkcs11-spy.rc: $(top_builddir)/config.stat
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@ -58,7 +58,7 @@ modules
done
clean-libLTLIBRARIES:
@@ -455,9 +456,9 @@ clean-libLTLIBRARIES:
@@ -456,9 +457,9 @@ clean-libLTLIBRARIES:
onepin-opensc-pkcs11.la: $(onepin_opensc_pkcs11_la_OBJECTS) $(onepin_opensc_pkcs11_la_DEPENDENCIES)
$(AM_V_CCLD)$(onepin_opensc_pkcs11_la_LINK) -rpath $(libdir) $(onepin_opensc_pkcs11_la_OBJECTS) $(onepin_opensc_pkcs11_la_LIBADD) $(LIBS)
opensc-pkcs11.la: $(opensc_pkcs11_la_OBJECTS) $(opensc_pkcs11_la_DEPENDENCIES)
@ -70,7 +70,7 @@ modules
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -693,7 +694,7 @@ check-am: all-am
@@ -694,7 +695,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(LTLIBRARIES) $(SCRIPTS)
installdirs:
@ -79,7 +79,7 @@ modules
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -753,7 +754,6 @@ install-dvi-am:
@@ -754,7 +755,6 @@ install-dvi-am:
install-exec-am: install-libLTLIBRARIES
@$(NORMAL_INSTALL)
@ -87,7 +87,7 @@ modules
install-html: install-html-am
install-html-am:
@@ -801,7 +801,7 @@ uninstall-am: uninstall-libLTLIBRARIES
@@ -802,7 +802,7 @@ uninstall-am: uninstall-libLTLIBRARIES
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
@ -96,7 +96,7 @@ modules
install-html install-html-am install-info install-info-am \
install-libLTLIBRARIES install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
@@ -825,18 +825,6 @@ pkcs11-jar: jar-dir
@@ -826,18 +826,6 @@ pkcs11-jar: jar-dir
cp opensc_pkcs11_install.js jar-dir
signtool -Z"opensc-pkcs11.jar" -i"opensc_pkcs11_install.js" \
-k"testcert" jar-dir

8
security/opensc/patches/patch-src_tests_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_tests_Makefile_in,v 1.2 2014/08/13 06:18:47 dcoppa Exp $
--- src/tests/Makefile.in.orig Mon Jun 30 20:38:01 2014
+++ src/tests/Makefile.in Wed Aug 13 07:34:28 2014
@@ -212,7 +212,8 @@ LIBRARY_BITNESS = @LIBRARY_BITNESS@
$OpenBSD: patch-src_tests_Makefile_in,v 1.3 2015/04/24 12:53:24 dcoppa Exp $
--- src/tests/Makefile.in.orig Wed Apr 8 18:11:24 2015
+++ src/tests/Makefile.in Fri Apr 24 13:21:34 2015
@@ -213,7 +213,8 @@ LIBRARY_BITNESS = @LIBRARY_BITNESS@
LIBS = \
$(top_builddir)/src/libopensc/libopensc.la \
$(top_builddir)/src/common/libscdl.la \

4
security/opensc/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2015/03/20 22:47:42 naddy Exp $
@comment $OpenBSD: PLIST,v 1.9 2015/04/24 12:53:24 dcoppa Exp $
@bin bin/cardos-tool
@bin bin/cryptoflex-tool
@bin bin/dnie-tool
@ -31,6 +31,7 @@ lib/pkcs11/pkcs11-spy.so
lib/pkgconfig/libopensc.pc
@man man/man1/cardos-tool.1
@man man/man1/cryptoflex-tool.1
@man man/man1/dnie-tool.1
@man man/man1/eidenv.1
@man man/man1/iasecc-tool.1
@man man/man1/netkey-tool.1
@ -69,6 +70,7 @@ share/opensc/iasecc_admin_eid.profile
share/opensc/iasecc_generic_oberthur.profile
share/opensc/iasecc_generic_pki.profile
share/opensc/incrypto34.profile
share/opensc/isoApplet.profile
share/opensc/jcop.profile
share/opensc/miocos.profile
share/opensc/muscle.profile