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

[packages] sslh: update to v1.7a (#6631)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@19506 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-02-03 21:47:22 +00:00
parent a4aadc2469
commit d2f668216a
3 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/sslh/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2009 OpenWrt.org # Copyright (C) 2009-2010 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=sslh PKG_NAME:=sslh
PKG_VERSION:=1.6i PKG_VERSION:=1.7a
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://rutschle.net/tech/ PKG_SOURCE_URL:=http://rutschle.net/tech/
PKG_MD5SUM:=b2e0a207df885d7be57713449edae815 PKG_MD5SUM:=ee124654412198a5e11fe28acf10634d
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

17
net/sslh/files/sslh.init
View File

@ -1,5 +1,5 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (C) 2009 OpenWrt.org # Copyright (C) 2009-2010 OpenWrt.org
NAME=sslh NAME=sslh
PROG=/usr/sbin/sslh PROG=/usr/sbin/sslh
@ -60,7 +60,7 @@ stop()
# killing all server processes # killing all server processes
for pidfile in `ls /var/run/${NAME}.*.pid` for pidfile in `ls /var/run/${NAME}.*.pid`
do do
start-stop-daemon -K -s KILL -p "${pidfile}" -n "${NAME}" >/dev/null start-stop-daemon -q -K -s KILL -p "${pidfile}" -n "${NAME}"
[ $? -ne 0 ] && rc=1 [ $? -ne 0 ] && rc=1
rm -f "${pidfile}" rm -f "${pidfile}"
done done
@ -103,12 +103,10 @@ killclients()
server=`echo ${connection} | cut -d ' ' -f 7 | cut -d '/' -f 1` server=`echo ${connection} | cut -d ' ' -f 7 | cut -d '/' -f 1`
# check if client connection # check if client connection
ps | grep -e "^[ ]*${server} " | grep -e "${PROG}" >/dev/null grep -F -q -e "${PROG}" "/proc/${server}/cmdline" && {
if [ $? -eq 0 ]
then
append ignore "${server}" append ignore "${server}"
break break
fi }
done done
# get all server pids that should be ignored # get all server pids that should be ignored
@ -121,9 +119,10 @@ killclients()
local skip local skip
for pid in `pidof "${NAME}"` for pid in `pidof "${NAME}"`
do do
# check if correct program # check if correct program, otherwise process next pid
ps | grep -e "^[ ]*${pid} " | grep -e "${PROG}" >/dev/null grep -F -q -e "${PROG}" "/proc/${pid}/cmdline" || {
[ $? -ne 0 ] && continue continue
}
# check if pid should be ignored (servers, ourself) # check if pid should be ignored (servers, ourself)
skip=0 skip=0

10
net/sslh/patches/002-fork_fix.patch
View File

@ -1,10 +0,0 @@
--- a/sslh.c
+++ b/sslh.c
@@ -469,6 +469,7 @@
if (!fork())
{
+ close(listen_socket);
start_shoveler(in_socket);
exit(0);
}