[gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/files/, net-libs/zeromq/

[gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/files/, net-libs/zeromq/

[Justin Lecher]

commit:     c116ae0e559dad258e3cfe8e641d55feab2b634b
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 11:43:08 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 11:43:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c116ae0e

net-libs/zeromq: Backport fix for underlinking

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=602230

Package-Manager: portage-2.3.3
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../zeromq/files/zeromq-4.2.0-dl-backport.patch    | 25 ++++++++++++++++++++++
 net-libs/zeromq/zeromq-4.2.0.ebuild                |  6 +++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/net-libs/zeromq/files/zeromq-4.2.0-dl-backport.patch b/net-libs/zeromq/files/zeromq-4.2.0-dl-backport.patch
new file mode 100644
index 00000000..c00001d
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-4.2.0-dl-backport.patch
@@ -0,0 +1,25 @@
+From 1b3fcbd3eead8f1f59f3e9472319d58ce6b52bb7 Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <luca.boccassi@gmail.com>
+Date: Thu, 10 Nov 2016 22:49:41 +0000
+Subject: [PATCH] Problem: linker fails looking for dladdr
+
+Solution: search and add it via AC_CHECK_LIB when building with
+libunwind, as the backtrace function uses dladdr. This problem
+only appears on some distributions and with some compiler/toolchain
+versions.
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4fb2757..d548f9f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -650,6 +650,7 @@ PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
+         AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
+         AC_SUBST([LIBUNWIND_CFLAGS])
+         AC_SUBST([LIBUNWIND_LIBS])
++        AC_CHECK_LIB([dl], [dladdr])
+     ],
+     [
+         AC_MSG_WARN([Cannot find libunwind])

diff --git a/net-libs/zeromq/zeromq-4.2.0.ebuild b/net-libs/zeromq/zeromq-4.2.0.ebuild
index f43dcbd..c6b044a 100644
--- a/net-libs/zeromq/zeromq-4.2.0.ebuild
+++ b/net-libs/zeromq/zeromq-4.2.0.ebuild
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}
 	sys-apps/util-linux
 	pgm? ( virtual/pkgconfig )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-dl-backport.patch
+)
+
 src_prepare() {
 	sed \
 		-e '/libzmq_werror=/s:yes:no:g' \
@@ -51,5 +55,5 @@ src_test() {
 
 src_install() {
 	default
-	find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
+	find "${ED}"usr/lib* -name '*.la' -delete || die
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/files/, net-libs/zeromq/

[Thomas Deutschmann]

commit:     1b14dc8e6719814848931eb231992ba237bbad33
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 15 21:26:51 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 15 21:27:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b14dc8e

net-libs/zeromq: fix test_security_zap

Closes: https://bugs.gentoo.org/673472
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../files/zeromq-4.3.1-fix-test_security_zap.patch | 25 ++++++++++++++++++++++
 net-libs/zeromq/zeromq-4.3.1.ebuild                |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch b/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch
new file mode 100644
index 00000000000..3c89024b84b
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch
@@ -0,0 +1,25 @@
+From 4147957a5eec57ec7a2a416dca74c3c0299a3432 Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+Date: Sun, 13 Jan 2019 13:08:10 +0000
+Subject: [PATCH] Problem: test_security_zap fails on architectures that
+ disallow unaligned pointer access
+
+Solution: use memcpy instead of doing pointer arithmetics with casting
+and dereferencing to fix the error on sparc64
+---
+ tests/testutil_security.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/testutil_security.hpp b/tests/testutil_security.hpp
+index 90999118c..437bfb298 100644
+--- a/tests/testutil_security.hpp
++++ b/tests/testutil_security.hpp
+@@ -345,7 +345,7 @@ static int get_monitor_event_internal (void *monitor_,
+     uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
+     uint16_t event = *(uint16_t *) (data);
+     if (value_)
+-        *value_ = *(uint32_t *) (data + 2);
++        memcpy (value_, data + 2, sizeof (uint32_t));
+ 
+     //  Second frame in message contains event address
+     zmq_msg_init (&msg);

diff --git a/net-libs/zeromq/zeromq-4.3.1.ebuild b/net-libs/zeromq/zeromq-4.3.1.ebuild
index ab8a55ef119..e22d0db60dc 100644
--- a/net-libs/zeromq/zeromq-4.3.1.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.1.ebuild
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 	)
 	pgm? ( virtual/pkgconfig )"
 
-PATCHES=()
+PATCHES=( "${FILESDIR}"/${P}-fix-test_security_zap.patch )
 
 src_prepare() {
 	sed \

[gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/files/, net-libs/zeromq/

[Sam James]

commit:     6d5f2daeee8249439d1c59bd3e0c6e023e2f5e5b
Author:     jinqiang zhang <peeweep <AT> 0x0 <DOT> ee>
AuthorDate: Tue Mar  7 07:51:03 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 17:15:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d5f2dae

net-libs/zeromq: fix compile failed under riscv64 qemu-user

Closes: https://bugs.gentoo.org/899986
Signed-off-by: jinqiang zhang <peeweep <AT> 0x0.ee>
Closes: https://github.com/gentoo/gentoo/pull/29972
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/zeromq/files/zeromq-4.3.4-qemu-user.patch | 52 ++++++++++++++++++++++
 net-libs/zeromq/zeromq-4.3.4-r2.ebuild             |  1 +
 2 files changed, 53 insertions(+)

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() {