X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsquidguard;h=a48c25cbe2d275dfd79878a15b10b06a538431e7;hb=5765b49bff0c3bcd60d1624c1bb159ce47085183;hp=676b733b4d6921599a5eec3d9a6894a05ea8b341;hpb=0bd7d00b4382fd2afb643703276eee5518d2564b;p=ipfire-2.x.git

diff --git a/lfs/squidguard b/lfs/squidguard
index 676b733b4d..a48c25cbe2 100644
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.3
+VER        = 1.4.1
 
 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 = 9ae7b62a63631bb2dd1f474cf2bbe4dc
 
 install : $(TARGET)
 
@@ -70,17 +70,17 @@ $(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) && patch -Np1 -i $(DIR_SRC)/src/patches/squidguard-1.4-squid-helper-protocol.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
-	cd $(DIR_APP) && make $(MAKETUNING)
+		--with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib
+	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 
 	# URL-Filter
-	-mkdir /etc/squidGuard /srv/web/ipfire/html/repository
+	-mkdir /etc/squidGuard /var/urlrepo
 	cp -f  $(DIR_CONF)/urlfilter/autoupdate.urls /var/ipfire/urlfilter/autoupdate/autoupdate.urls
 	ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.daily
 	ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.weekly
@@ -99,10 +99,11 @@ $(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/*
-	chown -R nobody:nobody /srv/web/ipfire/html/repository
+	chown -R nobody:nobody /var/urlrepo
 	chown -R squid:squid /var/log/squidGuard
 
 	@rm -rf $(DIR_APP)