Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-5

2026-04-09 18:45:54 +02:00 · 2012-09-12 16:14:31 +02:00
parent ba890f6584 c7fa84917f
commit e218d500dd
67 changed files with 4056 additions and 787 deletions
--- a/config/calamaris/mkreport
+++ b/config/calamaris/mkreport
@@ -94,7 +94,7 @@ sub processlogfiles
 		{
 			if ($filestr =~ /access\.log/) {
 				open (LOG,"gzip -dc $filestr |");
-				foreach (<LOG>) {
+				while (<LOG>) {
 					if (substr($_,0,10) >= $date_from) { if (substr($_,0,10) <= $date_to) { print TMPLOG "$_"; } }
 				}
 				close(LOG);
@@ -106,7 +106,7 @@ sub processlogfiles
 	{
 		if ($filestr =~ /access\.log/) {
 			open (LOG,$filestr);
-			foreach (<LOG>) {
+			while (<LOG>) {
 				if (substr($_,0,10) >= $date_from) { if (substr($_,0,10) <= $date_to) { print TMPLOG "$_"; } }
 			}
 			close(LOG);
--- a/config/cfgroot/ethernet-vlans
+++ b/config/cfgroot/ethernet-vlans
@@ -0,0 +1,9 @@
+#GREEN_PARENT_DEV="eth0"
+#GREEN_VLAN_ID=20
+#GREEN_MAC_ADDRESS="00:11:22:33:44:55"
+#BLUE_PARENT_DEV="green0"
+#BLUE_VLAN_ID=30
+#BLUE_MAC_ADDRESS="00:22:33:44:55:66"
+#ORANGE_PARENT_DEV="green0"
+#ORANGE_VLAN_ID=40
+#ORANGE_MAC_ADDRESS="00:33:44:55:66:77"
--- a/config/minidlna/minidlna.conf
+++ b/config/minidlna/minidlna.conf
@@ -0,0 +1,67 @@
+# port for HTTP (descriptions, SOAP, media transfer) traffic
+port=8200
+
+# network interfaces to serve, comma delimited
+network_interface=green0,blue0
+
+# set this to the directory you want scanned.
+# * if have multiple directories, you can have multiple media_dir= lines
+# * if you want to restrict a media_dir to a specific content type, you
+#   can prepend the type, followed by a comma, to the directory:
+#   + "A" for audio  (eg. media_dir=A,/home/jmaggard/Music)
+#   + "V" for video  (eg. media_dir=V,/home/jmaggard/Videos)
+#   + "P" for images (eg. media_dir=P,/home/jmaggard/Pictures)
+media_dir=/var/mp3
+
+# set this if you want to customize the name that shows up on your clients
+#friendly_name=My DLNA Server
+
+# set this if you would like to specify the directory where you want MiniDLNA to store its database and album art cache
+db_dir=/var/cache/minidlna
+
+# set this if you would like to specify the directory where you want MiniDLNA to store its log file
+#log_dir=/var/log
+
+# set this to change the verbosity of the information that is logged
+# each section can use a different level: off, fatal, error, warn, info, or debug
+#log_level=general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn
+
+# this should be a list of file names to check for when searching for album art
+# note: names should be delimited with a forward slash ("/")
+album_art_names=Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg
+
+# set this to no to disable inotify monitoring to automatically discover new files
+# note: the default is yes
+inotify=yes
+
+# set this to yes to enable support for streaming .jpg and .mp3 files to a TiVo supporting HMO
+enable_tivo=no
+
+# set this to strictly adhere to DLNA standards.
+# * This will allow server-side downscaling of very large JPEG images,
+#   which may hurt JPEG serving performance on (at least) Sony DLNA products.
+strict_dlna=no
+
+# default presentation url is http address on port 80
+#presentation_url=http://www.mylan/index.php
+
+# notify interval in seconds. default is 895 seconds.
+notify_interval=900
+
+# serial and model number the daemon will report to clients
+# in its XML description
+serial=12345678
+model_number=1
+
+# specify the path to the MiniSSDPd socket
+#minissdpdsocket=/var/run/minissdpd.sock
+
+# use different container as root of the tree
+# possible values:
+#   + "." - use standard container (this is the default)
+#   + "B" - "Browse Directory"
+#   + "M" - "Music"
+#   + "V" - "Video"
+#   + "P" - "Pictures"
+# if you specify "B" and client device is audio-only then "Music/Folders" will be used as root
+#root_container=.
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -73,7 +73,6 @@ my $PROTO = "";
 my $DPORT = "";
 my $DEV = "";
 my $MAC = "";
-my $POLICY = "";
 my $DO = "";
 my $DAY = "";

@@ -90,11 +89,9 @@ close FILE;

 if ( $outfwsettings{'POLICY'} eq 'MODE1' ) {
 	$outfwsettings{'STATE'} = "ALLOW";
-	$POLICY = "DROP";
-	$DO = "ACCEPT";
+	$DO = "RETURN";
 } elsif ( $outfwsettings{'POLICY'} eq 'MODE2' ) {
 	$outfwsettings{'STATE'} = "DENY";
-	$POLICY = "ACCEPT";
 	$DO = "DROP -m comment --comment 'DROP_OUTGOINGFW '";
 }

@@ -112,13 +109,13 @@ if ( $outfwsettings{'POLICY'} eq 'MODE0' ) {
 }

 if ( $outfwsettings{'POLICY'} eq 'MODE1' ) {
-	$CMD = "/sbin/iptables -A OUTGOINGFW -m state --state ESTABLISHED,RELATED -j ACCEPT";
+	$CMD = "/sbin/iptables -A OUTGOINGFW -m state --state ESTABLISHED,RELATED -j RETURN";
 	if ($DEBUG) { print "$CMD\n"; } else { system("$CMD"); }
-	$CMD = "/sbin/iptables -A OUTGOINGFWMAC -m state --state ESTABLISHED,RELATED -j ACCEPT";
+	$CMD = "/sbin/iptables -A OUTGOINGFWMAC -m state --state ESTABLISHED,RELATED -j RETURN";
 	if ($DEBUG) { print "$CMD\n"; } else { system("$CMD"); }
-		$CMD = "/sbin/iptables -A OUTGOINGFW -p icmp -j ACCEPT";
+		$CMD = "/sbin/iptables -A OUTGOINGFW -p icmp -j RETURN";
 	if ($DEBUG) { print "$CMD\n"; } else { system("$CMD"); }
-		$CMD = "/sbin/iptables -A OUTGOINGFWMAC -p icmp -j ACCEPT";
+		$CMD = "/sbin/iptables -A OUTGOINGFWMAC -p icmp -j RETURN";
 	if ($DEBUG) { print "$CMD\n"; } else { system("$CMD"); }
 }

@@ -260,7 +257,7 @@ foreach $p2pentry (sort @p2ps)
 			$P2PSTRING = "$P2PSTRING --$p2pline[1]";
 		}
 	} else {
-		$DO = "ACCEPT";
+		$DO = "RETURN";
 		if ("$p2pline[2]" eq "on") {
 			$P2PSTRING = "$P2PSTRING --$p2pline[1]";
 		}
@@ -290,4 +287,4 @@ if ( $outfwsettings{'POLICY'} eq 'MODE1' ) {
 	} else {
 		system("$CMD");
 	}
-}
+}
--- a/config/rootfiles/common/armv5tel/glibc
+++ b/config/rootfiles/common/armv5tel/glibc
@@ -466,7 +466,7 @@ usr/bin/ldd
 #usr/lib/crt1.o
 #usr/lib/crti.o
 #usr/lib/crtn.o
-#usr/lib/gconv
+usr/lib/gconv
 #usr/lib/gconv/ANSI_X3.110.so
 #usr/lib/gconv/ARMSCII-8.so
 #usr/lib/gconv/ASMO_449.so
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -47,6 +47,7 @@ etc/rc.d/init.d/mISDN
 #etc/rc.d/init.d/mediatomb
 #etc/rc.d/init.d/messagebus
 #etc/rc.d/init.d/miau
+#etc/rc.d/init.d/minidlna
 #etc/rc.d/init.d/miniupnpd
 #etc/rc.d/init.d/mldonkey
 etc/rc.d/init.d/modules
@@ -57,6 +58,7 @@ etc/rc.d/init.d/mountkernfs
 #etc/rc.d/init.d/mysql
 #etc/rc.d/init.d/netsnmpd
 etc/rc.d/init.d/network
+etc/rc.d/init.d/network-vlans
 #etc/rc.d/init.d/networking
 etc/rc.d/init.d/networking/any
 etc/rc.d/init.d/networking/blue
@@ -212,6 +214,7 @@ etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S75firstsetup
 etc/rc.d/rcsysinit.d/S80localnet
 etc/rc.d/rcsysinit.d/S90sysctl
+etc/rc.d/rcsysinit.d/S91network-vlans
 etc/rc.d/rc3.d/S15fireinfo
 #etc/sysconfig
 etc/sysconfig/createfiles
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -35,6 +35,7 @@ var/ipfire/ethernet
 #var/ipfire/ethernet/known_nics
 #var/ipfire/ethernet/scanned_nics
 #var/ipfire/ethernet/settings
+#var/ipfire/ethernet/vlans
 #var/ipfire/extrahd
 #var/ipfire/extrahd/bin
 var/ipfire/extrahd/bin/extrahd.pl
@@ -57,9 +58,9 @@ var/ipfire/langs
 #var/ipfire/langs/en.pl
 #var/ipfire/langs/es.pl
 #var/ipfire/langs/fr.pl
+#var/ipfire/langs/list
 #var/ipfire/langs/pl.pl
 #var/ipfire/langs/ru.pl
-#var/ipfire/langs/list
 var/ipfire/logging
 #var/ipfire/logging/settings
 var/ipfire/mac
--- a/config/rootfiles/common/i586/glibc
+++ b/config/rootfiles/common/i586/glibc
@@ -474,7 +474,7 @@ usr/bin/ldd
 #usr/lib/crt1.o
 #usr/lib/crti.o
 #usr/lib/crtn.o
-#usr/lib/gconv
+usr/lib/gconv
 #usr/lib/gconv/ANSI_X3.110.so
 #usr/lib/gconv/ARMSCII-8.so
 #usr/lib/gconv/ASMO_449.so
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -48,6 +48,7 @@ etc/rc.d/init.d/mISDN
 #etc/rc.d/init.d/mediatomb
 #etc/rc.d/init.d/messagebus
 #etc/rc.d/init.d/miau
+#etc/rc.d/init.d/minidlna
 #etc/rc.d/init.d/miniupnpd
 #etc/rc.d/init.d/mldonkey
 etc/rc.d/init.d/modules
@@ -58,6 +59,7 @@ etc/rc.d/init.d/mountkernfs
 #etc/rc.d/init.d/mysql
 #etc/rc.d/init.d/netsnmpd
 etc/rc.d/init.d/network
+etc/rc.d/init.d/network-vlans
 #etc/rc.d/init.d/networking
 etc/rc.d/init.d/networking/any
 etc/rc.d/init.d/networking/blue
@@ -215,6 +217,7 @@ etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S75firstsetup
 etc/rc.d/rcsysinit.d/S80localnet
 etc/rc.d/rcsysinit.d/S90sysctl
+etc/rc.d/rcsysinit.d/S91network-vlans
 etc/rc.d/rc3.d/S15fireinfo
 #etc/sysconfig
 etc/sysconfig/createfiles
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -5,6 +5,7 @@ usr/local/bin/backupctrl
 usr/local/bin/dhcpctrl
 usr/local/bin/extrahdctrl
 usr/local/bin/fireinfoctrl
+usr/local/bin/getconntracktable
 usr/local/bin/getipstat
 usr/local/bin/getiptstate
 #usr/local/bin/iowrap
--- a/config/rootfiles/common/nasm
+++ b/config/rootfiles/common/nasm
@@ -1,4 +1,4 @@
 #usr/bin/nasm
 #usr/bin/ndisasm
-#usr/man/man1/nasm.1
-#usr/man/man1/ndisasm.1
+#usr/share/man/man1/nasm.1
+#usr/share/man/man1/ndisasm.1
--- a/config/rootfiles/common/usb_modeswitch_data
+++ b/config/rootfiles/common/usb_modeswitch_data
@@ -5,6 +5,7 @@ usr/share/usb_modeswitch/03f0:002a
 usr/share/usb_modeswitch/0408:f000
 usr/share/usb_modeswitch/0421:060c
 usr/share/usb_modeswitch/0421:0610
+usr/share/usb_modeswitch/0421:061d
 usr/share/usb_modeswitch/0421:0622
 usr/share/usb_modeswitch/0421:0627
 usr/share/usb_modeswitch/0421:062c
@@ -35,6 +36,7 @@ usr/share/usb_modeswitch/05c7:1000
 usr/share/usb_modeswitch/072f:100d
 usr/share/usb_modeswitch/07d1:a800
 usr/share/usb_modeswitch/07d1:a804
+usr/share/usb_modeswitch/0922:1001
 usr/share/usb_modeswitch/0930:0d46
 usr/share/usb_modeswitch/0ace:2011
 usr/share/usb_modeswitch/0ace:20ff
@@ -77,6 +79,7 @@ usr/share/usb_modeswitch/0af0:8302
 usr/share/usb_modeswitch/0af0:8304
 usr/share/usb_modeswitch/0af0:8400
 usr/share/usb_modeswitch/0af0:8600
+usr/share/usb_modeswitch/0af0:8700
 usr/share/usb_modeswitch/0af0:8800
 usr/share/usb_modeswitch/0af0:8900
 usr/share/usb_modeswitch/0af0:9000
@@ -163,6 +166,7 @@ usr/share/usb_modeswitch/1410:5041
 usr/share/usb_modeswitch/1410:5059
 usr/share/usb_modeswitch/148e:a000
 usr/share/usb_modeswitch/148f:2578
+usr/share/usb_modeswitch/15eb:7153
 usr/share/usb_modeswitch/16d8:6281
 usr/share/usb_modeswitch/16d8:6803
 usr/share/usb_modeswitch/16d8:6804
@@ -184,12 +188,15 @@ usr/share/usb_modeswitch/19d2:0110
 usr/share/usb_modeswitch/19d2:0115
 usr/share/usb_modeswitch/19d2:0146
 usr/share/usb_modeswitch/19d2:0149
+usr/share/usb_modeswitch/19d2:0154
 usr/share/usb_modeswitch/19d2:0166
 usr/share/usb_modeswitch/19d2:0169
+usr/share/usb_modeswitch/19d2:0325
 usr/share/usb_modeswitch/19d2:1001
 usr/share/usb_modeswitch/19d2:1007
 usr/share/usb_modeswitch/19d2:1009
 usr/share/usb_modeswitch/19d2:1013
+usr/share/usb_modeswitch/19d2:1017
 usr/share/usb_modeswitch/19d2:1171
 usr/share/usb_modeswitch/19d2:1175
 usr/share/usb_modeswitch/19d2:1179
@@ -209,7 +216,9 @@ usr/share/usb_modeswitch/1a8d:1000
 usr/share/usb_modeswitch/1a8d:2000
 usr/share/usb_modeswitch/1ab7:5700
 usr/share/usb_modeswitch/1b7d:0700
+usr/share/usb_modeswitch/1bbb:00ca
 usr/share/usb_modeswitch/1bbb:f000
+usr/share/usb_modeswitch/1bbb:f017
 usr/share/usb_modeswitch/1bbb:f052
 usr/share/usb_modeswitch/1c9e:1001
 usr/share/usb_modeswitch/1c9e:6061
@@ -227,6 +236,7 @@ usr/share/usb_modeswitch/1edf:6003
 usr/share/usb_modeswitch/1ee8:0009
 usr/share/usb_modeswitch/1ee8:0013
 usr/share/usb_modeswitch/1ee8:0040
+usr/share/usb_modeswitch/1ee8:004a
 usr/share/usb_modeswitch/1ee8:0060
 usr/share/usb_modeswitch/1f28:0021
 usr/share/usb_modeswitch/1fac:0032
@@ -237,7 +247,10 @@ usr/share/usb_modeswitch/201e:2009
 usr/share/usb_modeswitch/2020:f00e
 usr/share/usb_modeswitch/2077:f000
 usr/share/usb_modeswitch/21f5:1000
+usr/share/usb_modeswitch/22de:6803
 usr/share/usb_modeswitch/22f4:0021
 usr/share/usb_modeswitch/230d:0001
 usr/share/usb_modeswitch/230d:0007
+usr/share/usb_modeswitch/230d:0101
+usr/share/usb_modeswitch/2357:0200
 usr/share/usb_modeswitch/8888:6500
--- a/config/rootfiles/core/61/filelists/files
+++ b/config/rootfiles/core/61/filelists/files
@@ -2,9 +2,14 @@ etc/system-release
 etc/issue
 etc/rc.d/init.d/collectd
 opt/pakfire/lib/functions.sh
+srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/services.cgi
 var/ipfire/general-functions.pl
 var/ipfire/langs
+var/ipfire/proxy/calamaris/bin/mkreport
+usr/local/bin/getconntracktable
 usr/sbin/redirect_wrapper
--- a/config/rootfiles/core/62/exclude
+++ b/config/rootfiles/core/62/exclude
@@ -0,0 +1,12 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
--- a/config/rootfiles/core/62/filelists/GeoIP
+++ b/config/rootfiles/core/62/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
--- a/config/rootfiles/core/62/filelists/files
+++ b/config/rootfiles/core/62/filelists/files
@@ -0,0 +1,8 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/network-vlans
+etc/rc.d/rcsysinit.d/S91network-vlans
+srv/web/ipfire/cgi-bin/connections.cgi
+usr/lib/gconv
+var/ipfire/ethernet/vlans
+var/ipfire/outgoing/bin/outgoingfw.pl
--- a/config/rootfiles/core/62/filelists/hwdata
+++ b/config/rootfiles/core/62/filelists/hwdata
@@ -0,0 +1,2 @@
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids
--- a/config/rootfiles/core/62/filelists/php
+++ b/config/rootfiles/core/62/filelists/php
@@ -0,0 +1 @@
+../../../common/php
--- a/config/rootfiles/core/62/filelists/usb_modeswitch
+++ b/config/rootfiles/core/62/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
--- a/config/rootfiles/core/62/filelists/usb_modeswitch_data
+++ b/config/rootfiles/core/62/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
--- a/config/rootfiles/core/62/meta
+++ b/config/rootfiles/core/62/meta
@@ -0,0 +1 @@
+DEPS=""
--- a/config/rootfiles/core/62/update.sh
+++ b/config/rootfiles/core/62/update.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2012 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=62
+for (( i=1; i<=$core; i++ ))
+do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#arch=`uname -m`
+#if [ ${arch::3} == "arm" ]; then
+#	depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
+#	depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
+#else
+#	depmod -a 2.6.32.45-ipfire     >/dev/null 2>&1
+#	depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+#	depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+#fi
+
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
--- a/config/rootfiles/packages/apcupsd
+++ b/config/rootfiles/packages/apcupsd
@@ -12,11 +12,12 @@ etc/apcupsd/onbattery
 etc/rc.d/rc0.d/K35apcupsd
 etc/rc.d/rc3.d/S65apcupsd
 etc/rc.d/rc6.d/K35apcupsd
+#root/.lesshst
 sbin/apcaccess
 sbin/apctest
 sbin/apcupsd
 sbin/smtp
-#srv/web/ipfire/cgi-bin/multimon.cgi
+srv/web/ipfire/cgi-bin/multimon.cgi
 srv/web/ipfire/cgi-bin/upsfstats.cgi
 srv/web/ipfire/cgi-bin/upsimage.cgi
 srv/web/ipfire/cgi-bin/upsstats.cgi
@@ -25,6 +26,10 @@ srv/web/ipfire/cgi-bin/upsstats.cgi
 #usr/share/hal/fdi/policy
 #usr/share/hal/fdi/policy/20thirdparty
 #usr/share/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi
+#usr/share/man/man5/apcupsd.conf.5
+#usr/share/man/man8/apcaccess.8
+#usr/share/man/man8/apccontrol.8
+#usr/share/man/man8/apctest.8
 #usr/share/man/man8/apcupsd.8
 etc/rc.d/init.d/apcupsd
 var/ipfire/menu.d/EX-apcupsd.menu
--- a/config/rootfiles/packages/flac
+++ b/config/rootfiles/packages/flac
@@ -0,0 +1,314 @@
+usr/bin/flac
+usr/bin/metaflac
+#usr/include/FLAC
+#usr/include/FLAC++
+#usr/include/FLAC++/all.h
+#usr/include/FLAC++/decoder.h
+#usr/include/FLAC++/encoder.h
+#usr/include/FLAC++/export.h
+#usr/include/FLAC++/metadata.h
+#usr/include/FLAC/all.h
+#usr/include/FLAC/assert.h
+#usr/include/FLAC/callback.h
+#usr/include/FLAC/export.h
+#usr/include/FLAC/format.h
+#usr/include/FLAC/metadata.h
+#usr/include/FLAC/ordinals.h
+#usr/include/FLAC/stream_decoder.h
+#usr/include/FLAC/stream_encoder.h
+#usr/lib/libFLAC++.a
+#usr/lib/libFLAC++.la
+#usr/lib/libFLAC++.so
+usr/lib/libFLAC++.so.6
+usr/lib/libFLAC++.so.6.2.0
+#usr/lib/libFLAC.a
+#usr/lib/libFLAC.la
+#usr/lib/libFLAC.so
+usr/lib/libFLAC.so.8
+usr/lib/libFLAC.so.8.2.0
+#usr/lib/pkgconfig/flac++.pc
+#usr/lib/pkgconfig/flac.pc
+#usr/man/man1/flac.1
+#usr/man/man1/metaflac.1
+#usr/share/aclocal/libFLAC++.m4
+#usr/share/aclocal/libFLAC.m4
+#usr/share/doc/flac-1.2.1
+#usr/share/doc/flac-1.2.1/FLAC.tag
+#usr/share/doc/flac-1.2.1/html
+#usr/share/doc/flac-1.2.1/html/api
+#usr/share/doc/flac-1.2.1/html/api/+_2all_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/+_2export_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/+_2export_8h.html
+#usr/share/doc/flac-1.2.1/html/api/+_2metadata_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/+_2metadata_8h.html
+#usr/share/doc/flac-1.2.1/html/api/all_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/annotated.html
+#usr/share/doc/flac-1.2.1/html/api/assert_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/callback_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/callback_8h.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1File-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1File.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1File.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1File-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1File.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1File.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Application-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Application.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Application.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Chain.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Iterator.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Padding.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Padding.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Picture-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Picture.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Picture.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Prototype.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Prototype.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SeekTable.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SeekTable.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1StreamInfo.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Unknown.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Unknown.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment.png
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
+#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
+#usr/share/doc/flac-1.2.1/html/api/classes.html
+#usr/share/doc/flac-1.2.1/html/api/decoder_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/decoder_8h.html
+#usr/share/doc/flac-1.2.1/html/api/dir_000000.html
+#usr/share/doc/flac-1.2.1/html/api/dir_000001.html
+#usr/share/doc/flac-1.2.1/html/api/dir_000002.html
+#usr/share/doc/flac-1.2.1/html/api/dirs.html
+#usr/share/doc/flac-1.2.1/html/api/doxygen.css
+#usr/share/doc/flac-1.2.1/html/api/doxygen.png
+#usr/share/doc/flac-1.2.1/html/api/encoder_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/encoder_8h.html
+#usr/share/doc/flac-1.2.1/html/api/export_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/export_8h.html
+#usr/share/doc/flac-1.2.1/html/api/files.html
+#usr/share/doc/flac-1.2.1/html/api/format_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/format_8h.html
+#usr/share/doc/flac-1.2.1/html/api/functions.html
+#usr/share/doc/flac-1.2.1/html/api/functions_func.html
+#usr/share/doc/flac-1.2.1/html/api/functions_vars.html
+#usr/share/doc/flac-1.2.1/html/api/globals.html
+#usr/share/doc/flac-1.2.1/html/api/globals_0x66.html
+#usr/share/doc/flac-1.2.1/html/api/globals_0x67.html
+#usr/share/doc/flac-1.2.1/html/api/globals_defs.html
+#usr/share/doc/flac-1.2.1/html/api/globals_enum.html
+#usr/share/doc/flac-1.2.1/html/api/globals_eval.html
+#usr/share/doc/flac-1.2.1/html/api/globals_func.html
+#usr/share/doc/flac-1.2.1/html/api/globals_type.html
+#usr/share/doc/flac-1.2.1/html/api/globals_vars.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac__callbacks.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac__decoder.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac__encoder.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac__export.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac__format.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata__level0.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata__level1.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata__level2.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata__object.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac__stream__decoder.html
+#usr/share/doc/flac-1.2.1/html/api/group__flac__stream__encoder.html
+#usr/share/doc/flac-1.2.1/html/api/group__flacpp.html
+#usr/share/doc/flac-1.2.1/html/api/group__flacpp__decoder.html
+#usr/share/doc/flac-1.2.1/html/api/group__flacpp__encoder.html
+#usr/share/doc/flac-1.2.1/html/api/group__flacpp__export.html
+#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata.html
+#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata__level0.html
+#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata__level1.html
+#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata__level2.html
+#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata__object.html
+#usr/share/doc/flac-1.2.1/html/api/group__porting.html
+#usr/share/doc/flac-1.2.1/html/api/group__porting__1__1__2__to__1__1__3.html
+#usr/share/doc/flac-1.2.1/html/api/group__porting__1__1__3__to__1__1__4.html
+#usr/share/doc/flac-1.2.1/html/api/group__porting__1__1__4__to__1__2__0.html
+#usr/share/doc/flac-1.2.1/html/api/hierarchy.html
+#usr/share/doc/flac-1.2.1/html/api/index.html
+#usr/share/doc/flac-1.2.1/html/api/metadata_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/metadata_8h.html
+#usr/share/doc/flac-1.2.1/html/api/modules.html
+#usr/share/doc/flac-1.2.1/html/api/ordinals_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/stream__decoder_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/stream__decoder_8h.html
+#usr/share/doc/flac-1.2.1/html/api/stream__encoder_8h-source.html
+#usr/share/doc/flac-1.2.1/html/api/stream__encoder_8h.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____Frame-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____Frame.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____FrameFooter-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____FrameFooter.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____FrameHeader-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____FrameHeader.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____IOCallbacks-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____IOCallbacks.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamDecoder-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamDecoder.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamEncoder-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamEncoder.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Application-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Application.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet__Index.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Padding-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Padding.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Picture-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Picture.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__SeekPoint.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__SeekTable-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__SeekTable.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__StreamInfo-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__StreamInfo.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Unknown-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Unknown.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__VorbisComment-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__VorbisComment.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Constant-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Constant.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Fixed-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Fixed.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__LPC-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__LPC.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Verbatim-members.html
+#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Verbatim.html
+#usr/share/doc/flac-1.2.1/html/changelog.html
+#usr/share/doc/flac-1.2.1/html/comparison.html
+#usr/share/doc/flac-1.2.1/html/comparison__chopin_prelude_24.html
+#usr/share/doc/flac-1.2.1/html/comparison__dream_theater_600.html
+#usr/share/doc/flac-1.2.1/html/comparison__eddie_warner_titus.html
+#usr/share/doc/flac-1.2.1/html/comparison__fanfare_de_l_eventail_de_jeanne.html
+#usr/share/doc/flac-1.2.1/html/comparison__gloria_estefan_conga.html
+#usr/share/doc/flac-1.2.1/html/comparison__hand_in_my_pocket.html
+#usr/share/doc/flac-1.2.1/html/comparison__l_sub_raga_sivapriya.html
+#usr/share/doc/flac-1.2.1/html/comparison__laetatus_sum.html
+#usr/share/doc/flac-1.2.1/html/comparison__mummified_in_barbed_wire.html
+#usr/share/doc/flac-1.2.1/html/comparison__prokofiev_pcon3_3.html
+#usr/share/doc/flac-1.2.1/html/comparison__ravel_sq4_4.html
+#usr/share/doc/flac-1.2.1/html/comparison__scarlatti_k42.html
+#usr/share/doc/flac-1.2.1/html/comparison__tool_forty_six_and_2.html
+#usr/share/doc/flac-1.2.1/html/comparison__white_room.html
+#usr/share/doc/flac-1.2.1/html/comparison_all_cpudectime.html
+#usr/share/doc/flac-1.2.1/html/comparison_all_cpuenctime.html
+#usr/share/doc/flac-1.2.1/html/comparison_all_procdectime.html
+#usr/share/doc/flac-1.2.1/html/comparison_all_procenctime.html
+#usr/share/doc/flac-1.2.1/html/comparison_all_ratio.html
+#usr/share/doc/flac-1.2.1/html/developers.html
+#usr/share/doc/flac-1.2.1/html/documentation.html
+#usr/share/doc/flac-1.2.1/html/documentation_bugs.html
+#usr/share/doc/flac-1.2.1/html/documentation_example_code.html
+#usr/share/doc/flac-1.2.1/html/documentation_format_overview.html
+#usr/share/doc/flac-1.2.1/html/documentation_tasks.html
+#usr/share/doc/flac-1.2.1/html/documentation_tools.html
+#usr/share/doc/flac-1.2.1/html/documentation_tools_flac.html
+#usr/share/doc/flac-1.2.1/html/documentation_tools_metaflac.html
+#usr/share/doc/flac-1.2.1/html/documentation_tools_plugins.html
+#usr/share/doc/flac-1.2.1/html/download.html
+#usr/share/doc/flac-1.2.1/html/faq.html
+#usr/share/doc/flac-1.2.1/html/favicon.ico
+#usr/share/doc/flac-1.2.1/html/features.html
+#usr/share/doc/flac-1.2.1/html/flac.css
+#usr/share/doc/flac-1.2.1/html/format.html
+#usr/share/doc/flac-1.2.1/html/id.html
+#usr/share/doc/flac-1.2.1/html/images
+#usr/share/doc/flac-1.2.1/html/images/1x1.gif
+#usr/share/doc/flac-1.2.1/html/images/cafebug.gif
+#usr/share/doc/flac-1.2.1/html/images/hw
+#usr/share/doc/flac-1.2.1/html/images/hw/Blackbird_Front_low3_325x87.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/MS300frontsmall_270x108.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/MediaBox_Frt_170x325.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/SB_Hero_Black_325x182.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/Sooloos-ControlOne_325x328.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/Z500_front_325x94.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/a2_01_325x252.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/arcus_325x135.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/bmp-1430_325x241.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/cs505_front_lrg_325x113.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/enus_3-4lft-hires_product_eva8000_325x127.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/escient_ProductLine_325x163.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/hifidelio_bl_front_Z_RGB_325x163.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/i-station-mini-dx_325x237.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/iwod-g10_325x257.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/knc_hr-2800_325x209.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/mediaready_prodmain_MRMCa_325x232.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/meizu_m6_325x206.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/musica_artwork_325x90.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/neodigits_x5000_325x124.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/onda-vx737_325x240.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/request_n_front_325x103.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/rio_karma_279x254.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/sonos_family_RGB_325x200.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/teclast-tl29_325x244.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/transporter_hero_grey_325x208.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/tvix-4000_325x204.jpg
+#usr/share/doc/flac-1.2.1/html/images/hw/vibez_nofm_combi_black_b_325x220.jpg
+#usr/share/doc/flac-1.2.1/html/images/logo100.gif
+#usr/share/doc/flac-1.2.1/html/images/logo130.gif
+#usr/share/doc/flac-1.2.1/html/index.html
+#usr/share/doc/flac-1.2.1/html/itunes.html
+#usr/share/doc/flac-1.2.1/html/license.html
+#usr/share/doc/flac-1.2.1/html/links.html
+#usr/share/doc/flac-1.2.1/html/news.html
+#usr/share/doc/flac-1.2.1/html/ogg_mapping.html
+#usr/share/doc/flac-1.2.1/html/ru
+#usr/share/doc/flac-1.2.1/html/ru/authors.html
+#usr/share/doc/flac-1.2.1/html/ru/comparison.html
+#usr/share/doc/flac-1.2.1/html/ru/developers.html
+#usr/share/doc/flac-1.2.1/html/ru/documentation.html
+#usr/share/doc/flac-1.2.1/html/ru/download.html
+#usr/share/doc/flac-1.2.1/html/ru/features.html
+#usr/share/doc/flac-1.2.1/html/ru/format.html
+#usr/share/doc/flac-1.2.1/html/ru/goals.html
+#usr/share/doc/flac-1.2.1/html/ru/id.html
+#usr/share/doc/flac-1.2.1/html/ru/index.html
+#usr/share/doc/flac-1.2.1/html/ru/links.html
+#usr/share/doc/flac-1.2.1/html/ru/news.html
--- a/config/rootfiles/packages/fping
+++ b/config/rootfiles/packages/fping
@@ -0,0 +1,2 @@
+usr/sbin/fping
+#usr/share/man/man8/fping.8
--- a/config/rootfiles/packages/libexif
+++ b/config/rootfiles/packages/libexif
@@ -0,0 +1,64 @@
+#usr/include/libexif
+#usr/include/libexif/_stdint.h
+#usr/include/libexif/exif-byte-order.h
+#usr/include/libexif/exif-content.h
+#usr/include/libexif/exif-data-type.h
+#usr/include/libexif/exif-data.h
+#usr/include/libexif/exif-entry.h
+#usr/include/libexif/exif-format.h
+#usr/include/libexif/exif-ifd.h
+#usr/include/libexif/exif-loader.h
+#usr/include/libexif/exif-log.h
+#usr/include/libexif/exif-mem.h
+#usr/include/libexif/exif-mnote-data.h
+#usr/include/libexif/exif-tag.h
+#usr/include/libexif/exif-utils.h
+#usr/lib/libexif.la
+#usr/lib/libexif.so
+usr/lib/libexif.so.12
+usr/lib/libexif.so.12.3.3
+usr/lib/pkgconfig/libexif.pc
+#usr/share/doc/libexif
+#usr/share/doc/libexif/ABOUT-NLS
+#usr/share/doc/libexif/AUTHORS
+#usr/share/doc/libexif/COPYING
+#usr/share/doc/libexif/ChangeLog
+#usr/share/doc/libexif/NEWS
+#usr/share/doc/libexif/README
+#usr/share/locale/be/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/bs
+#usr/share/locale/bs/LC_MESSAGES
+#usr/share/locale/bs/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/cs/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/da/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/de/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/en_AU
+#usr/share/locale/en_AU/LC_MESSAGES
+#usr/share/locale/en_AU/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/en_CA
+#usr/share/locale/en_CA/LC_MESSAGES
+#usr/share/locale/en_CA/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/en_GB/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/es/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/fr/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/it/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/ja/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/nl/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/pl/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/pt
+#usr/share/locale/pt/LC_MESSAGES
+#usr/share/locale/pt/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/ru/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/sk/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/sq
+#usr/share/locale/sq/LC_MESSAGES
+#usr/share/locale/sq/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/sr
+#usr/share/locale/sr/LC_MESSAGES
+#usr/share/locale/sr/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/sv/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/tr/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/uk/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/vi/LC_MESSAGES/libexif-12.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/libexif-12.mo
--- a/config/rootfiles/packages/minidlna
+++ b/config/rootfiles/packages/minidlna
@@ -0,0 +1,3 @@
+etc/rc.d/init.d/minidlna
+etc/minidlna.conf
+usr/sbin/minidlna
--- a/config/rootfiles/packages/nmap
+++ b/config/rootfiles/packages/nmap
@@ -55,16 +55,25 @@ usr/share/nmap/nmap.xsl
 usr/share/nmap/nse_main.lua
 #usr/share/nmap/nselib
 usr/share/nmap/nselib/afp.lua
+usr/share/nmap/nselib/amqp.lua
 usr/share/nmap/nselib/asn1.lua
 usr/share/nmap/nselib/base64.lua
+usr/share/nmap/nselib/bitcoin.lua
+usr/share/nmap/nselib/bittorrent.lua
 usr/share/nmap/nselib/brute.lua
 usr/share/nmap/nselib/citrixxml.lua
 usr/share/nmap/nselib/comm.lua
+usr/share/nmap/nselib/creds.lua
+usr/share/nmap/nselib/cvs.lua
 #usr/share/nmap/nselib/data
 usr/share/nmap/nselib/data/favicon-db
+usr/share/nmap/nselib/data/http-default-accounts-fingerprints.lua
 usr/share/nmap/nselib/data/http-fingerprints.lua
 usr/share/nmap/nselib/data/http-folders.txt
+usr/share/nmap/nselib/data/mysql-cis.audit
+usr/share/nmap/nselib/data/oracle-default-accounts.lst
 usr/share/nmap/nselib/data/oracle-sids
+usr/share/nmap/nselib/data/packetdecoders.lua
 usr/share/nmap/nselib/data/passwords.lst
 #usr/share/nmap/nselib/data/psexec
 usr/share/nmap/nselib/data/psexec/README
@@ -77,15 +86,26 @@ usr/share/nmap/nselib/data/psexec/network.lua
 usr/share/nmap/nselib/data/psexec/nmap_service.c
 usr/share/nmap/nselib/data/psexec/nmap_service.vcproj
 usr/share/nmap/nselib/data/psexec/pwdump.lua
+usr/share/nmap/nselib/data/rtsp-urls.txt
+usr/share/nmap/nselib/data/snmpcommunities.lst
+usr/share/nmap/nselib/data/ssl-ciphers
+usr/share/nmap/nselib/data/ssl-fingerprints
+usr/share/nmap/nselib/data/tftplist.txt
 usr/share/nmap/nselib/data/usernames.lst
+usr/share/nmap/nselib/data/wp-plugins.lst
 usr/share/nmap/nselib/datafiles.lua
 usr/share/nmap/nselib/dhcp.lua
+usr/share/nmap/nselib/dhcp6.lua
 usr/share/nmap/nselib/dns.lua
+usr/share/nmap/nselib/dnsbl.lua
 usr/share/nmap/nselib/dnssd.lua
 usr/share/nmap/nselib/drda.lua
+usr/share/nmap/nselib/eap.lua
 usr/share/nmap/nselib/ftp.lua
 usr/share/nmap/nselib/giop.lua
 usr/share/nmap/nselib/http.lua
+usr/share/nmap/nselib/httpspider.lua
+usr/share/nmap/nselib/iax2.lua
 usr/share/nmap/nselib/imap.lua
 usr/share/nmap/nselib/informix.lua
 usr/share/nmap/nselib/ipOps.lua
@@ -94,52 +114,105 @@ usr/share/nmap/nselib/json.lua
 usr/share/nmap/nselib/ldap.lua
 usr/share/nmap/nselib/listop.lua
 usr/share/nmap/nselib/match.lua
+usr/share/nmap/nselib/membase.lua
 usr/share/nmap/nselib/mongodb.lua
 usr/share/nmap/nselib/msrpc.lua
 usr/share/nmap/nselib/msrpcperformance.lua
 usr/share/nmap/nselib/msrpctypes.lua
 usr/share/nmap/nselib/mssql.lua
 usr/share/nmap/nselib/mysql.lua
+usr/share/nmap/nselib/natpmp.lua
+usr/share/nmap/nselib/ncp.lua
+usr/share/nmap/nselib/ndmp.lua
 usr/share/nmap/nselib/netbios.lua
 usr/share/nmap/nselib/nrpc.lua
 usr/share/nmap/nselib/nsedebug.lua
+usr/share/nmap/nselib/omp2.lua
 usr/share/nmap/nselib/packet.lua
 usr/share/nmap/nselib/pgsql.lua
 usr/share/nmap/nselib/pop3.lua
+usr/share/nmap/nselib/pppoe.lua
 usr/share/nmap/nselib/proxy.lua
+usr/share/nmap/nselib/redis.lua
 usr/share/nmap/nselib/rmi.lua
 usr/share/nmap/nselib/rpc.lua
+usr/share/nmap/nselib/rpcap.lua
+usr/share/nmap/nselib/rsync.lua
+usr/share/nmap/nselib/rtsp.lua
+usr/share/nmap/nselib/sasl.lua
 usr/share/nmap/nselib/shortport.lua
+usr/share/nmap/nselib/sip.lua
 usr/share/nmap/nselib/smb.lua
 usr/share/nmap/nselib/smbauth.lua
+usr/share/nmap/nselib/smtp.lua
 usr/share/nmap/nselib/snmp.lua
+usr/share/nmap/nselib/socks.lua
+usr/share/nmap/nselib/srvloc.lua
 usr/share/nmap/nselib/ssh1.lua
 usr/share/nmap/nselib/ssh2.lua
+usr/share/nmap/nselib/sslcert.lua
 usr/share/nmap/nselib/stdnse.lua
 usr/share/nmap/nselib/strbuf.lua
 usr/share/nmap/nselib/strict.lua
+usr/share/nmap/nselib/stun.lua
 usr/share/nmap/nselib/tab.lua
 usr/share/nmap/nselib/target.lua
+usr/share/nmap/nselib/tftp.lua
 usr/share/nmap/nselib/tns.lua
 usr/share/nmap/nselib/unpwdb.lua
 usr/share/nmap/nselib/upnp.lua
 usr/share/nmap/nselib/url.lua
+usr/share/nmap/nselib/versant.lua
 usr/share/nmap/nselib/vnc.lua
+usr/share/nmap/nselib/vulns.lua
+usr/share/nmap/nselib/vuzedht.lua
 usr/share/nmap/nselib/wsdd.lua
+usr/share/nmap/nselib/xdmcp.lua
+usr/share/nmap/nselib/xmpp.lua
 #usr/share/nmap/scripts
+usr/share/nmap/scripts/acarsd-info.nse
+usr/share/nmap/scripts/address-info.nse
 usr/share/nmap/scripts/afp-brute.nse
+usr/share/nmap/scripts/afp-ls.nse
 usr/share/nmap/scripts/afp-path-vuln.nse
 usr/share/nmap/scripts/afp-serverinfo.nse
 usr/share/nmap/scripts/afp-showmount.nse
+usr/share/nmap/scripts/amqp-info.nse
 usr/share/nmap/scripts/asn-query.nse
 usr/share/nmap/scripts/auth-owners.nse
 usr/share/nmap/scripts/auth-spoof.nse
+usr/share/nmap/scripts/backorifice-brute.nse
+usr/share/nmap/scripts/backorifice-info.nse
 usr/share/nmap/scripts/banner.nse
+usr/share/nmap/scripts/bitcoin-getaddr.nse
+usr/share/nmap/scripts/bitcoin-info.nse
+usr/share/nmap/scripts/bitcoinrpc-info.nse
+usr/share/nmap/scripts/bittorrent-discovery.nse
+usr/share/nmap/scripts/broadcast-avahi-dos.nse
+usr/share/nmap/scripts/broadcast-db2-discover.nse
+usr/share/nmap/scripts/broadcast-dhcp-discover.nse
+usr/share/nmap/scripts/broadcast-dhcp6-discover.nse
 usr/share/nmap/scripts/broadcast-dns-service-discovery.nse
 usr/share/nmap/scripts/broadcast-dropbox-listener.nse
+usr/share/nmap/scripts/broadcast-listener.nse
 usr/share/nmap/scripts/broadcast-ms-sql-discover.nse
+usr/share/nmap/scripts/broadcast-netbios-master-browser.nse
+usr/share/nmap/scripts/broadcast-networker-discover.nse
+usr/share/nmap/scripts/broadcast-novell-locate.nse
+usr/share/nmap/scripts/broadcast-pc-anywhere.nse
+usr/share/nmap/scripts/broadcast-pc-duo.nse
+usr/share/nmap/scripts/broadcast-ping.nse
+usr/share/nmap/scripts/broadcast-pppoe-discover.nse
+usr/share/nmap/scripts/broadcast-rip-discover.nse
+usr/share/nmap/scripts/broadcast-ripng-discover.nse
+usr/share/nmap/scripts/broadcast-sybase-asa-discover.nse
 usr/share/nmap/scripts/broadcast-upnp-info.nse
+usr/share/nmap/scripts/broadcast-versant-locate.nse
+usr/share/nmap/scripts/broadcast-wake-on-lan.nse
+usr/share/nmap/scripts/broadcast-wpad-discover.nse
 usr/share/nmap/scripts/broadcast-wsdd-discover.nse
+usr/share/nmap/scripts/broadcast-xdmcp-discover.nse
+usr/share/nmap/scripts/cccam-version.nse
 usr/share/nmap/scripts/citrix-brute-xml.nse
 usr/share/nmap/scripts/citrix-enum-apps-xml.nse
 usr/share/nmap/scripts/citrix-enum-apps.nse
@@ -147,24 +220,38 @@ usr/share/nmap/scripts/citrix-enum-servers-xml.nse
 usr/share/nmap/scripts/citrix-enum-servers.nse
 usr/share/nmap/scripts/couchdb-databases.nse
 usr/share/nmap/scripts/couchdb-stats.nse
+usr/share/nmap/scripts/creds-summary.nse
+usr/share/nmap/scripts/cvs-brute-repository.nse
+usr/share/nmap/scripts/cvs-brute.nse
 usr/share/nmap/scripts/daap-get-library.nse
 usr/share/nmap/scripts/daytime.nse
 usr/share/nmap/scripts/db2-das-info.nse
 usr/share/nmap/scripts/db2-discover.nse
 usr/share/nmap/scripts/dhcp-discover.nse
+usr/share/nmap/scripts/dns-blacklist.nse
+usr/share/nmap/scripts/dns-brute.nse
 usr/share/nmap/scripts/dns-cache-snoop.nse
+usr/share/nmap/scripts/dns-client-subnet-scan.nse
 usr/share/nmap/scripts/dns-fuzz.nse
+usr/share/nmap/scripts/dns-nsec-enum.nse
+usr/share/nmap/scripts/dns-nsid.nse
 usr/share/nmap/scripts/dns-random-srcport.nse
 usr/share/nmap/scripts/dns-random-txid.nse
 usr/share/nmap/scripts/dns-recursion.nse
 usr/share/nmap/scripts/dns-service-discovery.nse
+usr/share/nmap/scripts/dns-srv-enum.nse
 usr/share/nmap/scripts/dns-update.nse
+usr/share/nmap/scripts/dns-zeustracker.nse
 usr/share/nmap/scripts/dns-zone-transfer.nse
 usr/share/nmap/scripts/domcon-brute.nse
 usr/share/nmap/scripts/domcon-cmd.nse
 usr/share/nmap/scripts/domino-enum-users.nse
+usr/share/nmap/scripts/dpap-brute.nse
 usr/share/nmap/scripts/drda-brute.nse
 usr/share/nmap/scripts/drda-info.nse
+usr/share/nmap/scripts/duplicates.nse
+usr/share/nmap/scripts/eap-info.nse
+usr/share/nmap/scripts/epmd-info.nse
 usr/share/nmap/scripts/finger.nse
 usr/share/nmap/scripts/firewalk.nse
 usr/share/nmap/scripts/ftp-anon.nse
@@ -172,56 +259,121 @@ usr/share/nmap/scripts/ftp-bounce.nse
 usr/share/nmap/scripts/ftp-brute.nse
 usr/share/nmap/scripts/ftp-libopie.nse
 usr/share/nmap/scripts/ftp-proftpd-backdoor.nse
+usr/share/nmap/scripts/ftp-vsftpd-backdoor.nse
+usr/share/nmap/scripts/ftp-vuln-cve2010-4221.nse
+usr/share/nmap/scripts/ganglia-info.nse
 usr/share/nmap/scripts/giop-info.nse
 usr/share/nmap/scripts/gopher-ls.nse
+usr/share/nmap/scripts/hadoop-datanode-info.nse
+usr/share/nmap/scripts/hadoop-jobtracker-info.nse
+usr/share/nmap/scripts/hadoop-namenode-info.nse
+usr/share/nmap/scripts/hadoop-secondary-namenode-info.nse
+usr/share/nmap/scripts/hadoop-tasktracker-info.nse
+usr/share/nmap/scripts/hbase-master-info.nse
+usr/share/nmap/scripts/hbase-region-info.nse
 usr/share/nmap/scripts/hddtemp-info.nse
-usr/share/nmap/scripts/hostmap.nse
+usr/share/nmap/scripts/hostmap-bfk.nse
+usr/share/nmap/scripts/http-affiliate-id.nse
+usr/share/nmap/scripts/http-apache-negotiation.nse
+usr/share/nmap/scripts/http-auth-finder.nse
 usr/share/nmap/scripts/http-auth.nse
+usr/share/nmap/scripts/http-awstatstotals-exec.nse
+usr/share/nmap/scripts/http-axis2-dir-traversal.nse
+usr/share/nmap/scripts/http-backup-finder.nse
+usr/share/nmap/scripts/http-barracuda-dir-traversal.nse
 usr/share/nmap/scripts/http-brute.nse
+usr/share/nmap/scripts/http-cakephp-version.nse
+usr/share/nmap/scripts/http-chrono.nse
+usr/share/nmap/scripts/http-config-backup.nse
+usr/share/nmap/scripts/http-cors.nse
 usr/share/nmap/scripts/http-date.nse
+usr/share/nmap/scripts/http-default-accounts.nse
 usr/share/nmap/scripts/http-domino-enum-passwords.nse
+usr/share/nmap/scripts/http-email-harvest.nse
 usr/share/nmap/scripts/http-enum.nse
 usr/share/nmap/scripts/http-favicon.nse
 usr/share/nmap/scripts/http-form-brute.nse
+usr/share/nmap/scripts/http-generator.nse
+usr/share/nmap/scripts/http-google-malware.nse
+usr/share/nmap/scripts/http-grep.nse
 usr/share/nmap/scripts/http-headers.nse
 usr/share/nmap/scripts/http-iis-webdav-vuln.nse
+usr/share/nmap/scripts/http-joomla-brute.nse
+usr/share/nmap/scripts/http-litespeed-sourcecode-download.nse
+usr/share/nmap/scripts/http-majordomo2-dir-traversal.nse
 usr/share/nmap/scripts/http-malware-host.nse
+usr/share/nmap/scripts/http-method-tamper.nse
 usr/share/nmap/scripts/http-methods.nse
 usr/share/nmap/scripts/http-open-proxy.nse
+usr/share/nmap/scripts/http-open-redirect.nse
 usr/share/nmap/scripts/http-passwd.nse
 usr/share/nmap/scripts/http-php-version.nse
+usr/share/nmap/scripts/http-proxy-brute.nse
+usr/share/nmap/scripts/http-put.nse
+usr/share/nmap/scripts/http-qnap-nas-info.nse
 usr/share/nmap/scripts/http-robots.txt.nse
+usr/share/nmap/scripts/http-robtex-reverse-ip.nse
 usr/share/nmap/scripts/http-title.nse
 usr/share/nmap/scripts/http-trace.nse
+usr/share/nmap/scripts/http-unsafe-output-escaping.nse
 usr/share/nmap/scripts/http-userdir-enum.nse
 usr/share/nmap/scripts/http-vhosts.nse
 usr/share/nmap/scripts/http-vmware-path-vuln.nse
+usr/share/nmap/scripts/http-vuln-cve2009-3960.nse
+usr/share/nmap/scripts/http-vuln-cve2010-2861.nse
+usr/share/nmap/scripts/http-vuln-cve2011-3192.nse
+usr/share/nmap/scripts/http-vuln-cve2011-3368.nse
+usr/share/nmap/scripts/http-vuln-cve2012-1823.nse
+usr/share/nmap/scripts/http-waf-detect.nse
+usr/share/nmap/scripts/http-wordpress-brute.nse
+usr/share/nmap/scripts/http-wordpress-enum.nse
+usr/share/nmap/scripts/http-wordpress-plugins.nse
+usr/share/nmap/scripts/iax2-brute.nse
 usr/share/nmap/scripts/iax2-version.nse
+usr/share/nmap/scripts/imap-brute.nse
 usr/share/nmap/scripts/imap-capabilities.nse
 usr/share/nmap/scripts/informix-brute.nse
 usr/share/nmap/scripts/informix-query.nse
 usr/share/nmap/scripts/informix-tables.nse
+usr/share/nmap/scripts/ip-geolocation-geobytes.nse
+usr/share/nmap/scripts/ip-geolocation-geoplugin.nse
+usr/share/nmap/scripts/ip-geolocation-ipinfodb.nse
+usr/share/nmap/scripts/ip-geolocation-maxmind.nse
 usr/share/nmap/scripts/ipidseq.nse
+usr/share/nmap/scripts/ipv6-node-info.nse
+usr/share/nmap/scripts/irc-botnet-channels.nse
+usr/share/nmap/scripts/irc-brute.nse
 usr/share/nmap/scripts/irc-info.nse
 usr/share/nmap/scripts/irc-unrealircd-backdoor.nse
 usr/share/nmap/scripts/iscsi-brute.nse
 usr/share/nmap/scripts/iscsi-info.nse
 usr/share/nmap/scripts/jdwp-version.nse
+usr/share/nmap/scripts/krb5-enum-users.nse
 usr/share/nmap/scripts/ldap-brute.nse
+usr/share/nmap/scripts/ldap-novell-getpass.nse
 usr/share/nmap/scripts/ldap-rootdse.nse
 usr/share/nmap/scripts/ldap-search.nse
 usr/share/nmap/scripts/lexmark-config.nse
+usr/share/nmap/scripts/lltd-discovery.nse
+usr/share/nmap/scripts/maxdb-info.nse
+usr/share/nmap/scripts/membase-brute.nse
+usr/share/nmap/scripts/membase-http-info.nse
+usr/share/nmap/scripts/memcached-info.nse
+usr/share/nmap/scripts/metasploit-xmlrpc-brute.nse
 usr/share/nmap/scripts/modbus-discover.nse
+usr/share/nmap/scripts/mongodb-brute.nse
 usr/share/nmap/scripts/mongodb-databases.nse
 usr/share/nmap/scripts/mongodb-info.nse
 usr/share/nmap/scripts/ms-sql-brute.nse
 usr/share/nmap/scripts/ms-sql-config.nse
+usr/share/nmap/scripts/ms-sql-dump-hashes.nse
 usr/share/nmap/scripts/ms-sql-empty-password.nse
 usr/share/nmap/scripts/ms-sql-hasdbaccess.nse
 usr/share/nmap/scripts/ms-sql-info.nse
 usr/share/nmap/scripts/ms-sql-query.nse
 usr/share/nmap/scripts/ms-sql-tables.nse
 usr/share/nmap/scripts/ms-sql-xp-cmdshell.nse
+usr/share/nmap/scripts/mysql-audit.nse
 usr/share/nmap/scripts/mysql-brute.nse
 usr/share/nmap/scripts/mysql-databases.nse
 usr/share/nmap/scripts/mysql-empty-password.nse
@@ -229,20 +381,34 @@ usr/share/nmap/scripts/mysql-info.nse
 usr/share/nmap/scripts/mysql-users.nse
 usr/share/nmap/scripts/mysql-variables.nse
 usr/share/nmap/scripts/nat-pmp-info.nse
+usr/share/nmap/scripts/nat-pmp-mapport.nse
 usr/share/nmap/scripts/nbstat.nse
+usr/share/nmap/scripts/ncp-enum-users.nse
+usr/share/nmap/scripts/ncp-serverinfo.nse
+usr/share/nmap/scripts/ndmp-fs-info.nse
+usr/share/nmap/scripts/ndmp-version.nse
+usr/share/nmap/scripts/nessus-brute.nse
+usr/share/nmap/scripts/nessus-xmlrpc-brute.nse
 usr/share/nmap/scripts/netbus-auth-bypass.nse
 usr/share/nmap/scripts/netbus-brute.nse
 usr/share/nmap/scripts/netbus-info.nse
 usr/share/nmap/scripts/netbus-version.nse
+usr/share/nmap/scripts/nexpose-brute.nse
 usr/share/nmap/scripts/nfs-ls.nse
 usr/share/nmap/scripts/nfs-showmount.nse
 usr/share/nmap/scripts/nfs-statfs.nse
+usr/share/nmap/scripts/nping-brute.nse
 usr/share/nmap/scripts/nrpe-enum.nse
 usr/share/nmap/scripts/ntp-info.nse
 usr/share/nmap/scripts/ntp-monlist.nse
+usr/share/nmap/scripts/omp2-brute.nse
+usr/share/nmap/scripts/omp2-enum-targets.nse
+usr/share/nmap/scripts/openlookup-info.nse
+usr/share/nmap/scripts/openvas-otp-brute.nse
 usr/share/nmap/scripts/oracle-brute.nse
 usr/share/nmap/scripts/oracle-enum-users.nse
 usr/share/nmap/scripts/oracle-sid-brute.nse
+usr/share/nmap/scripts/ovs-agent-version.nse
 usr/share/nmap/scripts/p2p-conficker.nse
 usr/share/nmap/scripts/path-mtu.nse
 usr/share/nmap/scripts/pgsql-brute.nse
@@ -251,11 +417,30 @@ usr/share/nmap/scripts/pop3-brute.nse
 usr/share/nmap/scripts/pop3-capabilities.nse
 usr/share/nmap/scripts/pptp-version.nse
 usr/share/nmap/scripts/qscan.nse
+usr/share/nmap/scripts/quake3-info.nse
+usr/share/nmap/scripts/quake3-master-getservers.nse
+usr/share/nmap/scripts/rdp-vuln-ms12-020.nse
 usr/share/nmap/scripts/realvnc-auth-bypass.nse
+usr/share/nmap/scripts/redis-brute.nse
+usr/share/nmap/scripts/redis-info.nse
 usr/share/nmap/scripts/resolveall.nse
+usr/share/nmap/scripts/reverse-index.nse
+usr/share/nmap/scripts/rexec-brute.nse
+usr/share/nmap/scripts/riak-http-info.nse
+usr/share/nmap/scripts/rlogin-brute.nse
 usr/share/nmap/scripts/rmi-dumpregistry.nse
+usr/share/nmap/scripts/rpcap-brute.nse
+usr/share/nmap/scripts/rpcap-info.nse
 usr/share/nmap/scripts/rpcinfo.nse
+usr/share/nmap/scripts/rsync-brute.nse
+usr/share/nmap/scripts/rsync-list-modules.nse
+usr/share/nmap/scripts/rtsp-methods.nse
+usr/share/nmap/scripts/rtsp-url-brute.nse
+usr/share/nmap/scripts/samba-vuln-cve-2012-1182.nse
 usr/share/nmap/scripts/script.db
+usr/share/nmap/scripts/servicetags.nse
+usr/share/nmap/scripts/sip-brute.nse
+usr/share/nmap/scripts/sip-enum-users.nse
 usr/share/nmap/scripts/skypev2-version.nse
 usr/share/nmap/scripts/smb-brute.nse
 usr/share/nmap/scripts/smb-check-vulns.nse
@@ -266,19 +451,25 @@ usr/share/nmap/scripts/smb-enum-sessions.nse
 usr/share/nmap/scripts/smb-enum-shares.nse
 usr/share/nmap/scripts/smb-enum-users.nse
 usr/share/nmap/scripts/smb-flood.nse
+usr/share/nmap/scripts/smb-mbenum.nse
 usr/share/nmap/scripts/smb-os-discovery.nse
 usr/share/nmap/scripts/smb-psexec.nse
 usr/share/nmap/scripts/smb-security-mode.nse
 usr/share/nmap/scripts/smb-server-stats.nse
 usr/share/nmap/scripts/smb-system-info.nse
 usr/share/nmap/scripts/smbv2-enabled.nse
+usr/share/nmap/scripts/smtp-brute.nse
 usr/share/nmap/scripts/smtp-commands.nse
 usr/share/nmap/scripts/smtp-enum-users.nse
 usr/share/nmap/scripts/smtp-open-relay.nse
 usr/share/nmap/scripts/smtp-strangeport.nse
+usr/share/nmap/scripts/smtp-vuln-cve2010-4344.nse
+usr/share/nmap/scripts/smtp-vuln-cve2011-1720.nse
+usr/share/nmap/scripts/smtp-vuln-cve2011-1764.nse
 usr/share/nmap/scripts/sniffer-detect.nse
 usr/share/nmap/scripts/snmp-brute.nse
 usr/share/nmap/scripts/snmp-interfaces.nse
+usr/share/nmap/scripts/snmp-ios-config.nse
 usr/share/nmap/scripts/snmp-netstat.nse
 usr/share/nmap/scripts/snmp-processes.nse
 usr/share/nmap/scripts/snmp-sysdescr.nse
@@ -286,6 +477,8 @@ usr/share/nmap/scripts/snmp-win32-services.nse
 usr/share/nmap/scripts/snmp-win32-shares.nse
 usr/share/nmap/scripts/snmp-win32-software.nse
 usr/share/nmap/scripts/snmp-win32-users.nse
+usr/share/nmap/scripts/socks-auth-info.nse
+usr/share/nmap/scripts/socks-brute.nse
 usr/share/nmap/scripts/socks-open-proxy.nse
 usr/share/nmap/scripts/sql-injection.nse
 usr/share/nmap/scripts/ssh-hostkey.nse
@@ -293,15 +486,36 @@ usr/share/nmap/scripts/ssh2-enum-algos.nse
 usr/share/nmap/scripts/sshv1.nse
 usr/share/nmap/scripts/ssl-cert.nse
 usr/share/nmap/scripts/ssl-enum-ciphers.nse
+usr/share/nmap/scripts/ssl-google-cert-catalog.nse
+usr/share/nmap/scripts/ssl-known-key.nse
 usr/share/nmap/scripts/sslv2.nse
+usr/share/nmap/scripts/stun-info.nse
+usr/share/nmap/scripts/stun-version.nse
 usr/share/nmap/scripts/stuxnet-detect.nse
 usr/share/nmap/scripts/svn-brute.nse
+usr/share/nmap/scripts/targets-asn.nse
+usr/share/nmap/scripts/targets-ipv6-multicast-echo.nse
+usr/share/nmap/scripts/targets-ipv6-multicast-invalid-dst.nse
+usr/share/nmap/scripts/targets-ipv6-multicast-mld.nse
+usr/share/nmap/scripts/targets-ipv6-multicast-slaac.nse
+usr/share/nmap/scripts/targets-sniffer.nse
 usr/share/nmap/scripts/targets-traceroute.nse
 usr/share/nmap/scripts/telnet-brute.nse
+usr/share/nmap/scripts/telnet-encryption.nse
+usr/share/nmap/scripts/tftp-enum.nse
+usr/share/nmap/scripts/unusual-port.nse
 usr/share/nmap/scripts/upnp-info.nse
+usr/share/nmap/scripts/url-snarf.nse
+usr/share/nmap/scripts/versant-info.nse
+usr/share/nmap/scripts/vmauthd-brute.nse
 usr/share/nmap/scripts/vnc-brute.nse
 usr/share/nmap/scripts/vnc-info.nse
+usr/share/nmap/scripts/voldemort-info.nse
+usr/share/nmap/scripts/vuze-dht-info.nse
 usr/share/nmap/scripts/wdb-version.nse
 usr/share/nmap/scripts/whois.nse
 usr/share/nmap/scripts/wsdd-discover.nse
 usr/share/nmap/scripts/x11-access.nse
+usr/share/nmap/scripts/xdmcp-discover.nse
+usr/share/nmap/scripts/xmpp-brute.nse
+usr/share/nmap/scripts/xmpp-info.nse
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -19,13 +19,10 @@
 #                                                                             #
 ###############################################################################

-my @network=();
-my @masklen=();
-my @colour=();
+use strict;

 use Net::IPv4Addr qw( :all );
-
-use strict;
+use Switch;

 # enable only the following on debugging purpose
 #use warnings;
@@ -35,42 +32,64 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";

-#workaround to suppress a warning when a variable is used only once
-my @dummy = ( ${Header::table1colour} );
-undef (@dummy);
+my $colour_multicast = "#A0A0A0";

-# Read various files
+&Header::showhttpheaders();
+
+my @network=();
+my @masklen=();
+my @colour=();

 my %netsettings=();
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);

-open (ACTIVE, '/usr/local/bin/getiptstate |') or die 'Unable to open ip_conntrack';
-my @active = <ACTIVE>;
-close (ACTIVE);
+#workaround to suppress a warning when a variable is used only once
+my @dummy = ( ${Header::table1colour} );
+undef (@dummy);
+
+# Read the connection tracking table.
+open(CONNTRACK, "/usr/local/bin/getconntracktable | sort -k 5,5 --numeric-sort --reverse |") or die "Unable to read conntrack table";
+my @conntrack = <CONNTRACK>;
+close(CONNTRACK);
+
+# Collect data for the @network array.
+
+# Add Firewall Localhost 127.0.0.1
+push(@network, '127.0.0.1');
+push(@masklen, '255.255.255.255');
+push(@colour, ${Header::colourfw});

 if (open(IP, "${General::swroot}/red/local-ipaddress")) {
-        my $redip = <IP>;
-        close(IP);
-        chomp $redip;
-        push(@network, $redip);
-        push(@masklen, '255.255.255.255' );
-        push(@colour, ${Header::colourfw} );
+	my $redip = <IP>;
+	close(IP);
+
+	chomp $redip;
+	push(@network, $redip);
+	push(@masklen, '255.255.255.255');
+	push(@colour, ${Header::colourfw});
 }

-my @vpn = `/usr/local/bin/ipsecctrl I 2>/dev/null|grep erouted|cut -d"]" -f3|cut -d"=" -f4|cut -d";" -f1| sed "s|/| |g"`;
-  foreach my $route (@vpn) {
-                chomp($route);
-                my @temp = split(/[\t ]+/, $route);
-                if ( $temp[0] eq '$redip' ){next;}
-                push(@network, $temp[0]);
-                push(@masklen, $temp[1]);
-                push(@colour, ${Header::colourvpn} );
-        }
+# Add STATIC RED aliases
+if ($netsettings{'RED_DEV'}) {
+	my $aliasfile = "${General::swroot}/ethernet/aliases";
+	open(ALIASES, $aliasfile) or die 'Unable to open aliases file.';
+	my @aliases = <ALIASES>;
+	close(ALIASES);

-my $aliasfile = "${General::swroot}/ethernet/aliases";
-open(ALIASES, $aliasfile) or die 'Unable to open aliases file.';
-my @aliases = <ALIASES>;
-close(ALIASES);
+	# We have a RED eth iface
+	if ($netsettings{'RED_TYPE'} eq 'STATIC') {
+		# We have a STATIC RED eth iface
+		foreach my $line (@aliases) {
+			chomp($line);
+			my @temp = split(/\,/,$line);
+			if ($temp[0]) {
+				push(@network, $temp[0]);
+				push(@masklen, $netsettings{'RED_NETMASK'} );
+				push(@colour, ${Header::colourfw} );
+			}
+		}
+	}
+}

 # Add Green Firewall Interface
 push(@network, $netsettings{'GREEN_ADDRESS'});
@@ -85,32 +104,11 @@ push(@colour, ${Header::colourgreen} );
 # Add Green Routes to Array
 my @routes = `/sbin/route -n | /bin/grep $netsettings{'GREEN_DEV'}`;
 foreach my $route (@routes) {
-        chomp($route);
-        my @temp = split(/[\t ]+/, $route);
-        push(@network, $temp[0]);
-        push(@masklen, $temp[2]);
-        push(@colour, ${Header::colourgreen} );
-}
-
-# Add Firewall Localhost 127.0.0.1
-push(@network, '127.0.0.1');
-push(@masklen, '255.255.255.255' );
-push(@colour, ${Header::colourfw} );
-
-# Add Orange Network
-if ($netsettings{'ORANGE_DEV'}) {
-        push(@network, $netsettings{'ORANGE_NETADDRESS'});
-        push(@masklen, $netsettings{'ORANGE_NETMASK'} );
-        push(@colour, ${Header::colourorange} );
-        # Add Orange Routes to Array
-        @routes = `/sbin/route -n | /bin/grep $netsettings{'ORANGE_DEV'}`;
-        foreach my $route (@routes) {
-                  chomp($route);
-                my @temp = split(/[\t ]+/, $route);
-                push(@network, $temp[0]);
-                push(@masklen, $temp[2]);
-                push(@colour, ${Header::colourorange} );
-        }
+	chomp($route);
+	my @temp = split(/[\t ]+/, $route);
+	push(@network, $temp[0]);
+	push(@masklen, $temp[2]);
+	push(@colour, ${Header::colourgreen} );
 }

 # Add Blue Firewall Interface
@@ -120,304 +118,431 @@ push(@colour, ${Header::colourfw} );

 # Add Blue Network
 if ($netsettings{'BLUE_DEV'}) {
-        push(@network, $netsettings{'BLUE_NETADDRESS'});
-        push(@masklen, $netsettings{'BLUE_NETMASK'} );
-        push(@colour, ${Header::colourblue} );
-        # Add Blue Routes to Array
-        @routes = `/sbin/route -n | /bin/grep $netsettings{'BLUE_DEV'}`;
-        foreach my $route (@routes) {
-                  chomp($route);
-                my @temp = split(/[\t ]+/, $route);
-                push(@network, $temp[0]);
-                push(@masklen, $temp[2]);
-                push(@colour, ${Header::colourblue} );
-        }
+	push(@network, $netsettings{'BLUE_NETADDRESS'});
+	push(@masklen, $netsettings{'BLUE_NETMASK'} );
+	push(@colour, ${Header::colourblue} );
+
+	# Add Blue Routes to Array
+	@routes = `/sbin/route -n | /bin/grep $netsettings{'BLUE_DEV'}`;
+	foreach my $route (@routes) {
+		chomp($route);
+		my @temp = split(/[\t ]+/, $route);
+		push(@network, $temp[0]);
+		push(@masklen, $temp[2]);
+		push(@colour, ${Header::colourblue} );
+	}
 }

+# Add Orange Firewall Interface
+push(@network, $netsettings{'ORANGE_ADDRESS'});
+push(@masklen, "255.255.255.255" );
+push(@colour, ${Header::colourfw} );
+
+# Add Orange Network
+if ($netsettings{'ORANGE_DEV'}) {
+	push(@network, $netsettings{'ORANGE_NETADDRESS'});
+	push(@masklen, $netsettings{'ORANGE_NETMASK'} );
+	push(@colour, ${Header::colourorange} );
+	# Add Orange Routes to Array
+	@routes = `/sbin/route -n | /bin/grep $netsettings{'ORANGE_DEV'}`;
+	foreach my $route (@routes) {
+		chomp($route);
+		my @temp = split(/[\t ]+/, $route);
+		push(@network, $temp[0]);
+		push(@masklen, $temp[2]);
+		push(@colour, ${Header::colourorange} );
+	}
+}
+
+# Highlight multicast connections.
+push(@network, "224.0.0.0");
+push(@masklen, "239.0.0.0");
+push(@colour, $colour_multicast);
+
 # Add OpenVPN net and RED/BLUE/ORANGE entry (when appropriate)
 if (-e "${General::swroot}/ovpn/settings") {
-    my %ovpnsettings = ();    
-    &General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);
-    my @tempovpnsubnet = split("\/",$ovpnsettings{'DOVPN_SUBNET'});
+	my %ovpnsettings = ();
+	&General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);
+	my @tempovpnsubnet = split("\/",$ovpnsettings{'DOVPN_SUBNET'});

-    # add OpenVPN net
-                push(@network, $tempovpnsubnet[0]);
-                push(@masklen, $tempovpnsubnet[1]);
-                push(@colour, ${Header::colourovpn} );
+	# add OpenVPN net
+	push(@network, $tempovpnsubnet[0]);
+	push(@masklen, $tempovpnsubnet[1]);
+	push(@colour, ${Header::colourovpn} );

+	# add BLUE:port / proto
+	if (($ovpnsettings{'ENABLED_BLUE'} eq 'on') && $netsettings{'BLUE_DEV'}) {
+		push(@network, $netsettings{'BLUE_ADDRESS'} );
+		push(@masklen, '255.255.255.255' );
+		push(@colour, ${Header::colourovpn});
+	}

-    if ( ($ovpnsettings{'ENABLED_BLUE'} eq 'on') && $netsettings{'BLUE_DEV'} ) {
-      # add BLUE:port / proto
-            push(@network, $netsettings{'BLUE_ADDRESS'} );
-            push(@masklen, '255.255.255.255' );
-                  push(@colour, ${Header::colourovpn} );
-    }
-    if ( ($ovpnsettings{'ENABLED_ORANGE'} eq 'on') && $netsettings{'ORANGE_DEV'} ) {
-      # add ORANGE:port / proto
-            push(@network, $netsettings{'ORANGE_ADDRESS'} );
-            push(@masklen, '255.255.255.255' );
-                  push(@colour, ${Header::colourovpn} );
-    }
+	# add ORANGE:port / proto
+	if (($ovpnsettings{'ENABLED_ORANGE'} eq 'on') && $netsettings{'ORANGE_DEV'}) {
+		push(@network, $netsettings{'ORANGE_ADDRESS'} );
+		push(@masklen, '255.255.255.255' );
+		push(@colour, ${Header::colourovpn} );
+	}
 }

