From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4fWpyb5yMnz2xXQ for ; Thu, 12 Mar 2026 13:54:47 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4fWpyb5kGjz2xQW for ; Thu, 12 Mar 2026 13:54:47 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4fWpyb31Fsz2k5 for ; Thu, 12 Mar 2026 13:54:47 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1773323687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=6rftTZsVAXk/eLWbaqvhLXX1akt2I/dhWilk4W+Hyag=; b=0BT7OVpQfsxRrI6aXf9q7uzSq1xUpk4l6zU1FEx14AbCeg5YnKNBEB8VNmjCZwjxDRrTqk zAH2VwQXsZEZ31BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1773323687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=6rftTZsVAXk/eLWbaqvhLXX1akt2I/dhWilk4W+Hyag=; b=WTr3Jdvx3Q6vEhUupPLIcKu4ka/Vm96X54lbSBOVUW3DbE0zi8s2S6e2NMzYDnqofDUDZG EdI30dE6hkmHxXE2g3EPfUCvtgHtd08yqW/FvvmjwplEw4plh91e3JRFP1nZC8u/bwdoC0 CJn/8n/55Pp8ybiGpAmBOz81if0uAWxw1rkdp2Gwp+TDJULTSQHVPCEdosUYKrYak1I6lw 6SPiv0HP+j9Tc2a1lysEV8bwxeu1Rv6/vKN//fnCKBaPDTBg9axDf5aafAB1LiuJ+WrYiX l29JaMi3tCEPOidDlDz9A7AVmfn0f5bpa3Od5XmVjqTUFcugmcWUx/EvUHKdpg== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4fWpyb16Wfz2xHf; Thu, 12 Mar 2026 13:54:47 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 607b7ced0046f6bc78d458ff2febf8041dadbfbc X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 7f0ed6b7191053034e8003ce619f73937eeae477 X-Git-Newrev: 607b7ced0046f6bc78d458ff2febf8041dadbfbc Message-Id: <4fWpyb16Wfz2xHf@people01.haj.ipfire.org> Date: Thu, 12 Mar 2026 13:54:46 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 607b7ced0046f6bc78d458ff2febf8041dadbfbc (commit) via 61b0ac401653dabb59a1dea43887c3d67a221ef4 (commit) via 45080ce86a80a35f061f807cb1584b8df5a71f67 (commit) via 769310ae84b926c5491c6b2ba008aaa6f0ac8993 (commit) via f4675ca8bebc5fa3d5c34fdc31b82616dd065a34 (commit) from 7f0ed6b7191053034e8003ce619f73937eeae477 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 607b7ced0046f6bc78d458ff2febf8041dadbfbc Merge: 45080ce86 61b0ac401 Author: Michael Tremer Date: Thu Mar 12 13:54:35 2026 +0000 Merge branch 'master' into next commit 45080ce86a80a35f061f807cb1584b8df5a71f67 Author: Michael Tremer Date: Thu Mar 12 13:51:21 2026 +0000 core202: Ship ids.cgi Signed-off-by: Michael Tremer commit 769310ae84b926c5491c6b2ba008aaa6f0ac8993 Author: Stefan Schantl Date: Wed Mar 11 20:39:50 2026 +0100 ids.cgi: Fix sorting the ignored hosts by id The sorting statement was entirely wrong, so the lists of ignored hosts never got sorted in a proper way. Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer commit f4675ca8bebc5fa3d5c34fdc31b82616dd065a34 Author: Michael Tremer Date: Thu Mar 12 13:50:42 2026 +0000 make.sh: Start Core Update 202 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{201 => 202}/exclude | 0 config/rootfiles/core/{201 => 202}/filelists/core-files | 0 config/rootfiles/core/202/filelists/files | 1 + config/rootfiles/{oldcore/152 => core/202}/update.sh | 16 +++++++++------- config/rootfiles/{core => oldcore}/201/exclude | 0 .../{core => oldcore}/201/filelists/aarch64/binutils | 0 .../{core => oldcore}/201/filelists/aarch64/glibc | 0 .../{core => oldcore}/201/filelists/asciidoctor | 0 config/rootfiles/{core => oldcore}/201/filelists/bind | 0 .../{core => oldcore}/201/filelists/conntrack-tools | 0 .../rootfiles/{core => oldcore}/201/filelists/core-files | 0 .../rootfiles/{core => oldcore}/201/filelists/coreutils | 0 config/rootfiles/{core => oldcore}/201/filelists/expat | 0 config/rootfiles/oldcore/{106 => 201}/filelists/file | 0 config/rootfiles/{core => oldcore}/201/filelists/files | 0 config/rootfiles/{core => oldcore}/201/filelists/fuse | 0 config/rootfiles/{core => oldcore}/201/filelists/gettext | 0 .../rootfiles/{core => oldcore}/201/filelists/harfbuzz | 0 config/rootfiles/{core => oldcore}/201/filelists/hwdata | 0 .../rootfiles/{core => oldcore}/201/filelists/iana-etc | 0 .../{core => oldcore}/201/filelists/ids-ruleset-sources | 0 .../rootfiles/{core => oldcore}/201/filelists/iptables | 0 config/rootfiles/{core => oldcore}/201/filelists/jansson | 0 config/rootfiles/{core => oldcore}/201/filelists/krb5 | 0 config/rootfiles/{core => oldcore}/201/filelists/less | 0 .../rootfiles/{core => oldcore}/201/filelists/libgcrypt | 0 config/rootfiles/{core => oldcore}/201/filelists/libksba | 0 .../201/filelists/libnetfilter_conntrack | 0 config/rootfiles/{core => oldcore}/201/filelists/libpng | 0 config/rootfiles/{core => oldcore}/201/filelists/libuv | 0 .../rootfiles/{core => oldcore}/201/filelists/libxcrypt | 0 config/rootfiles/{core => oldcore}/201/filelists/lua | 0 config/rootfiles/{core => oldcore}/201/filelists/ncurses | 0 config/rootfiles/{core => oldcore}/201/filelists/openssl | 0 config/rootfiles/{core => oldcore}/201/filelists/openvpn | 0 config/rootfiles/{core => oldcore}/201/filelists/p11-kit | 0 config/rootfiles/{core => oldcore}/201/filelists/pam | 0 .../{core => oldcore}/201/filelists/perl-Net-LibIDN2 | 0 config/rootfiles/{core => oldcore}/201/filelists/procps | 0 .../{core => oldcore}/201/filelists/riscv64/binutils | 0 .../{core => oldcore}/201/filelists/riscv64/glibc | 0 config/rootfiles/{core => oldcore}/201/filelists/ruby | 0 .../{core => oldcore}/201/filelists/suricata-reporter | 0 config/rootfiles/{core => oldcore}/201/filelists/unbound | 0 config/rootfiles/{core => oldcore}/201/filelists/vim | 0 .../{core => oldcore}/201/filelists/wireless-regdb | 0 .../{core => oldcore}/201/filelists/x86_64/binutils | 0 .../{core => oldcore}/201/filelists/x86_64/glibc | 0 .../201/filelists/x86_64/intel-microcode | 0 .../rootfiles/{core => oldcore}/201/filelists/xfsprogs | 0 config/rootfiles/{core => oldcore}/201/filelists/zlib-ng | 0 config/rootfiles/{core => oldcore}/201/update.sh | 0 html/cgi-bin/ids.cgi | 2 +- make.sh | 2 +- 54 files changed, 12 insertions(+), 9 deletions(-) copy config/rootfiles/core/{201 => 202}/exclude (100%) copy config/rootfiles/core/{201 => 202}/filelists/core-files (100%) create mode 100644 config/rootfiles/core/202/filelists/files copy config/rootfiles/{oldcore/152 => core/202}/update.sh (92%) rename config/rootfiles/{core => oldcore}/201/exclude (100%) rename config/rootfiles/{core => oldcore}/201/filelists/aarch64/binutils (100%) rename config/rootfiles/{core => oldcore}/201/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/201/filelists/asciidoctor (100%) rename config/rootfiles/{core => oldcore}/201/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/201/filelists/conntrack-tools (100%) rename config/rootfiles/{core => oldcore}/201/filelists/core-files (100%) rename config/rootfiles/{core => oldcore}/201/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/201/filelists/expat (100%) copy config/rootfiles/oldcore/{106 => 201}/filelists/file (100%) rename config/rootfiles/{core => oldcore}/201/filelists/files (100%) rename config/rootfiles/{core => oldcore}/201/filelists/fuse (100%) rename config/rootfiles/{core => oldcore}/201/filelists/gettext (100%) rename config/rootfiles/{core => oldcore}/201/filelists/harfbuzz (100%) rename config/rootfiles/{core => oldcore}/201/filelists/hwdata (100%) rename config/rootfiles/{core => oldcore}/201/filelists/iana-etc (100%) rename config/rootfiles/{core => oldcore}/201/filelists/ids-ruleset-sources (100%) rename config/rootfiles/{core => oldcore}/201/filelists/iptables (100%) rename config/rootfiles/{core => oldcore}/201/filelists/jansson (100%) rename config/rootfiles/{core => oldcore}/201/filelists/krb5 (100%) rename config/rootfiles/{core => oldcore}/201/filelists/less (100%) rename config/rootfiles/{core => oldcore}/201/filelists/libgcrypt (100%) rename config/rootfiles/{core => oldcore}/201/filelists/libksba (100%) rename config/rootfiles/{core => oldcore}/201/filelists/libnetfilter_conntrack (100%) rename config/rootfiles/{core => oldcore}/201/filelists/libpng (100%) rename config/rootfiles/{core => oldcore}/201/filelists/libuv (100%) rename config/rootfiles/{core => oldcore}/201/filelists/libxcrypt (100%) rename config/rootfiles/{core => oldcore}/201/filelists/lua (100%) rename config/rootfiles/{core => oldcore}/201/filelists/ncurses (100%) rename config/rootfiles/{core => oldcore}/201/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/201/filelists/openvpn (100%) rename config/rootfiles/{core => oldcore}/201/filelists/p11-kit (100%) rename config/rootfiles/{core => oldcore}/201/filelists/pam (100%) rename config/rootfiles/{core => oldcore}/201/filelists/perl-Net-LibIDN2 (100%) rename config/rootfiles/{core => oldcore}/201/filelists/procps (100%) rename config/rootfiles/{core => oldcore}/201/filelists/riscv64/binutils (100%) rename config/rootfiles/{core => oldcore}/201/filelists/riscv64/glibc (100%) rename config/rootfiles/{core => oldcore}/201/filelists/ruby (100%) rename config/rootfiles/{core => oldcore}/201/filelists/suricata-reporter (100%) rename config/rootfiles/{core => oldcore}/201/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/201/filelists/vim (100%) rename config/rootfiles/{core => oldcore}/201/filelists/wireless-regdb (100%) rename config/rootfiles/{core => oldcore}/201/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/201/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/201/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/201/filelists/xfsprogs (100%) rename config/rootfiles/{core => oldcore}/201/filelists/zlib-ng (100%) rename config/rootfiles/{core => oldcore}/201/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/201/exclude b/config/rootfiles/core/202/exclude similarity index 100% rename from config/rootfiles/core/201/exclude rename to config/rootfiles/core/202/exclude diff --git a/config/rootfiles/core/201/filelists/core-files b/config/rootfiles/core/202/filelists/core-files similarity index 100% rename from config/rootfiles/core/201/filelists/core-files rename to config/rootfiles/core/202/filelists/core-files diff --git a/config/rootfiles/core/202/filelists/files b/config/rootfiles/core/202/filelists/files new file mode 100644 index 000000000..076a4d033 --- /dev/null +++ b/config/rootfiles/core/202/filelists/files @@ -0,0 +1 @@ +srv/web/ipfire/cgi-bin/ids.cgi diff --git a/config/rootfiles/core/202/update.sh b/config/rootfiles/core/202/update.sh new file mode 100644 index 000000000..64ba20420 --- /dev/null +++ b/config/rootfiles/core/202/update.sh @@ -0,0 +1,71 @@ +#!/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) 2026 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=202 + +# 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 + +# Extract files +extract_files + +# update linker config +ldconfig + +# Restart init +#telinit u + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Apply SSH configuration +/usr/local/bin/sshctrl + +# 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/oldcore/201/exclude b/config/rootfiles/oldcore/201/exclude new file mode 100644 index 000000000..8ee1c3c2f --- /dev/null +++ b/config/rootfiles/oldcore/201/exclude @@ -0,0 +1,35 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +boot/uEnv.txt +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +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/lib/location/ipset +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/201/filelists/aarch64/binutils b/config/rootfiles/oldcore/201/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/201/filelists/aarch64/binutils rename to config/rootfiles/oldcore/201/filelists/aarch64/binutils diff --git a/config/rootfiles/core/201/filelists/aarch64/glibc b/config/rootfiles/oldcore/201/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/201/filelists/aarch64/glibc rename to config/rootfiles/oldcore/201/filelists/aarch64/glibc diff --git a/config/rootfiles/core/201/filelists/asciidoctor b/config/rootfiles/oldcore/201/filelists/asciidoctor similarity index 100% rename from config/rootfiles/core/201/filelists/asciidoctor rename to config/rootfiles/oldcore/201/filelists/asciidoctor diff --git a/config/rootfiles/core/201/filelists/bind b/config/rootfiles/oldcore/201/filelists/bind similarity index 100% rename from config/rootfiles/core/201/filelists/bind rename to config/rootfiles/oldcore/201/filelists/bind diff --git a/config/rootfiles/core/201/filelists/conntrack-tools b/config/rootfiles/oldcore/201/filelists/conntrack-tools similarity index 100% rename from config/rootfiles/core/201/filelists/conntrack-tools rename to config/rootfiles/oldcore/201/filelists/conntrack-tools diff --git a/config/rootfiles/oldcore/201/filelists/core-files b/config/rootfiles/oldcore/201/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/201/filelists/core-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/201/filelists/coreutils b/config/rootfiles/oldcore/201/filelists/coreutils similarity index 100% rename from config/rootfiles/core/201/filelists/coreutils rename to config/rootfiles/oldcore/201/filelists/coreutils diff --git a/config/rootfiles/core/201/filelists/expat b/config/rootfiles/oldcore/201/filelists/expat similarity index 100% rename from config/rootfiles/core/201/filelists/expat rename to config/rootfiles/oldcore/201/filelists/expat diff --git a/config/rootfiles/oldcore/201/filelists/file b/config/rootfiles/oldcore/201/filelists/file new file mode 120000 index 000000000..0c60e43aa --- /dev/null +++ b/config/rootfiles/oldcore/201/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/201/filelists/files b/config/rootfiles/oldcore/201/filelists/files similarity index 100% rename from config/rootfiles/core/201/filelists/files rename to config/rootfiles/oldcore/201/filelists/files diff --git a/config/rootfiles/core/201/filelists/fuse b/config/rootfiles/oldcore/201/filelists/fuse similarity index 100% rename from config/rootfiles/core/201/filelists/fuse rename to config/rootfiles/oldcore/201/filelists/fuse diff --git a/config/rootfiles/core/201/filelists/gettext b/config/rootfiles/oldcore/201/filelists/gettext similarity index 100% rename from config/rootfiles/core/201/filelists/gettext rename to config/rootfiles/oldcore/201/filelists/gettext diff --git a/config/rootfiles/core/201/filelists/harfbuzz b/config/rootfiles/oldcore/201/filelists/harfbuzz similarity index 100% rename from config/rootfiles/core/201/filelists/harfbuzz rename to config/rootfiles/oldcore/201/filelists/harfbuzz diff --git a/config/rootfiles/core/201/filelists/hwdata b/config/rootfiles/oldcore/201/filelists/hwdata similarity index 100% rename from config/rootfiles/core/201/filelists/hwdata rename to config/rootfiles/oldcore/201/filelists/hwdata diff --git a/config/rootfiles/core/201/filelists/iana-etc b/config/rootfiles/oldcore/201/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/201/filelists/iana-etc rename to config/rootfiles/oldcore/201/filelists/iana-etc diff --git a/config/rootfiles/core/201/filelists/ids-ruleset-sources b/config/rootfiles/oldcore/201/filelists/ids-ruleset-sources similarity index 100% rename from config/rootfiles/core/201/filelists/ids-ruleset-sources rename to config/rootfiles/oldcore/201/filelists/ids-ruleset-sources diff --git a/config/rootfiles/core/201/filelists/iptables b/config/rootfiles/oldcore/201/filelists/iptables similarity index 100% rename from config/rootfiles/core/201/filelists/iptables rename to config/rootfiles/oldcore/201/filelists/iptables diff --git a/config/rootfiles/core/201/filelists/jansson b/config/rootfiles/oldcore/201/filelists/jansson similarity index 100% rename from config/rootfiles/core/201/filelists/jansson rename to config/rootfiles/oldcore/201/filelists/jansson diff --git a/config/rootfiles/core/201/filelists/krb5 b/config/rootfiles/oldcore/201/filelists/krb5 similarity index 100% rename from config/rootfiles/core/201/filelists/krb5 rename to config/rootfiles/oldcore/201/filelists/krb5 diff --git a/config/rootfiles/core/201/filelists/less b/config/rootfiles/oldcore/201/filelists/less similarity index 100% rename from config/rootfiles/core/201/filelists/less rename to config/rootfiles/oldcore/201/filelists/less diff --git a/config/rootfiles/core/201/filelists/libgcrypt b/config/rootfiles/oldcore/201/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/201/filelists/libgcrypt rename to config/rootfiles/oldcore/201/filelists/libgcrypt diff --git a/config/rootfiles/core/201/filelists/libksba b/config/rootfiles/oldcore/201/filelists/libksba similarity index 100% rename from config/rootfiles/core/201/filelists/libksba rename to config/rootfiles/oldcore/201/filelists/libksba diff --git a/config/rootfiles/core/201/filelists/libnetfilter_conntrack b/config/rootfiles/oldcore/201/filelists/libnetfilter_conntrack similarity index 100% rename from config/rootfiles/core/201/filelists/libnetfilter_conntrack rename to config/rootfiles/oldcore/201/filelists/libnetfilter_conntrack diff --git a/config/rootfiles/core/201/filelists/libpng b/config/rootfiles/oldcore/201/filelists/libpng similarity index 100% rename from config/rootfiles/core/201/filelists/libpng rename to config/rootfiles/oldcore/201/filelists/libpng diff --git a/config/rootfiles/core/201/filelists/libuv b/config/rootfiles/oldcore/201/filelists/libuv similarity index 100% rename from config/rootfiles/core/201/filelists/libuv rename to config/rootfiles/oldcore/201/filelists/libuv diff --git a/config/rootfiles/core/201/filelists/libxcrypt b/config/rootfiles/oldcore/201/filelists/libxcrypt similarity index 100% rename from config/rootfiles/core/201/filelists/libxcrypt rename to config/rootfiles/oldcore/201/filelists/libxcrypt diff --git a/config/rootfiles/core/201/filelists/lua b/config/rootfiles/oldcore/201/filelists/lua similarity index 100% rename from config/rootfiles/core/201/filelists/lua rename to config/rootfiles/oldcore/201/filelists/lua diff --git a/config/rootfiles/core/201/filelists/ncurses b/config/rootfiles/oldcore/201/filelists/ncurses similarity index 100% rename from config/rootfiles/core/201/filelists/ncurses rename to config/rootfiles/oldcore/201/filelists/ncurses diff --git a/config/rootfiles/core/201/filelists/openssl b/config/rootfiles/oldcore/201/filelists/openssl similarity index 100% rename from config/rootfiles/core/201/filelists/openssl rename to config/rootfiles/oldcore/201/filelists/openssl diff --git a/config/rootfiles/core/201/filelists/openvpn b/config/rootfiles/oldcore/201/filelists/openvpn similarity index 100% rename from config/rootfiles/core/201/filelists/openvpn rename to config/rootfiles/oldcore/201/filelists/openvpn diff --git a/config/rootfiles/core/201/filelists/p11-kit b/config/rootfiles/oldcore/201/filelists/p11-kit similarity index 100% rename from config/rootfiles/core/201/filelists/p11-kit rename to config/rootfiles/oldcore/201/filelists/p11-kit diff --git a/config/rootfiles/core/201/filelists/pam b/config/rootfiles/oldcore/201/filelists/pam similarity index 100% rename from config/rootfiles/core/201/filelists/pam rename to config/rootfiles/oldcore/201/filelists/pam diff --git a/config/rootfiles/core/201/filelists/perl-Net-LibIDN2 b/config/rootfiles/oldcore/201/filelists/perl-Net-LibIDN2 similarity index 100% rename from config/rootfiles/core/201/filelists/perl-Net-LibIDN2 rename to config/rootfiles/oldcore/201/filelists/perl-Net-LibIDN2 diff --git a/config/rootfiles/core/201/filelists/procps b/config/rootfiles/oldcore/201/filelists/procps similarity index 100% rename from config/rootfiles/core/201/filelists/procps rename to config/rootfiles/oldcore/201/filelists/procps diff --git a/config/rootfiles/core/201/filelists/riscv64/binutils b/config/rootfiles/oldcore/201/filelists/riscv64/binutils similarity index 100% rename from config/rootfiles/core/201/filelists/riscv64/binutils rename to config/rootfiles/oldcore/201/filelists/riscv64/binutils diff --git a/config/rootfiles/core/201/filelists/riscv64/glibc b/config/rootfiles/oldcore/201/filelists/riscv64/glibc similarity index 100% rename from config/rootfiles/core/201/filelists/riscv64/glibc rename to config/rootfiles/oldcore/201/filelists/riscv64/glibc diff --git a/config/rootfiles/core/201/filelists/ruby b/config/rootfiles/oldcore/201/filelists/ruby similarity index 100% rename from config/rootfiles/core/201/filelists/ruby rename to config/rootfiles/oldcore/201/filelists/ruby diff --git a/config/rootfiles/core/201/filelists/suricata-reporter b/config/rootfiles/oldcore/201/filelists/suricata-reporter similarity index 100% rename from config/rootfiles/core/201/filelists/suricata-reporter rename to config/rootfiles/oldcore/201/filelists/suricata-reporter diff --git a/config/rootfiles/core/201/filelists/unbound b/config/rootfiles/oldcore/201/filelists/unbound similarity index 100% rename from config/rootfiles/core/201/filelists/unbound rename to config/rootfiles/oldcore/201/filelists/unbound diff --git a/config/rootfiles/core/201/filelists/vim b/config/rootfiles/oldcore/201/filelists/vim similarity index 100% rename from config/rootfiles/core/201/filelists/vim rename to config/rootfiles/oldcore/201/filelists/vim diff --git a/config/rootfiles/core/201/filelists/wireless-regdb b/config/rootfiles/oldcore/201/filelists/wireless-regdb similarity index 100% rename from config/rootfiles/core/201/filelists/wireless-regdb rename to config/rootfiles/oldcore/201/filelists/wireless-regdb diff --git a/config/rootfiles/core/201/filelists/x86_64/binutils b/config/rootfiles/oldcore/201/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/201/filelists/x86_64/binutils rename to config/rootfiles/oldcore/201/filelists/x86_64/binutils diff --git a/config/rootfiles/core/201/filelists/x86_64/glibc b/config/rootfiles/oldcore/201/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/201/filelists/x86_64/glibc rename to config/rootfiles/oldcore/201/filelists/x86_64/glibc diff --git a/config/rootfiles/core/201/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/201/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/201/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/201/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/201/filelists/xfsprogs b/config/rootfiles/oldcore/201/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/201/filelists/xfsprogs rename to config/rootfiles/oldcore/201/filelists/xfsprogs diff --git a/config/rootfiles/core/201/filelists/zlib-ng b/config/rootfiles/oldcore/201/filelists/zlib-ng similarity index 100% rename from config/rootfiles/core/201/filelists/zlib-ng rename to config/rootfiles/oldcore/201/filelists/zlib-ng diff --git a/config/rootfiles/core/201/update.sh b/config/rootfiles/oldcore/201/update.sh similarity index 100% rename from config/rootfiles/core/201/update.sh rename to config/rootfiles/oldcore/201/update.sh diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 192c71ec6..849c37528 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -1506,7 +1506,7 @@ END my $col = ""; # Loop through all entries of the hash. - foreach my $key (sort { $ignored{$a}[0] <=> $ignored{$b}[0] } keys %ignored) { + foreach my $key (sort { $a <=> $b } keys %ignored) { # Assign data array positions to some nice variable names. my $address = $ignored{$key}[0]; my $remark = $ignored{$key}[1]; diff --git a/make.sh b/make.sh index 225767f91..1b34586bd 100755 --- a/make.sh +++ b/make.sh @@ -23,7 +23,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.29" # Version number -CORE="201" # Core Level (Filename) +CORE="202" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree