gentoo auto-resync : 11:07:2023 - 04:28:45

6 files changed, 98 insertions, 4 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 63de9e54dd9a..79759cebcedc 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 2d21e7361f1e..db56983a324b 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -2,8 +2,10 @@ AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f
 DIST libbpf-0.8.1.tar.gz 942702 BLAKE2B 084be7d4258500fa894560ed2e52821addcc5d150dcd77fd646271b614d788b7931271be9c3e46fdbc4ed93d053ea3e09023158a8e4a31f9452d10dcb0677b58 SHA512 e3bb602f55215a4f030e564af7321ba6338937c426fcaee478b607f88b0c773c40a0c3f59a2b345bda951a19e79061733f8a3fdc10a6292e92782e65754b584a
 DIST libbpf-1.1.0.tar.gz 2337951 BLAKE2B 70bee4e94c3b372501e1697cec6573fb3292e61236ed210bde4c3a838494cc951571d7c47720c28a47b8e038331775d66d3f4ad24423f5102e1ee708d1981f88 SHA512 751126893883c68e5472724988327e03f7f52becd472f7d6239fa838762f857e54a0347f8f824b8c32ca93b8f419310a86e1d75e3646dae72c2d2992d093b828
 DIST libbpf-1.2.0.tar.gz 999623 BLAKE2B cd10fd9133f01d3f8dbd5ed4585e5605c3b9fb0d9f6ee76a49dcb61a0555edfeb85e333f7b8eb069f47a65d0ab24dcdc33502bd660378cd662a366f10de627a4 SHA512 b5291e807a3c83cb80a47e3518a3ab5ad0b0e6157842117c0684c32e525dce0cca199c3c9028390b94a73ff968391aa023312d3b8bd7472aff1c9ee5206c424e
+DIST libbpf-1.2.1.tar.gz 999804 BLAKE2B fa384675be2d24f284d8384d23a395e9106d9f0456a9c34608bcc57b990addc85708b1aa17102044c03a0458949e494865316babc0d7e496d8ce902abf64a072 SHA512 080103800808a16cab99c445add50af2656584776b360d90a8d3abbf44bcde55b64f8ff36a2577a13918375b578ca474740f333c860962fb98957d67f0ae83d9
 EBUILD libbpf-0.8.1.ebuild 1153 BLAKE2B 98da8cd35ab316a4bbf9d4e6a9c40b278ecd1385d8077a16e4582fb9a4209c40ebcf4ec9e24d3312334ace6c2f99da9732e7a9379a0dd478baa66bdd790a4793 SHA512 16a7e9a08fe9d782da9f57727b50592d42c7cfcd5cbf407197c5764e2a7175f0277a116e25379092e0f67adac353513f614d9bfe2edac2990d0fc91d5adc9a26
 EBUILD libbpf-1.1.0.ebuild 1185 BLAKE2B 57c4bfa90f1601343e66e0233c30af684c47688eda103bd2672472cf6a199f8849f0821d2e889e583dc09a4a8e36b9a9f92fb3d1abb6e2db844b5f57c3566489 SHA512 ab6998bfa3a4674c6df8ccfa0b46216779d6ea48d22f33a45836f233f3c755b714aeada2f8950814a083a1a490ca10672df60351b9c8ece555fe98a3a1bb5c27
 EBUILD libbpf-1.2.0.ebuild 1187 BLAKE2B 0e21d28560cab7cc4f356d7325d635fbdb5bd006561cd6d2e8736c5bab5a21e4a8aedbe77617fac5d1292ad47144d4cb6394014c67b8574f14fecd588047013b SHA512 7f2e7a789a5cd8d11d2bcdf34364160cfd875a94899efa1391a1921686360b44d4cd489727c42a68058e2a2076ac57131d09a78c05cbf3f669bad830dfd23e11
+EBUILD libbpf-1.2.1.ebuild 1192 BLAKE2B bd3087d68ed1e96220a836e005d3d5e82c7322159e79d3e43c2ed2d14b02d8103c024f0a43dee77383e2abfc5fb7b12bff2a7925cde32393e9a7bafc87c4c5a3 SHA512 a4623adfec492b597089d4d8a3a30e56d6ecee6065a109d3488ca2e0e719ee72b21a2acc37e75bb9acca0d28e91686b9b904af090aaad6cdb82c992cda877442
 EBUILD libbpf-9999.ebuild 1192 BLAKE2B e26a265cb13392e4e90e48ab96cabad38188e9b28ccf40e8e7b11a08117193dbe025f5ab71c09da29a7e3ab2561c154389e87be9b1a1fba8e7d57eb3105a07bb SHA512 955be1dde34476c2b66014f9b3da584ea38459105f49980e29fd943198feb3ee228a6ffb121c9bbce7c109712c37bbc8996f8cc4715eba626bd08aadaa23d7e8
 MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
diff --git a/dev-libs/libbpf/libbpf-1.2.1.ebuild b/dev-libs/libbpf/libbpf-1.2.1.ebuild
new file mode 100644
index 000000000000..c444170afb0c
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-1.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+S="${WORKDIR}/${P}/src"
+
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+HOMEPAGE="https://github.com/libbpf/libbpf"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="static-libs"
+
+DEPEND="
+	sys-kernel/linux-headers
+	virtual/libelf"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/libbpf-9999-paths.patch
+)
+
+src_configure() {
+	append-cflags -fPIC
+	tc-export CC AR PKG_CONFIG
+	export LIBSUBDIR="$(get_libdir)"
+	export PREFIX="${EPREFIX}/usr"
+	export V=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		LIBSUBDIR="${LIBSUBDIR}" \
+		install install_uapi_headers
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
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() {