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

[package] update stunnel to 4.27 (#5650)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@17193 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2009-08-09 10:44:52 +00:00
parent 109bd4846d
commit 8d4c64b799
5 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/stunnel/Makefile
View File

@ -2,9 +2,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=stunnel PKG_NAME:=stunnel
PKG_VERSION:=4.25 PKG_VERSION:=4.27
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=7f00799f43910c0362df0e69c65965aa PKG_MD5SUM:=3c655d815576f50046a1c28744b88681
PKG_SOURCE_URL:=http://www.stunnel.org/download/stunnel/src/ PKG_SOURCE_URL:=http://www.stunnel.org/download/stunnel/src/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -47,7 +47,7 @@ define Package/stunnel/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/stunnel $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/stunnel $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/lib/stunnel $(INSTALL_DIR) $(1)/usr/lib/stunnel
$(CP) $(PKG_INSTALL_DIR)/usr/lib/stunnel/libstunnel.so $(1)/usr/lib/stunnel/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/stunnel/libstunnel.so $(1)/usr/lib/stunnel/
$(INSTALL_DIR) $(1)/etc/stunnel $(INSTALL_DIR) $(1)/etc/stunnel
$(INSTALL_CONF) ./files/stunnel.conf $(1)/etc/stunnel/stunnel.conf $(INSTALL_CONF) ./files/stunnel.conf $(1)/etc/stunnel/stunnel.conf
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d

11
net/stunnel/files/stunnel.init
View File

@ -3,8 +3,7 @@
START=90 START=90
case "$1" in start() {
start|boot)
if [ -s "/etc/stunnel/stunnel.pem" ]; then if [ -s "/etc/stunnel/stunnel.pem" ]; then
chmod og-rwx /etc/stunnel/stunnel.pem chmod og-rwx /etc/stunnel/stunnel.pem
stunnel stunnel
@ -22,9 +21,9 @@ case "$1" in
stunnel) & stunnel) &
} }
fi fi
;; }
stop)
stop() {
killall stunnel killall stunnel
killall -9 stunnel killall -9 stunnel
;; }
esac

4
net/stunnel/patches/100-cross-compile.patch
View File

@ -1,6 +1,6 @@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -20898,56 +20898,56 @@ @@ -21536,56 +21536,56 @@ _ACEOF
fi fi
rm -f conftest* rm -f conftest*
@ -100,7 +100,7 @@
{ echo "$as_me:$LINENO: **************************************** entropy" >&5 { echo "$as_me:$LINENO: **************************************** entropy" >&5
@@ -23394,8 +23394,8 @@ @@ -24033,8 +24033,8 @@ _ACEOF
# Add SSL includes and libraries # Add SSL includes and libraries

4
net/stunnel/patches/101-no-comp.patch
View File

@ -1,6 +1,6 @@
--- a/src/ssl.c --- a/src/ssl.c
+++ b/src/ssl.c +++ b/src/ssl.c
@@ -62,13 +62,16 @@ @@ -62,13 +62,16 @@ void ssl_init(void) { /* init SSL before
} }
void ssl_configure(void) { /* configure global SSL settings */ void ssl_configure(void) { /* configure global SSL settings */
@ -17,7 +17,7 @@
int id=0; int id=0;
COMP_METHOD *cm=NULL; COMP_METHOD *cm=NULL;
char *name="unknown"; char *name="unknown";
@@ -97,6 +100,7 @@ @@ -97,6 +100,7 @@ static void init_compression(void) {
die(1); die(1);
} }
s_log(LOG_INFO, "Compression enabled using %s method", name); s_log(LOG_INFO, "Compression enabled using %s method", name);

14
net/stunnel/patches/102-no-ssl2.patch
View File

@ -1,13 +1,13 @@
--- a/src/options.c --- a/src/options.c
+++ b/src/options.c +++ b/src/options.c
@@ -1127,8 +1127,10 @@ @@ -1166,8 +1166,10 @@ static char *service_options(CMD cmd, LO
section->client_method=SSLv23_client_method; section->client_method=(SSL_METHOD *)SSLv23_client_method();
section->server_method=SSLv23_server_method; section->server_method=(SSL_METHOD *)SSLv23_server_method();
} else if(!strcasecmp(arg, "SSLv2")) { } else if(!strcasecmp(arg, "SSLv2")) {
+#ifndef OPENSSL_NO_SSL2 +#ifndef OPENSSL_NO_SSL2
section->client_method=SSLv2_client_method; section->client_method=(SSL_METHOD *)SSLv2_client_method();
section->server_method=SSLv2_server_method; section->server_method=(SSL_METHOD *)SSLv2_server_method();
+#endif +#endif
} else if(!strcasecmp(arg, "SSLv3")) { } else if(!strcasecmp(arg, "SSLv3")) {
section->client_method=SSLv3_client_method; section->client_method=(SSL_METHOD *)SSLv3_client_method();
section->server_method=SSLv3_server_method; section->server_method=(SSL_METHOD *)SSLv3_server_method();