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 <[email protected]> + +- 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 <[email protected]> # # 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 <tcpd.h> +#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 <sys/resource.h> +#ifdef WITH_LIBWRAP +#include <tcpd.h> +#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 };