-# Add STATIC RED aliases
-if ($netsettings{'RED_DEV'}) {
-        # We have a RED eth iface
-        if ($netsettings{'RED_TYPE'} eq 'STATIC') {
-                # We have a STATIC RED eth iface
-                foreach my $line (@aliases)
-                {
-                        chomp($line);
-                        my @temp = split(/\,/,$line);
-                        if ( $temp[0] ) {
-                                push(@network, $temp[0]);
-                                push(@masklen, $netsettings{'RED_NETMASK'} );
-                                push(@colour, ${Header::colourfw} );
-                        }
-                }
-        }
+open(IPSEC, "${General::swroot}/vpn/config");
+my @ipsec = <IPSEC>;
+close(IPSEC);
+
+foreach my $line (@ipsec) {
+	my @vpn = split(',', $line);
+	my ($network, $mask) = split("/", $vpn[12]);
+
+	if (!&General::validip($mask)) {
+		$mask = ipv4_cidr2msk($mask);
+	}
+
+	push(@network, $network);
+	push(@masklen, $mask);
+	push(@colour, ${Header::colourvpn});
 }

-# Add VPNs
-if ( $vpn[0] ne 'none' ) {
-        foreach my $line (@vpn) {
-                my @temp = split(/[\t ]+/,$line);
-                my @temp1 = split(/[\/:]+/,$temp[3]);
-                push(@network, $temp1[0]);
-                push(@masklen, ipv4_cidr2msk($temp1[1]));
-                push(@colour, ${Header::colourvpn} );
-        }
+if (-e "${General::swroot}/ovpn/n2nconf") {
+	open(OVPNN2N, "${General::swroot}/ovpn/ovpnconfig");
+	my @ovpnn2n = <OVPNN2N>;
+	close(OVPNN2N);
+
+	foreach my $line (@ovpnn2n) {
+		my @ovpn = split(',', $line);
+		next if ($ovpn[4] ne 'net');
+
+		my ($network, $mask) = split("/", $ovpn[12]);
+		if (!&General::validip($mask)) {
+			$mask = ipv4_cidr2msk($mask);
+		}
+
+		push(@network, $network);
+		push(@masklen, $mask);
+		push(@colour, ${Header::colourovpn});
+	}
 }

-#Establish simple filtering&sorting boxes on top of table
-
-our %cgiparams;
-&Header::getcgihash(\%cgiparams);
-
-my @list_proto = ($Lang::tr{'all'}, 'icmp', 'udp', 'tcp');
-my @list_state = ($Lang::tr{'all'}, 'SYN_SENT', 'SYN_RECV', 'ESTABLISHED', 'FIN_WAIT',
-                    'CLOSE_WAIT', 'LAST_ACK', 'TIME_WAIT', 'CLOSE', 'LISTEN');
-my @list_mark = ($Lang::tr{'all'}, '[ASSURED]', '[UNREPLIED]');
-my @list_sort = ('orgsip','protocol', 'expires', 'status', 'orgdip', 'orgsp',
-                    'orgdp', 'exsip', 'exdip', 'exsp', 'exdp', 'marked');
-
-# init or silently correct unknown value...
-if ( ! grep ( /^$cgiparams{'SEE_PROTO'}$/ , @list_proto )) { $cgiparams{'SEE_PROTO'} = $list_proto[0] };
-if ( ! grep ( /^$cgiparams{'SEE_STATE'}$/ , @list_state )) { $cgiparams{'SEE_STATE'} = $list_state[0] };
-if ( ($cgiparams{'SEE_MARK'} ne $Lang::tr{'all'}) &&	# ok the grep should work but it doesn't because of
-     ($cgiparams{'SEE_MARK'} ne '[ASSURED]') &&		# the '[' & ']' interpreted as list separator.
-     ($cgiparams{'SEE_MARK'} ne '[UNREPLIED]')		# So, explicitly enumerate items.
-   )  { $cgiparams{'SEE_MARK'}  = $list_mark[0] };
-if ( ! grep ( /^$cgiparams{'SEE_SORT'}$/  , @list_sort ))  { $cgiparams{'SEE_SORT'}  = $list_sort[0] };
-# *.*.*.* or a valid IP
-if ( $cgiparams{'SEE_SRC'}  !~ /^(\*\.\*\.\*\.\*\.|\d+\.\d+\.\d+\.\d+)$/) {  $cgiparams{'SEE_SRC'} = '*.*.*.*' };
-if ( $cgiparams{'SEE_DEST'} !~ /^(\*\.\*\.\*\.\*\.|\d+\.\d+\.\d+\.\d+)$/) {  $cgiparams{'SEE_DEST'} = '*.*.*.*' };
-
-
-our %entries = ();	# will hold the lines analyzed correctly
-my $unknownlines = '';	# should be empty all the time...
-my $index = 0;		# just a counter to make unique entryies in entries
-
-&Header::showhttpheaders();
+# Show the page.
 &Header::openpage($Lang::tr{'connections'}, 1, '');
 &Header::openbigbox('100%', 'left');
 &Header::openbox('100%', 'left', $Lang::tr{'connection tracking'});

-# Build listbox objects
-my $menu_proto = &make_select ('SEE_PROTO', $cgiparams{'SEE_PROTO'}, @list_proto);
-my $menu_state = &make_select ('SEE_STATE', $cgiparams{'SEE_STATE'}, @list_state);
-
-print <<END
-<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<table width='100%'>
-<tr><td align='center'><b>$Lang::tr{'legend'} : </b></td>
-    <td align='center' bgcolor='${Header::colourgreen}'><b><font color='#FFFFFF'>$Lang::tr{'lan'}</font></b></td>
-    <td align='center' bgcolor='${Header::colourred}'><b><font color='#FFFFFF'>$Lang::tr{'internet'}</font></b></td>
-    <td align='center' bgcolor='${Header::colourorange}'><b><font color='#FFFFFF'>$Lang::tr{'dmz'}</font></b></td>
-    <td align='center' bgcolor='${Header::colourblue}'><b><font color='#FFFFFF'>$Lang::tr{'wireless'}</font></b></td>
-    <td align='center' bgcolor='${Header::colourfw}'><b><font color='#FFFFFF'>IPFire</font></b></td>
-    <td align='center' bgcolor='${Header::colourvpn}'><b><font color='#FFFFFF'>$Lang::tr{'vpn'}</font></b></td>
-    <td align='center' bgcolor='${Header::colourovpn}'><b><font color='#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b></td>
-</tr>
-</table>
-<br />
-<table width='100%'>
-<tr><td align='center'><font size=2>$Lang::tr{'source ip and port'}</font></td>
-		<td>&nbsp;</td>
-		<td align='center'><font size=2>$Lang::tr{'dest ip and port'}</font></td>
-		<td>&nbsp;</td>
-		<td align='center'><font size=2>$Lang::tr{'protocol'}</font></td>
-		<td align='center'><font size=2>$Lang::tr{'connection'}<br></br>$Lang::tr{'status'}</font></td>
-    <td align='center'><font size=2>$Lang::tr{'expires'}<br></br>($Lang::tr{'seconds'})</font></td>
-    
-</tr>
-<tr><td colspan='4'>&nbsp;</td>
-		<td align='center'>$menu_proto</td>
-    <td align='center'>$menu_state</td>
-    <td>&nbsp;</td>
-</tr>
-<tr>
-    <td align='center' colspan='7'></td>
-</tr>
-<tr>
-    <td align='center' colspan='7'><input type='submit' value="$Lang::tr{'update'}" /></td>
-</tr>
-
+# Print legend.
+print <<END;
+	<table width='100%'>
+		<tr>
+			<td align='center'>
+				<b>$Lang::tr{'legend'} : </b>
+			</td>
+			<td align='center' bgcolor='${Header::colourgreen}'>
+				<b><font color='#FFFFFF'>$Lang::tr{'lan'}</font></b>
+			</td>
+			<td align='center' bgcolor='${Header::colourred}'>
+				<b><font color='#FFFFFF'>$Lang::tr{'internet'}</font></b>
+			</td>
+			<td align='center' bgcolor='${Header::colourorange}'>
+				<b><font color='#FFFFFF'>$Lang::tr{'dmz'}</font></b>
+			</td>
+			<td align='center' bgcolor='${Header::colourblue}'>
+				<b><font color='#FFFFFF'>$Lang::tr{'wireless'}</font></b>
+			</td>
+			<td align='center' bgcolor='${Header::colourfw}'>
+				<b><font color='#FFFFFF'>IPFire</font></b>
+			</td>
+			<td align='center' bgcolor='${Header::colourvpn}'>
+				<b><font color='#FFFFFF'>$Lang::tr{'vpn'}</font></b>
+			</td>
+			<td align='center' bgcolor='${Header::colourovpn}'>
+				<b><font color='#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b>
+			</td>
+			<td align='center' bgcolor='$colour_multicast'>
+				<b><font color='#FFFFFF'>Multicast</font></b>
+			</td>
+		</tr>
+	</table>
+	<br>
 END
-;

-my $i=0;
-foreach my $line (@active) {
-    $i++;
-    if ($i < 3) {
-			next;
-    }
-    chomp($line);
-    my @temp = split(' ',$line);
-
-    my ($sip, $sport) = split(':', $temp[0]);
-    my ($dip, $dport) = split(':', $temp[1]);
-    my $proto = $temp[2];
-    my $state; my $ttl;
-    if ( $proto eq "esp" ){$state = "";$ttl = $temp[3];}
-    elsif ( $proto eq "icmp" ){$state = "";$ttl = $temp[4];}
-    else{$state = $temp[3];$ttl = $temp[4];}
-    
-    next if( !(
-              		(($cgiparams{'SEE_PROTO'}  eq $Lang::tr{'all'}) || ($proto  eq $cgiparams{'SEE_PROTO'} ))
-    	         && (($cgiparams{'SEE_STATE'}  eq $Lang::tr{'all'}) || ($state  eq $cgiparams{'SEE_STATE'} ))
-               && (($cgiparams{'SEE_SRC'}    eq "*.*.*.*")        || ($sip    eq $cgiparams{'SEE_SRC'}   ))
-               && (($cgiparams{'SEE_DEST'}   eq "*.*.*.*")    	  || ($dip    eq $cgiparams{'SEE_DEST'}  ))
-              ));
-
-    if (($proto eq 'udp') && ($ttl eq '')) {
-			$ttl = $state;
-			$state = '&nbsp;';	
-    }
-
-    my $sipcol = ipcolour($sip);
-    my $dipcol = ipcolour($dip);
-
-    my $sserv = '';
-    if ($sport < 1024) {
-	$sserv = uc(getservbyport($sport, lc($proto)));
-	if ($sserv ne '') {
-	    $sserv = "&nbsp;($sserv)";
-	}
-    }
-
-    my $dserv = '';
-    if ($dport < 1024) {
-	$dserv = uc(getservbyport($dport, lc($proto)));
-	if ($dserv ne '') {
-	    $dserv = "&nbsp;($dserv)";
-	}
-    }
-
-    print <<END
-    <tr >
-      <td align='center' bgcolor='$sipcol'>
-        <a href='/cgi-bin/ipinfo.cgi?ip=$sip'>
-          <font color='#FFFFFF'>$sip</font>
-        </a>
-      </td>
-      <td align='center' bgcolor='$sipcol'>
-        <a href='http://isc.sans.org/port_details.php?port=$sport' target='top'>
-          <font color='#FFFFFF'>$sport$sserv</font>
-        </a>
-      </td>
-      <td align='center' bgcolor='$dipcol'>
-        <a href='/cgi-bin/ipinfo.cgi?ip=$dip'>
-          <font color='#FFFFFF'>$dip</font>
-        </a>
-      </td>
-      <td align='center' bgcolor='$dipcol'>
-        <a href='http://isc.sans.org/port_details.php?port=$dport' target='top'>
-          <font color='#FFFFFF'>$dport$dserv</font>
-        </a>
-      </td>
-      <td align='center'>$proto</td>
-      <td align='center'>$state</td>
-      <td align='center'>$ttl</td>
-    </tr>
+# Print table header.
+print <<END;
+	<table width='100%'>
+		<tr>
+			<th align='center'>
+				$Lang::tr{'protocol'}
+			</th>
+			<th align='center'>
+				$Lang::tr{'source ip and port'}
+			</th>
+			<th>&nbsp;</th>
+			<th align='center'>
+				$Lang::tr{'dest ip and port'}
+			</th>
+			<th>&nbsp;</th>
+			<th align='center'>
+				$Lang::tr{'download'} /
+				<br>$Lang::tr{'upload'}
+			</th>
+			<th align='center'>
+				$Lang::tr{'connection'}<br>$Lang::tr{'status'}
+			</th>
+			<th align='center'>
+				$Lang::tr{'expires'}<br>($Lang::tr{'seconds'})
+			</th>
+		</tr>
+END
+
+foreach my $line (@conntrack) {
+	my @conn = split(' ', $line);
+
+	# The first bit is the l3 protocol.
+	my $l3proto = $conn[0];
+
+	# Skip everything that is not IPv4.
+	if ($l3proto ne 'ipv4') {
+		next;
+	}
+
+	# L4 protocol (tcp, udp, ...).
+	my $l4proto = $conn[2];
+
+	# Translate unknown protocols.
+	if ($l4proto eq 'unknown') {
+		my $l4protonum = $conn[3];
+		if ($l4protonum eq '2') {
+			$l4proto = 'IGMP';
+		} elsif ($l4protonum eq '4') {
+			$l4proto = 'IPv4 Encap';
+		} elsif ($l4protonum eq '33') {
+			$l4proto = 'DCCP';
+		} elsif ($l4protonum eq '41') {
+			$l4proto = 'IPv6 Encap';
+		} elsif ($l4protonum eq '50') {
+			$l4proto = 'ESP';
+		} elsif ($l4protonum eq '51') {
+			$l4proto = 'AH';
+		} elsif ($l4protonum eq '132') {
+			$l4proto = 'SCTP';
+		} else {
+			$l4proto = $l4protonum;
+		}
+	} else {
+		$l4proto = uc($l4proto);
+	}
+
+	# Source and destination.
+	my $sip;
+	my $sip_ret;
+	my $dip;
+	my $dip_ret;
+	my $sport;
+	my $sport_ret;
+	my $dport;
+	my $dport_ret;
+	my @packets;
+	my @bytes;
+
+	my $ttl = $conn[4];
+	my $state;
+	if ($l4proto eq 'TCP') {
+		$state = $conn[5];
+	}
+
+	# Kick out everything that is not IPv4.
+	foreach my $item (@conn) {
+		my ($key, $val) = split('=', $item);
+
+		switch ($key) {
+			case "src" {
+				if ($sip == "") {
+					$sip = $val;
+				} else {
+					$dip_ret = $val;
+				}
+			}
+			case "dst" {
+				if ($dip == "") {
+					$dip = $val;
+				} else {
+					$sip_ret = $val;
+				}
+			}
+			case "sport" {
+				if ($sport == "") {
+					$sport = $val;
+				} else {
+					$dport_ret = $val;
+				}
+			}
+			case "dport" {
+				if ($dport == "") {
+					$dport = $val;
+				} else {
+					$sport_ret = $val;
+				}
+			}
+			case "packets" {
+				push(@packets, $val);
+			}
+			case "bytes" {
+				push(@bytes, $val);
+			}
+		}
+	}
+
+	my $sip_colour = ipcolour($sip);
+	my $dip_colour = ipcolour($dip);
+
+	my $sserv = '';
+	if ($sport < 1024) {
+		$sserv = uc(getservbyport($sport, lc($l4proto)));
+	}
+
+	my $dserv = '';
+	if ($dport < 1024) {
+		$dserv = uc(getservbyport($dport, lc($l4proto)));
+	}
+
+	my $bytes_in = format_bytes($bytes[0]);
+	my $bytes_out = format_bytes($bytes[1]);
+
+	# Format TTL
+	$ttl = format_time($ttl);
+
+	my $sip_extra;
+	if ($sip ne $sip_ret) {
+		$sip_extra = "<font color='#FFFFFF'>&gt;</font> ";
+		$sip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$sip_ret'>";
+		$sip_extra .= "	<font color='#FFFFFF'>$sip_ret</font>";
+		$sip_extra .= "</a>";
+	}
+
+	my $dip_extra;
+	if ($dip ne $dip_ret) {
+		$dip_extra = "<font color='#FFFFFF'>&gt;</font> ";
+		$dip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$dip_ret'>";
+		$dip_extra .= " <font color='#FFFFFF'>$dip_ret</font>";
+		$dip_extra .= "</a>";
+	}
+
+
+	my $sport_extra;
+	if ($sport ne $sport_ret) {
+		my $sserv_ret = '';
+		if ($sport_ret < 1024) {
+			$sserv_ret = uc(getservbyport($sport_ret, lc($l4proto)));
+		}
+
+		$sport_extra = "<font color='#FFFFFF'>&gt;</font> ";
+		$sport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$sport_ret' target='top' title='$sserv_ret'>";
+		$sport_extra .= " <font color='#FFFFFF'>$sport_ret</font>";
+		$sport_extra .= "</a>";
+	}
+
+	my $dport_extra;
+	if ($dport ne $dport_ret) {
+		my $dserv_ret = '';
+		if ($dport_ret < 1024) {
+			$dserv_ret = uc(getservbyport($dport_ret, lc($l4proto)));
+		}
+
+		$dport_extra = "<font color='#FFFFFF'>&gt;</font> ";
+		$dport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$dport_ret' target='top' title='$dserv_ret'>";
+		$dport_extra .= " <font color='#FFFFFF'>$dport_ret</font>";
+		$dport_extra .= "</a>";
+	}
+
+	print <<END;
+	<tr>
+		<td align='center'>$l4proto</td>
+		<td align='center' bgcolor='$sip_colour'>
+			<a href='/cgi-bin/ipinfo.cgi?ip=$sip'>
+				<font color='#FFFFFF'>$sip</font>
+			</a>
+			$sip_extra
+		</td>
+		<td align='center' bgcolor='$sip_colour'>
+			<a href='http://isc.sans.org/port_details.php?port=$sport' target='top' title='$sserv'>
+				<font color='#FFFFFF'>$sport</font>
+			</a>
+			$sport_extra
+		</td>
+		<td align='center' bgcolor='$dip_colour'>
+			<a href='/cgi-bin/ipinfo.cgi?ip=$dip'>
+				<font color='#FFFFFF'>$dip</font>
+			</a>
+			$dip_extra
+		</td>
+		<td align='center' bgcolor='$dip_colour'>
+			<a href='http://isc.sans.org/port_details.php?port=$dport' target='top' title='$dserv'>
+				<font color='#FFFFFF'>$dport</font>
+			</a>
+			$dport_extra
+		</td>
+		<td align='center'>
+			$bytes_in / $bytes_out
+		</td>
+		<td align='center'>$state</td>
+		<td align='center'>$ttl</td>
+	</tr>
 END
-;
 }

-print "</table></form>";
+# Close the main table.
+print "</table>";

 &Header::closebox();
 &Header::closebigbox();
 &Header::closepage();

+sub format_bytes($) {
+	my $bytes = shift;
+	my @units = ("B", "k", "M", "G", "T");
+
+	foreach my $unit (@units) {
+		if ($bytes < 1024) {
+			return sprintf("%d%s", $bytes, $unit);
+		}
+
+		$bytes /= 1024;
+	}
+
+	return sprintf("%d%s", $bytes, $units[$#units]);
+}
+
+sub format_time($) {
+	my $time = shift;
+
+	my $seconds = $time % 60;
+	my $minutes = $time / 60;
+
+	my $hours = 0;
+	if ($minutes >= 60) {
+		$hours = $minutes / 60;
+		$minutes %= 60;
+	}
+
+	return sprintf("%3d:%02d:%02d", $hours, $minutes, $seconds);
+}
+
 sub ipcolour($) {
-        my $id = 0;
-        my $line;
-        my $colour = ${Header::colourred};
-        my ($ip) = $_[0];
-        my $found = 0;
-        foreach $line (@network) {
-					if ($network[$id] eq '') {
-			 			$id++;
-					} else {
-						if (!$found && ipv4_in_network( $network[$id] , $masklen[$id], $ip) ) {
-							$found = 1;
-							$colour = $colour[$id];
-						}
-						$id++;
-					}
-        }
-        return $colour
-}
+	my $id = 0;
+	my $colour = ${Header::colourred};
+	my ($ip) = $_[0];
+	my $found = 0;

-# Create a string containing a complete SELECT html object 
-# param1: name
-# param2: current value selected
-# param3: field list
-sub make_select ($,$,$) {
-        my $select_name = shift;
-        my $selected    = shift;
-        my $select = "<select name='$select_name'>";
+	foreach my $line (@network) {
+		if ($network[$id] eq '') {
+			$id++;
+		} else {
+			if (!$found && ipv4_in_network($network[$id], $masklen[$id], $ip) ) {
+				$found = 1;
+				$colour = $colour[$id];
+			}
+			$id++;
+		}
+	}

-        foreach my $value (@_) {
-                    my $check = $selected eq $value ? "selected='selected'" : '';
-                    $select .= "<option $check value='$value'>$value</option>";
-        }
-        $select .= "</select>";
-        return $select;
-}
-
-# Build a list of IP obtained from the %entries hash
-# param1: IP field name
-sub get_known_ips ($) {
-        my $field = shift;
-        my $qs = $cgiparams{'SEE_SORT'};	# switch the sort order
-        $cgiparams{'SEE_SORT'} = $field;
-
-        my @liste=('*.*.*.*');
-        foreach my $entry ( sort sort_entries keys %entries) {
-                    push (@liste, $entries{$entry}->{$field}) if (! grep (/^$entries{$entry}->{$field}$/,@liste) );
-        }
-
-        $cgiparams{'SEE_SORT'} = $qs;	#restore sort order
-        return @liste;
-}
-
-# Used to sort the table containing the lines displayed.
-sub sort_entries { #Reverse is not implemented
-        my $qs=$cgiparams{'SEE_SORT'};
-        if ($qs =~ /orgsip|orgdip|exsip|exdip/) {
-                my @a = split(/\./,$entries{$a}->{$qs});
-                my @b = split(/\./,$entries{$b}->{$qs});
-                ($a[0]<=>$b[0]) ||
-                ($a[1]<=>$b[1]) ||
-                ($a[2]<=>$b[2]) ||
-                ($a[3]<=>$b[3]);
-        } elsif ($qs =~ /expire|orgsp|orgdp|exsp|exdp/) {
-                    $entries{$a}->{$qs} <=> $entries{$b}->{$qs};
-        } else {
-                    $entries{$a}->{$qs} cmp $entries{$b}->{$qs};
-        }
+	return $colour;
 }

 1;
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -35,6 +35,24 @@ require "${General::swroot}/header.pl";

 &Header::openbigbox('100%', 'center');

+&Header::openbox('100%', 'left', $Lang::tr{'donation'});
+
+print <<END
+<p>$Lang::tr{'donation-text'}</p>
+	<div align="center">
+		<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+			<input type="hidden" name="cmd" value="_s-xclick">
+			<input type="hidden" name="hosted_button_id" value="HHBTSN9QRWPAY">
+			<input type="image" src="$Lang::tr{'donation-link'}" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+			<img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1">
+		</form>
+	</div>
+<br />
+
+END
+;
+&Header::closebox();
+
 &Header::openbox('100%', 'left', $Lang::tr{'credits'});

 print <<END
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -394,47 +394,51 @@ END
 	}

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

-&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
-foreach my $dkey (keys %confighash) {
-if ($confighash{$dkey}[3] eq 'net') {
+	&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]);

-          if (-e "/var/run/$confighash{$dkey}[1]n2n.pid") {
-          my @output = "";
-          my @tustate = "";
-          my $tport = $confighash{$dkey}[22];
-          my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); 
-          if ($tport ne '') {
-          $tnet->open('127.0.0.1');
-          @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/');
-          @tustate = split(/\,/, $output[1]);
-         if ( $tustate[1] eq 'CONNECTED')
-          { $display = "<font color=$Header::colourgreen>$Lang::tr{'capsopen'}</font>";
-          } else {
-          $display = "<font color=$Header::colourred>$tustate[1]</font>"; }
+			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='center' bgcolor='$Header::colourovpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN n2n</b></font></a><br>
-  <td width='30%' align='center'> $confighash{$dkey}[10]<td width='45%' align='center'> $display 
-
+			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
-;
+		}
+	}
 }
-}
-}
-}
-}
-
-###
-# m.a.d n2n end
-###

 # Fireinfo
 if ( ! -e "/var/ipfire/main/send_profile") {
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -356,11 +356,14 @@ sub writeserverconf {
    if ($sovpnsettings{CLIENT2CLIENT} eq 'on') {
 	print CONF "client-to-client\n";
    }
-    if ($sovpnsettings{MSSFIX} eq 'on') {
-	print CONF "mssfix\n";
-    }
-    if (($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{FRAGMENT} ne 0) && $sovpnsettings{'DPROTOCOL'} ne 'tcp') {
-	print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
+    if ($sovpnsettings{'DPROTOCOL'} eq 'udp') {
+        if ($sovpnsettings{MSSFIX} eq 'on') {
+	    print CONF "mssfix\n";
+        }
+        if ($sovpnsettings{'FRAGMENT'} eq '' || $sovpnsettings{'FRAGMENT'} eq 0) {
+		$sovpnsettings{'FRAGMENT'} = '1300';
+        }
+        print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
    }
    if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) {	
 	print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} $sovpnsettings{'KEEPALIVE_2'}\n";
@@ -529,7 +532,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
    	}
    }
    if ($cgiparams{'MSSFIX'} ne 'on') {
-    	delete $vpnsettings{'MSSFIX'};
+    	$vpnsettings{'MSSFIX'} = 'off';
    } else {
    	$vpnsettings{'MSSFIX'} = $cgiparams{'MSSFIX'};
    }
