From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Dec 2013 10:29:10 +0000 (+0100)
Subject: sslh: Move binary to /usr/sbin.
X-Git-Tag: v2.15-beta1~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0206795e57d0b0f0caabec7de4efe54fff1bc6b5;p=people%2Fms%2Fipfire-2.x.git

sslh: Move binary to /usr/sbin.
---

diff --git a/config/rootfiles/packages/sslh b/config/rootfiles/packages/sslh
index c52d15676b..2c67aad3ad 100644
--- 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 e6f2cebce2..f4201c3352 100644
--- 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 0dae1dcff9..43e58f392b 100644
--- a/src/initscripts/init.d/sslh
+++ b/src/initscripts/init.d/sslh
@@ -20,14 +20,14 @@ case "$1" in
 			exit 1
 		fi
 
-		loadproc /usr/local/bin/sslh -u nobody \
+		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
 		;;
 
@@ -38,7 +38,7 @@ case "$1" in
 		;;
 
 	status)
-		statusproc /usr/local/bin/sslh
+		statusproc /usr/sbin/sslh
 		;;
 
 	*)