webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Start Core Update 166

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2022-03-10 10:34:48 +00:00
parent d29b3c77ac
commit 64a2131815
59 changed files with 107 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/rootfiles/oldcore/165/core-files Normal file
View File

@@ -0,0 +1,5 @@
etc/system-release
etc/issue
etc/os-release
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs

35
config/rootfiles/oldcore/165/exclude Normal file
View File

@@ -0,0 +1,35 @@
boot/config.txt
boot/grub/grub.cfg
boot/grub/grubenv
boot/uEnv.txt
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
usr/share/xt_geoip
var/ipfire/dma
var/ipfire/time
var/ipfire/firewall/locationblock
var/ipfire/fwhosts/customlocationgrp
var/ipfire/ovpn
var/ipfire/urlfilter/blacklist
var/ipfire/urlfilter/settings
var/lib/alternatives
var/lib/location/database.db
var/log/cache
var/log/dhcpcd.log
var/log/messages
var/state/dhcp/dhcpd.leases
var/updatecache

1
config/rootfiles/oldcore/165/filelists/aarch64/binutils Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/aarch64/binutils

1
config/rootfiles/oldcore/165/filelists/aarch64/gcc Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/aarch64/gcc

1
config/rootfiles/oldcore/165/filelists/aarch64/glibc Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/aarch64/glibc

1
config/rootfiles/oldcore/165/filelists/armv6l/binutils Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/armv6l/binutils

1
config/rootfiles/oldcore/165/filelists/armv6l/gcc Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/armv6l/gcc

1
config/rootfiles/oldcore/165/filelists/armv6l/glibc Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/armv6l/glibc

1
config/rootfiles/oldcore/165/filelists/armv6l/python3 Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/armv6l/python3

1
config/rootfiles/oldcore/165/filelists/bash Symbolic link
View File

@@ -0,0 +1 @@
../../../common/bash

1
config/rootfiles/oldcore/165/filelists/bind Symbolic link
View File

@@ -0,0 +1 @@
../../../common/bind

1
config/rootfiles/oldcore/165/filelists/curl Symbolic link
View File

@@ -0,0 +1 @@
../../../common/curl

1
config/rootfiles/oldcore/165/filelists/ddns Symbolic link
View File

@@ -0,0 +1 @@
../../../common/ddns

1
config/rootfiles/oldcore/165/filelists/dhcpcd Symbolic link
View File

@@ -0,0 +1 @@
../../../common/dhcpcd

1
config/rootfiles/oldcore/165/filelists/ethtool Symbolic link
View File

@@ -0,0 +1 @@
../../../common/ethtool

1
config/rootfiles/oldcore/165/filelists/expat Symbolic link
View File

@@ -0,0 +1 @@
../../../common/expat

24
config/rootfiles/oldcore/165/filelists/files Normal file
View File

@@ -0,0 +1,24 @@
etc/rc.d/helper/oci-setup
etc/rc.d/init.d/firewall
etc/rc.d/init.d/networking/functions.network
opt/pakfire/etc/pakfire.conf
opt/pakfire/lib/functions.pl
srv/web/ipfire/cgi-bin/backup.cgi
srv/web/ipfire/cgi-bin/firewall.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/logs.cgi/ovpnclients.dat
srv/web/ipfire/cgi-bin/media.cgi
srv/web/ipfire/cgi-bin/optionsfw.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/qos.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/cgi-bin/wirelessclient.cgi
srv/web/ipfire/html/themes/ipfire/include/css/style.css
usr/lib/firewall/firewall-lib.pl
usr/lib/firewall/rules.pl
usr/local/bin/update-location-database
usr/sbin/setup
var/ipfire/ids-functions.pl
var/ipfire/location-functions.pl
var/ipfire/main/manualpages
var/ipfire/menu.d/50-firewall.menu

1
config/rootfiles/oldcore/165/filelists/findutils Symbolic link
View File

@@ -0,0 +1 @@
../../../common/findutils

1
config/rootfiles/oldcore/165/filelists/fireinfo Symbolic link
View File

@@ -0,0 +1 @@
../../../common/fireinfo

1
config/rootfiles/oldcore/165/filelists/gdbm Symbolic link
View File

@@ -0,0 +1 @@
../../../common/gdbm

1
config/rootfiles/oldcore/165/filelists/glib Symbolic link
View File

@@ -0,0 +1 @@
../../../common/glib

