* [gentoo-commits] repo/gentoo:master commit in: net-libs/socket_wrapper/, net-libs/socket_wrapper/files/
@ 2020-05-08 3:35 Mike Gilbert
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert @ 2020-05-08 3:35 UTC (permalink / raw
To: gentoo-commits
commit: 92957d0a4e66217194d92beb864ef7b9f2c04cbb
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 03:34:55 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri May 8 03:34:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92957d0a
net-libs/socket_wrapper: enable unit tests
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../socket_wrapper/files/1.2.4-tests-pid.patch | 47 ++++++++++++++++++++++
.../socket_wrapper/socket_wrapper-1.2.3.ebuild | 14 ++++++-
2 files changed, 59 insertions(+), 2 deletions(-)
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 00000000000..49aca70becd
--- /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 a34e9de9815..6f4bafee216 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
@@ -14,5 +14,15 @@ 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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/socket_wrapper/, net-libs/socket_wrapper/files/
@ 2021-05-22 20:12 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2021-05-22 20:12 UTC (permalink / raw
To: gentoo-commits
commit: 895cd505ac064877f5411a6b6b867876e7eb3ca5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 19:03:14 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat May 22 20:12:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=895cd505
net-libs/socket_wrapper: Drop 1.2.3
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-libs/socket_wrapper/Manifest | 1 -
.../socket_wrapper/files/1.2.4-tests-pid.patch | 47 ----------------------
.../socket_wrapper/socket_wrapper-1.2.3.ebuild | 28 -------------
3 files changed, 76 deletions(-)
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index 8b296abbd49..db0b6d157fd 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -1,2 +1 @@
-DIST socket_wrapper-1.2.3.tar.gz 67476 BLAKE2B 66858406398ce3f33311390812f5fe377a7064d94be5af15fe03c363ab39798fd5a5dad7259e4ef477887c3de8b1d4d1739d08128adea0b1759b3227b4657214 SHA512 78eb85da900b43cbb5b639f19a159fc55ec1209a1a86d5d1eee5f22225d749043712b74c0f8fcb77f5a9bb705568f4cd1cbc89f85941946c745ca2d3a60878b2
DIST socket_wrapper-1.3.2.tar.gz 86255 BLAKE2B 33f526a8871cfb1a889a84660ea8e82b6e591646924e16d2c452bb001e0eb4c1457b8151208bbec55c13c40fd124c160fc85d0df227519f62a2683e4ea1acb85 SHA512 f4d3a7026f1777a4c3b5481a0f6e6057b6372e9b64f44523ec1ebf0a34159d7154493dce6ee3c95fbea15607c6ada1382f2475d5d553133a061c80719c135b9d
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
deleted file mode 100644
index 49aca70becd..00000000000
--- a/net-libs/socket_wrapper/files/1.2.4-tests-pid.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index 29a7bc24504..00000000000
--- a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="A library passing all socket communications through unix sockets"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-22 20:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-08 3:35 [gentoo-commits] repo/gentoo:master commit in: net-libs/socket_wrapper/, net-libs/socket_wrapper/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2021-05-22 20:12 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox