* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/files/, dev-libs/opensc/
@ 2017-07-19 13:52 Alon Bar-Lev
0 siblings, 0 replies; 6+ messages in thread
From: Alon Bar-Lev @ 2017-07-19 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 8f51b98ef781174c33af1e0d92ec8def54ec0be2
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 13:46:05 2017 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 13:52:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f51b98e
dev-libs/opensc: version bump
Package-Manager: Portage-2.3.6, Repoman-2.3.1
dev-libs/opensc/Manifest | 1 +
dev-libs/opensc/files/opensc-0.17.0-build.patch | 100 ++++++++++++++++++++++++
dev-libs/opensc/opensc-0.17.0.ebuild | 60 ++++++++++++++
3 files changed, 161 insertions(+)
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index c55f52e15fd..f8e3c0ca396 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1 +1,2 @@
DIST opensc-0.16.0.tar.gz 1760418 SHA256 3ac8c29542bb48179e7086d35a1b8907a4e86aca3de3323c2f48bd74eaaf5729 SHA512 15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139 WHIRLPOOL 8207606e4994d7744fc93cc6aef1b0cde8a2073e791aebf71e82669013d261f82abc6e41ddf971fb136d4580c21ea475bb2e36bbdec600b354f5e1decec4b02a
+DIST opensc-0.17.0.tar.gz 1900483 SHA256 4cd8928c5c5787dd8beee6c77be25032996dedaa4df8bfdd369bcbcde9980bd1 SHA512 64c4f44be64e315fba96974c23331b06805b258ea6296bcc741b8f50b35bba4ab5aace8137f2642e114210465e6312a38e83d3261952b56ab7c06a43d475a7f7 WHIRLPOOL d48e591ec47589945dd8b4b358ce5c51c980ec75f7ab0724884fa2fe28cedeeacbc575a5ae4b0a354afcc5ffc608e0502c28244c8f3ebd3867dd7e5b7f270259
diff --git a/dev-libs/opensc/files/opensc-0.17.0-build.patch b/dev-libs/opensc/files/opensc-0.17.0-build.patch
new file mode 100644
index 00000000000..8a51d7ac445
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.17.0-build.patch
@@ -0,0 +1,100 @@
+From 65b302e33b710833d4d14bf8eaf00acdaa436c39 Mon Sep 17 00:00:00 2001
+From: Frank Morgner <frankmorgner@gmail.com>
+Date: Wed, 19 Jul 2017 00:09:36 +0200
+Subject: [PATCH] sc-hsm: fixed building with --disable-sm
+
+Closes https://github.com/OpenSC/OpenSC/pull/1103
+---
+ src/libopensc/card-sc-hsm.c | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/src/libopensc/card-sc-hsm.c b/src/libopensc/card-sc-hsm.c
+index cfa084a06..1f61e0138 100644
+--- a/src/libopensc/card-sc-hsm.c
++++ b/src/libopensc/card-sc-hsm.c
+@@ -284,7 +284,9 @@ static int sc_hsm_soc_select_minbioclient(sc_card_t *card)
+ };
+
+ /* Select MinBioClient */
++#ifdef ENABLE_SM
+ sc_sm_stop(card);
++#endif
+ sc_format_apdu(card, &apdu, SC_APDU_CASE_3_SHORT, 0xA4, 0x04, 0x0C);
+ apdu.data = minBioClient_aid.value;
+ apdu.datalen = minBioClient_aid.len;
+@@ -533,7 +535,9 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
+ sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data;
+ sc_apdu_t apdu;
+ u8 cmdbuff[16];
++#ifdef ENABLE_SM
+ u8 rbuf[SC_MAX_APDU_BUFFER_SIZE];
++#endif
+ int r;
+ int cmd = data->cmd;
+ size_t pin2_len = data->pin2.len;
+@@ -563,7 +567,10 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
+ if ((card->type == SC_CARD_TYPE_SC_HSM_SOC || card->reader->uid.len
+ || cmd == SC_PIN_CMD_GET_SESSION_PIN)
+ && (data->cmd != SC_PIN_CMD_GET_INFO)
+- && card->sm_ctx.sm_mode != SM_MODE_TRANSMIT) {
++#ifdef ENABLE_SM
++ && card->sm_ctx.sm_mode != SM_MODE_TRANSMIT
++#endif
++ ) {
+ LOG_TEST_RET(card->ctx,
+ sc_hsm_perform_chip_authentication(card),
+ "Could not perform chip authentication");
+@@ -604,6 +611,7 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
+ data->apdu = &apdu;
+ }
+
++#ifdef ENABLE_SM
+ if ((data->cmd == SC_PIN_CMD_GET_INFO)
+ && (card->sm_ctx.sm_mode == SM_MODE_TRANSMIT)) {
+ /* JCOP's SM accelerator is incapable of using case 1 APDU in SM */
+@@ -612,6 +620,7 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
+ apdu.resplen = sizeof rbuf;
+ data->apdu = &apdu;
+ }
++#endif
+
+ data->pin1.offset = 5;
+ data->pin1.length_offset = 4;
+@@ -627,11 +636,17 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
+ data->cmd = SC_PIN_CMD_GET_SESSION_PIN;
+ if (data->pin_reference == 0x81) {
+ u8 recvbuf[SC_MAX_APDU_BUFFER_SIZE];
++#ifdef ENABLE_SM
+ if (card->sm_ctx.sm_mode != SM_MODE_TRANSMIT) {
+ sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL,
+ "Session PIN generation only supported in SM");
+ LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
+ }
++#else
++ sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL,
++ "Session PIN generation only supported in SM");
++ LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
++#endif
+ sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0x5A, 0x01, data->pin_reference);
+ apdu.cla = 0x80;
+ apdu.resp = recvbuf;
+@@ -669,7 +684,9 @@ static int sc_hsm_logout(sc_card_t * card)
+ sc_path_t path;
+ sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data;
+ memset(priv->sopin, 0, sizeof(priv->sopin));
++#ifdef ENABLE_SM
+ sc_sm_stop(card);
++#endif
+
+ sc_path_set(&path, SC_PATH_TYPE_DF_NAME, sc_hsm_aid.value, sc_hsm_aid.len, 0, 0);
+
+@@ -1586,7 +1603,9 @@ static int sc_hsm_init(struct sc_card *card)
+ static int sc_hsm_finish(sc_card_t * card)
+ {
+ sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data;
++#ifdef ENABLE_SM
+ sc_sm_stop(card);
++#endif
+ if (priv->serialno) {
+ free(priv->serialno);
+ }
diff --git a/dev-libs/opensc/opensc-0.17.0.ebuild b/dev-libs/opensc/opensc-0.17.0.ebuild
new file mode 100644
index 00000000000..0612c40f2bb
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.17.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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: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"
+)
+
+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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/files/, dev-libs/opensc/
@ 2018-05-16 18:36 Alon Bar-Lev
0 siblings, 0 replies; 6+ messages in thread
From: Alon Bar-Lev @ 2018-05-16 18:36 UTC (permalink / raw
To: gentoo-commits
commit: b625fcf97c9ce2dba9712b1beda3f2ca8bc6410a
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Wed May 16 18:34:42 2018 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Wed May 16 18:34:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b625fcf9
dev-libs/opensc: version bump
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-libs/opensc/Manifest | 1 +
dev-libs/opensc/files/opensc-0.18.0-build.patch | 32 +++++++++++++
dev-libs/opensc/opensc-0.18.0.ebuild | 60 +++++++++++++++++++++++++
3 files changed, 93 insertions(+)
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 9c821f16b70..400ac494bc1 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,2 +1,3 @@
DIST opensc-0.16.0.tar.gz 1760418 BLAKE2B 7f5799445e285010392f315fa57919c7f0b038170a19e83dbda664d5d73898f075cccad4304275402c900b9fc50564ed5515a10d31156a6c76a68f170ca3e439 SHA512 15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139
DIST opensc-0.17.0.tar.gz 1950547 BLAKE2B 861dbb60e211d503332228c9d75d667f70cb9e15883c571821bb2f7703ca62dd4ce56c5ea7965e2d5e8c6a81b5063fc689013670294426baf1bfaec88282e20e SHA512 8991c1724d187d3c34a2ed591b21f0085f767c0d866edc2decfda85a2b3dedf717838f4937d1dda3e1bbc17f02e6eca6740299660128bc448a29e8bfc2962922
+DIST opensc-0.18.0.tar.gz 2037073 BLAKE2B f2b339d1f9c616f6f706acb3c55289deb5b1749a8b5561142c69db4ed1c7dee554ce1f8d820e6e69bb9e462ca460379badf3017ed35fa6cd395702c995326c3e SHA512 dc90cff3e0e639c14bfb11d1d0455964d24d08aa27728592ab0d8b487a1ffee1ca71cb9bbf5d0f101b2ebd85cf9478988f686d45effa72315e6ffc843d398768
diff --git a/dev-libs/opensc/files/opensc-0.18.0-build.patch b/dev-libs/opensc/files/opensc-0.18.0-build.patch
new file mode 100644
index 00000000000..2bea2e53d59
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.18.0-build.patch
@@ -0,0 +1,32 @@
+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
+
diff --git a/dev-libs/opensc/opensc-0.18.0.ebuild b/dev-libs/opensc/opensc-0.18.0.ebuild
new file mode 100644
index 00000000000..9693228d0a4
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.18.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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: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"
+)
+
+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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/files/, dev-libs/opensc/
@ 2018-06-28 7:53 Alon Bar-Lev
0 siblings, 0 replies; 6+ messages in thread
From: Alon Bar-Lev @ 2018-06-28 7:53 UTC (permalink / raw
To: gentoo-commits
commit: 37cd06c918995921e9deaf912d9474733896934a
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 19:38:08 2018 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 07:53:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37cd06c9
dev-libs/opensc: fix libressl-2.7 build
Closes: https://bugs.gentoo.org/show_bug.cgi?id=658212
Thanks: Tom Li
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-libs/opensc/files/opensc-0.18.0-libressl.patch | 79 ++++++++++++++++++++++
dev-libs/opensc/opensc-0.18.0.ebuild | 1 +
2 files changed, 80 insertions(+)
diff --git a/dev-libs/opensc/files/opensc-0.18.0-libressl.patch b/dev-libs/opensc/files/opensc-0.18.0-libressl.patch
new file mode 100644
index 00000000000..f6f3d772e07
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.18.0-libressl.patch
@@ -0,0 +1,79 @@
+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
index 9693228d0a4..784b2c5735c 100644
--- a/dev-libs/opensc/opensc-0.18.0.ebuild
+++ b/dev-libs/opensc/opensc-0.18.0.ebuild
@@ -35,6 +35,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}/${P}-build.patch"
+ "${FILESDIR}/${P}-libressl.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/files/, dev-libs/opensc/
@ 2020-01-27 10:57 Mikle Kolyada
0 siblings, 0 replies; 6+ messages in thread
From: Mikle Kolyada @ 2020-01-27 10:57 UTC (permalink / raw
To: gentoo-commits
commit: fba89edf9be44ed37396761afe1a590f13e0da85
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 10:56:58 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 10:56:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fba89edf
dev-libs/opensc: Drop old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
dev-libs/opensc/Manifest | 1 -
.../files/opensc-0.19.0-p11test_common.h.patch | 108 ---------------------
dev-libs/opensc/opensc-0.19.0-r2.ebuild | 66 -------------
3 files changed, 175 deletions(-)
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 016cba20da9..d75f0be4183 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,2 +1 @@
-DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c888874963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a SHA512 90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e
DIST opensc-0.20.0.tar.gz 2140645 BLAKE2B 298a6d9c8a9682899cae201ba7edd464a2e3d947f6d97672727bedc47f6b529cb1495a8bc335f83cdb42b0c0077de0fd7ff9f3f8f506b543b1970cb6557b762e SHA512 71f71fa6062410e63c6c60f5b2d10d1d855cc6cc815ef0e42e42a1ddd25bbd52fc396c1e495ef54610f3243996dec84dacc8007b186deb670ed645b04ee6eda5
diff --git a/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch b/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch
deleted file mode 100644
index ca27c70245d..00000000000
--- a/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From d1e4f4879b8d0a7423afc1c9a3632da4763ee31c Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 15 Sep 2018 11:04:13 +0300
-Subject: [PATCH] missing include
-
----
- src/tests/p11test/p11test_common.h | 89 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 89 insertions(+)
- create mode 100644 src/tests/p11test/p11test_common.h
-
-diff --git a/src/tests/p11test/p11test_common.h b/src/tests/p11test/p11test_common.h
-new file mode 100644
-index 0000000..d3ca304
---- /dev/null
-+++ b/src/tests/p11test/p11test_common.h
-@@ -0,0 +1,89 @@
-+/*
-+ * p11test_common.h: Test suite shared declarations for PKCS#11 API
-+ *
-+ * Copyright (C) 2016 Martin Strhársky <strharsky.martin@gmail.com>
-+ * Copyright (C) 2016, 2017 Red Hat, Inc.
-+ *
-+ * Author: Jakub Jelen <jjelen@redhat.com>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef P11TEST_COMMON_H
-+#define P11TEST_COMMON_H
-+#include "config.h"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <setjmp.h>
-+#include <cmocka.h>
-+#include "pkcs11/pkcs11.h"
-+#include "libopensc/sc-ossl-compat.h"
-+
-+#define MAX_MECHS 200
-+
-+#ifndef NDEBUG
-+ #define debug_print(fmt, ...) \
-+ { fprintf(stderr, fmt "\n", ##__VA_ARGS__); } while (0)
-+#else
-+ #define debug_print(fmt, ...)
-+#endif
-+
-+#define FLAGS_SIGN 0x01
-+#define FLAGS_SIGN_OPENSSL 0x02
-+#define FLAGS_SIGN_ANY ( FLAGS_SIGN | FLAGS_SIGN_OPENSSL )
-+#define FLAGS_DECRYPT 0x04
-+#define FLAGS_DECRYPT_OPENSSL 0x08
-+#define FLAGS_DECRYPT_ANY ( FLAGS_DECRYPT | FLAGS_DECRYPT_OPENSSL )
-+
-+typedef struct {
-+ char *outfile;
-+ FILE *fd;
-+ int in_test;
-+ int first;
-+ int in_data;
-+ int first_data;
-+} log_context_t;
-+
-+typedef struct {
-+ CK_MECHANISM_TYPE mech;
-+ CK_MECHANISM_TYPE hash;
-+ CK_RSA_PKCS_MGF_TYPE mgf;
-+ int salt;
-+ int usage_flags;
-+ int result_flags;
-+} test_mech_t;
-+
-+typedef struct {
-+ CK_FUNCTION_LIST_PTR function_pointer;
-+ CK_SLOT_ID slot_id;
-+ CK_SESSION_HANDLE session_handle;
-+ CK_UTF8CHAR* pin;
-+ size_t pin_length;
-+ char *library_path;
-+ unsigned int interactive;
-+ log_context_t log;
-+
-+ test_mech_t rsa_mechs[MAX_MECHS];
-+ size_t num_rsa_mechs;
-+ test_mech_t ec_mechs[MAX_MECHS];
-+ size_t num_ec_mechs;
-+ test_mech_t keygen_mechs[MAX_MECHS];
-+ size_t num_keygen_mechs;
-+} token_info_t;
-+
-+token_info_t token;
-+
-+#endif /* P11TEST_COMMON_H */
-+
---
-2.16.4
-
diff --git a/dev-libs/opensc/opensc-0.19.0-r2.ebuild b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
deleted file mode 100644
index f02c94ebc57..00000000000
--- a/dev-libs/opensc/opensc-0.19.0-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-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="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
-RESTRICT="!test? ( test )"
-
-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 )
- notify? ( dev-libs/glib:2= )"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
- pcsc-lite? ( !openct !ctapi )
- openct? ( !pcsc-lite !ctapi )
- ctapi? ( !pcsc-lite !openct )
- || ( pcsc-lite openct ctapi )"
-
-PATCHES=(
- "${FILESDIR}/${P}-p11test_common.h.patch"
-)
-
-src_configure() {
- econf \
- --with-completiondir="$(get_bashcompdir)" \
- --disable-openpace \
- --disable-static \
- --disable-strict \
- --enable-man \
- $(use_enable ctapi) \
- $(use_enable doc) \
- $(use_enable notify ) \
- $(use_enable openct) \
- $(use_enable openct) \
- $(use_enable pcsc-lite pcsc) \
- $(use_enable readline) \
- $(use_enable secure-messaging sm) \
- $(use_enable ssl openssl) \
- $(use_enable test tests) \
- $(use_enable zlib)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/files/, dev-libs/opensc/
@ 2021-03-19 18:23 Mikle Kolyada
0 siblings, 0 replies; 6+ messages in thread
From: Mikle Kolyada @ 2021-03-19 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 88da919fb87989caa7ab863ee3fa75bf09672c40
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 19 18:21:44 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Mar 19 18:23:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88da919f
dev-libs/opensc: drop old
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
dev-libs/opensc/Manifest | 1 -
dev-libs/opensc/files/opensc-0.20.0-gcc10.patch | 37 -------------
dev-libs/opensc/opensc-0.20.0.ebuild | 70 -------------------------
3 files changed, 108 deletions(-)
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 9dda7cdc03c..c25c8a7d762 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,2 +1 @@
-DIST opensc-0.20.0.tar.gz 2140645 BLAKE2B 298a6d9c8a9682899cae201ba7edd464a2e3d947f6d97672727bedc47f6b529cb1495a8bc335f83cdb42b0c0077de0fd7ff9f3f8f506b543b1970cb6557b762e SHA512 71f71fa6062410e63c6c60f5b2d10d1d855cc6cc815ef0e42e42a1ddd25bbd52fc396c1e495ef54610f3243996dec84dacc8007b186deb670ed645b04ee6eda5
DIST opensc-0.21.0.tar.gz 2210878 BLAKE2B 22b63ca59cb721cdbbda755fa90f5b46fd9e5b6d7768cddbfeaffd58d68adcb145d6d604b334cf778608be9ee5fc98109f98d131d2536e61f79705aa3dbafa6c SHA512 3511b0a04a96e62011c48667e3fd36a1611fe67a89f7626ff056c9c3614f8cabc91c9924a6ca7a8ea50076a128e3967277a0dd624b4fa27c62cefee9fab22646
diff --git a/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch b/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
deleted file mode 100644
index f96a1140872..00000000000
--- a/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5450f61681d0c46c587dbe789bf19f1cb573e794 Mon Sep 17 00:00:00 2001
-From: Jakub Jelen <jjelen@redhat.com>
-Date: Mon, 10 Feb 2020 15:09:17 +0100
-Subject: [PATCH] Unbreak build with -fno-common (default in gcc10)
-
----
- src/tests/p11test/p11test.c | 3 +++
- src/tests/p11test/p11test_common.h | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/tests/p11test/p11test.c b/src/tests/p11test/p11test.c
-index feecf6fb42..a16282cba3 100644
---- a/src/tests/p11test/p11test.c
-+++ b/src/tests/p11test/p11test.c
-@@ -34,6 +34,9 @@
-
- #define DEFAULT_P11LIB "../../pkcs11/.libs/opensc-pkcs11.so"
-
-+/* Global variable keeping information about token we are using */
-+token_info_t token;
-+
- void display_usage() {
- fprintf(stdout,
- " Usage:\n"
-diff --git a/src/tests/p11test/p11test_common.h b/src/tests/p11test/p11test_common.h
-index 2f3b238de0..9eb5cedecb 100644
---- a/src/tests/p11test/p11test_common.h
-+++ b/src/tests/p11test/p11test_common.h
-@@ -84,7 +84,7 @@ typedef struct {
- size_t num_keygen_mechs;
- } token_info_t;
-
--token_info_t token;
-+extern token_info_t token;
-
- #endif /* P11TEST_COMMON_H */
-
diff --git a/dev-libs/opensc/opensc-0.20.0.ebuild b/dev-libs/opensc/opensc-0.20.0.ebuild
deleted file mode 100644
index 51a8742645f..00000000000
--- a/dev-libs/opensc/opensc-0.20.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 libtool
-
-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 ~sparc x86"
-IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="zlib? ( sys-libs/zlib )
- readline? ( sys-libs/readline:0= )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( >=dev-libs/libressl-3.1.0:0= )
- )
- openct? ( >=dev-libs/openct-0.5.0 )
- pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
- notify? ( dev-libs/glib:2 )"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
- pcsc-lite? ( !openct !ctapi )
- openct? ( !pcsc-lite !ctapi )
- ctapi? ( !pcsc-lite !openct )
- || ( pcsc-lite openct ctapi )"
-
-PATCHES=(
- "${FILESDIR}/${P}-gcc10.patch"
-)
-
-src_prepare() {
- default
- elibtoolize
-}
-
-src_configure() {
- econf \
- --with-completiondir="$(get_bashcompdir)" \
- --disable-openpace \
- --disable-static \
- --disable-strict \
- --enable-man \
- $(use_enable ctapi) \
- $(use_enable doc) \
- $(use_enable notify ) \
- $(use_enable openct) \
- $(use_enable pcsc-lite pcsc) \
- $(use_enable readline) \
- $(use_enable secure-messaging sm) \
- $(use_enable ssl openssl) \
- $(use_enable test cmocka) \
- $(use_enable zlib)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/files/, dev-libs/opensc/
@ 2021-03-19 18:25 Mikle Kolyada
0 siblings, 0 replies; 6+ messages in thread
From: Mikle Kolyada @ 2021-03-19 18:25 UTC (permalink / raw
To: gentoo-commits
commit: ea9b63e29bd481cd32c6d22f0f2bce51050b5a14
Author: Henning Schild <henning <AT> hennsch <DOT> de>
AuthorDate: Wed Mar 10 07:30:29 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Mar 19 18:25:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9b63e2
dev-libs/opensc: ship config snippet for app-crypt/p11-kit
In order to use smartcards with app-crypt/p11-kit, a module needs to be
loaded by it. Doing this makes sure "p11tool --list-tokens" will find
smartcards without further manual steps.
The method is inspired by Fedora and OpenSuse.
Signed-off-by: Henning Schild <henning <AT> hennsch.de>
Closes: https://github.com/gentoo/gentoo/pull/19858
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
dev-libs/opensc/files/opensc.module | 8 ++++
dev-libs/opensc/opensc-0.21.0-r1.ebuild | 68 +++++++++++++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/dev-libs/opensc/files/opensc.module b/dev-libs/opensc/files/opensc.module
new file mode 100644
index 00000000000..3246ab4da0a
--- /dev/null
+++ b/dev-libs/opensc/files/opensc.module
@@ -0,0 +1,8 @@
+# This file describes how to load the opensc module
+# See: http://p11-glue.freedesktop.org/doc/p11-kit/config.html
+
+# This is a relative path, which means it will be loaded from
+# the p11-kit default path which is usually $(libdir)/pkcs11.
+# Doing it this way allows for packagers to package opensc for
+# 32-bit and 64-bit and make them parallel installable
+module: onepin-opensc-pkcs11.so
diff --git a/dev-libs/opensc/opensc-0.21.0-r1.ebuild b/dev-libs/opensc/opensc-0.21.0-r1.ebuild
new file mode 100644
index 00000000000..7e6fedb42d1
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.21.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 libtool
+
+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 ~sparc x86"
+IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+ readline? ( sys-libs/readline:0= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( >=dev-libs/libressl-3.1.0:0= )
+ )
+ openct? ( >=dev-libs/openct-0.5.0 )
+ pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+ notify? ( dev-libs/glib:2 )"
+DEPEND="${RDEPEND}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+ pcsc-lite? ( !openct !ctapi )
+ openct? ( !pcsc-lite !ctapi )
+ ctapi? ( !pcsc-lite !openct )
+ || ( pcsc-lite openct ctapi )"
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --with-completiondir="$(get_bashcompdir)" \
+ --disable-openpace \
+ --disable-static \
+ --disable-strict \
+ --enable-man \
+ $(use_enable ctapi) \
+ $(use_enable doc) \
+ $(use_enable notify ) \
+ $(use_enable openct) \
+ $(use_enable pcsc-lite pcsc) \
+ $(use_enable readline) \
+ $(use_enable secure-messaging sm) \
+ $(use_enable ssl openssl) \
+ $(use_enable test cmocka) \
+ $(use_enable zlib)
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+ insinto /etc/pkcs11/modules/
+ doins "${FILESDIR}/${PN}.module"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-19 18:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-19 18:25 [gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/files/, dev-libs/opensc/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2021-03-19 18:23 Mikle Kolyada
2020-01-27 10:57 Mikle Kolyada
2018-06-28 7:53 Alon Bar-Lev
2018-05-16 18:36 Alon Bar-Lev
2017-07-19 13:52 Alon Bar-Lev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox