Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/files/, dev-libs/opensc/
Date: Mon, 27 Jan 2020 10:57:15
Message-Id: 1580122618.fba89edf9be44ed37396761afe1a590f13e0da85.zlogene@gentoo
1 commit: fba89edf9be44ed37396761afe1a590f13e0da85
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 27 10:56:58 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 27 10:56:58 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fba89edf
7
8 dev-libs/opensc: Drop old
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 dev-libs/opensc/Manifest | 1 -
14 .../files/opensc-0.19.0-p11test_common.h.patch | 108 ---------------------
15 dev-libs/opensc/opensc-0.19.0-r2.ebuild | 66 -------------
16 3 files changed, 175 deletions(-)
17
18 diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
19 index 016cba20da9..d75f0be4183 100644
20 --- a/dev-libs/opensc/Manifest
21 +++ b/dev-libs/opensc/Manifest
22 @@ -1,2 +1 @@
23 -DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c888874963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a SHA512 90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e
24 DIST opensc-0.20.0.tar.gz 2140645 BLAKE2B 298a6d9c8a9682899cae201ba7edd464a2e3d947f6d97672727bedc47f6b529cb1495a8bc335f83cdb42b0c0077de0fd7ff9f3f8f506b543b1970cb6557b762e SHA512 71f71fa6062410e63c6c60f5b2d10d1d855cc6cc815ef0e42e42a1ddd25bbd52fc396c1e495ef54610f3243996dec84dacc8007b186deb670ed645b04ee6eda5
25
26 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
27 deleted file mode 100644
28 index ca27c70245d..00000000000
29 --- a/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch
30 +++ /dev/null
31 @@ -1,108 +0,0 @@
32 -From d1e4f4879b8d0a7423afc1c9a3632da4763ee31c Mon Sep 17 00:00:00 2001
33 -From: Alon Bar-Lev <alon.barlev@×××××.com>
34 -Date: Sat, 15 Sep 2018 11:04:13 +0300
35 -Subject: [PATCH] missing include
36 -
37 ----
38 - src/tests/p11test/p11test_common.h | 89 ++++++++++++++++++++++++++++++++++++++
39 - 1 file changed, 89 insertions(+)
40 - create mode 100644 src/tests/p11test/p11test_common.h
41 -
42 -diff --git a/src/tests/p11test/p11test_common.h b/src/tests/p11test/p11test_common.h
43 -new file mode 100644
44 -index 0000000..d3ca304
45 ---- /dev/null
46 -+++ b/src/tests/p11test/p11test_common.h
47 -@@ -0,0 +1,89 @@
48 -+/*
49 -+ * p11test_common.h: Test suite shared declarations for PKCS#11 API
50 -+ *
51 -+ * Copyright (C) 2016 Martin Strhársky <strharsky.martin@×××××.com>
52 -+ * Copyright (C) 2016, 2017 Red Hat, Inc.
53 -+ *
54 -+ * Author: Jakub Jelen <jjelen@××××××.com>
55 -+ *
56 -+ * This library is free software; you can redistribute it and/or
57 -+ * modify it under the terms of the GNU Lesser General Public
58 -+ * License as published by the Free Software Foundation; either
59 -+ * version 2.1 of the License, or (at your option) any later version.
60 -+ *
61 -+ * This library is distributed in the hope that it will be useful,
62 -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
63 -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
64 -+ * Lesser General Public License for more details.
65 -+ *
66 -+ * You should have received a copy of the GNU General Public License
67 -+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
68 -+ */
69 -+
70 -+#ifndef P11TEST_COMMON_H
71 -+#define P11TEST_COMMON_H
72 -+#include "config.h"
73 -+#include <stdio.h>
74 -+#include <stdlib.h>
75 -+#include <string.h>
76 -+#include <setjmp.h>
77 -+#include <cmocka.h>
78 -+#include "pkcs11/pkcs11.h"
79 -+#include "libopensc/sc-ossl-compat.h"
80 -+
81 -+#define MAX_MECHS 200
82 -+
83 -+#ifndef NDEBUG
84 -+ #define debug_print(fmt, ...) \
85 -+ { fprintf(stderr, fmt "\n", ##__VA_ARGS__); } while (0)
86 -+#else
87 -+ #define debug_print(fmt, ...)
88 -+#endif
89 -+
90 -+#define FLAGS_SIGN 0x01
91 -+#define FLAGS_SIGN_OPENSSL 0x02
92 -+#define FLAGS_SIGN_ANY ( FLAGS_SIGN | FLAGS_SIGN_OPENSSL )
93 -+#define FLAGS_DECRYPT 0x04
94 -+#define FLAGS_DECRYPT_OPENSSL 0x08
95 -+#define FLAGS_DECRYPT_ANY ( FLAGS_DECRYPT | FLAGS_DECRYPT_OPENSSL )
96 -+
97 -+typedef struct {
98 -+ char *outfile;
99 -+ FILE *fd;
100 -+ int in_test;
101 -+ int first;
102 -+ int in_data;
103 -+ int first_data;
104 -+} log_context_t;
105 -+
106 -+typedef struct {
107 -+ CK_MECHANISM_TYPE mech;
108 -+ CK_MECHANISM_TYPE hash;
109 -+ CK_RSA_PKCS_MGF_TYPE mgf;
110 -+ int salt;
111 -+ int usage_flags;
112 -+ int result_flags;
113 -+} test_mech_t;
114 -+
115 -+typedef struct {
116 -+ CK_FUNCTION_LIST_PTR function_pointer;
117 -+ CK_SLOT_ID slot_id;
118 -+ CK_SESSION_HANDLE session_handle;
119 -+ CK_UTF8CHAR* pin;
120 -+ size_t pin_length;
121 -+ char *library_path;
122 -+ unsigned int interactive;
123 -+ log_context_t log;
124 -+
125 -+ test_mech_t rsa_mechs[MAX_MECHS];
126 -+ size_t num_rsa_mechs;
127 -+ test_mech_t ec_mechs[MAX_MECHS];
128 -+ size_t num_ec_mechs;
129 -+ test_mech_t keygen_mechs[MAX_MECHS];
130 -+ size_t num_keygen_mechs;
131 -+} token_info_t;
132 -+
133 -+token_info_t token;
134 -+
135 -+#endif /* P11TEST_COMMON_H */
136 -+
137 ---
138 -2.16.4
139 -
140
141 diff --git a/dev-libs/opensc/opensc-0.19.0-r2.ebuild b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
142 deleted file mode 100644
143 index f02c94ebc57..00000000000
144 --- a/dev-libs/opensc/opensc-0.19.0-r2.ebuild
145 +++ /dev/null
146 @@ -1,66 +0,0 @@
147 -# Copyright 1999-2019 Gentoo Authors
148 -# Distributed under the terms of the GNU General Public License v2
149 -
150 -EAPI=7
151 -
152 -inherit bash-completion-r1
153 -
154 -DESCRIPTION="Libraries and applications to access smartcards"
155 -HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
156 -SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
157 -
158 -LICENSE="LGPL-2.1"
159 -SLOT="0"
160 -KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
161 -IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
162 -RESTRICT="!test? ( test )"
163 -
164 -RDEPEND="zlib? ( sys-libs/zlib )
165 - readline? ( sys-libs/readline:0= )
166 - ssl? (
167 - !libressl? ( dev-libs/openssl:0= )
168 - libressl? ( >=dev-libs/libressl-2.7.0:0= )
169 - )
170 - openct? ( >=dev-libs/openct-0.5.0 )
171 - pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
172 - notify? ( dev-libs/glib:2= )"
173 -DEPEND="${RDEPEND}
174 - app-text/docbook-xsl-stylesheets
175 - dev-libs/libxslt
176 - test? ( dev-util/cmocka )"
177 -BDEPEND="virtual/pkgconfig"
178 -
179 -REQUIRED_USE="
180 - pcsc-lite? ( !openct !ctapi )
181 - openct? ( !pcsc-lite !ctapi )
182 - ctapi? ( !pcsc-lite !openct )
183 - || ( pcsc-lite openct ctapi )"
184 -
185 -PATCHES=(
186 - "${FILESDIR}/${P}-p11test_common.h.patch"
187 -)
188 -
189 -src_configure() {
190 - econf \
191 - --with-completiondir="$(get_bashcompdir)" \
192 - --disable-openpace \
193 - --disable-static \
194 - --disable-strict \
195 - --enable-man \
196 - $(use_enable ctapi) \
197 - $(use_enable doc) \
198 - $(use_enable notify ) \
199 - $(use_enable openct) \
200 - $(use_enable openct) \
201 - $(use_enable pcsc-lite pcsc) \
202 - $(use_enable readline) \
203 - $(use_enable secure-messaging sm) \
204 - $(use_enable ssl openssl) \
205 - $(use_enable test tests) \
206 - $(use_enable zlib)
207 -}
208 -
209 -src_install() {
210 - default
211 - find "${D}" -name '*.la' -delete || die
212 -}