commit: 3e84ac178222a92c3bf3cc3ed1dbca0fc64a0d95 Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> AuthorDate: Tue Apr 2 18:04:28 2019 +0000 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> CommitDate: Tue Apr 2 18:04:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e84ac17
dev-libs/opensc: cleanup old Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 dev-libs/opensc/Manifest | 2 - dev-libs/opensc/files/opensc-0.17.0-build.patch | 100 ------------------------ dev-libs/opensc/opensc-0.16.0.ebuild | 55 ------------- dev-libs/opensc/opensc-0.17.0.ebuild | 60 -------------- 4 files changed, 217 deletions(-) diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest index 6ebb2d0a9e6..ebe4b6b70a0 100644 --- a/dev-libs/opensc/Manifest +++ b/dev-libs/opensc/Manifest @@ -1,4 +1,2 @@ -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 DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c888874963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a SHA512 90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e diff --git a/dev-libs/opensc/files/opensc-0.17.0-build.patch b/dev-libs/opensc/files/opensc-0.17.0-build.patch deleted file mode 100644 index 8a51d7ac445..00000000000 --- a/dev-libs/opensc/files/opensc-0.17.0-build.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 65b302e33b710833d4d14bf8eaf00acdaa436c39 Mon Sep 17 00:00:00 2001 -From: Frank Morgner <frankmorg...@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.16.0.ebuild b/dev-libs/opensc/opensc-0.16.0.ebuild deleted file mode 100644 index df55b1ce24b..00000000000 --- a/dev-libs/opensc/opensc-0.16.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# 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 )" - -src_configure() { - econf \ - --docdir="/usr/share/doc/${PF}" \ - --htmldir='$(docdir)/html' \ - --disable-static \ - $(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.17.0.ebuild b/dev-libs/opensc/opensc-0.17.0.ebuild deleted file mode 100644 index 0612c40f2bb..00000000000 --- a/dev-libs/opensc/opensc-0.17.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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 -}
