gentoo auto-resync : 22:01:2023 - 12:52:10

3 files changed, 109 insertions, 0 deletions

diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index 191968091dfc..6620653ff56b 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -1,10 +1,12 @@
 AUX liburing-2.1-arm-syscall.patch 1752 BLAKE2B f2f27e9ff6f86b75808d99a0e89e2c8609f481ba3ff1f908b1f2ec670a5ab5518ea990ff4bc24506f5ce6f6d8e1083ac7e3b0aaee9d72a8fb5bc3d4577617309 SHA512 04e1c92d6b399f046c500ff3a7d78990682e60df3994431977f7a01bea0fba0fb1dea6e66340bfd79869fbc2114f4e9a9eb391ed26d81a3041accf78141fd158
 AUX liburing-2.1-gnu_source-musl-cpuset.patch 1483 BLAKE2B 4df57662e28240455795415c4de4b3047afdfcd0818d829f79c0489539d6646fa84de8ef94d15488e8d66169598bbfdd4dbbd21c90638eb5e372ecfdbb2dfe8c SHA512 a779f9077c2529c8e294ff6c22823c149d79eb84f20889583422987eec42c3e549d61041e07456a9b085284fdc5f44e8816efa837e4e8865deb6874f29f463f0
+AUX liburing-2.3-liburing.map-Export-io_uring_-enable_rings-register_.patch 1233 BLAKE2B 86113d0201afc1860d240f585a392dd45ea8a1b45adbae96c2a87d18f8540bae96a6a5efc6e8a971aa1535034a859a99c75ea6e43c0744967707aebcc93e08c0 SHA512 7110eae38e18e710522211a9ab8b5a0879107dc236553b139d460a0068e44def9e28357c615665920dd86e0b70d552daeb09b677ca460adc3eb352fffe61be73
 DIST liburing-2.1.tar.bz2 120806 BLAKE2B 3a09d1504150ed1c111f064187d868fd86ec7c3dbf661f73999f7fbb9c945b528f7ab2e0cfff5d270a1a977f04deedc7c790b6df8708ef2884fbf28c1a9ffd1b SHA512 a658454869b01752b5e499c4f0b50c342a8ff63b3dd1a473a96f9fad03f22a6e4d2354b0e658a4e7e50ea27440a84ee274856b3687803583bc80cb4bc45aec71
 DIST liburing-2.2.tar.bz2 172733 BLAKE2B 19ae8a356e4fdc296bfb3ff121b777bd7c970388b31686aac5c531508e807360d58220bc27f9c62c55bd76ca687013acfceb3fa8a2162b615561f637cc50ffe1 SHA512 55b935a90c108be54393a5ab341b56e40ad8d506360fe15b3dcde5ee263356f11080f8614efdc4253f6318ea35d808ec47a9dbfc6b9f6cc2e04f7f1a75c3f621
 DIST liburing-2.3.tar.bz2 197929 BLAKE2B 94ae2a79522fbac13c071ad752f5cbfae3e3b3dd6b35da24e5c756ba47a7b304e5bcb18391ca23fc2edafeb2dbcdcf143fd2cda71656396ac34248159a964fb7 SHA512 341aa13d3b560617f3710291945ec2fe35d828e0b67ee3a97555fd4eb3d2042a7f9e722080d8ebb45aa74a2ca4ef58db1e8a10c351e951a604da007ba69d2738
 EBUILD liburing-2.1-r2.ebuild 1724 BLAKE2B 900c92124e14b809a698f48b81536e4b6c37e6629169fcb0b668cefb51cdcba84d7555a3eff957b0bd1b9c37bb2f4005d9c2bae569b6a1b852043c77614f3d02 SHA512 385c3f5f1d2d5bc38463d758d317ce58ee57261b80e039772a3a050d4aa870dcd80f4a7d5247e6036aea777494edf40af6669438ea4ef9b1cad87144437789aa
 EBUILD liburing-2.2.ebuild 1574 BLAKE2B 78ebce489d9b427f0832118b0e752cc8cb033a7b98bbb056b85222d69e355d01ca3c3ae3e1a9d9afbad14f0aaa4cdead017a580fc32734adb8097e0bd43f4854 SHA512 84002d4a80e24bc4516170a720f10a15d7fa94e5a7a1831c38be7e109bcc0f90423cfd9097569be4b3af45be366ea1c537fb9626012fda502377fea0438d6b83
