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 d46bec52993235a8b185a2f040846e9059c3f4e7 (commit) via c4e04122359ee5de775bb0f69a678b7ce28f5707 (commit) via d41f9e6ee88320b8a5e0433326053e21b4b0ca49 (commit) from 5068ac3822ac9afbee841ac417963b2c1343d809 (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 d46bec52993235a8b185a2f040846e9059c3f4e7 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 26 10:55:32 2012 +0100

calamaris: Fix viewing reports.

Fixes that only the last created report could be viewed (#10259).

commit c4e04122359ee5de775bb0f69a678b7ce28f5707 Merge: 5068ac3 d41f9e6 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 26 10:55:01 2012 +0100

Merge branch 'create-core-65' into next

commit d41f9e6ee88320b8a5e0433326053e21b4b0ca49 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Nov 23 14:32:25 2012 +0100

Create core update 65.

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

Summary of changes: config/rootfiles/core/{63 => 65}/exclude | 0 config/rootfiles/{oldcore/59 => core/65}/filelists/files | 4 ++-- config/rootfiles/core/{60 => 65}/meta | 0 config/rootfiles/core/{64 => 65}/update.sh | 7 ++++--- html/cgi-bin/logs.cgi/calamaris.dat | 4 ++-- make.sh | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) copy config/rootfiles/core/{63 => 65}/exclude (100%) copy config/rootfiles/{oldcore/59 => core/65}/filelists/files (61%) copy config/rootfiles/core/{60 => 65}/meta (100%) copy config/rootfiles/core/{64 => 65}/update.sh (97%)

Difference in files: diff --git a/config/rootfiles/core/65/exclude b/config/rootfiles/core/65/exclude new file mode 100644 index 0000000..b6a8d1d --- /dev/null +++ b/config/rootfiles/core/65/exclude @@ -0,0 +1,13 @@ +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 +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files new file mode 100644 index 0000000..f481777 --- /dev/null +++ b/config/rootfiles/core/65/filelists/files @@ -0,0 +1,7 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat +srv/web/ipfire/cgi-bin/ovpnmain.cgi +usr/sbin/ovpn-ccd-convert +var/ipfire/general-functions.pl +var/ipfire/langs diff --git a/config/rootfiles/core/65/meta b/config/rootfiles/core/65/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/65/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh new file mode 100644 index 0000000..85ab2e9 --- /dev/null +++ b/config/rootfiles/core/65/update.sh @@ -0,0 +1,83 @@ +#!/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=65 +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" + +# Convert OpenVPN RW connections. +/usr/sbin/ovpn-ccd-convert + +#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/html/cgi-bin/logs.cgi/calamaris.dat b/html/cgi-bin/logs.cgi/calamaris.dat index 19a3693..4ee60c2 100644 --- a/html/cgi-bin/logs.cgi/calamaris.dat +++ b/html/cgi-bin/logs.cgi/calamaris.dat @@ -98,6 +98,7 @@ if ($reportsettings{'ACTION'} eq $Lang::tr{'calamaris create report'}) delete $reportsettings{'DAY_END'}; delete $reportsettings{'MONTH_END'}; delete $reportsettings{'YEAR_END'}; + delete $reportsettings{'REPORT'};

&General::writehash("${General::swroot}/proxy/calamaris/settings", %reportsettings);

@@ -493,12 +494,11 @@ END if (@reports) { print "<td><select name='REPORT' size='5'>\n"; - my $n=0; foreach (@reports) { @reportdata=split(/#/); print "\t<option "; - if ($n eq '0') { print "selected "; $reportsettings{'REPORT'}=$reportdata[1]; $n++} + if ($reportsettings{'REPORT'} eq $reportdata[1]) { print "selected ";} print "value='$reportdata[1]'>$reportdata[2] &nbsp;-&nbsp; $reportdata[3]</option>\n"; } print "</select></td>\n"; diff --git a/make.sh b/make.sh index 0675d8e..5d142ef 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number -CORE="64" # Core Level (Filename) +CORE="65" # Core Level (Filename) PAKFIRE_CORE="64" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan

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