commit socat for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2020-04-25 20:07:05

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new.2738 (New)


Package is "socat"

Sat Apr 25 20:07:05 2020 rev:41 rq:795509 version:1.7.3.4

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2020-02-07 
15:52:38.087452500 +0100
+++ /work/SRC/openSUSE:Factory/.socat.new.2738/socat.changes2020-04-25 
20:07:09.203402884 +0200
@@ -1,0 +2,9 @@
+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
+
+---

Old:

  socat-1.7.3.3.tar.bz2

New:

  socat-1.7.3.4.tar.bz2



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.WZ0Ugf/_old  2020-04-25 20:07:10.227404995 +0200
+++ /var/tmp/diff_new_pack.WZ0Ugf/_new  2020-04-25 20:07:10.231405003 +0200
@@ -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 @@
 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
 

++ socat-1.7.3.3.tar.bz2 -> socat-1.7.3.4.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/socat-1.7.3.3/CHANGES new/socat-1.7.3.4/CHANGES
--- old/socat-1.7.3.3/CHANGES   2019-04-05 22:10:24.0 +0200
+++ new/socat-1.7.3.4/CHANGES   2020-01-05 16:07:44.0 +0100
@@ -1,4 +1,40 @@
 
+### V 1.7.3.4:
+
+Corrections:
+   Header of xiotermios_speed() declared parameter unsigned int instead of
+   speed_t, thus compiling failed on MacOS
+   Thanks to Joe Strout and others for reporting this bug.
+   Thanks to Andrew Childs and others for sending a patch.
+
+   Under certain circumstances, termios options of the first address were
+   applied to the second address, resulting in error
+   "Inappropriate ioctl for device" 
+   This affected version 1.7.3.3 only.
+   Test: TERMIOS_PH_ALL
+   Thanks to Ivan J. for reporting this issue.
+
+   Socat failed to compile when no poll() system call was found by
+   configure.
+   Thanks to Jason White for sending a patch.
+
+   Due to use of SSL_CTX_clear_mode() Socat failed to compile on old
+   systems with, e.g., OpenSSL-0.9.8. Thanks to Simon Matter and Moritz B.
+   for reporting this problem and sending initial patches.
+
+   getaddrinfo() in IP4-SENDTO and IP6-SENDTO addresses failed with
+   "ai_socktype not supported" when protocol 6 was addressed.
+   The fix removes the possibility to use service names with SCTP.
+   Test: IP_SENDTO_6
+   Thanks to S�ren for sending an initial patch.
+
+   Under certain circumstances, Socat printed the "socket ... is at EOF"
+   multiple times.
+   Test: MULTIPLE_EOF
+
+   Newer parts of test.sh used substitutions ${x,,*} or ${x^^*} that are
+   not implemented in older bash versions.
+
 ### V 1.7.3.3:
 
 Corrections:
@@ -55,6 +91,7 @@
name to decide if it is an IPv4 address. This was not RFC conform. This
fix removes the possibility for use of IPv4 addresses with IPv6, e.g.
TCP6:127.0.0.1:80
+   Debian issue 695885
Thanks to Nicolas Fournil for reporting this issue.
 
Print a useful error message when single character options appear to be
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/socat-1.7.3.3/Makefile.in 
new/socat-1.7.3.4/Makefile.in
--- old/socat-1.7.3.3/Makefile.in   2019-04-04 10:59:55.0 +0200
+++ new/socat-1.7.3.4/Makefile.in   2020-01-04 11:33:07.0 +0100
@@ -49,7 +49,6 @@
xio-ip.c xio-ip4.c xio-ip6.c xio-ipapp.c xio-tcp.c \
xio-sctp.c xio-rawip.c \
xio-socks.c xio-proxy.c xio-udp.c \
-   

commit socat for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2020-02-07 15:51:54

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new.26092 (New)


Package is "socat"

Fri Feb  7 15:51:54 2020 rev:40 rq:769984 version:1.7.3.3

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2019-04-10 
23:09:37.083866373 +0200
+++ /work/SRC/openSUSE:Factory/.socat.new.26092/socat.changes   2020-02-07 
15:52:38.087452500 +0100
@@ -1,0 +2,6 @@
+Tue Feb  4 12:41:58 UTC 2020 - Marcus Meissner 
+
+- socat-common-fixes.patch: include tcpd.h where needed to fix
+  -fno-common bsc#1160293
+
+---

New:

  socat-common-fixes.patch



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.ssBtHN/_old  2020-02-07 15:52:39.543453295 +0100
+++ /var/tmp/diff_new_pack.ssBtHN/_new  2020-02-07 15:52:39.555453302 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package socat
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Pascal Bleser 
 #
 # All modifications and additions to the file contributed by third parties
@@ -27,6 +27,7 @@
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
 Source1:%{name}.changes
 Patch1: socat-ignore-tests-failure-boo1078346.patch
+Patch2: socat-common-fixes.patch
 BuildRequires:  iputils
 BuildRequires:  net-tools
 BuildRequires:  openssl-devel
@@ -54,6 +55,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 sed 's|#! %{_bindir}/env bash|#!%{_bindir}/bash|' -i proxyecho.sh readline.sh
 
 %build
@@ -61,7 +63,7 @@
 CL_DATE="$(awk -F " - " 'NR==2{print $1;}' %{SOURCE1})"
 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"
+export CFLAGS="%{optflags} -fno-strict-aliasing -DHAVE_SSLv23_client_method 
-DHAVE_SSLv23_server_method -fno-common"
 %configure
 make %{?_smp_mflags} all
 mkdir examples

++ socat-common-fixes.patch ++
Index: socat-1.7.3.3/filan.c
===
--- socat-1.7.3.3.orig/filan.c
+++ socat-1.7.3.3/filan.c
@@ -20,6 +20,10 @@
 
 #include "filan.h"
 
