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 d27675b08175ed7969d842fdc64f157797911faa (commit) via a2907cdd9fba3a6ce6af8cc75c656daf1fa43dc0 (commit) via d01d68913f643c5d4b9b58a7ecab6d1c4dde5c0c (commit) via af9aa1556e6329e7af3d8939c51316fe1599295a (commit) via 0971726e1372d743f92b7f0e6969ebbaa8718756 (commit) via 6fc3f2e685d42d9c6261ca281740ce067ab6e00d (commit) via e7dafc3e3eb7be7e685fe0e7b3999fd6f264c80b (commit) via f0ce8b2c8853041cd708a0cef88b1bd22cbf88df (commit) via d66433fca6323940ac217d7a0834a0b178d509eb (commit) via 49ce16f9bea9f1812be5cb41ef7b390556fc2364 (commit) via 8d76eb20852a695b15e6fd32076128a25fad01d1 (commit) via bfd5cfa9c6949eca6319a774b871007c9da8fd0e (commit) via a485606c27781a5439d38fcde662a786cb5671d9 (commit) from ee82349a0ea00866d731936e769fab9441690932 (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 d27675b08175ed7969d842fdc64f157797911faa Merge: a2907cdd9 ee82349a0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 11 07:31:11 2019 +0200
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit a2907cdd9fba3a6ce6af8cc75c656daf1fa43dc0 Merge: 4f30ce49b d01d68913 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 11 07:30:26 2019 +0200
Merge remote-tracking branch 'origin/master' into next
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/{core/131 => oldcore/130}/exclude | 0 .../{core/131 => oldcore/130}/filelists/Net_SSLeay | 0 .../{core/131 => oldcore/130}/filelists/apache2 | 0 config/rootfiles/oldcore/130/filelists/files | 3 +++ .../rootfiles/oldcore/{106 => 130}/filelists/strongswan | 0 .../rootfiles/{core/131 => oldcore/130}/filelists/wget | 0 config/rootfiles/oldcore/{112 => 130}/update.sh | 16 +++++++--------- make.sh | 5 +++-- 8 files changed, 13 insertions(+), 11 deletions(-) copy config/rootfiles/{core/131 => oldcore/130}/exclude (100%) copy config/rootfiles/{core/131 => oldcore/130}/filelists/Net_SSLeay (100%) copy config/rootfiles/{core/131 => oldcore/130}/filelists/apache2 (100%) create mode 100644 config/rootfiles/oldcore/130/filelists/files copy config/rootfiles/oldcore/{106 => 130}/filelists/strongswan (100%) copy config/rootfiles/{core/131 => oldcore/130}/filelists/wget (100%) copy config/rootfiles/oldcore/{112 => 130}/update.sh (91%)
Difference in files: diff --git a/config/rootfiles/oldcore/130/exclude b/config/rootfiles/oldcore/130/exclude new file mode 100644 index 000000000..b22159878 --- /dev/null +++ b/config/rootfiles/oldcore/130/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +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/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/130/filelists/Net_SSLeay b/config/rootfiles/oldcore/130/filelists/Net_SSLeay new file mode 120000 index 000000000..13fe0560c --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/Net_SSLeay @@ -0,0 +1 @@ +../../../common/Net_SSLeay \ No newline at end of file diff --git a/config/rootfiles/oldcore/130/filelists/apache2 b/config/rootfiles/oldcore/130/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/130/filelists/files b/config/rootfiles/oldcore/130/filelists/files new file mode 100644 index 000000000..98b8fec39 --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +usr/local/bin/ipsec-interfaces diff --git a/config/rootfiles/oldcore/130/filelists/strongswan b/config/rootfiles/oldcore/130/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/130/filelists/wget b/config/rootfiles/oldcore/130/filelists/wget new file mode 120000 index 000000000..fcb57dfec --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/oldcore/130/update.sh b/config/rootfiles/oldcore/130/update.sh new file mode 100644 index 000000000..86e42a1d4 --- /dev/null +++ b/config/rootfiles/oldcore/130/update.sh @@ -0,0 +1,65 @@ +#!/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) 2019 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=130 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/usr/local/bin/ipsecctrl D + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/apache restart +/usr/local/bin/ipsecctrl S + +# This update needs 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 diff --git a/make.sh b/make.sh index de973c69c..b4d5ea7a3 100755 --- a/make.sh +++ b/make.sh @@ -24,9 +24,10 @@
NAME="IPFire" # Software name SNAME="ipfire" # Short name +<<<<<<< HEAD VERSION="2.23" # Version number -CORE="130" # Core Level (Filename) -PAKFIRE_CORE="129" # Core Level (PAKFIRE) +CORE="131" # Core Level (Filename) +PAKFIRE_CORE="130" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir
hooks/post-receive -- IPFire 2.x development tree