X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsquidguard;h=f627a27d81ddb3af8726bd7e9513582b31b96398;hp=557c4f037a2e2aaf462d9aef394bf49fd85be68b;hb=8d4da55a5d09e9f71e1845b31e8b8ac3979e8f77;hpb=52948e87b185cc7f8ad47fb7c8680a4d66a51bef

diff --git a/lfs/squidguard b/lfs/squidguard
index 557c4f037a..f627a27d81 100644
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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
@@ -103,7 +103,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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)