From 586819755b4dbfdffdc8a725ab7c0f86095b8489 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Sep 2018 17:37:09 +0100 Subject: gentoo resync : 15.09.2018 --- dev-libs/opensc/Manifest | 7 +- .../files/opensc-0.19.0-p11test_common.h.patch | 108 +++++++++++++++++++++ dev-libs/opensc/metadata.xml | 3 +- dev-libs/opensc/opensc-0.18.0.ebuild | 4 +- dev-libs/opensc/opensc-0.19.0-r1.ebuild | 63 ++++++++++++ 5 files changed, 180 insertions(+), 5 deletions(-) create mode 100644 dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch create mode 100644 dev-libs/opensc/opensc-0.19.0-r1.ebuild (limited to 'dev-libs/opensc') diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest index d34729be8519..e4b63abe4ac0 100644 --- a/dev-libs/opensc/Manifest +++ b/dev-libs/opensc/Manifest @@ -1,10 +1,13 @@ AUX opensc-0.17.0-build.patch 3577 BLAKE2B 0ad69e4305a21d613f93e76818d442983b1b1b642ba8e5c7030e44c96d4e86ed03f72c7623ba6b08ef9b620f6a5c5f43ea00a670880f070c165cb1f60235c529 SHA512 0412a0d0ee3caca534098357e7778f2aa6800ef6d8d559614cd892de13c6dd05d3a6f78dc12cdf834ab6a4c0160234342b46efda0ac844e2411f54aa08a94016 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.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 EBUILD opensc-0.16.0.ebuild 1390 BLAKE2B 14cd6dacb0ebc6d688ac0c0c6628cf11cb10337e13cf390a72d83bd755a589f8b8a61e4961a66b4de0b479e39f43ae30725dddd91aea27e33242cab1955de7ca SHA512 ab05e282f226d4c194b292330cdd132c23e92abff34aa8acdb75b3e2e97d5c1dad29089fe79f8e48d0ba93ed4150c7a287a497da20322ec9f44e8c6850230b4e EBUILD opensc-0.17.0.ebuild 1467 BLAKE2B 87f9b57bfeedd29319951e7e88e96f67dbdb6517ecef4a185f6f61c396a1943b7967b2e6ac9080dfc4f54b6bcf017c81169702a0e6b035eec6f4bd40a3f34f42 SHA512 50b49c15558621c22addc53dd2ed3b5379e1c185b098c1b4caee9a3af8557f87dc1de3c0d4f6d8c6ae8c73399caf7780aa2a984ff1f64d30814eb2082c8792d4 -EBUILD opensc-0.18.0.ebuild 1496 BLAKE2B ca71d1b5c5e679d1b8bdc3e424cc6b5c46a4611c2ec6e7a2b2435eb017f788ef0ebcbfefdac73b07ef5e2793371a8e9579bdaf2ef864a1e39b07b2ed44c208b7 SHA512 54555a9f3e0c80913c90cbd8403ec7f912fef4502f4052c66328841c017be2a284bea580cabd4fd7ba87fd1799f98f3f495df5b45fe00594632e72997d349699 -MISC metadata.xml 1164 BLAKE2B d512f5bb01592e7f864a09e7d537a94e89ac2226be34fa999d746701e3b0b9fc8495700f5dc6ec1c866ec9f2fa59ed23d737de53204e4cbc401eca176d1a8ac6 SHA512 eae0e3d7c795c452f65730138d867bff881778d9615b1cea1aba362d374e4d8ae8949d01204ce14bb8ea80021ca3328cb2657f3e25b95b93a7848e76f577c761 +EBUILD opensc-0.18.0.ebuild 1503 BLAKE2B cae3cd5dafd6c2c87785ef9518cc5b7e3564feec31ef29da8bd35a0180eae13291d18484921a8f4e060e3495ca4ccbe5a63ae02b711bb059b1eb5541ad9789b7 SHA512 1975af57c5c3e11fe90832b2518fbe72e782bb58260f9f87c7aa64d5c5f53180f07c5e95a9ed10daa8ad41501a342ab4af23c5140ef2750db12cb4febcbf3a27 +EBUILD opensc-0.19.0-r1.ebuild 1560 BLAKE2B 587618acb1bb5aeb4d5ab9d65689bf485630ee01e2bf955a089d5e1976ba1606958a1a1561bb143936c784eb5d3ea979c000a15bff5858390080e67756f4ec2b SHA512 58148ffac2813eb4185d8e36d3ec3b07bd5a32f71a1d38a6b73978c2b8e202f7f1359797bbecad0bc9374f6df5f2aa4371afb94177b28b5d4bf9d0f30f594b98 +MISC metadata.xml 1214 BLAKE2B 5d2a0bb352a11969d1f959c4d19171f3f274461f4dedc2558bb89d8ad114dc3796a49e04a35773340de2b321f4be86ea389f1b9733126785d0991771b254a891 SHA512 f37c2a234cfaa304bb41e17147e6970960fd909da2ab2bd924b61be20175d0b6351be98551451c95dcf8e5a77edd4c8c546d93b2bd04012ae667fbddb372e33e 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 new file mode 100644 index 000000000000..ca27c70245d7 --- /dev/null +++ b/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch @@ -0,0 +1,108 @@ +From d1e4f4879b8d0a7423afc1c9a3632da4763ee31c Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev +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 ++ * Copyright (C) 2016, 2017 Red Hat, Inc. ++ * ++ * Author: Jakub Jelen ++ * ++ * 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 . ++ */ ++ ++#ifndef P11TEST_COMMON_H ++#define P11TEST_COMMON_H ++#include "config.h" ++#include ++#include ++#include ++#include ++#include ++#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/metadata.xml b/dev-libs/opensc/metadata.xml index 52bf7f8f7bb9..7c8bf05b0e80 100644 --- a/dev-libs/opensc/metadata.xml +++ b/dev-libs/opensc/metadata.xml @@ -16,8 +16,9 @@ card. - Use dev-libs/openct (and CT-API) for accessing Smartcard hardware Use CT-API for accessing Smartcard hardware + Enable notifications + Use dev-libs/openct (and CT-API) for accessing Smartcard hardware Use sys-apps/pcsc-lite (and PC/SC API) for accessing Smartcard hardware Enable secure messaging diff --git a/dev-libs/opensc/opensc-0.18.0.ebuild b/dev-libs/opensc/opensc-0.18.0.ebuild index 2d33364c868f..a6b6123d08f3 100644 --- a/dev-libs/opensc/opensc-0.18.0.ebuild +++ b/dev-libs/opensc/opensc-0.18.0.ebuild @@ -11,14 +11,14 @@ 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="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= ) + libressl? ( >=dev-libs/libressl-2.7.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )" diff --git a/dev-libs/opensc/opensc-0.19.0-r1.ebuild b/dev-libs/opensc/opensc-0.19.0-r1.ebuild new file mode 100644 index 000000000000..10b9ad5a8db7 --- /dev/null +++ b/dev-libs/opensc/opensc-0.19.0-r1.ebuild @@ -0,0 +1,63 @@ +# 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="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test 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 ) + notify? ( dev-libs/glib:2= )" +DEPEND="${RDEPEND} + virtual/pkgconfig + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + test? ( dev-util/cmocka )" + +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 \ + --disable-openpace \ + --disable-static \ + --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 + prune_libtool_files --all +} -- cgit v1.2.3