mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 19:23:24 +02:00
core186: start update
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
@@ -1 +0,0 @@
|
||||
../../../../common/aarch64/binutils
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/aarch64/glibc
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/aarch64/util-linux
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/arping
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/bind
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/ca-certificates
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/elfutils
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/ethtool
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/expat
|
||||
@@ -1,54 +0,0 @@
|
||||
etc/rc.d/init.d/functions
|
||||
etc/sudoers.d/logwatch-mdadm
|
||||
lib/firmware/brcm/BCM-0a5c-6410.hcd
|
||||
lib/firmware/brcm/brcmfmac43012-sdio.bin
|
||||
lib/firmware/brcm/brcmfmac43012-sdio.clm_blob
|
||||
lib/firmware/brcm/brcmfmac43430-sdio.clm_blob
|
||||
lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt
|
||||
lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt
|
||||
lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt
|
||||
lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt
|
||||
lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt
|
||||
lib/firmware/brcm/brcmfmac43455-sdio.clm_blob
|
||||
lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
|
||||
lib/firmware/brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi 4 Model B.txt
|
||||
lib/firmware/brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi Compute Module 4.txt
|
||||
lib/firmware/brcm/brcmfmac4354-sdio.clm_blob
|
||||
lib/firmware/brcm/brcmfmac4356-pcie.clm_blob
|
||||
lib/firmware/brcm/brcmfmac4356-sdio.clm_blob
|
||||
lib/firmware/brcm/brcmfmac4356-sdio.khadas,vim2.txt
|
||||
lib/firmware/brcm/brcmfmac43570-pcie.clm_blob
|
||||
lib/firmware/brcm/brcmfmac4373-sdio.clm_blob
|
||||
lib/firmware/brcm/brcmfmac54591-pcie.bin
|
||||
lib/firmware/brcm/brcmfmac54591-pcie.clm_blob
|
||||
lib/firmware/cxgb4/t4-config.txt
|
||||
lib/firmware/cxgb4/t5-config.txt
|
||||
lib/firmware/cxgb4/t6-config.txt
|
||||
lib/firmware/intel/ice/ddp/ice.pkg
|
||||
lib/firmware/netronome/flower/nic_AMDA0058-0011_1x100.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0058-0011_2x40.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0058-0011_4x10_1x40.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0058-0011_8x10.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0058-0012_1x100.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0058-0012_2x40.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0058-0012_4x10_1x40.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0058-0012_8x10.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0078-0011_1x100.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0078-0011_2x40.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0078-0011_4x10_1x40.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0078-0011_8x10.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0078-0012_1x100.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0078-0012_2x40.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0078-0012_4x10_1x40.nffw
|
||||
lib/firmware/netronome/flower/nic_AMDA0078-0012_8x10.nffw
|
||||
lib/firmware/nvidia/tegra124/vic.bin
|
||||
lib/firmware/nvidia/tegra186/vic.bin
|
||||
lib/firmware/nvidia/tegra210/vic.bin
|
||||
srv/web/ipfire/cgi-bin/dhcp.cgi
|
||||
srv/web/ipfire/cgi-bin/dns.cgi
|
||||
srv/web/ipfire/cgi-bin/index.cgi
|
||||
srv/web/ipfire/cgi-bin/ovpnmain.cgi
|
||||
srv/web/ipfire/cgi-bin/time.cgi
|
||||
var/ipfire/backup/bin/backup.pl
|
||||
var/ipfire/main/manualpages
|
||||
var/ipfire/ovpn/openssl/ovpn.cnf
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/iproute2
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/iputils
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/knot
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/libcap
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/libffi
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/libgpg-error
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/libhtp
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/libpng
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/newt
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/ntp
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/openjpeg
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/openssh
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/pango
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/pciutils
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/pixman
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/poppler
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/ppp
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/qpdf
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/riscv64/binutils
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/riscv64/glibc
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/riscv64/util-linux
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/shadow
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/sqlite
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/squid
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/suricata
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/tcl
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/unbound
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/wget
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/whois
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/x86_64/binutils
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/x86_64/glibc
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/x86_64/intel-microcode
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/x86_64/util-linux
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/xz
|
||||
@@ -1,143 +0,0 @@
|
||||
#!/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) 2024 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
core=185
|
||||
|
||||
# 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
|
||||
/etc/init.d/ntp stop
|
||||
/etc/init.d/squid stop
|
||||
|
||||
# Extract files
|
||||
extract_files
|
||||
|
||||
# Remove files
|
||||
rm -rvf \
|
||||
/etc/pango \
|
||||
/lib/firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp \
|
||||
/lib/firmware/ath11k/IPQ6018/hw1.0/Notice.txt \
|
||||
/lib/firmware/ath11k/IPQ8074/hw2.0/Notice.txt \
|
||||
/lib/firmware/ath11k/QCA6390/hw2.0/Notice.txt \
|
||||
/lib/firmware/ath11k/QCN9074/hw1.0/Notice.txt \
|
||||
/lib/firmware/ath11k/WCN6855/hw2.0/Notice.txt \
|
||||
/lib/firmware/intel-ucode/06-86-04 \
|
||||
/lib/firmware/intel-ucode/06-86-05 \
|
||||
/lib/firmware/intel-ucode/06-8f-04 \
|
||||
/sbin/xtables-multi \
|
||||
/srv/web/ipfire/html/themes/ipfire-rounded \
|
||||
/usr/lib/crda/pubkeys/linville.key.pub.pem \
|
||||
/usr/lib/grub/i386-pc/efiemu{32,64}.o \
|
||||
/usr/lib/grub/i386-pc/verifiers.* \
|
||||
/usr/lib/grub/i386-pc/verify.* \
|
||||
/usr/lib/grub/x86_64-efi/shim_lock.* \
|
||||
/usr/lib/grub/x86_64-efi/verifiers.* \
|
||||
/usr/lib/grub/x86_64-efi/verify.* \
|
||||
/usr/lib/pppd/2.5.0 \
|
||||
/usr/lib/snort_dynamic* \
|
||||
/usr/local/bin/snortctrl \
|
||||
/usr/share/usb_modeswitch/1033:0035 \
|
||||
/usr/share/vim/vim7* \
|
||||
/var/ipfire/geoip-functions.pl \
|
||||
/var/ipfire/dhcpc/dhcpcd-hooks/00-linux \
|
||||
/var/ipfire/dhcpc/dhcpcd-hooks/02-dump \
|
||||
/var/lib/location/tmp*
|
||||
|
||||
# update linker config
|
||||
ldconfig
|
||||
|
||||
# Update Language cache
|
||||
/usr/local/bin/update-lang-cache
|
||||
|
||||
# Filesytem cleanup
|
||||
/usr/local/bin/filesystem-cleanup
|
||||
|
||||
# Apply local configuration to sshd_config
|
||||
/usr/local/bin/sshctrl
|
||||
|
||||
# Fix permissions of /etc/sudoers.d/
|
||||
chmod -v 750 /etc/sudoers.d
|
||||
chmod -v 640 /etc/sudoers.d/*
|
||||
|
||||
# Start services
|
||||
telinit u
|
||||
/etc/init.d/sshd restart
|
||||
/etc/init.d/suricata restart
|
||||
/etc/init.d/unbound restart
|
||||
/etc/init.d/ntp start
|
||||
if [ -f /var/ipfire/proxy/enable ]; then
|
||||
/etc/init.d/squid start
|
||||
fi
|
||||
## Modify ovpnconfig according to bug 13548 for no-pass entry for N2N client connections
|
||||
# Check if ovpnconfig exists and is not empty
|
||||
if [ -s /var/ipfire/ovpn/ovpnconfig ]; then
|
||||
# Add blank line at top of ovpnconfig otherwise the first roadwarrior entry is treated like a blank line and missed out from update
|
||||
awk 'NR==1{print ""}1' /var/ipfire/ovpn/ovpnconfig > /var/ipfire/ovpn/tmp_file && mv /var/ipfire/ovpn/tmp_file /var/ipfire/ovpn/ovpnconfig
|
||||
|
||||
# Make all N2N connections 'no-pass' since they do not use encryption
|
||||
awk '{FS=OFS=","} {if($5=="net") {$43="no-pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.new
|
||||
|
||||
# Copy all RW connections unchanged to the new ovpnconfig file
|
||||
for y in $(awk -F',' '/host/ { print $3 }' /var/ipfire/ovpn/ovpnconfig); do
|
||||
awk -v var="$y" '{FS=OFS=","} {if($3==var) {print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.new
|
||||
|
||||
done
|
||||
fi
|
||||
|
||||
# Replace existing ovpnconfig with updated index
|
||||
mv /var/ipfire/ovpn/ovpnconfig.new /var/ipfire/ovpn/ovpnconfig
|
||||
# Set correct ownership
|
||||
chown nobody:nobody /var/ipfire/ovpn/ovpnconfig
|
||||
|
||||
# Rebuild initial ramdisks
|
||||
dracut --regenerate-all --force
|
||||
KVER="xxxKVERxxx"
|
||||
case "$(uname -m)" in
|
||||
aarch64)
|
||||
mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
|
||||
# dont remove initramfs because grub need this to boot.
|
||||
;;
|
||||
esac
|
||||
|
||||
# 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
|
||||
1
config/rootfiles/core/186/filelists/aarch64/linux
Symbolic link
1
config/rootfiles/core/186/filelists/aarch64/linux
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/aarch64/linux
|
||||
1
config/rootfiles/core/186/filelists/files
Normal file
1
config/rootfiles/core/186/filelists/files
Normal file
@@ -0,0 +1 @@
|
||||
srv/web/ipfire/cgi-bin/vulnerabilities.cgi
|
||||
1
config/rootfiles/core/186/filelists/riscv64/linux
Symbolic link
1
config/rootfiles/core/186/filelists/riscv64/linux
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/riscv64/linux
|
||||
1
config/rootfiles/core/186/filelists/x86_64/linux
Symbolic link
1
config/rootfiles/core/186/filelists/x86_64/linux
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/x86_64/linux
|
||||
141
config/rootfiles/core/186/update.sh
Normal file
141
config/rootfiles/core/186/update.sh
Normal file
@@ -0,0 +1,141 @@
|
||||
#!/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) 2024 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
core=186
|
||||
|
||||
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
|
||||
|
||||
# Stop services
|
||||
|
||||
KVER="xxxKVERxxx"
|
||||
|
||||
# Backup uEnv.txt if exist
|
||||
if [ -e /boot/uEnv.txt ]; then
|
||||
cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
|
||||
fi
|
||||
|
||||
# Do some sanity checks prior to the kernel update
|
||||
case $(uname -r) in
|
||||
*-ipfire*)
|
||||
# Ok.
|
||||
;;
|
||||
*)
|
||||
exit_with_error "ERROR cannot update. No IPFire Kernel." 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# Check diskspace on root and size of boot
|
||||
ROOTSPACE=$( df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1 )
|
||||
if [ $ROOTSPACE -lt 200000 ]; then
|
||||
exit_with_error "ERROR cannot update because not enough free space on root." 2
|
||||
fi
|
||||
BOOTSIZE=$( df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1 )
|
||||
if [ $BOOTSIZE -lt 100000 ]; then
|
||||
exit_with_error "ERROR cannot update. BOOT partition is to small." 3
|
||||
fi
|
||||
|
||||
# Remove the old kernel
|
||||
rm -rvf \
|
||||
/boot/System.map-* \
|
||||
/boot/config-* \
|
||||
/boot/ipfirerd-* \
|
||||
/boot/initramfs-* \
|
||||
/boot/vmlinuz-* \
|
||||
/boot/uImage-* \
|
||||
/boot/zImage-* \
|
||||
/boot/uInit-* \
|
||||
/boot/dtb-* \
|
||||
/lib/modules
|
||||
|
||||
# Extract files
|
||||
extract_files
|
||||
|
||||
# Remove files
|
||||
#rm -rvf \
|
||||
# /XXX
|
||||
|
||||
# update linker config
|
||||
ldconfig
|
||||
|
||||
# Update Language cache
|
||||
/usr/local/bin/update-lang-cache
|
||||
|
||||
# Filesytem cleanup
|
||||
/usr/local/bin/filesystem-cleanup
|
||||
|
||||
# Start services
|
||||
|
||||
# Build initial ramdisks
|
||||
dracut --regenerate-all --force
|
||||
KVER="xxxKVERxxx"
|
||||
case "$(uname -m)" in
|
||||
aarch64)
|
||||
mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
|
||||
# dont remove initramfs because grub need this to boot.
|
||||
;;
|
||||
esac
|
||||
|
||||
# Upadate Kernel version in uEnv.txt
|
||||
if [ -e /boot/uEnv.txt ]; then
|
||||
sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
|
||||
fi
|
||||
|
||||
# Call user update script (needed for some ARM boards)
|
||||
if [ -e /boot/pakfire-kernel-update ]; then
|
||||
/boot/pakfire-kernel-update ${KVER}
|
||||
fi
|
||||
|
||||
# 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
|
||||
/usr/bin/install-bootloader
|
||||
fi
|
||||
|
||||
sync
|
||||
|
||||
# Don't report the exitcode last command
|
||||
exit 0
|
||||
Reference in New Issue
Block a user