- 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 <m...@elabnet.de>
--- cut ---
Index: feeds/packages/net/socat/patches/502-no_sslv2.patch
===================================================================
--- feeds/packages/net/socat/patches/502-no_sslv2.patch (Revision 31678)
+++ feeds/packages/net/socat/patches/502-no_sslv2.patch (Arbeitskopie)
@@ -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")) {
Index: feeds/packages/net/socat/Makefile
===================================================================
--- feeds/packages/net/socat/Makefile (Revision 31678)
+++ feeds/packages/net/socat/Makefile (Arbeitskopie)
@@ -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.0
+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_MD5SUM:=eb563dd00b9d39a49fb62a677fc941fe
PKG_INSTALL:=1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
