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 89445161b066671398185384cc2a80843cc9dc04 (commit) from b14b37ba67eb52e1423781a329e3ea459a1334f5 (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 89445161b066671398185384cc2a80843cc9dc04 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Apr 12 08:14:26 2020 +0200

core144: start update

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

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

Summary of changes: config/rootfiles/core/{143 => 144}/exclude | 0 .../{oldcore/113 => core/144}/filelists/files | 3 +-- .../rootfiles/{oldcore/140 => core/144}/update.sh | 22 ++++++++-------------- config/rootfiles/{core => oldcore}/143/exclude | 0 .../143/filelists/aarch64/binutils | 0 .../{core => oldcore}/143/filelists/aarch64/gcc | 0 .../{core => oldcore}/143/filelists/aarch64/glibc | 0 .../rootfiles/{core => oldcore}/143/filelists/apr | 0 .../143/filelists/armv5tel/binutils | 0 .../{core => oldcore}/143/filelists/armv5tel/gcc | 0 .../{core => oldcore}/143/filelists/armv5tel/glibc | 0 .../{core => oldcore}/143/filelists/cairo | 0 .../{core => oldcore}/143/filelists/coreutils | 0 .../rootfiles/{core => oldcore}/143/filelists/dma | 0 .../{core => oldcore}/143/filelists/files | 0 .../{core => oldcore}/143/filelists/hwdata | 0 .../{core => oldcore}/143/filelists/i586/binutils | 0 .../{core => oldcore}/143/filelists/i586/gcc | 0 .../{core => oldcore}/143/filelists/i586/glibc | 0 .../143/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/143/filelists/libssh | 0 .../{core => oldcore}/143/filelists/libtool | 0 .../{core => oldcore}/143/filelists/logwatch | 0 .../rootfiles/{core => oldcore}/143/filelists/ntp | 0 .../{core => oldcore}/143/filelists/openssh | 0 .../{core => oldcore}/143/filelists/openssl | 0 .../rootfiles/{core => oldcore}/143/filelists/pcre | 0 .../{core => oldcore}/143/filelists/smartmontools | 0 .../{core => oldcore}/143/filelists/strongswan | 0 .../{core => oldcore}/143/filelists/unbound | 0 .../143/filelists/x86_64/binutils | 0 .../{core => oldcore}/143/filelists/x86_64/gcc | 0 .../{core => oldcore}/143/filelists/x86_64/glibc | 0 .../rootfiles/{core => oldcore}/143/filelists/xz | 0 config/rootfiles/{core => oldcore}/143/update.sh | 0 html/cgi-bin/credits.cgi | 3 ++- make.sh | 2 +- 37 files changed, 12 insertions(+), 18 deletions(-) copy config/rootfiles/core/{143 => 144}/exclude (100%) copy config/rootfiles/{oldcore/113 => core/144}/filelists/files (51%) copy config/rootfiles/{oldcore/140 => core/144}/update.sh (89%) rename config/rootfiles/{core => oldcore}/143/exclude (100%) rename config/rootfiles/{core => oldcore}/143/filelists/aarch64/binutils (100%) rename config/rootfiles/{core => oldcore}/143/filelists/aarch64/gcc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/apr (100%) rename config/rootfiles/{core => oldcore}/143/filelists/armv5tel/binutils (100%) rename config/rootfiles/{core => oldcore}/143/filelists/armv5tel/gcc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/armv5tel/glibc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/cairo (100%) rename config/rootfiles/{core => oldcore}/143/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/143/filelists/dma (100%) rename config/rootfiles/{core => oldcore}/143/filelists/files (100%) rename config/rootfiles/{core => oldcore}/143/filelists/hwdata (100%) rename config/rootfiles/{core => oldcore}/143/filelists/i586/binutils (100%) rename config/rootfiles/{core => oldcore}/143/filelists/i586/gcc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/143/filelists/libssh (100%) rename config/rootfiles/{core => oldcore}/143/filelists/libtool (100%) rename config/rootfiles/{core => oldcore}/143/filelists/logwatch (100%) rename config/rootfiles/{core => oldcore}/143/filelists/ntp (100%) rename config/rootfiles/{core => oldcore}/143/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/143/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/143/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/143/filelists/smartmontools (100%) rename config/rootfiles/{core => oldcore}/143/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/143/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/143/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/143/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/xz (100%) rename config/rootfiles/{core => oldcore}/143/update.sh (100%)

Difference in files: diff --git a/config/rootfiles/core/143/exclude b/config/rootfiles/core/144/exclude similarity index 100% rename from config/rootfiles/core/143/exclude rename to config/rootfiles/core/144/exclude diff --git a/config/rootfiles/core/144/filelists/files b/config/rootfiles/core/144/filelists/files new file mode 100644 index 000000000..ce4e51768 --- /dev/null +++ b/config/rootfiles/core/144/filelists/files @@ -0,0 +1,4 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/144/update.sh b/config/rootfiles/core/144/update.sh new file mode 100644 index 000000000..6a9c51931 --- /dev/null +++ b/config/rootfiles/core/144/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) 2020 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=144 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # force fsck at next boot, this may fix free space on xfs + touch /forcefsck + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# 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 + + +# Remove files + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Start services + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# 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/config/rootfiles/oldcore/143/exclude b/config/rootfiles/oldcore/143/exclude new file mode 100644 index 000000000..b22159878 --- /dev/null +++ b/config/rootfiles/oldcore/143/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/core/143/filelists/aarch64/binutils b/config/rootfiles/oldcore/143/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/143/filelists/aarch64/binutils rename to config/rootfiles/oldcore/143/filelists/aarch64/binutils diff --git a/config/rootfiles/core/143/filelists/aarch64/gcc b/config/rootfiles/oldcore/143/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/143/filelists/aarch64/gcc rename to config/rootfiles/oldcore/143/filelists/aarch64/gcc diff --git a/config/rootfiles/core/143/filelists/aarch64/glibc b/config/rootfiles/oldcore/143/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/143/filelists/aarch64/glibc rename to config/rootfiles/oldcore/143/filelists/aarch64/glibc diff --git a/config/rootfiles/core/143/filelists/apr b/config/rootfiles/oldcore/143/filelists/apr similarity index 100% rename from config/rootfiles/core/143/filelists/apr rename to config/rootfiles/oldcore/143/filelists/apr diff --git a/config/rootfiles/core/143/filelists/armv5tel/binutils b/config/rootfiles/oldcore/143/filelists/armv5tel/binutils similarity index 100% rename from config/rootfiles/core/143/filelists/armv5tel/binutils rename to config/rootfiles/oldcore/143/filelists/armv5tel/binutils diff --git a/config/rootfiles/core/143/filelists/armv5tel/gcc b/config/rootfiles/oldcore/143/filelists/armv5tel/gcc similarity index 100% rename from config/rootfiles/core/143/filelists/armv5tel/gcc rename to config/rootfiles/oldcore/143/filelists/armv5tel/gcc diff --git a/config/rootfiles/core/143/filelists/armv5tel/glibc b/config/rootfiles/oldcore/143/filelists/armv5tel/glibc similarity index 100% rename from config/rootfiles/core/143/filelists/armv5tel/glibc rename to config/rootfiles/oldcore/143/filelists/armv5tel/glibc diff --git a/config/rootfiles/core/143/filelists/cairo b/config/rootfiles/oldcore/143/filelists/cairo similarity index 100% rename from config/rootfiles/core/143/filelists/cairo rename to config/rootfiles/oldcore/143/filelists/cairo diff --git a/config/rootfiles/core/143/filelists/coreutils b/config/rootfiles/oldcore/143/filelists/coreutils similarity index 100% rename from config/rootfiles/core/143/filelists/coreutils rename to config/rootfiles/oldcore/143/filelists/coreutils diff --git a/config/rootfiles/core/143/filelists/dma b/config/rootfiles/oldcore/143/filelists/dma similarity index 100% rename from config/rootfiles/core/143/filelists/dma rename to config/rootfiles/oldcore/143/filelists/dma diff --git a/config/rootfiles/core/143/filelists/files b/config/rootfiles/oldcore/143/filelists/files similarity index 100% rename from config/rootfiles/core/143/filelists/files rename to config/rootfiles/oldcore/143/filelists/files diff --git a/config/rootfiles/core/143/filelists/hwdata b/config/rootfiles/oldcore/143/filelists/hwdata similarity index 100% rename from config/rootfiles/core/143/filelists/hwdata rename to config/rootfiles/oldcore/143/filelists/hwdata diff --git a/config/rootfiles/core/143/filelists/i586/binutils b/config/rootfiles/oldcore/143/filelists/i586/binutils similarity index 100% rename from config/rootfiles/core/143/filelists/i586/binutils rename to config/rootfiles/oldcore/143/filelists/i586/binutils diff --git a/config/rootfiles/core/143/filelists/i586/gcc b/config/rootfiles/oldcore/143/filelists/i586/gcc similarity index 100% rename from config/rootfiles/core/143/filelists/i586/gcc rename to config/rootfiles/oldcore/143/filelists/i586/gcc diff --git a/config/rootfiles/core/143/filelists/i586/glibc b/config/rootfiles/oldcore/143/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/143/filelists/i586/glibc rename to config/rootfiles/oldcore/143/filelists/i586/glibc diff --git a/config/rootfiles/core/143/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/143/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/143/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/143/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/143/filelists/libssh b/config/rootfiles/oldcore/143/filelists/libssh similarity index 100% rename from config/rootfiles/core/143/filelists/libssh rename to config/rootfiles/oldcore/143/filelists/libssh diff --git a/config/rootfiles/core/143/filelists/libtool b/config/rootfiles/oldcore/143/filelists/libtool similarity index 100% rename from config/rootfiles/core/143/filelists/libtool rename to config/rootfiles/oldcore/143/filelists/libtool diff --git a/config/rootfiles/core/143/filelists/logwatch b/config/rootfiles/oldcore/143/filelists/logwatch similarity index 100% rename from config/rootfiles/core/143/filelists/logwatch rename to config/rootfiles/oldcore/143/filelists/logwatch diff --git a/config/rootfiles/core/143/filelists/ntp b/config/rootfiles/oldcore/143/filelists/ntp similarity index 100% rename from config/rootfiles/core/143/filelists/ntp rename to config/rootfiles/oldcore/143/filelists/ntp diff --git a/config/rootfiles/core/143/filelists/openssh b/config/rootfiles/oldcore/143/filelists/openssh similarity index 100% rename from config/rootfiles/core/143/filelists/openssh rename to config/rootfiles/oldcore/143/filelists/openssh diff --git a/config/rootfiles/core/143/filelists/openssl b/config/rootfiles/oldcore/143/filelists/openssl similarity index 100% rename from config/rootfiles/core/143/filelists/openssl rename to config/rootfiles/oldcore/143/filelists/openssl diff --git a/config/rootfiles/core/143/filelists/pcre b/config/rootfiles/oldcore/143/filelists/pcre similarity index 100% rename from config/rootfiles/core/143/filelists/pcre rename to config/rootfiles/oldcore/143/filelists/pcre diff --git a/config/rootfiles/core/143/filelists/smartmontools b/config/rootfiles/oldcore/143/filelists/smartmontools similarity index 100% rename from config/rootfiles/core/143/filelists/smartmontools rename to config/rootfiles/oldcore/143/filelists/smartmontools diff --git a/config/rootfiles/core/143/filelists/strongswan b/config/rootfiles/oldcore/143/filelists/strongswan similarity index 100% rename from config/rootfiles/core/143/filelists/strongswan rename to config/rootfiles/oldcore/143/filelists/strongswan diff --git a/config/rootfiles/core/143/filelists/unbound b/config/rootfiles/oldcore/143/filelists/unbound similarity index 100% rename from config/rootfiles/core/143/filelists/unbound rename to config/rootfiles/oldcore/143/filelists/unbound diff --git a/config/rootfiles/core/143/filelists/x86_64/binutils b/config/rootfiles/oldcore/143/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/143/filelists/x86_64/binutils rename to config/rootfiles/oldcore/143/filelists/x86_64/binutils diff --git a/config/rootfiles/core/143/filelists/x86_64/gcc b/config/rootfiles/oldcore/143/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/143/filelists/x86_64/gcc rename to config/rootfiles/oldcore/143/filelists/x86_64/gcc diff --git a/config/rootfiles/core/143/filelists/x86_64/glibc b/config/rootfiles/oldcore/143/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/143/filelists/x86_64/glibc rename to config/rootfiles/oldcore/143/filelists/x86_64/glibc diff --git a/config/rootfiles/core/143/filelists/xz b/config/rootfiles/oldcore/143/filelists/xz similarity index 100% rename from config/rootfiles/core/143/filelists/xz rename to config/rootfiles/oldcore/143/filelists/xz diff --git a/config/rootfiles/core/143/update.sh b/config/rootfiles/oldcore/143/update.sh similarity index 100% rename from config/rootfiles/core/143/update.sh rename to config/rootfiles/oldcore/143/update.sh diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index f4f22e1a2..cecc1c197 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -63,8 +63,8 @@ print <<END Michael Tremer, Arne Fitzenreiter, Christian Schmidt, -Alexander Marx, Stefan Schantl, +Alexander Marx, Matthias Fischer, Peter Müller, Jan Paul Tücking, @@ -128,6 +128,7 @@ Julian McConnell, Kay-Michael Köhler, Kim Wölfel, Logan Schmidt, +Markus Untersee, Nico Prenzel, Oliver Fuhrer, Osmar Gonzalez, diff --git a/make.sh b/make.sh index c250d56fc..03eba4ac8 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.25" # Version number -CORE="143" # Core Level (Filename) +CORE="144" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level

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