+#ifdef WITH_LIBWRAP
+#include 
+#endif
+
 
 struct sockopt {
int so;
@@ -28,10 +32,6 @@ struct sockopt {
 
 static int filan_streams_analyze(int fd, FILE *outfile);
 
-/* dirty workaround so we dont get an error on AIX when being linked with
-   libwrap */
-int allow_severity, deny_severity;
-
 /* global variables for configuring filan */
 bool filan_followsymlinks;
 bool filan_rawoutput;
Index: socat-1.7.3.3/procan.c
===
--- socat-1.7.3.3.orig/procan.c
+++ socat-1.7.3.3/procan.c
@@ -16,6 +16,9 @@
 #include "filan.h"
 
 #include 
+#ifdef WITH_LIBWRAP
+#include 
+#endif
 
 #include "procan.h"
 
Index: socat-1.7.3.3/xio-tcpwrap.c
===
--- socat-1.7.3.3.orig/xio-tcpwrap.c
+++ socat-1.7.3.3/xio-tcpwrap.c
@@ -13,6 +13,7 @@
 #include "xio-tcpwrap.h"
 
 
+
 #if (WITH_TCP || WITH_UDP) && WITH_LIBWRAP
 
 const struct optdesc opt_tcpwrappers = { "tcpwrappers", "tcpwrap", 
OPT_TCPWRAPPERS, GROUP_RANGE,  PH_ACCEPT, TYPE_STRING_NULL, OFUNC_SPEC };

commit socat for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2019-04-10 23:09:34

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new.27019 (New)


Package is "socat"

Wed Apr 10 23:09:34 2019 rev:39 rq:692059 version:1.7.3.3

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2018-09-18 
11:41:12.804050204 +0200
+++ /work/SRC/openSUSE:Factory/.socat.new.27019/socat.changes   2019-04-10 
23:09:37.083866373 +0200
@@ -1,0 +2,9 @@
+Sat Apr  6 13:34:11 UTC 2019 - Martin Hauke 
+
+- Update to version 1.7.3.3:
+  * bugfix release, see the CHANGES file for all changes
+- Drop patch:
+  * socat-openssl-1.1-tests.patch (not longer needed)
+- Run spec-cleaner
+
+---

Old:

  socat-1.7.3.2.tar.bz2
  socat-openssl-1.1-tests.patch

New:

  socat-1.7.3.3.tar.bz2



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.m1yeAY/_old  2019-04-10 23:09:37.827867218 +0200
+++ /var/tmp/diff_new_pack.m1yeAY/_new  2019-04-10 23:09:37.831867223 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package socat
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Pascal Bleser 
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,39 +13,35 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:   socat
+Version:1.7.3.3
+Release:0
+Summary:Multipurpose relay for bidirectional data transfer
+License:SUSE-GPL-2.0-with-openssl-exception AND MIT
+Group:  Productivity/Networking/Other
+URL:http://www.dest-unreach.org/socat/
+Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
+Source1:%{name}.changes
+Patch1: socat-ignore-tests-failure-boo1078346.patch
+BuildRequires:  iputils
+BuildRequires:  net-tools
 BuildRequires:  openssl-devel
 BuildRequires:  procps
 BuildRequires:  readline-devel
 %if 0%{?suse_version}
 BuildRequires:  tcpd-devel
 %endif
-# begin: test deps: (ip, ping, ping6, netstat, /etc/services)
 %if 0%{?suse_version}
 BuildRequires:  iproute2
 BuildRequires:  netcfg
 %endif
-BuildRequires:  iputils
-BuildRequires:  net-tools
 %if 0%{?suse_version} >= 1330
 BuildRequires:  net-tools-deprecated
 %endif
-# end: test deps
-Version:1.7.3.2
-Release:0
-Url:http://www.dest-unreach.org/socat/
-Summary:Multipurpose relay for bidirectional data transfer
-License:SUSE-GPL-2.0-with-openssl-exception AND MIT
-Group:  Productivity/Networking/Other
-Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
-Patch0: socat-openssl-1.1-tests.patch
-Patch1: socat-ignore-tests-failure-boo1078346.patch
-Source1:%{name}.changes
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 socat is a relay for bidirectional data transfer between two
@@ -56,21 +52,18 @@
 combination of two of these.
 
 %prep
-%setup
-if pkg-config --atleast-version=1.1 openssl 
-then
-%patch0 -p1
-fi
+%setup -q
 %patch1 -p1
+sed 's|#! %{_bindir}/env bash|#!%{_bindir}/bash|' -i proxyecho.sh readline.sh
 
 %build
 # export deterministic BUILD_DATE, format like "__DATE__ __TIME__"
 CL_DATE="$(awk -F " - " 'NR==2{print $1;}' %{SOURCE1})"
 test -n "$CL_DATE"
-export BUILD_DATE="$(LANG=C date --utc -d "${CL_DATE}" +"%b %e %Y %T")"
+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"
 %configure
-make all
+make %{?_smp_mflags} all
 mkdir examples
 cp -a daemon.sh ftp.sh mail.sh proxyecho.sh readline.sh examples
 
@@ -94,12 +87,11 @@
 ./test.sh $sotests
 
 %files
-%defattr(-,root,root)
 %license COPYING COPYING.OpenSSL
 %doc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY 
VERSION examples
 %{_bindir}/socat
 %{_bindir}/procan
 %{_bindir}/filan
-%{_mandir}/man1/socat.1*
+%{_mandir}/man1/socat.1%{?ext_man}
 
 %changelog

++ socat-1.7.3.2.tar.bz2 -> socat-1.7.3.3.tar.bz2 ++
 9408 lines of diff (skipped)

commit socat for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2018-09-18 11:41:05

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is "socat"

Tue Sep 18 11:41:05 2018 rev:38 rq:635272 version:1.7.3.2

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2018-09-04 
22:49:12.059568065 +0200
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2018-09-18 
11:41:12.804050204 +0200
@@ -1,0 +2,5 @@
+Mon Sep 10 12:14:48 UTC 2018 - Jan Engelhardt 
+
+- Replace old variables by modern counterparts.
+
+---



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.3Dn5CP/_old  2018-09-18 11:41:13.984048965 +0200
+++ /var/tmp/diff_new_pack.3Dn5CP/_new  2018-09-18 11:41:13.984048965 +0200
@@ -70,15 +70,15 @@
 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"
 %configure
-%{__make} all
+make all
 mkdir examples
 cp -a daemon.sh ftp.sh mail.sh proxyecho.sh readline.sh examples
 
 %install
 mkdir -p \
-   ${RPM_BUILD_ROOT}/%{_bindir} \
-   ${RPM_BUILD_ROOT}/%{_mandir}/man1
-%{__make} DESTDIR=${RPM_BUILD_ROOT} install
+   %{buildroot}/%{_bindir} \
+   %{buildroot}/%{_mandir}/man1
+%make_install
 
 %check
 export TERM=ansi

commit socat for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2018-09-04 22:49:10

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is "socat"

Tue Sep  4 22:49:10 2018 rev:37 rq:632455 version:1.7.3.2

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2018-04-10 
09:48:54.176003511 +0200
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2018-09-04 
22:49:12.059568065 +0200
@@ -1,0 +2,7 @@
+Thu Aug 30 16:32:32 UTC 2018 - crrodrig...@opensuse.org
+
+- We HAVE_SSLv23_*_method, just not as functions, but macros
+  add the relevant defines in the command line so support for
+  autonegotiation of the highest TLS version is restored.
+
+---



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.mUoP8p/_old  2018-09-04 22:49:13.795574033 +0200
+++ /var/tmp/diff_new_pack.mUoP8p/_new  2018-09-04 22:49:13.843574198 +0200
@@ -68,7 +68,7 @@
 CL_DATE="$(awk -F " - " 'NR==2{print $1;}' %{SOURCE1})"
 test -n "$CL_DATE"
 export BUILD_DATE="$(LANG=C date --utc -d "${CL_DATE}" +"%b %e %Y %T")"
-export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing"
+export CFLAGS="%{optflags} -fno-strict-aliasing -DHAVE_SSLv23_client_method 
-DHAVE_SSLv23_server_method"
 %configure
 %{__make} all
 mkdir examples

commit socat for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2018-04-10 09:48:49

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is "socat"

Tue Apr 10 09:48:49 2018 rev:36 rq:593334 version:1.7.3.2

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2018-02-06 
16:46:17.832089396 +0100
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2018-04-10 
09:48:54.176003511 +0200
@@ -1,0 +2,5 @@
+Tue Apr  3 13:53:32 CEST 2018 - ku...@suse.de
+
+- Use %license instead of %doc [bsc#1082318]
+
+---



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.GYzHxj/_old  2018-04-10 09:48:55.811944241 +0200
+++ /var/tmp/diff_new_pack.GYzHxj/_new  2018-04-10 09:48:55.811944241 +0200
@@ -39,7 +39,7 @@
 Release:0
 Url:http://www.dest-unreach.org/socat/
 Summary:Multipurpose relay for bidirectional data transfer
-License:SUSE-GPL-2.0-with-openssl-exception and MIT
+License:SUSE-GPL-2.0-with-openssl-exception AND MIT
 Group:  Productivity/Networking/Other
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
 Patch0: socat-openssl-1.1-tests.patch
@@ -95,7 +95,8 @@
 
 %files
 %defattr(-,root,root)
-%doc BUGREPORTS CHANGES COPYING COPYING.OpenSSL DEVELOPMENT EXAMPLES FAQ FILES 
PORTING README SECURITY VERSION examples
+%license COPYING COPYING.OpenSSL
+%doc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY 
VERSION examples
 %{_bindir}/socat
 %{_bindir}/procan
 %{_bindir}/filan

commit socat for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2018-02-06 16:46:16

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is "socat"

Tue Feb  6 16:46:16 2018 rev:35 rq:572514 version:1.7.3.2

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2017-08-22 
11:05:45.825033998 +0200
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2018-02-06 
16:46:17.832089396 +0100
@@ -1,0 +2,6 @@
+Fri Feb  2 06:50:32 UTC 2018 - norm...@linux.vnet.ibm.com
+
+- Add socat-ignore-tests-failure-boo1078346.patch
+  flaky test failures PowerPC and s390 , bypass boo#1078346
+
+---

New:

  socat-ignore-tests-failure-boo1078346.patch



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.kxfYV7/_old  2018-02-06 16:46:18.476059263 +0100
+++ /var/tmp/diff_new_pack.kxfYV7/_new  2018-02-06 16:46:18.476059263 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package socat
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Pascal Bleser 
 #
 # All modifications and additions to the file contributed by third parties
@@ -43,6 +43,7 @@
 Group:  Productivity/Networking/Other
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
 Patch0: socat-openssl-1.1-tests.patch
+Patch1: socat-ignore-tests-failure-boo1078346.patch
 Source1:%{name}.changes
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -60,6 +61,7 @@
 then
 %patch0 -p1
 fi
+%patch1 -p1
 
 %build
 # export deterministic BUILD_DATE, format like "__DATE__ __TIME__"

++ socat-ignore-tests-failure-boo1078346.patch ++
From: Michel Normand 
Subject: socat ignore tests failure boo1078346
Date: Wed, 31 Jan 2018 10:19:54 +0100

socat ignore flaky tests failure boo1078346
for PowerPC and S390

Signed-off-by: Michel Normand 
---
 test.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: socat-1.7.3.2/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+
 
 if [ "$numFAIL" -gt 0 ]; then
 echo "FAILED: $listFAIL"
-exit 1
+uname -p | grep -qE 'ppc|s390' && { echo "ignore flaky failures, bypass 
boo#1078346"; exit 0; } || exit 1
 fi
 exit 0
 

commit socat for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2017-08-22 11:05:40

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is "socat"

Tue Aug 22 11:05:40 2017 rev:34 rq:517414 version:1.7.3.2

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2017-04-20 
20:47:24.174057172 +0200
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2017-08-22 
11:05:45.825033998 +0200
@@ -1,0 +2,5 @@
+Thu Aug 17 13:42:49 UTC 2017 - meiss...@suse.com
+
+- socat-openssl-1.1-tests.patch: make tests work on openssl1. (bsc#1042674)
+
+---

New:

  socat-openssl-1.1-tests.patch



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.wnJMY2/_old  2017-08-22 11:05:47.752762487 +0200
+++ /var/tmp/diff_new_pack.wnJMY2/_new  2017-08-22 11:05:47.756761924 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package socat
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Pascal Bleser 
 #
 # All modifications and additions to the file contributed by third parties
@@ -42,6 +42,7 @@
 License:SUSE-GPL-2.0-with-openssl-exception and MIT
 Group:  Productivity/Networking/Other
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
+Patch0: socat-openssl-1.1-tests.patch
 Source1:%{name}.changes
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -55,6 +56,10 @@
 
 %prep
 %setup
+if pkg-config --atleast-version=1.1 openssl 
+then
+%patch0 -p1
+fi
 
 %build
 # export deterministic BUILD_DATE, format like "__DATE__ __TIME__"

++ socat-openssl-1.1-tests.patch ++
OpenSSL 1.1 introduces the concept of security levels, in attempt to prevent
users from accidently setting insecure ciphers.
aNULL ciphers are considered insecure and are only allowed in Security Level 0.
The default Security Level is 1.
Unfortunately a cipher string featuring @SECLEVEL=0 is not accepted in older
OpenSSL versions, thus this patch should be applied to newer distributions only.

Index: socat-1.7.3.2/test.sh
===
--- socat-1.7.3.2.orig/test.sh  2017-01-22 19:07:10.0 +0100
+++ socat-1.7.3.2/test.sh   2017-08-17 12:36:50.809352091 +0200
@@ -11227,8 +11227,8 @@ tf="$td/test$N.stdout"
 te="$td/test$N.stderr"
 tdiff="$td/test$N.diff"
 da="test$N $(date) $RANDOM"
-CMD2="$TRACE $SOCAT $opts 
OPENSSL-LISTEN:$PORT,reuseaddr,$SOCAT_EGD,ciphers=aNULL,verify=0 pipe"
-CMD="$TRACE $SOCAT $opts - 
openssl:$LOCALHOST:$PORT,ciphers=aNULL,verify=0,$SOCAT_EGD"
+CMD2="$TRACE $SOCAT $opts 
OPENSSL-LISTEN:$PORT,reuseaddr,$SOCAT_EGD,ciphers=aNULL:@SECLEVEL=0,verify=0 
pipe"
+CMD="$TRACE $SOCAT $opts - 
openssl:$LOCALHOST:$PORT,ciphers=aNULL:@SECLEVEL=0,verify=0,$SOCAT_EGD"
 printf "test $F_n $TEST... " $N
 eval "$CMD2 2>\"${te}1\" &"
 pid=$! # background process id
@@ -11632,8 +11632,8 @@ tf1="$td/test$N.1.stdout"
 te1="$td/test$N.1.stderr"
 tdiff="$td/test$N.diff"
 da="test$N $(date) $RANDOM"
-CMD0="$TRACE $SOCAT $opts 
OPENSSL-LISTEN:$PORT,reuseaddr,ciphers=aNULL,verify=0, PIPE"
-CMD1="$TRACE $SOCAT $opts - 
OPENSSL-CONNECT:$LOCALHOST:$PORT,bind=$LOCALHOST,ciphers=aNULL,verify=0"
+CMD0="$TRACE $SOCAT $opts 
OPENSSL-LISTEN:$PORT,reuseaddr,ciphers=aNULL:@SECLEVEL=0,verify=0, PIPE"
+CMD1="$TRACE $SOCAT $opts - 
OPENSSL-CONNECT:$LOCALHOST:$PORT,bind=$LOCALHOST,ciphers=aNULL:@SECLEVEL=0,verify=0"
 printf "test $F_n $TEST... " $N
 $CMD0 >/dev/null 2>"$te0" &
 pid0=$!
@@ -12191,8 +12191,8 @@ tf="$td/test$N.stdout"
 te="$td/test$N.stderr"
 tdiff="$td/test$N.diff"
 da="test$N $(date) $RANDOM"
-CMD0="$SOCAT $opts OPENSSL-LISTEN:$PORT,reuseaddr,cipher=aNULL,verify=0 
SYSTEM:cat"
-CMD1="$SOCAT $opts - OPENSSL-CONNECT:$LOCALHOST:$PORT,cipher=aNULL,verify=0"
+CMD0="$SOCAT $opts 
OPENSSL-LISTEN:$PORT,reuseaddr,cipher=aNULL:@SECLEVEL=0,verify=0 SYSTEM:cat"
+CMD1="$SOCAT $opts - 
OPENSSL-CONNECT:$LOCALHOST:$PORT,cipher=aNULL:@SECLEVEL=0,verify=0"
 printf "test $F_n $TEST... " $N
 $CMD0 >/dev/null 2>"${te}0" &
 pid0=$!
@@ -12302,8 +12302,8 @@ tf="$td/test$N.stdout"
 te="$td/test$N.stderr"
 tdiff="$td/test$N.diff"
 da="test$N $(date) $RANDOM"
-CMD0="$SOCAT $opts 
OPENSSL-LISTEN:$PORT,reuseaddr,method=$method,cipher=aNULL,verify=0 PIPE"
-CMD1="$SOCAT $opts - 
OPENSSL-CONNECT:$LOCALHOST:$PORT,method=$method,cipher=aNULL,verify=0"
+CMD0="$SOCAT $opts 
OPENSSL-LISTEN:$PORT,reuseaddr,method=$method,cipher=aNULL:@SECLEVEL=0,verify=0 
PIPE"
+CMD1="$SOCAT $opts - 

commit socat for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2017-04-20 20:47:22

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is "socat"

Thu Apr 20 20:47:22 2017 rev:33 rq:487585 version:1.7.3.2

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2016-02-23 
16:54:21.0 +0100
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2017-04-20 
20:47:24.174057172 +0200
@@ -1,0 +2,11 @@
+Mon Apr 10 14:56:19 UTC 2017 - sweet_...@gmx.de
+
+- update to 1.7.3.2, bug fixes:
+  * fixes uninterruptable hang / CPU loop on host resolution
+problems
+  * some compile problems, and lots of other bugs and porting
+issues
+- remove fix-linux-errqueue.h-not-found.patch, this build issue
+  was fixed by upstream
+
+---

Old:

  fix-linux-errqueue.h-not-found.patch
  socat-1.7.3.1.tar.bz2

New:

  socat-1.7.3.2.tar.bz2



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.qdSBxz/_old  2017-04-20 20:47:25.121923153 +0200
+++ /var/tmp/diff_new_pack.qdSBxz/_new  2017-04-20 20:47:25.125922587 +0200
@@ -35,7 +35,7 @@
 BuildRequires:  net-tools-deprecated
 %endif
 # end: test deps
-Version:1.7.3.1
+Version:1.7.3.2
 Release:0
 Url:http://www.dest-unreach.org/socat/
 Summary:Multipurpose relay for bidirectional data transfer
@@ -43,7 +43,6 @@
 Group:  Productivity/Networking/Other
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
 Source1:%{name}.changes
-Patch2: fix-linux-errqueue.h-not-found.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -56,7 +55,6 @@
 
 %prep
 %setup
-%patch2 -p1
 
 %build
 # export deterministic BUILD_DATE, format like "__DATE__ __TIME__"

++ socat-1.7.3.1.tar.bz2 -> socat-1.7.3.2.tar.bz2 ++
 6041 lines of diff (skipped)

commit socat for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2016-02-23 16:54:20

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is "socat"

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2016-02-07 
09:21:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2016-02-23 
16:54:21.0 +0100
@@ -6 +6 @@
-OpenSSL" 
+OpenSSL" (bnc#938913 and CVE-2015-4000).
@@ -7,0 +8 @@
+(bnc#964844)



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.jLDp68/_old  2016-02-23 16:54:22.0 +0100
+++ /var/tmp/diff_new_pack.jLDp68/_new  2016-02-23 16:54:22.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package socat
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Pascal Bleser 
 #
 # All modifications and additions to the file contributed by third parties

commit socat for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2016-02-07 09:21:48

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is "socat"

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2015-03-29 
20:15:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2016-02-07 
09:21:49.0 +0100
@@ -1,0 +2,23 @@
+Tue Feb  2 12:19:40 UTC 2016 - sweet_...@gmx.de
+
+- update to 1.7.3.1, security fixes:
+  * Socat security advisory 7 and MSVR-1499: "Bad DH p parameter in
+OpenSSL" 
+  * Socat security advisory 8: "Stack overflow in arguments parser" 
+
+---
+Mon Apr 20 05:54:10 UTC 2015 - sweet_...@gmx.de
+
+- test-suite, use a small but safe subset of all tests
+- don't remove "example" scripts from builddir, they are needed for
+  tests
+
+---
+Tue Apr 14 15:57:19 UTC 2015 - sweet_...@gmx.de
+
+- remove socat-remove_date.patch, export BUILD_DATE instead
+  (new feature since 1.7.2.4)
+- run tests, don't abort yet
+- require tcpd-devel only on SUSE systems at build time
+
+---

Old:

  socat-1.7.3.0.tar.bz2
  socat-remove_date.patch

New:

  socat-1.7.3.1.tar.bz2



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.AUd2Ej/_old  2016-02-07 09:21:50.0 +0100
+++ /var/tmp/diff_new_pack.AUd2Ej/_new  2016-02-07 09:21:50.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package socat
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Pascal Bleser 
 #
 # All modifications and additions to the file contributed by third parties
@@ -21,15 +21,28 @@
 BuildRequires:  openssl-devel
 BuildRequires:  procps
 BuildRequires:  readline-devel
+%if 0%{?suse_version}
 BuildRequires:  tcpd-devel
-Version:1.7.3.0
+%endif
+# begin: test deps: (ip, ping, ping6, netstat, /etc/services)
+%if 0%{?suse_version}
+BuildRequires:  iproute2
+BuildRequires:  netcfg
+%endif
+BuildRequires:  iputils
+BuildRequires:  net-tools
+%if 0%{?suse_version} >= 1330
+BuildRequires:  net-tools-deprecated
+%endif
+# end: test deps
+Version:1.7.3.1
 Release:0
 Url:http://www.dest-unreach.org/socat/
 Summary:Multipurpose relay for bidirectional data transfer
 License:SUSE-GPL-2.0-with-openssl-exception and MIT
 Group:  Productivity/Networking/Other
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
-Patch1: socat-remove_date.patch
+Source1:%{name}.changes
 Patch2: fix-linux-errqueue.h-not-found.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -43,15 +56,18 @@
 
 %prep
 %setup
-%patch1 -p1
 %patch2 -p1
 
 %build
+# export deterministic BUILD_DATE, format like "__DATE__ __TIME__"
+CL_DATE="$(awk -F " - " 'NR==2{print $1;}' %{SOURCE1})"
+test -n "$CL_DATE"
+export BUILD_DATE="$(LANG=C date --utc -d "${CL_DATE}" +"%b %e %Y %T")"
 export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing"
 %configure
 %{__make} all
 mkdir examples
-mv daemon.sh ftp.sh mail.sh proxyecho.sh readline.sh examples
+cp -a daemon.sh ftp.sh mail.sh proxyecho.sh readline.sh examples
 
 %install
 mkdir -p \
@@ -59,6 +75,19 @@
${RPM_BUILD_ROOT}/%{_mandir}/man1
 %{__make} DESTDIR=${RPM_BUILD_ROOT} install
 
+%check
+export TERM=ansi
+# use a small but safe subset of all tests
+sotests="filan consistency stdio fd pipe pipes exec gopen noatime system"
+%ifnarch armv6l armv6hl aarch64
+# add some more tests for fast machines only
+sotests+=" unix"
+%endif
+# increase socket shutdown timeout, default 0.1 or 0.5 caused sometimes
+# random failures on slow machines (armv6l, aarch64)
+export OPTS="-t 2"
+./test.sh $sotests
+
 %files
 %defattr(-,root,root)
 %doc BUGREPORTS CHANGES COPYING COPYING.OpenSSL DEVELOPMENT EXAMPLES FAQ FILES 
PORTING README SECURITY VERSION examples

++ socat-1.7.3.0.tar.bz2 -> socat-1.7.3.1.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/socat-1.7.3.0/CHANGES new/socat-1.7.3.1/CHANGES
--- old/socat-1.7.3.0/CHANGES   2015-01-24 17:22:09.0 +0100
+++ new/socat-1.7.3.1/CHANGES   2016-01-29 11:29:36.0 +0100
@@ -1,8 +1,39 @@
 
+### V 1.7.3.1:
+
+security:
+   Socat security advisory 8
+   A stack overflow in vulnerability was found that can be triggered when
+   command line arguments 

commit socat for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2015-03-29 20:15:22

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is socat

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2014-11-04 
17:27:38.0 +0100
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2015-03-29 
20:15:24.0 +0200
@@ -1,0 +2,8 @@
+Wed Mar 25 15:29:21 UTC 2015 - p.drou...@gmail.com
+
+- Update to version 1.7.3.0
+  * Too many changes to list; please read the CHANGES file for news
+- Remove redundant %clean section
+- Update fix-linux-errqueue.h-not-found.patch and socat-remove_date.patch 
+
+---

Old:

  socat-1.7.2.4.tar.bz2

New:

  socat-1.7.3.0.tar.bz2



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.OQcUOw/_old  2015-03-29 20:15:25.0 +0200
+++ /var/tmp/diff_new_pack.OQcUOw/_new  2015-03-29 20:15:25.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package socat
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Pascal Bleser pascal.ble...@opensuse.org
 #
 # All modifications and additions to the file contributed by third parties
@@ -22,7 +22,7 @@
 BuildRequires:  procps
 BuildRequires:  readline-devel
 BuildRequires:  tcpd-devel
-Version:1.7.2.4
+Version:1.7.3.0
 Release:0
 Url:http://www.dest-unreach.org/socat/
 Summary:Multipurpose relay for bidirectional data transfer
@@ -59,9 +59,6 @@
${RPM_BUILD_ROOT}/%{_mandir}/man1
 %{__make} DESTDIR=${RPM_BUILD_ROOT} install
 
-%clean
-%{?buildroot:%__rm -rf %{buildroot}}
-
 %files
 %defattr(-,root,root)
 %doc BUGREPORTS CHANGES COPYING COPYING.OpenSSL DEVELOPMENT EXAMPLES FAQ FILES 
PORTING README SECURITY VERSION examples

++ fix-linux-errqueue.h-not-found.patch ++
--- /var/tmp/diff_new_pack.OQcUOw/_old  2015-03-29 20:15:25.0 +0200
+++ /var/tmp/diff_new_pack.OQcUOw/_new  2015-03-29 20:15:25.0 +0200
@@ -25,13 +25,14 @@
 ===
 --- socat-1.7.2.4.orig/configure.in
 +++ socat-1.7.2.4/configure.in
-@@ -79,8 +79,7 @@ AC_HEADER_RESOLV()
+@@ -80,9 +80,7 @@
  
  AC_CHECK_HEADERS(termios.h linux/if_tun.h)
  AC_CHECK_HEADERS(net/if_dl.h)
 -AC_CHECK_HEADERS(linux/types.h)
--AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], 
[#include linux/types.h])
-+AC_CHECK_HEADERS(linux/types.h linux/errqueue.h)
+-AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], 
[#include sys/time.h
+-#include linux/types.h])
++AC_CHECK_HEADERS(linux/types.h linux/errqueue.h sys/time.h)
  AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
  AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
  AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h)
@@ -39,12 +40,12 @@
 ===
 --- socat-1.7.2.4.orig/configure
 +++ socat-1.7.2.4/configure
-@@ -3968,26 +3968,19 @@ fi
+@@ -3980,27 +3980,19 @@
  
  done
  
 -for ac_header in linux/types.h
-+for ac_header in linux/types.h linux/errqueue.h
++for ac_header in linux/types.h linux/errqueue.h sys/time.h
  do :
 -  ac_fn_c_check_header_mongrel $LINENO linux/types.h 
ac_cv_header_linux_types_h $ac_includes_default
 -if test x$ac_cv_header_linux_types_h = xyes; then :
@@ -60,7 +61,8 @@
  
  done
  
--ac_fn_c_check_header_compile $LINENO linux/errqueue.h 
ac_cv_header_linux_errqueue_h #include linux/types.h
+-ac_fn_c_check_header_compile $LINENO linux/errqueue.h 
ac_cv_header_linux_errqueue_h #include sys/time.h
+-#include linux/types.h
 -
 -if test x$ac_cv_header_linux_errqueue_h = xyes; then :
 -  $as_echo #define HAVE_LINUX_ERRQUEUE_H 1 confdefs.h

++ socat-1.7.2.4.tar.bz2 - socat-1.7.3.0.tar.bz2 ++
 12392 lines of diff (skipped)

++ socat-remove_date.patch ++
--- /var/tmp/diff_new_pack.OQcUOw/_old  2015-03-29 20:15:25.0 +0200
+++ /var/tmp/diff_new_pack.OQcUOw/_new  2015-03-29 20:15:25.0 +0200
@@ -15,22 +15,21 @@
 ===
 --- socat-1.7.2.3.orig/socat.c 2011-12-06 07:44:41.0 +
 +++ socat-1.7.2.3/socat.c  2014-03-03 19:31:00.0 +
-@@ -70,8 +70,6 @@ static int socat_newchild(void);
+@@ -70,7 +70,6 @@
  static const char socatversion[] =
  #include ./VERSION
;
--static const char timestamp[] = __DATE__ __TIME__;
--
+-static const char timestamp[] = BUILD_DATE;
+ 
  const char copyright_socat[] = socat by 

commit socat for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2014-11-04 17:27:27

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is socat

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2014-03-22 
18:02:26.0 +0100
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2014-11-04 
17:27:38.0 +0100
@@ -1,0 +2,10 @@
+Sat Oct 25 06:53:21 UTC 2014 - co...@suse.com
+
+- correctly apply the patch
+
+---
+Fri Oct 24 10:02:01 UTC 2014 - jav...@opensuse.org
+
+- Add fix-linux-errqueue.h-not-found.patch 
+
+---

New:

  fix-linux-errqueue.h-not-found.patch



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.SlxWdu/_old  2014-11-04 17:27:39.0 +0100
+++ /var/tmp/diff_new_pack.SlxWdu/_new  2014-11-04 17:27:39.0 +0100
@@ -30,6 +30,7 @@
 Group:  Productivity/Networking/Other
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
 Patch1: socat-remove_date.patch
+Patch2: fix-linux-errqueue.h-not-found.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -43,6 +44,7 @@
 %prep
 %setup
 %patch1 -p1
+%patch2 -p1
 
 %build
 export RPM_OPT_FLAGS=%{optflags} -fno-strict-aliasing

++ fix-linux-errqueue.h-not-found.patch ++
configure.in: fix linux/errqueue.h not found

The do_compile failed:
...
|tmp/work/core2-64-poky-linux/socat/1.7.2.4-r0/socat-1.7.2.4/xio-ip.c:
In function 'xiolog_ancillary_ip':
|tmp/work/core2-64-poky-linux/socat/1.7.2.4-r0/socat-1.7.2.4/xio-ip.c:520:12:
error: dereferencing pointer to incomplete type
| err-ee_errno, '\0', err-ee_origin, '\0', err-ee_type, '\0',
|^
| ake: *** [xio-ip.o] Error 1
...

For 1.7.2.4, the header check of 'linux/errqueue.h ' was not correctly,
but the old version 1.7.2.3 worked, so we reference 1.7.2.3 to fix this
issue.

Upstream-Status: Pending
Signed-off-by: Hongxu Jia hongxu@windriver.com
---
 configure.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: socat-1.7.2.4/configure.in
===
--- socat-1.7.2.4.orig/configure.in
+++ socat-1.7.2.4/configure.in
@@ -79,8 +79,7 @@ AC_HEADER_RESOLV()
 
 AC_CHECK_HEADERS(termios.h linux/if_tun.h)
 AC_CHECK_HEADERS(net/if_dl.h)
-AC_CHECK_HEADERS(linux/types.h)
-AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], 
[#include linux/types.h])
+AC_CHECK_HEADERS(linux/types.h linux/errqueue.h)
 AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
 AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
 AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h)
Index: socat-1.7.2.4/configure
===
--- socat-1.7.2.4.orig/configure
+++ socat-1.7.2.4/configure
@@ -3968,26 +3968,19 @@ fi
 
 done
 
-for ac_header in linux/types.h
+for ac_header in linux/types.h linux/errqueue.h
 do :
-  ac_fn_c_check_header_mongrel $LINENO linux/types.h 
ac_cv_header_linux_types_h $ac_includes_default
-if test x$ac_cv_header_linux_types_h = xyes; then :
+  as_ac_Header=`$as_echo ac_cv_header_$ac_header | $as_tr_sh`
+ac_fn_c_check_header_mongrel $LINENO $ac_header $as_ac_Header 
$ac_includes_default
+if eval test \x\$$as_ac_Header\ = xyes; then :
   cat confdefs.h _ACEOF
-#define HAVE_LINUX_TYPES_H 1
+#define `$as_echo HAVE_$ac_header | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-ac_fn_c_check_header_compile $LINENO linux/errqueue.h 
ac_cv_header_linux_errqueue_h #include linux/types.h
-
-if test x$ac_cv_header_linux_errqueue_h = xyes; then :
-  $as_echo #define HAVE_LINUX_ERRQUEUE_H 1 confdefs.h
-
-fi
-
-
 for ac_header in sys/utsname.h sys/select.h sys/file.h
 do :
   as_ac_Header=`$as_echo ac_cv_header_$ac_header | $as_tr_sh`
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit socat for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2014-03-22 14:45:41

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is socat

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2014-03-06 
19:29:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2014-03-22 
18:02:26.0 +0100
@@ -1,0 +2,7 @@
+Tue Mar 11 07:05:34 UTC 2014 - meiss...@suse.com
+
+- updated to 1.7.2.4: minor bugfixes:
+  This version contains fixes for most of the bugs and porting issues
+  reported or found in more than two years.
+
+---

Old:

  socat-1.7.2.3.tar.bz2

New:

  socat-1.7.2.4.tar.bz2



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.tkWZpH/_old  2014-03-22 18:02:26.0 +0100
+++ /var/tmp/diff_new_pack.tkWZpH/_new  2014-03-22 18:02:26.0 +0100
@@ -22,13 +22,12 @@
 BuildRequires:  procps
 BuildRequires:  readline-devel
 BuildRequires:  tcpd-devel
-Version:1.7.2.3
+Version:1.7.2.4
 Release:0
 Url:http://www.dest-unreach.org/socat/
 Summary:Multipurpose relay for bidirectional data transfer
 License:SUSE-GPL-2.0-with-openssl-exception and MIT
 Group:  Productivity/Networking/Other
-# 1.7.2.1: md5 7ddfea7e9e85f868670f94d3ea08358b
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
 Patch1: socat-remove_date.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build

++ socat-1.7.2.3.tar.bz2 - socat-1.7.2.4.tar.bz2 ++
 21386 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit socat for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2014-03-06 19:29:33

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is socat

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2013-06-05 
13:13:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2014-03-06 
19:29:36.0 +0100
@@ -1,0 +2,14 @@
+Mon Mar  3 19:35:45 UTC 2014 - andreas.stie...@gmx.de
+
+- mention patch in changelog entry, annotate patch
+
+---
+Sun Feb 02 10:09:04 UTC 2014 - pascal.ble...@opensuse.org
+
+- update to 1.7.2.3: security fix:
+  * CVE-2014-0019: socats PROXY-CONNECT address was vulnerable to a buffer
+overflow with data from command line (see socat-secadv5.txt)
+- added esocat-remove_date.patch to prevent unneccessary rebuilds,
+  fixes W: file-contains-date-and-time
+
+---

Old:

  socat-1.7.2.2.tar.bz2

New:

  socat-1.7.2.3.tar.bz2
  socat-remove_date.patch



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.M116w4/_old  2014-03-06 19:29:37.0 +0100
+++ /var/tmp/diff_new_pack.M116w4/_new  2014-03-06 19:29:37.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package socat
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Pascal Bleser pascal.ble...@opensuse.org
 #
 # All modifications and additions to the file contributed by third parties
@@ -22,7 +22,7 @@
 BuildRequires:  procps
 BuildRequires:  readline-devel
 BuildRequires:  tcpd-devel
-Version:1.7.2.2
+Version:1.7.2.3
 Release:0
 Url:http://www.dest-unreach.org/socat/
 Summary:Multipurpose relay for bidirectional data transfer
@@ -30,6 +30,7 @@
 Group:  Productivity/Networking/Other
 # 1.7.2.1: md5 7ddfea7e9e85f868670f94d3ea08358b
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
+Patch1: socat-remove_date.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -42,6 +43,7 @@
 
 %prep
 %setup
+%patch1 -p1
 
 %build
 export RPM_OPT_FLAGS=%{optflags} -fno-strict-aliasing
@@ -65,6 +67,6 @@
 %{_bindir}/socat
 %{_bindir}/procan
 %{_bindir}/filan
-%{_mandir}/man1/socat.1%{ext_man}
+%{_mandir}/man1/socat.1*
 
 %changelog

++ socat-1.7.2.2.tar.bz2 - socat-1.7.2.3.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/socat-1.7.2.2/CHANGES new/socat-1.7.2.3/CHANGES
--- old/socat-1.7.2.2/CHANGES   2013-03-25 17:36:42.0 +0100
+++ new/socat-1.7.2.3/CHANGES   2014-01-28 18:39:01.0 +0100
@@ -1,4 +1,11 @@
 
+### V 1.7.2.3:
+
+security:
+   CVE-2014-0019: socats PROXY-CONNECT address was vulnerable to a buffer
+   overflow with data from command line (see socat-secadv5.txt)
+   Credits to Florian Weimer of the Red Hat Product Security Team
+
 ### V 1.7.2.2:
 
 security:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/socat-1.7.2.2/VERSION new/socat-1.7.2.3/VERSION
--- old/socat-1.7.2.2/VERSION   2013-03-25 17:42:07.0 +0100
+++ new/socat-1.7.2.3/VERSION   2014-01-28 18:39:01.0 +0100
@@ -1 +1 @@
-1.7.2.2
+1.7.2.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/socat-1.7.2.2/test.sh new/socat-1.7.2.3/test.sh
--- old/socat-1.7.2.2/test.sh   2013-03-22 07:43:41.0 +0100
+++ new/socat-1.7.2.3/test.sh   2014-01-28 18:39:01.0 +0100
@@ -49,6 +49,9 @@
 #SOCAT_EGD=egd=/dev/egd-pool
 MISCDELAY=1
 [ -z $SOCAT ]  SOCAT=./socat
+if [ ! -x $SOCAT ]; then
+echo $SOCAT does not exist 2; exit 1;
+fi
 [ -z $PROCAN ]  PROCAN=./procan
 [ -z $FILAN ]  FILAN=./filan
 opts=$opt_t $OPTS
@@ -10876,6 +10879,56 @@
 PORT=$((PORT+1))
 N=$((N+1))
 
+
+if false; then # this overflow is not reliably reproducable
+# socat up to 2.0.0-b6 did not check the length of the PROXY-CONNECT command 
line paramters when copying them into the HTTP request buffer. This could lead 
to a buffer overflow.
+NAME=PROXY_ADDR_OVFL
+case $TESTS in
+*%functions%*|*%bugs%*|*%security%*|*%socket%*|*%$NAME%*)
+TEST=$NAME: proxy address parameters overflow
+# invoke socat PROXY-CONNECT with long proxy server and target server names. 
If it terminates with exit code = 128 it is vulnerable
+# However, even if vulnerable it often does not crash. Therefore we try to use 
a boundary check program like 

commit socat for openSUSE:Factory

[h_root]

binigvdn8vP7Z.bin
Description: Binary data

commit socat for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2013-03-05 15:20:12

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is socat, Maintainer is meiss...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2012-06-05 
15:35:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2013-03-05 
15:20:14.0 +0100
@@ -1,0 +2,11 @@
+Mon Mar  4 11:20:27 UTC 2013 - cfarr...@suse.com
+
+- license update: SUSE-GPL-2.0-with-openssl-exception and MIT
+  See README
+
+---
+Sat Mar  2 08:13:52 UTC 2013 - co...@suse.com
+
+- update license to new format
+
+---



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.Z9mJDC/_old  2013-03-05 15:20:16.0 +0100
+++ /var/tmp/diff_new_pack.Z9mJDC/_new  2013-03-05 15:20:16.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package socat
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Pascal Bleser pascal.ble...@opensuse.org
 #
 # All modifications and additions to the file contributed by third parties
@@ -26,7 +26,7 @@
 Release:0
 Url:http://www.dest-unreach.org/socat/
 Summary:Multipurpose relay for bidirectional data transfer
-License:BSD-3-Clause ; GPL-2.0+
+License:SUSE-GPL-2.0-with-openssl-exception and MIT
 Group:  Productivity/Networking/Other
 # 1.7.2.1: md5 7ddfea7e9e85f868670f94d3ea08358b
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit socat for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2012-06-05 15:35:23

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is socat, Maintainer is meiss...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2011-12-25 
17:41:55.0 +0100
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2012-06-05 
15:35:25.0 +0200
@@ -1,0 +2,6 @@
+Fri May 25 14:15:08 UTC 2012 - meiss...@suse.com
+
+- udapted to 1.7.2.1
+  security fix for READLINE bnc#759859 
+
+---

Old:

  socat-1.7.2.0.tar.bz2

New:

  socat-1.7.2.1.tar.bz2



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.kQkBx0/_old  2012-06-05 15:35:26.0 +0200
+++ /var/tmp/diff_new_pack.kQkBx0/_new  2012-06-05 15:35:26.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package socat
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Pascal Bleser pascal.ble...@opensuse.org
 #
 # All modifications and additions to the file contributed by third parties
@@ -16,18 +16,19 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:   socat
 BuildRequires:  openssl-devel
 BuildRequires:  procps
 BuildRequires:  readline-devel
 BuildRequires:  tcpd-devel
-Version:1.7.2.0
+Version:1.7.2.1
 Release:0
 Url:http://www.dest-unreach.org/socat/
 Summary:Multipurpose relay for bidirectional data transfer
 License:BSD-3-Clause ; GPL-2.0+
 Group:  Productivity/Networking/Other
-# 1.7.2.0: md5 eb563dd00b9d39a49fb62a677fc941fe
+# 1.7.2.1: md5 7ddfea7e9e85f868670f94d3ea08358b
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 

++ socat-1.7.2.0.tar.bz2 - socat-1.7.2.1.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/socat-1.7.2.0/CHANGES new/socat-1.7.2.1/CHANGES
--- old/socat-1.7.2.0/CHANGES   2011-12-05 19:21:33.0 +0100
+++ new/socat-1.7.2.1/CHANGES   2012-04-22 12:24:00.0 +0200
@@ -1,4 +1,17 @@
 
+### V 1.7.2.1:
+
+security:
+   fixed a possible heap buffer overflow in the readline address. This bug
+   could be exploited when all of the following conditions were met:
+   1) one of the addresses is READLINE without the noprompt and without the
+   prompt options.
+   2) the other (almost arbitrary address) reads malicious data (which is
+   then transferred by socat to READLINE).
+   Workaround: when using the READLINE address apply option prompt or
+   noprompt.
+   Full credits to Johan Thillemann for finding and reporting this issue.
+
 ### V 1.7.2.0:
 
 corrections:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/socat-1.7.2.0/COPYING new/socat-1.7.2.1/COPYING
--- old/socat-1.7.2.0/COPYING   2001-04-19 12:39:56.0 +0200
+++ new/socat-1.7.2.1/COPYING   2012-01-08 21:27:57.0 +0100
@@ -1,12 +1,12 @@
-   GNU GENERAL PUBLIC LICENSE
-  Version 2, June 1991
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-  675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-   Preamble
+Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-   GNU GENERAL PUBLIC LICENSE
+
+GNU 

commit socat for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2011-12-25 17:41:33

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is socat, Maintainer is meiss...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2011-12-08 
11:31:20.0 +0100
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2011-12-25 
17:41:55.0 +0100
@@ -1,0 +2,5 @@
+Wed Dec 21 10:31:49 UTC 2011 - co...@suse.com
+
+- remove call to suse_update_config (very old work around)
+
+---



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.hceht7/_old  2011-12-25 17:41:56.0 +0100
+++ /var/tmp/diff_new_pack.hceht7/_new  2011-12-25 17:41:56.0 +0100
@@ -16,17 +16,17 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
-
 Name:   socat
-BuildRequires:  openssl-devel procps readline-devel tcpd-devel
+BuildRequires:  openssl-devel
+BuildRequires:  procps
+BuildRequires:  readline-devel
+BuildRequires:  tcpd-devel
 Version:1.7.2.0
-Release:6
-License:BSD-3-Clause ; GPL-2.0+
-Group:  Productivity/Networking/Other
+Release:0
 Url:http://www.dest-unreach.org/socat/
 Summary:Multipurpose relay for bidirectional data transfer
+License:BSD-3-Clause ; GPL-2.0+
+Group:  Productivity/Networking/Other
 # 1.7.2.0: md5 eb563dd00b9d39a49fb62a677fc941fe
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -43,7 +43,6 @@
 %setup
 
 %build
-%{?suse_update_config:%{suse_update_config -f}}
 export RPM_OPT_FLAGS=%{optflags} -fno-strict-aliasing
 %configure
 %{__make} all

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit socat for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2011-12-08 11:31:16

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is socat, Maintainer is meiss...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/socat/socat.changes  2011-09-23 
12:46:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2011-12-08 
11:31:20.0 +0100
@@ -1,0 +2,10 @@
+Wed Dec  7 17:49:55 CET 2011 - meiss...@suse.de
+
+- updated to 1.7.2.0
+  This release allows tun/tap interfaces without IP addresses and
+  introduces the options openssl-compress and max-children. It fixes 18
+  bugs and has 11 changes for improved platform support, especially Mac
+  OS X Lion, DragonFly, and Android.
+- socat-unixsalen.patch now upstream.
+
+---

Old:

  socat-1.7.1.3.tar.bz2
  socat-unixsalen.patch

New:

  socat-1.7.2.0.tar.bz2



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.aCU4bJ/_old  2011-12-08 11:31:25.0 +0100
+++ /var/tmp/diff_new_pack.aCU4bJ/_new  2011-12-08 11:31:25.0 +0100
@@ -21,14 +21,14 @@
 
 Name:   socat
 BuildRequires:  openssl-devel procps readline-devel tcpd-devel
-Version:1.7.1.3
+Version:1.7.2.0
 Release:6
 License:BSD-3-Clause ; GPL-2.0+
 Group:  Productivity/Networking/Other
 Url:http://www.dest-unreach.org/socat/
 Summary:Multipurpose relay for bidirectional data transfer
+# 1.7.2.0: md5 eb563dd00b9d39a49fb62a677fc941fe
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
-Patch0: socat-unixsalen.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -41,15 +41,11 @@
 
 %prep
 %setup
-%patch0 -p1
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}
-export CFLAGS=%{optflags} -fno-strict-aliasing
-./configure \
-   --prefix=%{_prefix} \
-   --mandir=%{_mandir} \
-   --sysconfdir=%{_sysconfdir}
+export RPM_OPT_FLAGS=%{optflags} -fno-strict-aliasing
+%configure
 %{__make} all
 mkdir examples
 mv daemon.sh ftp.sh mail.sh proxyecho.sh readline.sh examples

