* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pkcs11-helper/files/, dev-libs/pkcs11-helper/
@ 2018-08-22 17:29 Alon Bar-Lev
0 siblings, 0 replies; 2+ messages in thread
From: Alon Bar-Lev @ 2018-08-22 17:29 UTC (permalink / raw
To: gentoo-commits
commit: e60ab0b2d94f5307bf6c6c056bd5487a38ab008e
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 22 17:28:47 2018 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Wed Aug 22 17:29:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e60ab0b2
dev-libs/pkcs11-helper: build with openssl bindist
Closes: https://bugs.gentoo.org/664086
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/pkcs11-helper-1.25.1-build.patch | 33 ++++++++++++++++++++++
dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild | 4 +++
2 files changed, 37 insertions(+)
diff --git a/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch b/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch
new file mode 100644
index 00000000000..a657dba14ce
--- /dev/null
+++ b/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch
@@ -0,0 +1,33 @@
+From 0e2ae10ef9611beef92457171e8c78d8e936dfca Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 22 Aug 2018 20:24:19 +0300
+Subject: [PATCH] openssl: build with openssl ec disabled
+
+---
+ ChangeLog | 1 +
+ lib/pkcs11h-openssl.c | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/pkcs11h-openssl.c b/lib/pkcs11h-openssl.c
+index c981e21..4ebc211 100644
+--- a/lib/pkcs11h-openssl.c
++++ b/lib/pkcs11h-openssl.c
+@@ -263,6 +263,7 @@ DSA_SIG_set0 (DSA_SIG *sig, BIGNUM *r, BIGNUM *s)
+ }
+ #endif
+
++#ifdef __ENABLE_EC
+ #ifndef HAVE_ECDSA_SIG_SET0
+ static int
+ ECDSA_SIG_set0 (ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
+@@ -275,7 +276,6 @@ ECDSA_SIG_set0 (ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
+ }
+ #endif
+
+-#ifdef __ENABLE_EC
+ #ifndef HAVE_EC_KEY_METHOD_GET_SIGN
+ void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
+ int (**psign)(int type, const unsigned char *dgst,
+--
+2.16.4
+
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
index 5cf68a2ebbf..976039d3900 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
@@ -23,6 +23,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( >=app-doc/doxygen-1.4.7 )"
+PATCHES=(
+ "${FILESDIR}/${P}-build.patch"
+)
+
src_configure() {
econf \
--disable-crypto-engine-polarssl \
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pkcs11-helper/files/, dev-libs/pkcs11-helper/
@ 2022-04-17 19:00 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-04-17 19:00 UTC (permalink / raw
To: gentoo-commits
commit: 78620144b0a0ecfa208f255194e9db203def0f9d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 18:50:11 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 18:59:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78620144
dev-libs/pkcs11-helper: drop 1.25.1-r1, 1.27.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/pkcs11-helper/Manifest | 1 -
.../files/pkcs11-helper-1.25.1-build.patch | 33 ---------------
.../pkcs11-helper/pkcs11-helper-1.25.1-r1.ebuild | 40 ------------------
dev-libs/pkcs11-helper/pkcs11-helper-1.27.0.ebuild | 47 ----------------------
4 files changed, 121 deletions(-)
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index cd9a73bdc0e3..fa7ff1622a81 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,2 +1 @@
-DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
DIST pkcs11-helper-1.27.0.tar.bz2 422425 BLAKE2B a9fd7ef04dce1abbae57b09a12b4be560465ae0cf2910443332882967d00b6380c62944820aa9580e101459d1c35edaae68cd7abbafa308a8b152921ac32f04c SHA512 5799342cb755dae8b7ba0880d652e9d4b4f1e52a74043015e1185e1e059326cb2689bb51957db98060ac2257dee34e2f047dcf3d52ad59fd49b91fedcfc5332b
diff --git a/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch b/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch
deleted file mode 100644
index a657dba14ce2..000000000000
--- a/dev-libs/pkcs11-helper/files/pkcs11-helper-1.25.1-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0e2ae10ef9611beef92457171e8c78d8e936dfca Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 22 Aug 2018 20:24:19 +0300
-Subject: [PATCH] openssl: build with openssl ec disabled
-
----
- ChangeLog | 1 +
- lib/pkcs11h-openssl.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/pkcs11h-openssl.c b/lib/pkcs11h-openssl.c
-index c981e21..4ebc211 100644
---- a/lib/pkcs11h-openssl.c
-+++ b/lib/pkcs11h-openssl.c
-@@ -263,6 +263,7 @@ DSA_SIG_set0 (DSA_SIG *sig, BIGNUM *r, BIGNUM *s)
- }
- #endif
-
-+#ifdef __ENABLE_EC
- #ifndef HAVE_ECDSA_SIG_SET0
- static int
- ECDSA_SIG_set0 (ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
-@@ -275,7 +276,6 @@ ECDSA_SIG_set0 (ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
- }
- #endif
-
--#ifdef __ENABLE_EC
- #ifndef HAVE_EC_KEY_METHOD_GET_SIGN
- void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
- int (**psign)(int type, const unsigned char *dgst,
---
-2.16.4
-
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1-r1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1-r1.ebuild
deleted file mode 100644
index 96d1d2412c3b..000000000000
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PKCS#11 helper library"
-HOMEPAGE="https://github.com/OpenSC/pkcs11-helper"
-SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="bindist doc gnutls nss static-libs"
-
-RDEPEND="
- >=dev-libs/openssl-0.9.7:0=[bindist(-)=]
- gnutls? ( >=net-libs/gnutls-1.4.4 )
- nss? ( dev-libs/nss )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- doc? ( >=app-doc/doxygen-1.4.7 )"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
-)
-
-src_configure() {
- econf \
- --disable-crypto-engine-polarssl \
- --disable-crypto-engine-mbedtls \
- $(use_enable doc) \
- $(use_enable gnutls crypto-engine-gnutls) \
- $(use_enable nss crypto-engine-nss) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.27.0.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.27.0.ebuild
deleted file mode 100644
index 7d1814330930..000000000000
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.27.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PKCS#11 helper library"
-HOMEPAGE="https://github.com/OpenSC/pkcs11-helper"
-
-if [[ $(ver_cut 3) -eq 0 ]]; then
- MY_PV=$(ver_cut 1-2)
-else
- MY_PV=${PV}
-fi
-
-SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${PN}-${MY_PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="bindist doc gnutls nss static-libs"
-
-RDEPEND="
- >=dev-libs/openssl-0.9.7:0=[bindist(-)=]
- gnutls? ( >=net-libs/gnutls-1.4.4 )
- nss? ( dev-libs/nss )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- doc? ( >=app-doc/doxygen-1.4.7 )"
-
-PATCHES=(
- "${FILESDIR}/${P}-nss.patch"
-)
-
-src_configure() {
- econf \
- --disable-crypto-engine-polarssl \
- --disable-crypto-engine-mbedtls \
- $(use_enable doc) \
- $(use_enable gnutls crypto-engine-gnutls) \
- $(use_enable nss crypto-engine-nss) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-17 19:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-22 17:29 [gentoo-commits] repo/gentoo:master commit in: dev-libs/pkcs11-helper/files/, dev-libs/pkcs11-helper/ Alon Bar-Lev
-- strict thread matches above, loose matches on Subject: below --
2022-04-17 19:00 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox