Merge remote-tracking branch 'stevee/core67-merge' into next

Conflicts: make.sh
2026-04-18 15:02:59 +02:00 · 2013-03-03 23:11:17 +01:00
parent dddb9afe1a cf4657e009
commit 5627b4c9f2
14 changed files with 253 additions and 103 deletions
--- a/config/rootfiles/common/IO-Socket-SSL
+++ b/config/rootfiles/common/IO-Socket-SSL
@@ -0,0 +1,6 @@
+usr/lib/perl5/site_perl/5.12.3/IO/Socket
+usr/lib/perl5/site_perl/5.12.3/IO/Socket/SSL.pm
+usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/IO/Socket
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/IO/Socket/SSL
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/IO/Socket/SSL/.packlist
+#usr/share/man/man3/IO::Socket::SSL.3
--- a/config/rootfiles/packages/nfs
+++ b/config/rootfiles/packages/nfs
@@ -1,5 +1,7 @@
+etc/rc.d/init.d/nfs-server
 sbin/mount.nfs
 sbin/mount.nfs4
+sbin/osd_login
 sbin/umount.nfs
 sbin/umount.nfs4
 #usr/include/nfsidmap.h
@@ -20,6 +22,9 @@ usr/lib/libnfsidmap/static.so
 usr/lib/libnfsidmap/umich_ldap.so
 #usr/lib/pkgconfig/libnfsidmap.pc
 usr/sbin/exportfs
+usr/sbin/mountstats
+usr/sbin/nfsdcltrack
+usr/sbin/nfsiostat
 usr/sbin/nfsstat
 usr/sbin/rpc.idmapd
 usr/sbin/rpc.mountd
@@ -37,7 +42,10 @@ usr/sbin/start-statd
 #usr/share/man/man8/idmapd.8
 #usr/share/man/man8/mount.nfs.8
 #usr/share/man/man8/mountd.8
+#usr/share/man/man8/mountstats.8
 #usr/share/man/man8/nfsd.8
+#usr/share/man/man8/nfsdcltrack.8
+#usr/share/man/man8/nfsiostat.8
 #usr/share/man/man8/nfsstat.8
 #usr/share/man/man8/rpc.idmapd.8
 #usr/share/man/man8/rpc.mountd.8
@@ -56,5 +64,4 @@ var/lib/nfs/sm
 #var/lib/nfs/sm.bak
 var/lib/nfs/state
 var/lib/nfs/xtab
-etc/rc.d/init.d/nfs-server
 var/ipfire/nfs/nfs-server
--- a/config/rootfiles/packages/sendEmail
+++ b/config/rootfiles/packages/sendEmail
@@ -0,0 +1 @@
+usr/local/bin/sendEmail
--- a/config/updxlrator/updxlrator
+++ b/config/updxlrator/updxlrator
@@ -8,6 +8,11 @@
 #
 # $Id: updxlrator,v 2.1 2009/01/10 00:00:00 marco.s Exp $
 #
+# ChangeLog:
+#
+# 2012-10-26: nightshift - move curly bracket to capture AVG download source.
+#			 - Adding BIG HINT for new update source#
+#

 use strict;
 use HTTP::Date;
