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

diff --git a/config/rootfiles/core/64/filelists/files b/config/rootfiles/core/64/filelists/files
index a3b99c8e0e10c2a81359b860e00ac7e8872f7f52..072fc70227b0827b8a03133a921f880069fdae4e 100644 (file)
--- a/config/rootfiles/core/64/filelists/files
+++ b/config/rootfiles/core/64/filelists/files
@@ -4,3 +4,4 @@ etc/rc.d/init.d/firewall
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 var/ipfire/outgoing/bin/outgoingfw.pl
+var/ipfire/langs

diff --git a/config/rootfiles/core/64/update.sh b/config/rootfiles/core/64/update.sh
index 00394d1ac7474f2804ee60b1c5c4970ecbe250b1..c1e7545500c05e866a87b236cd4293a0c09bfd86 100644 (file)
--- a/config/rootfiles/core/64/update.sh
+++ b/config/rootfiles/core/64/update.sh
@@ -46,7 +46,7 @@ extract_files
 
 #
 #Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
 #Rebuild module dep's
 #arch=`uname -m`

diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files
index 0f013b153515ec97bbac779c634c2fda9c4cd1d6..669a8d199756d97dd8b3288aea99269467c5fbcf 100644 (file)
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -4,6 +4,7 @@ etc/sysctl.conf
 etc/securetty
 opt/pakfire/etc/pakfire.conf
 etc/rc.d/init.d/partresize
+etc/rc.d/init.d/firewall
 etc/rc.d/init.d/fsresize
 etc/rc.d/init.d/setclock
 etc/rc.d/init.d/tmpfs
@@ -18,5 +19,7 @@ srv/web/ipfire/cgi-bin/services.cgi
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 var/ipfire/langs
+var/ipfire/outgoing/bin/outgoingfw.pl
 var/ipfire/qos/bin/makeqosscripts.pl
 usr/local/bin/readhash
+usr/local/bin/scanhd

diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh
index e54c329c3dcc598b9375b71ff5a0839c5e26b07d..c7cb75daa64447a3bd27950341796d4ff587bf07 100644 (file)
--- a/config/rootfiles/core/65/update.sh
+++ b/config/rootfiles/core/65/update.sh
@@ -41,6 +41,21 @@ do
        rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
+#
+# Do some sanity checks.
+
+if [ "$(grep " xavf " /opt/pakfire/lib/functions.sh)" == "" ]; then
+       /usr/bin/logger -p syslog.emerg -t core-upgrade-$core \
+               "ERROR: this update need a newer pakfire version (core64)."
+       exit 1
+fi
+if [ ! "$(mount | grep " reiser4 (")" == "" ]; then
+       /usr/bin/logger -p syslog.emerg -t core-upgrade-$core \
+               "ERROR: cannot update because there is a reiser4 fs mounted."
+       exit 2
+fi
+
+#
 #
 KVER="3.2.33"
 MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
@@ -68,6 +83,7 @@ add_to_backup boot
 add_to_backup etc/snort
 add_to_backup usr/lib/snort_*
 add_to_backup usr/share/zoneinfo
+add_to_backup lib/libncurses*
 
 # Backup the files
 tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \
@@ -109,10 +125,11 @@ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
 /etc/init.d/squid stop
 /etc/init.d/ipsec stop
 
-#Remove old snort and zoneinfo
+#Remove old snort, zoneinfo and ncurses-libs(wrong path).
 rm -rf /etc/snort
 rm -rf /usr/lib/snort_*
 rm -rf /usr/share/zoneinfo
+rm -rf /lib/libncurses*
 
 #
 #Extract files
@@ -193,9 +210,9 @@ echo '/opt/pakfire/pakfire update -y --force'             >> /tmp/pak_update
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/pak_update
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/pak_update
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-65 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-65 "Check it before reboot !!!"' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-65 " *** Please reboot... *** "' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-$core "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-$core "Check it before reboot !!!"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-$core " *** Please reboot... *** "' >> /tmp/pak_update
 echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
 #
 chmod +x /tmp/pak_update

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index f96284f113581f82f36702fa0c15cdb32310df67..365630a6e4d47e111446a44d441b7000190d987d 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1328,14 +1328,10 @@
 'ovpn config' => 'Configruación de OVPN',
 'ovpn device' => 'Dispositivo OpenVPN',
 'ovpn dl' => 'Configuración de descargas OVPN',
-'ovpn errmsg green already pushed' => 'Route for green network is always set',
-'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
 'ovpn log' => 'Registro de log de OVPN',
 'ovpn on blue' => 'OpenVPN en BLUE',
 'ovpn on orange' => 'OpenVPN en ORANGE',
 'ovpn on red' => 'OpenVPN en RED',
-'ovpn routes push' => 'Routes (one per line):',
-'ovpn routes push options' => 'Route push options',
 'ovpn server status' => 'Status actual del servidor OpenVPN:',
 'ovpn subnet' => 'Subred de OpenVPN (ej. 10.0.10.0/255.255.255.0',
 'ovpn subnet is invalid' => 'Subred de OpenVPN no es válida.',

diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index e0d64a095a53d4fc21680e3e628f5e6f4e904446..12439e4453581406710825c77940ab676bda9ba1 100644 (file)
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -1351,14 +1351,10 @@
 'ovpn config' => 'OVPN-Konfig',
 'ovpn device' => 'Urządzenie OpenVPN:',
 'ovpn dl' => 'Pobierz konfig OVPN',
-'ovpn errmsg green already pushed' => 'Route for green network is always set',
-'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
 'ovpn log' => 'Log OVPN',
 'ovpn on blue' => 'OpenVPN na int. BLUE',
 'ovpn on orange' => 'OpenVPN na int. ORANGE',
 'ovpn on red' => 'OpenVPN na int. RED',
-'ovpn routes push' => 'Routes (one per line):',
-'ovpn routes push options' => 'Route push options',
 'ovpn server status' => 'Stan serwera OpenVPN:',
 'ovpn subnet' => 'Podsieć OpenVPN (np. 10.0.10.0/255.255.255.0)',
 'ovpn subnet is invalid' => 'Podsieć OpenVPN jest niepoprawna.',

diff --git a/lfs/GeoIP b/lfs/GeoIP
index 3dd7e6fb88418659cd3ddc4bc5ed0182680838be..68254a7dd650570d0f0d39d7acd331c8d9c2fde0 100644 (file)
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
 include Config
 
 VER        = 1.17
-DATVER     = 02102012
+DATVER     = 06112012
 
 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 = 371c7ea4a8c8b963594ec3031e798696
+GeoIP.dat-$(DATVER).gz_MD5 = a8677695b0abecb69707ebe2444e64f9
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index 278c807f9a8e445efc6a1892c6d4bb41d76a292b..b60723d6ff2be2e4ed9f4d45d2380f24223ec011 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="64"                                                      # Core Level (Filename)
-PAKFIRE_CORE="63"                                              # Core Level (PAKFIRE)
+PAKFIRE_CORE="64"                                              # 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