Changeset 18703


Ignore:
Timestamp:
2009-12-08T20:42:55+01:00 (6 years ago)
Author:
florian
Message:

[package] update stunnel to 4.29 (#6324)

Location:
packages/net/stunnel
Files:
3 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • packages/net/stunnel/Makefile

    r17193 r18703  
    33 
    44PKG_NAME:=stunnel 
    5 PKG_VERSION:=4.27 
     5PKG_VERSION:=4.29 
    66PKG_RELEASE:=1 
    7 PKG_MD5SUM:=3c655d815576f50046a1c28744b88681 
     7PKG_MD5SUM:=14dc3f8412947f0548975cbce74d6863 
    88PKG_SOURCE_URL:=http://www.stunnel.org/download/stunnel/src/ 
    99PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    2727endef 
    2828 
     29define Package/stunnel/conffiles 
     30/etc/stunnel/stunnel.conf 
     31endef 
    2932 
    3033define Build/Configure 
     
    5053        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/stunnel/libstunnel.so $(1)/usr/lib/stunnel/ 
    5154        $(INSTALL_DIR) $(1)/etc/stunnel 
    52         $(INSTALL_CONF) ./files/stunnel.conf $(1)/etc/stunnel/stunnel.conf 
     55        $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/stunnel/stunnel.conf-sample $(1)/etc/stunnel/stunnel.conf 
    5356        $(INSTALL_DIR) $(1)/etc/init.d 
    5457        $(INSTALL_BIN) ./files/stunnel.init $(1)/etc/init.d/stunnel 
  • packages/net/stunnel/files/stunnel.init

    r17193 r18703  
    33 
    44START=90 
     5RUN_D=/var 
     6PID_F=$RUN_D/stunnel.pid 
    57 
    68start() { 
    79        if [ -s "/etc/stunnel/stunnel.pem" ]; then 
    810                chmod og-rwx /etc/stunnel/stunnel.pem 
    9                 stunnel 
     11                [ ! -f $PID_F ] && stunnel 
    1012        else 
    1113                [ -e /etc/stunnel/config ] && \ 
     
    1517                X509_O=${X509_O:-"openwrt.org"} 
    1618                X509_OU=${X509_OU:-"open-source firmware"} 
    17                  
     19 
    1820                [ -x /sbin/keygen ] && { 
    1921                (keygen "$X509_CN" "$X509_O" "$X509_OU" > /etc/stunnel/stunnel.pem; 
     
    2527 
    2628stop() { 
    27         killall stunnel 
    28         killall -9 stunnel 
     29        [ -f $PID_F ] && kill -9 $(cat $PID_F) && rm -f $PID_F 
    2930} 
  • packages/net/stunnel/patches/101-no-comp.patch

    r17193 r18703  
    11--- a/src/ssl.c 
    22+++ b/src/ssl.c 
    3 @@ -62,13 +62,16 @@ void ssl_init(void) { /* init SSL before 
     3@@ -63,13 +63,16 @@ void ssl_init(void) { /* init SSL before 
    44 } 
    55  
     
    1818     COMP_METHOD *cm=NULL; 
    1919     char *name="unknown"; 
    20 @@ -97,6 +100,7 @@ static void init_compression(void) { 
     20@@ -98,6 +101,7 @@ static void init_compression(void) { 
    2121         die(1); 
    2222     } 
  • packages/net/stunnel/patches/102-no-ssl2.patch

    r17193 r18703  
    11--- a/src/options.c 
    22+++ b/src/options.c 
    3 @@ -1166,8 +1166,10 @@ static char *service_options(CMD cmd, LO 
     3@@ -1198,8 +1198,10 @@ static char *service_options(CMD cmd, LO 
    44             section->client_method=(SSL_METHOD *)SSLv23_client_method(); 
    55             section->server_method=(SSL_METHOD *)SSLv23_server_method(); 
Note: See TracChangeset for help on using the changeset viewer.