#
-# 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.
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
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
+++ /dev/null
---- 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")) {