webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix Core13 for redirector patch

Browse Source 
Movde Core13 Files to 14
Added squid stable20 to Core14
Corrected vdr init file
This commit is contained in:
Christian Schmidt
2008-05-08 22:07:18 +02:00
parent aab26bfe3c
commit ff5ec02a0e
7 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/rootfiles/core/13/files
View File

@@ -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

2
config/rootfiles/core/13/update.sh
View File

@@ -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

6
config/rootfiles/core/14/files
View File

@@ -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

36
config/urlfilter/redirect_wrapper
View File

@@ -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;

2
doc/packages-list.txt
View File

@@ -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

4
lfs/squid
View File

@@ -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)

2
src/initscripts/init.d/vdr
View File

@@ -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