Geändert:

* URL-Filter gefixt.
  * Überblendungen sind an- und ausschaltbar.
  * GLIB in ISO für MC.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@188 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-07-01 14:36:04 +00:00
parent 5cfe86e6c4
commit bd365f3a89
11 changed files with 483 additions and 470 deletions

View File

@@ -103,27 +103,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
touch /var/log/squid/access.log
chown -R squid:squid /var/log/squid /var/log/cache
# URL-Filter
-mkdir /etc/squidGuard /home/httpd/html/repository
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
ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.monthly
cp -f $(DIR_CONF)/urlfilter/squidGuard.conf /var/ipfire/urlfilter/squidGuard.conf
ln -fs /var/ipfire/urlfilter/squidGuard.conf /etc/squidGuard/squidGuard.conf
cp -f $(DIR_CONF)/urlfilter/prebuild.pl /var/ipfire/urlfilter/bin/prebuild.pl
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
/bin/tar --no-same-owner -xzf $(DIR_CONF)/urlfilter/blacklists.tar.gz -C /var/ipfire/urlfilter
/usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl
chown -R nobody:nobody /var/ipfire/urlfilter
chown -R nobody:nobody /home/httpd/html/images/urlfilter
chown -R nobody:nobody /home/httpd/html/repository
touch /var/log/squidGuard
chown -R squid:squid /var/log/squidGuard
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -76,9 +76,31 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
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-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
cd $(DIR_APP) && make install
# URL-Filter
-mkdir /etc/squidGuard /home/httpd/html/repository
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
ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.monthly
cp -f $(DIR_CONF)/urlfilter/squidGuard.conf /var/ipfire/urlfilter/squidGuard.conf
ln -fs /var/ipfire/urlfilter/squidGuard.conf /etc/squidGuard/squidGuard.conf
cp -f $(DIR_CONF)/urlfilter/prebuild.pl /var/ipfire/urlfilter/bin/prebuild.pl
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
/bin/tar --no-same-owner -xzf $(DIR_CONF)/urlfilter/blacklists.tar.gz -C /var/ipfire/urlfilter
/usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl
chown -R nobody:nobody /var/ipfire/urlfilter
chown -R nobody:nobody /home/httpd/html/images/urlfilter
chown -R nobody:nobody /home/httpd/html/repository
chown -R squid:squid /var/log/squidGuard
@rm -rf $(DIR_APP)
@$(POSTBUILD)