Revision: 7329
http://sourceforge.net/p/ipcop/svn/7329
Author: owes
Date: 2014-03-14 19:14:38 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
Update fcron to 3.1.2
Modified Paths:
--------------
ipcop/trunk/config/cron/crontab
ipcop/trunk/config/rootfiles/common/fcron
ipcop/trunk/lfs/fcron
ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
ipcop/trunk/updates/2.1.3/information.xml
ipcop/trunk/updates/2.1.3/setup
Modified: ipcop/trunk/config/cron/crontab
===================================================================
--- ipcop/trunk/config/cron/crontab 2014-03-14 19:13:05 UTC (rev 7328)
+++ ipcop/trunk/config/cron/crontab 2014-03-14 19:14:38 UTC (rev 7329)
@@ -4,7 +4,7 @@
SHELL=/bin/bash
PATH=/sbin:/bin:/usr/sbin:/usr/bin
HOME=/
-!mailto()
+#!mailto()
# Log rotation
0 * * * * /usr/sbin/logrotate /etc/logrotate.conf
Modified: ipcop/trunk/config/rootfiles/common/fcron
===================================================================
--- ipcop/trunk/config/rootfiles/common/fcron 2014-03-14 19:13:05 UTC (rev
7328)
+++ ipcop/trunk/config/rootfiles/common/fcron 2014-03-14 19:14:38 UTC (rev
7329)
@@ -1,89 +1,9 @@
-## fcron-3.0.6
-##
etc/fcron.allow
etc/fcron.conf
etc/fcron.deny
usr/bin/fcronsighup
usr/bin/fcrontab
usr/sbin/fcron
-#usr/share/doc/fcron-3.0.6
-#usr/share/doc/fcron-3.0.6/en
-#usr/share/doc/fcron-3.0.6/en/HTML
-#usr/share/doc/fcron-3.0.6/en/HTML/LEGALNOTICE.html
-#usr/share/doc/fcron-3.0.6/en/HTML/changes.html
-#usr/share/doc/fcron-3.0.6/en/HTML/faq.html
-#usr/share/doc/fcron-3.0.6/en/HTML/fcron.8.html
-#usr/share/doc/fcron-3.0.6/en/HTML/fcron.conf.5.html
-#usr/share/doc/fcron-3.0.6/en/HTML/fcrondyn.1.html
-#usr/share/doc/fcron-3.0.6/en/HTML/fcrontab.1.html
-#usr/share/doc/fcron-3.0.6/en/HTML/fcrontab.5.html
-#usr/share/doc/fcron-3.0.6/en/HTML/fdl.html
-#usr/share/doc/fcron-3.0.6/en/HTML/gpl.html
-#usr/share/doc/fcron-3.0.6/en/HTML/how-and-why.html
-#usr/share/doc/fcron-3.0.6/en/HTML/index.html
-#usr/share/doc/fcron-3.0.6/en/HTML/install.html
-#usr/share/doc/fcron-3.0.6/en/HTML/manpages.html
-#usr/share/doc/fcron-3.0.6/en/HTML/readme.html
-#usr/share/doc/fcron-3.0.6/en/HTML/relnotes.html
-#usr/share/doc/fcron-3.0.6/en/HTML/thanks.html
-#usr/share/doc/fcron-3.0.6/en/HTML/todo.html
-#usr/share/doc/fcron-3.0.6/en/HTML/using-fcron.html
-#usr/share/doc/fcron-3.0.6/en/txt
-#usr/share/doc/fcron-3.0.6/en/txt/changes.txt
-#usr/share/doc/fcron-3.0.6/en/txt/faq.txt
-#usr/share/doc/fcron-3.0.6/en/txt/gpl.txt
-#usr/share/doc/fcron-3.0.6/en/txt/install.txt
-#usr/share/doc/fcron-3.0.6/en/txt/readme.txt
-#usr/share/doc/fcron-3.0.6/en/txt/relnotes.txt
-#usr/share/doc/fcron-3.0.6/en/txt/thanks.txt
-#usr/share/doc/fcron-3.0.6/en/txt/todo.txt
-#usr/share/doc/fcron-3.0.6/fr
-#usr/share/doc/fcron-3.0.6/fr/HTML
-#usr/share/doc/fcron-3.0.6/fr/HTML/LEGALNOTICE.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/changes.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/faq.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/fcron.8.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/fcron.conf.5.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/fcrondyn.1.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/fcrontab.1.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/fcrontab.5.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/fdl.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/gpl.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/how-and-why.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/index.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/install.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/manpages.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/readme.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/relnotes.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/thanks.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/todo.html
-#usr/share/doc/fcron-3.0.6/fr/HTML/using-fcron.html
-#usr/share/doc/fcron-3.0.6/fr/txt
-#usr/share/doc/fcron-3.0.6/fr/txt/changes.txt
-#usr/share/doc/fcron-3.0.6/fr/txt/faq.txt
-#usr/share/doc/fcron-3.0.6/fr/txt/gpl.txt
-#usr/share/doc/fcron-3.0.6/fr/txt/install.txt
-#usr/share/doc/fcron-3.0.6/fr/txt/readme.txt
-#usr/share/doc/fcron-3.0.6/fr/txt/relnotes.txt
-#usr/share/doc/fcron-3.0.6/fr/txt/thanks.txt
-#usr/share/doc/fcron-3.0.6/fr/txt/todo.txt
-#usr/share/man/fr
-#usr/share/man/fr/man1
-#usr/share/man/fr/man1/fcrondyn.1
-#usr/share/man/fr/man1/fcrontab.1
-#usr/share/man/fr/man3
-#usr/share/man/fr/man3/bitstring.3
-#usr/share/man/fr/man5
-#usr/share/man/fr/man5/fcron.conf.5
-#usr/share/man/fr/man5/fcrontab.5
-#usr/share/man/fr/man8
-#usr/share/man/fr/man8/fcron.8
-#usr/share/man/man1/fcrondyn.1
-#usr/share/man/man1/fcrontab.1
-#usr/share/man/man3/bitstring.3
-#usr/share/man/man5/fcron.conf.5
-#usr/share/man/man5/fcrontab.5
-#usr/share/man/man8/fcron.8
var/spool/cron
var/spool/cron/new.root
var/spool/cron/root.orig
Modified: ipcop/trunk/lfs/fcron
===================================================================
--- ipcop/trunk/lfs/fcron 2014-03-14 19:13:05 UTC (rev 7328)
+++ ipcop/trunk/lfs/fcron 2014-03-14 19:14:38 UTC (rev 7329)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = fcron
-VER = 3.0.6
+VER = 3.1.2
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 69ebcb41921e2a282f41ebecb3a27053
+$(DL_FILE)_MD5 = 36bf213e15f3a480f2274f8e46cced0a
install : $(TARGET)
@@ -89,6 +89,7 @@
cd $(DIR_APP) && ./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
+ --datarootdir=/usr/share/fcron \
--with-cflags="-Wall" \
--without-sendmail \
--with-dsssl-dir=no \
@@ -102,11 +103,15 @@
--with-boot-install=no \
--with-pam=no \
--with-selinux=no
+
cd $(DIR_APP) && make -j $(PARALLELISM)
cd $(DIR_APP) && make install
echo "root" > /etc/fcron.allow
echo "all" > /etc/fcron.deny
chmod u-s /usr/bin/fcrontab /usr/bin/fcronsighup
/usr/bin/fcrontab $(DIR_SRC)/config/cron/crontab
+
+ # drop doc & manpages
+ @rm -rf /usr/share/fcron
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
===================================================================
--- ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-14 19:13:05 UTC
(rev 7328)
+++ ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-14 19:14:38 UTC
(rev 7329)
@@ -105,6 +105,11 @@
/usr/bin/lsattr
/usr/sbin/mklost+found
##
+## fcron-3.1.2
+/usr/bin/fcronsighup
+/usr/bin/fcrontab
+/usr/sbin/fcron
+##
## freetype-2.5.3
/usr/lib/libfreetype.so.6
/usr/lib/libfreetype.so.6.11.2
Modified: ipcop/trunk/updates/2.1.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.3/information.xml 2014-03-14 19:13:05 UTC (rev
7328)
+++ ipcop/trunk/updates/2.1.3/information.xml 2014-03-14 19:14:38 UTC (rev
7329)
@@ -5,7 +5,7 @@
<size>0</size>
<isoimages>no</isoimages>
<description>Language updates.<br />
- Upgrade bind to 9.9.5, coreutils to 8.22, e2fsprogs to 1.42.9,
freetype to 2.5.3, glib to 2.38.2, gnupg to 1.4.16,
+ Upgrade bind to 9.9.5, coreutils to 8.22, e2fsprogs to 1.42.9, fcron
to 3.1.2, freetype to 2.5.3, glib to 2.38.2, gnupg to 1.4.16,
iproute2 to 3.12.0, libgcrypt to 1.6.1, libgpg-error to 1.12, libnl to
3.2.24, libpng to 1.6.10, logrotate to 3.8.7, openldap to 2.4.39,
pcre to 8.34, procps to 3.3.9, psmisc to 22.21, readline to 6.3,
sqlite to 3.8.3.1,
squid-langpack to 20140220, tzdata to 2014a, ulogd to 2.0.3,
util-linux to 2.24.1.</description>
Modified: ipcop/trunk/updates/2.1.3/setup
===================================================================
--- ipcop/trunk/updates/2.1.3/setup 2014-03-14 19:13:05 UTC (rev 7328)
+++ ipcop/trunk/updates/2.1.3/setup 2014-03-14 19:14:38 UTC (rev 7329)
@@ -34,8 +34,12 @@
#
#####
+# Patch fcrontab for new version
+if [ $(grep '^!mailto()' /var/spool/cron/root.orig) ]; then
+ sed -i -e 's|!mailto.*|#!mailto()|g' /var/spool/cron/root.orig
+ /usr/bin/fcrontab -z
+fi
-
#####
#
# End of version specific handling. Continue with universal stuff.
@@ -135,6 +139,16 @@
# Cannot unpack to symlinked /var/log on FLASH installation, so copy here
cp /var/ipcop/traffic/empty-ulogd.db /var/log/traffic/ulogd.db
+# Restart fcrond to activate new version
+/usr/bin/killall fcron
+# We need a small pause to give fcron time to stop
+sleep 1
+if [ -e /etc/FLASH ]; then
+ /usr/sbin/fcron -s 86400
+else
+ /usr/sbin/fcron
+fi
+
#####
#
# End of version specific handling. Continue with universal stuff.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
