[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 528f824cfbb0e8bed7e56e9ebf4d2624ac27eefc - IPFire-SCM

10 Oct 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  528f824cfbb0e8bed7e56e9ebf4d2624ac27eefc (commit)
       via  748837e6ea86c62f83b9775b41e2e6b145bff5c0 (commit)
       via  dc1c56ca781324b2ef9fe895e388075df74a018a (commit)
       via  057249ba530658f9565021df825d7d76545eb625 (commit)
       via  9c2941ee78c8462065a0b42e780f5042f27103c9 (commit)
       via  06fb3d3711be19fe4f75039325e5f87381a71bdf (commit)
       via  96d0fe52aca3d937ff2746efde573266b6d90813 (commit)
       via  d39287de761337f4601aef02409527ff0a6abe63 (commit)
       via  97c3590c6faaea8c31ae5d4139e98cbecb22fd49 (commit)
       via  1fdebd80815e2b3dbccc404558de80d999b1ae0d (commit)
       via  a2ee81406ff7e6847ad17670c7b11766da6c5ce3 (commit)
       via  caf4eb1adc5c18fb54a5296e85e3726439b34abe (commit)
       via  34ba75f4c0d1d28986c46c97caca9cf743194f5f (commit)
       via  e52fe3f6920d9997593941f7a7c3873c07454f78 (commit)
       via  821b6a65649391e6b36b729e24e1c183c8693dc9 (commit)
       via  d97b2de4a135b323612a0d7c24760ce9f9ff5040 (commit)
       via  09e756f8f2ec9485f7b87b87e8a00f44482f7854 (commit)
       via  3ed577a5418e69562f98df617abe0f501d12faef (commit)
       via  f66be830476f44b89dbe8dca1236f8aa7aa4fa62 (commit)
       via  f3549ba5f84effa22db6d4fbdf939de80f6c7cdf (commit)
      from  5ea81cd5309792d112294627a74ae295645d69cb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 528f824cfbb0e8bed7e56e9ebf4d2624ac27eefc
Merge: 748837e dc1c56c
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Oct 10 12:05:56 2010 +0200
Merge commit 'origin'; branch 'master' into next
commit 748837e6ea86c62f83b9775b41e2e6b145bff5c0
Merge: 5ea81cd 9c2941e
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Oct 10 12:05:20 2010 +0200
Merge commit 'origin/master' into next
Conflicts:
    	config/rootfiles/core/41/filelists/files
-----------------------------------------------------------------------
Summary of changes:
 config/guardian/guardian.pl         |   60 +++++++++++++++---------------
 config/guardian/guardian_block.sh   |    5 ++-
 config/guardian/guardian_unblock.sh |    5 ++-
 doc/packages-list.txt               |   68 +++++++++++++++++-----------------
 html/cgi-bin/outgoinggrp.cgi        |    4 +-
 html/cgi-bin/urlfilter.cgi          |    8 ++++
 html/cgi-bin/vpnmain.cgi            |    4 +-
 langs/de/cgi-bin/de.pl              |    2 +
 langs/en/cgi-bin/en.pl              |    2 +
 langs/es/cgi-bin/es.pl              |    2 +
 langs/fr/cgi-bin/fr.pl              |    2 +
 lfs/guardian                        |    2 +-
 lfs/imspector                       |   11 +++---
 lfs/samba                           |    6 ++--
 lfs/vsftpd                          |    6 ++--
 src/initscripts/init.d/firewall     |    5 ++-
 src/initscripts/init.d/openvmtools  |    4 +-
 src/initscripts/init.d/vdradmin     |    4 ++-
 18 files changed, 111 insertions(+), 89 deletions(-)
Difference in files:

diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl
index 0c37c34..c7fd5f8 100644
--- a/config/guardian/guardian.pl
+++ b/config/guardian/guardian.pl
@@ -50,6 +50,8 @@ print "My gatewayaddess is: $gatewayaddr\n";
    		# destination was found.
    "$hostipaddr" => 1);