++ socat-1.7.1.3.tar.bz2 - socat-1.7.2.0.tar.bz2 ++
 35127 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit socat for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory checked 
in at 2011-12-06 19:05:05

Comparing /work/SRC/openSUSE:Factory/socat (Old)
 and  /work/SRC/openSUSE:Factory/.socat.new (New)


Package is socat, Maintainer is meiss...@suse.com

Changes:




Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.hcTw2y/_old  2011-12-06 19:38:15.0 +0100
+++ /var/tmp/diff_new_pack.hcTw2y/_new  2011-12-06 19:38:15.0 +0100
@@ -23,7 +23,7 @@
 BuildRequires:  openssl-devel procps readline-devel tcpd-devel
 Version:1.7.1.3
 Release:6
-License:BSD3c ; GPLv2+
+License:BSD-3-Clause ; GPL-2.0+
 Group:  Productivity/Networking/Other
 Url:http://www.dest-unreach.org/socat/
 Summary:Multipurpose relay for bidirectional data transfer

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit socat for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package socat for openSUSE:Factory
checked in at Thu Apr 21 13:43:57 CEST 2011.




--- socat/socat.changes 2010-08-02 14:10:18.0 +0200
+++ /mounts/work_src_done/STABLE/socat/socat.changes2011-02-02 
18:24:17.0 +0100
@@ -1,0 +2,5 @@
+Wed Feb  2 18:23:27 CET 2011 - meiss...@suse.de
+
+- Handle case where a AF_LOCAL socket has no name. bnc#668319
+
+---

