diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2014-02-19 19:36:43 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2014-02-19 19:36:43 +0000 |
| commit | c27d5c9973ea35bda0dd1fd321be37f421272f3a (patch) | |
| tree | 5f566fa0220bc84ad11f96d188229bd531ebce6c /dev-libs/opensc | |
| parent | Version bump, snapshot from upstream git repository. (diff) | |
| download | gentoo-2-c27d5c9973ea35bda0dd1fd321be37f421272f3a.tar.gz gentoo-2-c27d5c9973ea35bda0dd1fd321be37f421272f3a.tar.bz2 gentoo-2-c27d5c9973ea35bda0dd1fd321be37f421272f3a.zip | |
Fix USE -ssl
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)
Diffstat (limited to 'dev-libs/opensc')
| -rw-r--r-- | dev-libs/opensc/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/opensc/files/opensc-0.13.0-openssl.patch | 27 | ||||
| -rw-r--r-- | dev-libs/opensc/opensc-0.13.0.ebuild | 10 |
3 files changed, 41 insertions, 4 deletions
diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog index 25bec2255f24..d5cc7e16030e 100644 --- a/dev-libs/opensc/ChangeLog +++ b/dev-libs/opensc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/opensc -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.134 2013/02/08 20:10:08 alonbl Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.135 2014/02/19 19:36:43 alonbl Exp $ + + 19 Feb 2014; Alon Bar-Lev <alonbl@gentoo.org> + +files/opensc-0.13.0-openssl.patch, opensc-0.13.0.ebuild: + Fix USE -ssl 08 Feb 2013; Alon Bar-Lev <alonbl@gentoo.org> metadata.xml, opensc-0.13.0.ebuild: 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, diff --git a/dev-libs/opensc/opensc-0.13.0.ebuild b/dev-libs/opensc/opensc-0.13.0.ebuild index 3dabc431b129..01f9db92238c 100644 --- a/dev-libs/opensc/opensc-0.13.0.ebuild +++ b/dev-libs/opensc/opensc-0.13.0.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.13.0.ebuild,v 1.2 2013/02/08 20:10:08 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.13.0.ebuild,v 1.3 2014/02/19 19:36:43 alonbl Exp $ EAPI=4 +inherit eutils + DESCRIPTION="Libraries and applications to access smartcards" HOMEPAGE="http://www.opensc-project.org/opensc/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -29,6 +31,10 @@ REQUIRED_USE=" ctapi? ( !pcsc-lite !openct ) || ( pcsc-lite openct ctapi )" +src_prepare() { + epatch "${FILESDIR}/${P}-openssl.patch" +} + src_configure() { econf \ --docdir="/usr/share/doc/${PF}" \ |