gentoo auto-resync : 11:03:2023 - 18:08:11

3 files changed, 55 insertions, 1 deletions

diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 36e43ac8489a..89b196ba4bf4 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,7 +1,8 @@
 AUX zeromq-4.3.4-gcc-13.patch 3437 BLAKE2B 84cd5fb685b97741d78505022bbf33d154d48dc08f4b273ce5191aa3140f2ad889b526394d26cceb85489c63f0f14cafd764f12db9a5df2696bea90fda5ef82e SHA512 2a391896aa47e4de7994f66a549fcf4d2ddb0236bfe09e5e2e89b7224e08405f37bf601fcde361dcbf7e9b9aa17429a536d2c0481b307732c3cf665c2fa43f44
+AUX zeromq-4.3.4-qemu-user.patch 2385 BLAKE2B a224679ea010cc1af6d38265ca62d703d242f3f87cf7fab0d901c0ee73dae2d5b7436618f130264a6380ea27729ee46b1e29549aba22387200c7af044429e3c0 SHA512 334343b3cee4e8210d6b1eb48451056e1a89f62f116fc1da83437981a7a296de48bf4f3e9057c213940984f4de67dfdb4ea26a63cf08ab17bda22d4d25001dbd
 DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
 DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e
 EBUILD zeromq-4.3.3-r1.ebuild 1434 BLAKE2B 2ef0bdd7421a2a831b6494b8b4e919f83a4451f2065c448afa780e1740b04b9e3d1fc083af3fcb988f343deb5b55dbb833e2f8e10861b4d19830fc5e987b7d48 SHA512 1e2c77d3150800989e0e32ee8026c7e7523be71f98eb6269e5e2b1963faaa9cb11b50a8f1a6b9ee6df2c0492c3ce3bdbeb7916528dd9af2590bc2df6a5a80bbc
 EBUILD zeromq-4.3.4-r1.ebuild 1459 BLAKE2B 2761055575f039a6b5bc7447d8a871d76b0ab6acfb71b8f35ef78e4fd2430520862a73b42a3d23dc8cdbcafb1592ee146dd72239cb9dd87288ba1b080d23b3e5 SHA512 12f37a75b48cb9ef39ee8a26959e4b73e26c3aa3aa0512f703d162b502772432930adfdb18b1db12bf31d60cfa805cc1b0ac5a963860ea4ac08c943a8e748a15
-EBUILD zeromq-4.3.4-r2.ebuild 1529 BLAKE2B 1ea7794965ed35b3a05842fd30930e681e255f37c75c5df815badc405b47709df189d3d234704e5e888bc9393b42feb65009a4b8c81cec8d7ea97c7c1259513e SHA512 1e17b334878aeefa944a52f9bf0ad5e05c8d13b25fb6fd1f74037fbd7333bfdb2650eab695c9cce6b7a775ca41a649f65b7bce1cfc6025ea825ad4ca30f12263
+EBUILD zeromq-4.3.4-r2.ebuild 1565 BLAKE2B 5533561ab0b7d731075901913ac779bda48f15cb35931df1ce3134337036281822c7873240a8ba6aa9eaceb666c25aad05e1f20c09427c3edc47937fa8bd4d38 SHA512 1939718541e77ece158cb6b390053ec7ba3bd701c67319095ecb4970b3fa73946029864ce165978c1bb7bd801f8d5383173958a279598e22eb8c770bded94e40
 MISC metadata.xml 1541 BLAKE2B eb0032809d47b0f6e7064c1bcc8acd746480e3d1e222aeb7dd5658b820462376a8982e0d5a46e7dadc22efa8caaaa51c93f7bd66a1d73bba42a43dd959223596 SHA512 f3f8a92816c09499a6111fb375f429091c834be52e21189a7685fe59a40761ebd4d0d9e23889a0fc36d23863b3bcf16c245b00fb3d1ae21c9d8143be90977231
diff --git a/net-libs/zeromq/files/zeromq-4.3.4-qemu-user.patch b/net-libs/zeromq/files/zeromq-4.3.4-qemu-user.patch
new file mode 100644
index 000000000000..8374496e39e1
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-4.3.4-qemu-user.patch
@@ -0,0 +1,52 @@
+UPSTREAM: https://github.com/zeromq/libzmq/pull/4486
+BUG: https://bugs.gentoo.org/899986
+From: Han Gao <gaohan@iscas.ac.cn>
+
+In qemu-user, CACHELINE_SIZE probe is undefined
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8672d61799..072a6507e9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -481,7 +481,8 @@ execute_process(
+   ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(CACHELINE_SIZE STREQUAL ""
+    OR CACHELINE_SIZE EQUAL 0
+-   OR CACHELINE_SIZE EQUAL -1)
++   OR CACHELINE_SIZE EQUAL -1
++   OR CACHELINE_SIZE EQUAL "undefined")
+   set(ZMQ_CACHELINE_SIZE 64)
+ else()
+   set(ZMQ_CACHELINE_SIZE ${CACHELINE_SIZE})
+diff --git a/RELICENSE/hangao.md b/RELICENSE/hangao.md
+new file mode 100644
+index 0000000000..de100bb59a
+--- /dev/null
++++ b/RELICENSE/hangao.md
+@@ -0,0 +1,13 @@
++# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
++
++This is a statement by Han Gao that grants permission to relicense its copyrights in the libzmq C++
++library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
++Open Source Initiative approved license chosen by the current ZeroMQ 
++BDFL (Benevolent Dictator for Life).
++
++A portion of the commits made by the Github handle "Rabenda", with
++commit author "Han Gao <gaohan@iscas.ac.cn>" or "Han Gao <rabenda.cn@gmail.com>", are copyright of Han Gao .
++This document hereby grants the libzmq project team to relicense libzmq, 
++including all past, present and future contributions of the author listed above.
++
++Han Gao 2023/01/10
+diff --git a/acinclude.m4 b/acinclude.m4
+index ac55776e53..f27fc8e831 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1254,7 +1254,7 @@ AC_DEFUN([LIBZMQ_CHECK_CACHELINE], [{
+     AC_CHECK_TOOL(libzmq_getconf, getconf)
+     if ! test "x$libzmq_getconf" = "x"; then
+         zmq_cacheline_size=$($libzmq_getconf LEVEL1_DCACHE_LINESIZE 2>/dev/null || echo 64)
+-        if test "x$zmq_cacheline_size" = "x0" -o  "x$zmq_cacheline_size" = "x-1"; then
++        if test "x$zmq_cacheline_size" = "x0" -o  "x$zmq_cacheline_size" = "x-1" -o "x$zmq_cacheline_size" = "xundefined"; then
+             # getconf on some architectures does not know the size, try to fallback to
+             # the value the kernel knows on Linux
+             zmq_cacheline_size=$(cat /sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size 2>/dev/null || echo 64)
diff --git a/net-libs/zeromq/zeromq-4.3.4-r2.ebuild b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild
index 06892942f602..7cb568736d2d 100644
--- a/net-libs/zeromq/zeromq-4.3.4-r2.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild
@@ -34,6 +34,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc-13.patch
+	"${FILESDIR}"/${P}-qemu-user.patch
 )
 
 src_prepare() {