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, next has been updated via fdec4318350a85de39a2bef8a0ea32fdb89d8cab (commit) via 6560ecaa51f5493aa5674825d1d1b7bc9e464184 (commit) via 5cbbd5f1ed37c0c465378916716319d63234a294 (commit) via 8969d075e06a687b8878e9ed1b41133a0f015b05 (commit) via b7d1e1c4a4ce1bfc1cf87dd5f305110fc009df29 (commit) via 2d40b8174bb5c7e7f9424439e622c936de87bfc5 (commit) via 2c0a849f7a7c388bf53072e5fc335b4f97488ba0 (commit) via f028065fd15c1984db770724bdfb35fa5e0635fa (commit) via a4826680bc8a58f169327d97da60005dbdc47e0d (commit) via 844d37795d6166d4017327b550804d47591b09f1 (commit) via ef5d80c0336c2e484220906d35b75ae93984d57c (commit) via 67ab1d620624ba3d02ffd94c80cbdb9d1872131c (commit) via 25a063e66dd06b43685dcd6cc779a6ad71b125b6 (commit) via 88511b6145749525957565b11b227b207e1f5a65 (commit) via d2bbe7f46e107c8a94aa84aaa32f570fde298426 (commit) via 5d934a73dcbbdb1e4dfa7219eb40bbb34e2cc9c7 (commit) via 16ada955ac658c59f8a2d96acb305699c224482e (commit) via 8cbc8e01b382df53d9882d7a7e0970287575ad08 (commit) via 0f0a5a6e5ffee29fa9e63b267d13232d5d8ffe49 (commit) via 524fc726215f527803423b0af51364ff5904221e (commit) via 870f68d7f2c8cdd6febf5a1706c52deca992ce86 (commit) via 42fb65f0f3f78c706d0406f40b6989f3d40e4cae (commit) from 818f3344652cc151fbe12cdd245f832b80a69fde (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 fdec4318350a85de39a2bef8a0ea32fdb89d8cab Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Apr 9 12:19:06 2012 +0200
started core59.
commit 6560ecaa51f5493aa5674825d1d1b7bc9e464184 Merge: 818f334 5cbbd5f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Apr 9 12:15:59 2012 +0200
Merge branch 'master' into next
Conflicts: config/rootfiles/core/58/filelists/files make.sh
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/58/filelists/files | 3 ++ config/rootfiles/core/{55 => 59}/exclude | 0 .../rootfiles/core/{58 => 59}/filelists/Net-Telnet | 0 config/rootfiles/core/{58 => 59}/filelists/files | 1 - config/rootfiles/core/{52 => 59}/meta | 0 config/rootfiles/core/{58 => 59}/update.sh | 24 +++++++++---------- make.sh | 4 +- 7 files changed, 16 insertions(+), 16 deletions(-) copy config/rootfiles/core/{55 => 59}/exclude (100%) copy config/rootfiles/core/{58 => 59}/filelists/Net-Telnet (100%) copy config/rootfiles/core/{58 => 59}/filelists/files (93%) copy config/rootfiles/core/{52 => 59}/meta (100%) copy config/rootfiles/core/{58 => 59}/update.sh (87%)
Difference in files: diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files index 047127e..19d98e5 100644 --- a/config/rootfiles/core/58/filelists/files +++ b/config/rootfiles/core/58/filelists/files @@ -1,7 +1,10 @@ etc/system-release etc/issue etc/vimrc +<<<<<<< HEAD srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi var/ipfire/general-functions.pl var/ipfire/langs +======= +>>>>>>> master diff --git a/config/rootfiles/core/59/exclude b/config/rootfiles/core/59/exclude new file mode 100644 index 0000000..7360266 --- /dev/null +++ b/config/rootfiles/core/59/exclude @@ -0,0 +1,12 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/59/filelists/Net-Telnet b/config/rootfiles/core/59/filelists/Net-Telnet new file mode 120000 index 0000000..66ca926 --- /dev/null +++ b/config/rootfiles/core/59/filelists/Net-Telnet @@ -0,0 +1 @@ +../../../common/Net-Telnet \ No newline at end of file diff --git a/config/rootfiles/core/59/filelists/files b/config/rootfiles/core/59/filelists/files new file mode 100644 index 0000000..16464c7 --- /dev/null +++ b/config/rootfiles/core/59/filelists/files @@ -0,0 +1,6 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +var/ipfire/general-functions.pl +var/ipfire/langs diff --git a/config/rootfiles/core/59/meta b/config/rootfiles/core/59/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/59/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/59/update.sh b/config/rootfiles/core/59/update.sh new file mode 100644 index 0000000..5a3cc2a --- /dev/null +++ b/config/rootfiles/core/59/update.sh @@ -0,0 +1,82 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2012 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=59 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files + +# +#Start services +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" + +#Rebuild module dep's +#arch=`uname -m` +#if [ ${arch::3} == "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +#fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index a720b62..4e79793 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number -CORE="58" # Core Level (Filename) -PAKFIRE_CORE="57" # Core Level (PAKFIRE) +CORE="59" # Core Level (Filename) +PAKFIRE_CORE="58" # 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