From bf6aa9a4055111856df55b0d2629d3924eb5a6b8 Mon Sep 17 00:00:00 2001
From: Stephen Walker <stephendwalker@gmail.com>
Date: Sat, 19 May 2012 20:55:02 +0000
Subject: [PATCH] socat: update to 1.7.2.1 (CVE-2012-0219), use
 CONFIGURE_{ARGS,VARS}

- Update socat to 1.7.2.0
(main reason: avoids compile-error against kernel 3.3.5 with ext2_fs.h which seems to got removed/changed to not being used from userspace from current kernel)
- remove 502-no_sslv2.patch which doesn't apply surely and looks quite outdated to me, socat isn't linked against *ssl* anyway, compiles and works fine, verified on ar71xx

Michael

Signed-off-by: Michael Markstaller <mm@elabnet.de>

SVN-Revision: 31818
---
 net/socat/Makefile                        | 34 ++++++++--------
 net/socat/patches/501-honor_ldflags.patch |  2 +-
 net/socat/patches/502-no_sslv2.patch      | 48 -----------------------
 3 files changed, 17 insertions(+), 67 deletions(-)
 delete mode 100644 net/socat/patches/502-no_sslv2.patch

diff --git a/net/socat/Makefile b/net/socat/Makefile
index 009da5ea9..ae8d55b2e 100644
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=socat
-PKG_VERSION:=1.7.1.3
-PKG_RELEASE:=2
+PKG_VERSION:=1.7.2.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download/
-PKG_MD5SUM:=2081987fb0cb0290b8105574058cb329
+PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download
+PKG_MD5SUM:=7ddfea7e9e85f868670f94d3ea08358b
 
 PKG_INSTALL:=1
 
@@ -36,19 +36,17 @@ define Package/socat/description
 	many more options.
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-libwrap \
-		--disable-readline \
-		--disable-openssl \
-		--enable-termios \
-		, \
-		sc_cv_termios_ispeed="no" \
-		sc_cv_sys_crdly_shift=9 \
-		sc_cv_sys_tabdly_shift=11 \
-		sc_cv_sys_csize_shift=4 \
-	)
-endef
+CONFIGURE_ARGS += \
+	--disable-libwrap \
+	--disable-readline \
+	--disable-openssl \
+	--enable-termios
+
+CONFIGURE_VARS += \
+	sc_cv_termios_ispeed="no" \
+	sc_cv_sys_crdly_shift=9 \
+	sc_cv_sys_tabdly_shift=11 \
+	sc_cv_sys_csize_shift=4
 
 define Package/socat/install
 	$(INSTALL_DIR) $(1)/usr/bin
diff --git a/net/socat/patches/501-honor_ldflags.patch b/net/socat/patches/501-honor_ldflags.patch
index a8eee612e..0dbc77389 100644
--- a/net/socat/patches/501-honor_ldflags.patch
+++ b/net/socat/patches/501-honor_ldflags.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -37,7 +37,8 @@
+@@ -38,7 +38,8 @@ INSTALL = @INSTALL@
  
  #0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS)
  CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(CPPFLAGS)
diff --git a/net/socat/patches/502-no_sslv2.patch b/net/socat/patches/502-no_sslv2.patch
deleted file mode 100644
index ea6be1344..000000000
--- a/net/socat/patches/502-no_sslv2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/sslcls.c
-+++ b/sslcls.c
-@@ -35,6 +35,7 @@
-    return result;
- }
- 
-+#ifndef OPENSSL_NO_SSL2
- SSL_METHOD *sycSSLv2_client_method(void) {
-    SSL_METHOD *result;
-    Debug("SSLv2_client_method()");
-@@ -50,6 +51,7 @@
-    Debug1("SSLv2_server_method() -> %p", result);
-    return result;
- }
-+#endif
- 
- SSL_METHOD *sycSSLv3_client_method(void) {
-    SSL_METHOD *result;
---- a/xio-openssl.c
-+++ b/xio-openssl.c
-@@ -676,9 +676,12 @@
- 
-    if (!server) {
-       if (me_str != 0) {
-+#ifndef OPENSSL_NO_SSL2
- 	 if (!strcasecmp(me_str, "SSLv2") || !strcasecmp(me_str, "SSL2")) {
- 	    method = sycSSLv2_client_method();
--	 } else if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
-+	 } else
-+#endif
-+	 if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
- 	    method = sycSSLv3_client_method();
- 	 } else if (!strcasecmp(me_str, "SSLv23") || !strcasecmp(me_str, "SSL23") ||
- 		    !strcasecmp(me_str, "SSL")) {
-@@ -695,9 +698,12 @@
-       }
-    } else /* server */ {
-       if (me_str != 0) {
-+#ifndef OPENSSL_NO_SSL2
- 	 if (!strcasecmp(me_str, "SSLv2") || !strcasecmp(me_str, "SSL2")) {
- 	    method = sycSSLv2_server_method();
--	 } else if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
-+	 } else
-+#endif
-+	 if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
- 	    method = sycSSLv3_server_method();
- 	 } else if (!strcasecmp(me_str, "SSLv23") || !strcasecmp(me_str, "SSL23") ||
- 		    !strcasecmp(me_str, "SSL")) {
-- 
2.30.2