Remove old opensc

6 files changed, 0 insertions, 294 deletions

diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
deleted file mode 100644
index 9ef620e..0000000
--- a/dev-libs/opensc/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX opensc-0.11.13+pcsc-lite-1.6.2.patch 2581 RMD160 ecff368edb374c1f5965b34f0e342fc5ac7e1e45 SHA1 969d4e9312b9056288d4699c4275a9d118d50443 SHA256 de08b3a968068ed600aa172891be59f0bb0b8a432bc6eea8fcc99a405ee309f5
-AUX opensc-0.11.13-overflows.patch 2463 RMD160 d5879f4f5acde30828904c78df5f8973d071d49b SHA1 701383d7df0ccf4e154361a43f23c552eee1b498 SHA256 fd2071a803ed34ec961ab7a4dcddedaf00180e2fc54a1b53f9af945f2960c921
-AUX opensc-0.12.0-crossbuild.patch 1976 RMD160 e5d4a702f3cebef3ba24fca175aac3752a83a0be SHA1 ed3e6d1e2c6e248e6eaa9e53fde50fa6c75b6b97 SHA256 daa295cbdee3b27d9e0c9d5bc86361f272f5b36613f7f07657e7de2b4b3d628f
-AUX opensc-0.12.1-crossbuild.patch 1839 RMD160 21c3ce0de0c293ed76c003bf8327908329e43f9f SHA1 d5e730f5c7f64f1e6aa137edef726901059fb183 SHA256 dd1f76f60d6223fc86ee80f500b89ffc3dfebffac04ef999f58df17d90b1bedb
-DIST opensc-0.12.2.tar.gz 1738553 RMD160 45504135db05fd404a357ebd8bea047c5c8604dc SHA1 8c34be52eb94025eb181c02b466223901bef744c SHA256 50e7371c0f45a3ed887098b712554905e3ef639d4dfca5ac90b8af5f69f1e675
-EBUILD opensc-0.12.2-r1.ebuild 1927 RMD160 975d70e6f4da5cd2690aaa950ef11549fdcd66cf SHA1 4200850e19bb50cf2cc91d3f1b8221cf2e18dd99 SHA256 e5e0ccd10a4d993762aebbc42e35987b02da26b17dc6c7df4c7ed33dd88082bf
diff --git a/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch b/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch
deleted file mode 100644
index 1cac75e..0000000
--- a/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: opensc-0.11.13/src/libopensc/internal-winscard.h
-===================================================================
---- opensc-0.11.13.orig/src/libopensc/internal-winscard.h
-+++ opensc-0.11.13/src/libopensc/internal-winscard.h
-@@ -77,7 +77,7 @@ typedef struct
- 	unsigned long cbAtr;
- 	unsigned char rgbAtr[MAX_ATR_SIZE];
- }
--SCARD_READERSTATE_A;
-+SCARD_READERSTATE;
- 
- typedef struct _SCARD_IO_REQUEST
- {
-@@ -87,8 +87,8 @@ typedef struct _SCARD_IO_REQUEST
- SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST;
- 
- typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST;
--typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A,
--	*LPSCARD_READERSTATE_A;
-+typedef SCARD_READERSTATE SCARD_READERSTATE, *PSCARD_READERSTATE,
-+	*SCARD_READERSTATE;
- 
- #endif	/* HAVE_SCARD_H */
- 
-@@ -113,7 +113,7 @@ typedef LONG (PCSC_API *SCardEndTransact
- typedef LONG (PCSC_API *SCardStatus_t)(SCARDHANDLE hCard, LPSTR mszReaderNames, LPDWORD pcchReaderLen,
- 	LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen);
- typedef LONG (PCSC_API *SCardGetStatusChange_t)(SCARDCONTEXT hContext, DWORD dwTimeout,
--	LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders);
-+	SCARD_READERSTATE *rgReaderStates, DWORD cReaders);
- typedef LONG (PCSC_API *SCardControlOLD_t)(SCARDHANDLE hCard, LPCVOID pbSendBuffer, DWORD cbSendLength,
- 	LPVOID pbRecvBuffer, LPDWORD lpBytesReturned);
- typedef LONG (PCSC_API *SCardControl_t)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID pbSendBuffer,
-Index: opensc-0.11.13/src/libopensc/reader-pcsc.c
-===================================================================
---- opensc-0.11.13.orig/src/libopensc/reader-pcsc.c
-+++ opensc-0.11.13/src/libopensc/reader-pcsc.c
-@@ -80,7 +80,7 @@ struct pcsc_private_data {
- 
- struct pcsc_slot_data {
- 	SCARDHANDLE pcsc_card;
--	SCARD_READERSTATE_A reader_state;
-+	SCARD_READERSTATE reader_state;
- 	DWORD verify_ioctl;
- 	DWORD verify_ioctl_start;
- 	DWORD verify_ioctl_finish;
-@@ -353,7 +353,7 @@ static int pcsc_wait_for_event(sc_reader
- 	sc_context_t *ctx;
- 	SCARDCONTEXT pcsc_ctx;
- 	LONG ret;
--	SCARD_READERSTATE_A rgReaderStates[SC_MAX_READERS];
-+	SCARD_READERSTATE rgReaderStates[SC_MAX_READERS];
- 	unsigned long on_bits, off_bits;
- 	time_t end_time, now, delta;
- 	size_t i;
-@@ -401,7 +401,7 @@ static int pcsc_wait_for_event(sc_reader
- 	/* Wait for a status change and return if it's a card insert/removal
- 	 */
- 	for( ; ; ) {
--		SCARD_READERSTATE_A *rsp;
-+		SCARD_READERSTATE *rsp;
- 
- 		/* Scan the current state of all readers to see if they
- 		 * match any of the events we're polling for */
diff --git a/dev-libs/opensc/files/opensc-0.11.13-overflows.patch b/dev-libs/opensc/files/opensc-0.11.13-overflows.patch
deleted file mode 100644
index 3b83e2d..0000000
--- a/dev-libs/opensc/files/opensc-0.11.13-overflows.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- a/src/libopensc/internal.h
-+++ b/src/libopensc/internal.h
-@@ -49,6 +49,13 @@ extern "C" {
- #define sleep(t)	Sleep((t) * 1000)
- #endif
- 
-+#ifndef MAX
-+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
-+#endif
-+#ifndef MIN
-+#define MIN(x, y) (((x) < (y)) ? (x) : (y))
-+#endif
-+
- struct sc_atr_table {
- 	/* The atr fields are required to
- 	 * be in aa:bb:cc hex format. */
---- a/src/libopensc/muscle.c
-+++ b/src/libopensc/muscle.c
-@@ -31,13 +31,6 @@
- #define MSC_DSA_PUBLIC		0x04
- #define MSC_DSA_PRIVATE 	0x05
- 
--#ifndef MAX
--#define MAX(x, y) (((x) > (y)) ? (x) : (y))
--#endif
--#ifndef MIN
--#define MIN(x, y) (((x) < (y)) ? (x) : (y))
--#endif
--
- static msc_id inputId = { { 0xFF, 0xFF, 0xFF, 0xFF } };
- static msc_id outputId = { { 0xFF, 0xFF, 0xFF, 0xFE } };
- 
---- a/src/libopensc/card-acos5.c
-+++ b/src/libopensc/card-acos5.c
-@@ -138,8 +138,8 @@ static int acos5_get_serialnr(sc_card_t * card, sc_serial_number_t * serial)
- 	/*
- 	 * Cache serial number.
- 	 */
--	memcpy(card->serialnr.value, apdu.resp, apdu.resplen);
--	card->serialnr.len = apdu.resplen;
-+	memcpy(card->serialnr.value, apdu.resp, MIN(apdu.resplen, SC_MAX_SERIALNR));
-+	card->serialnr.len = MIN(apdu.resplen, SC_MAX_SERIALNR);
- 
- 	/*
- 	 * Copy and return serial number.
---- a/src/libopensc/card-atrust-acos.c
-+++ b/src/libopensc/card-atrust-acos.c
-@@ -842,8 +842,8 @@ static int acos_get_serialnr(sc_card_t *card, sc_serial_number_t *serial)
- 	if (apdu.sw1 != 0x90 || apdu.sw2 != 0x00)
- 		return SC_ERROR_INTERNAL;
- 	/* cache serial number */
--	memcpy(card->serialnr.value, apdu.resp, apdu.resplen);
--	card->serialnr.len = apdu.resplen;
-+	memcpy(card->serialnr.value, apdu.resp, MIN(apdu.resplen, SC_MAX_SERIALNR));
-+	card->serialnr.len = MIN(apdu.resplen, SC_MAX_SERIALNR);
- 	/* copy and return serial number */
- 	memcpy(serial, &card->serialnr, sizeof(*serial));
- 	return SC_SUCCESS;
---- a/src/libopensc/card-starcos.c
-+++ b/src/libopensc/card-starcos.c
-@@ -1279,8 +1279,8 @@ static int starcos_get_serialnr(sc_card_t *card, sc_serial_number_t *serial)
- 	if (apdu.sw1 != 0x90 || apdu.sw2 != 0x00)
- 		return SC_ERROR_INTERNAL;
- 	/* cache serial number */
--	memcpy(card->serialnr.value, apdu.resp, apdu.resplen);
--	card->serialnr.len = apdu.resplen;
-+	memcpy(card->serialnr.value, apdu.resp, MIN(apdu.resplen, SC_MAX_SERIALNR));
-+	card->serialnr.len = MIN(apdu.resplen, SC_MAX_SERIALNR);
- 	/* copy and return serial number */
- 	memcpy(serial, &card->serialnr, sizeof(*serial));
- 	return SC_SUCCESS;
diff --git a/dev-libs/opensc/files/opensc-0.12.0-crossbuild.patch b/dev-libs/opensc/files/opensc-0.12.0-crossbuild.patch
deleted file mode 100644
index 82a9bb2..0000000
--- a/dev-libs/opensc/files/opensc-0.12.0-crossbuild.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: opensc-0.12.0/src/pkcs11/Makefile.am
-===================================================================
---- opensc-0.12.0.orig/src/pkcs11/Makefile.am
-+++ opensc-0.12.0/src/pkcs11/Makefile.am
-@@ -15,9 +15,10 @@ OPENSC_PKCS11_SRC = pkcs11-global.c pkcs
- 	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) \
-+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)
- 
- libpkcs11_la_SOURCES = libpkcs11.c
- libpkcs11_la_LIBADD = $(LTLIB_LIBS)
-@@ -35,7 +36,7 @@ onepin_opensc_pkcs11_la_LDFLAGS = $(AM_L
- 	-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) libpkcs11.la
-+pkcs11_spy_la_LIBADD = 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
-Index: opensc-0.12.0/src/tools/Makefile.am
-===================================================================
---- opensc-0.12.0.orig/src/tools/Makefile.am
-+++ opensc-0.12.0/src/tools/Makefile.am
-@@ -24,8 +24,9 @@ opensc_explorer_LDADD = $(OPTIONAL_READL
- 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/pkcs11/libpkcs11.la
-+pkcs11_tool_LDADD = \
-+	$(top_builddir)/src/pkcs11/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.1-crossbuild.patch b/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch
deleted file mode 100644
index 008fd3c..0000000
--- a/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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/opensc-0.12.2-r1.ebuild b/dev-libs/opensc/opensc-0.12.2-r1.ebuild
deleted file mode 100644
index 143765a..0000000
--- a/dev-libs/opensc/opensc-0.12.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2.ebuild,v 1.4 2012/05/04 18:35:51 jdhore Exp $
-
-EAPI="4"
-
-inherit eutils autotools
-
-DESCRIPTION="Libraries and applications to access smartcards"
-HOMEPAGE="http://www.opensc-project.org/opensc/"
-SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc libtool +pcsc-lite openct readline ssl zlib"
-
-RDEPEND="libtool? ( sys-devel/libtool )
-	zlib? ( sys-libs/zlib )
-	readline? ( sys-libs/readline )
-	ssl? ( dev-libs/openssl )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt"
-
-REQUIRED_USE="
-	pcsc-lite? ( !openct )
-	openct? ( !pcsc-lite )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.12.1-crossbuild.patch
-	eautoreconf
-}
-
-src_configure() {
-	# disable everything, enable selectively
-	local myconf="--disable-pcsc --disable-openct --disable-ctapi"
-
-	if use pcsc-lite; then
-		myconf+=" --enable-pcsc"
-	elif use openct; then
-		myconf+=" --enable-openct"
-	else
-		myconf+=" --enable-ctapi"
-	fi
-
-	# the configure script prefers libtool's libltdl over
-	# the native system's dlopen ... so we have to manually
-	# control the behavior to something a bit more sane
-	export ac_cv_header_ltdl_h=$(usex libtool) \
-		   ac_cv_lib_ltdl_lt_dlopen=$(usex libtool)
-
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir="/usr/share/doc/${PF}/html" \
-		--disable-static \
-		$(use_enable doc) \
-		$(use_enable openct) \
-		$(use_enable readline) \
-		$(use_enable zlib) \
-		${myconf}
-}
-
-src_install() {
-	dodir /etc /usr/$(get_libdir)/pkcs11
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete
-
-	dodoc ChangeLog
-}