Merge branch 'openssl-update' into fifteen

diff --git a/config/rootfiles/core/fifteen/update.sh b/config/rootfiles/core/fifteen/update.sh
index 53c9f06e3ef69b8d4f690b2a42a4c7f5755152f8..34cc9137e843310083c4a5f071c5bd120f5e0144 100644 (file)
--- a/config/rootfiles/core/fifteen/update.sh
+++ b/config/rootfiles/core/fifteen/update.sh
@@ -49,13 +49,18 @@ rm -f /etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
 rm -f /etc/rc.d/init.d/networking/red.up/25-portfw
 rm -f /etc/rc.d/init.d/networking/red.up/26-xtaccess
 
+# Remove old firewallscripts
+rm -f /usr/local/bin/setportfw
+rm -f /usr/local/bin/setdmzholes
+rm -f /usr/local/bin/setxtaccess
+rm -f /usr/local/bin/outgoingfwctrl
+
 # Remove old CGI files
 rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
 
 # Generate chains for new firewall
 /sbin/iptables -N INPUTFW
 /sbin/iptables -N FORWARDFW
-/sbin/iptables -N OUTGOINGFW
 /sbin/iptables -N POLICYFWD
 /sbin/iptables -N POLICYIN
 /sbin/iptables -N POLICYOUT

diff --git a/config/rootfiles/packages/sslh b/config/rootfiles/packages/sslh
index c52d15676bf3c5e52cc84fb3e83a4c37a6023f00..2c67aad3ad18a4aa820e9d409047d59b29ca9ca9 100644 (file)
--- a/config/rootfiles/packages/sslh
+++ b/config/rootfiles/packages/sslh
@@ -1,4 +1,2 @@
-usr/local/sbin/sslh
-#usr/local/share/man/man8/sslh.8.gz
 etc/rc.d/init.d/sslh
-#usr/local/bin/sslh
+usr/sbin/sslh

diff --git a/lfs/sslh b/lfs/sslh
index e6f2cebce204d9a4311c43fc741a15e38a1b28ca..f4201c33526cd8d87e1457e50814225887b27e21 100644 (file)
--- a/lfs/sslh
+++ b/lfs/sslh
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sslh
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""
 
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make install
-       cp $(DIR_APP)/sslh /usr/local/bin
+       cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING)
+       cd $(DIR_APP) && install -v -m 755 sslh /usr/sbin
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/initscripts/init.d/sslh b/src/initscripts/init.d/sslh
index 9c15213b8f85417b2941204e00cc327da3b42062..43e58f392b79a18bc9288d2775df28d7c3148dbd 100644 (file)
--- a/src/initscripts/init.d/sslh
+++ b/src/initscripts/init.d/sslh
@@ -4,29 +4,30 @@
 # Based on sysklogd script from LFS-3.1 and earlier.
 # Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
 
-#$LastChangedBy: bdubbs $
-#$Date: 2006-09-10 19:41:47 -0500 (Sun, 10 Sep 2006) $
-
 . /etc/sysconfig/rc
 . $rc_functions
 
 case "$1" in
        start)
                boot_mesg "Starting SSLH Deamon..."
-               loadproc /usr/local/bin/sslh -u nobody -p `cat /var/ipfire/red/local-ipaddress`:443 -s localhost:222 -l localhost:444
-               evaluate_retval
 
-               if ! grep -q "443:443" /var/ipfire/xtaccess/config ; then
-                       echo "tcp,0.0.0.0/0,443:443,on,0.0.0.0,SSLH" >> /var/ipfire/xtaccess/config
-                       /usr/local/bin/setxtaccess
+               LOCAL_IP_ADDRESS="$(</var/ipfire/red/local-ipaddress)"
+               if [ -z "${LOCAL_IP_ADDRESS}" ]; then
+                       echo_failure
+                       boot_mesg -n "FAILURE:\n\nCould not determine" ${FAILURE}
+                       boot_mesg -n " your external IP address."
+                       boot_mesg "" ${NORMAL}
+                       exit 1
                fi
 
-               
+               loadproc /usr/sbin/sslh -u nobody \
+                       -p "${LOCAL_IP_ADDRESS}:443" -s localhost:222 -l localhost:444
+               evaluate_retval
                ;;
 
        stop)
                boot_mesg "Stopping SSLH Deamon..."
-               killproc /usr/local/bin/sslh
+               killproc /usr/sbin/sslh
                evaluate_retval
                ;;
 
@@ -37,7 +38,7 @@ case "$1" in
                ;;
 
        status)
-               statusproc /usr/local/bin/sslh
+               statusproc /usr/sbin/sslh
                ;;
 
        *)