X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ffcron;h=8e39dc6be8c422e0f43f814828661d5e2b391dd2;hp=2a6d4934f05ff947bdd9eefe2f6abb497d8a456a;hb=9f52e35066b3fa8603e85784b7ede0532afc66e6;hpb=7b9e5f10cc3982177abffece56f14a7149d82e60

diff --git a/lfs/fcron b/lfs/fcron
index 2a6d4934f0..8e39dc6be8 100644
--- a/lfs/fcron
+++ b/lfs/fcron
@@ -1,22 +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>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 3.0.1
+VER        = 3.2.0
 
 THISAPP    = fcron-$(VER)
 DL_FILE    = $(THISAPP).src.tar.gz
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8e5dcb3a646c11294294895954ef0a48
+$(DL_FILE)_MD5 = 4b031c2fba32a98fa814d1557158b0e9
 
 install : $(TARGET)
 
@@ -72,20 +70,22 @@ $(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) && ./configure	\
-	    --prefix=/usr			\
-	    --disable-nls			\
-	    --without-sendmail		\
-	    --with-spooldir=/var/spool/cron 	\
-	    --with-fifodir=/var/run	 	\
-	    --with-username=cron		\
-	    --with-groupname=cron		\
-	    --with-run-non-privileged=no	\
-	    --with-fcrondyn=no		\
-	    --with-sysfcrontab=no		\
-	    --with-boot-install=no		\
-	    --with-pam=no			\
-	    --with-selinux=no
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--without-sendmail \
+		--with-spooldir=/var/spool/cron \
+		--with-fifodir=/var/run \
+		--with-piddir=/var/run \
+		--sysconfdir=/etc \
+		--with-username=cron \
+		--with-groupname=cron \
+		--with-run-non-privileged=no \
+		--with-fcrondyn=no \
+		--with-sysfcrontab=no \
+		--with-boot-install=no \
+		--with-pam=no \
+		--with-selinux=no
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	echo "root" > /etc/fcron.allow
@@ -93,8 +93,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	chmod u-s /usr/bin/fcrontab /usr/bin/fcronsighup
 	mkdir -p /etc/fcron.minutely /etc/fcron.cyclic /etc/fcron.hourly \
 		/etc/fcron.daily /etc/fcron.weekly /etc/fcron.monthly
-	cp -vf $(DIR_CONF)/cron/minutely/* /etc/fcron.minutely
-	chmod -v 755 /etc/fcron.minutely/*
+
+	#Create Placeholder files
+	echo "Place scripts run minutely here ..." > /etc/fcron.minutely/info.txt
+	echo "Place scripts run cyclic here ..." > /etc/fcron.cyclic/info.txt 
+	echo "Place scripts run hourly here ..." > /etc/fcron.hourly/info.txt
+	echo "Place scripts run daily here ..." > /etc/fcron.daily/info.txt
+	echo "Place scripts run weekly here ..." > /etc/fcron.weekly/info.txt
+	echo "Place scripts run monthly here ..." > /etc/fcron.monthly/info.txt
+
+	chmod 640 /etc/fcron.{conf,allow,deny}
 	/usr/bin/fcrontab $(DIR_SRC)/config/cron/crontab
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)