+EBUILD liburing-2.3-r1.ebuild 1712 BLAKE2B badc217685258fe94131c60a0e8d11d86777f590a8a5d97bad6c6da7a88b82b1c1130a84c21d5af8b0a04179edcfdafa31560a35e44b95e1cb7e316e94cb4a95 SHA512 1ef4c3aed0187cc7f5b908887e9a0ca80663d8aeee722a015387db2e97278d0877a8f3f883834eca80f193f62fa50f51b52e29f84c42a2f95ec57a10c9c0accf
 EBUILD liburing-2.3.ebuild 1581 BLAKE2B d67499bcdff891ee3d5883f01dd1250c5357551719cab3aa1b52ec69083acdbe2ef28c29acdab92223ace87440309c7357cc663542270a04889fc558457dc034 SHA512 1820e0094a1830a73d404c052fd22e6fdc9dbc264dcb3b351f8d672caebbb8ab42a9cb318fd33e098ba4d2f2781bd35d903527883bd1af7b581e779e5882dde0
 EBUILD liburing-9999.ebuild 1581 BLAKE2B d67499bcdff891ee3d5883f01dd1250c5357551719cab3aa1b52ec69083acdbe2ef28c29acdab92223ace87440309c7357cc663542270a04889fc558457dc034 SHA512 1820e0094a1830a73d404c052fd22e6fdc9dbc264dcb3b351f8d672caebbb8ab42a9cb318fd33e098ba4d2f2781bd35d903527883bd1af7b581e779e5882dde0
 MISC metadata.xml 326 BLAKE2B 7c133a6dbb4ab4b537c0741ec9f3cd525c0803040950ee93e4c1cbc848c7618074471cc1a18ca07d6963c06252c83b66df0811ebae4c0cf9d7782f66ca5aa14a SHA512 1aacf941a9fa57429468fdfc8f546f559c5d483988ba5c6b0f4ed0fe5913f85d218b2a9eec83bae1d11a71eed36a37e76ccedc192697fbe9763fd0b09b2dcfd7
diff --git a/sys-libs/liburing/files/liburing-2.3-liburing.map-Export-io_uring_-enable_rings-register_.patch b/sys-libs/liburing/files/liburing-2.3-liburing.map-Export-io_uring_-enable_rings-register_.patch
new file mode 100644
index 000000000000..8ea4c4df2b8a
--- /dev/null
+++ b/sys-libs/liburing/files/liburing-2.3-liburing.map-Export-io_uring_-enable_rings-register_.patch
@@ -0,0 +1,35 @@
+From 19424b0baa5999918701e1972b901b0937331581 Mon Sep 17 00:00:00 2001
+From: Ammar Faizi <ammarfaizi2@gnuweeb.org>
+Date: Sat, 14 Jan 2023 10:54:05 +0700
+Subject: [PATCH] liburing.map: Export
+ `io_uring_{enable_rings,register_restrictions}`
+
+When adding these two functions, Stefano didn't add
+io_uring_enable_rings() and io_uring_register_restrictions() to
+liburing.map. It causes a linking problem. Add them to liburing.map.
+
+This issue hits liburing 2.0 to 2.3.
+
+[flow: backport to liburing 2.3]
+
+Closes: https://github.com/axboe/liburing/pull/774
+Fixes: https://github.com/axboe/liburing/issues/773
+Fixes: https://github.com/facebook/folly/issues/1908
+Fixes: d2654b1ac886 ("Add helper to enable rings")
+Fixes: 25cf9b968a27 ("Add helper to register restrictions")
+Cc: Dylan Yudaken <dylany@meta.com>
+Cc: Stefano Garzarella <sgarzare@redhat.com>
+Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
+Link: https://lore.kernel.org/r/20230114035405.429608-1-ammar.faizi@intel.com
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+--- a/src/liburing.map
++++ b/src/liburing.map
+@@ -68,2 +68,5 @@ LIBURING_2.3 {
+        io_uring_submit_and_get_events;
++
++		io_uring_enable_rings;
++		io_uring_register_restrictions;
+ } LIBURING_2.3;
+-- 
+2.39.1
+
diff --git a/sys-libs/liburing/liburing-2.3-r1.ebuild b/sys-libs/liburing/liburing-2.3-r1.ebuild
new file mode 100644
index 000000000000..5a407a2b025e
--- /dev/null
+++ b/sys-libs/liburing/liburing-2.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Efficient I/O with io_uring"
+HOMEPAGE="https://github.com/axboe/liburing"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/axboe/liburing.git"
+else
+	SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+LICENSE="MIT"
+SLOT="0/2" # liburing.so major version
+
+IUSE="static-libs"
+# fsync test hangs forever
+RESTRICT="test"
+
+# At least installed headers need <linux/*>, bug #802516
+DEPEND=">=sys-kernel/linux-headers-5.1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# https://bugs.gentoo.org/891633
+	"${FILESDIR}/${PN}-2.3-liburing.map-Export-io_uring_-enable_rings-register_.patch"
+)
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" != *9999 ]] ; then
+		# Make sure pkgconfig files contain the correct version
+		# bug #809095 and #833895
+		sed -i "/^Version:/s@[[:digit:]\.]\+@${PV}@" ${PN}.spec || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--libdevdir="${EPREFIX}/usr/$(get_libdir)"
+		--mandir="${EPREFIX}/usr/share/man"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+	)
+	# No autotools configure! "econf" will fail.
+	TMPDIR="${T}" ./configure "${myconf[@]}" || die
+}
+
+multilib_src_compile() {
+	emake V=1 AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.a" -delete || die
+	fi
+}
+
+multilib_src_test() {
+	emake V=1 runtests
+}