pool/socat
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 487180 from home:rudi_m:ul-all

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/487180
OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=38
This commit is contained in:
Marcus Meissner 2017-04-12 13:52:15 +00:00 committed by Git OBS Bridge
parent 92fdf0bddb
commit 853f2497fd
5 changed files with 15 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
fix-linux-errqueue.h-not-found.patch
View File

@ -1,75 +0,0 @@
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.jia@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
@@ -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 <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)
Index: socat-1.7.2.4/configure
===================================================================
--- socat-1.7.2.4.orig/configure
+++ socat-1.7.2.4/configure
@@ -3980,27 +3980,19 @@
done
-for ac_header in linux/types.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 :
+ 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"\" = x"yes"; 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 <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
-
-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`

3
socat-1.7.3.1.tar.bz2
View File

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

3
socat-1.7.3.2.tar.bz2 Normal file
View File

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

11
socat.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Apr 10 14:56:19 UTC 2017 - sweet_f_a@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
-------------------------------------------------------------------
Tue Feb 2 12:19:40 UTC 2016 - sweet_f_a@gmx.de

4
socat.spec
View File

@ -35,7 +35,7 @@ BuildRequires: net-tools
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 @@ 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
Source1: %{name}.changes
Patch2: fix-linux-errqueue.h-not-found.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -56,7 +55,6 @@ combination of two of these.
%prep
%setup
%patch2 -p1
%build
# export deterministic BUILD_DATE, format like "__DATE__ __TIME__"