[socat/el6] * Wed May 23 2012 Paul Wouters <pwouters at redhat.com> - 1.7.2.1-1 - Updated to 1.7.2.1 for CVE-2012-0

[Paul Wouters]

commit f6ca8a28b6b64de558c3b2fb167ebd222c1a689f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed May 23 17:57:25 2012 -0400

    * Wed May 23 2012 Paul Wouters <pwouters at redhat.com> - 1.7.2.1-1
    - Updated to 1.7.2.1 for CVE-2012-0219, rhbz#821554, rhbz#821688
    - Remove patch merged upstream
    - Remove --disable-fips from configure
    - Added socat-1.7.2.1-errqueue.patch

 .gitignore |    5 ++---
 socat.spec |   14 +++++++++++---
 sources    |    2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 530a105..944eea5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
-socat-1.6.0.1.tar.bz2
-socat-1.7.0.0.tar.bz2
-socat-1.7.1.1.tar.bz2
+socat-1.5.0.0.tar.bz2
 socat-1.7.1.2.tar.gz
 socat-1.7.1.3.tar.gz
 /socat-1.7.2.0.tar.gz
+/socat-1.7.2.1.tar.gz
diff --git a/socat.spec b/socat.spec
index f60cd1d..48036dd 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.2.0
-Release: 2%{?dist}
+Version: 1.7.2.1
+Release: 1%{?dist}
 License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.gz
+Patch1: socat-1.7.2.1-errqueue.patch
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel compat-readline5-devel ncurses-devel
@@ -23,6 +24,7 @@ The compat-readline5 library is used to avoid GPLv2 vs GPLv3 issues.
 %setup -q 
 iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8
 mv CHANGES.utf8 CHANGES
+%patch1 -p1
 
 %build
 autoconf
@@ -36,7 +38,7 @@ export CPPFLAGS="-I%{_includedir}/readline5" LDFLAGS="-L%{_libdir}/readline5"
         --enable-listen --enable-proxy --enable-exec \
         --enable-system --enable-pty --enable-readline \
         --enable-openssl --enable-sycls --enable-filan \
-        --enable-retry --enable-libwrap --disable-fips
+        --enable-retry --enable-libwrap
 
 chmod 644 *.sh
 make %{?_smp_mflags}
@@ -62,6 +64,12 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Wed May 23 2012 Paul Wouters <pwouters at redhat.com> - 1.7.2.1-1
+- Updated to 1.7.2.1 for CVE-2012-0219, rhbz#821554, rhbz#821688
+- Remove patch merged upstream
+- Remove --disable-fips from configure
+- Added socat-1.7.2.1-errqueue.patch
+
 * Mon Jan 09 2012 Paul Wouters <paul at nohats.ca> - 1.7.2.0-2
 - Bump for EVR with el5
 
diff --git a/sources b/sources
index 8d7ba00..8f16e0d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0565dd58800e4c50534c61bbb453b771  socat-1.7.2.0.tar.gz
+c807a2feb6fdd8cdbd8b075a36e8f5f4  socat-1.7.2.1.tar.gz