From c10e0ef7382a4f617eab93fbc78dff58a9c723fed32f8f09feed1763671988bc Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 13 Apr 2022 09:48:27 +0000
Subject: [PATCH] Accepting request 969720 from
 home:marxin:branches:network:utilities

- Use autosetup
- Add socat-fix-asan-error.patch that is offered to upstream
  and that fixes an ASAN error seen for 'test 313 NESTEDOVFL'.

OBS-URL: https://build.opensuse.org/request/show/969720
OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=60
---
 socat-fix-asan-error.patch | 13 +++++++++++++
 socat.changes              |  7 +++++++
 socat.spec                 |  5 ++---
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 socat-fix-asan-error.patch

diff --git a/socat-fix-asan-error.patch b/socat-fix-asan-error.patch
new file mode 100644
index 0000000..0665878
--- /dev/null
+++ b/socat-fix-asan-error.patch
@@ -0,0 +1,13 @@
+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.changes b/socat.changes
index 7479be0..5351fc2 100644
--- a/socat.changes
+++ b/socat.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr 13 07:41:15 UTC 2022 - Martin Liška <mliska@suse.cz>
+
+- Use autosetup
+- Add socat-fix-asan-error.patch that is offered to upstream
+  and that fixes an ASAN error seen for 'test 313 NESTEDOVFL'.
+
 -------------------------------------------------------------------
 Sat Jan 22 20:54:21 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/socat.spec b/socat.spec
index 503a184..f6078a7 100644
--- a/socat.spec
+++ b/socat.spec
@@ -28,6 +28,7 @@ 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
@@ -53,9 +54,7 @@ file descriptor (stdin etc.), the GNU line editor, a program, or a
 combination of two of these.
 
 %prep
-%setup -q
-%patch1 -p1
-%patch2 -p1
+%autosetup
 sed 's|#! %{_bindir}/env bash|#!%{_bindir}/bash|' -i proxyecho.sh readline.sh
 
 %build