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 4c4b9c7f3cc895f4f86646adef2b4efd5b00eb36..7746d03e0e5439bfbbd633c3a54bde1d5863544a 100644 (file)
--- 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/addonctrl

+#usr/local/bin/applejuicectrl

 usr/local/bin/backupctrl
 #usr/local/bin/clamavctrl
 usr/local/bin/dhcpctrl
 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/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
 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/syslogdctrl
 usr/local/bin/timectrl
 #usr/local/bin/tripwirectrl

+usr/local/bin/updxlratorctrl

 usr/local/bin/updxsetperms
 usr/local/bin/upnpctrl
 usr/local/bin/updxsetperms
 usr/local/bin/upnpctrl

+usr/local/bin/urlfilterctrl

 usr/local/bin/wirelessctrl
 #usr/local/bin/wlanapctrl
 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 227a62c5c42df72e7297111826a3341638bc9a2d..505310a5fec16a3478b0041ae2a9ab16bba4d876 100644 (file)
--- 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
 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