gentoo resync : 14.05.2020

3 files changed, 62 insertions, 4 deletions

diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index bc7318e7a4b2..f125c92a777c 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -1,3 +1,4 @@
+AUX 1.2.4-tests-pid.patch 1229 BLAKE2B 96466d9b8da797a31140d862326f5aaa3ecab0098c534f9df19ca9b44b98f9f539fa2b1aa5cd9fa0af8054387bfa19f5960200cd15d213d7c96f14c715d5479d SHA512 1b3358e7a5da2a3fc896aacd62adc70e803aa441465f1fa560745f90a48f8c46dff3fa594285fe0bf24008e572be3f20449f5de10087ea1527fbd392c0a4af31
 DIST socket_wrapper-1.2.3.tar.gz 67476 BLAKE2B 66858406398ce3f33311390812f5fe377a7064d94be5af15fe03c363ab39798fd5a5dad7259e4ef477887c3de8b1d4d1739d08128adea0b1759b3227b4657214 SHA512 78eb85da900b43cbb5b639f19a159fc55ec1209a1a86d5d1eee5f22225d749043712b74c0f8fcb77f5a9bb705568f4cd1cbc89f85941946c745ca2d3a60878b2
-EBUILD socket_wrapper-1.2.3.ebuild 478 BLAKE2B 84fad9a5947c2242cf36633c0ad7643958a658141a95ca3e9c5579add8a549f1fbc3b478cb04343037dfa71329ecaa97145a29136a1528280b1419469bdbdce9 SHA512 1d31e0d4940f6fb2b37dcf83546259ce0861d2d618550a6e5bddf65c4efe979ea4155bac16046cd45a70ae244d4935949350933b9a68c27eda1928913e7a104d
+EBUILD socket_wrapper-1.2.3.ebuild 653 BLAKE2B 6587216cbbe8662e38e3f079f3902994880e762954f8a36bed0caa7c02b736ed88e9a2ce0e9a6d4844444d9e31060a2726a53916d78b4242cb8c09eb0ff1ee85 SHA512 bf9f490c4566ff184df86a598186dd28b3ce640a81d37a7c768c9f01c28e43defb117854a0ed73200671e5efdf9ab5bacb97b7d23011e9e878b3a57f247919ab
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-libs/socket_wrapper/files/1.2.4-tests-pid.patch b/net-libs/socket_wrapper/files/1.2.4-tests-pid.patch
new file mode 100644
index 000000000000..49aca70becdf
--- /dev/null
+++ b/net-libs/socket_wrapper/files/1.2.4-tests-pid.patch
@@ -0,0 +1,47 @@
+From a70e32fa9d60adde861618c91618a3be80f07c22 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 7 May 2020 23:28:50 -0400
+Subject: [PATCH] tests: do not truncate pid to 16 bits
+
+On Linux, pid_t is a 32-bit type, and the kernel permits pids up to 22
+bits in length.
+
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ tests/torture.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/tests/torture.c b/tests/torture.c
+index e55ebcf..8524138 100644
+--- a/tests/torture.c
++++ b/tests/torture.c
+@@ -255,8 +255,7 @@ void torture_teardown_socket_dir(void **state)
+ void torture_teardown_echo_srv(void **state)
+ {
+ 	struct torture_state *s = *state;
+-	char buf[8] = {0};
+-	long int tmp;
++	char buf[11] = {0};
+ 	ssize_t rc;
+ 	pid_t pid;
+ 	int fd;
+@@ -277,13 +276,12 @@ void torture_teardown_echo_srv(void **state)
+ 
+ 	buf[sizeof(buf) - 1] = '\0';
+ 
+-	tmp = strtol(buf, NULL, 10);
+-	if (tmp == 0 || tmp > 0xFFFF || errno == ERANGE) {
++	errno = 0;
++	pid = strtol(buf, NULL, 10);
++	if (pid == 0 || errno != 0) {
+ 		goto done;
+ 	}
+ 
+-	pid = (pid_t)(tmp & 0xFFFF);
+-
+ 	for (count = 0; count < 10; count++) {
+ 		/* Make sure the daemon goes away! */
+ 		kill(pid, SIGTERM);
+-- 
+2.26.2
+
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
index a34e9de9815d..1c99cfc52cc3 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
@@ -10,9 +10,19 @@ HOMEPAGE="https://cwrap.org/socket_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+BDEPEND="test? ( >=dev-util/cmocka-1.1.0 )"
+
+PATCHES=(
+	"${FILESDIR}"/1.2.4-tests-pid.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DUNIT_TESTING=$(usex test ON OFF)
+	)
+	cmake-multilib_src_configure
+}