Merge remote-tracking branch 'ms/firewall-new' into firewall

diff --git a/config/ovpn/verify b/config/ovpn/verify
index 72334296cabf27d8991b9a34687ca22963922511..44ed1105df3446204dba7a816a15fc3afe57636d 100644 (file)
--- a/config/ovpn/verify
+++ b/config/ovpn/verify
@@ -49,7 +49,7 @@ if (-f "${General::swroot}/ovpn/ovpnconfig"){
                exit 0 if ($cn eq $CN);
 
                # Compatibility code for incorrectly saved CNs.
-               $cn =~ s/\ /_/;
+               $cn =~ s/\ /_/g;
                exit 0 if ($cn eq $CN);
        }
 }

diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq
index 10ec777b266d3e3cf2693a3c73e5fb8c64f32473..4467545ae53a3fe999e2582fb54f5981c72089ea 100644 (file)
--- a/config/rootfiles/common/daq
+++ b/config/rootfiles/common/daq
@@ -21,7 +21,7 @@ usr/lib/daq
 #usr/lib/libdaq.la
 #usr/lib/libdaq.so
 usr/lib/libdaq.so.2
-usr/lib/libdaq.so.2.0.0
+usr/lib/libdaq.so.2.0.1
 #usr/lib/libdaq_static.a
 #usr/lib/libdaq_static.la
 #usr/lib/libdaq_static_modules.a

diff --git a/config/rootfiles/core/71/update.sh b/config/rootfiles/core/71/update.sh
index 8990b97edb20f10fa36f2c9bd2ae87440fdbc56f..e45ccd837ee80e54b7639ea2dafd6772351d1b89 100644 (file)
--- a/config/rootfiles/core/71/update.sh
+++ b/config/rootfiles/core/71/update.sh
@@ -39,7 +39,7 @@ cp -f /etc/snort/snort.conf /etc/snort/snort.conf.backup
 #
 #Stop services
 /etc/init.d/snort stop
-
+/etc/init.d/squid stop
 #
 #Remove old usb-modeswitch file
 rm /usr/share/usb_modeswitch/0e8d:0002
@@ -59,6 +59,7 @@ grep "^include $RULE_PATH" /etc/snort/snort.conf.backup >> /etc/snort/snort.conf
 
 #
 #Start services
+/etc/init.d/squid start
 /etc/init.d/snort start
 
 #

diff --git a/config/rootfiles/core/72/exclude b/config/rootfiles/core/72/exclude
index 321a931ca5a55e6c7ac27da9449d937faceaae41..e8ae55d9769b4250351bce11f01bab63e2aab1a5 100644 (file)
--- a/config/rootfiles/core/72/exclude
+++ b/config/rootfiles/core/72/exclude
@@ -10,8 +10,8 @@ etc/ipsec.user.secrets
 var/log/cache
 var/updatecache
 etc/localtime
-var/ipfire/ovpn
 etc/ssh/ssh_config
 etc/ssh/sshd_config
 etc/ssl/openssl.cnf
 var/state/dhcp/dhcpd.leases
+etc/snort/snort.conf

diff --git a/config/rootfiles/core/72/filelists/daq b/config/rootfiles/core/72/filelists/daq
new file mode 120000 (symlink)
index 0000000..d0e0956
--- /dev/null
+++ b/config/rootfiles/core/72/filelists/daq
@@ -0,0 +1 @@
+../../../common/daq
\ No newline at end of file

diff --git a/config/rootfiles/core/72/filelists/files b/config/rootfiles/core/72/filelists/files
index f25463113a6f1d89a61ec7220c08752c8f1b9d22..e8f90a12040f735d580006fd639e1716c191df0a 100644 (file)
--- a/config/rootfiles/core/72/filelists/files
+++ b/config/rootfiles/core/72/filelists/files
@@ -2,6 +2,10 @@ etc/system-release
 etc/issue
 etc/rc.d/init.d/firewall
 srv/web/ipfire/cgi-bin/ddns.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
 usr/local/bin/openvpnctrl
 usr/local/bin/setddns.pl
