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 c366dbb4337921e3e581498bc2b85f787a6913f4 (commit) via 0fbf41404c75702d73b5234c6dde210c346ae0e6 (commit) from c98cc4ae90643b9a43431be5de7d821c110267c0 (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 c366dbb4337921e3e581498bc2b85f787a6913f4 Merge: c98cc4a 0fbf414 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 17 14:09:05 2015 +0100
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/{oldcore/85 => core/88}/exclude | 0 config/rootfiles/{oldcore/60 => core/88}/filelists/files | 0 config/rootfiles/{oldcore/81 => core/88}/filelists/openssh | 0 config/rootfiles/{oldcore/87 => core/88}/filelists/openssl | 0 .../rootfiles/{oldcore/87 => core/88}/filelists/openssl-compat | 0 config/rootfiles/{oldcore/87 => core/88}/meta | 0 config/rootfiles/{oldcore/81 => core/88}/update.sh | 10 +++++----- 7 files changed, 5 insertions(+), 5 deletions(-) copy config/rootfiles/{oldcore/85 => core/88}/exclude (100%) copy config/rootfiles/{oldcore/60 => core/88}/filelists/files (100%) copy config/rootfiles/{oldcore/81 => core/88}/filelists/openssh (100%) copy config/rootfiles/{oldcore/87 => core/88}/filelists/openssl (100%) copy config/rootfiles/{oldcore/87 => core/88}/filelists/openssl-compat (100%) copy config/rootfiles/{oldcore/87 => core/88}/meta (100%) copy config/rootfiles/{oldcore/81 => core/88}/update.sh (95%)
Difference in files: diff --git a/config/rootfiles/core/88/exclude b/config/rootfiles/core/88/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/88/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/88/filelists/files b/config/rootfiles/core/88/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/core/88/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/88/filelists/openssh b/config/rootfiles/core/88/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/88/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssl b/config/rootfiles/core/88/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/88/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssl-compat b/config/rootfiles/core/88/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/core/88/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/88/meta b/config/rootfiles/core/88/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/88/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/88/update.sh b/config/rootfiles/core/88/update.sh new file mode 100644 index 0000000..6ef1f48 --- /dev/null +++ b/config/rootfiles/core/88/update.sh @@ -0,0 +1,57 @@ +#!/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) 2014 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=88 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Remove old files + +# Extract files +extract_files + +# Start services + +# Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + + +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
hooks/post-receive -- IPFire 2.x development tree