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

Update to opensc-0.14.0

Browse Source
This commit is contained in:
dcoppa 2014-08-13 06:18:47 +00:00
parent c484dc9d8f
commit 6ff7d2ab3c
6 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/opensc/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.23 2014/01/13 09:03:21 dcoppa Exp $
# $OpenBSD: Makefile,v 1.24 2014/08/13 06:18:47 dcoppa Exp $
SHARED_ONLY= Yes
COMMENT= set of libraries and utilities to access smart cards
DISTNAME= opensc-0.13.0
REVISION= 0
DISTNAME= opensc-0.14.0
CATEGORIES= security
SHARED_LIBS += opensc 3.0 # 3.0
@ -15,7 +14,7 @@ HOMEPAGE= https://github.com/OpenSC/OpenSC/wiki
MAINTAINER= David Coppa <dcoppa@openbsd.org>
# LGPLv2.1
# LGPLv2.1+
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opensc/}

4
security/opensc/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (opensc-0.13.0.tar.gz) = q95GrlOxKzJz5AxTL/1PfUI6UeCRmlI0dhRTwXwImxQ=
SIZE (opensc-0.13.0.tar.gz) = 1946899
SHA256 (opensc-0.14.0.tar.gz) = +s3KIV902Zmyhq4katqNj8uXzljwpt0w2LHBgBAem/A=
SIZE (opensc-0.14.0.tar.gz) = 2039158

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

@ -1,20 +1,17 @@
$OpenBSD: patch-configure_ac,v 1.1 2013/06/07 13:27:58 dcoppa Exp $
$OpenBSD: patch-configure_ac,v 1.2 2014/08/13 06:18:47 dcoppa Exp $
libdl is not required on OpenBSD
--- configure.ac.orig Tue Dec 4 15:43:40 2012
+++ configure.ac Thu Jun 6 10:20:51 2013
@@ -285,14 +285,6 @@ AC_CHECK_LIB(
--- 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(
)
if test "${WIN32}" = "no"; then
- dnl dl support
- AC_CHECK_LIB(
- [dl],
- [dlopen],
- ,
- [AC_MSG_ERROR([libdl required])]
- )
- AC_SEARCH_LIBS([dlopen], [dl dld], [], [
- AC_MSG_ERROR([unable to find the dlopen() function])
- ])
-
dnl Special check for pthread support.
AX_PTHREAD(

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

@ -1,4 +1,4 @@
$OpenBSD: patch-src_pkcs11_Makefile_in,v 1.1 2013/06/07 13:27:58 dcoppa Exp $
$OpenBSD: patch-src_pkcs11_Makefile_in,v 1.2 2014/08/13 06:18:47 dcoppa Exp $
Do not install shared modules under ${PREFIX}/lib/ and avoid the
nasty symlink dance
@ -6,9 +6,9 @@ nasty symlink dance
Use --tag=disable-static to disable libtool static archives for
modules
--- src/pkcs11/Makefile.in.orig Tue Dec 4 15:43:58 2012
+++ src/pkcs11/Makefile.in Thu Jun 6 10:28:53 2013
@@ -74,7 +74,7 @@ am__nobase_list = $(am__nobase_strip_setup); \
--- src/pkcs11/Makefile.in.orig Mon Jun 30 20:38:01 2014
+++ src/pkcs11/Makefile.in Wed Aug 13 07:42:08 2014
@@ -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' | \
sed '$$!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 \
@@ -190,6 +190,7 @@ LIBOBJS = @LIBOBJS@
@@ -212,6 +212,7 @@ LIBOBJS = @LIBOBJS@
LIBRARY_BITNESS = @LIBRARY_BITNESS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@ -25,8 +25,8 @@ modules
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -385,25 +386,25 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
@@ -423,25 +424,25 @@ versioninfo-pkcs11-spy.rc: $(top_builddir)/config.stat
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@ -58,9 +58,9 @@ modules
done
clean-libLTLIBRARIES:
@@ -424,9 +425,9 @@ $(top_builddir)/win32/versioninfo.lo: \
$(top_builddir)/win32/$(am__dirstamp) \
$(top_builddir)/win32/$(DEPDIR)/$(am__dirstamp)
@@ -455,9 +456,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)
- $(AM_V_CCLD)$(opensc_pkcs11_la_LINK) -rpath $(libdir) $(opensc_pkcs11_la_OBJECTS) $(opensc_pkcs11_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(opensc_pkcs11_la_LINK) -rpath $(pkcs11dir) $(opensc_pkcs11_la_OBJECTS) $(opensc_pkcs11_la_LIBADD) $(LIBS)
@ -70,7 +70,7 @@ modules
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -566,7 +567,7 @@ check-am: all-am
@@ -693,7 +694,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
@@ -628,7 +629,6 @@ install-dvi-am:
@@ -753,7 +754,6 @@ install-dvi-am:
install-exec-am: install-libLTLIBRARIES
@$(NORMAL_INSTALL)
@ -87,7 +87,7 @@ modules
install-html: install-html-am
install-html-am:
@@ -676,7 +676,7 @@ uninstall-am: uninstall-libLTLIBRARIES
@@ -801,7 +801,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 \
@@ -700,18 +700,6 @@ pkcs11-jar: jar-dir
@@ -825,18 +825,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
@ -108,7 +108,7 @@ modules
-@WIN32_TRUE@ done
-@WIN32_FALSE@install-exec-hook:
-@WIN32_FALSE@ $(MKDIR_P) "$(DESTDIR)$(pkcs11dir)"
-@WIN32_FALSE@ for l in opensc-pkcs11$(PKCS11_SUFFIX) pkcs11-spy$(PKCS11_SUFFIX); do \
-@WIN32_FALSE@ for l in opensc-pkcs11$(PKCS11_SUFFIX) onepin-opensc-pkcs11$(PKCS11_SUFFIX) pkcs11-spy$(PKCS11_SUFFIX); do \
-@WIN32_FALSE@ rm -f "$(DESTDIR)$(pkcs11dir)/$$l"; \
-@WIN32_FALSE@ $(LN_S) ../$$l "$(DESTDIR)$(pkcs11dir)/$$l"; \
-@WIN32_FALSE@ done

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_tests_Makefile_in,v 1.1 2013/08/20 14:28:48 dcoppa Exp $
--- src/tests/Makefile.in.orig Tue Aug 20 15:56:20 2013
+++ src/tests/Makefile.in Tue Aug 20 15:57:20 2013
@@ -211,7 +211,8 @@ LIBRARY_BITNESS = @LIBRARY_BITNESS@
$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@
LIBS = \
$(top_builddir)/src/libopensc/libopensc.la \
$(top_builddir)/src/common/libscdl.la \

5
security/opensc/pkg/PLIST
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.5 2013/06/07 13:27:58 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.6 2014/08/13 06:18:47 dcoppa Exp $
%%SHARED%%
@bin bin/cardos-tool
@bin bin/cryptoflex-tool
@bin bin/dnie-tool
@bin bin/eidenv
@bin bin/iasecc-tool
@bin bin/netkey-tool
@ -22,6 +23,8 @@ lib/libsmm-local.a
lib/libsmm-local.la
@lib lib/libsmm-local.so.${LIBsmm-local_VERSION}
lib/pkcs11/
lib/pkcs11/onepin-opensc-pkcs11.la
lib/pkcs11/onepin-opensc-pkcs11.so
lib/pkcs11/opensc-pkcs11.la
lib/pkcs11/pkcs11-spy.la
lib/pkgconfig/libopensc.pc