summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/opensc/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/opensc/files')
-rw-r--r--dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch38
-rw-r--r--dev-libs/opensc/files/opensc-0.12.2-dl.patch42
-rw-r--r--dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch67
-rw-r--r--dev-libs/opensc/files/opensc-0.13.0-openssl.patch27
4 files changed, 174 insertions, 0 deletions
diff --git a/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch b/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch
new file mode 100644
index 000000000000..008fd3c35700
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch
@@ -0,0 +1,38 @@
+--- src/pkcs11/Makefile.am 2011-05-17 13:07:00.000000000 -0400
++++ Makefile.am.new 2011-07-07 10:03:28.399185928 -0400
+@@ -14,9 +14,10 @@
+ mechanism.c openssl.c framework-pkcs15.c \
+ framework-pkcs15init.c debug.c opensc-pkcs11.exports \
+ pkcs11-display.c pkcs11-display.h
+-OPENSC_PKCS11_LIBS = $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) $(LTLIB_LIBS) \
++OPENSC_PKCS11_LIBS = \
+ $(top_builddir)/src/common/libcompat.la \
+- $(top_builddir)/src/libopensc/libopensc.la
++ $(top_builddir)/src/libopensc/libopensc.la \
++ $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) $(LTLIB_LIBS)
+
+ opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) hack-disabled.c
+ opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
+@@ -31,7 +32,7 @@
+ -module -shared -avoid-version -no-undefined
+
+ pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h pkcs11-spy.exports
+-pkcs11_spy_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) $(top_builddir)/src/common/libpkcs11.la
++pkcs11_spy_la_LIBADD = $(top_builddir)/src/common/libpkcs11.la $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS)
+ pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
+ -export-symbols "$(srcdir)/pkcs11-spy.exports" \
+ -module -shared -avoid-version -no-undefined
+--- src/tools/Makefile.am 2011-05-17 13:07:00.000000000 -0400
++++ Makefile.am.new 2011-07-07 10:06:08.710185925 -0400
+@@ -24,8 +24,9 @@
+ pkcs15_tool_SOURCES = pkcs15-tool.c util.c
+ pkcs15_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
+ pkcs11_tool_SOURCES = pkcs11-tool.c util.c
+-pkcs11_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) \
+- $(top_builddir)/src/common/libpkcs11.la
++pkcs11_tool_LDADD = \
++ $(top_builddir)/src/common/libpkcs11.la \
++ $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS)
+ pkcs15_crypt_SOURCES = pkcs15-crypt.c util.c
+ pkcs15_crypt_LDADD = $(OPTIONAL_OPENSSL_LIBS)
+ cryptoflex_tool_SOURCES = cryptoflex-tool.c util.c
diff --git a/dev-libs/opensc/files/opensc-0.12.2-dl.patch b/dev-libs/opensc/files/opensc-0.12.2-dl.patch
new file mode 100644
index 000000000000..526ef8161a89
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.12.2-dl.patch
@@ -0,0 +1,42 @@
+From 1b896582a0cd74854f99e08854554807a8f1f764 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 22 May 2012 14:12:23 -0400
+Subject: [PATCH] link against -ldl when -lltdl is not available
+
+If ltdl isn't found, the code will use dlopen if it's available.
+But it won't link to -ldl which can cause link errors like so:
+
+ CCLD opensc-tool
+../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlopen'
+../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlsym'
+../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlerror'
+../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlclose'
+collect2: ld returned 1 exit status
+make[3]: *** [opensc-tool] Error 1
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.ac | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2751f0f..123aeb1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -277,6 +277,13 @@ if test -z "${LTLIB_LIBS}"; then
+ [LTLIB_LIBS="-lltdl"]
+ )
+ fi
++if test -z "${LTLIB_LIBS}"; then
++ AC_CHECK_LIB(
++ [dl],
++ [dlopen],
++ [LTLIB_LIBS="-ldl"]
++ )
++fi
+
+ saved_CFLAGS="${CFLAGS}"
+ CFLAGS="${CFLAGS} ${LTLIB_CFLAGS}"
+--
+1.7.8.6
+
diff --git a/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch b/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch
new file mode 100644
index 000000000000..3ef24ec3d254
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch
@@ -0,0 +1,67 @@
+From 4ede74dd803ddbc4d0686bec0749459f54854495 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Sun, 13 May 2012 14:55:35 -0700
+Subject: [PATCH] build: fix parallel install by creating directory in the
+ rule
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Relying on the rule that creates the directory is a bad idea to be
+parallel safe.
+
+(Patch modified to use autoconf's MKDIR_P instead of automake's
+deprecated mkdir_p, allowing use of automake 1.12).
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ etc/Makefile.am | 4 ++--
+ src/pkcs11/Makefile.am | 7 ++++---
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/etc/Makefile.am b/etc/Makefile.am
+index 0ef546f..3b75995 100644
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
+@@ -18,8 +18,8 @@ opensc.conf: opensc.conf.in force
+ -e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \
+ < $< > $@
+
+-sysconf_DATA=#required in order to create dir
+-install-exec-hook: install-sysconfDATA opensc.conf
++install-exec-hook: opensc.conf
++ $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+ if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \
+ $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \
+ else \
+diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am
+index 8ff9abc..211055b 100644
+--- a/src/pkcs11/Makefile.am
++++ b/src/pkcs11/Makefile.am
+@@ -53,19 +53,20 @@ pkcs11-jar: jar-dir
+ -k"testcert" jar-dir
+
+ if WIN32
+-install-exec-hook: install-pkcs11DATA
++install-exec-hook:
++ $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ for l in opensc-pkcs11.dll onepin-opensc-pkcs11.dll pkcs11-spy.dll; do \
+ mv "$(DESTDIR)$(libdir)/$$l" "$(DESTDIR)$(bindir)/$$l"; \
+ done
+ else
+ # see http://wiki.cacert.org/wiki/Pkcs11TaskForce
+-pkcs11_DATA = #This will create the directory
+ if CYGWIN
+ PKCS11_SUFFIX=.dll
+ else
+ PKCS11_SUFFIX=.so
+ endif
+-install-exec-hook: install-pkcs11DATA
++install-exec-hook:
++ $(MKDIR_P) "$(DESTDIR)$(pkcs11dir)"
+ for l in opensc-pkcs11$(PKCS11_SUFFIX) onepin-opensc-pkcs11$(PKCS11_SUFFIX) pkcs11-spy$(PKCS11_SUFFIX); do \
+ rm -f "$(DESTDIR)$(pkcs11dir)/$$l"; \
+ $(LN_S) ../$$l "$(DESTDIR)$(pkcs11dir)/$$l"; \
+--
+1.7.8.6
+
diff --git a/dev-libs/opensc/files/opensc-0.13.0-openssl.patch b/dev-libs/opensc/files/opensc-0.13.0-openssl.patch
new file mode 100644
index 000000000000..1568493d757d
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.13.0-openssl.patch
@@ -0,0 +1,27 @@
+diff -urNp opensc-0.13.0.old/src/libopensc/iasecc-sm.c opensc-0.13.0/src/libopensc/iasecc-sm.c
+--- opensc-0.13.0.old/src/libopensc/iasecc-sm.c 2012-12-04 16:43:40.000000000 +0200
++++ opensc-0.13.0/src/libopensc/iasecc-sm.c 2014-02-19 21:24:34.479234564 +0200
+@@ -26,10 +26,6 @@
+ #include "asn1.h"
+ #include "cardctl.h"
+
+-#ifndef ENABLE_OPENSSL
+-#error "Need OpenSSL"
+-#endif
+-
+ #include "sm.h"
+ #include "iasecc.h"
+ #include "authentic.h"
+diff -urNp opensc-0.13.0.old/src/pkcs11/framework-pkcs15.c opensc-0.13.0/src/pkcs11/framework-pkcs15.c
+--- opensc-0.13.0.old/src/pkcs11/framework-pkcs15.c 2012-12-04 16:43:40.000000000 +0200
++++ opensc-0.13.0/src/pkcs11/framework-pkcs15.c 2014-02-19 21:31:43.816108633 +0200
+@@ -2853,8 +2853,8 @@ struct sc_pkcs11_framework_ops framework
+ pkcs15_login,
+ pkcs15_logout,
+ pkcs15_change_pin,
+- pkcs15_initialize,
+ #ifdef USE_PKCS15_INIT
++ pkcs15_initialize,
+ pkcs15_init_pin,
+ pkcs15_create_object,
+ pkcs15_gen_keypair,