+var/ipfire/langs
+var/ipfire/ovpn/verify

diff --git a/config/rootfiles/core/72/filelists/snort b/config/rootfiles/core/72/filelists/snort
new file mode 120000 (symlink)
index 0000000..9406ce0
--- /dev/null
+++ b/config/rootfiles/core/72/filelists/snort
@@ -0,0 +1 @@
+../../../common/snort
\ No newline at end of file

diff --git a/config/rootfiles/core/72/update.sh b/config/rootfiles/core/72/update.sh
index 4a5b943adbb2c0baff8c7a669a5d82587d8a3860..c3dc20a81db19a6d8d2f72966be16c607c3ad46b 100644 (file)
--- a/config/rootfiles/core/72/update.sh
+++ b/config/rootfiles/core/72/update.sh
@@ -34,8 +34,9 @@ done
 
 #
 #Stop services
-ipsec stop
-
+/etc/init.d/ipsec stop
+/etc/init.d/snort stop
+/etc/init.d/squid stop
 
 #
 #Extract files
@@ -44,11 +45,16 @@ extract_files
 
 #
 #Start services
-ipsec start
+/etc/init.d/squid start
+/etc/init.d/snort start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+       /etc/init.d/ipsec start
+fi
+
 
 #
 #Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
 sync
 
@@ -61,4 +67,3 @@ sync
 sendprofile
 #Don't report the exitcode last command
 exit 0
-

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 22aa896231cf1401de2e934c816ad881d648fab0..3d81d45647f248dbe900d4a3ce6f6f5b854a1abf 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -823,7 +823,6 @@ WARNING: untranslated string: tor common settings
 WARNING: untranslated string: tor configuration
 WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
-WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
 WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index d7de30720b1cc1da48494455fed3e694531575e5..fd38d40ff45b0d1ee11b60fed778e1020e468124 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -814,7 +814,6 @@ WARNING: untranslated string: tor common settings
 WARNING: untranslated string: tor configuration
 WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
-WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
 WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index b94c15034865747fc31c4d7600562a522edb8dae..8bd78ba6a21d931808ca552ea3ba125c37b9c34f 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -731,7 +731,6 @@ WARNING: untranslated string: tor common settings
 WARNING: untranslated string: tor configuration
 WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
-WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
 WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 22aa896231cf1401de2e934c816ad881d648fab0..3d81d45647f248dbe900d4a3ce6f6f5b854a1abf 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -823,7 +823,6 @@ WARNING: untranslated string: tor common settings
 WARNING: untranslated string: tor configuration
 WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
-WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
 WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index f9d8d8ed2bad7b4f5abc823785b1ee6e97432d16..04d4ad09a1fd7b5bcd1bf5bd5a0a6f39fbed0549 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -794,7 +794,6 @@ WARNING: untranslated string: tor common settings
 WARNING: untranslated string: tor configuration
 WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
-WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
 WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index fe2c61759c80917533a90ac7455dd3266e8810df..a7f2c39833e06719f3e0c12e7ff631443a6d0a10 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -727,7 +727,6 @@ WARNING: untranslated string: tor common settings
 WARNING: untranslated string: tor configuration
 WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
-WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
 WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask

diff --git a/doc/language_missings b/doc/language_missings
index 512b2ca70f5c991a8e4957f5d5483dbf24f1056a..511a32efce97b0789c6255465e436ef3ae31f1bb 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -310,7 +310,6 @@
 < tor configuration
 < tor connected relays
 < tor contact info
-< tor do not advertise relay
 < tor enabled
 < tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask
@@ -719,7 +718,6 @@
 < tor configuration
 < tor connected relays
 < tor contact info
-< tor do not advertise relay
 < tor enabled
 < tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask
@@ -1080,7 +1078,6 @@
 < tor configuration
 < tor connected relays
 < tor contact info
-< tor do not advertise relay
 < tor enabled
 < tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask
