###############################################################################
-# This file is part of the IPCop Firewall. #
# #
-# IPCop is free software; you can redistribute it and/or modify #
+# IPFire.org - A linux based firewall #
+# 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 #
-# the Free Software Foundation; either version 2 of the License, or #
+# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
-# IPCop is distributed in the hope that it will be useful, #
+# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
-# along with IPCop; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Makefiles are based on LFSMake, which is #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
include Config
-VER = 1.2.0
+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 = c6e2e9112fdbda0602656f94c1ce31fd
+$(DL_FILE)_MD5 = ebf207accc6da4ad07de2db6e71ce8dc
install : $(TARGET)
$(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 \
+ 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
- -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
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
/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)