diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-07-11 04:28:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-07-11 04:28:45 +0100 |
| commit | 7e110ec617b903791c3d309845e11a8b27f441cc (patch) | |
| tree | d9e8b4826e21ef9fa1fc2255d459f563d5581283 /dev-libs/libp11 | |
| parent | f2a91413828611d85d0496e98e1656e9b0e4528b (diff) | |
gentoo auto-resync : 11:07:2023 - 04:28:45
Diffstat (limited to 'dev-libs/libp11')
| -rw-r--r-- | dev-libs/libp11/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/libp11/files/libp11-0.4.12-openssl-3.1.patch | 25 | ||||
| -rw-r--r-- | dev-libs/libp11/libp11-0.4.12-r3.ebuild (renamed from dev-libs/libp11/libp11-0.4.12-r2.ebuild) | 18 |
3 files changed, 42 insertions, 4 deletions
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest index 3813fa21de69..3e913f74ebd4 100644 --- a/dev-libs/libp11/Manifest +++ b/dev-libs/libp11/Manifest @@ -1,4 +1,5 @@ +AUX libp11-0.4.12-openssl-3.1.patch 961 BLAKE2B 01aae650ec002a7fd1d70cd41953138f7ca8be5168e626530db8e78c85aa2681e8f2bb61e5811a2a5cac116d22cfcfd102736554bb53719509f81e20ac9decbe SHA512 018d026b56bb50219c7b946dcbdee8aaa91f7d48cfdc595fd46a5250ff1a9f9766fd5dd4f97261ac9adbb109b78023971b97bbd42a6533f0a43bb7d437924824 DIST libp11-0.4.12.tar.gz 516414 BLAKE2B a816749984753a1916dd58860c51b49d316946b59eb3bc839f6a21dcff14de48d7a4937f55fc7ad96a26b914591854d5cf11a1fbac2d5f2f5e04c833973c0e42 SHA512 674cfca2c9eaf162262204c94f9d59d3095dabbc348c1842e758b897e1a5bd4ba08b2d589ec3b2a2d1343a8760eab253e7008dc09ef5b499e2f16385efe5c8cc EBUILD libp11-0.4.12-r1.ebuild 735 BLAKE2B 345d0b033c53d9842e47be807ecf22b382da1b96b2a258ec7163f5924489abad6ccdd6499b1831868ab8fb7b3201056ec2483c90e5d82795953148a00c44bd34 SHA512 247b4fcd656d60866ec9a3d6d361cb0a16b35b70b4aef696937cef4c5133aa69cac626b1ec10cca1396e5d1214933b53ab81d27c672f226430f3ac554b605c7f -EBUILD libp11-0.4.12-r2.ebuild 780 BLAKE2B 25a1115cf75e6a7416d6f62699969d363da3a9e16f4aa61c5042b628106f02160a5976932cb993d473f288ba5c188ff127f74b0cf4093eab15b48cee2a270d98 SHA512 0ebc01c4e83d072e7e7dbf12f47642ac4898d6b1bb039858ead27fab0e960f263b45e02293d220f3e07d7f35db8dc978c8d229d36367e4e94516e5ad5ba60a87 +EBUILD libp11-0.4.12-r3.ebuild 932 BLAKE2B 9d9d3a6cac738ff4d46d949c906d365a5a54c1bd319258e84eafeccf6300c0fc74460af916cb7986dbd8e492cb8b9f104112ea66efd0f3ce219013f762066f13 SHA512 ca823dadd68bcbf859c807ac538edc629cd8b1acc2075b1037cf9537fd728847ddf87211f2be6113b5286c11461ced8a656b0e4e3872075c092ec49e384b4f6c MISC metadata.xml 605 BLAKE2B 69d65e5f468abb8e4ac74afe597d7f1129e3dd1ecb249aa794a75c628268e5250cc0385c8119c0752155967d22a07fdfac2d31af458c0811a47bd32663627d1d SHA512 a2bd8e47b0d86aa7f3009bc724cc22adfbab5ddc041b2ec87f6f96faa4f2bfb442e501668c27627723727058b4c615cd6c80ef40f1bbdd580fdf6b7fe7326229 diff --git a/dev-libs/libp11/files/libp11-0.4.12-openssl-3.1.patch b/dev-libs/libp11/files/libp11-0.4.12-openssl-3.1.patch new file mode 100644 index 000000000000..fbc7cf9d64ed --- /dev/null +++ b/dev-libs/libp11/files/libp11-0.4.12-openssl-3.1.patch @@ -0,0 +1,25 @@ +https://github.com/OpenSC/libp11/pull/503 +https://bugs.gentoo.org/910203 + +From 580c12b78b63d88010a6178d7c4c58186938c479 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger <dimstar@opensuse.org> +Date: Tue, 6 Jun 2023 14:27:46 +0200 +Subject: [PATCH] Detect openSSL 3.1; compatible to openSSL 3.0 + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d6b0ee91..b96979d9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -33,7 +33,7 @@ AC_C_BIGENDIAN + # issues with applications linking to new openssl, old libp11, and vice versa + case "`$PKG_CONFIG --modversion --silence-errors libcrypto || \ + $PKG_CONFIG --modversion openssl`" in +- 3.0.*) # Predicted engines directory prefix for OpenSSL 3.x ++ 3.1.*|3.0.*) # Predicted engines directory prefix for OpenSSL 3.x + LIBP11_LT_OLDEST="3" + debian_ssl_prefix="openssl-3.0.0";; + 1.1.*) # Predicted engines directory prefix for OpenSSL 1.1.x diff --git a/dev-libs/libp11/libp11-0.4.12-r2.ebuild b/dev-libs/libp11/libp11-0.4.12-r3.ebuild index 7b6e2ec011e6..83c149c404b1 100644 --- a/dev-libs/libp11/libp11-0.4.12-r2.ebuild +++ b/dev-libs/libp11/libp11-0.4.12-r3.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit autotools + DESCRIPTION="Abstraction layer to simplify PKCS#11 API" HOMEPAGE="https://github.com/opensc/libp11/wiki" SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz" @@ -20,11 +22,21 @@ BDEPEND="virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-libs/opensc )" +src_prepare() { + local PATCHES=( + "${FILESDIR}"/libp11-0.4.12-openssl-3.1.patch + ) + default + eautoreconf +} + src_configure() { - econf \ - --enable-shared \ - $(use_enable static-libs static) \ + local args=( + --enable-shared + $(use_enable static-libs static) $(use_enable doc api-doc) + ) + econf "${args[@]}" } src_install() { |