Hotfix Core13 for redirector patch

Movde Core13 Files to 14
Added squid stable20 to Core14
Corrected vdr init file

diff --git a/config/rootfiles/core/13/files b/config/rootfiles/core/13/files
index a95e60509c2a4acf2b65561676645c1130341571..0cdd0be7a0817c3a7273f798b31ecfe13e386f2b 100644 (file)
--- a/config/rootfiles/core/13/files
+++ b/config/rootfiles/core/13/files
@@ -1,10 +1,4 @@
-etc/init.d/mISDN
-etc/modprobe.d/blacklist
-usr/bin/bc
-usr/bin/dc
 opt/pakfire/lib/functions.pl
 var/ipfire/urlfilter/bin/prebuild.pl
 srv/web/ipfire/cgi-bin/urlfilter.cgi
-srv/web/ipfire/cgi-bin/updatexlrator.cgi
-srv/web/ipfire/html/images/updxl-src-avg.gif
-usr/sbin/updxlrator
+usr/sbin/redirect_wrapper

diff --git a/config/rootfiles/core/13/update.sh b/config/rootfiles/core/13/update.sh
index 600ffd9514d210aa4b40a1259d4c28eecd535c29..943ece3ec7814a57c55af2a462768f0fbd6e1d23 100644 (file)
--- a/config/rootfiles/core/13/update.sh
+++ b/config/rootfiles/core/13/update.sh
@@ -2,4 +2,4 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 extract_files
-/etc/init.d/mISDN config
+/var/ipfire/urlfilter/bin/prebuild.pl

diff --git a/config/rootfiles/core/14/files b/config/rootfiles/core/14/files
index ba8bce191f710302ee3b1df174f12ca57db2fa5e..b2f830e64e18da0982b9099c485c4749a788326c 100644 (file)
--- a/config/rootfiles/core/14/files
+++ b/config/rootfiles/core/14/files
@@ -2,3 +2,9 @@ etc/init.d/mISDN
 etc/modprobe.d/blacklist
 usr/bin/bc
 usr/bin/dc
+etc/squid
+usr/lib/squid
+usr/sbin/squid
+srv/web/ipfire/cgi-bin/updatexlrator.cgi
+srv/web/ipfire/html/images/updxl-src-avg.gif
+usr/sbin/updxlrator

diff --git a/config/urlfilter/redirect_wrapper b/config/urlfilter/redirect_wrapper
index a22a0e3f60eb0f23d602583d5f7101ac80cf841a..aee7015b5b32b49a4ca2068126af8bcee5bdaf55 100644 (file)
--- a/config/urlfilter/redirect_wrapper
+++ b/config/urlfilter/redirect_wrapper
@@ -24,25 +24,29 @@
 use strict;
 use IPC::Open2;
 use IO::Handle;
+
+# define here your redirectors (use a comma sperated list)
+my $redirectors = [ '/usr/bin/squidGuard', '/usr/sbin/updxlrator' ];
+
 require '/var/ipfire/general-functions.pl';
 
 my %proxysettings=();
 &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
 
 # define here your redirectors (use a comma sperated list)
-my @redirectors = "";
-if ( $proxysettings{'ENABLE_FILTER'} eq 'on' && -e '/usr/bin/squidGuard' ){push(@redirectors,"/usr/bin/squidGuard"); }
-if ( $proxysettings{'ENABLE_CLAMAV'} eq 'on' && -e '/usr/bin/squidclamav' ){ push(@redirectors,"/usr/bin/squidclamav"); }
-if ( $proxysettings{'ENABLE_UPDXLRATOR'} eq 'on' && -e '/usr/sbin/updxlrator' ) { push(@redirectors,"/usr/sbin/updxlrator"); }
-
-#my $redirectors = [ '/usr/bin/squidclamav', '/usr/bin/squidGuard', '/usr/sbin/updxlrator' ];
+if ( $proxysettings{'ENABLE_FILTER'} eq 'on' && $proxysettings{'ENABLE_CLAMAV'} eq 'on' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'on' ){my $redirectors = [ '/usr/bin/squidGuard', '/usr/bin/squidclamav', '/usr/sbin/updxlrator' ];}
+if ( $proxysettings{'ENABLE_FILTER'} eq 'on' && $proxysettings{'ENABLE_CLAMAV'} eq 'on' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'off' ){my $redirectors = [ '/usr/bin/squidGuard', '/usr/bin/squidclamav' ];}
+if ( $proxysettings{'ENABLE_FILTER'} eq 'on' && $proxysettings{'ENABLE_CLAMAV'} eq 'off' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'on' ){my $redirectors = [ '/usr/bin/squidGuard', '/usr/sbin/updxlrator' ];}
+if ( $proxysettings{'ENABLE_FILTER'} eq 'on' && $proxysettings{'ENABLE_CLAMAV'} eq 'off' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'off' ){my $redirectors = [ '/usr/bin/squidGuard' ];}
+if ( $proxysettings{'ENABLE_FILTER'} eq 'off' && $proxysettings{'ENABLE_CLAMAV'} eq 'on' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'on' ){my $redirectors = [ '/usr/bin/squidclamav', '/usr/sbin/updxlrator' ];}
+if ( $proxysettings{'ENABLE_FILTER'} eq 'off' && $proxysettings{'ENABLE_CLAMAV'} eq 'on' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'off' ){my $redirectors = [ '/usr/bin/squidclamav' ];}
+if ( $proxysettings{'ENABLE_FILTER'} eq 'off' && $proxysettings{'ENABLE_CLAMAV'} eq 'off' && $proxysettings{'ENABLE_UPDXLRATOR'} eq 'on' ){my $redirectors = [ '/usr/sbin/updxlrator' ];}
 
 # Attention: keep in mind that the order of your redirectors is important.
 # It doesn't make sense to scan for viruses on pages you restrict access to...
 # So place first your tools which restrict access, then the tools which do the
 # content filtering!
 