@@ -1894,7 +1897,6 @@ ADV_ERROR:
    if ($cgiparams{'MAX_CLIENTS'} eq '') {
 	$cgiparams{'MAX_CLIENTS'} =  '100';     
    }
-    
    if ($cgiparams{'KEEPALIVE_1'} eq '') {
 	$cgiparams{'KEEPALIVE_1'} =  '10';     
    }
@@ -1902,7 +1904,13 @@ ADV_ERROR:
 	$cgiparams{'KEEPALIVE_2'} =  '60';     
    }
    if ($cgiparams{'LOG_VERB'} eq '') {
-	$cgiparams{'LOG_VERB'} =  '3';     
+	$cgiparams{'LOG_VERB'} =  '3';
+    }
+    if ($cgiparams{'MSSFIX'} eq '') {
+        $cgiparams{'MSSFIX'} = 'on';
+    }
+    if ($cgiparams{'FRAGMENT'} eq '') {
+        $cgiparams{'FRAGMENT'} = '1300';
    }
    $checked{'CLIENT2CLIENT'}{'off'} = '';
    $checked{'CLIENT2CLIENT'}{'on'} = '';
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -353,6 +353,13 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
 		$errormessage = $Lang::tr{'advproxy errmsg invalid proxy port'};
 		goto ERROR;
 	}
