From ac2ed23d50453ccea19238df96b7e63c0e48160e06bd47418cd51cc440f67a93 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 14 Dec 2022 10:09:58 +0000 Subject: [PATCH] Accepting request 1040684 from home:polslinux:branches:network:utilities MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to 1.7.4.4: * FIX: In error.c msg2() there was a stack overflow on long messages: The terminating \0 Byte was written behind the last position. * FIX: UDP-RECVFROM with fork sometimes terminated when multiple packets arrived. * FIX: a couple of weaknesses and errors when accessing invalid or  incompatible file system entries with UNIX domain, file, and generic addresses. * FIX: bad parser error message on "socat /tmp/x\"x/x -" - Drop socat-fix-asan-error.patch OBS-URL: https://build.opensuse.org/request/show/1040684 OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=62 --- socat-1.7.4.3.tar.gz | 3 --- socat-1.7.4.4.tar.gz | 3 +++ socat-common-fixes.patch | 18 +++++++++--------- socat-fix-asan-error.patch | 13 ------------- socat-ignore-tests-failure-boo1078346.patch | 8 ++++---- socat.changes | 14 ++++++++++++++ socat.spec | 3 +-- 7 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 socat-1.7.4.3.tar.gz create mode 100644 socat-1.7.4.4.tar.gz delete mode 100644 socat-fix-asan-error.patch diff --git a/socat-1.7.4.3.tar.gz b/socat-1.7.4.3.tar.gz deleted file mode 100644 index 02f505b..0000000 --- a/socat-1.7.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d697245144731423ddbbceacabbd29447089ea223e9a439b28f9ff90d0dd216e -size 655520 diff --git a/socat-1.7.4.4.tar.gz b/socat-1.7.4.4.tar.gz new file mode 100644 index 0000000..255ff89 --- /dev/null +++ b/socat-1.7.4.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f8f4b9d5c60b8c53d17b60d79ababc4a0f51b3bb6d2bd3ae8a6a4b9d68f195e +size 662968 diff --git a/socat-common-fixes.patch b/socat-common-fixes.patch index b871940..ec6d74b 100644 --- a/socat-common-fixes.patch +++ b/socat-common-fixes.patch @@ -1,7 +1,7 @@ -Index: socat-1.7.4.1/filan.c +Index: socat-1.7.4.4/filan.c =================================================================== ---- socat-1.7.4.1.orig/filan.c -+++ socat-1.7.4.1/filan.c +--- socat-1.7.4.4.orig/filan.c ++++ socat-1.7.4.4/filan.c @@ -20,6 +20,10 @@ #include "filan.h" @@ -13,10 +13,10 @@ Index: socat-1.7.4.1/filan.c struct sockopt { int so; -Index: socat-1.7.4.1/procan.c +Index: socat-1.7.4.4/procan.c =================================================================== ---- socat-1.7.4.1.orig/procan.c -+++ socat-1.7.4.1/procan.c +--- socat-1.7.4.4.orig/procan.c ++++ socat-1.7.4.4/procan.c @@ -16,6 +16,9 @@ #include "filan.h" @@ -27,10 +27,10 @@ Index: socat-1.7.4.1/procan.c #include "procan.h" -Index: socat-1.7.4.1/xio-tcpwrap.c +Index: socat-1.7.4.4/xio-tcpwrap.c =================================================================== ---- socat-1.7.4.1.orig/xio-tcpwrap.c -+++ socat-1.7.4.1/xio-tcpwrap.c +--- socat-1.7.4.4.orig/xio-tcpwrap.c ++++ socat-1.7.4.4/xio-tcpwrap.c @@ -13,6 +13,7 @@ #include "xio-tcpwrap.h" diff --git a/socat-fix-asan-error.patch b/socat-fix-asan-error.patch deleted file mode 100644 index 0665878..0000000 --- a/socat-fix-asan-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/error.c b/error.c -index 3135fd5..eacfec5 100644 ---- a/error.c -+++ b/error.c -@@ -360,7 +360,7 @@ void msg2( - if (handler) bufp[-1] = tolower(bufp[-1]); /* for debugging, low chars indicate messages from signal handlers */ - #endif - *bufp++ = ' '; -- strncpy(bufp, text, BUFLEN-(bufp-buff)-1); -+ strncpy(bufp, text, BUFLEN-(bufp-buff)-2); - strcat(bufp, "\n"); - _msg(level, buff, syslp); - if (level >= diagopts.exitlevel) { diff --git a/socat-ignore-tests-failure-boo1078346.patch b/socat-ignore-tests-failure-boo1078346.patch index 591544a..c1f0f14 100644 --- a/socat-ignore-tests-failure-boo1078346.patch +++ b/socat-ignore-tests-failure-boo1078346.patch @@ -10,11 +10,11 @@ Signed-off-by: Michel Normand test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: socat-1.7.4.1/test.sh +Index: socat-1.7.4.4/test.sh =================================================================== ---- socat-1.7.4.1.orig/test.sh -+++ socat-1.7.4.1/test.sh -@@ -15042,7 +15042,7 @@ if [ "$numCANT" -gt 0 ]; then +--- socat-1.7.4.4.orig/test.sh ++++ socat-1.7.4.4/test.sh +@@ -15736,7 +15736,7 @@ if [ "$numCANT" -gt 0 ]; then fi if [ "$numFAIL" -gt 0 ]; then echo "FAILED: $listFAIL" diff --git a/socat.changes b/socat.changes index 5351fc2..fecb7a8 100644 --- a/socat.changes +++ b/socat.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Dec 6 13:46:41 UTC 2022 - Paolo Stivanin + +- Update to 1.7.4.4: + * FIX: In error.c msg2() there was a stack overflow on long messages: The + terminating \0 Byte was written behind the last position. + * FIX: UDP-RECVFROM with fork sometimes terminated when multiple packets + arrived. + * FIX: a couple of weaknesses and errors when accessing invalid or +  incompatible file system entries with UNIX domain, file, and generic + addresses. + * FIX: bad parser error message on "socat /tmp/x\"x/x -" +- Drop socat-fix-asan-error.patch + ------------------------------------------------------------------- Wed Apr 13 07:41:15 UTC 2022 - Martin Liška diff --git a/socat.spec b/socat.spec index f6078a7..f59b039 100644 --- a/socat.spec +++ b/socat.spec @@ -18,7 +18,7 @@ Name: socat -Version: 1.7.4.3 +Version: 1.7.4.4 Release: 0 Summary: Multipurpose relay for bidirectional data transfer License: MIT AND SUSE-GPL-2.0-with-openssl-exception @@ -28,7 +28,6 @@ Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.ta Source1: %{name}.changes Patch1: socat-ignore-tests-failure-boo1078346.patch Patch2: socat-common-fixes.patch -Patch3: socat-fix-asan-error.patch BuildRequires: iputils BuildRequires: net-tools BuildRequires: openssl-devel