[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a832f4f33ef12cd4245b5d50bc98b05db2dae2ca
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 a832f4f33ef12cd4245b5d50bc98b05db2dae2ca (commit) via 3648650e7628193cf271c984e7fcafa7dd59fe04 (commit) via 1346863ac7cbf67b38d6209a6b0ab3bab565386c (commit) via 6105282debd636dd5634f6e487afbeb02b51a69b (commit) via 4bd2536f4b2da867a96c53b79320874793231002 (commit) via a18da317d3b9802572f2f174d1b76a1eba7ff53b (commit) via c7c8b4aaecc68b12fa3ad89d2eabe82581b969ad (commit) via db083dd81ece9a52f1badc189d34f89b228a28c0 (commit) via 58574e318b594d471a6c9376ade91d7f7c6f4644 (commit) via dc7239d678ca426485814c95060ac72d987b814d (commit) via 8074eed711092b90ae279fa968545a27d2655fd6 (commit) via 68eeed828507c6edc395772d6d9c81f1cc12dd53 (commit) via d66d6f88273637d34b649184543862f588a7d9e3 (commit) via 36585d00bd91bb7207627ca4e46c5d3c6f20cd26 (commit) via 8f6a5178e816689fc6bd38aebfc0cfc41aa5d37d (commit) via 54798036675c0eebb8dedb55d2e509d8385cc363 (commit) via a6f4183e83385cbd21d31db07171fb7109b81d54 (commit) via 75c2cf6f51d4f7d8e513b6df6a25b30e8a834f9f (commit) from e70bd5b7423a0e29248d0084fd04973c06ae8202 (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 a832f4f33ef12cd4245b5d50bc98b05db2dae2ca Merge: 3648650 1346863 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 1 17:30:54 2012 +0200
Merge remote-tracking branch 'origin/core60' into next
Conflicts: config/rootfiles/core/59/update.sh lfs/strongswan make.sh
commit 3648650e7628193cf271c984e7fcafa7dd59fe04 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 1 17:25:10 2012 +0200
Move core60 content to core61.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/59/update.sh | 4 ++++ config/rootfiles/core/60/filelists/files | 4 ---- .../rootfiles/core/{53 => 60}/filelists/strongswan | 0 config/rootfiles/core/60/update.sh | 7 +++++-- config/rootfiles/core/{55 => 61}/exclude | 0 config/rootfiles/core/{60 => 61}/filelists/GeoIP | 0 .../rootfiles/core/{60 => 61}/filelists/Net-Telnet | 0 config/rootfiles/core/{60 => 61}/filelists/files | 0 config/rootfiles/core/{52 => 61}/meta | 0 config/rootfiles/core/{60 => 61}/update.sh | 2 +- lfs/strongswan | 4 ++-- make.sh | 4 ++-- 12 files changed, 14 insertions(+), 11 deletions(-) copy config/rootfiles/core/{53 => 60}/filelists/strongswan (100%) copy config/rootfiles/core/{55 => 61}/exclude (100%) rename config/rootfiles/core/{60 => 61}/filelists/GeoIP (100%) rename config/rootfiles/core/{60 => 61}/filelists/Net-Telnet (100%) copy config/rootfiles/core/{60 => 61}/filelists/files (100%) copy config/rootfiles/core/{52 => 61}/meta (100%) copy config/rootfiles/core/{60 => 61}/update.sh (99%)
Difference in files: diff --git a/config/rootfiles/core/59/update.sh b/config/rootfiles/core/59/update.sh index 5a3cc2a..2f1d865 100644 --- a/config/rootfiles/core/59/update.sh +++ b/config/rootfiles/core/59/update.sh @@ -34,12 +34,16 @@ done
# #Stop services +/etc/init.d/ipsec stop +/etc/init.d/sshd stop
# #Extract files +extract_files
# #Start services +/etc/init.d/sshd start if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then /etc/init.d/ipsec start fi diff --git a/config/rootfiles/core/60/filelists/GeoIP b/config/rootfiles/core/60/filelists/GeoIP deleted file mode 100644 index 0258236..0000000 --- a/config/rootfiles/core/60/filelists/GeoIP +++ /dev/null @@ -1 +0,0 @@ -usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/60/filelists/Net-Telnet b/config/rootfiles/core/60/filelists/Net-Telnet deleted file mode 120000 index 66ca926..0000000 --- a/config/rootfiles/core/60/filelists/Net-Telnet +++ /dev/null @@ -1 +0,0 @@ -../../../common/Net-Telnet \ No newline at end of file diff --git a/config/rootfiles/core/60/filelists/files b/config/rootfiles/core/60/filelists/files index 16464c7..409e5fe 100644 --- a/config/rootfiles/core/60/filelists/files +++ b/config/rootfiles/core/60/filelists/files @@ -1,6 +1,2 @@ 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/60/filelists/strongswan b/config/rootfiles/core/60/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/60/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/60/update.sh b/config/rootfiles/core/60/update.sh index 3701942..5aaa23e 100644 --- a/config/rootfiles/core/60/update.sh +++ b/config/rootfiles/core/60/update.sh @@ -34,17 +34,20 @@ done
# #Stop services +/etc/init.d/ipsec stop
# #Extract files 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" +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#Rebuild module dep's #arch=`uname -m` diff --git a/config/rootfiles/core/61/exclude b/config/rootfiles/core/61/exclude new file mode 100644 index 0000000..7360266 --- /dev/null +++ b/config/rootfiles/core/61/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/61/filelists/GeoIP b/config/rootfiles/core/61/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/core/61/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/61/filelists/Net-Telnet b/config/rootfiles/core/61/filelists/Net-Telnet new file mode 120000 index 0000000..66ca926 --- /dev/null +++ b/config/rootfiles/core/61/filelists/Net-Telnet @@ -0,0 +1 @@ +../../../common/Net-Telnet \ No newline at end of file diff --git a/config/rootfiles/core/61/filelists/files b/config/rootfiles/core/61/filelists/files new file mode 100644 index 0000000..16464c7 --- /dev/null +++ b/config/rootfiles/core/61/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/61/meta b/config/rootfiles/core/61/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/61/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/61/update.sh b/config/rootfiles/core/61/update.sh new file mode 100644 index 0000000..c6a8580 --- /dev/null +++ b/config/rootfiles/core/61/update.sh @@ -0,0 +1,80 @@ +#!/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=61 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#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/lfs/strongswan b/lfs/strongswan index 44497d4..d0d533d 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@
include Config
-VER = 4.6.3 +VER = 4.6.4
THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 34146e514ced1738b4f2d9e7169bbb52 +$(DL_FILE)_MD5 = 4c0999c42faa0860ae0afc4f8efd9d04
install : $(TARGET)
diff --git a/make.sh b/make.sh index f3e3065..89f979d 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="60" # Core Level (Filename) -PAKFIRE_CORE="59" # Core Level (PAKFIRE) +CORE="61" # Core Level (Filename) +PAKFIRE_CORE="60" # 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
-
git＠ipfire.org