diff --git a/socat-1.7.3.3.tar.bz2 b/socat-1.7.3.3.tar.bz2 deleted file mode 100644 index 854ca69..0000000 --- a/socat-1.7.3.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a -size 489901 diff --git a/socat-1.7.3.4.tar.bz2 b/socat-1.7.3.4.tar.bz2 new file mode 100644 index 0000000..4dc1305 --- /dev/null +++ b/socat-1.7.3.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc +size 490552 diff --git a/socat-common-fixes.patch b/socat-common-fixes.patch index b56401c..1a676e5 100644 --- a/socat-common-fixes.patch +++ b/socat-common-fixes.patch @@ -1,7 +1,7 @@ -Index: socat-1.7.3.3/filan.c +Index: socat-1.7.3.4/filan.c =================================================================== ---- socat-1.7.3.3.orig/filan.c -+++ socat-1.7.3.3/filan.c +--- socat-1.7.3.4.orig/filan.c ++++ socat-1.7.3.4/filan.c @@ -20,6 +20,10 @@ #include "filan.h" @@ -24,10 +24,10 @@ Index: socat-1.7.3.3/filan.c /* global variables for configuring filan */ bool filan_followsymlinks; bool filan_rawoutput; -Index: socat-1.7.3.3/procan.c +Index: socat-1.7.3.4/procan.c =================================================================== ---- socat-1.7.3.3.orig/procan.c -+++ socat-1.7.3.3/procan.c +--- socat-1.7.3.4.orig/procan.c ++++ socat-1.7.3.4/procan.c @@ -16,6 +16,9 @@ #include "filan.h" @@ -38,10 +38,10 @@ Index: socat-1.7.3.3/procan.c #include "procan.h" -Index: socat-1.7.3.3/xio-tcpwrap.c +Index: socat-1.7.3.4/xio-tcpwrap.c =================================================================== ---- socat-1.7.3.3.orig/xio-tcpwrap.c -+++ socat-1.7.3.3/xio-tcpwrap.c +--- socat-1.7.3.4.orig/xio-tcpwrap.c ++++ socat-1.7.3.4/xio-tcpwrap.c @@ -13,6 +13,7 @@ #include "xio-tcpwrap.h" diff --git a/socat-ignore-tests-failure-boo1078346.patch b/socat-ignore-tests-failure-boo1078346.patch index 6873973..0b91ce5 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.3.2/test.sh +Index: socat-1.7.3.4/test.sh =================================================================== ---- socat-1.7.3.2.orig/test.sh -+++ socat-1.7.3.2/test.sh -@@ -12801,7 +12801,7 @@ echo "summary: $((N-1)) tests, $((numOK+ +--- socat-1.7.3.4.orig/test.sh ++++ socat-1.7.3.4/test.sh +@@ -13224,7 +13224,7 @@ echo "summary: $((N-1)) tests, $((numOK+ if [ "$numFAIL" -gt 0 ]; then echo "FAILED: $listFAIL" diff --git a/socat.changes b/socat.changes index 2d72bf6..aae8da8 100644 --- a/socat.changes +++ b/socat.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Apr 17 06:58:23 UTC 2020 - Martin Pluskal + +- Update to version 1.7.3.4: + * bugfix release, see the CHANGES file for all changes +- Refresh patches: + * socat-common-fixes.patch + * socat-ignore-tests-failure-boo1078346.patch + ------------------------------------------------------------------- Tue Feb 4 12:41:58 UTC 2020 - Marcus Meissner diff --git a/socat.spec b/socat.spec index eaa88a7..957ee02 100644 --- a/socat.spec +++ b/socat.spec @@ -1,7 +1,7 @@ # # spec file for package socat # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2010 Pascal Bleser # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: socat -Version: 1.7.3.3 +Version: 1.7.3.4 Release: 0 Summary: Multipurpose relay for bidirectional data transfer License: SUSE-GPL-2.0-with-openssl-exception AND MIT @@ -65,7 +65,7 @@ test -n "$CL_DATE" export BUILD_DATE="$(LANG=C date --utc -d "${CL_DATE}" +"%{b} %{e} %{Y} %{T}")" export CFLAGS="%{optflags} -fno-strict-aliasing -DHAVE_SSLv23_client_method -DHAVE_SSLv23_server_method -fno-common" %configure -make %{?_smp_mflags} all +%make_build all mkdir examples cp -a daemon.sh ftp.sh mail.sh proxyecho.sh readline.sh examples