-#print "Anzahl ".$#redirectors."\n";
 
 ##### no need to change anything below this line #####
 
@@ -52,24 +56,34 @@ STDOUT->autoflush(1);
 my $line;
 my $return;
 my $i;
+my $debug=0; # enable only for debugging
 
 # open progamms
 my $pidlist = [];
 my $rlist = [];
 my $wlist = [];
-for($i = 1; $i <= $#redirectors; $i++) {
-                         #print "i=".$i." redirector ".$redirectors[$i]."\n";
-        $pidlist->[$i] = open2($rlist->[$i], $wlist->[$i], $redirectors[$i] );
+for($i = 0; $i < @$redirectors; $i++) {
+        $pidlist->[$i] = open2($rlist->[$i], $wlist->[$i], $redirectors->[$i]);
 }
 
 # wait for data...
 while($line = <>) {
-        for($i = 1; $i <= $#redirectors; $i++) {
+        for($i = 0; $i < @$redirectors; $i++) {
                 $wlist->[$i]->print($line);
                 $return = $rlist->[$i]->getline;
                 last if($return ne "\n" and $return ne $line);
                                                                # break if redirector changes data
         }
         print $return;
+
+                               if ($debug){
+                chomp $line;
+                chomp $return;
+                if ( $line ne $return ){
+                open(DATEI, ">>/var/log/squid/redirector_debug") || die "Unable to acces file /var/log/redirector_debug";
+                                        print DATEI "Requested ".$line."\nAnswer    ".$return."\n";
+                                        close(DATEI);
+                                        }
+                               }
 }
 exit 0;

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 442e487750f3419f2a13933b983fae379e0c2efc..31540529f010615bddd380bf15693063dfdd4807 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -253,7 +253,7 @@
 * sox-12.18.1
 * spandsp-0.0.4pre15
 * squashfs3.2-r2
-* squid-2.6.STABLE19
+* squid-2.6.STABLE20
 * squid-graph-3.2
 * squidGuard-1.3
 * squidclamav-3.5

diff --git a/lfs/squid b/lfs/squid
index f5d06769a0b4afa934c58ac47ba895cf6b9e4775..db45600addc658269fd48601327323c2239c3dad 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.STABLE19
+VER        = 2.6.STABLE20
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e1f355ab907369903b5e28aff0fe8386
+$(DL_FILE)_MD5 = 6e1d87e9ae47f825c814a954a6febc36
 
 install : $(TARGET)
 

diff --git a/src/initscripts/init.d/vdr b/src/initscripts/init.d/vdr
index 4cfb7967fec8336c3b7408dfa94765dc4e320173..673c9732931626d010ea508665305cfa78cebdf4 100644 (file)
--- a/src/initscripts/init.d/vdr
+++ b/src/initscripts/init.d/vdr
@@ -19,7 +19,7 @@ case "${1}" in
        start)
                boot_mesg "Starting Video Disk Recorder..."
                if [ "$(ps -A | grep runvdr)" != "" ]; then
-                  boot_mesg "Error! Alrady run!"
+                  boot_mesg "Error! Already running!"
                   echo_failure
                   exit 1;
                fi