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 140707831bf512e9c8477ffde18c167e2c2d455b (commit) via 45e1202d27f6a4d3a4416ce800a9560b87c49989 (commit) via 69c529972aec2641f9f689915c0a29f84d457002 (commit) via d3bf851bf8a272ac7f51bc1f37018ab434c3b64c (commit) from 30fcfc4cd56414383259895ac1c807d9e2cc182a (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 140707831bf512e9c8477ffde18c167e2c2d455b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jan 24 19:20:36 2020 +0100

core140: remove /usr/lib/libboost*1.55.0 at cleanup

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

commit 45e1202d27f6a4d3a4416ce800a9560b87c49989 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jan 24 19:18:15 2020 +0100

filesystem-cleanup: add /usr/lib/sse2 folder

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

commit 69c529972aec2641f9f689915c0a29f84d457002 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jan 24 19:14:02 2020 +0100

core140: insert a core upgrade that only cleans the rootfs

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

commit d3bf851bf8a272ac7f51bc1f37018ab434c3b64c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jan 24 08:55:40 2020 +0100

rename core140 to core141

we need to insert a core that cleanup root to free some diskspace.

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

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

Summary of changes: config/rootfiles/core/140/filelists/files | 37 ++-------------------- config/rootfiles/core/140/update.sh | 19 +++++++---- config/rootfiles/core/{140 => 141}/exclude | 0 .../core/{140 => 141}/filelists/aarch64/efivar | 0 .../core/{140 => 141}/filelists/aarch64/gcc | 0 .../core/{140 => 141}/filelists/aarch64/glibc | 0 .../core/{140 => 141}/filelists/aarch64/python3 | 0 .../core/{140 => 141}/filelists/armv5tel/gcc | 0 .../core/{140 => 141}/filelists/armv5tel/glibc | 0 .../core/{140 => 141}/filelists/armv5tel/pyhton3 | 0 config/rootfiles/core/{140 => 141}/filelists/bind | 0 .../rootfiles/core/{140 => 141}/filelists/elinks | 0 config/rootfiles/core/{140 => 141}/filelists/file | 0 config/rootfiles/core/{140 => 141}/filelists/files | 0 .../core/{140 => 141}/filelists/geoip-database | 0 config/rootfiles/core/{140 => 141}/filelists/glib | 0 .../rootfiles/core/{140 => 141}/filelists/i586/gcc | 0 .../core/{140 => 141}/filelists/i586/glibc | 0 .../core/{140 => 141}/filelists/i586/python3 | 0 config/rootfiles/core/{140 => 141}/filelists/knot | 0 .../rootfiles/core/{140 => 141}/filelists/libhtp | 0 .../rootfiles/core/{140 => 141}/filelists/libmpc | 0 config/rootfiles/core/{140 => 141}/filelists/lvm2 | 0 config/rootfiles/core/{140 => 141}/filelists/mdadm | 0 config/rootfiles/core/{140 => 141}/filelists/mpfr | 0 .../rootfiles/core/{140 => 141}/filelists/suricata | 0 .../rootfiles/core/{140 => 141}/filelists/unbound | 0 .../core/{140 => 141}/filelists/x86_64/efivar | 0 .../core/{140 => 141}/filelists/x86_64/gcc | 0 .../core/{140 => 141}/filelists/x86_64/glibc | 0 .../core/{140 => 141}/filelists/x86_64/python3 | 0 config/rootfiles/core/{140 => 141}/meta | 0 config/rootfiles/core/{140 => 141}/update.sh | 2 +- src/scripts/filesystem-cleanup | 1 + 34 files changed, 17 insertions(+), 42 deletions(-) copy config/rootfiles/core/{140 => 141}/exclude (100%) rename config/rootfiles/core/{140 => 141}/filelists/aarch64/efivar (100%) rename config/rootfiles/core/{140 => 141}/filelists/aarch64/gcc (100%) rename config/rootfiles/core/{140 => 141}/filelists/aarch64/glibc (100%) rename config/rootfiles/core/{140 => 141}/filelists/aarch64/python3 (100%) rename config/rootfiles/core/{140 => 141}/filelists/armv5tel/gcc (100%) rename config/rootfiles/core/{140 => 141}/filelists/armv5tel/glibc (100%) rename config/rootfiles/core/{140 => 141}/filelists/armv5tel/pyhton3 (100%) rename config/rootfiles/core/{140 => 141}/filelists/bind (100%) rename config/rootfiles/core/{140 => 141}/filelists/elinks (100%) rename config/rootfiles/core/{140 => 141}/filelists/file (100%) copy config/rootfiles/core/{140 => 141}/filelists/files (100%) rename config/rootfiles/core/{140 => 141}/filelists/geoip-database (100%) rename config/rootfiles/core/{140 => 141}/filelists/glib (100%) rename config/rootfiles/core/{140 => 141}/filelists/i586/gcc (100%) rename config/rootfiles/core/{140 => 141}/filelists/i586/glibc (100%) rename config/rootfiles/core/{140 => 141}/filelists/i586/python3 (100%) rename config/rootfiles/core/{140 => 141}/filelists/knot (100%) rename config/rootfiles/core/{140 => 141}/filelists/libhtp (100%) rename config/rootfiles/core/{140 => 141}/filelists/libmpc (100%) rename config/rootfiles/core/{140 => 141}/filelists/lvm2 (100%) rename config/rootfiles/core/{140 => 141}/filelists/mdadm (100%) rename config/rootfiles/core/{140 => 141}/filelists/mpfr (100%) rename config/rootfiles/core/{140 => 141}/filelists/suricata (100%) rename config/rootfiles/core/{140 => 141}/filelists/unbound (100%) rename config/rootfiles/core/{140 => 141}/filelists/x86_64/efivar (100%) rename config/rootfiles/core/{140 => 141}/filelists/x86_64/gcc (100%) rename config/rootfiles/core/{140 => 141}/filelists/x86_64/glibc (100%) rename config/rootfiles/core/{140 => 141}/filelists/x86_64/python3 (100%) copy config/rootfiles/core/{140 => 141}/meta (100%) copy config/rootfiles/core/{140 => 141}/update.sh (99%)

Difference in files: diff --git a/config/rootfiles/core/140/filelists/files b/config/rootfiles/core/140/filelists/files index 47f915b5a..4418d8bf3 100644 --- a/config/rootfiles/core/140/filelists/files +++ b/config/rootfiles/core/140/filelists/files @@ -1,38 +1,5 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/credits.cgi -var/ipfire/langs -etc/rc.d/helper/aws-setup -etc/rc.d/helper/azure-setup -etc/rc.d/init.d/lvmetad -etc/rc.d/init.d/networking/dhcpcd.exe -etc/rc.d/init.d/networking/red -etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders -etc/rc.d/init.d/partresize -etc/rc.d/init.d/suricata -etc/rc.d/init.d/unbound -etc/rc.d/rcsysinit.d/S09lvmetad -etc/ppp/ip-down -etc/ppp/ip-up -etc/unbound/unbound.conf -opt/pakfire/etc/pakfire.conf -opt/pakfire/lib/functions.pl -srv/web/ipfire/cgi-bin/dns.cgi -srv/web/ipfire/cgi-bin/dnsforward.cgi -srv/web/ipfire/cgi-bin/gui.cgi -srv/web/ipfire/cgi-bin/hosts.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/netexternal.cgi -srv/web/ipfire/cgi-bin/pppsetup.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -usr/local/bin/backupiso -usr/local/bin/convert-dns-settings -usr/local/bin/unboundctrl -usr/sbin/convert-snort -usr/sbin/setup -usr/sbin/unbound-dhcp-leases-bridge -var/ipfire/backup/bin/backup.pl -var/ipfire/ids-functions.pl -var/ipfire/menu.d/30-network.menu -var/ipfire/general-functions.pl +#var/ipfire/langs +usr/local/bin/filesystem-cleanup diff --git a/config/rootfiles/core/140/update.sh b/config/rootfiles/core/140/update.sh index 2f044fb4b..08ccee09d 100644 --- a/config/rootfiles/core/140/update.sh +++ b/config/rootfiles/core/140/update.sh @@ -17,7 +17,7 @@ # 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. # +# Copyright (C) 2020 IPFire-Team info@ipfire.org. # # # ############################################################################ # @@ -43,7 +43,14 @@ done

# Remove files -rm -f /etc/rc.d/init.d/networking/red.up/06-safe-search +rm -rf /usr/lib/libboost*1.55.0 +rm -rf /usr/lib/mysql +rm -rf /usr/lib/pppd/2.4.4 +rm -rf /usr/lib/pppd/2.4.5 +rm -rf /usr/lib/pppd/2.4.6 +rm -rf /usr/local/share/GeoIP +rm -rf /usr/share/mysql +rm -rf /usr/share/vim7*

# Stop services

@@ -51,13 +58,13 @@ rm -f /etc/rc.d/init.d/networking/red.up/06-safe-search extract_files

# update linker config -ldconfig +# ldconfig

-# restart init after glibc replace -telinit u +# run filesystem cleanup +/usr/local/bin/filesystem-cleanup

# Update Language cache -/usr/local/bin/update-lang-cache +#/usr/local/bin/update-lang-cache

# Start services

diff --git a/config/rootfiles/core/141/exclude b/config/rootfiles/core/141/exclude new file mode 100644 index 000000000..b22159878 --- /dev/null +++ b/config/rootfiles/core/141/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/140/filelists/aarch64/efivar b/config/rootfiles/core/141/filelists/aarch64/efivar similarity index 100% rename from config/rootfiles/core/140/filelists/aarch64/efivar rename to config/rootfiles/core/141/filelists/aarch64/efivar diff --git a/config/rootfiles/core/140/filelists/aarch64/gcc b/config/rootfiles/core/141/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/140/filelists/aarch64/gcc rename to config/rootfiles/core/141/filelists/aarch64/gcc diff --git a/config/rootfiles/core/140/filelists/aarch64/glibc b/config/rootfiles/core/141/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/140/filelists/aarch64/glibc rename to config/rootfiles/core/141/filelists/aarch64/glibc diff --git a/config/rootfiles/core/140/filelists/aarch64/python3 b/config/rootfiles/core/141/filelists/aarch64/python3 similarity index 100% rename from config/rootfiles/core/140/filelists/aarch64/python3 rename to config/rootfiles/core/141/filelists/aarch64/python3 diff --git a/config/rootfiles/core/140/filelists/armv5tel/gcc b/config/rootfiles/core/141/filelists/armv5tel/gcc similarity index 100% rename from config/rootfiles/core/140/filelists/armv5tel/gcc rename to config/rootfiles/core/141/filelists/armv5tel/gcc diff --git a/config/rootfiles/core/140/filelists/armv5tel/glibc b/config/rootfiles/core/141/filelists/armv5tel/glibc similarity index 100% rename from config/rootfiles/core/140/filelists/armv5tel/glibc rename to config/rootfiles/core/141/filelists/armv5tel/glibc diff --git a/config/rootfiles/core/140/filelists/armv5tel/pyhton3 b/config/rootfiles/core/141/filelists/armv5tel/pyhton3 similarity index 100% rename from config/rootfiles/core/140/filelists/armv5tel/pyhton3 rename to config/rootfiles/core/141/filelists/armv5tel/pyhton3 diff --git a/config/rootfiles/core/140/filelists/bind b/config/rootfiles/core/141/filelists/bind similarity index 100% rename from config/rootfiles/core/140/filelists/bind rename to config/rootfiles/core/141/filelists/bind diff --git a/config/rootfiles/core/140/filelists/elinks b/config/rootfiles/core/141/filelists/elinks similarity index 100% rename from config/rootfiles/core/140/filelists/elinks rename to config/rootfiles/core/141/filelists/elinks diff --git a/config/rootfiles/core/140/filelists/file b/config/rootfiles/core/141/filelists/file similarity index 100% rename from config/rootfiles/core/140/filelists/file rename to config/rootfiles/core/141/filelists/file diff --git a/config/rootfiles/core/141/filelists/files b/config/rootfiles/core/141/filelists/files new file mode 100644 index 000000000..47f915b5a --- /dev/null +++ b/config/rootfiles/core/141/filelists/files @@ -0,0 +1,38 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs +etc/rc.d/helper/aws-setup +etc/rc.d/helper/azure-setup +etc/rc.d/init.d/lvmetad +etc/rc.d/init.d/networking/dhcpcd.exe +etc/rc.d/init.d/networking/red +etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders +etc/rc.d/init.d/partresize +etc/rc.d/init.d/suricata +etc/rc.d/init.d/unbound +etc/rc.d/rcsysinit.d/S09lvmetad +etc/ppp/ip-down +etc/ppp/ip-up +etc/unbound/unbound.conf +opt/pakfire/etc/pakfire.conf +opt/pakfire/lib/functions.pl +srv/web/ipfire/cgi-bin/dns.cgi +srv/web/ipfire/cgi-bin/dnsforward.cgi +srv/web/ipfire/cgi-bin/gui.cgi +srv/web/ipfire/cgi-bin/hosts.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/netexternal.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/local/bin/backupiso +usr/local/bin/convert-dns-settings +usr/local/bin/unboundctrl +usr/sbin/convert-snort +usr/sbin/setup +usr/sbin/unbound-dhcp-leases-bridge +var/ipfire/backup/bin/backup.pl +var/ipfire/ids-functions.pl +var/ipfire/menu.d/30-network.menu +var/ipfire/general-functions.pl diff --git a/config/rootfiles/core/140/filelists/geoip-database b/config/rootfiles/core/141/filelists/geoip-database similarity index 100% rename from config/rootfiles/core/140/filelists/geoip-database rename to config/rootfiles/core/141/filelists/geoip-database diff --git a/config/rootfiles/core/140/filelists/glib b/config/rootfiles/core/141/filelists/glib similarity index 100% rename from config/rootfiles/core/140/filelists/glib rename to config/rootfiles/core/141/filelists/glib diff --git a/config/rootfiles/core/140/filelists/i586/gcc b/config/rootfiles/core/141/filelists/i586/gcc similarity index 100% rename from config/rootfiles/core/140/filelists/i586/gcc rename to config/rootfiles/core/141/filelists/i586/gcc diff --git a/config/rootfiles/core/140/filelists/i586/glibc b/config/rootfiles/core/141/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/140/filelists/i586/glibc rename to config/rootfiles/core/141/filelists/i586/glibc diff --git a/config/rootfiles/core/140/filelists/i586/python3 b/config/rootfiles/core/141/filelists/i586/python3 similarity index 100% rename from config/rootfiles/core/140/filelists/i586/python3 rename to config/rootfiles/core/141/filelists/i586/python3 diff --git a/config/rootfiles/core/140/filelists/knot b/config/rootfiles/core/141/filelists/knot similarity index 100% rename from config/rootfiles/core/140/filelists/knot rename to config/rootfiles/core/141/filelists/knot diff --git a/config/rootfiles/core/140/filelists/libhtp b/config/rootfiles/core/141/filelists/libhtp similarity index 100% rename from config/rootfiles/core/140/filelists/libhtp rename to config/rootfiles/core/141/filelists/libhtp diff --git a/config/rootfiles/core/140/filelists/libmpc b/config/rootfiles/core/141/filelists/libmpc similarity index 100% rename from config/rootfiles/core/140/filelists/libmpc rename to config/rootfiles/core/141/filelists/libmpc diff --git a/config/rootfiles/core/140/filelists/lvm2 b/config/rootfiles/core/141/filelists/lvm2 similarity index 100% rename from config/rootfiles/core/140/filelists/lvm2 rename to config/rootfiles/core/141/filelists/lvm2 diff --git a/config/rootfiles/core/140/filelists/mdadm b/config/rootfiles/core/141/filelists/mdadm similarity index 100% rename from config/rootfiles/core/140/filelists/mdadm rename to config/rootfiles/core/141/filelists/mdadm diff --git a/config/rootfiles/core/140/filelists/mpfr b/config/rootfiles/core/141/filelists/mpfr similarity index 100% rename from config/rootfiles/core/140/filelists/mpfr rename to config/rootfiles/core/141/filelists/mpfr diff --git a/config/rootfiles/core/140/filelists/suricata b/config/rootfiles/core/141/filelists/suricata similarity index 100% rename from config/rootfiles/core/140/filelists/suricata rename to config/rootfiles/core/141/filelists/suricata diff --git a/config/rootfiles/core/140/filelists/unbound b/config/rootfiles/core/141/filelists/unbound similarity index 100% rename from config/rootfiles/core/140/filelists/unbound rename to config/rootfiles/core/141/filelists/unbound diff --git a/config/rootfiles/core/140/filelists/x86_64/efivar b/config/rootfiles/core/141/filelists/x86_64/efivar similarity index 100% rename from config/rootfiles/core/140/filelists/x86_64/efivar rename to config/rootfiles/core/141/filelists/x86_64/efivar diff --git a/config/rootfiles/core/140/filelists/x86_64/gcc b/config/rootfiles/core/141/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/140/filelists/x86_64/gcc rename to config/rootfiles/core/141/filelists/x86_64/gcc diff --git a/config/rootfiles/core/140/filelists/x86_64/glibc b/config/rootfiles/core/141/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/140/filelists/x86_64/glibc rename to config/rootfiles/core/141/filelists/x86_64/glibc diff --git a/config/rootfiles/core/140/filelists/x86_64/python3 b/config/rootfiles/core/141/filelists/x86_64/python3 similarity index 100% rename from config/rootfiles/core/140/filelists/x86_64/python3 rename to config/rootfiles/core/141/filelists/x86_64/python3 diff --git a/config/rootfiles/core/141/meta b/config/rootfiles/core/141/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/141/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/141/update.sh b/config/rootfiles/core/141/update.sh new file mode 100644 index 000000000..e757c2ed5 --- /dev/null +++ b/config/rootfiles/core/141/update.sh @@ -0,0 +1,79 @@ +#!/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=141 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # 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 +rm -f /etc/rc.d/init.d/networking/red.up/06-safe-search + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# restart init after glibc replace +telinit u + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services + +# 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/src/scripts/filesystem-cleanup b/src/scripts/filesystem-cleanup index 7e7accc7a..e0430e480 100644 --- a/src/scripts/filesystem-cleanup +++ b/src/scripts/filesystem-cleanup @@ -22,6 +22,7 @@ ############################################################################

PATHS=( + /usr/lib/sse2 /usr/lib /lib )

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