gentoo auto-resync : 02:02:2023 - 09:07:02

4 files changed, 128 insertions, 0 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 78ecfba30da8..4b90717b4847 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index f1e657bf3a64..36e43ac8489a 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,5 +1,7 @@
+AUX zeromq-4.3.4-gcc-13.patch 3437 BLAKE2B 84cd5fb685b97741d78505022bbf33d154d48dc08f4b273ce5191aa3140f2ad889b526394d26cceb85489c63f0f14cafd764f12db9a5df2696bea90fda5ef82e SHA512 2a391896aa47e4de7994f66a549fcf4d2ddb0236bfe09e5e2e89b7224e08405f37bf601fcde361dcbf7e9b9aa17429a536d2c0481b307732c3cf665c2fa43f44
 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
 MISC metadata.xml 1541 BLAKE2B eb0032809d47b0f6e7064c1bcc8acd746480e3d1e222aeb7dd5658b820462376a8982e0d5a46e7dadc22efa8caaaa51c93f7bd66a1d73bba42a43dd959223596 SHA512 f3f8a92816c09499a6111fb375f429091c834be52e21189a7685fe59a40761ebd4d0d9e23889a0fc36d23863b3bcf16c245b00fb3d1ae21c9d8143be90977231
diff --git a/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch b/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch
new file mode 100644
index 000000000000..79deeacc2bd8
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch
@@ -0,0 +1,55 @@
+https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d
+
+From 438d5d88392baffa6c2c5e0737d9de19d6686f0d Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Tue, 20 Dec 2022 21:45:16 +0000
+Subject: [PATCH] src/secure_allocator.hpp: define missing 'rebind' type
+
+`gcc-13` added an assert to standard headers to make sure custom
+allocators have intended implementation of rebind type instead
+of inherited rebind. gcc change:
+    https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7
+
+Without the fix build fails on this week's `gcc-13` as:
+
+    [ 92%] Building CXX object tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o
+    In file included from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34,
+                     from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64,
+                     from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/memory:69,
+                     from tests/../src/secure_allocator.hpp:42,
+                     from tests/../src/curve_client_tools.hpp:49,
+                     from tests/test_security_curve.cpp:53:
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind<zmq::secure_allocator_t<unsigned char>, unsigned char, void>':
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11:   required by substitution of 'template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = zmq::secure_allocator_t<unsigned char>; _Up = unsigned char]'
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8:   required by substitution of 'template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = zmq::secure_allocator_t<unsigned char>]'
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65:   required from 'struct __gnu_cxx::__alloc_traits<zmq::secure_allocator_t<unsigned char>, unsigned char>::rebind<unsigned char>'
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21:   required from 'struct std::_Vector_base<unsigned char, zmq::secure_allocator_t<unsigned char> >'
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11:   required from 'class std::vector<unsigned char, zmq::secure_allocator_t<unsigned char> >'
+    tests/../src/curve_client_tools.hpp:64:76:   required from here
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A
+       70 |                         _Tp>::value,
+          |                               ^~~~~
+
+The change adds trivial `rebind` definition with expected return type
+and satisfies conversion requirements.
+--- a/src/secure_allocator.hpp
++++ b/src/secure_allocator.hpp
+@@ -99,6 +99,17 @@ bool operator!= (const secure_allocator_t<T> &, const secure_allocator_t<U> &)
+ #else
+ template <typename T> struct secure_allocator_t : std::allocator<T>
+ {
++    secure_allocator_t () ZMQ_DEFAULT;
++
++    template <class U>
++    secure_allocator_t (const secure_allocator_t<U> &) ZMQ_NOEXCEPT
++    {
++    }
++
++    template <class U> struct rebind
++    {
++        typedef secure_allocator_t<U> other;
++    };
+ };
+ #endif
+ }
+
diff --git a/net-libs/zeromq/zeromq-4.3.4-r2.ebuild b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild
new file mode 100644
index 000000000000..06892942f602
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="https://zeromq.org/"
+SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
+	libbsd? ( dev-libs/libbsd:= )
+	sodium? ( dev-libs/libsodium:= )
+"
+DEPEND="
+	${RDEPEND}
+	!elibc_Darwin? ( sys-apps/util-linux )
+"
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	pgm? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-13.patch
+)
+
+src_prepare() {
+	sed \
+		-e '/libzmq_werror=/s:yes:no:g' \
+		-i configure.ac || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--without-pgm
+		$(use_enable drafts)
+		$(use_enable libbsd)
+		$(use_enable static-libs static)
+		$(use_enable unwind libunwind)
+		$(use_with sodium libsodium)
+		$(use_with doc docs)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Restricting to one job because multiple tests are using the same port.
+	# Upstream knows the problem and says it doesn't support parallel test
+	# execution, see ${S}/INSTALL.
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}"/usr/lib* -name '*.la' -delete || die
+}