Fixed build and core 11

diff --git a/config/rootfiles/core/11/update.sh b/config/rootfiles/core/11/update.sh
index a933075577178a7ba69cf14cebdf1f5d4d43eece..7fcbd6409ca04825ab00ddc9533649f1a3538ea6 100644 (file)
--- a/config/rootfiles/core/11/update.sh
+++ b/config/rootfiles/core/11/update.sh
@@ -5,5 +5,5 @@
 extract_files
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 squidGuard -d -C all
-chmod 666 /var/ipfire/urlfilter/blacklist/*/*.db
+chmod 666 /var/ipfire/urlfilter/blacklists/*/*.db
 /etc/init.d/squid start

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index be8437116f9ee77bf203663dda974aad1e150b5f..0cfd4d16dabd5ce8a4c8911db6e4d7ee627a8414 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -60,7 +60,7 @@
 * collectd-4.3.0
 * coreutils-5.96
 * cpio-2.6
-* cups-1.2.12
+* cups-1.3.7
 * curl-7.15.3
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
@@ -68,6 +68,7 @@
 * dhcp-3.1.0
 * dhcpcd-2.0.8
 * diffutils-2.8.1
+* dm9601-2.6
 * dnsmasq-2.40
 * dosfstools-2.11
 * e2fsprogs-1.39
@@ -95,6 +96,7 @@
 * gd-2.0.33
 * gdbm-1.8.3
 * gettext-0.14.5
+* git-1.5.4.5
 * glib-2.9.6
 * glibc-2.3.6
 * gmp-4.2
@@ -251,6 +253,7 @@
 * squid-2.6.STABLE19
 * squid-graph-3.2
 * squidGuard-1.3
+* squidclamav-3.5
 * subversion-1.4.4
 * sudo-1.6.8p12
 * sysfsutils-1.3.0

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 436261cc60b3324d5968746159681956564cf808..bfb7585d55d53dd4b552b5202803ab5342dcef58 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3685,7 +3685,7 @@ END
 
                print FILE "\nnever_direct allow all\n\n";
        }
-       if (($proxysettings{'ENABLE_FILTER'} eq 'on') && ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on'))
+       if (($proxysettings{'ENABLE_FILTER'} eq 'on') || ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on') || ($proxysettings{'ENABLE_CLAMAV'} eq 'on'))
        {
                print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n";
                if ($filtersettings{'CHILDREN'} > $xlratorsettings{'CHILDREN'})
@@ -3694,27 +3694,6 @@ END
                } else {
                        print FILE "url_rewrite_children $xlratorsettings{'CHILDREN'}\n\n";
                }
-       } else
-       {
-
-               if ($proxysettings{'ENABLE_FILTER'} eq 'on')
-               {
-                       print FILE <<END
-url_rewrite_program /usr/sbin/redirect_wrapper
-url_rewrite_children $filtersettings{'CHILDREN'}
-
-END
-                       ;
-               }
-               if ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on')
-               {
-                       print FILE <<END
-url_rewrite_program /usr/sbin/redirect_wrapper
-url_rewrite_children $xlratorsettings{'CHILDREN'}
-
-END
-                       ;
-               }
        }
        close FILE;
 }

diff --git a/lfs/squidclamav b/lfs/squidclamav
index dfd0512b3081b266185f04cc06da54d66c473fe6..3ef0ff942b89eaf6a7f40eed6a10984ffe512a3c 100644 (file)
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -34,6 +34,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squidclamav
 PAK_VER    = 1
 
+DEPS       = "clamav"
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -52,6 +54,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist: 
+       @$(PAK)
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -72,10 +77,8 @@ $(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) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       cp -f  $(DIR_SRC)/squidclamav/squidclamav.conf /etc/squidclamav.conf
+       cp -f  $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index a2edd156604086d1bc265c1a4e6e49409a14d7d7..15ed34cc585ed7a0fb507c0c7357e94b44439da2 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -566,6 +566,7 @@ buildipfire() {
   ipfiremake freefont
   ipfiremake vdr
   ipfiremake git
+  ipfiremake squidclamav
 }
 
 buildinstaller() {