@@ -1446,7 +1443,6 @@
 < tor configuration
 < tor connected relays
 < tor contact info
-< tor do not advertise relay
 < tor enabled
 < tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 62bb03a2b03b8adea3c8a37aab4f2e15f54a93ce..4bd0128cb4cf4a5e4ff6e0de3d76e4010e393da2 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -263,7 +263,7 @@ if (-e "/etc/snort/snort.conf") {
 #######################  End added for snort rules control  #################################
 
 if ($snortsettings{'RULES'} eq 'subscripted') {
-       $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2950.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2953.tar.gz/$snortsettings{'OINKCODE'}";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
        $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2950.tar.gz/$snortsettings{'OINKCODE'}";
 } elsif ($snortsettings{'RULES'} eq 'community') {

diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 2b578810d5263f4b58c20e97e63361128c90e1de..2a31dd4bf8ebc51875e7d53516f750316c444b55 100644 (file)
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -77,7 +77,6 @@ $settings{'TOR_RELAY_ADDRESS'} = '';
 $settings{'TOR_RELAY_PORT'} = 9001;
 $settings{'TOR_RELAY_NICKNAME'} = '';
 $settings{'TOR_RELAY_CONTACT_INFO'} = '';
-$settings{'TOR_RELAY_NOADVERTISE'} = 'off';
 $settings{'TOR_RELAY_BANDWIDTH_RATE'} = 0;
 $settings{'TOR_RELAY_BANDWIDTH_BURST'} = 0;
 $settings{'TOR_RELAY_ACCOUNTING_LIMIT'} = 0;
@@ -283,10 +282,6 @@ END
        &Header::closebox();
 
        # Tor relay box
-       $checked{'TOR_RELAY_NOADVERTISE'}{'on'} = '';
-       $checked{'TOR_RELAY_NOADVERTISE'}{'off'} = '';
-       $checked{'TOR_RELAY_NOADVERTISE'}{$settings{'TOR_RELAY_NOADVERTISE'}} = 'checked';
-
        $selected{'TOR_RELAY_MODE'}{'bridge'} = '';
        $selected{'TOR_RELAY_MODE'}{'exit'} = '';
        $selected{'TOR_RELAY_MODE'}{'private-bridge'} = '';
@@ -324,9 +319,9 @@ END
                                                <option value='private-bridge' $selected{'TOR_RELAY_MODE'}{'private-bridge'}>$Lang::tr{'tor relay mode private bridge'}</option>
                                        </select>
                                </td>
-                               <td width='25%' class='base'>$Lang::tr{'tor relay port'}:</td>
+                               <td width='25%' class='base'>$Lang::tr{'tor relay nickname'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
                                <td width='20%'>
-                                       <input type='text' name='TOR_RELAY_PORT' value='$settings{'TOR_RELAY_PORT'}' size='5' />
+                                       <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' />
                                </td>
                        </tr>
                        <tr>
@@ -334,22 +329,15 @@ END
                                <td width='30%'>
                                        <input type='text' name='TOR_RELAY_ADDRESS' value='$settings{'TOR_RELAY_ADDRESS'}' />
                                </td>
-                               <td width='25%' class='base'>$Lang::tr{'tor do not advertise relay'}:</td>
+                               <td width='25%' class='base'>$Lang::tr{'tor relay port'}:</td>
                                <td width='20%'>
-                                       <input type='checkbox' name='TOR_RELAY_NOADVERTISE' $checked{'TOR_RELAY_NOADVERTISE'}{'on'} />
-                               </td>
-                       </tr>
-                       <tr>
-                               <td width='25%' class='base'>$Lang::tr{'tor relay nickname'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-                               <td width='30%'>
-                                       <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' />
+                                       <input type='text' name='TOR_RELAY_PORT' value='$settings{'TOR_RELAY_PORT'}' size='5' />
                                </td>
-                               <td colspan='2'></td>
                        </tr>
                        <tr>
                                <td width='25%' class='base'>$Lang::tr{'tor contact info'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
                                <td width='75%' colspan='3'>
-                                       <input type='text' name='TOR_RELAY_CONTACT_INFO' value='$settings{'TOR_RELAY_CONTACT_INFO'}' size='60' />
+                                       <input type='text' name='TOR_RELAY_CONTACT_INFO' value='$settings{'TOR_RELAY_CONTACT_INFO'}' style='width: 98%;' />
                                </td>
                        </tr>
                </table>
@@ -628,11 +616,7 @@ sub BuildConfiguration() {
                # Reject access to private networks.
                print FILE "ExitPolicyRejectPrivate 1\n";
 
-               print FILE "ORPort $settings{'TOR_RELAY_PORT'}";
-               if ($settings{'TOR_RELAY_NOADVERTISE'} eq 'on') {
-                       print FILE " NoAdvertise";
-               }
-               print FILE "\n";
+               print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n";
 
                if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
                        print FILE "Address $settings{'TOR_RELAY_ADDRESS'}\n";

diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 82295d5a48e83beb8ec02226138d1ce6a4051747..d26287139f4f0b29fcba5cb563bc6f8deafd53e2 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1989,7 +1989,6 @@
 'tor configuration' => 'Tor-Konfiguration',
 'tor connected relays' => 'Verbundene Relays',
 'tor contact info' => 'Kontaktinformationen',
-'tor do not advertise relay' => 'Relay nicht announcieren',
 'tor enabled' => 'Tor einschalten',
 'tor errmsg invalid accounting limit' => 'Ungültiges Accounting-Limit',
 'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 8290763c25314a1276a95a89c9118861b54d2ee5..63d1e9358e57ca0cc62c2946bb6a9681b3be93b8 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2024,7 +2024,6 @@
 'tor configuration' => 'Tor Configuration',
 'tor connected relays' => 'Connected relays',
 'tor contact info' => 'Contact Info',
-'tor do not advertise relay' => 'Do not advertise the relay',
 'tor enabled' => 'Enable Tor',
 'tor errmsg invalid accounting limit' => 'Invalid accounting limit',
 'tor errmsg invalid ip or mask' => 'Invalid IP subnet',

diff --git a/lfs/daq b/lfs/daq
index cac012bec4b84416581f54bf2e921529453a318e..e6fd8fbdf462885cddb7a8ce0d119880ca84f873 100644 (file)
--- a/lfs/daq
+++ b/lfs/daq
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.0
+VER        = 2.0.1
 
 THISAPP    = daq-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a00855a153647df76d47f1ea454f74ae
+$(DL_FILE)_MD5 = 044aa3663d44580d005293eeb8ccf175
 
 install : $(TARGET)
 

diff --git a/lfs/snort b/lfs/snort
index daec621132f19c209fd8bf42072475eab3ee8e10..2d5d04a121b596fc8f1853a2a63a56a2d0eef742 100644 (file)
--- a/lfs/snort
+++ b/lfs/snort
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.5
+VER        = 2.9.5.3
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f5fc0e176afca5989d47509478758fc7
+$(DL_FILE)_MD5 = f99465c0734a6173bfca899dcb72266b
 
 install : $(TARGET)
 
@@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-linux-smp-stats --enable-smb-alerts \
                --enable-gre --enable-mpls --enable-targetbased \
                --enable-decoder-preprocessor-rules --enable-ppm \
+               --enable-non-ether-decoders \
                --enable-perfprofiling --enable-zlib --enable-active-response \
                --enable-normalizer --enable-reload --enable-react --enable-flexresp3
        cd $(DIR_APP) && make

diff --git a/make.sh b/make.sh
index 7fcb69f9357030b3d438f6ea290742ca4ab9a9a2..eb9421ca5e00fbbfcb2f87f3cdb109093adc3b74 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
 CORE="72"                                                      # Core Level (Filename)
-PAKFIRE_CORE="71"                                              # Core Level (PAKFIRE)
+PAKFIRE_CORE="72"                                              # 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