- up to 1.7.2.4

diff --git a/socat-autoconf.patch b/socat-autoconf.patch
new file mode 100644 (file)
index 0000000..4baa551
--- /dev/null
+++ b/socat-autoconf.patch
@@ -0,0 +1,11 @@
+--- socat-1.7.2.4.orig/configure.in    2014-03-09 15:51:39.000000000 +0100
++++ socat-1.7.2.4/configure.in 2014-12-28 10:54:26.703953535 +0100
+@@ -80,7 +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_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include <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)

diff --git a/socat.spec b/socat.spec
index 607494b84fa56f9f2621913b70b23e6ac17fa99d..5e78778d7b2cdb3a583998a1f8beb755995b1b42 100644 (file)
--- a/socat.spec
+++ b/socat.spec
@@ -1,15 +1,16 @@
 Summary:       Multipurpose relay
 Summary(pl.UTF-8):     Przekaźnik o wielu zastosowaniach
 Name:          socat
-Version:       1.7.2.2
+Version:       1.7.2.4
 Release:       1
 License:       GPL
 Group:         Networking/Utilities
 Source0:       http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 39231e512d8052f328552865df15d42f
+# Source0-md5: 69b8155dd442a6f24e28ef5407d868eb
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.tmpfiles
+Patch0:                %{name}-autoconf.patch
 URL:           http://www.dest-unreach.org/socat/
 BuildRequires: libwrap-devel >= 7.6-30
 BuildRequires: openssl-devel >= 0.9.7d
@@ -47,9 +48,14 @@ połączeniami sieciowymi.
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e 's#-lssl#-lssl -lcrypto#g' configure*
 
 %build
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
 %configure
 %{__make}