X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fstunnel;h=d23196a33cbc4887bc29805f5739373b901a1c43;hb=6104f2e816a215540fd3b08fbba2fd90af59a798;hp=ede05278b3032d6b3a9d14db681d7dbced546a30;hpb=a20e696311dec49d4f5c5e6715a3ece554a76f86;p=ipfire-2.x.git

diff --git a/lfs/stunnel b/lfs/stunnel
index ede05278b3..d23196a33c 100644
--- a/lfs/stunnel
+++ b/lfs/stunnel
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,13 +24,17 @@
 
 include Config
 
-VER        = 4.15
+VER        = 5.44
 
 THISAPP    = stunnel-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://stunnel.mirt.net/stunnel
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = stunnel
+PAK_VER    = 4
+
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -48,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2c00153ad099a5f9c5609e8d1dbbe470
+$(DL_FILE)_MD5 = 47697dee496c80c8e352b2b705c4a571
 
 install : $(TARGET)
 
@@ -59,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	make-packages.sh stunnel $(THISAPP)
+	@$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -81,19 +77,29 @@ $(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) && install -v -m 1770 -o stunnel -g stunnel -d /var/lib/stunnel/run
-	cd $(DIR_APP) && sed -i -e 's|nogroup|stunnel|' -e 's|$(prefix)/var/lib|$(localstatedir)|' tools/Makefile.in
-	cd $(DIR_APP) && sed -i 's|doc/stunnel|&-$(VERSION)|' {,doc/,tools/}Makefile.in
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-libwrap
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	echo "# File: /etc/stunnel/stunnel.conf" 	> /etc/stunnel/stunnel.conf
-	echo "" 					>> /etc/stunnel/stunnel.conf
-	echo "pid = /run/stunnel.pid" 		>> /etc/stunnel/stunnel.conf
-	echo "chroot = /var/lib/stunnel" 		>> /etc/stunnel/stunnel.conf
-	echo "client = no" 				>> /etc/stunnel/stunnel.conf
-	echo "setuid = stunnel" 			>> /etc/stunnel/stunnel.conf
-	echo "setgid = stunnel" 			>> /etc/stunnel/stunnel.conf
-	chmod -v 644 /etc/stunnel/stunnel.conf
+
+	# Create secure directory
+	install -v -m750 -o stunnel -g stunnel -d /var/lib/stunnel/run
+	chown -v stunnel:stunnel /var/lib/stunnel
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,stunnel)
+
+
+	# Install default configuration
+	-mkdir -pv /etc/stunnel
+	install -v -m 644 $(DIR_SRC)/config/stunnel/stunnel.conf \
+		/etc/stunnel
+
+	# Install backup include
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/stunnel \
+		/var/ipfire/backup/addons/includes
+
 	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
\ No newline at end of file
+	@$(POSTBUILD)