This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, thirteen has been updated via 590bdf1b931a7fbede1e65192d824833c852ee5e (commit) via 88cb3aa68ec070f7dbb8607e12c29cda08ea8952 (commit) via 6f8891ccc776e62448e1e08d3efbada21a8fd447 (commit) via b4a91e662d70122da6d22b4136b792ebaa23061b (commit) via 24510a3563d196586caf9b34fb359e5b60f339cf (commit) via b5c5e2d84de59abc3a09061b38c4027780383fb6 (commit) from db7a755dabac4f15e42e363e5a69f19f538ef66e (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 590bdf1b931a7fbede1e65192d824833c852ee5e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Nov 10 22:44:18 2012 +0100

updater: add some sanity checks.

commit 88cb3aa68ec070f7dbb8607e12c29cda08ea8952 Merge: db7a755 6f8891c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Nov 10 16:44:40 2012 +0100

Merge remote-tracking branch 'origin/next' into thirteen

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/64/filelists/files | 1 + config/rootfiles/core/64/update.sh | 2 +- config/rootfiles/core/65/update.sh | 21 ++++++++++++++++++--- langs/es/cgi-bin/es.pl | 4 ---- langs/pl/cgi-bin/pl.pl | 4 ---- lfs/GeoIP | 4 ++-- make.sh | 2 +- 7 files changed, 23 insertions(+), 15 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/64/filelists/files b/config/rootfiles/core/64/filelists/files index a3b99c8..072fc70 100644 --- 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 00394d1..c1e7545 100644 --- 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/update.sh b/config/rootfiles/core/65/update.sh index 5325086..c7cb75d 100644 --- a/config/rootfiles/core/65/update.sh +++ b/config/rootfiles/core/65/update.sh @@ -42,6 +42,21 @@ do 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` # Nur den letzten Parameter verwenden @@ -195,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 f96284f..365630a 100644 --- 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 e0d64a0..12439e4 100644 --- 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 3dd7e6f..68254a7 100644 --- 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 278c807..b60723d 100755 --- 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

hooks/post-receive -- IPFire 2.x development tree