Accepting request 692059 from network:utilities

OBS-URL: https://build.opensuse.org/request/show/692059
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/socat?expand=0&rev=39

socat-1.7.3.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251
-size 493324

socat-1.7.3.3.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a
+size 489901

socat-openssl-1.1-tests.patch

@@ -1,55 +0,0 @@
-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.000000000 +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 - OPENSSL-CONNECT:$LOCALHOST:$PORT,method=$method,cipher=aNULL:@SECLEVEL=0,verify=0"
- printf "test $F_n $TEST... " $N
- if [ "$method" = DTLS1 -a "$(echo -e "$OPENSSL_VERSION\n1.0.2" |sort -V |tail -n 1)" = "$OPENSSL_VERSION_GOOD" ]; then
-     $PRINTF "${YELLOW}might hang, skipping${NORMAL}\n"

socat.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Apr  6 13:34:11 UTC 2019 - Martin Hauke <mardnh@gmx.de>
+
+- 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
+
 -------------------------------------------------------------------
 Mon Sep 10 12:14:48 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
 

socat.spec

@@ -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 <pascal.bleser@opensuse.org>
 #
 # 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 @@ file descriptor (stdin etc.), the GNU line editor, a program, or a
 combination of two of these.
 
 %prep
-%setup
+%setup -q
-if pkg-config --atleast-version=1.1 openssl 
-then
-%patch0 -p1
-fi
 %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 @@ export OPTS="-t 2"
 ./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