bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update socat to 1.6.0.1 (#3654)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@11685 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2008-07-06 11:27:01 +00:00
parent 9e37cfa859
commit 5428c7d1d9
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/socat/Makefile
View File

@ -9,15 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=socat PKG_NAME:=socat
PKG_VERSION:=1.4.3.0 PKG_VERSION:=1.6.0.1
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download/ PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download/
PKG_MD5SUM:=ce574e75c2fda4456e8efd4efb86ec5e PKG_MD5SUM:=6a0dd33cde2a18eb382433aca8f76ce2
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.4
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

7
net/socat/patches/501-honor_ldflags.patch
View File

@ -1,7 +1,6 @@
diff -ruN socat-1.4-old/Makefile.in socat-1.4-new/Makefile.in --- a/Makefile.in
--- socat-1.4-old/Makefile.in 2005-09-10 22:09:11.000000000 +0200 +++ b/Makefile.in
+++ socat-1.4-new/Makefile.in 2005-10-08 17:12:45.000000000 +0200 @@ -37,7 +37,8 @@
@@ -36,7 +36,8 @@
#0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS) #0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS)
CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(CPPFLAGS) CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(CPPFLAGS)

14
net/socat/patches/502-no_sslv2.patch
View File

@ -1,6 +1,5 @@
diff -ruN socat-1.4-old/sslcls.c socat-1.4-new/sslcls.c --- a/sslcls.c
--- socat-1.4-old/sslcls.c 2005-03-12 19:06:54.000000000 +0100 +++ b/sslcls.c
+++ socat-1.4-new/sslcls.c 2006-12-18 12:26:32.000000000 +0100
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
return result; return result;
} }
@ -17,10 +16,9 @@ diff -ruN socat-1.4-old/sslcls.c socat-1.4-new/sslcls.c
SSL_METHOD *sycSSLv3_client_method(void) { SSL_METHOD *sycSSLv3_client_method(void) {
SSL_METHOD *result; SSL_METHOD *result;
diff -ruN socat-1.4-old/xio-openssl.c socat-1.4-new/xio-openssl.c --- a/xio-openssl.c
--- socat-1.4-old/xio-openssl.c 2005-09-04 11:40:45.000000000 +0200 +++ b/xio-openssl.c
+++ socat-1.4-new/xio-openssl.c 2006-12-18 12:27:17.000000000 +0100 @@ -676,9 +676,12 @@
@@ -612,9 +612,12 @@
if (!server) { if (!server) {
if (me_str != 0) { if (me_str != 0) {
@ -34,7 +32,7 @@ diff -ruN socat-1.4-old/xio-openssl.c socat-1.4-new/xio-openssl.c
method = sycSSLv3_client_method(); method = sycSSLv3_client_method();
} else if (!strcasecmp(me_str, "SSLv23") || !strcasecmp(me_str, "SSL23") || } else if (!strcasecmp(me_str, "SSLv23") || !strcasecmp(me_str, "SSL23") ||
!strcasecmp(me_str, "SSL")) { !strcasecmp(me_str, "SSL")) {
@@ -631,9 +634,12 @@ @@ -695,9 +698,12 @@
} }
} else /* server */ { } else /* server */ {
if (me_str != 0) { if (me_str != 0) {