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 8ba4babb91510aa5473929fc9aa28a4e271301cd (commit) via ea1fa596326e2817d23e2282e7c75a45e4afcbdf (commit) via 6d7da25360676a96fefbbf6d81886b1e456c4b01 (commit) via 667a22ed1c86cc969143c626cb9d85040370fd9b (commit) via fc8c4295ac9e33fa73f1d83e3d7567702831e638 (commit) from 39b14828cabf647dd505a7f5da956c7bb1f98f9e (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 8ba4babb91510aa5473929fc9aa28a4e271301cd Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Sep 7 14:09:53 2011 +0200
openvpn-n2n: start/stop at connect/disconnect.
commit ea1fa596326e2817d23e2282e7c75a45e4afcbdf Merge: 39b1482 6d7da25 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Sep 7 14:01:27 2011 +0200
Merge branch 'master' into next
Conflicts: make.sh
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/52/update.sh | 2 ++ config/rootfiles/core/{52 => 53}/exclude | 0 config/rootfiles/core/53/filelists/files | 1 + config/rootfiles/core/{49 => 53}/meta | 0 config/rootfiles/core/{52 => 53}/update.sh | 4 +++- config/rootfiles/core/next/filelists/files | 3 ++- make.sh | 4 ++-- src/initscripts/init.d/networking/red.down/10-ovpn | 1 + src/initscripts/init.d/networking/red.up/50-ovpn | 1 + 9 files changed, 12 insertions(+), 4 deletions(-) copy config/rootfiles/core/{52 => 53}/exclude (100%) create mode 100644 config/rootfiles/core/53/filelists/files copy config/rootfiles/core/{49 => 53}/meta (100%) copy config/rootfiles/core/{52 => 53}/update.sh (97%)
Difference in files: diff --git a/config/rootfiles/core/52/update.sh b/config/rootfiles/core/52/update.sh index 1e2f61e..412299d 100644 --- a/config/rootfiles/core/52/update.sh +++ b/config/rootfiles/core/52/update.sh @@ -34,6 +34,7 @@ done
# #Stop services +/etc/init.d/squid stop /etc/init.d/apache stop
# @@ -43,6 +44,7 @@ extract_files # #Start services /etc/init.d/apache start +/etc/init.d/squid start
# #Update Language cache diff --git a/config/rootfiles/core/53/exclude b/config/rootfiles/core/53/exclude new file mode 100644 index 0000000..bb0d8c8 --- /dev/null +++ b/config/rootfiles/core/53/exclude @@ -0,0 +1,2 @@ +srv/web/ipfire/html/proxy.pac +var/updatecache diff --git a/config/rootfiles/core/53/filelists/files b/config/rootfiles/core/53/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/53/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/53/meta b/config/rootfiles/core/53/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/53/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh new file mode 100644 index 0000000..f13519a --- /dev/null +++ b/config/rootfiles/core/53/update.sh @@ -0,0 +1,63 @@ +#!/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) 2011 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=53 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services +/etc/init.d/squid stop +/etc/init.d/apache stop + +# +#Extract files +extract_files + +# +#Start services +/etc/init.d/apache start +/etc/init.d/squid start + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.43-ipfire >/dev/null 2>&1 +#depmod 2.6.32.43-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.43-ipfire-xen >/dev/null 2>&1 + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files index 9b39879..1f43204 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -4,7 +4,8 @@ etc/sysctl.conf etc/system-release etc/issue etc/iproute2/rt_tables -etc/rc.d/init.d/networking/red +etc/rc.d/init.d/networking/red.up/50-ovpn +etc/rc.d/init.d/networking/red.down/10-ovpn srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/outgoinggrp.cgi diff --git a/make.sh b/make.sh index af88471..c986ec8 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.10" # Version number -CORE="52" # Core Level (Filename) -PAKFIRE_CORE="51" # Core Level (PAKFIRE) +CORE="53" # Core Level (Filename) +PAKFIRE_CORE="52" # 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 diff --git a/src/initscripts/init.d/networking/red.down/10-ovpn b/src/initscripts/init.d/networking/red.down/10-ovpn index 59e95ad..948d7b2 100644 --- a/src/initscripts/init.d/networking/red.down/10-ovpn +++ b/src/initscripts/init.d/networking/red.down/10-ovpn @@ -1,5 +1,6 @@ #!/bin/bash
/usr/local/bin/openvpnctrl -k & +/usr/local/bin/openvpnctrl -kn2n &
exit 0 diff --git a/src/initscripts/init.d/networking/red.up/50-ovpn b/src/initscripts/init.d/networking/red.up/50-ovpn index a53b920..f3db648 100644 --- a/src/initscripts/init.d/networking/red.up/50-ovpn +++ b/src/initscripts/init.d/networking/red.up/50-ovpn @@ -1,5 +1,6 @@ #!/bin/bash
/usr/local/bin/openvpnctrl -s > /dev/null 2>&1 +/usr/local/bin/openvpnctrl -sn2n > /dev/null 2>&1
exit 0
hooks/post-receive -- IPFire 2.x development tree