Merge branch 'ipsec' into next

[ipfire-2.x.git] / lfs / sslh

diff --git a/lfs/sslh b/lfs/sslh
index 7454a6d78e64a658ff65720a08b8b77485a52a1d..100cec0659f54b8a303eabfd00f1ef78aedac1fb 100644 (file)
--- a/lfs/sslh
+++ b/lfs/sslh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.6g
+VER        = 1.7a
 
 THISAPP    = sslh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sslh
-PAK_VER    = 1
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dc27a0fbcc9b3e434c203df7bc3c283a
+$(DL_FILE)_MD5 = ee124654412198a5e11fe28acf10634d
 
 install : $(TARGET)
 
@@ -77,7 +77,11 @@ $(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) USELIBWRAP=
+       cd $(DIR_APP) && install -v -m 755 sslh /usr/sbin
+
+       #install initscripts
+       $(call INSTALL_INITSCRIPT,sslh)
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)