From 4bf13a6a473945181338e3c24c257fbe3fe3f7f6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 9 Aug 2021 07:05:56 +0000 Subject: [PATCH 001/306] core160: begin updater Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/exclude | 34 ++++++++++ config/rootfiles/core/160/filelists/files | 0 .../core/160/filelists/release-files | 5 ++ config/rootfiles/core/160/update.sh | 67 +++++++++++++++++++ .../rootfiles/{core => oldcore}/159/exclude | 0 .../159/filelists/aarch64/binutils | 0 .../159/filelists/aarch64/gcc | 0 .../159/filelists/aarch64/glibc | 0 .../159/filelists/aarch64/grub | 0 .../159/filelists/aarch64/linux | 0 .../159/filelists/aarch64/linux-initrd | 0 .../159/filelists/aarch64/rpi-firmware | 0 .../159/filelists/aarch64/swconfig | 0 .../159/filelists/aarch64/u-boot | 0 .../159/filelists/aarch64/u-boot-mkimage | 0 .../159/filelists/armv6l/binutils | 0 .../159/filelists/armv6l/boost | 0 .../159/filelists/armv6l/gcc | 0 .../159/filelists/armv6l/glibc | 0 .../159/filelists/armv6l/linux | 0 .../159/filelists/armv6l/linux-initrd | 0 .../159/filelists/armv6l/pakfire | 0 .../159/filelists/armv6l/python3 | 0 .../159/filelists/armv6l/rpi-firmware | 0 .../159/filelists/armv6l/swconfig | 0 .../159/filelists/armv6l/u-boot | 0 .../159/filelists/armv6l/u-boot-friendlyarm | 0 .../159/filelists/armv6l/u-boot-mkimage | 0 .../{core => oldcore}/159/filelists/collectd | 0 .../159/filelists/core-files | 0 .../{core => oldcore}/159/filelists/dhcpcd | 0 .../{core => oldcore}/159/filelists/etherwake | 0 .../{core => oldcore}/159/filelists/files | 0 .../{core => oldcore}/159/filelists/fuse | 0 .../{core => oldcore}/159/filelists/gettext | 0 .../159/filelists/i586/binutils | 0 .../{core => oldcore}/159/filelists/i586/gcc | 0 .../159/filelists/i586/glibc | 0 .../{core => oldcore}/159/filelists/i586/grub | 0 .../159/filelists/i586/hyperscan | 0 .../159/filelists/i586/linux | 0 .../159/filelists/i586/linux-initrd | 0 .../159/filelists/i586/python3 | 0 .../159/filelists/libstatgrab | 0 .../{core => oldcore}/159/filelists/libusb | 0 .../{core => oldcore}/159/filelists/libxcrypt | 0 .../{core => oldcore}/159/filelists/linux-atm | 0 .../{core => oldcore}/159/filelists/openssh | 0 .../{core => oldcore}/159/filelists/python3 | 0 .../{core => oldcore}/159/filelists/squid | 0 .../159/filelists/x86_64/binutils | 0 .../159/filelists/x86_64/gcc | 0 .../159/filelists/x86_64/glibc | 0 .../159/filelists/x86_64/grub | 0 .../159/filelists/x86_64/hyperscan | 0 .../159/filelists/x86_64/linux | 0 .../159/filelists/x86_64/linux-initrd | 0 .../159/filelists/xtables-addons | 0 .../{core => oldcore}/159/filelists/zstd | 0 .../rootfiles/{core => oldcore}/159/update.sh | 0 make.sh | 2 +- 61 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/core/160/exclude create mode 100644 config/rootfiles/core/160/filelists/files create mode 100644 config/rootfiles/core/160/filelists/release-files create mode 100644 config/rootfiles/core/160/update.sh rename config/rootfiles/{core => oldcore}/159/exclude (100%) rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/binutils (100%) rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/gcc (100%) rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/grub (100%) rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/linux (100%) rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/rpi-firmware (100%) rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/swconfig (100%) rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/u-boot (100%) rename config/rootfiles/{core => oldcore}/159/filelists/aarch64/u-boot-mkimage (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/binutils (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/boost (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/gcc (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/glibc (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/linux (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/pakfire (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/python3 (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/rpi-firmware (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/swconfig (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/u-boot (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/u-boot-friendlyarm (100%) rename config/rootfiles/{core => oldcore}/159/filelists/armv6l/u-boot-mkimage (100%) rename config/rootfiles/{core => oldcore}/159/filelists/collectd (100%) rename config/rootfiles/{core => oldcore}/159/filelists/core-files (100%) rename config/rootfiles/{core => oldcore}/159/filelists/dhcpcd (100%) rename config/rootfiles/{core => oldcore}/159/filelists/etherwake (100%) rename config/rootfiles/{core => oldcore}/159/filelists/files (100%) rename config/rootfiles/{core => oldcore}/159/filelists/fuse (100%) rename config/rootfiles/{core => oldcore}/159/filelists/gettext (100%) rename config/rootfiles/{core => oldcore}/159/filelists/i586/binutils (100%) rename config/rootfiles/{core => oldcore}/159/filelists/i586/gcc (100%) rename config/rootfiles/{core => oldcore}/159/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/159/filelists/i586/grub (100%) rename config/rootfiles/{core => oldcore}/159/filelists/i586/hyperscan (100%) rename config/rootfiles/{core => oldcore}/159/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/159/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/159/filelists/i586/python3 (100%) rename config/rootfiles/{core => oldcore}/159/filelists/libstatgrab (100%) rename config/rootfiles/{core => oldcore}/159/filelists/libusb (100%) rename config/rootfiles/{core => oldcore}/159/filelists/libxcrypt (100%) rename config/rootfiles/{core => oldcore}/159/filelists/linux-atm (100%) rename config/rootfiles/{core => oldcore}/159/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/159/filelists/python3 (100%) rename config/rootfiles/{core => oldcore}/159/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/grub (100%) rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/hyperscan (100%) rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/159/filelists/x86_64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/159/filelists/xtables-addons (100%) rename config/rootfiles/{core => oldcore}/159/filelists/zstd (100%) rename config/rootfiles/{core => oldcore}/159/update.sh (100%) diff --git a/config/rootfiles/core/160/exclude b/config/rootfiles/core/160/exclude new file mode 100644 index 000000000..818039f4a --- /dev/null +++ b/config/rootfiles/core/160/exclude @@ -0,0 +1,34 @@ +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 +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 diff --git a/config/rootfiles/core/160/filelists/files b/config/rootfiles/core/160/filelists/files new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/160/filelists/release-files b/config/rootfiles/core/160/filelists/release-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/core/160/filelists/release-files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/os-release +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/160/update.sh b/config/rootfiles/core/160/update.sh new file mode 100644 index 000000000..deaa652d1 --- /dev/null +++ b/config/rootfiles/core/160/update.sh @@ -0,0 +1,67 @@ +#!/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) 2021 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=160 + +# 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 + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# 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/config/rootfiles/core/159/exclude b/config/rootfiles/oldcore/159/exclude similarity index 100% rename from config/rootfiles/core/159/exclude rename to config/rootfiles/oldcore/159/exclude diff --git a/config/rootfiles/core/159/filelists/aarch64/binutils b/config/rootfiles/oldcore/159/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/159/filelists/aarch64/binutils rename to config/rootfiles/oldcore/159/filelists/aarch64/binutils diff --git a/config/rootfiles/core/159/filelists/aarch64/gcc b/config/rootfiles/oldcore/159/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/159/filelists/aarch64/gcc rename to config/rootfiles/oldcore/159/filelists/aarch64/gcc diff --git a/config/rootfiles/core/159/filelists/aarch64/glibc b/config/rootfiles/oldcore/159/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/159/filelists/aarch64/glibc rename to config/rootfiles/oldcore/159/filelists/aarch64/glibc diff --git a/config/rootfiles/core/159/filelists/aarch64/grub b/config/rootfiles/oldcore/159/filelists/aarch64/grub similarity index 100% rename from config/rootfiles/core/159/filelists/aarch64/grub rename to config/rootfiles/oldcore/159/filelists/aarch64/grub diff --git a/config/rootfiles/core/159/filelists/aarch64/linux b/config/rootfiles/oldcore/159/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/159/filelists/aarch64/linux rename to config/rootfiles/oldcore/159/filelists/aarch64/linux diff --git a/config/rootfiles/core/159/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/159/filelists/aarch64/linux-initrd similarity index 100% rename from config/rootfiles/core/159/filelists/aarch64/linux-initrd rename to config/rootfiles/oldcore/159/filelists/aarch64/linux-initrd diff --git a/config/rootfiles/core/159/filelists/aarch64/rpi-firmware b/config/rootfiles/oldcore/159/filelists/aarch64/rpi-firmware similarity index 100% rename from config/rootfiles/core/159/filelists/aarch64/rpi-firmware rename to config/rootfiles/oldcore/159/filelists/aarch64/rpi-firmware diff --git a/config/rootfiles/core/159/filelists/aarch64/swconfig b/config/rootfiles/oldcore/159/filelists/aarch64/swconfig similarity index 100% rename from config/rootfiles/core/159/filelists/aarch64/swconfig rename to config/rootfiles/oldcore/159/filelists/aarch64/swconfig diff --git a/config/rootfiles/core/159/filelists/aarch64/u-boot b/config/rootfiles/oldcore/159/filelists/aarch64/u-boot similarity index 100% rename from config/rootfiles/core/159/filelists/aarch64/u-boot rename to config/rootfiles/oldcore/159/filelists/aarch64/u-boot diff --git a/config/rootfiles/core/159/filelists/aarch64/u-boot-mkimage b/config/rootfiles/oldcore/159/filelists/aarch64/u-boot-mkimage similarity index 100% rename from config/rootfiles/core/159/filelists/aarch64/u-boot-mkimage rename to config/rootfiles/oldcore/159/filelists/aarch64/u-boot-mkimage diff --git a/config/rootfiles/core/159/filelists/armv6l/binutils b/config/rootfiles/oldcore/159/filelists/armv6l/binutils similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/binutils rename to config/rootfiles/oldcore/159/filelists/armv6l/binutils diff --git a/config/rootfiles/core/159/filelists/armv6l/boost b/config/rootfiles/oldcore/159/filelists/armv6l/boost similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/boost rename to config/rootfiles/oldcore/159/filelists/armv6l/boost diff --git a/config/rootfiles/core/159/filelists/armv6l/gcc b/config/rootfiles/oldcore/159/filelists/armv6l/gcc similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/gcc rename to config/rootfiles/oldcore/159/filelists/armv6l/gcc diff --git a/config/rootfiles/core/159/filelists/armv6l/glibc b/config/rootfiles/oldcore/159/filelists/armv6l/glibc similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/glibc rename to config/rootfiles/oldcore/159/filelists/armv6l/glibc diff --git a/config/rootfiles/core/159/filelists/armv6l/linux b/config/rootfiles/oldcore/159/filelists/armv6l/linux similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/linux rename to config/rootfiles/oldcore/159/filelists/armv6l/linux diff --git a/config/rootfiles/core/159/filelists/armv6l/linux-initrd b/config/rootfiles/oldcore/159/filelists/armv6l/linux-initrd similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/linux-initrd rename to config/rootfiles/oldcore/159/filelists/armv6l/linux-initrd diff --git a/config/rootfiles/core/159/filelists/armv6l/pakfire b/config/rootfiles/oldcore/159/filelists/armv6l/pakfire similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/pakfire rename to config/rootfiles/oldcore/159/filelists/armv6l/pakfire diff --git a/config/rootfiles/core/159/filelists/armv6l/python3 b/config/rootfiles/oldcore/159/filelists/armv6l/python3 similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/python3 rename to config/rootfiles/oldcore/159/filelists/armv6l/python3 diff --git a/config/rootfiles/core/159/filelists/armv6l/rpi-firmware b/config/rootfiles/oldcore/159/filelists/armv6l/rpi-firmware similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/rpi-firmware rename to config/rootfiles/oldcore/159/filelists/armv6l/rpi-firmware diff --git a/config/rootfiles/core/159/filelists/armv6l/swconfig b/config/rootfiles/oldcore/159/filelists/armv6l/swconfig similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/swconfig rename to config/rootfiles/oldcore/159/filelists/armv6l/swconfig diff --git a/config/rootfiles/core/159/filelists/armv6l/u-boot b/config/rootfiles/oldcore/159/filelists/armv6l/u-boot similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/u-boot rename to config/rootfiles/oldcore/159/filelists/armv6l/u-boot diff --git a/config/rootfiles/core/159/filelists/armv6l/u-boot-friendlyarm b/config/rootfiles/oldcore/159/filelists/armv6l/u-boot-friendlyarm similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/u-boot-friendlyarm rename to config/rootfiles/oldcore/159/filelists/armv6l/u-boot-friendlyarm diff --git a/config/rootfiles/core/159/filelists/armv6l/u-boot-mkimage b/config/rootfiles/oldcore/159/filelists/armv6l/u-boot-mkimage similarity index 100% rename from config/rootfiles/core/159/filelists/armv6l/u-boot-mkimage rename to config/rootfiles/oldcore/159/filelists/armv6l/u-boot-mkimage diff --git a/config/rootfiles/core/159/filelists/collectd b/config/rootfiles/oldcore/159/filelists/collectd similarity index 100% rename from config/rootfiles/core/159/filelists/collectd rename to config/rootfiles/oldcore/159/filelists/collectd diff --git a/config/rootfiles/core/159/filelists/core-files b/config/rootfiles/oldcore/159/filelists/core-files similarity index 100% rename from config/rootfiles/core/159/filelists/core-files rename to config/rootfiles/oldcore/159/filelists/core-files diff --git a/config/rootfiles/core/159/filelists/dhcpcd b/config/rootfiles/oldcore/159/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/159/filelists/dhcpcd rename to config/rootfiles/oldcore/159/filelists/dhcpcd diff --git a/config/rootfiles/core/159/filelists/etherwake b/config/rootfiles/oldcore/159/filelists/etherwake similarity index 100% rename from config/rootfiles/core/159/filelists/etherwake rename to config/rootfiles/oldcore/159/filelists/etherwake diff --git a/config/rootfiles/core/159/filelists/files b/config/rootfiles/oldcore/159/filelists/files similarity index 100% rename from config/rootfiles/core/159/filelists/files rename to config/rootfiles/oldcore/159/filelists/files diff --git a/config/rootfiles/core/159/filelists/fuse b/config/rootfiles/oldcore/159/filelists/fuse similarity index 100% rename from config/rootfiles/core/159/filelists/fuse rename to config/rootfiles/oldcore/159/filelists/fuse diff --git a/config/rootfiles/core/159/filelists/gettext b/config/rootfiles/oldcore/159/filelists/gettext similarity index 100% rename from config/rootfiles/core/159/filelists/gettext rename to config/rootfiles/oldcore/159/filelists/gettext diff --git a/config/rootfiles/core/159/filelists/i586/binutils b/config/rootfiles/oldcore/159/filelists/i586/binutils similarity index 100% rename from config/rootfiles/core/159/filelists/i586/binutils rename to config/rootfiles/oldcore/159/filelists/i586/binutils diff --git a/config/rootfiles/core/159/filelists/i586/gcc b/config/rootfiles/oldcore/159/filelists/i586/gcc similarity index 100% rename from config/rootfiles/core/159/filelists/i586/gcc rename to config/rootfiles/oldcore/159/filelists/i586/gcc diff --git a/config/rootfiles/core/159/filelists/i586/glibc b/config/rootfiles/oldcore/159/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/159/filelists/i586/glibc rename to config/rootfiles/oldcore/159/filelists/i586/glibc diff --git a/config/rootfiles/core/159/filelists/i586/grub b/config/rootfiles/oldcore/159/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/159/filelists/i586/grub rename to config/rootfiles/oldcore/159/filelists/i586/grub diff --git a/config/rootfiles/core/159/filelists/i586/hyperscan b/config/rootfiles/oldcore/159/filelists/i586/hyperscan similarity index 100% rename from config/rootfiles/core/159/filelists/i586/hyperscan rename to config/rootfiles/oldcore/159/filelists/i586/hyperscan diff --git a/config/rootfiles/core/159/filelists/i586/linux b/config/rootfiles/oldcore/159/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/159/filelists/i586/linux rename to config/rootfiles/oldcore/159/filelists/i586/linux diff --git a/config/rootfiles/core/159/filelists/i586/linux-initrd b/config/rootfiles/oldcore/159/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/159/filelists/i586/linux-initrd rename to config/rootfiles/oldcore/159/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/159/filelists/i586/python3 b/config/rootfiles/oldcore/159/filelists/i586/python3 similarity index 100% rename from config/rootfiles/core/159/filelists/i586/python3 rename to config/rootfiles/oldcore/159/filelists/i586/python3 diff --git a/config/rootfiles/core/159/filelists/libstatgrab b/config/rootfiles/oldcore/159/filelists/libstatgrab similarity index 100% rename from config/rootfiles/core/159/filelists/libstatgrab rename to config/rootfiles/oldcore/159/filelists/libstatgrab diff --git a/config/rootfiles/core/159/filelists/libusb b/config/rootfiles/oldcore/159/filelists/libusb similarity index 100% rename from config/rootfiles/core/159/filelists/libusb rename to config/rootfiles/oldcore/159/filelists/libusb diff --git a/config/rootfiles/core/159/filelists/libxcrypt b/config/rootfiles/oldcore/159/filelists/libxcrypt similarity index 100% rename from config/rootfiles/core/159/filelists/libxcrypt rename to config/rootfiles/oldcore/159/filelists/libxcrypt diff --git a/config/rootfiles/core/159/filelists/linux-atm b/config/rootfiles/oldcore/159/filelists/linux-atm similarity index 100% rename from config/rootfiles/core/159/filelists/linux-atm rename to config/rootfiles/oldcore/159/filelists/linux-atm diff --git a/config/rootfiles/core/159/filelists/openssh b/config/rootfiles/oldcore/159/filelists/openssh similarity index 100% rename from config/rootfiles/core/159/filelists/openssh rename to config/rootfiles/oldcore/159/filelists/openssh diff --git a/config/rootfiles/core/159/filelists/python3 b/config/rootfiles/oldcore/159/filelists/python3 similarity index 100% rename from config/rootfiles/core/159/filelists/python3 rename to config/rootfiles/oldcore/159/filelists/python3 diff --git a/config/rootfiles/core/159/filelists/squid b/config/rootfiles/oldcore/159/filelists/squid similarity index 100% rename from config/rootfiles/core/159/filelists/squid rename to config/rootfiles/oldcore/159/filelists/squid diff --git a/config/rootfiles/core/159/filelists/x86_64/binutils b/config/rootfiles/oldcore/159/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/159/filelists/x86_64/binutils rename to config/rootfiles/oldcore/159/filelists/x86_64/binutils diff --git a/config/rootfiles/core/159/filelists/x86_64/gcc b/config/rootfiles/oldcore/159/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/159/filelists/x86_64/gcc rename to config/rootfiles/oldcore/159/filelists/x86_64/gcc diff --git a/config/rootfiles/core/159/filelists/x86_64/glibc b/config/rootfiles/oldcore/159/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/159/filelists/x86_64/glibc rename to config/rootfiles/oldcore/159/filelists/x86_64/glibc diff --git a/config/rootfiles/core/159/filelists/x86_64/grub b/config/rootfiles/oldcore/159/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/159/filelists/x86_64/grub rename to config/rootfiles/oldcore/159/filelists/x86_64/grub diff --git a/config/rootfiles/core/159/filelists/x86_64/hyperscan b/config/rootfiles/oldcore/159/filelists/x86_64/hyperscan similarity index 100% rename from config/rootfiles/core/159/filelists/x86_64/hyperscan rename to config/rootfiles/oldcore/159/filelists/x86_64/hyperscan diff --git a/config/rootfiles/core/159/filelists/x86_64/linux b/config/rootfiles/oldcore/159/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/159/filelists/x86_64/linux rename to config/rootfiles/oldcore/159/filelists/x86_64/linux diff --git a/config/rootfiles/core/159/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/159/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/159/filelists/x86_64/linux-initrd rename to config/rootfiles/oldcore/159/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/159/filelists/xtables-addons b/config/rootfiles/oldcore/159/filelists/xtables-addons similarity index 100% rename from config/rootfiles/core/159/filelists/xtables-addons rename to config/rootfiles/oldcore/159/filelists/xtables-addons diff --git a/config/rootfiles/core/159/filelists/zstd b/config/rootfiles/oldcore/159/filelists/zstd similarity index 100% rename from config/rootfiles/core/159/filelists/zstd rename to config/rootfiles/oldcore/159/filelists/zstd diff --git a/config/rootfiles/core/159/update.sh b/config/rootfiles/oldcore/159/update.sh similarity index 100% rename from config/rootfiles/core/159/update.sh rename to config/rootfiles/oldcore/159/update.sh diff --git a/make.sh b/make.sh index d78fb2ff0..0baf2050d 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.27" # Version number -CORE="159" # Core Level (Filename) +CORE="160" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop From db4e10a6ecdb59a6f19249873ba5d50b22db6a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20M=C3=BCller?= Date: Thu, 22 Apr 2021 18:15:22 +0200 Subject: [PATCH 002/306] general-functions.pl: do not miscalculate when enumerating IPsec N2N subnet membership MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: #11235 Cc: Alexander Marx Signed-off-by: Peter Müller Signed-off-by: Arne Fitzenreiter --- config/cfgroot/general-functions.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 550afcf82..c7df46489 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -601,7 +601,7 @@ sub checksubnets foreach my $key (keys %ipsecconf){ if ($ipsecconf{$key}[11] ne '' && $ipsecconf{$key}[36] eq ""){ foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) { - my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]); + my ($ipsecip,$ipsecsub) = split (/\//, $ipsecsubitem); $ipsecsub=&iporsubtodec($ipsecsub); if($ipsecconf{$key}[1] ne $ccdname){ if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){ From 9e47307d1b862d27931b0bf56bcfdc44381c9162 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 9 Aug 2021 07:47:45 +0000 Subject: [PATCH 003/306] core160: add general-functions.pl Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/160/filelists/files b/config/rootfiles/core/160/filelists/files index e69de29bb..57f856e53 100644 --- a/config/rootfiles/core/160/filelists/files +++ b/config/rootfiles/core/160/filelists/files @@ -0,0 +1 @@ +var/ipfire/general-functions.pl From 6f36132e6890f4a423de2a0df14ccf3c720110c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20M=C3=BCller?= Date: Thu, 22 Apr 2021 22:20:00 +0200 Subject: [PATCH 004/306] fwhosts.cgi: properly fetch configured IPsec N2N subnets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, the getcolor() function did not correctly process IPsec N2N connections with more than one remote network configured, resulting in networks mistakenly marked as being part of a VPN connection, or vice versa. Fixes: #11235 Signed-off-by: Peter Müller Acked-by: Stefan Schantl Reviewed-by: Michael Tremer Signed-off-by: Arne Fitzenreiter --- html/cgi-bin/fwhosts.cgi | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 35611ac08..0da771a5a 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -1974,11 +1974,13 @@ sub getcolor #Check if IP is part of a IPsec N2N network foreach my $key (sort keys %ipsecconf){ if ($ipsecconf{$key}[11]){ - my ($a,$b) = split("/",$ipsecconf{$key}[11]); - $b=&General::iporsubtodec($b); - if (&General::IpInSubnet($sip,$a,$b)){ - $tdcolor="$c"; - return $tdcolor; + foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) { + my ($a,$b) = split("/",$ipsecsubitem); + $b=&General::iporsubtodec($b); + if (&General::IpInSubnet($sip,$a,$b)){ + $tdcolor="$c"; + return $tdcolor; + } } } } From 6bebdc5c5653663c3f6fcfabbd4e2f426ca72c5a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 9 Aug 2021 07:52:24 +0000 Subject: [PATCH 005/306] core160: add fwhost.cgi Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/160/filelists/files b/config/rootfiles/core/160/filelists/files index 57f856e53..e68e90a52 100644 --- a/config/rootfiles/core/160/filelists/files +++ b/config/rootfiles/core/160/filelists/files @@ -1 +1,2 @@ +srv/web/ipfire/cgi-bin/fwhosts.cgi var/ipfire/general-functions.pl From ae367b9c8fbe5e59b9e2d313efc0be8fdd1b0ae8 Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Wed, 30 Jun 2021 19:46:07 +0200 Subject: [PATCH 006/306] alsa: Update to version 1.2.5.1 - Not really sure if a sound support capability is really appropriate for a firewall. I wouldn't have it. However if it stays as an add-on then it should be up to date. - Update alsa-lib from 1.0.27.1 (2013) to 1.2.5.1 (2021) - Update alsa-utils from 1.0.27.1 (2013) to 1.2.5.1 (2021) - Update alsa-firmware from 1.0.27 (2013) to 1.2.4 (2020) - Update rootfile - Changelog is too large to include here. Changes back to 2019-11-20 can be found at https://www.alsa-project.org/wiki/Main_Page Earlier changes have to be found from the git commits at https://github.com/alsa-project/alsa-lib and https://github.com/alsa-project/alsa-utils There is no changelog or git commits that I have been able to find for alsa-firmware Signed-off-by: Adolf Belka Signed-off-by: Arne Fitzenreiter --- config/rootfiles/packages/alsa | 118 ++++++++++++++------------------- lfs/alsa | 14 ++-- 2 files changed, 58 insertions(+), 74 deletions(-) diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa index 1c0d744ab..a704727ec 100644 --- a/config/rootfiles/packages/alsa +++ b/config/rootfiles/packages/alsa @@ -1,6 +1,6 @@ +etc/rc.d/init.d/alsa lib/firmware/aica_firmware.bin #lib/firmware/asihpi -lib/firmware/asihpi/dsp2400.bin lib/firmware/asihpi/dsp5000.bin lib/firmware/asihpi/dsp6200.bin lib/firmware/asihpi/dsp6205.bin @@ -8,8 +8,15 @@ lib/firmware/asihpi/dsp6400.bin lib/firmware/asihpi/dsp6600.bin lib/firmware/asihpi/dsp8700.bin lib/firmware/asihpi/dsp8900.bin -lib/firmware/ctefx.bin -lib/firmware/ctspeq.bin +#lib/firmware/cs46xx +lib/firmware/cs46xx/ba1 +lib/firmware/cs46xx/cwc4630 +lib/firmware/cs46xx/cwcasync +lib/firmware/cs46xx/cwcbinhack +lib/firmware/cs46xx/cwcdma +lib/firmware/cs46xx/cwcsnoop +lib/firmware/ctefx-desktop.bin +lib/firmware/ctefx-r3di.bin lib/firmware/digiface_firmware.bin lib/firmware/digiface_firmware_rev11.bin #lib/firmware/ea @@ -98,9 +105,12 @@ lib/firmware/vx/x1_1_vp4.xlx lib/firmware/vx/x1_1_vx2.xlx lib/firmware/vx/x1_1_vxp.xlx lib/firmware/vx/x1_2_v22.xlx +#lib/udev/rules.d/90-alsa-restore.rules usr/bin/aconnect +usr/bin/alsabat usr/bin/alsaloop usr/bin/alsamixer +usr/bin/alsatplg usr/bin/alsaucm usr/bin/amidi usr/bin/amixer @@ -111,19 +121,19 @@ usr/bin/arecordmidi usr/bin/aseqdump usr/bin/aseqnet usr/bin/aserver +usr/bin/axfer usr/bin/iecset usr/bin/speaker-test #usr/include/alsa -#usr/include/alsa/alisp.h #usr/include/alsa/asoundef.h #usr/include/alsa/asoundlib.h #usr/include/alsa/conf.h #usr/include/alsa/control.h #usr/include/alsa/control_external.h +#usr/include/alsa/control_plugin.h #usr/include/alsa/error.h #usr/include/alsa/global.h #usr/include/alsa/hwdep.h -#usr/include/alsa/iatomic.h #usr/include/alsa/input.h #usr/include/alsa/mixer.h #usr/include/alsa/mixer_abst.h @@ -141,31 +151,39 @@ usr/bin/speaker-test #usr/include/alsa/seq_midi_event.h #usr/include/alsa/seqmid.h #usr/include/alsa/sound +#usr/include/alsa/sound/asoc.h #usr/include/alsa/sound/asound_fm.h #usr/include/alsa/sound/emu10k1.h #usr/include/alsa/sound/hdsp.h usr/include/alsa/sound/hdspm.h #usr/include/alsa/sound/sb16_csp.h #usr/include/alsa/sound/sscape_ioctl.h +#usr/include/alsa/sound/tlv.h #usr/include/alsa/sound/type_compat.h +#usr/include/alsa/sound/uapi +#usr/include/alsa/sound/uapi/asoc.h +#usr/include/alsa/sound/uapi/asound_fm.h +#usr/include/alsa/sound/uapi/emu10k1.h +#usr/include/alsa/sound/uapi/hdsp.h +#usr/include/alsa/sound/uapi/hdspm.h +#usr/include/alsa/sound/uapi/sb16_csp.h +#usr/include/alsa/sound/uapi/sscape_ioctl.h +#usr/include/alsa/sound/uapi/tlv.h #usr/include/alsa/timer.h +#usr/include/alsa/topology.h #usr/include/alsa/use-case.h #usr/include/alsa/version.h +#usr/include/asoundlib.h #usr/include/sys/asoundlib.h -#usr/lib/alsa-lib -#usr/lib/alsa-lib/smixer -#usr/lib/alsa-lib/smixer/smixer-ac97.la -usr/lib/alsa-lib/smixer/smixer-ac97.so -#usr/lib/alsa-lib/smixer/smixer-hda.la -usr/lib/alsa-lib/smixer/smixer-hda.so -#usr/lib/alsa-lib/smixer/smixer-python.la -usr/lib/alsa-lib/smixer/smixer-python.so -#usr/lib/alsa-lib/smixer/smixer-sbase.la -usr/lib/alsa-lib/smixer/smixer-sbase.so #usr/lib/libasound.la -usr/lib/libasound.so +#usr/lib/libasound.so usr/lib/libasound.so.2 usr/lib/libasound.so.2.0.0 +#usr/lib/libatopology.la +#usr/lib/libatopology.so +usr/lib/libatopology.so.2 +usr/lib/libatopology.so.2.0.0 +#usr/lib/pkgconfig/alsa-topology.pc #usr/lib/pkgconfig/alsa.pc usr/local/share/alsa #usr/local/share/alsa/firmware @@ -242,13 +260,13 @@ usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin #usr/local/share/alsa/firmware/vxloader/x1_1_vx2.rbt #usr/local/share/alsa/firmware/vxloader/x1_1_vxp.rbt #usr/local/share/alsa/firmware/vxloader/x1_2_v22.rbt +usr/sbin/alsa-info.sh +usr/sbin/alsabat-test.sh usr/sbin/alsaconf usr/sbin/alsactl #usr/share/aclocal/alsa.m4 usr/share/alsa #usr/share/alsa/alsa.conf -#usr/share/alsa/alsa.conf.d -usr/share/alsa/alsa.conf.d/README #usr/share/alsa/cards #usr/share/alsa/cards/AACI.conf #usr/share/alsa/cards/ATIIXP-MODEM.conf @@ -279,11 +297,13 @@ usr/share/alsa/alsa.conf.d/README #usr/share/alsa/cards/FireWave.conf #usr/share/alsa/cards/GUS.conf #usr/share/alsa/cards/HDA-Intel.conf +#usr/share/alsa/cards/HdmiLpeAudio.conf #usr/share/alsa/cards/ICE1712.conf #usr/share/alsa/cards/ICE1724.conf #usr/share/alsa/cards/ICH-MODEM.conf #usr/share/alsa/cards/ICH.conf #usr/share/alsa/cards/ICH4.conf +#usr/share/alsa/cards/Loopback.conf #usr/share/alsa/cards/Maestro3.conf #usr/share/alsa/cards/NFORCE.conf #usr/share/alsa/cards/PC-Speaker.conf @@ -293,10 +313,7 @@ usr/share/alsa/alsa.conf.d/README #usr/share/alsa/cards/RME9636.conf #usr/share/alsa/cards/RME9652.conf #usr/share/alsa/cards/SB-XFi.conf -#usr/share/alsa/cards/SI7018 #usr/share/alsa/cards/SI7018.conf -#usr/share/alsa/cards/SI7018/sndoc-mixer.alisp -#usr/share/alsa/cards/SI7018/sndop-mixer.alisp #usr/share/alsa/cards/TRID4DWAVENX.conf #usr/share/alsa/cards/USB-Audio.conf #usr/share/alsa/cards/VIA686A.conf @@ -307,10 +324,14 @@ usr/share/alsa/alsa.conf.d/README #usr/share/alsa/cards/VXPocket.conf #usr/share/alsa/cards/VXPocket440.conf #usr/share/alsa/cards/YMF744.conf -#usr/share/alsa/cards/aliases.alisp #usr/share/alsa/cards/aliases.conf +#usr/share/alsa/cards/pistachio-card.conf +#usr/share/alsa/cards/vc4-hdmi.conf +#usr/share/alsa/ctl +#usr/share/alsa/ctl/default.conf #usr/share/alsa/init #usr/share/alsa/init/00main +#usr/share/alsa/init/ca0106 #usr/share/alsa/init/default #usr/share/alsa/init/hda #usr/share/alsa/init/help @@ -328,52 +349,25 @@ usr/share/alsa/alsa.conf.d/README #usr/share/alsa/pcm/modem.conf #usr/share/alsa/pcm/rear.conf #usr/share/alsa/pcm/side.conf +#usr/share/alsa/pcm/surround21.conf #usr/share/alsa/pcm/surround40.conf #usr/share/alsa/pcm/surround41.conf #usr/share/alsa/pcm/surround50.conf #usr/share/alsa/pcm/surround51.conf #usr/share/alsa/pcm/surround71.conf -#usr/share/alsa/smixer.conf -#usr/share/alsa/sndo-mixer.alisp #usr/share/alsa/speaker-test #usr/share/alsa/speaker-test/sample_map.csv -#usr/share/alsa/ucm -usr/share/alsa/ucm/DAISY-I2S -usr/share/alsa/ucm/DAISY-I2S/DAISY-I2S.conf -usr/share/alsa/ucm/DAISY-I2S/HiFi.conf -#usr/share/alsa/ucm/PandaBoard -usr/share/alsa/ucm/PandaBoard/FMAnalog -usr/share/alsa/ucm/PandaBoard/PandaBoard.conf -usr/share/alsa/ucm/PandaBoard/hifi -usr/share/alsa/ucm/PandaBoard/hifiLP -usr/share/alsa/ucm/PandaBoard/record -usr/share/alsa/ucm/PandaBoard/voice -usr/share/alsa/ucm/PandaBoard/voiceCall -#usr/share/alsa/ucm/PandaBoardES -usr/share/alsa/ucm/PandaBoardES/FMAnalog -usr/share/alsa/ucm/PandaBoardES/PandaBoardES.conf -usr/share/alsa/ucm/PandaBoardES/hifi -usr/share/alsa/ucm/PandaBoardES/hifiLP -usr/share/alsa/ucm/PandaBoardES/record -usr/share/alsa/ucm/PandaBoardES/voice -usr/share/alsa/ucm/PandaBoardES/voiceCall -#usr/share/alsa/ucm/SDP4430 -usr/share/alsa/ucm/SDP4430/FMAnalog -usr/share/alsa/ucm/SDP4430/SDP4430.conf -usr/share/alsa/ucm/SDP4430/hifi -usr/share/alsa/ucm/SDP4430/hifiLP -usr/share/alsa/ucm/SDP4430/record -usr/share/alsa/ucm/SDP4430/voice -usr/share/alsa/ucm/SDP4430/voiceCall -#usr/share/alsa/ucm/tegraalc5632 -usr/share/alsa/ucm/tegraalc5632/tegraalc5632.conf #usr/share/locale/de/LC_MESSAGES/alsa-utils.mo +#usr/share/locale/eu/LC_MESSAGES/alsa-utils.mo #usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo #usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo #usr/share/locale/ja/LC_MESSAGES/alsaconf.mo #usr/share/locale/ru/LC_MESSAGES/alsaconf.mo +#usr/share/locale/sk/LC_MESSAGES/alsa-utils.mo #usr/share/man/fr/man8/alsaconf.8 #usr/share/man/man1/aconnect.1 +#usr/share/man/man1/alsa-info.sh.1 +#usr/share/man/man1/alsabat.1 #usr/share/man/man1/alsactl.1 #usr/share/man/man1/alsaloop.1 #usr/share/man/man1/alsamixer.1 @@ -385,6 +379,9 @@ usr/share/alsa/ucm/tegraalc5632/tegraalc5632.conf #usr/share/man/man1/arecordmidi.1 #usr/share/man/man1/aseqdump.1 #usr/share/man/man1/aseqnet.1 +#usr/share/man/man1/axfer-list.1 +#usr/share/man/man1/axfer-transfer.1 +#usr/share/man/man1/axfer.1 #usr/share/man/man1/iecset.1 #usr/share/man/man1/speaker-test.1 #usr/share/man/man8/alsaconf.8 @@ -400,16 +397,3 @@ usr/share/sounds/alsa #usr/share/sounds/alsa/Side_Left.wav #usr/share/sounds/alsa/Side_Right.wav var/lib/alsa -etc/rc.d/init.d/alsa -lib/firmware/ess/maestro3_assp_kernel.fw -lib/firmware/ess/maestro3_assp_minisrc.fw -lib/firmware/korg/k1212.dsp -lib/firmware/sb16/alaw_main.csp -lib/firmware/sb16/ima_adpcm_capture.csp -lib/firmware/sb16/ima_adpcm_init.csp -lib/firmware/sb16/ima_adpcm_playback.csp -lib/firmware/sb16/mulaw_main.csp -lib/firmware/yamaha/ds1_ctrl.fw -lib/firmware/yamaha/ds1_dsp.fw -lib/firmware/yamaha/ds1e_ctrl.fw -lib/firmware/yamaha/yss225_registers.bin diff --git a/lfs/alsa b/lfs/alsa index 23ad58cf6..264849e11 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -25,9 +25,9 @@ include Config -VER = 1.0.27.1 -UVER = 1.0.27.1 -FVER = 1.0.27 +VER = 1.2.5.1 +UVER = 1.2.5.1 +FVER = 1.2.4 VERSUFIX = ipfire$(KCFG) @@ -36,7 +36,7 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) PROG = alsa -PAK_VER = 12 +PAK_VER = 13 DEPS = @@ -52,9 +52,9 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) alsa-utils-$(UVER).tar.bz2 = $(DL_FROM)/alsa-utils-$(UVER).tar.bz2 alsa-firmware-$(FVER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(FVER).tar.bz2 -$(DL_FILE)_MD5 = 17102aaab10e9d4b19f6b02937bab015 -alsa-utils-$(UVER).tar.bz2_MD5 = 3d81357b997744a139881ef72bc6921a -alsa-firmware-$(FVER).tar.bz2_MD5 = b373b350d5151dd7d64db2fc12936b04 +$(DL_FILE)_MD5 = c8335793e7828803311edc48fb71662e +alsa-utils-$(UVER).tar.bz2_MD5 = 8f142bebff84ff05438b46a0e896f53a +alsa-firmware-$(FVER).tar.bz2_MD5 = ee6c1d24a1a4ac1d86992b408ed710a2 install : $(TARGET) From 07335498ff089b09efe347dd348414aa26cd8ba1 Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Wed, 30 Jun 2021 19:46:31 +0200 Subject: [PATCH 007/306] ghostscript: Update version to 9.54.0 - Update from 9.53.3 to 9.54.0 - Update rootfile - delete patch related to FT_CALLBACK_DEF as fix has been implemented in the source tarball - Changelog highlights Version 9.54.0 (2021-03-30) The 9.54.0 release is a maintenance release, and also adds new functionality. Highlights in this release include: Overprint simulation is now available to all output devices, allowing quality previewing/proofing of PostScript and PDF jobs that rely on overprint. See the -dOverprint option documentation in: Overprint The "docxwrite" device adds the ability to output to Microsoft Word "docx" format. See: docxwrite The pdfwrite device is now capable of using the Tesseract OCR engine when it is built into Ghostscript to improve searchability and copy and paste functionality when the input lacks the metadata for that purpose. See: UseOCR Ghostscript/GhostPDL now includes a "map text to black" function, where text drawn by an input job (except when drawn using a Type 3 font) can be forced to draw in solid black. See: BlackText Ghostscript/GhostPDL now supports simple N-up imposition "internally". See: NupControl Our efforts in code hygiene and maintainability continue. The usual round of bug fixes, compatibility changes, and incremental improvements. Full details of above highlights can be found at https://www.ghostscript.com/doc/9.54.0/History9.htm Signed-off-by: Adolf Belka Signed-off-by: Arne Fitzenreiter --- config/rootfiles/packages/ghostscript | 403 +++++++++--------- lfs/ghostscript | 7 +- ...K_DEF-with-Freetype-2.10.3-and-later.patch | 50 --- 3 files changed, 205 insertions(+), 255 deletions(-) delete mode 100644 src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch diff --git a/config/rootfiles/packages/ghostscript b/config/rootfiles/packages/ghostscript index 983d0b766..45337fc36 100644 --- a/config/rootfiles/packages/ghostscript +++ b/config/rootfiles/packages/ghostscript @@ -25,208 +25,209 @@ usr/bin/ps2ps usr/bin/ps2ps2 usr/bin/unix-lpr.sh #usr/share/doc/ghostscript -#usr/share/doc/ghostscript/9.53.3 -#usr/share/doc/ghostscript/9.53.3/API.htm -#usr/share/doc/ghostscript/9.53.3/C-style.htm -#usr/share/doc/ghostscript/9.53.3/COPYING -#usr/share/doc/ghostscript/9.53.3/Commprod.htm -#usr/share/doc/ghostscript/9.53.3/DLL.htm -#usr/share/doc/ghostscript/9.53.3/Deprecated.htm -#usr/share/doc/ghostscript/9.53.3/Develop.htm -#usr/share/doc/ghostscript/9.53.3/Devices.htm -#usr/share/doc/ghostscript/9.53.3/Drivers.htm -#usr/share/doc/ghostscript/9.53.3/Fonts.htm -#usr/share/doc/ghostscript/9.53.3/GS9_Color_Management.pdf -#usr/share/doc/ghostscript/9.53.3/History9.htm -#usr/share/doc/ghostscript/9.53.3/Install.htm -#usr/share/doc/ghostscript/9.53.3/Language.htm -#usr/share/doc/ghostscript/9.53.3/Lib.htm -#usr/share/doc/ghostscript/9.53.3/Make.htm -#usr/share/doc/ghostscript/9.53.3/News.htm -#usr/share/doc/ghostscript/9.53.3/Ps-style.htm -#usr/share/doc/ghostscript/9.53.3/Ps2epsi.htm -#usr/share/doc/ghostscript/9.53.3/Psfiles.htm -#usr/share/doc/ghostscript/9.53.3/Readme.htm -#usr/share/doc/ghostscript/9.53.3/Release.htm -#usr/share/doc/ghostscript/9.53.3/SavedPages.htm -#usr/share/doc/ghostscript/9.53.3/Source.htm -#usr/share/doc/ghostscript/9.53.3/Unix-lpr.htm -#usr/share/doc/ghostscript/9.53.3/Use.htm -#usr/share/doc/ghostscript/9.53.3/VectorDevices.htm -#usr/share/doc/ghostscript/9.53.3/WhatIsGS.htm -#usr/share/doc/ghostscript/9.53.3/gdevds32.c -#usr/share/doc/ghostscript/9.53.3/gs-style.css -#usr/share/doc/ghostscript/9.53.3/images -#usr/share/doc/ghostscript/9.53.3/images/Artifex_logo.png -#usr/share/doc/ghostscript/9.53.3/images/favicon.png -#usr/share/doc/ghostscript/9.53.3/images/ghostscript_logo.png -#usr/share/doc/ghostscript/9.53.3/images/hamburger-light.png -#usr/share/doc/ghostscript/9.53.3/images/x-light.png -#usr/share/doc/ghostscript/9.53.3/index.html -#usr/share/doc/ghostscript/9.53.3/index.js -#usr/share/doc/ghostscript/9.53.3/pscet_status.txt -#usr/share/doc/ghostscript/9.53.3/sample_downscale_device.htm -#usr/share/doc/ghostscript/9.53.3/style.css -#usr/share/doc/ghostscript/9.53.3/subclass.htm -#usr/share/doc/ghostscript/9.53.3/thirdparty.htm +#usr/share/doc/ghostscript/9.54.0 +#usr/share/doc/ghostscript/9.54.0/API.htm +#usr/share/doc/ghostscript/9.54.0/C-style.htm +#usr/share/doc/ghostscript/9.54.0/COPYING +#usr/share/doc/ghostscript/9.54.0/Commprod.htm +#usr/share/doc/ghostscript/9.54.0/DLL.htm +#usr/share/doc/ghostscript/9.54.0/Deprecated.htm +#usr/share/doc/ghostscript/9.54.0/Develop.htm +#usr/share/doc/ghostscript/9.54.0/Devices.htm +#usr/share/doc/ghostscript/9.54.0/Drivers.htm +#usr/share/doc/ghostscript/9.54.0/Fonts.htm +#usr/share/doc/ghostscript/9.54.0/GS9_Color_Management.pdf +#usr/share/doc/ghostscript/9.54.0/History9.htm +#usr/share/doc/ghostscript/9.54.0/Install.htm +#usr/share/doc/ghostscript/9.54.0/Language.htm +#usr/share/doc/ghostscript/9.54.0/Lib.htm +#usr/share/doc/ghostscript/9.54.0/Make.htm +#usr/share/doc/ghostscript/9.54.0/News.htm +#usr/share/doc/ghostscript/9.54.0/Ps-style.htm +#usr/share/doc/ghostscript/9.54.0/Ps2epsi.htm +#usr/share/doc/ghostscript/9.54.0/Psfiles.htm +#usr/share/doc/ghostscript/9.54.0/Readme.htm +#usr/share/doc/ghostscript/9.54.0/Release.htm +#usr/share/doc/ghostscript/9.54.0/SavedPages.htm +#usr/share/doc/ghostscript/9.54.0/Source.htm +#usr/share/doc/ghostscript/9.54.0/Unix-lpr.htm +#usr/share/doc/ghostscript/9.54.0/Use.htm +#usr/share/doc/ghostscript/9.54.0/VectorDevices.htm +#usr/share/doc/ghostscript/9.54.0/WhatIsGS.htm +#usr/share/doc/ghostscript/9.54.0/gdevds32.c +#usr/share/doc/ghostscript/9.54.0/gs-style.css +#usr/share/doc/ghostscript/9.54.0/images +#usr/share/doc/ghostscript/9.54.0/images/Artifex_logo.png +#usr/share/doc/ghostscript/9.54.0/images/favicon.png +#usr/share/doc/ghostscript/9.54.0/images/ghostscript_logo.png +#usr/share/doc/ghostscript/9.54.0/images/hamburger-light.png +#usr/share/doc/ghostscript/9.54.0/images/x-light.png +#usr/share/doc/ghostscript/9.54.0/index.html +#usr/share/doc/ghostscript/9.54.0/index.js +#usr/share/doc/ghostscript/9.54.0/pscet_status.txt +#usr/share/doc/ghostscript/9.54.0/sample_downscale_device.htm +#usr/share/doc/ghostscript/9.54.0/style.css +#usr/share/doc/ghostscript/9.54.0/subclass.htm +#usr/share/doc/ghostscript/9.54.0/thirdparty.htm #usr/share/ghostscript -#usr/share/ghostscript/9.53.3 -#usr/share/ghostscript/9.53.3/lib -#usr/share/ghostscript/9.53.3/lib/PDFA_def.ps -#usr/share/ghostscript/9.53.3/lib/PDFX_def.ps -#usr/share/ghostscript/9.53.3/lib/PM760p.upp -#usr/share/ghostscript/9.53.3/lib/PM760pl.upp -#usr/share/ghostscript/9.53.3/lib/PM820p.upp -#usr/share/ghostscript/9.53.3/lib/PM820pl.upp -#usr/share/ghostscript/9.53.3/lib/Stc670p.upp -#usr/share/ghostscript/9.53.3/lib/Stc670pl.upp -#usr/share/ghostscript/9.53.3/lib/Stc680p.upp -#usr/share/ghostscript/9.53.3/lib/Stc680pl.upp -#usr/share/ghostscript/9.53.3/lib/Stc740p.upp -#usr/share/ghostscript/9.53.3/lib/Stc740pl.upp -#usr/share/ghostscript/9.53.3/lib/Stc760p.upp -#usr/share/ghostscript/9.53.3/lib/Stc760pl.upp -#usr/share/ghostscript/9.53.3/lib/Stc777p.upp -#usr/share/ghostscript/9.53.3/lib/Stc777pl.upp -#usr/share/ghostscript/9.53.3/lib/Stp720p.upp -#usr/share/ghostscript/9.53.3/lib/Stp720pl.upp -#usr/share/ghostscript/9.53.3/lib/Stp870p.upp -#usr/share/ghostscript/9.53.3/lib/Stp870pl.upp -#usr/share/ghostscript/9.53.3/lib/acctest.ps -#usr/share/ghostscript/9.53.3/lib/align.ps -#usr/share/ghostscript/9.53.3/lib/bj8.rpd -#usr/share/ghostscript/9.53.3/lib/bj8gc12f.upp -#usr/share/ghostscript/9.53.3/lib/bj8hg12f.upp -#usr/share/ghostscript/9.53.3/lib/bj8oh06n.upp -#usr/share/ghostscript/9.53.3/lib/bj8pa06n.upp -#usr/share/ghostscript/9.53.3/lib/bj8pp12f.upp -#usr/share/ghostscript/9.53.3/lib/bj8ts06n.upp -#usr/share/ghostscript/9.53.3/lib/bjc6000a1.upp -#usr/share/ghostscript/9.53.3/lib/bjc6000b1.upp -#usr/share/ghostscript/9.53.3/lib/bjc610a0.upp -#usr/share/ghostscript/9.53.3/lib/bjc610a1.upp -#usr/share/ghostscript/9.53.3/lib/bjc610a2.upp -#usr/share/ghostscript/9.53.3/lib/bjc610a3.upp -#usr/share/ghostscript/9.53.3/lib/bjc610a4.upp -#usr/share/ghostscript/9.53.3/lib/bjc610a5.upp -#usr/share/ghostscript/9.53.3/lib/bjc610a6.upp -#usr/share/ghostscript/9.53.3/lib/bjc610a7.upp -#usr/share/ghostscript/9.53.3/lib/bjc610a8.upp -#usr/share/ghostscript/9.53.3/lib/bjc610b1.upp -#usr/share/ghostscript/9.53.3/lib/bjc610b2.upp -#usr/share/ghostscript/9.53.3/lib/bjc610b3.upp -#usr/share/ghostscript/9.53.3/lib/bjc610b4.upp -#usr/share/ghostscript/9.53.3/lib/bjc610b6.upp -#usr/share/ghostscript/9.53.3/lib/bjc610b7.upp -#usr/share/ghostscript/9.53.3/lib/bjc610b8.upp -#usr/share/ghostscript/9.53.3/lib/caption.ps -#usr/share/ghostscript/9.53.3/lib/cbjc600.ppd -#usr/share/ghostscript/9.53.3/lib/cbjc800.ppd -#usr/share/ghostscript/9.53.3/lib/cdj550.upp -#usr/share/ghostscript/9.53.3/lib/cdj690.upp -#usr/share/ghostscript/9.53.3/lib/cdj690ec.upp -#usr/share/ghostscript/9.53.3/lib/cid2code.ps -#usr/share/ghostscript/9.53.3/lib/dnj750c.upp -#usr/share/ghostscript/9.53.3/lib/dnj750m.upp -#usr/share/ghostscript/9.53.3/lib/docie.ps -#usr/share/ghostscript/9.53.3/lib/font2pcl.ps -#usr/share/ghostscript/9.53.3/lib/ghostpdf.ppd -#usr/share/ghostscript/9.53.3/lib/gs_ce_e.ps -#usr/share/ghostscript/9.53.3/lib/gs_il2_e.ps -#usr/share/ghostscript/9.53.3/lib/gs_kanji.ps -#usr/share/ghostscript/9.53.3/lib/gs_ksb_e.ps -#usr/share/ghostscript/9.53.3/lib/gs_l.xbm -#usr/share/ghostscript/9.53.3/lib/gs_l.xpm -#usr/share/ghostscript/9.53.3/lib/gs_l_m.xbm -#usr/share/ghostscript/9.53.3/lib/gs_lgo_e.ps -#usr/share/ghostscript/9.53.3/lib/gs_lgx_e.ps -#usr/share/ghostscript/9.53.3/lib/gs_m.xbm -#usr/share/ghostscript/9.53.3/lib/gs_m.xpm -#usr/share/ghostscript/9.53.3/lib/gs_m_m.xbm -#usr/share/ghostscript/9.53.3/lib/gs_s.xbm -#usr/share/ghostscript/9.53.3/lib/gs_s.xpm -#usr/share/ghostscript/9.53.3/lib/gs_s_m.xbm -#usr/share/ghostscript/9.53.3/lib/gs_t.xbm -#usr/share/ghostscript/9.53.3/lib/gs_t.xpm -#usr/share/ghostscript/9.53.3/lib/gs_t_m.xbm -#usr/share/ghostscript/9.53.3/lib/gs_wl1_e.ps -#usr/share/ghostscript/9.53.3/lib/gs_wl2_e.ps -#usr/share/ghostscript/9.53.3/lib/gs_wl5_e.ps -#usr/share/ghostscript/9.53.3/lib/gslp.ps -#usr/share/ghostscript/9.53.3/lib/gsnup.ps -#usr/share/ghostscript/9.53.3/lib/ht_ccsto.ps -#usr/share/ghostscript/9.53.3/lib/image-qa.ps -#usr/share/ghostscript/9.53.3/lib/jispaper.ps -#usr/share/ghostscript/9.53.3/lib/landscap.ps -#usr/share/ghostscript/9.53.3/lib/lines.ps -#usr/share/ghostscript/9.53.3/lib/mkcidfm.ps -#usr/share/ghostscript/9.53.3/lib/necp2x.upp -#usr/share/ghostscript/9.53.3/lib/necp2x6.upp -#usr/share/ghostscript/9.53.3/lib/pdf2dsc.ps -#usr/share/ghostscript/9.53.3/lib/pdf_info.ps -#usr/share/ghostscript/9.53.3/lib/pf2afm.ps -#usr/share/ghostscript/9.53.3/lib/pfbtopfa.ps -#usr/share/ghostscript/9.53.3/lib/ppath.ps -#usr/share/ghostscript/9.53.3/lib/pphs.ps -#usr/share/ghostscript/9.53.3/lib/prfont.ps -#usr/share/ghostscript/9.53.3/lib/printafm.ps -#usr/share/ghostscript/9.53.3/lib/ps2ai.ps -#usr/share/ghostscript/9.53.3/lib/ps2epsi.ps -#usr/share/ghostscript/9.53.3/lib/ras1.upp -#usr/share/ghostscript/9.53.3/lib/ras24.upp -#usr/share/ghostscript/9.53.3/lib/ras3.upp -#usr/share/ghostscript/9.53.3/lib/ras32.upp -#usr/share/ghostscript/9.53.3/lib/ras4.upp -#usr/share/ghostscript/9.53.3/lib/ras8m.upp -#usr/share/ghostscript/9.53.3/lib/rollconv.ps -#usr/share/ghostscript/9.53.3/lib/s400a1.upp -#usr/share/ghostscript/9.53.3/lib/s400b1.upp -#usr/share/ghostscript/9.53.3/lib/sharp.upp -#usr/share/ghostscript/9.53.3/lib/sipixa6.upp -#usr/share/ghostscript/9.53.3/lib/st640ih.upp -#usr/share/ghostscript/9.53.3/lib/st640ihg.upp -#usr/share/ghostscript/9.53.3/lib/st640p.upp -#usr/share/ghostscript/9.53.3/lib/st640pg.upp -#usr/share/ghostscript/9.53.3/lib/st640pl.upp -#usr/share/ghostscript/9.53.3/lib/st640plg.upp -#usr/share/ghostscript/9.53.3/lib/stc.upp -#usr/share/ghostscript/9.53.3/lib/stc1520h.upp -#usr/share/ghostscript/9.53.3/lib/stc2.upp -#usr/share/ghostscript/9.53.3/lib/stc200_h.upp -#usr/share/ghostscript/9.53.3/lib/stc2_h.upp -#usr/share/ghostscript/9.53.3/lib/stc2s_h.upp -#usr/share/ghostscript/9.53.3/lib/stc300.upp -#usr/share/ghostscript/9.53.3/lib/stc300bl.upp -#usr/share/ghostscript/9.53.3/lib/stc300bm.upp -#usr/share/ghostscript/9.53.3/lib/stc500p.upp -#usr/share/ghostscript/9.53.3/lib/stc500ph.upp -#usr/share/ghostscript/9.53.3/lib/stc600ih.upp -#usr/share/ghostscript/9.53.3/lib/stc600p.upp -#usr/share/ghostscript/9.53.3/lib/stc600pl.upp -#usr/share/ghostscript/9.53.3/lib/stc640p.upp -#usr/share/ghostscript/9.53.3/lib/stc740ih.upp -#usr/share/ghostscript/9.53.3/lib/stc800ih.upp -#usr/share/ghostscript/9.53.3/lib/stc800p.upp -#usr/share/ghostscript/9.53.3/lib/stc800pl.upp -#usr/share/ghostscript/9.53.3/lib/stc_h.upp -#usr/share/ghostscript/9.53.3/lib/stc_l.upp -#usr/share/ghostscript/9.53.3/lib/stcany.upp -#usr/share/ghostscript/9.53.3/lib/stcany_h.upp -#usr/share/ghostscript/9.53.3/lib/stcinfo.ps -#usr/share/ghostscript/9.53.3/lib/stcolor.ps -#usr/share/ghostscript/9.53.3/lib/stocht.ps -#usr/share/ghostscript/9.53.3/lib/traceimg.ps -#usr/share/ghostscript/9.53.3/lib/traceop.ps -#usr/share/ghostscript/9.53.3/lib/uninfo.ps -#usr/share/ghostscript/9.53.3/lib/viewcmyk.ps -#usr/share/ghostscript/9.53.3/lib/viewgif.ps -#usr/share/ghostscript/9.53.3/lib/viewjpeg.ps -#usr/share/ghostscript/9.53.3/lib/viewmiff.ps -#usr/share/ghostscript/9.53.3/lib/viewpbm.ps -#usr/share/ghostscript/9.53.3/lib/viewpcx.ps -#usr/share/ghostscript/9.53.3/lib/viewps2a.ps -#usr/share/ghostscript/9.53.3/lib/winmaps.ps -#usr/share/ghostscript/9.53.3/lib/zeroline.ps +#usr/share/ghostscript/9.54.0 +#usr/share/ghostscript/9.54.0/lib +usr/share/ghostscript/9.54.0/lib/PDFA_def.ps +usr/share/ghostscript/9.54.0/lib/PDFX_def.ps +usr/share/ghostscript/9.54.0/lib/PM760p.upp +usr/share/ghostscript/9.54.0/lib/PM760pl.upp +usr/share/ghostscript/9.54.0/lib/PM820p.upp +usr/share/ghostscript/9.54.0/lib/PM820pl.upp +usr/share/ghostscript/9.54.0/lib/Stc670p.upp +usr/share/ghostscript/9.54.0/lib/Stc670pl.upp +usr/share/ghostscript/9.54.0/lib/Stc680p.upp +usr/share/ghostscript/9.54.0/lib/Stc680pl.upp +usr/share/ghostscript/9.54.0/lib/Stc740p.upp +usr/share/ghostscript/9.54.0/lib/Stc740pl.upp +usr/share/ghostscript/9.54.0/lib/Stc760p.upp +usr/share/ghostscript/9.54.0/lib/Stc760pl.upp +usr/share/ghostscript/9.54.0/lib/Stc777p.upp +usr/share/ghostscript/9.54.0/lib/Stc777pl.upp +usr/share/ghostscript/9.54.0/lib/Stp720p.upp +usr/share/ghostscript/9.54.0/lib/Stp720pl.upp +usr/share/ghostscript/9.54.0/lib/Stp870p.upp +usr/share/ghostscript/9.54.0/lib/Stp870pl.upp +usr/share/ghostscript/9.54.0/lib/acctest.ps +usr/share/ghostscript/9.54.0/lib/align.ps +usr/share/ghostscript/9.54.0/lib/bj8.rpd +usr/share/ghostscript/9.54.0/lib/bj8gc12f.upp +usr/share/ghostscript/9.54.0/lib/bj8hg12f.upp +usr/share/ghostscript/9.54.0/lib/bj8oh06n.upp +usr/share/ghostscript/9.54.0/lib/bj8pa06n.upp +usr/share/ghostscript/9.54.0/lib/bj8pp12f.upp +usr/share/ghostscript/9.54.0/lib/bj8ts06n.upp +usr/share/ghostscript/9.54.0/lib/bjc6000a1.upp +usr/share/ghostscript/9.54.0/lib/bjc6000b1.upp +usr/share/ghostscript/9.54.0/lib/bjc610a0.upp +usr/share/ghostscript/9.54.0/lib/bjc610a1.upp +usr/share/ghostscript/9.54.0/lib/bjc610a2.upp +usr/share/ghostscript/9.54.0/lib/bjc610a3.upp +usr/share/ghostscript/9.54.0/lib/bjc610a4.upp +usr/share/ghostscript/9.54.0/lib/bjc610a5.upp +usr/share/ghostscript/9.54.0/lib/bjc610a6.upp +usr/share/ghostscript/9.54.0/lib/bjc610a7.upp +usr/share/ghostscript/9.54.0/lib/bjc610a8.upp +usr/share/ghostscript/9.54.0/lib/bjc610b1.upp +usr/share/ghostscript/9.54.0/lib/bjc610b2.upp +usr/share/ghostscript/9.54.0/lib/bjc610b3.upp +usr/share/ghostscript/9.54.0/lib/bjc610b4.upp +usr/share/ghostscript/9.54.0/lib/bjc610b6.upp +usr/share/ghostscript/9.54.0/lib/bjc610b7.upp +usr/share/ghostscript/9.54.0/lib/bjc610b8.upp +usr/share/ghostscript/9.54.0/lib/caption.ps +usr/share/ghostscript/9.54.0/lib/cbjc600.ppd +usr/share/ghostscript/9.54.0/lib/cbjc800.ppd +usr/share/ghostscript/9.54.0/lib/cdj550.upp +usr/share/ghostscript/9.54.0/lib/cdj690.upp +usr/share/ghostscript/9.54.0/lib/cdj690ec.upp +usr/share/ghostscript/9.54.0/lib/cid2code.ps +usr/share/ghostscript/9.54.0/lib/dnj750c.upp +usr/share/ghostscript/9.54.0/lib/dnj750m.upp +usr/share/ghostscript/9.54.0/lib/docie.ps +usr/share/ghostscript/9.54.0/lib/font2pcl.ps +usr/share/ghostscript/9.54.0/lib/ghostpdf.ppd +usr/share/ghostscript/9.54.0/lib/gs_ce_e.ps +usr/share/ghostscript/9.54.0/lib/gs_css_e.ps +usr/share/ghostscript/9.54.0/lib/gs_il2_e.ps +usr/share/ghostscript/9.54.0/lib/gs_kanji.ps +usr/share/ghostscript/9.54.0/lib/gs_ksb_e.ps +usr/share/ghostscript/9.54.0/lib/gs_l.xbm +usr/share/ghostscript/9.54.0/lib/gs_l.xpm +usr/share/ghostscript/9.54.0/lib/gs_l_m.xbm +usr/share/ghostscript/9.54.0/lib/gs_lgo_e.ps +usr/share/ghostscript/9.54.0/lib/gs_lgx_e.ps +usr/share/ghostscript/9.54.0/lib/gs_m.xbm +usr/share/ghostscript/9.54.0/lib/gs_m.xpm +usr/share/ghostscript/9.54.0/lib/gs_m_m.xbm +usr/share/ghostscript/9.54.0/lib/gs_s.xbm +usr/share/ghostscript/9.54.0/lib/gs_s.xpm +usr/share/ghostscript/9.54.0/lib/gs_s_m.xbm +usr/share/ghostscript/9.54.0/lib/gs_t.xbm +usr/share/ghostscript/9.54.0/lib/gs_t.xpm +usr/share/ghostscript/9.54.0/lib/gs_t_m.xbm +usr/share/ghostscript/9.54.0/lib/gs_wl1_e.ps +usr/share/ghostscript/9.54.0/lib/gs_wl2_e.ps +usr/share/ghostscript/9.54.0/lib/gs_wl5_e.ps +usr/share/ghostscript/9.54.0/lib/gslp.ps +usr/share/ghostscript/9.54.0/lib/gsnup.ps +usr/share/ghostscript/9.54.0/lib/ht_ccsto.ps +usr/share/ghostscript/9.54.0/lib/image-qa.ps +usr/share/ghostscript/9.54.0/lib/jispaper.ps +usr/share/ghostscript/9.54.0/lib/landscap.ps +usr/share/ghostscript/9.54.0/lib/lines.ps +usr/share/ghostscript/9.54.0/lib/mkcidfm.ps +usr/share/ghostscript/9.54.0/lib/necp2x.upp +usr/share/ghostscript/9.54.0/lib/necp2x6.upp +usr/share/ghostscript/9.54.0/lib/pdf2dsc.ps +usr/share/ghostscript/9.54.0/lib/pdf_info.ps +usr/share/ghostscript/9.54.0/lib/pf2afm.ps +usr/share/ghostscript/9.54.0/lib/pfbtopfa.ps +usr/share/ghostscript/9.54.0/lib/ppath.ps +usr/share/ghostscript/9.54.0/lib/pphs.ps +usr/share/ghostscript/9.54.0/lib/prfont.ps +usr/share/ghostscript/9.54.0/lib/printafm.ps +usr/share/ghostscript/9.54.0/lib/ps2ai.ps +usr/share/ghostscript/9.54.0/lib/ps2epsi.ps +usr/share/ghostscript/9.54.0/lib/ras1.upp +usr/share/ghostscript/9.54.0/lib/ras24.upp +usr/share/ghostscript/9.54.0/lib/ras3.upp +usr/share/ghostscript/9.54.0/lib/ras32.upp +usr/share/ghostscript/9.54.0/lib/ras4.upp +usr/share/ghostscript/9.54.0/lib/ras8m.upp +usr/share/ghostscript/9.54.0/lib/rollconv.ps +usr/share/ghostscript/9.54.0/lib/s400a1.upp +usr/share/ghostscript/9.54.0/lib/s400b1.upp +usr/share/ghostscript/9.54.0/lib/sharp.upp +usr/share/ghostscript/9.54.0/lib/sipixa6.upp +usr/share/ghostscript/9.54.0/lib/st640ih.upp +usr/share/ghostscript/9.54.0/lib/st640ihg.upp +usr/share/ghostscript/9.54.0/lib/st640p.upp +usr/share/ghostscript/9.54.0/lib/st640pg.upp +usr/share/ghostscript/9.54.0/lib/st640pl.upp +usr/share/ghostscript/9.54.0/lib/st640plg.upp +usr/share/ghostscript/9.54.0/lib/stc.upp +usr/share/ghostscript/9.54.0/lib/stc1520h.upp +usr/share/ghostscript/9.54.0/lib/stc2.upp +usr/share/ghostscript/9.54.0/lib/stc200_h.upp +usr/share/ghostscript/9.54.0/lib/stc2_h.upp +usr/share/ghostscript/9.54.0/lib/stc2s_h.upp +usr/share/ghostscript/9.54.0/lib/stc300.upp +usr/share/ghostscript/9.54.0/lib/stc300bl.upp +usr/share/ghostscript/9.54.0/lib/stc300bm.upp +usr/share/ghostscript/9.54.0/lib/stc500p.upp +usr/share/ghostscript/9.54.0/lib/stc500ph.upp +usr/share/ghostscript/9.54.0/lib/stc600ih.upp +usr/share/ghostscript/9.54.0/lib/stc600p.upp +usr/share/ghostscript/9.54.0/lib/stc600pl.upp +usr/share/ghostscript/9.54.0/lib/stc640p.upp +usr/share/ghostscript/9.54.0/lib/stc740ih.upp +usr/share/ghostscript/9.54.0/lib/stc800ih.upp +usr/share/ghostscript/9.54.0/lib/stc800p.upp +usr/share/ghostscript/9.54.0/lib/stc800pl.upp +usr/share/ghostscript/9.54.0/lib/stc_h.upp +usr/share/ghostscript/9.54.0/lib/stc_l.upp +usr/share/ghostscript/9.54.0/lib/stcany.upp +usr/share/ghostscript/9.54.0/lib/stcany_h.upp +usr/share/ghostscript/9.54.0/lib/stcinfo.ps +usr/share/ghostscript/9.54.0/lib/stcolor.ps +usr/share/ghostscript/9.54.0/lib/stocht.ps +usr/share/ghostscript/9.54.0/lib/traceimg.ps +usr/share/ghostscript/9.54.0/lib/traceop.ps +usr/share/ghostscript/9.54.0/lib/uninfo.ps +usr/share/ghostscript/9.54.0/lib/viewcmyk.ps +usr/share/ghostscript/9.54.0/lib/viewgif.ps +usr/share/ghostscript/9.54.0/lib/viewjpeg.ps +usr/share/ghostscript/9.54.0/lib/viewmiff.ps +usr/share/ghostscript/9.54.0/lib/viewpbm.ps +usr/share/ghostscript/9.54.0/lib/viewpcx.ps +usr/share/ghostscript/9.54.0/lib/viewps2a.ps +usr/share/ghostscript/9.54.0/lib/winmaps.ps +usr/share/ghostscript/9.54.0/lib/zeroline.ps #usr/share/ghostscript/fonts #usr/share/ghostscript/fonts/COPYING #usr/share/ghostscript/fonts/ChangeLog diff --git a/lfs/ghostscript b/lfs/ghostscript index 696f95b29..1ee14a16e 100644 --- a/lfs/ghostscript +++ b/lfs/ghostscript @@ -24,7 +24,7 @@ include Config -VER = 9.53.3 +VER = 9.54.0 THISAPP = ghostscript-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ghostscript -PAK_VER = 7 +PAK_VER = 8 DEPS = cups dbus libtiff @@ -48,7 +48,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) ghostscript-fonts-std-8.11.tar.gz = $(URL_IPFIRE)/ghostscript-fonts-std-8.11.tar.gz gnu-gs-fonts-other-6.0.tar.gz = $(URL_IPFIRE)/gnu-gs-fonts-other-6.0.tar.gz -$(DL_FILE)_MD5 = bf0b41d6e19fdeb4b050afad309248d2 +$(DL_FILE)_MD5 = 72535d31018129a1a8ff636a47ba1f92 ghostscript-fonts-std-8.11.tar.gz_MD5 = 6865682b095f8c4500c54b285ff05ef6 gnu-gs-fonts-other-6.0.tar.gz_MD5 = 33457d3f37de7ef03d2eea05a9e6aa4f @@ -83,7 +83,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch cd $(DIR_APP) && rm -rf expat freetype icclib jasper jpeg jpegxr \ lcms lcms2 libpng openjpeg zlib cups/libs cd $(DIR_APP) && \ diff --git a/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch b/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch deleted file mode 100644 index 78014667d..000000000 --- a/src/patches/ghostscript-drop-use-of-FT_CALLBACK_DEF-with-Freetype-2.10.3-and-later.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 41ef9a0bc36b9db7115fbe9623f989bfb47bbade Mon Sep 17 00:00:00 2001 -From: Chris Liddell -Date: Tue, 20 Oct 2020 09:49:45 +0100 -Subject: [PATCH] Bug 702985: drop use of FT_CALLBACK_DEF() def - -From 2.10.3, Freetype disappeared the FT_CALLBACK_DEF() macro, which is what -we used when defining our callbacks from Freetype. - -No guidance forthcoming from the Freetype developer who made those changes, -so change to explicitly declaring the callbacks file static. - -Should fix the reported build failures. ---- - base/fapi_ft.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/base/fapi_ft.c b/base/fapi_ft.c -index 65fa6dcf4..21aef2f06 100644 ---- a/base/fapi_ft.c -+++ b/base/fapi_ft.c -@@ -125,7 +125,7 @@ static void - delete_inc_int_info(gs_fapi_server * a_server, - FT_IncrementalRec * a_inc_int_info); - --FT_CALLBACK_DEF(void *) -+static void * - FF_alloc(FT_Memory memory, long size) - { - gs_memory_t *mem = (gs_memory_t *) memory->user; -@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size) - return (gs_malloc(mem, size, 1, "FF_alloc")); - } - --FT_CALLBACK_DEF(void *) -+static void * - FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block) - { - gs_memory_t *mem = (gs_memory_t *) memory->user; -@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *) - return (tmp); - } - --FT_CALLBACK_DEF(void) -+static void - FF_free(FT_Memory memory, void *block) - { - gs_memory_t *mem = (gs_memory_t *) memory->user; --- -2.17.1 - From b6eb1746c6790abe99eebda4c34e6533d169996f Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Wed, 30 Jun 2021 19:46:50 +0200 Subject: [PATCH 008/306] intltool: Update to version 0.51.0 - Update from 0.40.5 (2008) to 0.51.0 (2015 - latest release) - Update of rootfile3 not required - Changelog is too long to include here Changes from version 0.41.0 to 0.51.0 can be found at https://launchpad.net/intltool/+download and in the ChangeLog files in the Source Tarballs Changes prior to 0.41.0 can be found at https://download.gnome.org/sources/intltool/ in the ChangeLog files in the Source Tarballs Signed-off-by: Adolf Belka Signed-off-by: Arne Fitzenreiter --- lfs/intltool | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lfs/intltool b/lfs/intltool index 234262f62..bc5008a52 100644 --- a/lfs/intltool +++ b/lfs/intltool @@ -24,15 +24,15 @@ include Config -VER = 0.40.5 +VER = 0.51.0 THISAPP = intltool-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = intltool -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3e7ded6f50d88cf8b8bb505eaf591775 +$(DL_FILE)_MD5 = 12e517cac2b57a0121cda351570f1e63 install : $(TARGET) @@ -77,7 +77,7 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install From b89454b52a0f29cb4336c1e57f6a856cfa16fb3c Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Wed, 30 Jun 2021 19:47:07 +0200 Subject: [PATCH 009/306] iperf3: Update to version 3.10.1 - Update from 3.9 to 3.10.1 - Update of rootfile not required - Changelog iperf-3.10.1 2021-06-03 * Notable user-visible changes * Fixed a problem with autoconf scripts that made builds fail in some environments (#1154 / #1155). * Developer-visible changes * GNU autoconf 2.71 or newer is now required to regenerate iperf3's configure scripts. iperf 3.10 2021-05-26 * Notable user-visible changes * Fix a bug where some --reverse tests didn't terminate (#982 / #1054). * Responsiveness of control connections is slightly improved (#1045 / #1046 / #1063). * The allowable clock skew when doing authentication between client and server is now configurable with the new --time-skew-threshold (#1065 / #1070). * Bitrate throttling using the -b option now works when a burst size is specified (#1090). * A bug with calculating CPU utilization has been fixed (#1076 / #1077). * A --bind-dev option to support binding sockets to a given network interface has been added to make iperf3 work better with multi-homed machines and/or VRFs (#817 / #1089 / #1097). * --pidfile now works with --client mode (#1110). * The server is now less likely to get stuck due to network errors (#1101, #1125), controlled by the new --rcv-timeout option. * Fixed a few bugs in termination conditions for byte or block-limited tests (#1113, #1114, #1115). * Added tcp_info.snd_wnd to JSON output (#1148). * Some bugs with garbled JSON output have been fixed (#1086, #1118, #1143 / #1146). * Support for setting the IPv4 don't-fragment (DF) bit has been added with the new --dont-fragment option (#1119). * A failure with not being able to read the congestion control algorithm under WSL1 has been fixed (#1061 / #1126). * Error handling and error messages now make more sense in cases where sockets were not successfully opened (#1129 / #1132 / #1136, #1135 / #1138, #1128 / #1139). * Some buffer overflow hazards were fixed (#1134). * Notable developer-visible changes * It is now possible to use the API to set/get the congestion control algorithm (#1036 / #1112). Signed-off-by: Adolf Belka Signed-off-by: Arne Fitzenreiter --- lfs/iperf3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/iperf3 b/lfs/iperf3 index e40feaed8..ba3b1b942 100644 --- a/lfs/iperf3 +++ b/lfs/iperf3 @@ -24,7 +24,7 @@ include Config -VER = 3.9 +VER = 3.10.1 THISAPP = iperf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = iperf3 -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 510fdb0943e88da5e0063f4599fa14f3 +$(DL_FILE)_MD5 = 9c981555af2eb9479135c5247c30d2ca install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) From 21b37391f9769718df7bd726453140f4ec8ff1c0 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Wed, 30 Jun 2021 20:40:31 +0200 Subject: [PATCH 010/306] Firewall: Proper allow to create REDIRECT rules. This patch now proper allows to create rules for redirecting requests of a given host, group or network(s) to a specified port or service to the local IPFire system. So it implements a very generic and easy to use feature to redirect (for example all DNS, NTP, or whatever) requests to the a local running instance and so to force usage of that local hosted service. * The feature supports specifiying a single port and redirect the requests to another given one. ( For example requests to UDP 123 can be redirected to local UDP 1234 if you run an NTP server on that port.) * It also supports direct usage of services or even service groups. ( So you can create a service group for DNS and redirect them to the local recursor, or create a "redirected services" group which easily can be managed...) Signed-off-by: Stefan Schantl Signed-off-by: Arne Fitzenreiter --- config/firewall/rules.pl | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index bc6187052..0dd1c9024 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -449,16 +449,28 @@ sub buildrules { my @nat_protocol_options = &get_protocol_options($hash, $key, $protocol, 1); push(@nat_options, @nat_protocol_options); } + + # Add time options. push(@nat_options, @time_options); + # Determine if a REDIRECT rule should be created. + my $use_redirect = ($destination_is_firewall && !$destination && $protocol_has_ports); + # Make port-forwardings useable from the internal networks. - my @internal_addresses = &fwlib::get_internal_firewall_ip_addresses(1); - unless ($nat_address ~~ @internal_addresses) { - &add_dnat_mangle_rules($nat_address, $source_intf, @nat_options); + if (!$use_redirect) { + my @internal_addresses = &fwlib::get_internal_firewall_ip_addresses(1); + unless ($nat_address ~~ @internal_addresses) { + &add_dnat_mangle_rules($nat_address, $source_intf, @nat_options); + } } + # Add source options. push(@nat_options, @source_options); - push(@nat_options, ("-d", $nat_address)); + + # Add NAT address. + if (!$use_redirect) { + push(@nat_options, ("-d", $nat_address)); + } my $dnat_port; if ($protocol_has_ports) { @@ -468,9 +480,13 @@ sub buildrules { my @nat_action_options = (); # Use iptables REDIRECT - my $use_redirect = ($destination_is_firewall && !$destination && $protocol_has_ports && $dnat_port); if ($use_redirect) { - push(@nat_action_options, ("-j", "REDIRECT", "--to-ports", $dnat_port)); + push(@nat_action_options, ("-j", "REDIRECT")); + + # Redirect to specified port if one has given. + if ($dnat_port) { + push(@nat_action_options, ("--to-ports", $dnat_port)); + } # Use iptables DNAT } else { From a2ede2ed2ae5cc74e6d0b457a489e1ec5b1156c0 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 16 Aug 2021 06:21:43 +0000 Subject: [PATCH 011/306] core160: add rules.pl Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/160/filelists/files b/config/rootfiles/core/160/filelists/files index e68e90a52..36600adf0 100644 --- a/config/rootfiles/core/160/filelists/files +++ b/config/rootfiles/core/160/filelists/files @@ -1,2 +1,3 @@ +usr/lib/firewall/rules.pl srv/web/ipfire/cgi-bin/fwhosts.cgi var/ipfire/general-functions.pl From c0766d8abbce8b2c2066ba828595d017a9cd76a0 Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Thu, 1 Jul 2021 23:25:32 +0200 Subject: [PATCH 012/306] sqlite: Update to version 3360000 - Update from 3350500 to 3360000 - Update of rootfile not required - Changelog Improvement to the EXPLAIN QUERY PLAN output to make it easier to understand. Byte-order marks at the start of a token are skipped as if they were whitespace. An error is raised on any attempt to access the rowid of a VIEW or subquery. Formerly, the rowid of a VIEW would be indeterminate and often would be NULL. The -DSQLITE_ALLOW_ROWID_IN_VIEW compile-time option is available to restore the legacy behavior for applications that need it. The sqlite3_deserialize() and sqlite3_serialize() interfaces are now enabled by default. The -DSQLITE_ENABLE_DESERIALIZE compile-time option is no longer required. Instead, there is is a new -DSQLITE_OMIT_DESERIALIZE compile-time option to omit those interfaces. The "memdb" VFS now allows the same in-memory database to be shared among multiple database connections in the same process as long as the database name begins with "/". Back out the EXISTS-to-IN optimization (item 8b in the SQLite 3.35.0 change log) as it was found to slow down queries more often than speed them up. Improve the constant-propagation optimization so that it works on non-join queries. The REGEXP extension is now included in CLI builds. Signed-off-by: Adolf Belka Signed-off-by: Arne Fitzenreiter --- lfs/sqlite | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/sqlite b/lfs/sqlite index a68bf462b..04eada9d8 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -24,7 +24,7 @@ include Config -VER = 3350500 +VER = 3360000 THISAPP = sqlite-autoconf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d1d1aba394c8e0443077dc9f1a681bb8 +$(DL_FILE)_MD5 = f5752052fc5b8e1b539af86a3671eac7 install : $(TARGET) From 803603bba3f5447902f48512c3c57f8a99e99188 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 16 Aug 2021 06:25:43 +0000 Subject: [PATCH 013/306] core160: add sqlite Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/filelists/sqlite | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/160/filelists/sqlite diff --git a/config/rootfiles/core/160/filelists/sqlite b/config/rootfiles/core/160/filelists/sqlite new file mode 120000 index 000000000..4ea569766 --- /dev/null +++ b/config/rootfiles/core/160/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file From fb9e027b986aacbf927d2e73d83c801fe834a97b Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Thu, 1 Jul 2021 23:25:48 +0200 Subject: [PATCH 014/306] Text-Tabs+Wrap: Update to 2013.0523 - Update from 2005.0824 to 2013.0523 - latest version - Update of rootfile required - Changelog = 2013/05/23 Change module 'NAME' = 2013/05/22 Typos = 2013/04/26 Minor test suite fixes - bug 81698. Fixed bug 79766 -- an extraneous "=" in a regex. Changed the license to qualify as an "open source" license. = 2012/08/18 Packaging fix. Minor documentation fixes. = 2012/08/15 Minor fixes to test suites. Added back versions to support old versions of perl. = 2009/04/17 Added support for Unicode combining characters to both Text::Tabs and Text::Wrap, plus a new test suite for each of these new functionalities. --tchrist = 2009/03/05 Test improvements from Dave Mitchel sent back in 2005... Added code to increase $columns if it's not big enough to accommodate the subsequent tab. Minor documentation fixes from David Landgren . Use warnings::warnif instead of just warn for columns < 2. Appled per request of Rafael Garcia-Suarez . = 2006/11/17 Text::Tabs can handle newlines now so the BUGS section has been removed per request from Aristotle Pagaltzis. = 2006/07/11 Further bomb-proofing to pass more tests: Dan Jacobson found another way to generate a "this shouldn't happen". = 2006/07/05 Made documentation and code changes to address perlbug: https://rt.perl.org/rt3/Ticket/Display.html?id=30229 Added in changes from the distributed-with-perl version. This took care of perlbug: https://rt.perl.org/rt3/Ticket/Display.html?id=34902 It also took care of suggestion from Matthijs Bomhoff . Made documentation changes (added EXAMPLES) as per a suggestion from Gabor Blasko belg4mit at MIT dot EDU reported that $columns==1 die'd. No longer. Added tests for each bug report. Signed-off-by: Adolf Belka Signed-off-by: Arne Fitzenreiter --- config/rootfiles/common/Text-Tabs+Wrap | 6 ++++-- lfs/Text-Tabs+Wrap | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/Text-Tabs+Wrap b/config/rootfiles/common/Text-Tabs+Wrap index 00e0a3812..9c6449ec3 100644 --- a/config/rootfiles/common/Text-Tabs+Wrap +++ b/config/rootfiles/common/Text-Tabs+Wrap @@ -1,2 +1,4 @@ -#usr/lib/perl5/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Text -#usr/lib/perl5/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Text/.packlist +#usr/lib/perl5/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Text-Wrap +#usr/lib/perl5/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Text-Wrap/.packlist +#usr/share/man/man3/modern::Text::Tabs.3 +#usr/share/man/man3/modern::Text::Wrap.3 diff --git a/lfs/Text-Tabs+Wrap b/lfs/Text-Tabs+Wrap index 68f8662b0..9cdbe0412 100644 --- a/lfs/Text-Tabs+Wrap +++ b/lfs/Text-Tabs+Wrap @@ -24,7 +24,7 @@ include Config -VER = 2005.0824 +VER = 2013.0523 THISAPP = Text-Tabs+Wrap-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 99c061630027de809beca99d0b71f689 +$(DL_FILE)_MD5 = 3e421ed3810803512af8d13bad548993 install : $(TARGET) From a66e5d3c7b30e15f3354f998c8baf69004c20806 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 16 Aug 2021 06:29:30 +0000 Subject: [PATCH 015/306] core160: add Text-Tabs+Wrap Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/filelists/Text-Tabs+Wrap | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/160/filelists/Text-Tabs+Wrap diff --git a/config/rootfiles/core/160/filelists/Text-Tabs+Wrap b/config/rootfiles/core/160/filelists/Text-Tabs+Wrap new file mode 120000 index 000000000..71d20ed34 --- /dev/null +++ b/config/rootfiles/core/160/filelists/Text-Tabs+Wrap @@ -0,0 +1 @@ +../../../common/Text-Tabs+Wrap \ No newline at end of file From 4a5312694593f905b65c37167d53fdb5570c385f Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Thu, 1 Jul 2021 23:26:04 +0200 Subject: [PATCH 016/306] traceroute: Update to version 2.1.0 - Update from 2.0.18 (2011) to 2.1.0 (2016 - latest version) - Update of rootfile not required - Changelog 2016-03-08 Dmitry Butskoy - 2.1.0 * Improve the main loop for better interactivity. Instead of waiting silently for maximum expiration time of probes in progress, use timeout of the first probe (which will be printed first from now) only. * Speedup wait mechanism. Traditional traceroute implementation always waited the whole timeout for any probe. But if we already have some replies from the same hop, or even from some next hop, we can use the round trip time of such a reply as a hint to determine the actual reasonable amount of time to wait. Now the `-w' option has a form of three (in general) float values separated by a comma (or a slash): `-w MAX_SECS,HERE,NEAR' . (last two are optional). MAX_SECS specifies the maximum time (in seconds) to wait, in any case. The optional HERE specifies a factor to multiply the round trip time of an already received response from the same hop. The resulting value is used as a timeout for the probe, instead of (but no more than) MAX_SECS. The optional NEAR specifies a similar factor for a response from some next hop. The time of the first found result is used in both cases. First, we look for the same hop (of the probe which will be printed first from now). If nothing found, then look for some next hop. If nothing found, use MAX_SECS. If HERE and/or NEAR have zero values, the corresponding computation is skipped. HERE and NEAR are always set to zero if only MAX_SECS is specified (which provides compatibility with previous versions). Thus, if your scripts use `-w SECS', then nothing changed for you, since the lonely SECS implies `-w SECS,0,0' . Defaults are 5.0 seconds for MAX_SECS, 3.0 times for HERE and 10.0 times for NEAR. Certainly, the new algorithm can lead to premature expiry (especially when response times differ at times) and printing "*" instead of a time. Anyway, you can always switch this algorithm off, just by specifying `-w' with the desired timeout only (fe. `-w 5'). We continue to wait whole MAX_SECS when one probe per time must be sent (`--sport', `-P proto'), because it seems more harmful rather than helpful to try to wait less in such cases. To provide compatibility with 2.0.x versions, use: traceroute -w 5 (or any other desired `-w' value). * Hint people to use the system traceroute(8) instead of tcptraceroute wrapper (by providing a stderr header). The using of this wrapper is a little bit harmful, since it has less possibilities and a little different set of options. For those who are used to use tcptraceroute in cmdline, just create a link with that name to the system traceroute. When invoked as "tcp*", it then behaves as `traceroute -T'. (The simple manual page added for this case in the wrapper subdir). The original tcptraceroute had some options differ ("lpNSAE"), but they was rare used. Most common "dnFifmqwst" was just the same. Therefore it should be painless to use the system binary directly, instead of the limited wrapper (which is still provided indeed). 2016-02-15 Dmitry Butskoy - 2.0.22 * Some portability fixing and improvements (Felix Janda) * Require clear numbers for options and arguments (Sergey Salnikov) * Drop compilation date from the version string (Debian #774365) * New tcp module option `reuse', which utilize SO_REUSEADDR to reuse local port numbers for the huge workloads (Richard Sheehan) * Avoid poll(2) call with spurious zero timeout in some rare cases by rounding the value properly using ceil(3) 2014-11-12 Dmitry Butskoy - 2.0.21 * Fix `--mtu' and `-F' working on kernels >= 3.13 * Some manual page improving (Christopher Mann) 2014-06-14 Dmitry Butskoy - 2.0.20 * Describe all complementary long options in the man page (Jan Synacek) * Use correct service name for AS lookups (Frederic Mangano) * Avoid some rare case null dereference (geogriffin@jsgriff.com) * Improve expiration check for simultaneous probes 2012-11-19 Dmitry Butskoy - 2.0.19 * DCCP protocol support (rfc4340), by Samuel Jero Use "-D" option for it (the protocol-specific options are available too). * Update COPYING and COPYING.LIB license files to the latest published ones (due to FSF address changes etc.) (Jan Synacek) * Add mention of "-l" option to manual (Filip Holec) Signed-off-by: Adolf Belka Signed-off-by: Arne Fitzenreiter --- lfs/traceroute | 6 +++--- ...te-2.0.18-ipfire.patch => traceroute-2.1.0-ipfire.patch} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename src/patches/{traceroute-2.0.18-ipfire.patch => traceroute-2.1.0-ipfire.patch} (100%) diff --git a/lfs/traceroute b/lfs/traceroute index 87157ff42..0ec14538e 100644 --- a/lfs/traceroute +++ b/lfs/traceroute @@ -24,7 +24,7 @@ include Config -VER = 2.0.18 +VER = 2.1.0 THISAPP = traceroute-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = traceroute -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b7254149b7f081cce07f4b9e065ba5ef +$(DL_FILE)_MD5 = 84d329d67abc3fb83fc8cb12aeaddaba install : $(TARGET) diff --git a/src/patches/traceroute-2.0.18-ipfire.patch b/src/patches/traceroute-2.1.0-ipfire.patch similarity index 100% rename from src/patches/traceroute-2.0.18-ipfire.patch rename to src/patches/traceroute-2.1.0-ipfire.patch From bacde6d9c11ef0fba82044fc64c11477ae146c5d Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sun, 4 Jul 2021 15:38:55 +0200 Subject: [PATCH 017/306] suricata: Update to 5.0.7 For details see: https://forum.suricata.io/t/suricata-6-0-3-and-5-0-7-released/1489 and https://redmine.openinfosecfoundation.org/versions/166 Signed-off-by: Matthias Fischer Acked-by: Stefan Schantl Signed-off-by: Arne Fitzenreiter --- lfs/suricata | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/suricata b/lfs/suricata index 19038e7c4..c7f189bf4 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -24,7 +24,7 @@ include Config -VER = 5.0.6 +VER = 5.0.7 THISAPP = suricata-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 82d80b4b3179315bf6f5695c6437ee1f +$(DL_FILE)_MD5 = f6ff77e4dcf8035853209ceeba9b530c install : $(TARGET) From 1cfbca8e69935af759f23d71c8005aacd4f9d7cd Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sun, 4 Jul 2021 15:38:56 +0200 Subject: [PATCH 018/306] libhtp: Update to 5.0.38 For details see: https://github.com/OISF/libhtp/releases/tag/0.5.38 Signed-off-by: Matthias Fischer Acked-by: Stefan Schantl Signed-off-by: Arne Fitzenreiter --- lfs/libhtp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/libhtp b/lfs/libhtp index e21db73a9..242953254 100644 --- a/lfs/libhtp +++ b/lfs/libhtp @@ -24,7 +24,7 @@ include Config -VER = 0.5.37 +VER = 0.5.38 THISAPP = libhtp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ccc2f25ab3c1db53a22034280f1600dd +$(DL_FILE)_MD5 = 4d3bee196a8adcb10bfd874ec6bd9ca0 install : $(TARGET) From fe16865fb2e4e163a837975e10ffc0d45807c289 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 16 Aug 2021 06:49:13 +0000 Subject: [PATCH 019/306] core160: add suricata and libhtp Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/filelists/libhtp | 1 + config/rootfiles/core/160/filelists/suricata | 1 + 2 files changed, 2 insertions(+) create mode 120000 config/rootfiles/core/160/filelists/libhtp create mode 120000 config/rootfiles/core/160/filelists/suricata diff --git a/config/rootfiles/core/160/filelists/libhtp b/config/rootfiles/core/160/filelists/libhtp new file mode 120000 index 000000000..676e2c5e8 --- /dev/null +++ b/config/rootfiles/core/160/filelists/libhtp @@ -0,0 +1 @@ +../../../common/libhtp \ No newline at end of file diff --git a/config/rootfiles/core/160/filelists/suricata b/config/rootfiles/core/160/filelists/suricata new file mode 120000 index 000000000..f671f6993 --- /dev/null +++ b/config/rootfiles/core/160/filelists/suricata @@ -0,0 +1 @@ +../../../common/suricata \ No newline at end of file From c175e589461454ad35b1a90b409bc28ea94c9d25 Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Thu, 8 Jul 2021 13:42:51 +0200 Subject: [PATCH 020/306] iproute2: Update to version 5.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update from 5.12.0 to 5.13.0 - Update of rootfile not required - Changelog is not available in source tarball and not on source website Below info obtained from the commits from the git repository devlink: Fix printf() type mismatches on 32-bit architectures Ben Hutchings utils: Fix BIT() to support up to 64 bits on all architectures Ben Hutchings uapi: update headers to 5.13 Stephen Hemminger devlink: Fix link errors on some systems Roi Dayan tc: pedit: add decrement operation Asbjørn Sloth Tønnesen tc: pedit: parse_cmd: add flags argument Asbjørn Sloth Tønnesen iplink: support for WWAN devices Sergey Ryazanov iplink: add support for parent device Sergey Ryazanov Import wwan.h uapi file David Ahern man: fix syntax for ip link property Stephen Hemminger seg6: add support for SRv6 End.DT46 Behavior Paolo Lungaroni Update kernel headers David Ahern utils: bump max args number to 512 for batch files Guillaume Nault uapi: update kernel headers to 5.13-rc6 Stephen Hemminger Merge branch 'devlink-rate-support' into next David Ahern devlink: Add ISO/IEC switch Dmytro Linkin devlink: Add port func rate support Dmytro Linkin devlink: Add helper function to validate object handler Dmytro Linkin Update kernel headers David Ahern devlink: Add optional controller user input Parav Pandit police: Add support for json output Roi Dayan tc: fq: add horizon attributes Eric Dumazet configure: convert LIBBPF environment variables to command-line options Hangbin Liu configure: add options ability Hangbin Liu ss: update ss man page Roman Mashak tc: f_flower: Add missing ct_state flags to usage description Ariel Levkovich tc: f_flower: Add option to match on related ct state Ariel Levkovich libgenl: make genl_add_mcast_grp set errno on error Florian Westphal lib/fs: fix issue when {name,open}_to_handle_at() is not implemented Heiko Thiery config.mk: Rerun configure when it is newer than config.mk David Ahern ip: dynamically size columns when printing stats Jakub Kicinski seg6: add counters support for SRv6 Behaviors Paolo Lungaroni tc: htb: improve burst error messages Andrea Claudi tipc: bail out if key is abnormally long Andrea Claudi tipc: bail out if algname is abnormally long Andrea Claudi tipc: call a sub-routine in separate socket Hoang Le tc-cake: update docs to include LE diffserv Tyson Moore dcb: fix memory leak Andrea Claudi dcb: fix return value on dcb_cmd_app_show Andrea Claudi lib: bpf_legacy: avoid to pass invalid argument to close() Andrea Claudi tc: q_ets: drop dead code from argument parsing Andrea Claudi ip: align the name of the 'nohandler' stat Jakub Kicinski Update kernel headers David Ahern Merge branch 'rdma-copy-on-fork' into next David Ahern rdma: Add copy-on-fork to get sys command Gal Pressman rdma: update uapi headers Gal Pressman mptcp: make sure flag signal is set when add addr with port Jianguo Wu Merge branch 'main' into next David Ahern ip: Add nodst option to macvlan type source Jethro Beekman Merge branch 'rdma-resource-tracking' into next David Ahern rdma: Add SRQ resource tracking information Neta Ostrovsky rdma: Add context resource tracking information Neta Ostrovsky rdma: Update uapi headers Neta Ostrovsky Update kernel headers David Ahern Signed-off-by: Adolf Belka Signed-off-by: Arne Fitzenreiter --- lfs/iproute2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/iproute2 b/lfs/iproute2 index 4a1ee3865..ac5df26e1 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -24,7 +24,7 @@ include Config -VER = 5.12.0 +VER = 5.13.0 THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bbebacdabd4628ff86453ef4771a242a +$(DL_FILE)_MD5 = 15fc3786303a173a14e180afe4cd2ecd install : $(TARGET) From e9ab20310347a5ba3963048970721643266380f8 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 16 Aug 2021 06:51:35 +0000 Subject: [PATCH 021/306] core160: add iproute2 Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/filelists/iproute2 | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/160/filelists/iproute2 diff --git a/config/rootfiles/core/160/filelists/iproute2 b/config/rootfiles/core/160/filelists/iproute2 new file mode 120000 index 000000000..05f0f71fb --- /dev/null +++ b/config/rootfiles/core/160/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file From 3850aa4c89d3e60bd70fc6f24fda24811747f169 Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Thu, 8 Jul 2021 13:43:11 +0200 Subject: [PATCH 022/306] pcre: Update to version 8.45 - Update from 8.44 to 8.45 - Updated rootfile - Checked the dependencies of the old lib versions using find-dependencies nothing flagged - Changelog Version 8.45 15-June-2021 This is the final release of PCRE1. A few minor tidies are included. 1. CMakeLists.txt has two user-supplied patches applied, one to allow for the setting of MODULE_PATH, and the other to support the generation of pcre-config file and libpcre*.pc files. 2. There was a memory leak if a compile error occurred when there were more than 20 named groups (Bugzilla #2613). 3. Fixed some typos in code and documentation. 4. Fixed a small (*MARK) bug in the interpreter (Bugzilla #2771). Signed-off-by: Adolf Belka Signed-off-by: Arne Fitzenreiter --- config/rootfiles/common/pcre | 138 +++++++++++++++++------------------ lfs/pcre | 4 +- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre index bd2e665fd..ce90d1d16 100644 --- a/config/rootfiles/common/pcre +++ b/config/rootfiles/common/pcre @@ -10,15 +10,15 @@ usr/bin/pcregrep #usr/lib/libpcre.la usr/lib/libpcre.so usr/lib/libpcre.so.1 -usr/lib/libpcre.so.1.2.12 +usr/lib/libpcre.so.1.2.13 #usr/lib/libpcre16.la usr/lib/libpcre16.so usr/lib/libpcre16.so.0 -usr/lib/libpcre16.so.0.2.12 +usr/lib/libpcre16.so.0.2.13 #usr/lib/libpcre32.la usr/lib/libpcre32.so usr/lib/libpcre32.so.0 -usr/lib/libpcre32.so.0.0.12 +usr/lib/libpcre32.so.0.0.13 #usr/lib/libpcrecpp.la usr/lib/libpcrecpp.so usr/lib/libpcrecpp.so.0 @@ -32,72 +32,72 @@ usr/lib/libpcreposix.so.0.0.7 #usr/lib/pkgconfig/libpcre32.pc #usr/lib/pkgconfig/libpcrecpp.pc #usr/lib/pkgconfig/libpcreposix.pc -#usr/share/doc/pcre-pcre-8.44 -#usr/share/doc/pcre-pcre-8.44/AUTHORS -#usr/share/doc/pcre-pcre-8.44/COPYING -#usr/share/doc/pcre-pcre-8.44/ChangeLog -#usr/share/doc/pcre-pcre-8.44/LICENCE -#usr/share/doc/pcre-pcre-8.44/NEWS -#usr/share/doc/pcre-pcre-8.44/README -#usr/share/doc/pcre-pcre-8.44/html -#usr/share/doc/pcre-pcre-8.44/html/NON-AUTOTOOLS-BUILD.txt -#usr/share/doc/pcre-pcre-8.44/html/README.txt -#usr/share/doc/pcre-pcre-8.44/html/index.html -#usr/share/doc/pcre-pcre-8.44/html/pcre-config.html -#usr/share/doc/pcre-pcre-8.44/html/pcre.html -#usr/share/doc/pcre-pcre-8.44/html/pcre16.html -#usr/share/doc/pcre-pcre-8.44/html/pcre32.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_assign_jit_stack.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_compile.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_compile2.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_config.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_copy_named_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_copy_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_dfa_exec.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_exec.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_free_study.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_free_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_free_substring_list.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_fullinfo.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_named_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_stringnumber.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_stringtable_entries.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_substring.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_get_substring_list.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_jit_exec.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_jit_stack_alloc.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_jit_stack_free.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_maketables.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_pattern_to_host_byte_order.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_refcount.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_study.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_utf16_to_host_byte_order.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_utf32_to_host_byte_order.html -#usr/share/doc/pcre-pcre-8.44/html/pcre_version.html -#usr/share/doc/pcre-pcre-8.44/html/pcreapi.html -#usr/share/doc/pcre-pcre-8.44/html/pcrebuild.html -#usr/share/doc/pcre-pcre-8.44/html/pcrecallout.html -#usr/share/doc/pcre-pcre-8.44/html/pcrecompat.html -#usr/share/doc/pcre-pcre-8.44/html/pcrecpp.html -#usr/share/doc/pcre-pcre-8.44/html/pcredemo.html -#usr/share/doc/pcre-pcre-8.44/html/pcregrep.html -#usr/share/doc/pcre-pcre-8.44/html/pcrejit.html -#usr/share/doc/pcre-pcre-8.44/html/pcrelimits.html -#usr/share/doc/pcre-pcre-8.44/html/pcrematching.html -#usr/share/doc/pcre-pcre-8.44/html/pcrepartial.html -#usr/share/doc/pcre-pcre-8.44/html/pcrepattern.html -#usr/share/doc/pcre-pcre-8.44/html/pcreperform.html -#usr/share/doc/pcre-pcre-8.44/html/pcreposix.html -#usr/share/doc/pcre-pcre-8.44/html/pcreprecompile.html -#usr/share/doc/pcre-pcre-8.44/html/pcresample.html -#usr/share/doc/pcre-pcre-8.44/html/pcrestack.html -#usr/share/doc/pcre-pcre-8.44/html/pcresyntax.html -#usr/share/doc/pcre-pcre-8.44/html/pcretest.html -#usr/share/doc/pcre-pcre-8.44/html/pcreunicode.html -#usr/share/doc/pcre-pcre-8.44/pcre-config.txt -#usr/share/doc/pcre-pcre-8.44/pcre.txt -#usr/share/doc/pcre-pcre-8.44/pcregrep.txt -#usr/share/doc/pcre-pcre-8.44/pcretest.txt +#usr/share/doc/pcre-pcre-8.45 +#usr/share/doc/pcre-pcre-8.45/AUTHORS +#usr/share/doc/pcre-pcre-8.45/COPYING +#usr/share/doc/pcre-pcre-8.45/ChangeLog +#usr/share/doc/pcre-pcre-8.45/LICENCE +#usr/share/doc/pcre-pcre-8.45/NEWS +#usr/share/doc/pcre-pcre-8.45/README +#usr/share/doc/pcre-pcre-8.45/html +#usr/share/doc/pcre-pcre-8.45/html/NON-AUTOTOOLS-BUILD.txt +#usr/share/doc/pcre-pcre-8.45/html/README.txt +#usr/share/doc/pcre-pcre-8.45/html/index.html +#usr/share/doc/pcre-pcre-8.45/html/pcre-config.html +#usr/share/doc/pcre-pcre-8.45/html/pcre.html +#usr/share/doc/pcre-pcre-8.45/html/pcre16.html +#usr/share/doc/pcre-pcre-8.45/html/pcre32.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_assign_jit_stack.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_compile.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_compile2.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_config.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_copy_named_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_copy_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_dfa_exec.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_exec.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_free_study.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_free_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_free_substring_list.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_fullinfo.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_named_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_stringnumber.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_stringtable_entries.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_substring.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_get_substring_list.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_jit_exec.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_jit_stack_alloc.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_jit_stack_free.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_maketables.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_pattern_to_host_byte_order.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_refcount.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_study.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_utf16_to_host_byte_order.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_utf32_to_host_byte_order.html +#usr/share/doc/pcre-pcre-8.45/html/pcre_version.html +#usr/share/doc/pcre-pcre-8.45/html/pcreapi.html +#usr/share/doc/pcre-pcre-8.45/html/pcrebuild.html +#usr/share/doc/pcre-pcre-8.45/html/pcrecallout.html +#usr/share/doc/pcre-pcre-8.45/html/pcrecompat.html +#usr/share/doc/pcre-pcre-8.45/html/pcrecpp.html +#usr/share/doc/pcre-pcre-8.45/html/pcredemo.html +#usr/share/doc/pcre-pcre-8.45/html/pcregrep.html +#usr/share/doc/pcre-pcre-8.45/html/pcrejit.html +#usr/share/doc/pcre-pcre-8.45/html/pcrelimits.html +#usr/share/doc/pcre-pcre-8.45/html/pcrematching.html +#usr/share/doc/pcre-pcre-8.45/html/pcrepartial.html +#usr/share/doc/pcre-pcre-8.45/html/pcrepattern.html +#usr/share/doc/pcre-pcre-8.45/html/pcreperform.html +#usr/share/doc/pcre-pcre-8.45/html/pcreposix.html +#usr/share/doc/pcre-pcre-8.45/html/pcreprecompile.html +#usr/share/doc/pcre-pcre-8.45/html/pcresample.html +#usr/share/doc/pcre-pcre-8.45/html/pcrestack.html +#usr/share/doc/pcre-pcre-8.45/html/pcresyntax.html +#usr/share/doc/pcre-pcre-8.45/html/pcretest.html +#usr/share/doc/pcre-pcre-8.45/html/pcreunicode.html +#usr/share/doc/pcre-pcre-8.45/pcre-config.txt +#usr/share/doc/pcre-pcre-8.45/pcre.txt +#usr/share/doc/pcre-pcre-8.45/pcregrep.txt +#usr/share/doc/pcre-pcre-8.45/pcretest.txt #usr/share/man/man1/pcre-config.1 #usr/share/man/man1/pcregrep.1 #usr/share/man/man1/pcretest.1 diff --git a/lfs/pcre b/lfs/pcre index e73f3fa08..981a29323 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -24,7 +24,7 @@ include Config -VER = 8.44 +VER = 8.45 THISAPP = pcre-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -58,7 +58,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cf7326204cc46c755b5b2608033d9d24 +$(DL_FILE)_MD5 = 4452288e6a0eefb2ab11d36010a1eebb install : $(TARGET) From 20743618b6355f56da4863119110fc0a4aae63be Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 16 Aug 2021 06:53:09 +0000 Subject: [PATCH 023/306] core160: add pcre Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/filelists/pcre | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/160/filelists/pcre diff --git a/config/rootfiles/core/160/filelists/pcre b/config/rootfiles/core/160/filelists/pcre new file mode 120000 index 000000000..b390d9a36 --- /dev/null +++ b/config/rootfiles/core/160/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file From ce7054ba18cccf97a148e41568a703a18302a5ba Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Thu, 8 Jul 2021 13:43:26 +0200 Subject: [PATCH 024/306] perl-MIME-Lite: Update to version 3.033 - Update from 3.030 (Nov 2013) to 3.033 (Jun 2021) - Update of rootfile not required - Changelog Version 3.033 No changes since previous version, just made non-trial. Version 3.032 Fix an error in printing to Net::SMTP (thanks, Peter Heirich) Add "use warnings" and require v5.6 Version 3.031 Add an SSL option to connect to the SMTP relay via SSL on port 465. (thanks, Max Maischein) Document some tips on using non-ASCII content with MIME::Lite (thanks, traveljury.com and Tom Hukins) Signed-off-by: Adolf Belka Signed-off-by: Arne Fitzenreiter --- lfs/perl-MIME-Lite | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/perl-MIME-Lite b/lfs/perl-MIME-Lite index 186a95c4b..7fd9903e5 100644 --- a/lfs/perl-MIME-Lite +++ b/lfs/perl-MIME-Lite @@ -24,7 +24,7 @@ include Config -VER = 3.030 +VER = 3.033 THISAPP = MIME-Lite-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5a6d90329e049eee77248d667343acc7 +$(DL_FILE)_MD5 = 42f056ef1338f129b1187a05e7b44369 install : $(TARGET) From b040e0fe32f7b05ac0844613e8b92b5b1cf5fc2e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 16 Aug 2021 06:55:02 +0000 Subject: [PATCH 025/306] core160: add perl-MIME-Lite Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/filelists/perl-MIME-Lite | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/160/filelists/perl-MIME-Lite diff --git a/config/rootfiles/core/160/filelists/perl-MIME-Lite b/config/rootfiles/core/160/filelists/perl-MIME-Lite new file mode 120000 index 000000000..aa0aa6be6 --- /dev/null +++ b/config/rootfiles/core/160/filelists/perl-MIME-Lite @@ -0,0 +1 @@ +../../../common/perl-MIME-Lite \ No newline at end of file From a8366ef743742ac25bda40c57e793ae6c4662268 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 24 Aug 2021 22:17:06 +0200 Subject: [PATCH 026/306] openssl: update to 1.1.1k This update fix: SM2 Decryption Buffer Overflow (CVE-2021-3711) Read buffer overruns processing ASN.1 strings (CVE-2021-3712) https://www.openssl.org/news/secadv/20210824.txt Signed-off-by: Arne Fitzenreiter --- config/rootfiles/common/openssl | 2 ++ lfs/openssl | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index 989670262..89c66adf0 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -599,6 +599,7 @@ usr/lib/libssl.so.1.1 #usr/share/doc/openssl/html/man3/BN_RECP_CTX_free.html #usr/share/doc/openssl/html/man3/BN_RECP_CTX_new.html #usr/share/doc/openssl/html/man3/BN_RECP_CTX_set.html +#usr/share/doc/openssl/html/man3/BN_abs_is_word.html #usr/share/doc/openssl/html/man3/BN_add.html #usr/share/doc/openssl/html/man3/BN_add_word.html #usr/share/doc/openssl/html/man3/BN_bin2bn.html @@ -4570,6 +4571,7 @@ usr/lib/libssl.so.1.1 #usr/share/man/man3/BN_RECP_CTX_free.3 #usr/share/man/man3/BN_RECP_CTX_new.3 #usr/share/man/man3/BN_RECP_CTX_set.3 +#usr/share/man/man3/BN_abs_is_word.3 #usr/share/man/man3/BN_add.3 #usr/share/man/man3/BN_add_word.3 #usr/share/man/man3/BN_bin2bn.3 diff --git a/lfs/openssl b/lfs/openssl index c56c24af0..e9a422315 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # +# Copyright (C) 2007-2021 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.1.1k +VER = 1.1.1l THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -78,7 +78,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c4e7d95f782b08116afa27b30393dd27 +$(DL_FILE)_MD5 = ac0d4387f3ba0ad741b0580dd45f6ff3 install : $(TARGET) From bdac4c81d8cbcce3f363dab622dc62f440e36718 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 24 Aug 2021 22:21:08 +0200 Subject: [PATCH 027/306] core160: add openssl Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/filelists/openssl | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/160/filelists/openssl diff --git a/config/rootfiles/core/160/filelists/openssl b/config/rootfiles/core/160/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/core/160/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file From 1c5aa4affcd12fa5ba78e23ead2a425fdc6beaa1 Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Thu, 8 Jul 2021 13:43:43 +0200 Subject: [PATCH 028/306] poppler: Update to version 21.07.0 - Update from 21.05.0 to 21.07.0 - Update of rootfile - Changelog is too large to include here. Full details can be found in the ChangeLog file in the source tarball. This is a collection of all the commits made. Signed-off-by: Adolf Belka Signed-off-by: Arne Fitzenreiter --- config/rootfiles/common/poppler | 4 ++-- lfs/poppler | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler index d80001c39..9746d9412 100644 --- a/config/rootfiles/common/poppler +++ b/config/rootfiles/common/poppler @@ -172,8 +172,8 @@ usr/lib/libpoppler-cpp.so.0.9.0 usr/lib/libpoppler-glib.so.8 usr/lib/libpoppler-glib.so.8.21.0 #usr/lib/libpoppler.so -usr/lib/libpoppler.so.110 -usr/lib/libpoppler.so.110.0.0 +usr/lib/libpoppler.so.111 +usr/lib/libpoppler.so.111.0.0 #usr/lib/pkgconfig/poppler-cpp.pc #usr/lib/pkgconfig/poppler-glib.pc #usr/lib/pkgconfig/poppler.pc diff --git a/lfs/poppler b/lfs/poppler index a63001c46..3589e86b4 100644 --- a/lfs/poppler +++ b/lfs/poppler @@ -24,7 +24,7 @@ include Config -VER = 21.05.0 +VER = 21.07.0 THISAPP = poppler-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 109c337462c2a4ac916226588a2c23f7 +$(DL_FILE)_MD5 = 3c4b500a0af4cf1dc4a1c66fa48b7551 install : $(TARGET) From ee2cd894cde65bf963dc64ebb6f30ddc581c9136 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 2 Sep 2021 08:52:41 +0000 Subject: [PATCH 029/306] core160: add poppler Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/filelists/poppler | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/160/filelists/poppler diff --git a/config/rootfiles/core/160/filelists/poppler b/config/rootfiles/core/160/filelists/poppler new file mode 120000 index 000000000..39aa6c263 --- /dev/null +++ b/config/rootfiles/core/160/filelists/poppler @@ -0,0 +1 @@ +../../../common/poppler \ No newline at end of file From 0e9b16472230a7f1022cebc445615905574e3e23 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Sun, 11 Jul 2021 19:54:16 +0200 Subject: [PATCH 030/306] firewall.cgi: Remove faulty assignments for selected hash. The removed assignments are wrong because both are trying to assign something different to the same key and will overwrite each other. Secondary the assignment to the hash is not needed at this place, so it safely can be removed. Signed-off-by: Stefan Schantl Signed-off-by: Arne Fitzenreiter --- html/cgi-bin/firewall.cgi | 2 -- 1 file changed, 2 deletions(-) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 70dee8d3c..d3cddfa23 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1022,8 +1022,6 @@ sub gen_dd_block $checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED'; $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected'; $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected'; - $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected'; - $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; print< From 04b6a4baa80a26a6e097c2194ef2b57a056083c2 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Sun, 11 Jul 2021 19:54:17 +0200 Subject: [PATCH 031/306] firewall.cgi: Fix multiple usage of configured net or interface. When configuring a standard network as source or target the same interface would be pre-selected as firewall interface when editing an existing rule. In case an existing input rule with an configured firewall interface should be changed, the same network device has been pre-selected in the standard networks dropdown box. This easily confuses users and may lead to false configurations when saving an edited rule. Signed-off-by: Stefan Schantl Signed-off-by: Arne Fitzenreiter --- html/cgi-bin/firewall.cgi | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index d3cddfa23..8d6adee96 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1032,7 +1032,12 @@ END { next if($defaultNetworks{$network}{'NAME'} eq "IPFire"); print "