+	if (!($proxysettings{'UPSTREAM_PROXY'} eq '')) {
+	  my @temp = split(/:/,$proxysettings{'UPSTREAM_PROXY'});
+	  if (!(&General::validip($temp[0]))) {
+	    $errormessage = $Lang::tr{'advproxy errmsg invalid upstream proxy'};
+	    goto ERROR;
+          }
+        }
 	if (!($proxysettings{'CACHE_SIZE'} =~ /^\d+/) ||
 		($proxysettings{'CACHE_SIZE'} < 10))
 	{
@@ -984,7 +991,7 @@ print <<END
 <tr><td class='base' >$Lang::tr{'processes'}<input type='text' name='CHILDREN' value='$proxysettings{'CHILDREN'}' size='5' /></td>
 END
 ;
-my $count = `arp -a | wc -l`;
+my $count = `ip n| wc -l`;
 if ( $count < 1 ){$count = 1;}
 if ( -e "/usr/bin/squidclamav" ) {
 	print "<td class='base'><b>".$Lang::tr{'advproxy squidclamav'}."</b><br />";
@@ -3013,7 +3020,7 @@ sub writeconfig
 	}

 	$_ = $proxysettings{'UPSTREAM_PROXY'};
-	my ($remotehost, $remoteport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
+        my ($remotehost, $remoteport) = split(/:/,$_);

 	if ($remoteport eq '') { $remoteport = 80; }

@@ -3923,6 +3930,11 @@ END
 		print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n";
 		print FILE "url_rewrite_children $proxysettings{'CHILDREN'}\n\n";
 	}
+
+	# Include file with user defined settings.
+	if (-e "/etc/squid/squid.conf.local") {
+		print FILE "include /etc/squid/squid.conf.local\n";
+	}
 	close FILE;
 }