@@ -75,8 +80,8 @@ while (<>) {
 	# -----------------------------------------------------------

 	if (
-	    (($source_url =~ m@^http://[^/]*\.microsoft\.com/.*\.(exe|psf|msi|msp|cab)$@i) ||
-	     ($source_url =~ m@^http://[^/]*\.windowsupdate\.com/.*\.(exe|psf|msi|msp|cab)$@i))
+	    (($source_url =~ m@^http://[^/]*\.microsoft\.com/.*\.(exe|psf|msi|msp|msu|cab)$@i) ||
+	     ($source_url =~ m@^http://[^/]*\.windowsupdate\.com/.*\.(exe|psf|msi|msp|msu|cab)$@i))
 	&&   ($source_url !~ m@^http://[^/]*\.microsoft\.com/.*(/autoupd|selfupdate/).*\.cab@i)
 	&&   ($source_url !~ m@\&@)
 	   )
@@ -88,6 +93,7 @@ while (<>) {
 	#  Section: Adobe Downloads
 	# -----------------------------------------------------------

+
 	if (
 	    ($source_url =~ m@^http://(ar)?download\.adobe\.com/.*\.(exe|msi|bin|dmg|idx|gz)$@i) ||
 	    ($source_url =~ m@^http://swupdl\.adobe\.com/updates/.*\.(exe|msi|bin|dmg|idx|gz|[a-z][a-z]_[A-Z][A-Z])$@i) ||
@@ -178,8 +184,6 @@ while (<>) {
 		$xlrator_url = &check_cache($source_url,$hostaddr,$username,"IPFire",$mirror);
 	}

-	}
-	
 	# -----------------------------------------------------------
 	# Section: AVG Downloads
 	# -----------------------------------------------------------
@@ -189,6 +193,9 @@ while (<>) {
 #		$xlrator_url = &check_cache($source_url,$hostaddr,$username,"AVG",$mirror);
 #	}

+# ----------- ADD NEW SOURCES BEFORE THIS LINE !!! ------------------
+	}
+
 	$request="$xlrator_url $hostaddr $username $method\n";

 	print $request;
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -383,62 +383,79 @@ END
 			print "<td align='center'>$active</td>";
 		}
 	}
-	if ( `cat /var/ipfire/ovpn/settings | grep ^ENABLED=on` || 
-	     `cat /var/ipfire/ovpn/settings | grep ^ENABLED_BLUE=on` || 
-	     `cat /var/ipfire/ovpn/settings | grep ^ENABLED_ORANGE=on`) { 
-		my $ovpnip = `cat /var/ipfire/ovpn/settings | grep ^DOVPN_SUBNET= | cut -c 14- | sed -e 's\/\\/255.255.255.0\/\/'`;
-		print <<END;
-		<tr><td align='center' bgcolor='$Header::colourovpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN</b></font></a><br>
-	  	<td width='30%' align='center'>$ovpnip
-  		<td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
+
+###
+# Check if there is any OpenVPN connection configured.
+###
+
+if ( -s "${General::swroot}/ovpn/ovpnconfig")
+	{
+	print <<END;
 	
+	<tr>
+		<td align='center' bgcolor='$Header::colourovpn' width='25%'>
+			<a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN</b></font></a><br>
+		</td>
+END
+	# Check if the OpenVPN server for Road Warrior Connections is running and display status information.
+	my %confighash=();
+
+	&General::readhash("${General::swroot}/ovpn/settings", \%confighash);
+
+	if (($confighash{'ENABLED'} eq "on") ||
+	    ($confighash{'ENABLED_BLUE'} eq "on") ||
+	    ($confighash{'ENABLED_ORANGE'} eq "on")) {
+
+		my $ovpnip = $confighash{'DOVPN_SUBNET'};
+		print <<END;
+	  	<td width='30%' align='center'>$ovpnip
+  		<td width='45%' align='center'><font color=$Header::colourgreen>Online</font>	
 END

 	}

-###
-# Print the OpenVPN N2N connection status.
-###
-if ( -d "${General::swroot}/ovpn/n2nconf") {
-	my %confighash=();
+	# Print the OpenVPN N2N connection status.
+	if ( -d "${General::swroot}/ovpn/n2nconf") {
+		my %confighash=();

-	&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
-	foreach my $dkey (keys %confighash) {
-		if (($confighash{$dkey}[3] eq 'net') && (-e "/var/run/$confighash{$dkey}[1]n2n.pid")) {
-			my $tport = $confighash{$dkey}[22];
-			next if ($tport eq '');
+		&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
+		foreach my $dkey (keys %confighash) {
+			if (($confighash{$dkey}[3] eq 'net') && (-e "/var/run/$confighash{$dkey}[1]n2n.pid")) {
+				my $tport = $confighash{$dkey}[22];
+				next if ($tport eq '');

-			my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); 
-			$tnet->open('127.0.0.1');
-			my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/');
-			my @tustate = split(/\,/, $output[1]);
+				my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); 
+				$tnet->open('127.0.0.1');
+				my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/');
+				my @tustate = split(/\,/, $output[1]);

-			my $display;
-			my $display_colour = $Header::colourred;
-			if ( $tustate[1] eq 'CONNECTED') {
-				$display_colour = $Header::colourgreen;
-				$display = $Lang::tr{'capsopen'};
-			} else {
-				$display = $tustate[1];
-			}
+				my $display;
+				my $display_colour = $Header::colourred;
+				if ( $tustate[1] eq 'CONNECTED') {
+					$display_colour = $Header::colourgreen;
+					$display = $Lang::tr{'capsopen'};
+				} else {
+					$display = $tustate[1];
+				}
 
-			print <<END;
-			<tr>
-				<td align='left' nowrap='nowrap' bgcolor='$color{'color22'}'>
-					$confighash{$dkey}[1]
-				</td>
-				<td align='center'>
-					$confighash{$dkey}[11]
-				</td>
-				<td align='center' bgcolor='$display_colour'>
-					<b>
-						<font color='#FFFFFF'>
-							$display
-						</font>
-					</b>
-				</td>
-			</tr>
+				print <<END;
+				<tr>
+					<td align='left' nowrap='nowrap' bgcolor='$color{'color22'}'>
+						$confighash{$dkey}[1]
+					</td>
+					<td align='center'>
+						$confighash{$dkey}[11]
+					</td>
+					<td align='center' bgcolor='$display_colour'>
+						<b>
+							<font color='#FFFFFF'>
+								$display
+							</font>
+						</b>
+					</td>
+				</tr>
 END
+			}
 		}
 	}
 }
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -863,7 +863,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
    }
 		
    if ($cgiparams{'DHCP_DOMAIN'} ne ''){
-	unless (&General::validfqdn($cgiparams{'DHCP_DOMAIN'}) || &General::validip($cgiparams{'DHCP_DOMAIN'})) {
+	unless (&General::validdomainname($cgiparams{'DHCP_DOMAIN'}) || &General::validip($cgiparams{'DHCP_DOMAIN'})) {
 		$errormessage = $Lang::tr{'invalid input for dhcp domain'};
 	goto ADV_ERROR;
    	}
@@ -4969,19 +4969,13 @@ END
 }


-	my $disable_clientdl = "disabled='disabled'";
-	if (( $cgiparams{'ENABLED'} eq 'on') || 
-	    ( $cgiparams{'ENABLED_BLUE'} eq 'on') ||
-	    ( $cgiparams{'ENABLED_ORANGE'} eq 'on')){
-	    $disable_clientdl = "";
-	}
 	print <<END
 	<td align='center'>$active</td>
 		
 	<form method='post' name='frm${key}a'><td align='center'>
-	    <input type='image'  name='$Lang::tr{'dl client arch'}' $disable_clientdl src='/images/openvpn.png' alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' />
-	    <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' $disable_clientdl />
-	    <input type='hidden' name='KEY' value='$key' $disable_clientdl />
+	    <input type='image'  name='$Lang::tr{'dl client arch'}' src='/images/openvpn.png' alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' />
+	    <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' />
+	    <input type='hidden' name='KEY' value='$key' />
 	</td></form>
 END
 	;
--- a/html/cgi-bin/updatexlrator.cgi
+++ b/html/cgi-bin/updatexlrator.cgi
@@ -27,6 +27,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
+#
+# Changelog:
+# 2012-10-27: nightshift - Bugfix regarding showing wrong vendor icon while Download of new Updates
+# 2012-10-27: nightshift - Optimizing logic of check for vendor icons
+#

 use strict;

@@ -75,6 +80,7 @@ my @vendors=();
 my %vendorstats=();

 my $repository = "/var/updatecache/";
+my $webhome = "/srv/web/ipfire/html"; 
 my $hintcolour = '#FFFFCC';
 my $colourgray = '#808080';

@@ -549,46 +555,23 @@ END
 			print "<img src='/images/updbooster/updxl-led-gray.gif' alt='$Lang::tr{'updxlrtr condition suspended'}' />&nbsp;</td>\n";
 		}

-			print "\t\t<td align='center' nowrap='nowrap'>&nbsp;";
-			if ($vendorid =~ /^Adobe$/i)
-			{
-				print "<img src='/images/updbooster/updxl-src-adobe.gif' alt='Adobe'}' />&nbsp;</td>\n";
-			} elsif ($vendorid =~ /^Microsoft$/i)
-			{
-				print "<img src='/images/updbooster/updxl-src-windows.gif' alt='Microsoft'}' />&nbsp;</td>\n";
-			} elsif ($vendorid =~ /^Symantec$/i)
-			{
-				print "<img src='/images/updbooster/updxl-src-symantec.gif' alt='Symantec'}' />&nbsp;</td>\n";
-			} elsif ($vendorid =~ /^Linux$/i)
-			{
-				print "<img src='/images/updbooster/updxl-src-linux.gif' alt='Linux'}' />&nbsp;</td>\n";
-			} elsif ($vendorid =~ /^TrendMicro$/i)
-			{
-				print "<img src='/images/updbooster/updxl-src-trendmicro.gif' alt='Trend Micro'}' />&nbsp;</td>\n";
-			} elsif ($vendorid =~ /^Apple$/i)
-			{
-				print "<img src='/images/updbooster/updxl-src-apple.gif' alt='Apple'}' />&nbsp;</td>\n";
-			} elsif ($vendorid =~ /^Avast$/i)
-			{
-				print "<img src='/images/updbooster/updxl-src-avast.gif' alt='Avast'}' />&nbsp;</td>\n";
-			} else
-			{
-				if (-e "/home/httpd/html/images/updbooster/updxl-src-" . $vendorid . ".gif")
-				{
-					print "<img src='/images/updbooster/updxl-src-" . $vendorid . ".gif' alt='" . ucfirst $vendorid . "' />&nbsp;</td>\n";
-				} else {
-					print "<img src='/images/updbooster/updxl-src-unknown.gif' alt='" . ucfirst $vendorid . "' />&nbsp;</td>\n";
-				}
-			}
+		print "\t\t<td align='center' nowrap='nowrap'>&nbsp;";

-			$shortname = substr($updatefile,rindex($updatefile,"/")+1);
-			$shortname =~ s/(.*)_[\da-f]*(\.(exe|cab|psf)$)/$1_*$2/i;
+		if (($vendorid ne '') && (-e "$webhome/images/updbooster/updxl-src-$vendorid.gif"))
+		{
+			print "<img src='/images/updbooster/updxl-src-" . $vendorid . ".gif' alt='" . ucfirst $vendorid . "' />&nbsp;</td>\n";
+		} else {
+			print "<img src='/images/updbooster/updxl-src-unknown.gif' alt='" . ucfirst $vendorid . "' />&nbsp;</td>\n";
+		}

-			$filesize = $dlinfo{'REMOTESIZE'};
-			1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/;
-			$dlinfo{'VENDORID'}=ucfirst $vendorid;
+		$shortname = substr($updatefile,rindex($updatefile,"/")+1);
+		$shortname =~ s/(.*)_[\da-f]*(\.(exe|cab|psf)$)/$1_*$2/i;

-			print <<END
+		$filesize = $dlinfo{'REMOTESIZE'};
+		1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/;
+		$dlinfo{'VENDORID'} = ucfirst $vendorid;
+
+		print <<END
 		<td class='base' align='center'>&nbsp;$dlinfo{'VENDORID'}&nbsp;</td>
 		<td class='base' align='left' title='cache:/$updatefile'>$shortname</td>
 		<td class='base' align='right'  nowrap='nowrap'>&nbsp;$filesize&nbsp;</td>
--- a/html/html/images/updbooster/updxl-src-microsoft.gif
+++ b/html/html/images/updbooster/updxl-src-microsoft.gif
--- a/html/html/images/updbooster/updxl-src-windows.gif
+++ b/html/html/images/updbooster/updxl-src-windows.gif
--- a/lfs/IO-Socket-SSL
+++ b/lfs/IO-Socket-SSL
@@ -0,0 +1,62 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.78
+
+THISAPP    = IO-Socket-SSL-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = http://cpan.noris.de/authors/id/S/SU/SULLR/
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 172201f3ebc400dc3733a0577ac29095
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && perl Makefile.PL
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -24,7 +24,7 @@

 include Config

-VER        = 1.2.2
+VER        = 1.2.7

 THISAPP    = nfs-utils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,11 +32,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nfs
-PAK_VER    = 4
+PAK_VER    = 5

 DEPS       = "portmap"

-LIBNFSIDMAP = 0.23
+LIBNFSIDMAP = 0.25

 ###############################################################################
 # Top-level Rules
@@ -48,8 +48,8 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz

-$(DL_FILE)_MD5 = dad92f64db3266c7757f71bb53ee8f35
-libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 28f3ece648c1dc5d25e8d623d55f8bd6
+$(DL_FILE)_MD5 = 3b5ca797197765dc0c3a4122720c7716
+libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab

 install : $(TARGET)

@@ -93,6 +93,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--sysconfdir=/etc  \
 		--disable-gss \
 		--disable-tirpc \
+		--disable-nfsv41 \
 		--without-tcp-wrappers

 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
--- a/lfs/sendEmail
+++ b/lfs/sendEmail
@@ -0,0 +1,69 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.56
+
+THISAPP    = sendEmail-v$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = sendEmail
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 5b7bec4373268fa6446fa59416bb99fb
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && cp -pvf sendEmail /usr/local/bin
+	chmod 755 /usr/local/bin/sendEmail
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
+
--- a/make.sh
+++ b/make.sh
@@ -536,6 +536,7 @@ buildipfire() {
  ipfiremake Net-IPv4Addr
  ipfiremake Net_SSLeay
  ipfiremake IO-Stringy
+  ipfiremake IO-Socket-SSL
  ipfiremake Unix-Syslog
  ipfiremake Mail-Tools
  ipfiremake MIME-Tools
@@ -758,6 +759,7 @@ buildipfire() {
  ipfiremake libdaemon
  ipfiremake avahi
  ipfiremake nginx
+  ipfiremake sendEmail
  echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
  cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
  echo >> $BASEDIR/build/var/ipfire/firebuild
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -252,6 +252,7 @@ case "$1" in
 	# upnp chain for our upnp daemon
 	/sbin/iptables -t nat -N UPNPFW
 	/sbin/iptables -t nat -A PREROUTING -j UPNPFW
+	/sbin/iptables -A FORWARD -m state --state NEW -j UPNPFW
 	# This chain only contains dummy rules.
 	/sbin/iptables -N UPNPFW