X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsquidguard;h=97e0fc222ac4cf5e8602fa98c4532fb0b4a19b88;hp=676b733b4d6921599a5eec3d9a6894a05ea8b341;hb=d1c279a9562cd3c43d3738d709779a4c75685f13;hpb=0bd7d00b4382fd2afb643703276eee5518d2564b

diff --git a/lfs/squidguard b/lfs/squidguard
index 676b733b4d..97e0fc222a 100644
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.3
+VER        = 1.4
 
 THISAPP    = squidGuard-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -36,11 +36,11 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d7c2c2e03a2835e4d1c3bef751ace76f
+$(DL_FILE)_MD5 = de834150998c1386c30feae196f16b06
 
 install : $(TARGET)
 
@@ -70,12 +70,11 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/squidGuard-$(VER)-20071117.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \
-       	--sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man  \
+		--sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man  \
 		--with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \
 		--with-sg-logdir=/var/log/squidGuard --with-sg-dbhome=/var/lib/squidguard \
-        	--with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib
+		--with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
@@ -99,6 +98,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/*