Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

[people/teissler/ipfire-2.x.git] / lfs / squidguard

diff --git a/lfs/squidguard b/lfs/squidguard
index 967afb98af03f3d572271e12e35c32960d5b28ac..c70a0d881e67dfce1f269cffb45e27216438b85f 100644 (file)
--- 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,16 @@ $(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)-ipfire.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 +98,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)