--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -240,7 +240,7 @@ sub isrunning{
 	my $pid = '';
 	my $testcmd = '';
 	my $exename;
-	my @memory;
+	my $memory;

 	$cmd =~ /(^[a-z]+)/;
 	$exename = $1;
@@ -256,13 +256,18 @@ sub isrunning{
 			}
 			close FILE;
 		}
-		if (open(FILE, "/proc/${pid}/statm")){
-				my $temp = <FILE>;
-				@memory = split(/ /,$temp);
+		if (open(FILE, "/proc/${pid}/status")) {
+			while (<FILE>) {
+				my ($key, $val) = split(":", $_, 2);
+				if ($key eq 'VmRSS') {
+					$memory = $val;
+					last;
+				}
+			}
+			close(FILE);
 		}
-		close FILE;
 		if ($testcmd =~ /$exename/){
-			$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center'>$pid</td><td align='center'>$memory[0] KB</td>";
+			$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center'>$pid</td><td align='center'>$memory</td>";
 		}
 	}
 	return $status;
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -223,6 +223,7 @@
 'advproxy errmsg invalid pdc' => 'Ungültiger Hostname für den Primary Domain Controller',
 'advproxy errmsg invalid proxy port' => 'Ungültiger Proxy-Port',
 'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy',
+'advproxy errmsg invalid upstream proxy' => 'Ungültige IP für Upstream-Proxy',
 'advproxy errmsg invalid user' => 'Benutzername existiert nicht',
 'advproxy errmsg ldap base dn' => 'LDAP base DN erforderlich',
 'advproxy errmsg ldap bind dn' => 'LDAP bind DN Benutzername und Passwort erforderlich',
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -223,6 +223,7 @@
 'advproxy errmsg invalid pdc' => 'Invalid hostname for primary domain controller',
 'advproxy errmsg invalid proxy port' => 'Invalid proxy port',
 'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting',
