From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 13 Jul 2010 19:23:26 +0000 (+0200)
Subject: Add urlfilter & updateacclerator changes to core39.
X-Git-Tag: v2.9-beta1~162
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=06e92db23a1f7b70272abec56e4da73449efde18;ds=sidebyside

Add urlfilter & updateacclerator changes to core39.
Rootfile update: misc-progs.
---

diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs
index 4c4b9c7f3c..7746d03e0e 100644
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -1,6 +1,5 @@
-usr/local/bin/setaliases
-#usr/local/bin/applejuicectrl
 usr/local/bin/addonctrl
+#usr/local/bin/applejuicectrl
 usr/local/bin/backupctrl
 #usr/local/bin/clamavctrl
 usr/local/bin/dhcpctrl
@@ -20,6 +19,7 @@ usr/local/bin/qosctrl
 usr/local/bin/rebuildhosts
 usr/local/bin/redctrl
 #usr/local/bin/sambactrl
+usr/local/bin/setaliases
 usr/local/bin/setdmzholes
 usr/local/bin/setportfw
 usr/local/bin/setxtaccess
@@ -30,7 +30,9 @@ usr/local/bin/sshctrl
 usr/local/bin/syslogdctrl
 usr/local/bin/timectrl
 #usr/local/bin/tripwirectrl
+usr/local/bin/updxlratorctrl
 usr/local/bin/updxsetperms
 usr/local/bin/upnpctrl
+usr/local/bin/urlfilterctrl
 usr/local/bin/wirelessctrl
 #usr/local/bin/wlanapctrl
diff --git a/config/rootfiles/core/39/filelists/files b/config/rootfiles/core/39/filelists/files
index 227a62c5c4..505310a5fe 100644
--- a/config/rootfiles/core/39/filelists/files
+++ b/config/rootfiles/core/39/filelists/files
@@ -4,3 +4,7 @@ etc/rc.d/init.d/networking/red
 etc/rc.d/helper/getdnsfromdhcpc.pl
 srv/web/ipfire/cgi-bin/pppsetup.cgi
 usr/local/bin/backupiso
+usr/local/bin/updxlratorctrl
+usr/local/bin/urlfilterctrl
+srv/web/ipfire/cgi-bin/updatexlrator.cgi
+srv/web/ipfire/cgi-bin/urlfilter.cgi