From 5bc9304b662ee0b47083c387075ee05c46600a51 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Jan 24 2015 01:56:43 +0000 Subject: - Resolves rhbz#1182005 - socat 1.7.2.4 build failure missing linux/errqueue.h --- diff --git a/socat-1.7.2.4-errqueue.patch b/socat-1.7.2.4-errqueue.patch new file mode 100644 index 0000000..8e37d8e --- /dev/null +++ b/socat-1.7.2.4-errqueue.patch @@ -0,0 +1,67 @@ +--- a/config.h.in ++++ a/config.h.in +@@ -308,6 +308,9 @@ + /* define if your struct sigaction has sa_sigaction */ + #undef HAVE_STRUCT_SIGACTION_SA_SIGACTION + ++/* define if you have struct sock_extended_err */ ++#undef HAVE_STRUCT_SOCK_EXTENDED_ERR ++ + /* Define if your struct termios has component c_ispeed */ + #undef HAVE_TERMIOS_ISPEED + +--- a/configure.in ++++ a/configure.in +@@ -80,7 +80,8 @@ 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 ]) ++AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include ++#include ]) + 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) +@@ -915,6 +916,22 @@ if test $sc_cv_type_sa_family_t = yes; then + fi + AC_MSG_RESULT($sc_cv_type_sa_family_t) + ++AC_MSG_CHECKING(for struct sock_extended_err) ++AC_CACHE_VAL(sc_cv_struct_sock_extended_err, ++[AC_TRY_COMPILE([#include ++#if TIME_WITH_SYS_TIME ++#include ++#endif ++#if HAVE_LINUX_ERRQUEUE_H ++#include ++#endif],[struct sock_extended_err s;], ++[sc_cv_struct_sock_extended_err=yes], ++[sc_cv_struct_sock_extended_err=no])]) ++if test $sc_cv_struct_sock_extended_err = yes; then ++ AC_DEFINE(HAVE_STRUCT_SOCK_EXTENDED_ERR) ++fi ++AC_MSG_RESULT($sc_cv_struct_sock_extended_err) ++ + AC_MSG_CHECKING(for struct sigaction.sa_sigaction) + AC_CACHE_VAL(sc_cv_struct_sigaction_sa_sigaction, + [AC_TRY_COMPILE([#include ],[struct sigaction s;s.sa_sigaction=0;], +--- a/xio-ip.c ++++ a/xio-ip.c +@@ -503,7 +503,7 @@ int xiolog_ancillary_ip(struct cmsghdr *cmsg, int *num, + return STAT_OK; + #endif /* defined(IP_PKTINFO) && HAVE_STRUCT_IN_PKTINFO */ + #endif /* WITH_IP4 */ +-#ifdef IP_RECVERR ++#if defined(IP_RECVERR) && HAVE_STRUCT_SOCK_EXTENDED_ERR + case IP_RECVERR: { + struct sock_extended_err *err = + (struct sock_extended_err *)CMSG_DATA(cmsg); +@@ -521,7 +521,7 @@ int xiolog_ancillary_ip(struct cmsghdr *cmsg, int *num, + err->ee_code, '\0', err->ee_info, '\0', err->ee_data); + return STAT_OK; + } +-#endif /* IP_RECVERR */ ++#endif /* defined(IP_RECVERR) && HAVE_STRUCT_SOCK_EXTENDED_ERR */ + #ifdef IP_RECVIF + case IP_RECVIF: { + /* spec in FreeBSD: /usr/include/net/if_dl.h */ diff --git a/socat.spec b/socat.spec index 1f957d4..0ed38ad 100644 --- a/socat.spec +++ b/socat.spec @@ -3,7 +3,7 @@ Summary: Bidirectional data relay between two data channels ('netcat++') Name: socat Version: 1.7.2.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Url: http://www.dest-unreach.org/%{name} Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.gz @@ -14,6 +14,7 @@ BuildRequires: autoconf kernel-headers > 2.6.18 # for make test BuildRequires: iproute net-tools coreutils procps-ng openssl iputils Patch1: socat-1.7.2.4-test.patch +Patch2: socat-1.7.2.4-errqueue.patch %description Socat is a relay for bidirectional data transfer between two independent data @@ -28,6 +29,7 @@ line editor (readline), a program, or a combination of two of these. iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8 mv CHANGES.utf8 CHANGES %patch1 -p1 +%patch2 -p1 %build %configure \ @@ -64,6 +66,9 @@ timeout 30m make test %doc %{_mandir}/man1/socat.1* %changelog +* Sat Jan 24 2015 Paul Wouters - 1.7.2.4-4 +- Resolves rhbz#1182005 - socat 1.7.2.4 build failure missing linux/errqueue.h + * Mon Aug 18 2014 Fedora Release Engineering - 1.7.2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild