Merge branch 'master' into next

config/rootfiles/core/50/filelists/files

@@ -3,3 +3,7 @@ var/ipfire/langs/
 etc/rc.d/init.d/console
 usr/local/sbin/setup
 var/ipfire/graphs.pl
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+usr/local/share/GeoIP/GeoIP.dat
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids

html/cgi-bin/logs.cgi/log.dat

@@ -60,7 +60,7 @@ my %sections = (
         'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
         'auth' => '(\w+\(pam_unix\)\[.*\]: )',
         'kernel' => '(kernel: (?!DROP_))',
-        'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon\[.*\]: |vpnwatch: )',
+        'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
         'openvpn' => '(openvpnserver)\[.*\]: ',
         'pakfire' => '(pakfire:) ',
         'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) '

lfs/GeoIP

@@ -25,7 +25,7 @@
 include Config
 
 VER        = 1.17
-DATVER     = 01012011
+DATVER     = 01072011
 
 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 = 560eaeef02761b866d106cda42929d4c
+GeoIP.dat-$(DATVER).gz_MD5 = 437a8fe09af2726856c1090615e27965
 
 install : $(TARGET)