Early spring clean: Remove trailing whitespaces, and correct licence headers

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

diff --git a/lfs/squidguard b/lfs/squidguard
index a5dd7b9cbfdbd1a7d165f4a5719ab11b310efa28..4c688859f2c19187b5f9869c1121e94ddd0f6894 100644 (file)
--- 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-2021  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,23 +24,25 @@
 
 include Config
 
-VER        = 1.4.1
+VER        = 1.6.0
 
-THISAPP    = squidGuard-$(VER)
+THISAPP    = squidguard-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+CFLAGS    += -fcommon
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) 
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9ae7b62a63631bb2dd1f474cf2bbe4dc
+$(DL_FILE)_MD5 = ebf207accc6da4ad07de2db6e71ce8dc
 
 install : $(TARGET)
 
@@ -70,12 +72,23 @@ $(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) && ./configure --prefix=/usr --datadir=/usr/share \
-               --sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man  \
+       cd $(DIR_APP) && ./autogen.sh
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --datadir=/usr/share \
+               --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-sg-logdir=/var/log/squidGuard \
+               --with-syslog=yes \
+               --with-sg-dbhome=/var/lib/squidguard \
+               --with-db=/usr \
+               --with-db-inc=/usr/include \
+               --with-db-lib=/usr/lib
+
+       cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
 
        # URL-Filter
@@ -90,8 +103,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chmod 755 /var/ipfire/urlfilter/bin/prebuild.pl
        cp -f  $(DIR_CONF)/urlfilter/autoupdate.pl /var/ipfire/urlfilter/bin/autoupdate.pl
        chmod 755 /var/ipfire/urlfilter/bin/autoupdate.pl
-       echo "1.7.1" > /var/ipfire/urlfilter/version
-       
+       echo "1.5-beta" > /var/ipfire/urlfilter/version
+
        # Wrapper
        cp -f  $(DIR_CONF)/urlfilter/redirect_wrapper /usr/sbin
        chmod 755 /usr/sbin/redirect_wrapper
@@ -100,6 +113,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        /usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl
        touch /var/ipfire/urlfilter/settings
        chown -R nobody:nobody /var/ipfire/urlfilter
+       chown -R root:root /var/ipfire/urlfilter/bin
        chmod 755 /srv/web/ipfire/html/images/urlfilter
        chmod 644 /srv/web/ipfire/html/images/urlfilter/*
        chown -R nobody:nobody /var/urlrepo