fix

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1136 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 5cfb5dea046edff87962e0d196d0f1e5e8d75f47..9f014f68af9902b04446ac1c2281f38c38b80725 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -29,7 +29,7 @@
 * URI-1.35
 * Unix-Syslog-0.100
 * XML-Parser-2.34
-* alsa-lib-1.0.13
+* alsa-lib-1.0.15
 * amavisd-new-2.5.2
 * applejuice-0.30
 * arping-2.05
@@ -99,7 +99,6 @@
 * hddtemp-0.3-beta14
 * hdparm-7.7
 * hplip-2.7.10
-* htop-0.6.2
 * htop-0.7
 * httpd-2.2.6
 * hwdata
@@ -139,11 +138,10 @@
 * libshout-2.2.2
 * libsigc++-2.0.17
 * libtool-1.5.22
-* libtorrent-0.11.6
 * libtorrent-0.11.9
 * libupnp-1.3.1
 * libusb-0.1.12
-* libvorbis-1.1.2
+* libvorbis-1.2.0
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
@@ -203,7 +201,6 @@
 * php-5.2.4
 * pkg-config-0.20
 * popt-1.10.4
-* portmap
 * portmap_5beta
 * postfix-2.4.6
 * ppp-2.4.4
@@ -215,8 +212,8 @@
 * rp-pppoe-3.8
 * rrdtool-1.2.15
 * rsync-2.6.9
-* rtorrent-0.7.6
-* samba-3.0.27a
+* rtorrent-0.7.9
+* samba-3.0.28
 * screen-4.0.3
 * sdparm-1.01
 * sed-4.1.5
@@ -230,10 +227,8 @@
 * squashfs3.2-r2
 * squid-2.6.STABLE16
 * squid-graph-3.2
-* squidGuard-1.2.0
 * squidGuard-1.3
 * squidclam-0.23
-* subversion-1.4.4
 * sudo-1.6.8p12
 * sysfsutils-1.3.0
 * sysklogd-1.4.1

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index d7b0ea6d839a6f74e9fb1c7a84bc408adb945b2a..62da3120bce7cb2ba05b63a65dba7006597481ee 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -2,6 +2,7 @@
 
 eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)
 IFACE=`/bin/cat /var/ipfire/red/iface 2> /dev/null | /usr/bin/tr -d '\012'`
 
 if [ -f /var/ipfire/red/device ]; then
@@ -35,7 +36,7 @@ iptables_init() {
        /sbin/iptables -N PSCAN
        if [ "$DROPPORTSCAN" == "on" ]; then
                /sbin/iptables -A PSCAN -p tcp  -m limit --limit 10/minute -j LOG --log-prefix "DROP_TCP Scan " -m comment --comment "DROP_TCP PScan"
-               /sbin/iptables -A PSCAN -p udp  -m limit --limit 10/minute -j LOG --log-prefix "DROP_UDP Scan " -m comment --comment "DROP_UPD PScan"
+               /sbin/iptables -A PSCAN -p udp  -m limit --limit 10/minute -j LOG --log-prefix "DROP_UDP Scan " -m comment --comment "DROP_UDP PScan"
                /sbin/iptables -A PSCAN -p icmp -m limit --limit 10/minute -j LOG --log-prefix "DROP_ICMP Scan " -m comment --comment "DROP_ICMP PScan"
                /sbin/iptables -A PSCAN -f      -m limit --limit 10/minute -j LOG --log-prefix "DROP_FRAG Scan " -m comment --comment "DROP_FRAG PScan"
        fi