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, master has been updated via 7e90cf38cb0f3fcee6e3e4baf0d629233f769d51 (commit) via defc321f04783b58a1a8ad45c77560d445eed6d6 (commit) from aacab139dc272d9c1b42340100cccb15cd7a302f (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 7e90cf38cb0f3fcee6e3e4baf0d629233f769d51 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Feb 29 21:53:41 2016 +0100
backup: fix vnstat path
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit defc321f04783b58a1a8ad45c77560d445eed6d6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Feb 29 21:47:05 2016 +0100
core99: create core99 for OpenSSL security update
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/backup/include | 2 +- config/rootfiles/core/{98 => 99}/exclude | 0 config/rootfiles/{oldcore/60 => core/99}/filelists/files | 1 + config/rootfiles/{oldcore/91 => core/99}/filelists/i586/openssl-sse2 | 0 config/rootfiles/{oldcore/94 => core/99}/filelists/openssh | 0 config/rootfiles/{oldcore/92 => core/99}/filelists/openssl | 0 config/rootfiles/{oldcore/95 => core/99}/meta | 0 config/rootfiles/core/{97 => 99}/update.sh | 4 ++-- 8 files changed, 4 insertions(+), 3 deletions(-) copy config/rootfiles/core/{98 => 99}/exclude (100%) copy config/rootfiles/{oldcore/60 => core/99}/filelists/files (52%) copy config/rootfiles/{oldcore/91 => core/99}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/{oldcore/94 => core/99}/filelists/openssh (100%) copy config/rootfiles/{oldcore/92 => core/99}/filelists/openssl (100%) copy config/rootfiles/{oldcore/95 => core/99}/meta (100%) copy config/rootfiles/core/{97 => 99}/update.sh (98%)
Difference in files: diff --git a/config/backup/include b/config/backup/include index 6ecb930..eb76ebf 100644 --- a/config/backup/include +++ b/config/backup/include @@ -33,7 +33,7 @@ /var/log/ip-acct/* /var/log/rrd/* /var/log/rrd/collectd -/var/log/rrd/vnstat +/var/log/vnstat /etc/sysconfig/firewall.local /etc/sysconfig/rc.local /root/.gitconfig diff --git a/config/rootfiles/core/99/exclude b/config/rootfiles/core/99/exclude new file mode 100644 index 0000000..d87f175 --- /dev/null +++ b/config/rootfiles/core/99/exclude @@ -0,0 +1,25 @@ +boot/config.txt +etc/alternatives +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +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/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/99/filelists/files b/config/rootfiles/core/99/filelists/files new file mode 100644 index 0000000..76b5b4e --- /dev/null +++ b/config/rootfiles/core/99/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +var/ipfire/backup/include diff --git a/config/rootfiles/core/99/filelists/i586/openssl-sse2 b/config/rootfiles/core/99/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/core/99/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/openssh b/config/rootfiles/core/99/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/99/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/openssl b/config/rootfiles/core/99/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/99/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/99/meta b/config/rootfiles/core/99/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/99/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/99/update.sh b/config/rootfiles/core/99/update.sh new file mode 100644 index 0000000..fd81307 --- /dev/null +++ b/config/rootfiles/core/99/update.sh @@ -0,0 +1,59 @@ +#!/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) 2016 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=99 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Extract files +extract_files + +# Update Language cache +# /usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/sshd restart +/etc/init.d/apache restart + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0
hooks/post-receive -- IPFire 2.x development tree