+&get_aliases;
+
 %sshhash = ();
if ( -e $targetfile ) {
@@ -186,8 +188,8 @@ sub ipchain {
    my ($source, $dest, $type) = @_;
    &write_log ("$source\t$type\n");
    if ($hash{$source} eq "") {
-		&write_log ("Running '$blockpath $source'\n");
-		system ("$blockpath $source");
+		&write_log ("Running '$blockpath $source $interface'\n");
+		system ("$blockpath $source $interface");
    	$hash{$source} = time() + $TimeLimit;
    } else {
 # We have already blocked this one, but snort detected another attack. So
@@ -244,6 +246,9 @@ sub load_conf {
    	}
    	if (/Interface\s+(.*)/) {
    		$interface = $1;
+			if ( $interface eq "" ) {
+				$interface = `cat /var/ipfire/ethernet/settings | grep RED_DEV | cut -d"=" -f2`;
+			}
    	}
    	if (/AlertFile\s+(.*)/) {
    		$alert_file = $1;
@@ -265,16 +270,13 @@ sub load_conf {
    	}
    }
-	if ($interface eq "") {
-		die "Fatal! Interface is undefined.. Please define it in $opt_o with keyword Interface\n";
-	}
    if ($alert_file eq "") {
    	print "Warning! AlertFile is undefined.. Assuming /var/log/snort.alert\n";
    	$alert_file="/var/log/snort.alert";
    }
    if ($hostipaddr eq "") {
    	print "Warning! HostIpAddr is undefined! Attempting to guess..\n";
-		$hostipaddr = &get_ip($interface);
+		$hostipaddr = `cat /var/ipfire/red/local-ipaddress`;
    	print "Got it.. your HostIpAddr is $hostipaddr\n";
    }
    if ($ignorefile eq "") {
@@ -345,30 +347,9 @@ sub daemonize {
    }
 }
-sub get_ip {
-	my ($interface) = $_[0];
-	my $ip;
-	open (IFCONFIG, "/bin/netstat -iee |grep $interface -A7 |");
-	while (<IFCONFIG>) {
-		if ($OS eq "FreeBSD") {
-			if (/inet (\d+.\d+.\d+.\d+)/) {
-				$ip = $1;
-			}
-		}
-		if ($OS eq "Linux") {
-			if (/inet addr:(\d+.\d+.\d+.\d+)/) {
-				$ip = $1;
-			}
-		}
-	}
-	close (IFCONFIG);
-
-	if ($ip eq "") { die "Couldn't figure out the ip address\n"; }
-		$ip;
-	}
-
 sub sig_handler_setup {
-	$SIG{TERM} = &clean_up_and_exit; # kill
+	$SIG{INT} = &clean_up_and_exit; # kill -2
+	$SIG{TERM} = &clean_up_and_exit; # kill -9
    $SIG{QUIT} = &clean_up_and_exit; # kill -3
 #  $SIG{HUP} = &flush_and_reload; # kill -1
 }
@@ -387,7 +368,7 @@ sub remove_blocks {
 sub call_unblock {
    my ($source, $message) = @_;
    &write_log ("$message");
-	system ("$unblockpath $source");
+	system ("$unblockpath $source $interface");
 }
sub clean_up_and_exit {
@@ -412,3 +393,22 @@ sub load_targetfile {
    close (TARG);
    print "Loaded $count addresses from $targetfile\n";
 }
+
+sub get_aliases {
+	my $ip;
+	print "Scanning for aliases on $interface and add them to the target hash...";
+
+	open (IFCONFIG, "/sbin/ip addr show $interface |");
+	my @lines = <IFCONFIG>;
+	close(IFCONFIG);
+
+	foreach $line (@lines) {
+		if ( $line =~ /inet (\d+.\d+.\d+.\d+)/) {
+			$ip = $1;
+			print " got $ip on $interface ... ";
+			$targethash{'$ip'} = "1";
+		}
+	}
+
+	print "done \n";
+}
\ No newline at end of file
diff --git a/config/guardian/guardian_block.sh b/config/guardian/guardian_block.sh
index 0a44325..a8331fa 100644
--- a/config/guardian/guardian_block.sh
+++ b/config/guardian/guardian_block.sh
@@ -2,10 +2,11 @@
# this is a sample block script for guardian. This should work with ipchains. 
 # This command gets called by guardian as such:
-#  guardian_block.sh <source_ip>
+#  guardian_block.sh <source_ip> <interface>
 # and the script will issue a command to block all traffic from that source ip
 # address. The logic of weither or not it is safe to block that address is
 # done inside guardian itself.
 source=$1
+interface=$2
-/sbin/iptables -I GUARDIANINPUT -s $source -j DROP
+/sbin/iptables -I GUARDIAN -s $source -i $interface -j DROP
diff --git a/config/guardian/guardian_unblock.sh b/config/guardian/guardian_unblock.sh
index e0d3b5d..315d771 100644
--- a/config/guardian/guardian_unblock.sh
+++ b/config/guardian/guardian_unblock.sh
@@ -2,8 +2,9 @@
# this is a sample unblock script for guardian. This should work with ipchains. 
 # This command gets called by guardian as such:
-#  unblock.sh <source_ip>
+#  unblock.sh <source_ip> <interface>
 # and the script will issue a command to remove the block that was created with # block.sh address. 
 source=$1
+interface=$2
-/sbin/iptables -D GUARDIANINPUT -s $source -j DROP
+/sbin/iptables -D GUARDIAN -s $source -i $interface -j DROP
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 146744e..7894e3d 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -37,7 +37,7 @@
 * Unix-Syslog-0.100
 * XML-Parser-2.34
 * alsa-lib-1.0.23
-* alsa-lib-1.0.23-kmod-2.6.32.23-ipfire
+* alsa-lib-1.0.23-kmod-2.6.32.24-ipfire
 * amavisd-new-2.5.2
 * apcupsd-3.14.4
 * applejuice-0.31
@@ -67,20 +67,20 @@
 * clamav-0.96.2
 * cmake-2.4.8
 * collectd-4.9.1
-* compat-wireless-2.6.35-1-kmod-2.6.32.23-ipfire
-* compat-wireless-2.6.35-1-kmod-2.6.32.23-ipfire-xen
+* compat-wireless-2.6.35-1-kmod-2.6.32.24-ipfire
+* compat-wireless-2.6.35-1-kmod-2.6.32.24-ipfire-xen
 * coreutils-5.96
 * cpio-2.11
 * cpufrequtils-007
-* cryptodev-20091126-kmod-2.6.32.23-ipfire
-* cryptodev-20091126-kmod-2.6.32.23-ipfire-xen
+* cryptodev-20091126-kmod-2.6.32.24-ipfire
+* cryptodev-20091126-kmod-2.6.32.24-ipfire-xen
 * cups-1.4.4
 * curl-7.19.5
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
 * dahdi-2.2.1
-* dahdi-2.2.1-kmod-2.6.32.23-ipfire
-* dahdi-2.2.1-kmod-2.6.32.23-ipfire-xen
+* dahdi-2.2.1-kmod-2.6.32.24-ipfire
+* dahdi-2.2.1-kmod-2.6.32.24-ipfire-xen
 * db-4.4.20
 * dbus-1.0.3
 * ddrescue-1.12
@@ -90,10 +90,10 @@
 * dnsmasq-2.45
 * dosfstools-3.0.9
 * dracut-006
-* e1000-8.0.19-kmod-2.6.32.23-ipfire
-* e1000-8.0.19-kmod-2.6.32.23-ipfire-xen
-* e1000e-1.1.19-kmod-2.6.32.23-ipfire
-* e1000e-1.1.19-kmod-2.6.32.23-ipfire-xen
+* e1000-8.0.19-kmod-2.6.32.24-ipfire
+* e1000-8.0.19-kmod-2.6.32.24-ipfire-xen
+* e1000e-1.1.19-kmod-2.6.32.24-ipfire
+* e1000e-1.1.19-kmod-2.6.32.24-ipfire-xen
 * e2fsprogs-1.41.11
 * ebtables-v2.0.8-2
 * ed-0.2
@@ -148,10 +148,10 @@
 * icecream-0.9.4.8
 * icegenerator-0.5.5-pre2
 * iftop-0.17
-* igb-2.3.4-kmod-2.6.32.23-ipfire
-* igb-2.3.4-kmod-2.6.32.23-ipfire-xen
+* igb-2.3.4-kmod-2.6.32.24-ipfire
+* igb-2.3.4-kmod-2.6.32.24-ipfire-xen
 * igmpproxy-0.1
-* imspector-0.9
+* imspector-20101008
 * inetutils-1.4.2
 * ipaddr-1.2
 * iperf-2.0.4
@@ -165,10 +165,10 @@
 * joe-3.7
 * jpegsrc.v6b
 * kbd-1.12
-* kqemu-1.4.0pre1-kmod-2.6.32.23-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.32.23-ipfire-xen
+* kqemu-1.4.0pre1-kmod-2.6.32.24-ipfire
+* kqemu-1.4.0pre1-kmod-2.6.32.24-ipfire-xen
 * kudzu-1.2.64
-* kvm-kmod-2.6.34.1-kmod-2.6.32.23-ipfire
+* kvm-kmod-2.6.34.1-kmod-2.6.32.24-ipfire
 * l7-protocols-2009-05-10
 * lame-3.97
 * lcd4linux-0.10.1-RC2
@@ -201,8 +201,8 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.32.23-ipfire
-* linux-2.6.32.23-ipfire-xen
+* linux-2.6.32.24-ipfire
+* linux-2.6.32.24-ipfire-xen
 * linux-atm-2.4.1
 * linux-firmware-20100318
 * linux-libc-headers-2.6.12.0
@@ -213,11 +213,11 @@
 * lynis-1.2.9
 * lzo-2.02
 * m4-1.4.4
-* mISDN-20100525-kmod-2.6.32.23-ipfire
-* mISDN-20100525-kmod-2.6.32.23-ipfire-xen
+* mISDN-20100525-kmod-2.6.32.24-ipfire
+* mISDN-20100525-kmod-2.6.32.24-ipfire-xen
 * mISDNuser-20100525
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.23-ipfire
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.23-ipfire-xen
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.24-ipfire
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.24-ipfire-xen
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
@@ -235,7 +235,7 @@
 * module-init-tools-3.5
 * motion-3.2.11
 * mpc-0.19
-* mpd-0.15.8
+* mpd-0.15.12
 * mpeg2dec-0.4.0b
 * mpfire-ipfire
 * mtd-CVS-20070507
@@ -286,12 +286,12 @@
 * psmisc-22.2
 * qemu-0.11.1-kqemu
 * qemu-0.12.3
-* r8101-1.016.00-kmod-2.6.32.23-ipfire
-* r8101-1.016.00-kmod-2.6.32.23-ipfire-xen
-* r8168-8.018.00-kmod-2.6.32.23-ipfire
-* r8168-8.018.00-kmod-2.6.32.23-ipfire-xen
-* r8169-6.013.00-kmod-2.6.32.23-ipfire
-* r8169-6.013.00-kmod-2.6.32.23-ipfire-xen
+* r8101-1.016.00-kmod-2.6.32.24-ipfire
+* r8101-1.016.00-kmod-2.6.32.24-ipfire-xen
+* r8168-8.018.00-kmod-2.6.32.24-ipfire
+* r8168-8.018.00-kmod-2.6.32.24-ipfire-xen
+* r8169-6.013.00-kmod-2.6.32.24-ipfire
+* r8169-6.013.00-kmod-2.6.32.24-ipfire-xen
 * readline-5.1
 * reiser4progs-1.0.6
 * reiserfsprogs-3.6.21
@@ -299,7 +299,7 @@
 * rssdler-0.4.0a
 * rsync-3.0.7
 * rtorrent-0.8.6
-* samba-3.5.5
+* samba-3.5.6
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01
@@ -346,8 +346,8 @@
 * usb-modeswitch-data-20100707
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-990bbeaeb761-kmod-2.6.32.23-ipfire
-* v4l-dvb-990bbeaeb761-kmod-2.6.32.23-ipfire-xen
+* v4l-dvb-990bbeaeb761-kmod-2.6.32.24-ipfire
+* v4l-dvb-990bbeaeb761-kmod-2.6.32.24-ipfire-xen
 * vdr-1.6.0
 * vdradmin-am-3.6.7
 * vim-7.0
@@ -355,7 +355,7 @@
 * vlc-0.8.6i
 * vnstat-1.6
 * vnstati-beta3
-* vsftpd-2.1.2
+* vsftpd-2.2.2
 * w_scan-20080105
 * watchdog-5.9
 * wget-1.10.2
diff --git a/html/cgi-bin/outgoinggrp.cgi b/html/cgi-bin/outgoinggrp.cgi
index f99468e..a00db2a 100644
--- a/html/cgi-bin/outgoinggrp.cgi
+++ b/html/cgi-bin/outgoinggrp.cgi
@@ -137,7 +137,7 @@ $ipgroupcontent =~ s/\n/<br />/g;
 &Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall ip groups'});
print <<END
-<a name="outgoing showipgroup"</a>
+<a name="outgoing showipgroup"></a>
 <br />
 <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showipgroup'>
 <table width='95%' cellspacing='0'>
@@ -214,7 +214,7 @@ $macgroupcontent =~ s/\n/<br />/g;
 &Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall mac groups'});
print <<END
-<a name="outgoing showmacgroup"</a>
+<a name="outgoing showmacgroup"></a>
 <br />
 <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
 <table width='95%' cellspacing='0'>
diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index eea32bf..1bfc039 100644
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -1214,6 +1214,10 @@ print <<END
    <td colspan='2'>$Lang::tr{'urlfilter blocked urls'}&nbsp;<img src='/blob.gif' alt='*' /></td>
 </tr>
 <tr>
+	<td colspan='2'>$Lang::tr{'urlfilter example'}</td>
+	<td colspan='2'>$Lang::tr{'urlfilter example ads'}</td>
+</tr>
+<tr>
    <td colspan='2' width='50%'><textarea name='CUSTOM_BLACK_DOMAINS' cols='32' rows='6' wrap='off'>
 END
 ;
@@ -1253,6 +1257,10 @@ print <<END
    <td colspan='2'>$Lang::tr{'urlfilter allowed urls'}&nbsp;<img src='/blob.gif' alt='*' /></td>
 </tr>
 <tr>
+	<td colspan='2'>$Lang::tr{'urlfilter example'}</td>
+	<td colspan='2'>$Lang::tr{'urlfilter example ads'}</td>
+</tr>
+<tr>
    <td colspan='2' width='50%'><textarea name='CUSTOM_WHITE_DOMAINS' cols='32' rows='6' wrap='off'>
 END
 ;
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 8a74063..f303cfb 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1988,7 +1988,7 @@ END
    print <<END
    <table width='100%' cellpadding='0' cellspacing='5' border='0'>
    <tr><td class='base' width='50%'>$Lang::tr{'use a pre-shared key'}</td>
-	    <td class='base' width='50%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td>
+	    <td class='base' width='50%'><input type='password' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td>
    </tr>
    </table>
 END
@@ -2006,7 +2006,7 @@ END
    <table width='100%' cellpadding='0' cellspacing='5' border='0'>
    <tr><td width='5%'><input type='radio' name='AUTH' value='psk' $checked{'AUTH'}{'psk'} $pskdisabled/></td>
        <td class='base' width='55%'>$Lang::tr{'use a pre-shared key'}</td>
-	    <td class='base' width='40%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' $pskdisabled/></td></tr>
+	    <td class='base' width='40%'><input type='password' name='PSK' size='30' value='$cgiparams{'PSK'}' $pskdisabled/></td></tr>
    <tr><td colspan='3' bgcolor='#000000'></td></tr>
    <tr><td><input type='radio' name='AUTH' value='certreq' $checked{'AUTH'}{'certreq'} $cakeydisabled /></td>
        <td class='base'><hr />$Lang::tr{'upload a certificate request'}</td>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6b01831..0936af0 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1886,6 +1886,8 @@
 'urlfilter enable log' => 'Aktiviere Protokoll',
 'urlfilter enable rewrite rules' => 'Aktiviere lokale Dateiumleitung',
 'urlfilter enabled' => 'Aktiviert:',
+'urlfilter example' => 'Beispiel: www.domain.com',
+'urlfilter example ads' => 'Beispiel: www.domain.com/ads/',
 'urlfilter export blacklist' => 'Blacklist exportieren',
 'urlfilter export error' => 'Kann Exportdatei nicht erstellen',
 'urlfilter expressions' => 'Ausdrücke (einen pro Zeile)',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 907de5d..b35a23a 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1920,6 +1920,8 @@
 'urlfilter enable log' => 'Enable log',
 'urlfilter enable rewrite rules' => 'Enable local file redirection',
 'urlfilter enabled' => 'Enabled:',
+'urlfilter example' => 'Example: www.domain.com',
+'urlfilter example ads' => 'Example: www.domain.com/ads/',
 'urlfilter export blacklist' => 'Export blacklist',
 'urlfilter export error' => 'Unable to create export file',
 'urlfilter expressions' => 'Expressions (one per line)',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 8074cd2..ca2b934 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1907,6 +1907,8 @@
 'urlfilter enable log' => 'Activar registro',
 'urlfilter enable rewrite rules' => 'Activar redirección de archivos locales',
 'urlfilter enabled' => 'Activado:',
+'urlfilter example' => 'Ejemplo: www.domain.com',
+'urlfilter example ads' => 'Ejemplo: www.domain.com/ads/',
 'urlfilter export blacklist' => 'Exportar lista negra',
 'urlfilter export error' => 'Imposible crear archivo de exportación',
 'urlfilter expressions' => 'Frases (una por línea)',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 7904bb6..0179e73 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1916,6 +1916,8 @@
 'urlfilter enable log' => 'Activer log',
 'urlfilter enable rewrite rules' => 'Activer fichier local de redirection',
 'urlfilter enabled' => 'Activé:',
+'urlfilter example' => 'Exemple: www.domain.com',
+'urlfilter example ads' => 'Exemple: www.domain.com/ads/',
 'urlfilter export blacklist' => 'Exporter Blackliste',
 'urlfilter export error' => 'Impossible de créer fichier d'exportation',
 'urlfilter expressions' => 'Expressions (une par ligne)',
diff --git a/lfs/guardian b/lfs/guardian
index 6cec09b..251a56f 100644
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -30,7 +30,7 @@ THISAPP    = guardian-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = guardian
-PAK_VER    = 6
+PAK_VER    = 7
DEPS       = ""
diff --git a/lfs/imspector b/lfs/imspector
index 31e358d..092211b 100644
--- a/lfs/imspector
+++ b/lfs/imspector
@@ -24,7 +24,7 @@
include Config
-VER        = 0.9
+VER        = 20101008
THISAPP    = imspector-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = imspector
-PAK_VER    = 1
+PAK_VER    = 2
DEPS       = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 626abf7c2b8f15d56df679ad66624575
+$(DL_FILE)_MD5 = 032407bb13ccddb77328f83eded102ee
install : $(TARGET)
@@ -77,9 +77,10 @@ $(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) && make install
+	cd $(DIR_SRC)/imspector && make install
    -mv /usr/etc/imspector /etc/imspector
-	install -v -m 755  $(DIR_CONF)/imspector/imspector.conf /etc/imspector.conf
+	-mv /etc/imspector/imspector /etc/imspector
+	install -v -m 755 $(DIR_CONF)/imspector/imspector.conf /etc/imspector.conf
    install -v -m 644 $(DIR_SRC)/config/backup/includes/imspector /var/ipfire/backup/addons/includes/imspector
    chmod 755 /srv/web/ipfire/cgi-bin/imspector.cgi
    chown nobody:nobody -R /var/log/imspector
diff --git a/lfs/samba b/lfs/samba
index 496a2bf..8a354d8 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
include Config
-VER        = 3.5.5
+VER        = 3.5.6
THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 30
+PAK_VER    = 31
DEPS       = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 278728aeeef9db7e27fa6a2ce5b43509
+$(DL_FILE)_MD5 = bf6c09ea497a166df8bd672db1d8da8f
install : $(TARGET)
diff --git a/lfs/vsftpd b/lfs/vsftpd
index e4cb67c..d5e8093 100644
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -24,7 +24,7 @@
include Config
-VER        = 2.1.2
+VER        = 2.2.2
THISAPP    = vsftpd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vsftpd
-PAK_VER    = 5
+PAK_VER    = 6
DEPS       = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6a8c8579d50adf0d0fc07226c03bfb52
+$(DL_FILE)_MD5 = 6d6bc136af14c23f8fef6f1a51f55418
install : $(TARGET)
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 366ae07..f4d5611 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -140,8 +140,9 @@ case "$1" in
    # CUSTOM chains, can be used by the users themselves
    /sbin/iptables -N CUSTOMINPUT
    /sbin/iptables -A INPUT -j CUSTOMINPUT
-	/sbin/iptables -N GUARDIANINPUT
-	/sbin/iptables -A INPUT -j GUARDIANINPUT
+	/sbin/iptables -N GUARDIAN
+	/sbin/iptables -A INPUT -j GUARDIAN
+	/sbin/iptables -A FORWARD -j GUARDIAN
    /sbin/iptables -N CUSTOMFORWARD
    /sbin/iptables -A FORWARD -j CUSTOMFORWARD
    /sbin/iptables -N CUSTOMOUTPUT
diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/init.d/openvmtools
index c1588e1..a3bd073 100755
--- a/src/initscripts/init.d/openvmtools
+++ b/src/initscripts/init.d/openvmtools
@@ -4,9 +4,9 @@
 #
 # Description : init-script for open-vm-tools
 #
-# Authors     : earl
+# Authors     : Jan Paul Tuecking (earl@ipfire.org)
 #
-# Version     : 00.01
+# Version     : 1.00
 #
 # Notes       :
 #
diff --git a/src/initscripts/init.d/vdradmin b/src/initscripts/init.d/vdradmin
index c7a565d..a0858de 100644
--- a/src/initscripts/init.d/vdradmin
+++ b/src/initscripts/init.d/vdradmin
@@ -8,7 +8,8 @@
 #
 # Version     : 01.00
 #
-# Notes       :
+# Notes       : Changes in 01.01
+#             : v.2.6.7 needs /var/run/vdradmin dir (earl@ipfire.org)
 #
 ########################################################################
@@ -18,6 +19,7 @@
 case "${1}" in
    start)
    	boot_mesg "Starting VDR Webadministration Tool..."
+		mkdir /var/run/vdradmin -p
    	loadproc /usr/bin/vdradmind > /dev/null
    	evaluate_retval
    	;;
hooks/post-receive
--
IPFire 2.x development tree

    