+'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP',
 'advproxy errmsg invalid user' => 'Username does not exist',
 'advproxy errmsg ldap base dn' => 'LDAP base DN required',
 'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required',
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
 include Config

 VER        = 1.17
-DATVER     = 04072012
+DATVER     = 05092012

 THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz

 $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = 1395bec12f8a5f0b1e889581271ed5ce
+GeoIP.dat-$(DATVER).gz_MD5 = c053f11cb8383fb8f4826591b0cbae3d

 install : $(TARGET)

--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -24,7 +24,7 @@

 include Config

-VER        = 3.14.4
+VER        = 3.14.10

 THISAPP    = apcupsd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = apcupsd
-PAK_VER    = 4
+PAK_VER    = 5

 DEPS       = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 78811129db1a882b9a2b9afd540470b3
+$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23

 install : $(TARGET)

--- a/lfs/configroot
+++ b/lfs/configroot
@@ -100,6 +100,7 @@ $(TARGET) :
 	cp $(DIR_SRC)/config/cfgroot/time-settings		$(CONFIG_ROOT)/time/settings
 	cp $(DIR_SRC)/config/cfgroot/logging-settings		$(CONFIG_ROOT)/logging/settings
 	cp $(DIR_SRC)/config/cfgroot/useragents			$(CONFIG_ROOT)/proxy/advanced
+	cp $(DIR_SRC)/config/cfgroot/ethernet-vlans		$(CONFIG_ROOT)/ethernet/vlans
 	cp $(DIR_SRC)/langs/list					$(CONFIG_ROOT)/langs/

 	# Oneliner configfiles
--- a/lfs/flac
+++ b/lfs/flac
@@ -0,0 +1,95 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.2.1
+
+THISAPP    = flac-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = flac
+PAK_VER    = 1
+
+DEPS       = "libogg"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 153c8b15a54da428d1f0fadc756c22c7
+
+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 axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-asm.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/flac-1.2.1-bitreader.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-cflags.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-gcc43.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-hidesyms.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-tests.patch
+	cd $(DIR_APP) && ./autogen.sh -V
+	cd $(DIR_APP) && \
+		./configure \
+		--prefix=/usr \
+		--disable-xmms-plugin \
+		--disable-thorough-tests
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
--- a/lfs/fping
+++ b/lfs/fping
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.1
+
+THISAPP    = fping-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = fping
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = a2bbf3316da8c7b47a1a0ffe959d5d9e
+
+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) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
--- a/lfs/icecc
+++ b/lfs/icecc
@@ -24,7 +24,7 @@

 include Config

-VER        = 0.9.6
+VER        = 0.9.7

 THISAPP    = icecc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = icecc
-PAK_VER    = 2
+PAK_VER    = 3

 DEPS       = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = c6dacb3f28eade45f603a99245cde4fd
+$(DL_FILE)_MD5 = c06900c2f4011428d0d48826a04f74fb

 install : $(TARGET)

@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/icecream-rename-scheduler.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/icecream-0.9.7-platform-arm.patch
 	cd $(DIR_APP) && ./configure \
 				--prefix=/opt/icecream
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -170,6 +170,7 @@ $(TARGET) :
 	ln -sf ../init.d/firstsetup  /etc/rc.d/rcsysinit.d/S75firstsetup
 	ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
 	ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S90sysctl
+	ln -sf ../init.d/network-vlans /etc/rc.d/rcsysinit.d/S91network-vlans

 	ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
 	ln -sf ../../firewall /etc/rc.d/init.d/networking/red.up/20-RL-firewall
--- a/lfs/libexif
+++ b/lfs/libexif
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.6.21
+
+THISAPP    = libexif-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = libexif
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 27339b89850f28c8f1c237f233e05b27
+
+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 axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -0,0 +1,86 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.0.25
+
+THISAPP    = minidlna-$(VER)
+DL_FILE    = minidlna_$(VER)_src.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = minidlna
+PAK_VER    = 2
+
+DEPS       = "ffmpeg flac libexif libid3tag libogg sqlite"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = d966256baf2f9b068b9de871ab5dade5
+
+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 axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make install
+
+	# Install configuration.
+	install -m 644 $(DIR_SRC)/config/minidlna/minidlna.conf /etc
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
--- a/lfs/nasm
+++ b/lfs/nasm
@@ -24,10 +24,10 @@

 include Config

-VER        = 0.98.39
+VER        = 2.10.03

 THISAPP    = nasm-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 2032ad44c7359f7a9a166a40a633e772
+$(DL_FILE)_MD5 = a5d0ed070476a7c5b4f0893dc4a4ea4b

 install : $(TARGET)

@@ -69,8 +69,7 @@ $(subst %,%_MD5,$(objects)) :

 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fix-1.patch
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -24,7 +24,7 @@

 include Config

-VER        = 5.51
+VER        = 6.01

 THISAPP    = nmap-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nmap
-PAK_VER    = 5
+PAK_VER    = 6

 DEPS       = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 0b80d2cb92ace5ebba8095a4c2850275
+$(DL_FILE)_MD5 = a1a71940f238abb835dbf3ee7412bcea

 install : $(TARGET)

--- a/lfs/php
+++ b/lfs/php
@@ -24,7 +24,7 @@

 include Config

-VER        = 5.3.14
+VER        = 5.3.16

 THISAPP    = php-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
 Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz

-$(DL_FILE)_MD5 = 7caac4f71e2f21426c11ac153e538392
+$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be
 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513

--- a/lfs/usb_modeswitch
+++ b/lfs/usb_modeswitch
@@ -24,7 +24,7 @@

 include Config

-VER        = 1.2.3
+VER        = 1.2.4

 THISAPP    = usb-modeswitch-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 9b29e8b0d93d7604a9e5efc4696d37a3
+$(DL_FILE)_MD5 = dbd4ce7966d7b4a5a0604a8280f7164d

 install : $(TARGET)

--- a/lfs/usb_modeswitch_data
+++ b/lfs/usb_modeswitch_data
@@ -24,7 +24,7 @@

 include Config

-VER        = 20120531
+VER        = 20120815

 THISAPP    = usb-modeswitch-data-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 4a948331d5b9fccba4a89d3e62040cc3
+$(DL_FILE)_MD5 = 12d7de3210e45ad6f48791d12bbdbf61

 install : $(TARGET)

--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.11"							# Version number
-CORE="61"							# Core Level (Filename)
-PAKFIRE_CORE="60"						# Core Level (PAKFIRE)
+CORE="62"							# Core Level (Filename)
+PAKFIRE_CORE="62"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
@@ -487,6 +487,7 @@ buildipfire() {
  ipfiremake libnl
  ipfiremake libidn
  ipfiremake libjpeg
+  ipfiremake libexif
  ipfiremake libpng
  ipfiremake libtiff
  ipfiremake libart
@@ -632,6 +633,7 @@ buildipfire() {
  ipfiremake libogg
  ipfiremake libvorbis
  ipfiremake libdvbpsi
+  ipfiremake flac
  ipfiremake lame
  ipfiremake sox
  ipfiremake libshout
@@ -767,6 +769,8 @@ buildipfire() {
  ipfiremake lcd4linux
  ipfiremake mtr
  ipfiremake tcpick
+  ipfiremake minidlna
+  ipfiremake fping
  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/hwdata/pci.ids
+++ b/src/hwdata/pci.ids
--- a/src/hwdata/usb.ids
+++ b/src/hwdata/usb.ids
--- a/src/initscripts/init.d/minidlna
+++ b/src/initscripts/init.d/minidlna
@@ -0,0 +1,48 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/minidlna
+#
+# Description : minidlna - UPNP/DLNA streaming server
+#
+# Authors     : Michael Tremer <michael.tremer@ipfire.org>
+#
+# Version     : 01.00
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+	start)
+		boot_mesg "Starting minidlna..."
+		loadproc /usr/sbin/minidlna
+		;;
+
+	stop)
+		boot_mesg "Stopping minidlna..."
+		killproc /usr/sbin/minidlna
+		;;
+
+	reload)
+		boot_mesg "Reloading minidlna..."
+		reloadproc /usr/sbin/minidlna
+		;;
+
+	restart)
+		${0} stop
+		sleep 1
+		${0} start
+		;;
+
+	status)
+		statusproc /usr/sbin/minidlna
+		;;
+
+	*)
+		echo "Usage: ${0} {start|stop|reload|restart|status}"
+		exit 1
+		;;
+esac
+
+# End $rc_base/init.d/minidlna
--- a/src/initscripts/init.d/network-vlans
+++ b/src/initscripts/init.d/network-vlans
@@ -0,0 +1,101 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2012 IPFire Team <info@ipfire.org>                         #
+#                                                                          #
+############################################################################
+
+CONFIG_FILE="/var/ipfire/ethernet/vlans"
+
+# Skip immediately if no configuration file has been found.
+[ -e "${CONFIG_FILE}" ] || exit 0
+
+eval $(readhash ${CONFIG_FILE})
+
+# This is start or stop.
+action=${1}
+
+for interface in green0 blue0 orange0; do
+	case "${interface}" in
+		green*)
+			PARENT_DEV=${GREEN_PARENT_DEV}
+			VLAN_ID=${GREEN_VLAN_ID}
+			MAC_ADDRESS=${GREEN_MAC_ADDRESS}
+			;;
+		blue*)
+			PARENT_DEV=${BLUE_PARENT_DEV}
+			VLAN_ID=${BLUE_VLAN_ID}
+			MAC_ADDRESS=${BLUE_MAC_ADDRESS}
+			;;
+		orange*)
+			PARENT_DEV=${ORANGE_PARENT_DEV}
+			VLAN_ID=${ORANGE_VLAN_ID}
+			MAC_ADDRESS=${ORANGE_MAC_ADDRESS}
+			;;
+	esac
+
+	case "${action}" in
+		start)
+			# Check if the interface does already exists.
+			# If so, we skip creating it.
+			if [ -d "/sys/class/net/${interface}" ]; then
+				echo "Interface ${interface} already exists."
+				continue
+			fi
+
+			# Check if the parent interface exists.
+			if [ -z "${PARENT_DEV}" ] || [ ! -d "/sys/class/net/${PARENT_DEV}" ]; then
+				echo "${interface}: Parent device is not set or does not exist: ${PARENT_DEV}"
+				continue
+			fi
+
+			if [ -z "${VLAN_ID}" ]; then
+				echo "${interface}: You did not set the VLAN ID."
+				continue
+			fi
+
+			echo "Creating VLAN interface ${interface}..."
+			vconfig add ${PARENT_DEV} ${VLAN_ID}
+			ip link set ${PARENT_DEV}.${VLAN_ID} name ${interface}
+
+			if [ -n "${MAC_ADDRESS}" ]; then
+				ip link set ${interface} address ${MAC_ADDRESS}
+			fi
+
+			# Bring up the parent device.
+			ip link set ${PARENT_DEV} up
+			;;
+
+		stop)
+			if [ ! -e "/proc/net/vlan/${interface}" ]; then
+				echo "${interface} is not a VLAN interface. Skipping."
+				continue
+			fi
+
+			echo "Removing VLAN interface ${interface}..."
+			ip link set ${interface} down
+			vconfig rem ${interface}
+			;;
+		
+		*)
+			echo "Invalid action: ${action}"
+			exit 1
+			;;
+	esac
+done
--- a/src/misc-progs/Makefile
+++ b/src/misc-progs/Makefile
@@ -32,7 +32,8 @@ SUID_PROGS = setdmzholes setportfw setxtaccess \
 	wirelessctrl getipstat getiptstate qosctrl launch-ether-wake \
 	redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \
 	smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \
-	setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes
+	setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes \
+	getconntracktable
 SUID_UPDX = updxsetperms

 install : all