calling whatdependson for head-i586


New:

  socat-unixsalen.patch



Other differences:
--
++ socat.spec ++
--- /var/tmp/diff_new_pack.IvA7tX/_old  2011-04-21 13:43:42.0 +0200
+++ /var/tmp/diff_new_pack.IvA7tX/_new  2011-04-21 13:43:42.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package socat (Version 1.7.1.3)
+# spec file for package socat
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Pascal Bleser pascal.ble...@opensuse.org
 #
 # All modifications and additions to the file contributed by third parties
@@ -22,12 +22,13 @@
 Name:   socat
 BuildRequires:  openssl-devel procps readline-devel tcpd-devel
 Version:1.7.1.3
-Release:1
+Release:6
 License:BSD3c ; GPLv2+
 Group:  Productivity/Networking/Other
 Url:http://www.dest-unreach.org/socat/
 Summary:Multipurpose relay for bidirectional data transfer
 Source: 
http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
+Patch0: socat-unixsalen.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -40,6 +41,7 @@
 
 %prep
 %setup
+%patch0 -p1
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}
@@ -68,4 +70,5 @@
 %{_bindir}/procan
 %{_bindir}/filan
 %{_mandir}/man1/socat.1%{ext_man}
+
 %changelog

++ socat-unixsalen.patch ++
Index: socat-1.7.1.2/sysutils.c
===
--- socat-1.7.1.2.orig/sysutils.c
+++ socat-1.7.1.2/sysutils.c
@@ -215,10 +215,14 @@ char *sockaddr_unix_info(const struct so
} else
 #endif /* WITH_ABSTRACT_UNIXSOCKET */
{
-  nextc =
-sanitize_string(sa-sun_path,
+  if (salen = XIOUNIXSOCKOVERHEAD) {
+   nextc = sanitize_string (anon, MIN(UNIX_PATH_MAX, strlen(anon)),
+   ubuff, XIOSAN_DEFAULT_BACKSLASH_OCT_3);
+  } else {
+   nextc = sanitize_string(sa-sun_path,
 MIN(UNIX_PATH_MAX, strlen(sa-sun_path)),
 ubuff, XIOSAN_DEFAULT_BACKSLASH_OCT_3);
+  }
   *nextc = '\0';
   strncpy(buff, ubuff, blen);
}





Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org