1
config/rootfiles/oldcore/165/filelists/harfbuzz Symbolic link
View File

@@ -0,0 +1 @@
../../../common/harfbuzz

1
config/rootfiles/oldcore/165/filelists/iana-etc Symbolic link
View File

@@ -0,0 +1 @@
../../../common/iana-etc

1
config/rootfiles/oldcore/165/filelists/iproute2 Symbolic link
View File

@@ -0,0 +1 @@
../../../common/iproute2

1
config/rootfiles/oldcore/165/filelists/lcms2 Symbolic link
View File

@@ -0,0 +1 @@
../../../common/lcms2

1
config/rootfiles/oldcore/165/filelists/libarchive Symbolic link
View File

@@ -0,0 +1 @@
../../../common/libarchive

1
config/rootfiles/oldcore/165/filelists/libcap Symbolic link
View File

@@ -0,0 +1 @@
../../../common/libcap

1
config/rootfiles/oldcore/165/filelists/libgpg-error Symbolic link
View File

@@ -0,0 +1 @@
../../../common/libgpg-error

1
config/rootfiles/oldcore/165/filelists/libloc Symbolic link
View File

@@ -0,0 +1 @@
../../../common/libloc

1
config/rootfiles/oldcore/165/filelists/libusb Symbolic link
View File

@@ -0,0 +1 @@
../../../common/libusb

1
config/rootfiles/oldcore/165/filelists/libxcrypt Symbolic link
View File

@@ -0,0 +1 @@
../../../common/libxcrypt

1
config/rootfiles/oldcore/165/filelists/lua Symbolic link
View File

@@ -0,0 +1 @@
../../../common/lua

1
config/rootfiles/oldcore/165/filelists/mdadm Symbolic link
View File

@@ -0,0 +1 @@
../../../common/mdadm

1
config/rootfiles/oldcore/165/filelists/newt Symbolic link
View File

@@ -0,0 +1 @@
../../../common/newt

1
config/rootfiles/oldcore/165/filelists/openssl Symbolic link
View File

@@ -0,0 +1 @@
../../../common/openssl

1
config/rootfiles/oldcore/165/filelists/p11-kit Symbolic link
View File

@@ -0,0 +1 @@
../../../common/p11-kit

1
config/rootfiles/oldcore/165/filelists/pango Symbolic link
View File

@@ -0,0 +1 @@
../../../common/pango

1
config/rootfiles/oldcore/165/filelists/perl-HTTP-Date Symbolic link
View File

@@ -0,0 +1 @@
../../../common/perl-HTTP-Date

1
config/rootfiles/oldcore/165/filelists/perl-HTTP-Message Symbolic link
View File

@@ -0,0 +1 @@
../../../common/perl-HTTP-Message

1
config/rootfiles/oldcore/165/filelists/perl-LWP-Protocol-https Symbolic link
View File

@@ -0,0 +1 @@
../../../common/perl-LWP-Protocol-https

1
config/rootfiles/oldcore/165/filelists/perl-Net-HTTP Symbolic link
View File

@@ -0,0 +1 @@
../../../common/perl-Net-HTTP

1
config/rootfiles/oldcore/165/filelists/perl-Try-Tiny Symbolic link
View File

@@ -0,0 +1 @@
../../../common/perl-Try-Tiny

1
config/rootfiles/oldcore/165/filelists/perl-libwww Symbolic link
View File

@@ -0,0 +1 @@
../../../common/perl-libwww

1
config/rootfiles/oldcore/165/filelists/poppler Symbolic link
View File

@@ -0,0 +1 @@
../../../common/poppler

1
config/rootfiles/oldcore/165/filelists/python3 Symbolic link
View File

@@ -0,0 +1 @@
../../../common/python3

1
config/rootfiles/oldcore/165/filelists/python3-daemon Symbolic link
View File

@@ -0,0 +1 @@
../../../common/python3-daemon

1
config/rootfiles/oldcore/165/filelists/python3-inotify Symbolic link
View File

@@ -0,0 +1 @@
../../../common/python3-inotify

1
config/rootfiles/oldcore/165/filelists/sqlite Symbolic link
View File

@@ -0,0 +1 @@
../../../common/sqlite

1
config/rootfiles/oldcore/165/filelists/sudo Symbolic link
View File

@@ -0,0 +1 @@
../../../common/sudo