@@ -160,3 +161,6 @@ fireinfoctrl: fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o

 rebuildroutes: rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o
 	$(COMPILE) -I../install+setup/libsmooth/ rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o -o $@
+
+getconntracktable: getconntracktable.c setuid.o ../install+setup/libsmooth/varval.o
+	$(COMPILE) -I../install+setup/libsmooth/ getconntracktable.c setuid.o ../install+setup/libsmooth/varval.o -o $@
--- a/src/misc-progs/getconntracktable.c
+++ b/src/misc-progs/getconntracktable.c
@@ -0,0 +1,31 @@
+/* IPFire helper program - getconntracktable
+ *
+ * This program is distributed under the terms of the GNU General Public
+ * Licence.  See the file COPYING for details.
+ *
+ * The kernel's connection tracking table is not readable by
+ * non-root users. So this helper will just read and output it.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "setuid.h"
+
+int main(void) {
+	if (!(initsetuid()))
+		exit(1);
+
+	FILE *fp = fopen("/proc/net/nf_conntrack", "r");
+	if (fp == NULL) {
+		exit(1);
+	}
+
+	/* Read content line by line and write it to stdout. */
+	char linebuf[STRING_SIZE];
+	while (fgets(linebuf, STRING_SIZE, fp)) {
+		printf("%s", linebuf);
+	}
+
+	fclose(fp);
+	return 0;
+}
--- a/src/paks/minidlna/install.sh
+++ b/src/paks/minidlna/install.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+[ -d /var/mp3 ] ||  ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 )
+
+start_service ${NAME}
+
+ln -svf ../init.d/minidlna /etc/rc.d/rc0.d/K00minidlna
+ln -svf ../init.d/minidlna /etc/rc.d/rc3.d/S99minidlna
+ln -svf ../init.d/minidlna /etc/rc.d/rc6.d/K00minidlna
--- a/src/paks/minidlna/uninstall.sh
+++ b/src/paks/minidlna/uninstall.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+remove_files
+rm -rf /etc/rc.d/rc*.d/*minidlna
--- a/src/paks/minidlna/update.sh
+++ b/src/paks/minidlna/update.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+./uninstall.sh
+./install.sh
--- a/src/patches/flac-1.2.1-asm.patch
+++ b/src/patches/flac-1.2.1-asm.patch
@@ -0,0 +1,73 @@
+diff -up flac-1.2.1/src/libFLAC/stream_decoder.c.asm flac-1.2.1/src/libFLAC/stream_decoder.c
+--- flac-1.2.1/src/libFLAC/stream_decoder.c.asm	2007-09-13 17:38:05.000000000 +0200
+++ flac-1.2.1/src/libFLAC/stream_decoder.c	2008-01-29 10:32:17.000000000 +0100
+@@ -421,7 +421,7 @@ static FLAC__StreamDecoderInitStatus ini
+ #ifdef FLAC__CPU_IA32
+ 		FLAC__ASSERT(decoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
+ #ifdef FLAC__HAS_NASM
+-#if 1 /*@@@@@@ OPT: not clearly faster, needs more testing */
+#if 0 /*@@@@@@ OPT: not clearly faster, needs more testing */
+ 		if(decoder->private_->cpuinfo.data.ia32.bswap)
+ 			decoder->private_->local_bitreader_read_rice_signed_block = FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap;
+ #endif
+diff -up flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm
+--- flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm.asm	2007-03-22 05:13:05.000000000 +0100
+++ flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm	2008-01-29 10:34:09.000000000 +0100
+@@ -1507,5 +1507,5 @@ cident FLAC__lpc_restore_signal_asm_ia32
+ end
+ 
+ %ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+       section .note.GNU-stack progbits noalloc noexec nowrite align=1
+ %endif
+diff -up flac-1.2.1/src/libFLAC/ia32/Makefile.am.asm flac-1.2.1/src/libFLAC/ia32/Makefile.am
+--- flac-1.2.1/src/libFLAC/ia32/Makefile.am.asm	2007-04-04 02:01:13.000000000 +0200
+++ flac-1.2.1/src/libFLAC/ia32/Makefile.am	2008-03-17 14:04:37.000000000 +0100
+@@ -37,7 +37,6 @@ STRIP_NON_ASM = sh $(top_srcdir)/strip_n
+ 
+ noinst_LTLIBRARIES = libFLAC-asm.la
+ libFLAC_asm_la_SOURCES = \
+-	bitreader_asm.nasm \
+ 	cpu_asm.nasm \
+ 	fixed_asm.nasm \
+ 	lpc_asm.nasm \
+diff -up flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm
+--- flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm.asm	2007-03-30 02:54:53.000000000 +0200
+++ flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm	2008-01-29 10:32:57.000000000 +0100
+@@ -564,5 +564,5 @@ cident FLAC__bitreader_read_rice_signed_
+ end
+ 
+ %ifdef OBJ_FORMAT_elf
+-	section .note.GNU-stack noalloc
+	section .note.GNU-stack progbits noalloc noexec nowrite align=1
+ %endif
+diff -up flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm
+--- flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm.asm	2007-03-22 05:13:05.000000000 +0100
+++ flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm	2008-01-29 10:33:52.000000000 +0100
+@@ -308,5 +308,5 @@ cident FLAC__fixed_compute_best_predicto
+ end
+ 
+ %ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+       section .note.GNU-stack progbits noalloc noexec nowrite align=1
+ %endif
+diff -up flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm
+--- flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm.asm	2007-03-22 05:13:05.000000000 +0100
+++ flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm	2008-01-29 10:33:24.000000000 +0100
+@@ -117,5 +117,5 @@ cident FLAC__cpu_info_extended_amd_asm_i
+ end
+ 
+ %ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+       section .note.GNU-stack progbits noalloc noexec nowrite align=1
+ %endif
+diff -up flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm
+--- flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.asm	2007-06-19 22:01:27.000000000 +0200
+++ flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm	2008-01-29 10:34:40.000000000 +0100
+@@ -155,5 +155,5 @@ cident precompute_partition_info_sums_32
+ end
+ 
+ %ifdef OBJ_FORMAT_elf
+-	section .note.GNU-stack noalloc
+	section .note.GNU-stack progbits noalloc noexec nowrite align=1
+ %endif
--- a/src/patches/flac-1.2.1-bitreader.patch
+++ b/src/patches/flac-1.2.1-bitreader.patch
@@ -0,0 +1,558 @@
+Index: src/libFLAC/bitreader.c
+===================================================================
+RCS file: /cvsroot/flac/flac/src/libFLAC/bitreader.c,v
+retrieving revision 1.15
+diff -u -r1.15 bitreader.c
+--- src/libFLAC/bitreader.c	28 Feb 2008 05:34:26 -0000	1.15
+++ src/libFLAC/bitreader.c	14 Mar 2008 11:07:07 -0000
+@@ -69,13 +69,12 @@
+ #endif
+ /* counts the # of zero MSBs in a word */
+ #define COUNT_ZERO_MSBS(word) ( \
+-	(word) <= 0xffff ? \
+-		( (word) <= 0xff? byte_to_unary_table[word] + 24 : byte_to_unary_table[(word) >> 8] + 16 ) : \
+-		( (word) <= 0xffffff? byte_to_unary_table[word >> 16] + 8 : byte_to_unary_table[(word) >> 24] ) \
+	word > 0xffffff ? byte_to_unary_table[(word) >> 24] : \
+	!word ? 32 : \
+	word > 0xffff ? byte_to_unary_table[word >> 16] + 8 : \
+	word > 0xff ? byte_to_unary_table[(word) >> 8] + 16 : \
+	byte_to_unary_table[word] + 24 \
+ )
+-/* this alternate might be slightly faster on some systems/compilers: */
+-#define COUNT_ZERO_MSBS2(word) ( (word) <= 0xff ? byte_to_unary_table[word] + 24 : ((word) <= 0xffff ? byte_to_unary_table[(word) >> 8] + 16 : ((word) <= 0xffffff ? byte_to_unary_table[(word) >> 16] + 8 : byte_to_unary_table[(word) >> 24])) )
+-
+ 
+ /*
+  * This should be at least twice as large as the largest number of words
+Index: src/libFLAC/bitreader.c
+===================================================================
+RCS file: /cvsroot/flac/flac/src/libFLAC/bitreader.c,v
+retrieving revision 1.15
+diff -u -r1.15 bitreader.c
+--- src/libFLAC/bitreader.c	28 Feb 2008 05:34:26 -0000	1.15
+++ src/libFLAC/bitreader.c	14 Mar 2008 13:19:46 -0000
+@@ -149,6 +148,7 @@
+ 	FLAC__CPUInfo cpu_info;
+ };
+ 
+#if FLAC__BYTES_PER_WORD == 4 && FLAC__CPU_IA32
+ #ifdef _MSC_VER
+ /* OPT: an MSVC built-in would be better */
+ static _inline FLAC__uint32 local_swap32_(FLAC__uint32 x)
+@@ -173,6 +173,15 @@
+ done1:
+ 	}
+ }
+#elif __GNUC__
+static void local_swap32_block_(FLAC__uint32 *start, FLAC__uint32 len)
+{
+	FLAC__uint32 *end;
+
+	for(end = start + len; start < end; start++)
+		asm ("bswap %0" : "=r"(*start) : "0"(*start));
+}
+#endif
+ #endif
+ 
+ static FLaC__INLINE void crc16_update_word_(FLAC__BitReader *br, brword word)
+@@ -263,7 +272,7 @@
+ #if WORDS_BIGENDIAN
+ #else
+ 	end = (br->words*FLAC__BYTES_PER_WORD + br->bytes + bytes + (FLAC__BYTES_PER_WORD-1)) / FLAC__BYTES_PER_WORD;
+-# if defined(_MSC_VER) && (FLAC__BYTES_PER_WORD == 4)
+# if FLAC__CPU_IA32 && (__GNUC__ || defined(_MSC_VER)) && FLAC__BYTES_PER_WORD == 4
+ 	if(br->cpu_info.type == FLAC__CPUINFO_TYPE_IA32 && br->cpu_info.data.ia32.bswap) {
+ 		start = br->words;
+ 		local_swap32_block_(br->buffer + start, end - start);
+Index: src/libFLAC/bitreader.c
+===================================================================
+RCS file: /cvsroot/flac/flac/src/libFLAC/bitreader.c,v
+retrieving revision 1.15
+diff -u -r1.15 bitreader.c
+--- src/libFLAC/bitreader.c	28 Feb 2008 05:34:26 -0000	1.15
+++ src/libFLAC/bitreader.c	17 Mar 2008 15:42:57 -0000
+@@ -803,379 +812,144 @@
+ }
+ 
+ /* this is by far the most heavily used reader call.  it ain't pretty but it's fast */
+-/* a lot of the logic is copied, then adapted, from FLAC__bitreader_read_unary_unsigned() and FLAC__bitreader_read_raw_uint32() */
+ FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter)
+-/* OPT: possibly faster version for use with MSVC */
+-#ifdef _MSC_VER
+ {
+-	unsigned i;
+-	unsigned uval = 0;
+-	unsigned bits; /* the # of binary LSBs left to read to finish a rice codeword */
+-
+ 	/* try and get br->consumed_words and br->consumed_bits into register;
+ 	 * must remember to flush them back to *br before calling other
+-	 * bitwriter functions that use them, and before returning */
+-	register unsigned cwords;
+-	register unsigned cbits;
+	 * bitreader functions that use them, and before returning */
+	unsigned cwords, words, lsbs, msbs, x, y;
+	unsigned ucbits; /* keep track of the number of unconsumed bits in word */
+	brword b;
+	int *val, *end;
+ 
+ 	FLAC__ASSERT(0 != br);
+ 	FLAC__ASSERT(0 != br->buffer);
+ 	/* WATCHOUT: code does not work with <32bit words; we can make things much faster with this assertion */
+ 	FLAC__ASSERT(FLAC__BITS_PER_WORD >= 32);
+ 	FLAC__ASSERT(parameter < 32);
+-	/* the above two asserts also guarantee that the binary part never straddles more that 2 words, so we don't have to loop to read it */
+-
+-	if(nvals == 0)
+-		return true;
+-
+-	cbits = br->consumed_bits;
+-	cwords = br->consumed_words;
+	/* the above two asserts also guarantee that the binary part never straddles more than 2 words, so we don't have to loop to read it */
+ 
+-	while(1) {
+	val = vals;
+	end = vals + nvals;
+ 
+-		/* read unary part */
+-		while(1) {
+-			while(cwords < br->words) { /* if we've not consumed up to a partial tail word... */
+-				brword b = br->buffer[cwords] << cbits;
+-				if(b) {
+-#if 0 /* slower, probably due to bad register allocation... */ && defined FLAC__CPU_IA32 && !defined FLAC__NO_ASM && FLAC__BITS_PER_WORD == 32
+-					__asm {
+-						bsr eax, b
+-						not eax
+-						and eax, 31
+-						mov i, eax
+-					}
+-#else
+-					i = COUNT_ZERO_MSBS(b);
+-#endif
+-					uval += i;
+-					bits = parameter;
+-					i++;
+-					cbits += i;
+-					if(cbits == FLAC__BITS_PER_WORD) {
+-						crc16_update_word_(br, br->buffer[cwords]);
+-						cwords++;
+-						cbits = 0;
+-					}
+-					goto break1;
+-				}
+-				else {
+-					uval += FLAC__BITS_PER_WORD - cbits;
+-					crc16_update_word_(br, br->buffer[cwords]);
+-					cwords++;
+-					cbits = 0;
+-					/* didn't find stop bit yet, have to keep going... */
+-				}
+-			}
+-			/* at this point we've eaten up all the whole words; have to try
+-			 * reading through any tail bytes before calling the read callback.
+-			 * this is a repeat of the above logic adjusted for the fact we
+-			 * don't have a whole word.  note though if the client is feeding
+-			 * us data a byte at a time (unlikely), br->consumed_bits may not
+-			 * be zero.
+-			 */
+-			if(br->bytes) {
+-				const unsigned end = br->bytes * 8;
+-				brword b = (br->buffer[cwords] & (FLAC__WORD_ALL_ONES << (FLAC__BITS_PER_WORD-end))) << cbits;
+-				if(b) {
+-					i = COUNT_ZERO_MSBS(b);
+-					uval += i;
+-					bits = parameter;
+-					i++;
+-					cbits += i;
+-					FLAC__ASSERT(cbits < FLAC__BITS_PER_WORD);
+-					goto break1;
+-				}
+-				else {
+-					uval += end - cbits;
+-					cbits += end;
+-					FLAC__ASSERT(cbits < FLAC__BITS_PER_WORD);
+-					/* didn't find stop bit yet, have to keep going... */
+-				}
+-			}
+-			/* flush registers and read; bitreader_read_from_client_() does
+-			 * not touch br->consumed_bits at all but we still need to set
+-			 * it in case it fails and we have to return false.
+-			 */
+-			br->consumed_bits = cbits;
+-			br->consumed_words = cwords;
+-			if(!bitreader_read_from_client_(br))
+	if(parameter == 0) {
+		while(val < end) {
+			/* read the unary MSBs and end bit */
+			if(!FLAC__bitreader_read_unary_unsigned(br, &msbs))
+ 				return false;
+-			cwords = br->consumed_words;
+-		}
+-break1:
+-		/* read binary part */
+-		FLAC__ASSERT(cwords <= br->words);
+-
+-		if(bits) {
+-			while((br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits < bits) {
+-				/* flush registers and read; bitreader_read_from_client_() does
+-				 * not touch br->consumed_bits at all but we still need to set
+-				 * it in case it fails and we have to return false.
+-				 */
+-				br->consumed_bits = cbits;
+-				br->consumed_words = cwords;
+-				if(!bitreader_read_from_client_(br))
+-					return false;
+-				cwords = br->consumed_words;
+-			}
+-			if(cwords < br->words) { /* if we've not consumed up to a partial tail word... */
+-				if(cbits) {
+-					/* this also works when consumed_bits==0, it's just a little slower than necessary for that case */
+-					const unsigned n = FLAC__BITS_PER_WORD - cbits;
+-					const brword word = br->buffer[cwords];
+-					if(bits < n) {
+-						uval <<= bits;
+-						uval |= (word & (FLAC__WORD_ALL_ONES >> cbits)) >> (n-bits);
+-						cbits += bits;
+-						goto break2;
+-					}
+-					uval <<= n;
+-					uval |= word & (FLAC__WORD_ALL_ONES >> cbits);
+-					bits -= n;
+-					crc16_update_word_(br, word);
+-					cwords++;
+-					cbits = 0;
+-					if(bits) { /* if there are still bits left to read, there have to be less than 32 so they will all be in the next word */
+-						uval <<= bits;
+-						uval |= (br->buffer[cwords] >> (FLAC__BITS_PER_WORD-bits));
+-						cbits = bits;
+-					}
+-					goto break2;
+-				}
+-				else {
+-					FLAC__ASSERT(bits < FLAC__BITS_PER_WORD);
+-					uval <<= bits;
+-					uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-bits);
+-					cbits = bits;
+-					goto break2;
+-				}
+-			}
+-			else {
+-				/* in this case we're starting our read at a partial tail word;
+-				 * the reader has guaranteed that we have at least 'bits' bits
+-				 * available to read, which makes this case simpler.
+-				 */
+-				uval <<= bits;
+-				if(cbits) {
+-					/* this also works when consumed_bits==0, it's just a little slower than necessary for that case */
+-					FLAC__ASSERT(cbits + bits <= br->bytes*8);
+-					uval |= (br->buffer[cwords] & (FLAC__WORD_ALL_ONES >> cbits)) >> (FLAC__BITS_PER_WORD-cbits-bits);
+-					cbits += bits;
+-					goto break2;
+-				}
+-				else {
+-					uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-bits);
+-					cbits += bits;
+-					goto break2;
+-				}
+-			}
+-		}
+-break2:
+-		/* compose the value */
+-		*vals = (int)(uval >> 1 ^ -(int)(uval & 1));
+ 
+-		/* are we done? */
+-		--nvals;
+-		if(nvals == 0) {
+-			br->consumed_bits = cbits;
+-			br->consumed_words = cwords;
+-			return true;
+			*val++ = (int)(msbs >> 1) ^ -(int)(msbs & 1);
+ 		}
+ 
+-		uval = 0;
+-		++vals;
+-
+		return true;
+ 	}
+-}
+-#else
+-{
+-	unsigned i;
+-	unsigned uval = 0;
+ 
+-	/* try and get br->consumed_words and br->consumed_bits into register;
+-	 * must remember to flush them back to *br before calling other
+-	 * bitwriter functions that use them, and before returning */
+-	register unsigned cwords;
+-	register unsigned cbits;
+-	unsigned ucbits; /* keep track of the number of unconsumed bits in the buffer */
+	FLAC__ASSERT(parameter > 0);
+ 
+-	FLAC__ASSERT(0 != br);
+-	FLAC__ASSERT(0 != br->buffer);
+-	/* WATCHOUT: code does not work with <32bit words; we can make things much faster with this assertion */
+-	FLAC__ASSERT(FLAC__BITS_PER_WORD >= 32);
+-	FLAC__ASSERT(parameter < 32);
+-	/* the above two asserts also guarantee that the binary part never straddles more than 2 words, so we don't have to loop to read it */
+	cwords = br->consumed_words;
+	words = br->words;
+ 
+-	if(nvals == 0)
+-		return true;
+	/* if we've not consumed up to a partial tail word... */
+	if(cwords >= words) {
+		x = 0;
+		goto process_tail;
+	}
+
+	ucbits = FLAC__BITS_PER_WORD - br->consumed_bits;
+	b = br->buffer[cwords] << br->consumed_bits;  /* keep unconsumed bits aligned to left */
+
+	while(val < end) {
+		/* read the unary MSBs and end bit */
+		x = y = COUNT_ZERO_MSBS(b);
+		if(x == FLAC__BITS_PER_WORD) {
+			x = ucbits;
+			do {
+				/* didn't find stop bit yet, have to keep going... */
+				crc16_update_word_(br, br->buffer[cwords++]);
+				if (cwords >= words)
+					goto incomplete_msbs;
+				b = br->buffer[cwords];
+				y = COUNT_ZERO_MSBS(b);
+				x += y;
+			} while(y == FLAC__BITS_PER_WORD);
+		}
+		b <<= y;
+		b <<= 1; /* account for stop bit */
+		ucbits = (ucbits - x - 1) % FLAC__BITS_PER_WORD;
+		msbs = x;
+
+		/* read the binary LSBs */
+		x = b >> (FLAC__BITS_PER_WORD - parameter);
+		if(parameter <= ucbits) {
+			ucbits -= parameter;
+			b <<= parameter;
+		} else {
+			/* there are still bits left to read, they will all be in the next word */
+			crc16_update_word_(br, br->buffer[cwords++]);
+			if (cwords >= words)
+				goto incomplete_lsbs;
+			b = br->buffer[cwords];
+			ucbits += FLAC__BITS_PER_WORD - parameter;
+			x |= b >> ucbits;
+			b <<= FLAC__BITS_PER_WORD - ucbits;
+		}
+		lsbs = x;
+ 
+-	cbits = br->consumed_bits;
+-	cwords = br->consumed_words;
+-	ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits;
+		/* compose the value */
+		x = (msbs << parameter) | lsbs;
+		*val++ = (int)(x >> 1) ^ -(int)(x & 1);
+ 
+-	while(1) {
+		continue;
+ 
+-		/* read unary part */
+-		while(1) {
+-			while(cwords < br->words) { /* if we've not consumed up to a partial tail word... */
+-				brword b = br->buffer[cwords] << cbits;
+-				if(b) {
+-#if 0 /* is not discernably faster... */ && defined FLAC__CPU_IA32 && !defined FLAC__NO_ASM && FLAC__BITS_PER_WORD == 32 && defined __GNUC__
+-					asm volatile (
+-						"bsrl %1, %0;"
+-						"notl %0;"
+-						"andl $31, %0;"
+-						: "=r"(i)
+-						: "r"(b)
+-					);
+-#else
+-					i = COUNT_ZERO_MSBS(b);
+-#endif
+-					uval += i;
+-					cbits += i;
+-					cbits++; /* skip over stop bit */
+-					if(cbits >= FLAC__BITS_PER_WORD) { /* faster way of testing if(cbits == FLAC__BITS_PER_WORD) */
+-						crc16_update_word_(br, br->buffer[cwords]);
+-						cwords++;
+-						cbits = 0;
+-					}
+-					goto break1;
+-				}
+-				else {
+-					uval += FLAC__BITS_PER_WORD - cbits;
+-					crc16_update_word_(br, br->buffer[cwords]);
+-					cwords++;
+-					cbits = 0;
+-					/* didn't find stop bit yet, have to keep going... */
+-				}
+-			}
+-			/* at this point we've eaten up all the whole words; have to try
+-			 * reading through any tail bytes before calling the read callback.
+-			 * this is a repeat of the above logic adjusted for the fact we
+-			 * don't have a whole word.  note though if the client is feeding
+-			 * us data a byte at a time (unlikely), br->consumed_bits may not
+-			 * be zero.
+-			 */
+-			if(br->bytes) {
+-				const unsigned end = br->bytes * 8;
+-				brword b = (br->buffer[cwords] & ~(FLAC__WORD_ALL_ONES >> end)) << cbits;
+-				if(b) {
+-					i = COUNT_ZERO_MSBS(b);
+-					uval += i;
+-					cbits += i;
+-					cbits++; /* skip over stop bit */
+-					FLAC__ASSERT(cbits < FLAC__BITS_PER_WORD);
+-					goto break1;
+-				}
+-				else {
+-					uval += end - cbits;
+-					cbits += end;
+-					FLAC__ASSERT(cbits < FLAC__BITS_PER_WORD);
+-					/* didn't find stop bit yet, have to keep going... */
+-				}
+		/* at this point we've eaten up all the whole words */
+process_tail:
+		do {
+			if(0) {
+incomplete_msbs:
+				br->consumed_bits = 0;
+				br->consumed_words = cwords;
+ 			}
+-			/* flush registers and read; bitreader_read_from_client_() does
+-			 * not touch br->consumed_bits at all but we still need to set
+-			 * it in case it fails and we have to return false.
+-			 */
+-			br->consumed_bits = cbits;
+-			br->consumed_words = cwords;
+-			if(!bitreader_read_from_client_(br))
+			
+			/* read the unary MSBs and end bit */
+			if(!FLAC__bitreader_read_unary_unsigned(br, &msbs))
+ 				return false;
+-			cwords = br->consumed_words;
+-			ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits + uval;
+-			/* + uval to offset our count by the # of unary bits already
+-			 * consumed before the read, because we will add these back
+-			 * in all at once at break1
+-			 */
+-		}
+-break1:
+-		ucbits -= uval;
+-		ucbits--; /* account for stop bit */
+-
+-		/* read binary part */
+-		FLAC__ASSERT(cwords <= br->words);
+-
+-		if(parameter) {
+-			while(ucbits < parameter) {
+-				/* flush registers and read; bitreader_read_from_client_() does
+-				 * not touch br->consumed_bits at all but we still need to set
+-				 * it in case it fails and we have to return false.
+-				 */
+-				br->consumed_bits = cbits;
+			msbs += x;
+			x = ucbits = 0;
+
+			if(0) {
+incomplete_lsbs:
+				br->consumed_bits = 0;
+ 				br->consumed_words = cwords;
+-				if(!bitreader_read_from_client_(br))
+-					return false;
+-				cwords = br->consumed_words;
+-				ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits;
+-			}
+-			if(cwords < br->words) { /* if we've not consumed up to a partial tail word... */
+-				if(cbits) {
+-					/* this also works when consumed_bits==0, it's just slower than necessary for that case */
+-					const unsigned n = FLAC__BITS_PER_WORD - cbits;
+-					const brword word = br->buffer[cwords];
+-					if(parameter < n) {
+-						uval <<= parameter;
+-						uval |= (word & (FLAC__WORD_ALL_ONES >> cbits)) >> (n-parameter);
+-						cbits += parameter;
+-					}
+-					else {
+-						uval <<= n;
+-						uval |= word & (FLAC__WORD_ALL_ONES >> cbits);
+-						crc16_update_word_(br, word);
+-						cwords++;
+-						cbits = parameter - n;
+-						if(cbits) { /* parameter > n, i.e. if there are still bits left to read, there have to be less than 32 so they will all be in the next word */
+-							uval <<= cbits;
+-							uval |= (br->buffer[cwords] >> (FLAC__BITS_PER_WORD-cbits));
+-						}
+-					}
+-				}
+-				else {
+-					cbits = parameter;
+-					uval <<= parameter;
+-					uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-cbits);
+-				}
+ 			}
+-			else {
+-				/* in this case we're starting our read at a partial tail word;
+-				 * the reader has guaranteed that we have at least 'parameter'
+-				 * bits available to read, which makes this case simpler.
+-				 */
+-				uval <<= parameter;
+-				if(cbits) {
+-					/* this also works when consumed_bits==0, it's just a little slower than necessary for that case */
+-					FLAC__ASSERT(cbits + parameter <= br->bytes*8);
+-					uval |= (br->buffer[cwords] & (FLAC__WORD_ALL_ONES >> cbits)) >> (FLAC__BITS_PER_WORD-cbits-parameter);
+-					cbits += parameter;
+-				}
+-				else {
+-					cbits = parameter;
+-					uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-cbits);
+-				}
+-			}
+-		}
+ 
+-		ucbits -= parameter;
+-
+-		/* compose the value */
+-		*vals = (int)(uval >> 1 ^ -(int)(uval & 1));
+			/* read the binary LSBs */
+			if(!FLAC__bitreader_read_raw_uint32(br, &lsbs, parameter - ucbits))
+				return false;
+			lsbs = x | lsbs;
+ 
+-		/* are we done? */
+-		--nvals;
+-		if(nvals == 0) {
+-			br->consumed_bits = cbits;
+-			br->consumed_words = cwords;
+-			return true;
+-		}
+			/* compose the value */
+			x = (msbs << parameter) | lsbs;
+			*val++ = (int)(x >> 1) ^ -(int)(x & 1);
+			x = 0;
+ 
+-		uval = 0;
+-		++vals;
+			cwords = br->consumed_words;
+			words = br->words;
+			ucbits = FLAC__BITS_PER_WORD - br->consumed_bits;
+			b = br->buffer[cwords] << br->consumed_bits;
+		} while(cwords >= words && val < end);
+	}
+ 
+	if(ucbits == 0 && cwords < words) {
+		/* don't leave the head word with no unconsumed bits */
+		crc16_update_word_(br, br->buffer[cwords++]);
+		ucbits = FLAC__BITS_PER_WORD;
+ 	}
+
+	br->consumed_bits = FLAC__BITS_PER_WORD - ucbits;
+	br->consumed_words = cwords;
+
+	return true;
+ }
+-#endif
+ 
+ #if 0 /* UNUSED */
+ FLAC__bool FLAC__bitreader_read_golomb_signed(FLAC__BitReader *br, int *val, unsigned parameter)
--- a/src/patches/flac-1.2.1-cflags.patch
+++ b/src/patches/flac-1.2.1-cflags.patch
@@ -0,0 +1,45 @@
+diff -up flac-1.2.1/src/libFLAC/Makefile.am.cflags flac-1.2.1/src/libFLAC/Makefile.am
+--- flac-1.2.1/src/libFLAC/Makefile.am.cflags	2007-09-14 23:06:17.000000000 +0200
+++ flac-1.2.1/src/libFLAC/Makefile.am	2008-03-17 14:19:29.000000000 +0100
+@@ -41,7 +41,7 @@ CPUCFLAGS = -faltivec -force_cpusubtype_
+ else
+ # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
+ #@@@ PPC optimizations temporarily disabled
+-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
+CPUCFLAGS = -DFLAC__NO_ASM
+ endif
+ endif
+ 
+@@ -69,7 +69,7 @@ endif
+ endif
+ endif
+ 
+-libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
+libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ libFLAC_extracflags.la
+ 
+ SUBDIRS = $(ARCH_SUBDIRS) include .
+ 
+@@ -112,7 +112,10 @@ libFLAC_la_SOURCES = \
+ 	metadata_iterators.c \
+ 	metadata_object.c \
+ 	stream_decoder.c \
+-	stream_encoder.c \
+ 	stream_encoder_framing.c \
+ 	window.c \
+ 	$(extra_ogg_sources)
+
+noinst_LTLIBRARIES = libFLAC_extracflags.la
+libFLAC_extracflags_la_SOURCES = stream_encoder.c
+libFLAC_extracflags_la_CFLAGS = $(AM_CFLAGS) -funroll-loops
+diff -up flac-1.2.1/configure.in.cflags flac-1.2.1/configure.in
+--- flac-1.2.1/configure.in.cflags	2007-09-13 17:48:42.000000000 +0200
+++ flac-1.2.1/configure.in	2008-03-17 14:17:08.000000000 +0100
+@@ -301,7 +301,7 @@ else
+ 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
+ 	if test "x$GCC" = xyes; then
+ 		CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
+-		CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
+		CFLAGS="-Wall -W -Winline $CFLAGS"
+ 	fi
+ fi
+ 
--- a/src/patches/flac-1.2.1-gcc43.patch
+++ b/src/patches/flac-1.2.1-gcc43.patch
@@ -0,0 +1,11 @@
+diff -up flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 flac-1.2.1/examples/cpp/encode/file/main.cpp
+--- flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43	2007-09-13 17:58:03.000000000 +0200
+++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2008-01-08 10:27:39.000000000 +0100
+@@ -29,6 +29,7 @@
+ #endif
+ 
+ #include <stdio.h>
+#include <string.h>
+ #include <stdlib.h>
+ #include "FLAC++/metadata.h"
+ #include "FLAC++/encoder.h"
--- a/src/patches/flac-1.2.1-hidesyms.patch
+++ b/src/patches/flac-1.2.1-hidesyms.patch
@@ -0,0 +1,39 @@
+diff -up flac-1.2.1/src/libFLAC/include/private/ogg_helper.h.hidesyms flac-1.2.1/src/libFLAC/include/private/ogg_helper.h
+--- flac-1.2.1/src/libFLAC/include/private/ogg_helper.h.hidesyms	2007-02-02 07:22:40.000000000 +0100
+++ flac-1.2.1/src/libFLAC/include/private/ogg_helper.h	2008-01-29 15:27:13.000000000 +0100
+@@ -35,9 +35,13 @@
+ #include <ogg/ogg.h>
+ #include "FLAC/stream_encoder.h" /* for FLAC__StreamEncoder */
+ 
+__attribute__((__visibility__("hidden")))
+ void simple_ogg_page__init(ogg_page *page);
+__attribute__((__visibility__("hidden")))
+ void simple_ogg_page__clear(ogg_page *page);
+__attribute__((__visibility__("hidden")))
+ FLAC__bool simple_ogg_page__get_at(FLAC__StreamEncoder *encoder, FLAC__uint64 position, ogg_page *page, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderReadCallback read_callback, void *client_data);
+__attribute__((__visibility__("hidden")))
+ FLAC__bool simple_ogg_page__set_at(FLAC__StreamEncoder *encoder, FLAC__uint64 position, ogg_page *page, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderWriteCallback write_callback, void *client_data);
+ 
+ #endif
+diff -up flac-1.2.1/src/libFLAC/include/private/bitreader.h.hidesyms flac-1.2.1/src/libFLAC/include/private/bitreader.h
+--- flac-1.2.1/src/libFLAC/include/private/bitreader.h.hidesyms	2007-07-10 22:22:19.000000000 +0200
+++ flac-1.2.1/src/libFLAC/include/private/bitreader.h	2008-01-29 15:27:13.000000000 +0100
+@@ -95,5 +95,6 @@ FLAC__bool FLAC__bitreader_read_golomb_u
+ FLAC__bool FLAC__bitreader_read_utf8_uint32(FLAC__BitReader *br, FLAC__uint32 *val, FLAC__byte *raw, unsigned *rawlen);
+ FLAC__bool FLAC__bitreader_read_utf8_uint64(FLAC__BitReader *br, FLAC__uint64 *val, FLAC__byte *raw, unsigned *rawlen);
+ 
+__attribute__((__visibility__("hidden")))
+ FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br);
+ #endif
+diff -up flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.hidesyms flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm
+--- flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.hidesyms	2008-01-29 15:27:13.000000000 +0100
+++ flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm	2008-01-29 15:28:32.000000000 +0100
+@@ -34,7 +34,7 @@
+ 
+ 	data_section
+ 
+-cglobal precompute_partition_info_sums_32bit_asm_ia32_
+cglobal precompute_partition_info_sums_32bit_asm_ia32_:function hidden
+ 
+ 	code_section
+ 
--- a/src/patches/flac-1.2.1-tests.patch
+++ b/src/patches/flac-1.2.1-tests.patch
@@ -0,0 +1,41 @@
+diff -up flac-1.2.1/test/test_seeking.sh.tests flac-1.2.1/test/test_seeking.sh
+--- flac-1.2.1/test/test_seeking.sh.tests	2007-09-11 09:33:04.000000000 +0200
+++ flac-1.2.1/test/test_seeking.sh	2008-01-29 13:52:03.000000000 +0100
+@@ -103,7 +103,7 @@ tiny_seek_count=100
+ if [ "$FLAC__TEST_LEVEL" -gt 1 ] ; then
+ 	small_seek_count=10000
+ else
+-	small_seek_count=100000
+	small_seek_count=100
+ fi
+ 
+ for suffix in '' '-s' ; do
+diff -up flac-1.2.1/test/test_streams.sh.tests flac-1.2.1/test/test_streams.sh
+--- flac-1.2.1/test/test_streams.sh.tests	2007-06-16 21:58:39.000000000 +0200
+++ flac-1.2.1/test/test_streams.sh	2008-03-17 13:57:39.000000000 +0100
+@@ -39,6 +39,10 @@ if [ x"$FLAC__TEST_LEVEL" = x ] ; then
+ 	FLAC__TEST_LEVEL=1
+ fi
+ 
+if [ "$FLAC__TEST_LEVEL" -eq 0 ] ; then
+	exit 0
+fi
+
+ flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable"
+ 
+ run_flac ()
+diff -up flac-1.2.1/src/test_streams/main.c.tests flac-1.2.1/src/test_streams/main.c
+--- flac-1.2.1/src/test_streams/main.c.tests	2007-08-31 07:54:49.000000000 +0200
+++ flac-1.2.1/src/test_streams/main.c	2008-01-29 13:53:46.000000000 +0100
+@@ -898,9 +898,9 @@ int main(int argc, char *argv[])
+ 	if(!generate_noise("noise.raw", 65536 * 8 * 3)) return 1;
+ 	if(!generate_noise("noise8m32.raw", 32)) return 1;
+ 	if(!generate_wackywavs()) return 1;
+-	for(channels = 1; channels <= 8; channels++) {
+	for(channels = 1; channels <= 2; channels++) {
+ 		unsigned bits_per_sample;
+-		for(bits_per_sample = 4; bits_per_sample <= 24; bits_per_sample++) {
+		for(bits_per_sample = 8; bits_per_sample <= 24; bits_per_sample += 8) {
+ 			static const unsigned nsamples[] = { 1, 111, 4777 } ;
+ 			unsigned samples;
+ 			for(samples = 0; samples < sizeof(nsamples)/sizeof(nsamples[0]); samples++) {
--- a/src/patches/icecream-0.9.7-platform-arm.patch
+++ b/src/patches/icecream-0.9.7-platform-arm.patch
@@ -0,0 +1,22 @@
+Index: services/scheduler.cpp
+===================================================================
+--- services/scheduler.cpp	(revision 1310078)
+++ services/scheduler.cpp	(working copy)
+@@ -52,7 +52,7 @@
+ #include "config.h"
+ #include "bench.h"
+ 
+-#define DEBUG_SCHEDULER 0
+#define DEBUG_SCHEDULER 1
+ 
+ /* TODO:
+    * leak check
+@@ -613,6 +613,8 @@
+ 
+       platform_map.insert( make_pair( string( "ppc" ), string( "ppc64" ) ) );
+       platform_map.insert( make_pair( string( "s390" ), string( "s390x" ) ) );
+
+      platform_map.insert( make_pair( string( "armv5tel"), string( "armv7l" ) ) );
+     }
+ 
+   multimap<string, string>::const_iterator end = platform_map.upper_bound( target );