Changeset 28331


Ignore:
Timestamp:
2011-09-30T14:49:09+02:00 (6 years ago)
Author:
florian
Message:

[package] sslh: update to 1.9

his patch bumps the sslh package to v1.9.

This update brings about some useful changes, including:

  • Multiple bind address support
  • IPv6 support
  • OpenVPN support
  • tinc VPN support

Tested and working on ar71xx.

Signed-off-by: Jonathan McCrohan <jmccrohan@…>

Location:
packages/net/sslh
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • packages/net/sslh/Makefile

    r27625 r28331  
    99 
    1010PKG_NAME:=sslh 
    11 PKG_VERSION:=1.7a 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=1.9 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=http://rutschle.net/tech/ 
    16 PKG_MD5SUM:=ee124654412198a5e11fe28acf10634d 
     16PKG_MD5SUM:=1c0193853ef35f80e3e4b1a744832cd1 
    1717 
    1818include $(INCLUDE_DIR)/package.mk 
     
    4141define Package/sslh/install 
    4242        $(INSTALL_DIR) $(1)/usr/sbin 
    43         $(INSTALL_BIN) $(PKG_BUILD_DIR)/sslh $(1)/usr/sbin/ 
     43        $(INSTALL_BIN) $(PKG_BUILD_DIR)/sslh-fork $(1)/usr/sbin/sslh 
    4444        $(INSTALL_DIR) $(1)/etc/init.d/ 
    4545        $(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) 
  • packages/net/sslh/files/sslh.config

    r27624 r28331  
    55        option 'enable' '1' 
    66        # listen defaults to '0.0.0.0:443' (all interfaces) 
     7        # multiple -p arguments may be supplied using a uci list 
    78        # -p <listenaddr>:<listenport> 
    89        option 'listen' '' 
    910        # ssh defaults to 'localhost:22' 
    10         # -s <sshhost>:<sshport> 
     11        # --ssh <sshhost>:<sshport> 
    1112        option 'ssh' '' 
    1213        # ssl defaults to 'localhost:443' 
    13         # -l <sslhost>:<sslport> 
     14        # --ssl <sslhost>:<sslport> 
    1415        option 'ssl' '' 
     16        # openvpn defaults to 'localhost:1194' 
     17        # --openvpn <openvpnhost>:<openvpnport> 
     18        option 'openvpn' '' 
     19        # tinc defaults to 'localhost:655' 
     20        # --tinc <tinchost>:<tincport> 
     21        option 'tinc' '' 
    1522        # timeout (for ssh, then ssl is assumed) defaults to 2 
    1623        # -t 
  • packages/net/sslh/files/sslh.init

    r19506 r28331  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2009-2010 OpenWrt.org 
     2# Copyright (C) 2009-2011 OpenWrt.org 
    33 
    44NAME=sslh 
     
    2525        local val 
    2626        # A) listen parameter 
    27         config_get val "${section}" listen 
    28         [ -n "${val}" ] && append args "-p ${val}" 
     27        config_get vals "${section}" listen 
     28        [ -n "${vals}" ] && for val in $vals; do append args "-p ${val}"; done 
    2929        # B) ssh parameter 
    3030        config_get val "${section}" ssh 
    31         [ -n "${val}" ] && append args "-s ${val}" 
     31        [ -n "${val}" ] && append args "--ssh ${val}" 
    3232        # C) ssl parameter 
    3333        config_get val "${section}" ssl 
    34         [ -n "${val}" ] && append args "-l ${val}" 
    35         # D) timeout (for ssh, then ssl is assumed) 
     34        [ -n "${val}" ] && append args "--ssl ${val}" 
     35        # D) openvpn parameter 
     36        config_get val "${section}" openvpn 
     37        [ -n "${val}" ] && append args "--openvpn ${val}" 
     38        # E) tinc parameter 
     39        config_get val "${section}" tinc 
     40        [ -n "${val}" ] && append args "--tinc ${val}" 
     41        # F) timeout (before a connection is considered to be SSH) 
    3642        config_get val "${section}" timeout 
    3743        [ -n "${val}" ] && append args "-t ${val}" 
    38         # E) verbose parameter 
     44        # G) verbose parameter 
    3945        local verbosed 
    4046        config_get_bool verbosed "${section}" verbose 0 
  • packages/net/sslh/patches/001-no_strip.patch

    r14955 r28331  
    1 --- a/Makefile 
    2 +++ b/Makefile 
    3 @@ -24,7 +24,6 @@ all: sslh $(MAN) 
    4   
    5  sslh: sslh.c Makefile 
    6         $(CC) $(CFLAGS) -D'VERSION=$(VERSION)' -o sslh sslh.c $(LIBS) 
    7 -       strip sslh 
    8   
    9  $(MAN): sslh.pod Makefile 
    10         pod2man --section=8 --release=$(VERSION) --center=" " sslh.pod | gzip -9 - > $(MAN) 
Note: See TracChangeset for help on using the changeset viewer.