Fixed urlfilter settings file missing

diff --git a/config/rootfiles/common/oldcore14 b/config/rootfiles/common/oldcore14
index 544126cecbd74ccb1627a5962059242251ff3695..84d71eb3cbe8049b474408692c45612470ce970d 100644 (file)
--- a/config/rootfiles/common/oldcore14
+++ b/config/rootfiles/common/oldcore14
@@ -3,7 +3,7 @@ etc/squid
 usr/lib/squid
 usr/sbin/squid
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
-srv/web/ipfire/html/images/updxl-src-avg.gif
+#srv/web/ipfire/html/images/updxl-src-avg.gif
 usr/sbin/updxlrator
 srv/web/ipfire/html/images/audio-volume-high.png
 srv/web/ipfire/html/images/audio-volume-low.png

diff --git a/config/rootfiles/common/squidguard b/config/rootfiles/common/squidguard
index 5ce49c1eae488e456944c55a4947de26ae06b2ca..effa5078182a011a0ee610d73b6e3872890517b1 100644 (file)
--- a/config/rootfiles/common/squidguard
+++ b/config/rootfiles/common/squidguard
@@ -10,6 +10,7 @@ var/ipfire/urlfilter/autoupdate/cron.weekly
 var/ipfire/urlfilter/bin/autoupdate.pl
 var/ipfire/urlfilter/bin/prebuild.pl
 var/ipfire/urlfilter/blacklists
+var/ipfire/urlfilter/settings
 #var/ipfire/urlfilter/blacklists/README
 #var/ipfire/urlfilter/blacklists/ads
 #var/ipfire/urlfilter/blacklists/ads/domains

diff --git a/config/rootfiles/core/17/files b/config/rootfiles/core/17/files
index c59e11d94bdc2e1e94ee29d1ba11609e3d945598..b5fff59ee88f058555ebb9d30849f7915e43f644 100644 (file)
--- a/config/rootfiles/core/17/files
+++ b/config/rootfiles/core/17/files
@@ -6,7 +6,7 @@ bin/ntfs-3g
 lib/libntfs-3g.so
 lib/libntfs-3g.so.36
 lib/libntfs-3g.so.36.0.0
-srv/web/ipfire/html/images/updbooster
+srv/web/ipfire/html/images/updbooster/
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
 var/ipfire/updatexlrator/bin/
 usr/sbin/updxlrator

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 357cfe841985e0d077e265f8d65aba29d236c9a6..109702d1364a024a1ad4b6fa872cb3cd96508542 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -183,7 +183,7 @@
 * lzo-2.02
 * m4-1.4.4
 * mISDNuser-1_1_8
-* madwifi-hal-0.10.5.6-r3835-20080801
+* madwifi-hal-2008-08-15-r3851-20080829
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34

diff --git a/lfs/squidguard b/lfs/squidguard
index 676b733b4d6921599a5eec3d9a6894a05ea8b341..557c4f037a2e2aaf462d9aef394bf49fd85be68b 100644 (file)
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -99,6 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        /bin/tar --no-same-owner -xzf $(DIR_CONF)/urlfilter/blacklists.tar.gz -C /var/ipfire/urlfilter
        /usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl
+       touch /var/ipfire/urlfilter/settings
        chown -R nobody:nobody /var/ipfire/urlfilter
        chmod 755 /srv/web/ipfire/html/images/urlfilter
        chmod 644 /srv/web/ipfire/html/images/urlfilter/*