diff --git a/.cvsignore b/.cvsignore index 5f0c773..103ddcb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ socat-1.6.0.1.tar.bz2 socat-1.7.0.0.tar.bz2 +socat-1.7.1.1.tar.bz2 diff --git a/socat-wall.patch b/socat-wall.patch new file mode 100644 index 0000000..a442a77 --- /dev/null +++ b/socat-wall.patch @@ -0,0 +1,29 @@ +--- /home/paul/BUILD/socat-1.7.1.1/configure.in 2009-05-06 14:09:03.000000000 -0400 ++++ configure.in 2009-05-09 09:29:03.000000000 -0400 +@@ -84,7 +84,7 @@ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB + dnl Check for hstrerror prototype + AC_MSG_CHECKING(for hstrerror prototype) + AC_CACHE_VAL(sc_cv_have_prototype_hstrerror, +-[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $CFLAGS1"; ++[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $(echo "$CFLAGS1" | sed -e 's@-Wall\>@@g')"; + AC_TRY_COMPILE([#include ],[hstrerror();], + [sc_cv_have_prototype_hstrerror=no], + [sc_cv_have_prototype_hstrerror=yes]); +@@ -1296,7 +1296,7 @@ dnl output values: 1..short, 2..unsign + dnl 5..long, 6..u-long; others not yet supported + define(AC_BASIC_TYPE,[ + AC_CACHE_CHECK(for equivalent simple type of $2, $4, +-[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $CFLAGS1" ++[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $(echo "$CFLAGS1" | sed -e 's@-Wall\>@@g')" + AC_TRY_COMPILE([$1],[$2 u; short v; &u==&v;], + [$4="1 /* short */"], + [AC_TRY_COMPILE([$1],[$2 u; unsigned short v; &u==&v;], +@@ -1328,7 +1328,7 @@ dnl arg4: output variable, values see AC + dnl arg5: cache variable (might be constructed automatically) + define(AC_TYPEOF_COMPONENT,[ + AC_CACHE_CHECK(for basic type of $2.$3, $5, +-[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $CFLAGS1" ++[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $(echo "$CFLAGS1" | sed -e 's@-Wall\>@@g')" + AC_TRY_COMPILE([$1],[$2 u;short v; &u.$3==&v;], + [$5="1 /* short */"], + [AC_TRY_COMPILE([$1],[$2 u; unsigned short v; &u.$3==&v;], diff --git a/socat.spec b/socat.spec index 2a12334..dbcfab0 100644 --- a/socat.spec +++ b/socat.spec @@ -1,10 +1,11 @@ Summary: Bidirectional data relay between two data channels ('netcat++') Name: socat -Version: 1.7.0.0 -Release: 2%{?dist} +Version: 1.7.1.1 +Release: 1%{?dist} License: GPLv2 Url: http://www.dest-unreach.org/%{name} Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2 +Patch0: socat-wall.patch Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel readline-devel ncurses-devel kernel-headers > 2.6.18 @@ -21,6 +22,7 @@ line editor (readline), a program, or a combination of two of these. %setup -q iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8 mv CHANGES.utf8 CHANGES +%patch0 %build %configure \ @@ -58,6 +60,10 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/socat.1* %changelog +* Mon May 11 2009 Paul Wouters - 1.7.1.1-1 +- Upgraded to 1.7.1.1. +- Patch for configure.in with -Wall + * Wed Feb 25 2009 Fedora Release Engineering - 1.7.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 5ee436a..cbf5bae 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ be5f942c44dafefa58365e9dc3ada81f socat-1.7.0.0.tar.bz2 +5aec1860fe15a258ddb900685d7510c1 socat-1.7.1.1.tar.bz2