1
config/rootfiles/oldcore/165/filelists/wpa_supplicant Symbolic link
View File

@@ -0,0 +1 @@
../../../common/wpa_supplicant

1
config/rootfiles/oldcore/165/filelists/x86_64/binutils Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/x86_64/binutils

1
config/rootfiles/oldcore/165/filelists/x86_64/gcc Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/x86_64/gcc

1
config/rootfiles/oldcore/165/filelists/x86_64/glibc Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/x86_64/glibc

1
config/rootfiles/oldcore/165/filelists/x86_64/hyperscan Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/x86_64/hyperscan

1
config/rootfiles/oldcore/165/filelists/zstd Symbolic link
View File

@@ -0,0 +1 @@
../../../common/zstd

147
config/rootfiles/oldcore/165/update.sh Normal file
View File

@@ -0,0 +1,147 @@
#!/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) 2022 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
core=165
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
# Check diskspace on root
ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
if [ $ROOTSPACE -lt 100000 ]; then
exit_with_error "ERROR cannot update because not enough free space on root." 2
exit 2
fi
# Remove files
rm -rvf \
/lib/xtables/libxt_ACCOUNT.so \
/lib/xtables/libxt_CHAOS.so \
/lib/xtables/libxt_condition.so \
/lib/xtables/libxt_DELUDE.so \
/lib/xtables/libxt_dhcpmac.so \
/lib/xtables/libxt_DHCPMAC.so \
/lib/xtables/libxt_DNETMAP.so \
/lib/xtables/libxt_ECHO.so \
/lib/xtables/libxt_fuzzy.so \
/lib/xtables/libxt_geoip.so \
/lib/xtables/libxt_gradm.so \
/lib/xtables/libxt_iface.so \
/lib/xtables/libxt_IPMARK.so \
/lib/xtables/libxt_ipp2p.so \
/lib/xtables/libxt_ipv4options.so \
/lib/xtables/libxt_length2.so \
/lib/xtables/libxt_LOGMARK.so \
/lib/xtables/libxt_lscan.so \
/lib/xtables/libxt_pknock.so \
/lib/xtables/libxt_PROTO.so \
/lib/xtables/libxt_psd.so \
/lib/xtables/libxt_quota2.so \
/lib/xtables/libxt_SYSRQ.so \
/lib/xtables/libxt_TARPIT.so \
/srv/web/ipfire/cgi-bin/p2p-block.cgi \
/usr/bin/2to3-3.8 \
/usr/bin/easy_install-3.8 \
/usr/bin/idle3.8 \
/usr/bin/pip3.8 \
/usr/bin/pydoc3.8 \
/usr/bin/python3.8 \
/usr/bin/python3.8-config \
/usr/bin/xt_geoip_query \
/usr/lib/libpython3.8.so \
/usr/lib/libpython3.8.so.1.0 \
/usr/lib/libxt_ACCOUNT_cl.so* \
/usr/lib/python3.8/ \
/usr/sbin/iptaccount \
/usr/sbin/ovpn-collectd-convert \
/usr/sbin/pknlusr \
/usr/share/xt_geoip/ \
/var/ipfire/dhcpc/dhcpcd-hooks/10-mtu \
/var/ipfire/firewall/p2protocols
# Rename squid-accounting add-on to proxy-accounting, if installed
# (see: https://lists.ipfire.org/pipermail/development/2022-February/012482.html)
if [ -e "/opt/pakfire/db/installed/meta-squid-accounting" ] && [ -e "/opt/pakfire/db/meta/meta-squid-accounting" ]; then
mv -v /opt/pakfire/db/installed/meta-squid-accounting /opt/pakfire/db/installed/meta-proxy-accounting
mv -v /opt/pakfire/db/meta/meta-squid-accounting /opt/pakfire/db/meta/meta-proxy-accounting
mv -v /opt/pakfire/db/rootfiles/squid-accounting /opt/pakfire/db/rootfiles/proxy-accounting
fi
# Stop services
# Extract files
extract_files
# update linker config
ldconfig
# Update Language cache
/usr/local/bin/update-lang-cache
# Filesytem cleanup
/usr/local/bin/filesystem-cleanup
# Export location DB in new format.
/usr/bin/location export \
--directory=/var/lib/location/ipset \
--family=ipv4 \
--format=ipset
# Start services
telinit u
/etc/rc.d/init.d/firewall restart
# 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