diff options
Diffstat (limited to 'dev-libs/opensc')
| -rw-r--r-- | dev-libs/opensc/Manifest | 6 | ||||
| -rw-r--r-- | dev-libs/opensc/files/opensc-0.18.0-build.patch | 100 | ||||
| -rw-r--r-- | dev-libs/opensc/files/opensc-0.18.0-libressl.patch | 79 | ||||
| -rw-r--r-- | dev-libs/opensc/opensc-0.18.0.ebuild | 61 | ||||
| -rw-r--r-- | dev-libs/opensc/opensc-0.19.0-r2.ebuild | 2 |
5 files changed, 2 insertions, 246 deletions
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest index 3bf2c46ae684..d988bf294067 100644 --- a/dev-libs/opensc/Manifest +++ b/dev-libs/opensc/Manifest @@ -1,8 +1,4 @@ -AUX opensc-0.18.0-build.patch 3060 BLAKE2B 4716e3cef86eca1da01f479909f21e23b362870eca9a9f44d391e5b0ea0b1fd5d04cc4cac2f681e3ea5325c366a154b919a34f827d6b85d92cc462f9b3832116 SHA512 3d70a8483b96a2ab0cee7c4eb9c71ce1429ef6bf5dbee65f685ec8f21b4c3f7b822e2b7011f420beca957f2ffbdb5726ec52350e2ae92c26c718fc0c421d953e -AUX opensc-0.18.0-libressl.patch 3145 BLAKE2B 2e1c0c789adf7c21db1cfd4ab2bf0ba077a463f74ee5bc3293278260b5531cfb231f70d594c491fdaaad0d09f4e7107804f3937d316816ea62eb0e6956ac1c6e SHA512 fedb3906104c02d08d5c44a0da49764556e19653a9d52a3e1ddc5254a2f13abee92b23fc3101779bdc6b9c623388ec9242f198402c022505dffc7e932d1b0dfe AUX opensc-0.19.0-p11test_common.h.patch 2969 BLAKE2B dd5e309fdaa847da43fa811f3cb8219930b0314aceb52a2e317984172fa432ba2032f8ef2c2c71780a2c3d442a353163987f81f743c43f45603040f446e998d8 SHA512 d1959887631ddc60e7df445d12641d366749cb09002c1d3e37dbcb606c61bbdb0fb335b8d4b433110bd8e37f8116cb7a6a87226c6504a9e0f735be67775352b0 -DIST opensc-0.18.0.tar.gz 2037073 BLAKE2B f2b339d1f9c616f6f706acb3c55289deb5b1749a8b5561142c69db4ed1c7dee554ce1f8d820e6e69bb9e462ca460379badf3017ed35fa6cd395702c995326c3e SHA512 dc90cff3e0e639c14bfb11d1d0455964d24d08aa27728592ab0d8b487a1ffee1ca71cb9bbf5d0f101b2ebd85cf9478988f686d45effa72315e6ffc843d398768 DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c888874963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a SHA512 90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e -EBUILD opensc-0.18.0.ebuild 1499 BLAKE2B 6908def240f76d09456dc5b3e937d660fc566284a1477973a5ce474833f9e3dc4c851fbf53ebf6b58f608681b93d37e7cb083ff476bbd04eab4445d5771169a1 SHA512 7f4797929355f08bb430b28f6e1cbda6be61d4ca3ba2af0003be67b18809c01d995133868632650debde80541c7f76e06e1f7e514c22fe7a059f3f2d134efa5b -EBUILD opensc-0.19.0-r2.ebuild 1651 BLAKE2B 44ecb8aca32165e08c53fdf7ed7f63a53969856dd73f2b3426e05f01cc220d3c7f8c71c8c12057d49ce42a0a6abff9bbcb50799e93a2f32e44f1beed29ff2660 SHA512 fe56f3ce2114695ee7143097595a72b3f009aeb6d84a5d8e465f4d7f703d801bd5f515f84e0db3808ec83a8730bd3c23c400cbf134ae545e7dbb290db9fc0144 +EBUILD opensc-0.19.0-r2.ebuild 1650 BLAKE2B fef733e027e8d7e7d57830bc42797680558f55f64ddc97c7501cc16ca571db5f65c35c0fb224f3659963eb8151ce85d6b2078e1dcfeb2916206ed4998ffb7935 SHA512 acfc69f72ddf2e9f9a95e97e133a406df5f05d21520184334c5fcd68f4b32d97eda49d1295061ee2cbe6b1d6c543f714a6eb76924c043b8b69e42e576b6ce2f6 MISC metadata.xml 1214 BLAKE2B 5d2a0bb352a11969d1f959c4d19171f3f274461f4dedc2558bb89d8ad114dc3796a49e04a35773340de2b321f4be86ea389f1b9733126785d0991771b254a891 SHA512 f37c2a234cfaa304bb41e17147e6970960fd909da2ab2bd924b61be20175d0b6351be98551451c95dcf8e5a77edd4c8c546d93b2bd04012ae667fbddb372e33e diff --git a/dev-libs/opensc/files/opensc-0.18.0-build.patch b/dev-libs/opensc/files/opensc-0.18.0-build.patch deleted file mode 100644 index 1db749ca654e..000000000000 --- a/dev-libs/opensc/files/opensc-0.18.0-build.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 1f1de5ae9a43e845431dc43af96ec61e910ad789 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Wed, 16 May 2018 21:30:15 +0300 -Subject: [PATCH] build: fix --disable-sm - ---- - src/libopensc/card-sc-hsm.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/libopensc/card-sc-hsm.c b/src/libopensc/card-sc-hsm.c -index e2af52b9..a609f612 100644 ---- a/src/libopensc/card-sc-hsm.c -+++ b/src/libopensc/card-sc-hsm.c -@@ -451,6 +451,7 @@ static int sc_hsm_soc_biomatch(sc_card_t *card, struct sc_pin_cmd_data *data, - - - -+#ifdef ENABLE_SM - #ifdef ENABLE_OPENPACE - #include "sm/sm-eac.h" - #include <eac/cv_cert.h> -@@ -573,6 +574,7 @@ static int sc_hsm_perform_chip_authentication(sc_card_t *card) - return SC_ERROR_NOT_SUPPORTED; - } - #endif -+#endif - - - --- -2.16.1 - -From a6b4605b863d45978ebd681c4bbaa3aaf0ab90e7 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Date: Tue, 10 Jul 2018 14:49:42 +0200 -Subject: [PATCH] card-piv.c: initialize variable to fix a ppc64el build - failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes a build failure with optimized ppc64el and new gcc builds -card-piv.c: In function ‘piv_validate_general_authentication.isra.3’: -card-piv.c:2390:9: error: ‘rbuflen’ may be used uninitialized in this function [-Werror=maybe-uninitialized] - body = sc_asn1_find_tag(card->ctx, rbuf, rbuflen, 0x7c, &bodylen); - ~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ---- - src/libopensc/card-piv.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libopensc/card-piv.c b/src/libopensc/card-piv.c -index e85dfc45..13b0cc21 100644 ---- a/src/libopensc/card-piv.c -+++ b/src/libopensc/card-piv.c -@@ -2334,7 +2334,7 @@ static int piv_validate_general_authentication(sc_card_t *card, - - u8 sbuf[4096]; /* needs work. for 3072 keys, needs 384+10 or so */ - u8 *rbuf = NULL; -- size_t rbuflen; -+ size_t rbuflen = 0; - - SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE); - --- -2.16.4 - -From 0f7af8a647a8fca6b1f1ee2327c3d26bed38c8f6 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Sat, 8 Sep 2018 00:16:57 +0300 -Subject: [PATCH] reader-ctapi: ctapi_connect: remove unused variable - -from day 1 return value of _sc_parse_atr was ignored. ---- - src/libopensc/reader-ctapi.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/libopensc/reader-ctapi.c b/src/libopensc/reader-ctapi.c -index 8d4c1c24..4b94337f 100644 ---- a/src/libopensc/reader-ctapi.c -+++ b/src/libopensc/reader-ctapi.c -@@ -239,7 +239,6 @@ static int ctapi_connect(sc_reader_t *reader) - char rv; - u8 cmd[9], rbuf[256], sad, dad; - unsigned short lr; -- int r; - - if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) - return SC_ERROR_NOT_ALLOWED; -@@ -265,7 +264,7 @@ static int ctapi_connect(sc_reader_t *reader) - return SC_ERROR_INTERNAL; - reader->atr.len = lr; - memcpy(reader->atr.value, rbuf, lr); -- r = _sc_parse_atr(reader); -+ _sc_parse_atr(reader); - - return 0; - } --- -2.16.4 - diff --git a/dev-libs/opensc/files/opensc-0.18.0-libressl.patch b/dev-libs/opensc/files/opensc-0.18.0-libressl.patch deleted file mode 100644 index f6f3d772e071..000000000000 --- a/dev-libs/opensc/files/opensc-0.18.0-libressl.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 226cd96bfd384a40b3ab6b6dafb97f6e399524f4 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Fri, 22 Jun 2018 22:21:03 +0300 -Subject: [PATCH] build: support >=libressl-2.7 - -https://github.com/OpenSC/OpenSC/pull/1406 - ---- - src/libopensc/sc-ossl-compat.h | 19 +++++++++++++------ - src/tools/sc-hsm-tool.c | 2 +- - 2 files changed, 14 insertions(+), 7 deletions(-) - -diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h -index a94d9564..d9e087a3 100644 ---- a/src/libopensc/sc-ossl-compat.h -+++ b/src/libopensc/sc-ossl-compat.h -@@ -90,17 +90,24 @@ extern "C" { - - #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay --#define OPENSSL_malloc_init CRYPTO_malloc_init - --#define EVP_PKEY_get0_RSA(x) (x->pkey.rsa) --#define EVP_PKEY_get0_DSA(x) (x->pkey.dsa) - #define X509_get_extension_flags(x) (x->ex_flags) - #define X509_get_key_usage(x) (x->ex_kusage) - #define X509_get_extended_key_usage(x) (x->ex_xkusage) --#define EVP_PKEY_up_ref(user_key) CRYPTO_add(&user_key->references, 1, CRYPTO_LOCK_EVP_PKEY) - #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2050300fL - #define X509_up_ref(cert) CRYPTO_add(&cert->references, 1, CRYPTO_LOCK_X509) - #endif -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x20700000L -+#define OPENSSL_malloc_init CRYPTO_malloc_init -+#define EVP_PKEY_get0_RSA(x) (x->pkey.rsa) -+#define EVP_PKEY_get0_DSA(x) (x->pkey.dsa) -+#define EVP_PKEY_up_ref(user_key) CRYPTO_add(&user_key->references, 1, CRYPTO_LOCK_EVP_PKEY) -+#endif -+#endif -+ -+/* workaround unused value warning for a macro that does nothing */ -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L -+#define OPENSSL_malloc_init() - #endif - - /* -@@ -110,7 +117,7 @@ extern "C" { - * If that is not good enough, versions could be added to libopensc - */ - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - /* based on OpenSSL-1.1.0 e_os2.h */ - /* sc_ossl_inline: portable inline definition usable in public headers */ - # if !defined(inline) && !defined(__cplusplus) -@@ -129,7 +136,7 @@ extern "C" { - # endif - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2050300fL) - - #define RSA_bits(R) (BN_num_bits(R->n)) - -diff --git a/src/tools/sc-hsm-tool.c b/src/tools/sc-hsm-tool.c -index 823eb217..307bad25 100644 ---- a/src/tools/sc-hsm-tool.c -+++ b/src/tools/sc-hsm-tool.c -@@ -1761,7 +1761,7 @@ int main(int argc, char *argv[]) - } - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L) - OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS - | OPENSSL_INIT_ADD_ALL_CIPHERS - | OPENSSL_INIT_ADD_ALL_DIGESTS, --- -2.16.4 - diff --git a/dev-libs/opensc/opensc-0.18.0.ebuild b/dev-libs/opensc/opensc-0.18.0.ebuild deleted file mode 100644 index 5ecdcca6ed00..000000000000 --- a/dev-libs/opensc/opensc-0.18.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit ltprune - -DESCRIPTION="Libraries and applications to access smartcards" -HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki" -SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86" -IUSE="doc +pcsc-lite secure-messaging openct ctapi readline libressl ssl zlib" - -RDEPEND="zlib? ( sys-libs/zlib ) - readline? ( sys-libs/readline:0= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( >=dev-libs/libressl-2.7.0:0= ) - ) - 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 !ctapi ) - openct? ( !pcsc-lite !ctapi ) - ctapi? ( !pcsc-lite !openct ) - || ( pcsc-lite openct ctapi )" - -PATCHES=( - "${FILESDIR}/${P}-build.patch" - "${FILESDIR}/${P}-libressl.patch" -) - -src_configure() { - econf \ - --docdir="/usr/share/doc/${PF}" \ - --htmldir='$(docdir)/html' \ - --disable-static \ - --disable-openpace \ - $(use_enable doc) \ - $(use_enable openct) \ - $(use_enable readline) \ - $(use_enable zlib) \ - $(use_enable secure-messaging sm) \ - $(use_enable ssl openssl) \ - $(use_enable pcsc-lite pcsc) \ - $(use_enable openct) \ - $(use_enable ctapi) -} - -src_install() { - default - prune_libtool_files --all -} diff --git a/dev-libs/opensc/opensc-0.19.0-r2.ebuild b/dev-libs/opensc/opensc-0.19.0-r2.ebuild index 71bd59ef5eda..d3734d86e9f9 100644 --- a/dev-libs/opensc/opensc-0.19.0-r2.ebuild +++ b/dev-libs/opensc/opensc-0.19.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86" IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib" RDEPEND="zlib? ( sys-libs/zlib ) |