gentoo auto-resync : 28:12:2024 - 06:30:54

3 files changed, 91 insertions, 0 deletions

diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index f1b48a786ea7..93dfa5826f28 100644
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@@ -1,5 +1,7 @@
+AUX nanomsg-1.2.1-chunk.patch 1417 BLAKE2B 3afb0dfec580847e76291450f6d051607d82444e1829680f837856a951b12ed54ed27d33af30c87e186e5094cd440ad40cd26c371873a821647070da6e9ecfa4 SHA512 c5b56bb7e93fb604efc9e357793d98ba67039e3d2a186be8860965e57626821446944fe416b046d48da376b568683c0301c81e719abdecb89fb1e13a742a9712
 DIST nanomsg-1.1.5.tar.gz 310739 BLAKE2B be3a6c3b8d41373798909f24f49c24018d99454e431dc64105a554021b1b49c8ed4fc6d14adfef315f5defd38d19482ab3a7625ea54fefea0794f149038ddfd4 SHA512 773b8e169a7accac21414c63972423a249164f5b843c6c65c1b03a2eb90d21da788a98debdeb396dab795e52d30605696bc2cf65e5e05687bf115438d5b22717
 DIST nanomsg-1.2.1.tar.gz 310191 BLAKE2B 8b02bf60196ce3d316643547e0a88cc63227306a24551f97a141e99996390cf3a8f1c838c6416991d09ff1309da5c69d995021585a5b8bcd02113fdcc232225a SHA512 cc119acafe6e000b75299e866b4bace56ec6d8c90e7843ad773efad7b534296d6baf2b75b107c70a0e4fd4cee9763315d87b6f354676b7915732961b89c3adcb
 EBUILD nanomsg-1.1.5-r1.ebuild 803 BLAKE2B 4b25937985c3376e6d1aeedca968015205fcfdb88100d7da8b09bbacc0fe58ada7de837b6439174a422e2e1b59b5374a15b11d17be83a7b2c7c01805d08b1364 SHA512 e529e816a70ff073996a770f0de0bdfe1be08a3d2a913490dbfd240be3d069cd5c139281ff8bf9187c384aad34f70f72ee80d4bf97ae6cab39c378fbdf3e8e8e
+EBUILD nanomsg-1.2.1-r1.ebuild 858 BLAKE2B d333af2ca2af8b1d418af02f7c018033e5e480c7bb9eebd30013457d51049748926190d1bb4161e2509bfe5cac1817a01674da0e0f332a6bae123a684fc271fd SHA512 9e3912491c3780844ffa6ed731ca96a1442123ec4ccecdc9618801c68bf0b721a2ccaf613c0c790329d3e706bf0bd2fc6f4a77784fcca34a0e2cbe81c33613c7
 EBUILD nanomsg-1.2.1.ebuild 806 BLAKE2B 427a3335145a7470bc59238fb4325b69f97f3e1166496ee9171b4725bd4eeea7f1335f185e714fa46cc48bc3a9dfdc099e0c6b1111ff51f4bfcceeebb460908c SHA512 b9ad79340902e267ee84f90458f76c351218a9969bbd6ed3f1bda36a1cf4be2b62c4472cc3b57a7fa513f7b0e3c5dda7f8e8b8ffe76aad5068837fddc612a422
 MISC metadata.xml 248 BLAKE2B 491f849b48cddf6768cf7b8bf6914b5331c647f708bcd17372ea461b1d05e249aacef393f6641b7ee5c9da84d2e69588c340a72a426051cd2d29b28399416522 SHA512 f9cad9e1d46fe8f275a70a7e578de6dce7f1e705e599664a74af58a38791cddfa6446c8cceb018c1e77ef01c32ca5b8e8b18aebc22f9239d2f673441af0cfb6e
diff --git a/dev-libs/nanomsg/files/nanomsg-1.2.1-chunk.patch b/dev-libs/nanomsg/files/nanomsg-1.2.1-chunk.patch
new file mode 100644
index 000000000000..7d6cec725939
--- /dev/null
+++ b/dev-libs/nanomsg/files/nanomsg-1.2.1-chunk.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/934665
+https://github.com/nanomsg/nanomsg/issues/1111#issuecomment-2113151297
+(acked by upstream at https://github.com/nanomsg/nanomsg/issues/1111#issuecomment-2305516234)
+
+--- a/src/utils/chunkref.c
++++ b/src/utils/chunkref.c
+@@ -52,6 +52,7 @@
+ {
+     if (self->size == NN_CHUNKREF_EXT) {
+         nn_chunk_free (self->u.chunk);
++        self->size = 0;
+     }
+ }
+ 
+@@ -80,6 +81,8 @@
+     dst->size = src->size;
+     if (src->size == NN_CHUNKREF_EXT) {
+         dst->u.chunk = src->u.chunk;
++        // self->u.chunk = NULL;
++        // src->size = 0;
+     } else {
+         nn_assert (src->size <= NN_CHUNKREF_MAX);
+         memcpy (dst->u.ref, src->u.ref, src->size);
+@@ -100,7 +103,7 @@
+ 
+ void *nn_chunkref_data (struct nn_chunkref *self)
+ {
+-    if (self->size > NN_CHUNKREF_MAX) {
++    if (self->size == NN_CHUNKREF_EXT) {
+         return self->u.chunk;
+     } else {
+         return self->u.ref;
+@@ -109,7 +112,7 @@
+ 
+ size_t nn_chunkref_size (struct nn_chunkref *self)
+ {
+-    if (self->size > NN_CHUNKREF_MAX) {
++    if (self->size == NN_CHUNKREF_EXT) {
+         return (nn_chunk_size(self->u.chunk));
+     }
+     return self->size;
+@@ -118,7 +121,7 @@
+ void nn_chunkref_trim (struct nn_chunkref *self, size_t n)
+ {
+     if (self->size == NN_CHUNKREF_EXT) {
+-        nn_chunk_trim (self->u.chunk, n);
++        self->u.chunk = nn_chunk_trim(self->u.chunk, n);
+         return;
+     }
diff --git a/dev-libs/nanomsg/nanomsg-1.2.1-r1.ebuild b/dev-libs/nanomsg/nanomsg-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..d99d9f30243a
--- /dev/null
+++ b/dev-libs/nanomsg/nanomsg-1.2.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="High-performance messaging interface for distributed applications"
+HOMEPAGE="https://nanomsg.org/"
+SRC_URI="https://github.com/nanomsg/nanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/6.0.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~riscv x86"
+IUSE="doc"
+
+BDEPEND="doc? ( dev-ruby/asciidoctor )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-chunk.patch
+)
+
+src_prepare() {
+	# Old CPUs like HPPA fails test because of timeout
+	sed -i \
+		-e '/inproc_shutdown/s/10/80/' \
+		-e '/ws_async_shutdown/s/10/80/' \
+		-e '/ipc_shutdown/s/40/80/' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNN_STATIC_LIB=OFF
+		-DNN_ENABLE_DOC=$(usex doc)
+	)
+
+	cmake_src_configure
+}