IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7826 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 69031f7674295d6d95219a97063c718beecc1052
by Michael Tremer 05 Apr '24

05 Apr '24

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, master has been updated via 69031f7674295d6d95219a97063c718beecc1052 (commit) from bb46f3bef8445a0dba2e92bbb614113a9a4adcaf (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 69031f7674295d6d95219a97063c718beecc1052 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 3 21:42:13 2024 +0100 suricata: Disable fail-open on NFQUEUE This change causes that if suricata crashes, the NFQUEUE will no longer fall into a mode where ALL packets are being accepted. This used the be the case before which opened the entire firewall. If suricata randomly crashes, we will fall back to the "bypass" mode where packets will bypass suricata, but nothing else. Fixes: #13642 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/suricata/suricata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml index fb4f9426b..5bec5cd01 100644 --- a/config/suricata/suricata.yaml +++ b/config/suricata/suricata.yaml @@ -351,7 +351,7 @@ nfq: bypass-mask: 1073741824 # route-queue: 2 # batchcount: 20 - fail-open: yes + fail-open: no ## ## Step 5: App Layer Protocol Configuration hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2fc167d93bae4b61e127521f05d80848142ca4e0
by Arne Fitzenreiter 04 Apr '24

04 Apr '24

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 2fc167d93bae4b61e127521f05d80848142ca4e0 (commit) via 05c31f4f144ce011a350aca1bc28cde3121b82ce (commit) via 7fdafdfbcef8505312d6d50a7b95153ea80e2032 (commit) from 62db0b5320a0958b1677191bc177e5dbdaa8d608 (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 2fc167d93bae4b61e127521f05d80848142ca4e0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 4 23:33:01 2024 +0200 kernel: update to 6.6.24 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 05c31f4f144ce011a350aca1bc28cde3121b82ce Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 4 18:26:55 2024 +0200 core186: add collectd to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 7fdafdfbcef8505312d6d50a7b95153ea80e2032 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 4 18:23:29 2024 +0200 collectd: fix cpufreq graph if virtual cores are offline the kernel doesn't allow to read the frequency of a offline virtual core if smt is disabled so now no error is reported in this case and NaN submited to the database. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.x86_64-ipfire | 4 ++-- config/rootfiles/common/x86_64/linux | 2 +- .../{oldcore/125 => core/186}/filelists/collectd | 0 lfs/collectd | 2 ++ lfs/linux | 4 ++-- .../collectd-4.10.9-cpufreq_skip_disabled_cores.patch | 18 ++++++++++++++++++ 6 files changed, 25 insertions(+), 5 deletions(-) copy config/rootfiles/{oldcore/125 => core/186}/filelists/collectd (100%) create mode 100644 src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch Difference in files: diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 9f7abd58f1..f6d9ede285 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.23-ipfire Kernel Configuration +# Linux/x86 6.6.24-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -176,7 +176,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" -CONFIG_GCC11_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index be499ef5f3..e74e1f98c2 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -8191,7 +8191,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/FW_LOADER_USER_HELPER #lib/modules/KVER-ipfire/build/include/config/GACT_PROB #lib/modules/KVER-ipfire/build/include/config/GARP -#lib/modules/KVER-ipfire/build/include/config/GCC11_NO_ARRAY_BOUNDS +#lib/modules/KVER-ipfire/build/include/config/GCC10_NO_ARRAY_BOUNDS #lib/modules/KVER-ipfire/build/include/config/GCC_ASM_GOTO_OUTPUT_WORKAROUND #lib/modules/KVER-ipfire/build/include/config/GCC_PLUGINS #lib/modules/KVER-ipfire/build/include/config/GCC_VERSION diff --git a/config/rootfiles/core/186/filelists/collectd b/config/rootfiles/core/186/filelists/collectd new file mode 120000 index 0000000000..871b32f14b --- /dev/null +++ b/config/rootfiles/core/186/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/lfs/collectd b/lfs/collectd index 5c4236b3af..24f5bc632e 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -103,12 +103,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10-drop-linux-disk-module.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-fix-glibc-headers.patch + cd $(DIR_APP) && autoupdate -v configure.in cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/lfs/linux b/lfs/linux index 9383a32968..f5ef18d622 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.23 +VER = 6.6.24 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = b00e2c084f9d7a4fcda0a9404fd897ca1fc90d660dd1063d699c8ec612c6a35c494ce14c91f458a1f77f2a70ce6612e019e5fc553b571ee669b5070f97841a02 +$(DL_FILE)_BLAKE2 = 0f4643c758bb3857396f08b0cc291e1cf7cc7d120fe53791ba8cdaa32f08f20822353e04464551b88e8de64e367de6900da01504e57bc684d47390b51d001285 install : $(TARGET) diff --git a/src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch b/src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch new file mode 100644 index 0000000000..e8851b6c7e --- /dev/null +++ b/src/patches/collectd/collectd-4.10.9-cpufreq_skip_disabled_cores.patch @@ -0,0 +1,18 @@ +diff -Naur collectd-4.10.9.org/src/cpufreq.c collectd-4.10.9/src/cpufreq.c +--- collectd-4.10.9.org/src/cpufreq.c 2013-04-08 08:26:17.000000000 +0200 ++++ collectd-4.10.9/src/cpufreq.c 2024-04-04 15:33:52.705372940 +0200 +@@ -104,12 +104,9 @@ + + if (fgets (buffer, 16, fp) == NULL) + { +- char errbuf[1024]; +- WARNING ("cpufreq: fgets: %s", +- sstrerror (errno, errbuf, +- sizeof (errbuf))); + fclose (fp); +- return (-1); ++ cpufreq_submit (i, NAN); ++ break; + } + + if (fclose (fp)) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 62db0b5320a0958b1677191bc177e5dbdaa8d608
by Arne Fitzenreiter 03 Apr '24

03 Apr '24

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 62db0b5320a0958b1677191bc177e5dbdaa8d608 (commit) via b25236acf75f47999bc01885c35a0fc80a782023 (commit) via e348f67fa68d34c35a9bab12bd9c8acfc2cadf0f (commit) via 6da6f5dbe2d31c920b4cd1e21d3c3abe0ed1f267 (commit) via ed91103e229b128288a9799a9bbbbe6cd1d7f32d (commit) from 5f04e70f746261430f4600de2e5bff6922a7a511 (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 62db0b5320a0958b1677191bc177e5dbdaa8d608 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 2 19:36:46 2024 +0000 core186: add grub-btrfs initskript changes to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b25236acf75f47999bc01885c35a0fc80a782023 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Mar 27 20:39:20 2024 +0100 grub-btrfsd: Drop redundant used PIDFILE mechanism This case is already covered by the PID mechanism of the used functions Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e348f67fa68d34c35a9bab12bd9c8acfc2cadf0f Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Mar 27 20:39:19 2024 +0100 grub-btrfsd: Adjust displayed starting message Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 6da6f5dbe2d31c920b4cd1e21d3c3abe0ed1f267 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Mar 27 20:39:18 2024 +0100 grub-btrfsd: Use generic volume_fs_type function for FS detection Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit ed91103e229b128288a9799a9bbbbe6cd1d7f32d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Mar 27 20:39:17 2024 +0100 initscripts: Add generic function to get the filesystem type of a volume Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/186/filelists/files | 5 +++++ src/initscripts/system/functions | 8 ++++++++ src/initscripts/system/grub-btrfsd | 21 ++++++++------------- 3 files changed, 21 insertions(+), 13 deletions(-) Difference in files: diff --git a/config/rootfiles/core/186/filelists/files b/config/rootfiles/core/186/filelists/files index 00198bcc3..86c9d666a 100644 --- a/config/rootfiles/core/186/filelists/files +++ b/config/rootfiles/core/186/filelists/files @@ -1 +1,6 @@ +etc/rc.d/init.d/functions +etc/rc.d/init.d/grub-btrfsd +etc/rc.d/rc0.d/K01grub-btrfsd +etc/rc.d/rc3.d/S99grub-btrfsd +etc/rc.d/rc6.d/K01grub-btrfsd srv/web/ipfire/cgi-bin/vulnerabilities.cgi diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions index 5a26aef45..b610143ab 100644 --- a/src/initscripts/system/functions +++ b/src/initscripts/system/functions @@ -883,3 +883,11 @@ running_on_oci() { # We are not running on OCI return 1 } + +volume_fs_type() { + if [ ! -d "${1}" ]; then + return + fi + + stat -f --format="%T" ${1} +} diff --git a/src/initscripts/system/grub-btrfsd b/src/initscripts/system/grub-btrfsd index dc5e32ad4..49073a807 100644 --- a/src/initscripts/system/grub-btrfsd +++ b/src/initscripts/system/grub-btrfsd @@ -25,27 +25,22 @@ SNAPSHOTDIR="/.snapshots" PIDFILE="/run/grub-btrfsd.pid" -root_is_btrfs() { - [ "$(stat -f --format="%T" /)" == "btrfs" ] || return 1 - - return 0 -} - case "$1" in start) - root_is_btrfs || exit 0 + root_fs_type=$(volume_fs_type "/") - boot_mesg "Starting Grub/Btrfs snapshot manager..." - loadproc -b -p "$PIDFILE" /usr/bin/grub-btrfsd --syslog "$SNAPSHOTDIR" + case "$root_fs_type" in + btrfs) - # Store the gained PID to the defined pidfile - echo "$!" > "$PIDFILE" + boot_mesg "Starting GRUB/Btrfs Daemon..." + loadproc -b /usr/bin/grub-btrfsd --syslog "$SNAPSHOTDIR" + ;; + esac ;; stop) boot_mesg "Stopping grub-btrfsd..." - killproc -p "$PIDFILE" /usr/bin/grub-btrfsd - sleep 1; + killproc /usr/bin/grub-btrfsd ;; restart) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5f04e70f746261430f4600de2e5bff6922a7a511
by Arne Fitzenreiter 31 Mar '24

31 Mar '24

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 5f04e70f746261430f4600de2e5bff6922a7a511 (commit) from 2d4f4ebfa2e374e06eb1600520d36618932cdd3f (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 5f04e70f746261430f4600de2e5bff6922a7a511 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Mar 31 16:30:50 2024 +0200 grub-btrfs: fix grub-btrfs build and remove bugtracker url grub-btrfs try to reconfigure grub in the buildsystem and print always the bugtracker url on every error even when its not a bug Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/grub-btrfs | 1 - lfs/grub-btrfs | 3 ++- .../grub-btrfs-4.13-remove_bug_report_url.patch | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 src/patches/grub-btrfs/grub-btrfs-4.13-remove_bug_report_url.patch Difference in files: diff --git a/config/rootfiles/common/grub-btrfs b/config/rootfiles/common/grub-btrfs index ba7a8fc3e..1a91d38b2 100644 --- a/config/rootfiles/common/grub-btrfs +++ b/config/rootfiles/common/grub-btrfs @@ -1,4 +1,3 @@ -#boot/grub/grubenv etc/default/grub-btrfs etc/default/grub-btrfs/config etc/grub.d/41_snapshots-btrfs diff --git a/lfs/grub-btrfs b/lfs/grub-btrfs index 8dc0c4f3e..63428258e 100644 --- a/lfs/grub-btrfs +++ b/lfs/grub-btrfs @@ -73,7 +73,8 @@ $(subst %,%_BLAKE2,$(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 < $(DIR_SRC)/src/patches/grub-btrfs/grub-btrfs-4.13-remove_bug_report_url.patch $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && make install + cd $(DIR_APP) && GRUB_UPDATE_EXCLUDE=true make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/grub-btrfs/grub-btrfs-4.13-remove_bug_report_url.patch b/src/patches/grub-btrfs/grub-btrfs-4.13-remove_bug_report_url.patch new file mode 100644 index 000000000..fae632dd3 --- /dev/null +++ b/src/patches/grub-btrfs/grub-btrfs-4.13-remove_bug_report_url.patch @@ -0,0 +1,22 @@ +diff -Naur grub-btrfs-4.13.org/41_snapshots-btrfs grub-btrfs-4.13/41_snapshots-btrfs +--- grub-btrfs-4.13.org/41_snapshots-btrfs 2023-06-05 08:55:44.000000000 +0200 ++++ grub-btrfs-4.13/41_snapshots-btrfs 2024-03-31 15:18:56.660479209 +0200 +@@ -48,8 +48,7 @@ + print_error() + { + local err_msg="$*" +- local bug_report="If you think an error has occurred, please file a bug report at \"https://github.com/Antynea/grub-btrfs\"" +- printf "%s\n" "${err_msg}" "${bug_report}" >&2 ; ++ printf "%s\n" "${err_msg}" >&2 ; + exit 0 + } + +@@ -78,7 +77,7 @@ + [[ "${GRUB_BTRFS_DISABLE,,}" == "true" ]] && print_error "GRUB_BTRFS_DISABLE is set to true (default=false)" + if ! type btrfs >/dev/null 2>&1; then print_error "btrfs-progs isn't installed"; fi + [[ -f "${GRUB_BTRFS_MKCONFIG_LIB:-/usr/share/grub/grub-mkconfig_lib}" ]] && . "${GRUB_BTRFS_MKCONFIG_LIB:-/usr/share/grub/grub-mkconfig_lib}" || print_error "grub-mkconfig_lib couldn't be found" +-[[ "$(btrfs filesystem df / 2>&1)" == *"not a btrfs filesystem"* ]] && print_error "Root filesystem isn't btrfs" ++[[ "$(btrfs filesystem df / 2>&1)" == *"not a btrfs filesystem"* ]] && print_error "Root filesystem isn't btrfs, skipping..." + + printf "Detecting snapshots ...\n" >&2 ; + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2d4f4ebfa2e374e06eb1600520d36618932cdd3f
by Arne Fitzenreiter 31 Mar '24

31 Mar '24

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 2d4f4ebfa2e374e06eb1600520d36618932cdd3f (commit) via bb46f3bef8445a0dba2e92bbb614113a9a4adcaf (commit) via ee08f7aea1f9414bf13ff929a2236d747e7e6546 (commit) via 56d32cbe9150302ec5516c0c66f8c36aaa0a38a2 (commit) via 7c6b05dfb8a5270a8434f9304ea5b44f6d59da94 (commit) via 0972da95bf50e4528d09097c23673779aaf7a634 (commit) via bd49143228a4c79b8d70edb7ab3922b4d86336fc (commit) via 417182c49b3cceaea5925503fd772e66c37775bc (commit) via 64d6bbe5a37ea9fb0de816725e88e0692159b163 (commit) via 21f467d65a7a4d3927601731f59dc6ab5f895142 (commit) via ee16b227a55aa2ee61a906342ca322de3c0fcf67 (commit) via 2ef62acc017de41ff59e0dd76b405374a2b55d18 (commit) via d33b29e2b13de7730cd4a67f7aa2bde000776485 (commit) via c85407615508fb5c62ddc92b7a6e83e4a278901d (commit) via cf94463c4c5c7f7eb71c1ac4bcef2160446fab79 (commit) via c283a6f615f5fe4bea63d5534bda8a0c6270b486 (commit) via 16901fee6aa334a705cf67018277898f42834f5d (commit) via 1b8437340bc1c4b343640690692071795716ba80 (commit) from ce30d74893c436e163633635831453944f370499 (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 2d4f4ebfa2e374e06eb1600520d36618932cdd3f Merge: ce30d74893 bb46f3bef8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Mar 31 13:36:08 2024 +0200 Merge remote-tracking branch 'origin/master' into next Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: README.md | 8 ++-- config/cfgroot/ids-functions.pl | 56 +++++++--------------- .../perl-Archive-Peek-Libarchive} | 16 +++---- .../common/{perl-Try-Tiny => perl-Capture-Tiny} | 12 ++--- config/rootfiles/common/perl-Config-AutoConf | 6 +++ .../common/{perl-Try-Tiny => perl-Object-Tiny} | 12 ++--- config/rootfiles/common/protobuf-c | 4 +- config/rootfiles/common/xz | 34 ++++++++----- .../oldcore/{151 => 185}/filelists/aarch64/boost | 0 .../oldcore/{124 => 185}/filelists/aarch64/grub | 0 .../oldcore/{114 => 185}/filelists/apache2 | 0 .../oldcore/{125 => 185}/filelists/collectd | 0 config/rootfiles/oldcore/185/filelists/files | 1 + .../rootfiles/oldcore/{125 => 185}/filelists/kmod | 0 .../oldcore/{104 => 185}/filelists/libarchive | 0 .../oldcore/{169 => 185}/filelists/libtiff | 0 .../oldcore/{101 => 185}/filelists/libxml2 | 0 .../185/filelists/perl-Archive-Peek-Libarchive | 1 + .../oldcore/185/filelists/perl-Capture-Tiny | 1 + .../oldcore/185/filelists/perl-Config-AutoConf | 1 + .../oldcore/185/filelists/perl-Object-Tiny | 1 + .../oldcore/{180 => 185}/filelists/riscv64/boost | 0 .../oldcore/{182 => 185}/filelists/riscv64/grub | 0 .../oldcore/{151 => 185}/filelists/x86_64/boost | 0 .../oldcore/{100 => 185}/filelists/x86_64/grub | 0 config/rootfiles/oldcore/185/update.sh | 6 ++- html/cgi-bin/credits.cgi | 1 + lfs/foomatic | 2 +- lfs/frr | 2 +- ...-Net-CIDR-Lite => perl-Archive-Peek-Libarchive} | 11 ++--- lfs/{perl-MIME-Tools => perl-Capture-Tiny} | 6 +-- lfs/{perl-MIME-Tools => perl-Config-AutoConf} | 6 +-- lfs/{perl-MIME-Tools => perl-Object-Tiny} | 6 +-- lfs/sarg | 2 +- lfs/tor | 2 +- lfs/xz | 4 +- make.sh | 4 ++ src/initscripts/packages/frr | 9 ++-- 38 files changed, 113 insertions(+), 101 deletions(-) copy config/rootfiles/{packages/perl-gettext => common/perl-Archive-Peek-Libarchive} (66%) copy config/rootfiles/common/{perl-Try-Tiny => perl-Capture-Tiny} (50%) create mode 100644 config/rootfiles/common/perl-Config-AutoConf copy config/rootfiles/common/{perl-Try-Tiny => perl-Object-Tiny} (51%) copy config/rootfiles/oldcore/{151 => 185}/filelists/aarch64/boost (100%) copy config/rootfiles/oldcore/{124 => 185}/filelists/aarch64/grub (100%) copy config/rootfiles/oldcore/{114 => 185}/filelists/apache2 (100%) copy config/rootfiles/oldcore/{125 => 185}/filelists/collectd (100%) copy config/rootfiles/oldcore/{125 => 185}/filelists/kmod (100%) copy config/rootfiles/oldcore/{104 => 185}/filelists/libarchive (100%) copy config/rootfiles/oldcore/{169 => 185}/filelists/libtiff (100%) copy config/rootfiles/oldcore/{101 => 185}/filelists/libxml2 (100%) create mode 120000 config/rootfiles/oldcore/185/filelists/perl-Archive-Peek-Libarchive create mode 120000 config/rootfiles/oldcore/185/filelists/perl-Capture-Tiny create mode 120000 config/rootfiles/oldcore/185/filelists/perl-Config-AutoConf create mode 120000 config/rootfiles/oldcore/185/filelists/perl-Object-Tiny copy config/rootfiles/oldcore/{180 => 185}/filelists/riscv64/boost (100%) copy config/rootfiles/oldcore/{182 => 185}/filelists/riscv64/grub (100%) copy config/rootfiles/oldcore/{151 => 185}/filelists/x86_64/boost (100%) copy config/rootfiles/oldcore/{100 => 185}/filelists/x86_64/grub (100%) copy lfs/{perl-Net-CIDR-Lite => perl-Archive-Peek-Libarchive} (93%) copy lfs/{perl-MIME-Tools => perl-Capture-Tiny} (93%) copy lfs/{perl-MIME-Tools => perl-Config-AutoConf} (93%) copy lfs/{perl-MIME-Tools => perl-Object-Tiny} (93%) Difference in files: diff --git a/README.md b/README.md index df3d35717..03c3d79d1 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ IPFire is a hardened, versatile, state-of-the-art Open Source firewall based on Linux. Its ease of use, high performance in any scenario and extensibility make -it usable for everyone. For a full list of features have a look [here](https://www.ipfire.org/features). +it usable for everyone. For a full list of features have a look [here](https://www.ipfire.org/about). This repository contains the source code of IPFire 2.x which is used to build the whole distribution from scratch, since IPFire is not based on any other @@ -16,13 +16,13 @@ Just head over to https://www.ipfire.org/download # How do I use this software? -We have a long and detailed wiki located [here](https://wiki.ipfire.org/) which -should answers most of your questions. +We have a long and detailed documentation located [here](https://ipfire.org/docs) which +should answer most of your questions. # But I have some questions left. Where can I get support? You can ask your question at our community located [here](https://community.ipfire.org/). -A complete list of our support channels can be found [here](https://www.ipfire.org/support). +A complete list of our support channels can be found [here](https://www.ipfire.org/help). # How can I contribute? diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl index c29a5151f..3eb883aa9 100644 --- a/config/cfgroot/ids-functions.pl +++ b/config/cfgroot/ids-functions.pl @@ -30,7 +30,7 @@ require "${General::swroot}/network-functions.pl"; require "${General::swroot}/suricata/ruleset-sources"; # Load perl module to deal with Archives. -use Archive::Tar; +use Archive::Peek::Libarchive; # Load perl module to deal with files and path. use File::Basename; @@ -515,9 +515,6 @@ sub downloadruleset ($) { sub extractruleset ($) { my ($provider) = @_; - # Disable chown functionality when uncompressing files. - $Archive::Tar::CHOWN = "0"; - # Get full path and downloaded rulesfile for the given provider. my $tarball = &_get_dl_rulesfile($provider); @@ -547,13 +544,11 @@ sub extractruleset ($) { } elsif ( $type eq "archive") { # Initialize the tar module. - my $tar = Archive::Tar->new($tarball); - - # Get the filelist inside the tarball. - my @packed_files = $tar->list_files; + my $tar = Archive::Peek::Libarchive->new(filename => $tarball); - # Loop through the filelist. - foreach my $packed_file (@packed_files) { + # Loop through the archive + $tar->iterate( sub { + my ($packed_file, $content) = @_; my $destination; # Splitt the packed file into chunks. @@ -572,13 +567,13 @@ sub extractruleset ($) { # Handle rules files. } elsif ($file =~ m/\.rules$/) { # Skip rule files which are not located in the rules directory or archive root. - next unless(($packed_file =~ /^rules\//) || ($packed_file =~ /^$provider-rules\//) || ($packed_file !~ /\//)); + return unless(($packed_file =~ /^rules\//) || ($packed_file =~ /^$provider-rules\//) || ($packed_file !~ /\//)); # Skip deleted.rules. # # Mostly they have been taken out for correctness or performance reasons and therfore # it is not a great idea to enable any of them. - next if($file =~ m/deleted.rules$/); + return if($file =~ m/deleted.rules$/); my $rulesfilename; @@ -615,39 +610,24 @@ sub extractruleset ($) { $destination = "$tmp_rules_directory/$rulesfilename"; } else { # Skip all other files. - next; + return; } # Check if the destination file exists. unless(-e "$destination") { - # Extract the file to the temporary directory. - $tar->extract_file("$packed_file", "$destination"); + # Open filehandle to write the content to a new file. + open(FILE, ">", "$destination") or die "Could not open $destination. $!\n"; } else { - # Generate temporary file name, located in the temporary rules directory and a suffix of ".tmp". - my $tmp = File::Temp->new( SUFFIX => ".tmp", DIR => "$tmp_rules_directory", UNLINK => 0 ); - my $tmpfile = $tmp->filename(); - - # Extract the file to the new temporary file name. - $tar->extract_file("$packed_file", "$tmpfile"); - - # Open the the existing file. - open(DESTFILE, ">>", "$destination") or die "Could not open $destination. $!\n"; - open(TMPFILE, "<", "$tmpfile") or die "Could not open $tmpfile. $!\n"; - - # Loop through the content of the temporary file. - while (<TMPFILE>) { - # Append the content line by line to the destination file. - print DESTFILE "$_"; - } + # Open filehandle to append the content to the existing file. + open(FILE, ">>", "$destination") or die "Could not open $destination. $!\n"; + } - # Close the file handles. - close(TMPFILE); - close(DESTFILE); + # Write the extracted file content to the filehandle. + print FILE "$content" if ($content); - # Remove the temporary file. - unlink("$tmpfile"); - } - } + # Close the file handle. + close(FILE); + }); } } diff --git a/config/rootfiles/common/perl-Archive-Peek-Libarchive b/config/rootfiles/common/perl-Archive-Peek-Libarchive new file mode 100644 index 000000000..95e204562 --- /dev/null +++ b/config/rootfiles/common/perl-Archive-Peek-Libarchive @@ -0,0 +1,8 @@ +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Archive +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Archive/Peek +usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Archive/Peek/Libarchive.pm +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Archive/Peek +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Archive/Peek/Libarchive +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Archive/Peek/Libarchive/.packlist +usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Archive/Peek/Libarchive/Libarchive.so +#usr/share/man/man3/Archive::Peek::Libarchive.3 diff --git a/config/rootfiles/common/perl-Capture-Tiny b/config/rootfiles/common/perl-Capture-Tiny new file mode 100644 index 000000000..4fb874d29 --- /dev/null +++ b/config/rootfiles/common/perl-Capture-Tiny @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.36.0/Capture +#usr/lib/perl5/site_perl/5.36.0/Capture/Tiny.pm +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Capture +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Capture/Tiny +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Capture/Tiny/.packlist +#usr/share/man/man3/Capture::Tiny.3 diff --git a/config/rootfiles/common/perl-Config-AutoConf b/config/rootfiles/common/perl-Config-AutoConf new file mode 100644 index 000000000..e46d506cc --- /dev/null +++ b/config/rootfiles/common/perl-Config-AutoConf @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.36.0/Config +#usr/lib/perl5/site_perl/5.36.0/Config/AutoConf.pm +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Config +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Config/AutoConf +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Config/AutoConf/.packlist +#usr/share/man/man3/Config::AutoConf.3 diff --git a/config/rootfiles/common/perl-Object-Tiny b/config/rootfiles/common/perl-Object-Tiny new file mode 100644 index 000000000..3ec9488d8 --- /dev/null +++ b/config/rootfiles/common/perl-Object-Tiny @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.36.0/Object +usr/lib/perl5/site_perl/5.36.0/Object/Tiny.pm +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Object +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Object/Tiny +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Object/Tiny/.packlist +#usr/share/man/man3/Object::Tiny.3 diff --git a/config/rootfiles/common/protobuf-c b/config/rootfiles/common/protobuf-c index 56e6a2362..aed0319db 100644 --- a/config/rootfiles/common/protobuf-c +++ b/config/rootfiles/common/protobuf-c @@ -8,6 +8,6 @@ #usr/lib/libprotobuf-c.a #usr/lib/libprotobuf-c.la #usr/lib/libprotobuf-c.so -#usr/lib/libprotobuf-c.so.1 -#usr/lib/libprotobuf-c.so.1.0.0 +usr/lib/libprotobuf-c.so.1 +usr/lib/libprotobuf-c.so.1.0.0 #usr/lib/pkgconfig/libprotobuf-c.pc diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz index 73c0e4d24..f3818a083 100644 --- a/config/rootfiles/common/xz +++ b/config/rootfiles/common/xz @@ -41,18 +41,17 @@ usr/bin/xzmore #usr/lib/liblzma.la #usr/lib/liblzma.so usr/lib/liblzma.so.5 -usr/lib/liblzma.so.5.6.1 +usr/lib/liblzma.so.5.4.5 #usr/lib/pkgconfig/liblzma.pc #usr/share/doc/xz #usr/share/doc/xz/AUTHORS #usr/share/doc/xz/COPYING -#usr/share/doc/xz/COPYING.0BSD #usr/share/doc/xz/COPYING.GPLv2 #usr/share/doc/xz/NEWS #usr/share/doc/xz/README #usr/share/doc/xz/THANKS +#usr/share/doc/xz/TODO #usr/share/doc/xz/api -#usr/share/doc/xz/api/COPYING.CC-BY-SA-4.0 #usr/share/doc/xz/api/annotated.html #usr/share/doc/xz/api/base_8h.html #usr/share/doc/xz/api/bc_s.png @@ -121,15 +120,16 @@ usr/lib/liblzma.so.5.6.1 #usr/share/doc/xz/api/tabs.css #usr/share/doc/xz/api/version_8h.html #usr/share/doc/xz/api/vli_8h.html -#usr/share/doc/xz/api/xz-logo.png #usr/share/doc/xz/examples #usr/share/doc/xz/examples/00_README.txt #usr/share/doc/xz/examples/01_compress_easy.c #usr/share/doc/xz/examples/02_decompress.c #usr/share/doc/xz/examples/03_compress_custom.c #usr/share/doc/xz/examples/04_compress_easy_mt.c -#usr/share/doc/xz/examples/11_file_info.c #usr/share/doc/xz/examples/Makefile +#usr/share/doc/xz/examples_old +#usr/share/doc/xz/examples_old/xz_pipe_comp.c +#usr/share/doc/xz/examples_old/xz_pipe_decomp.c #usr/share/doc/xz/faq.txt #usr/share/doc/xz/history.txt #usr/share/doc/xz/lzma-file-format.txt @@ -168,7 +168,6 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/de/man1/lzless.1 #usr/share/man/de/man1/lzma.1 #usr/share/man/de/man1/lzmadec.1 -#usr/share/man/de/man1/lzmainfo.1 #usr/share/man/de/man1/lzmore.1 #usr/share/man/de/man1/unlzma.1 #usr/share/man/de/man1/unxz.1 @@ -185,16 +184,21 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/fr #usr/share/man/fr/man1 #usr/share/man/fr/man1/lzcat.1 +#usr/share/man/fr/man1/lzcmp.1 +#usr/share/man/fr/man1/lzdiff.1 #usr/share/man/fr/man1/lzless.1 #usr/share/man/fr/man1/lzma.1 #usr/share/man/fr/man1/lzmadec.1 -#usr/share/man/fr/man1/lzmainfo.1 +#usr/share/man/fr/man1/lzmore.1 #usr/share/man/fr/man1/unlzma.1 #usr/share/man/fr/man1/unxz.1 #usr/share/man/fr/man1/xz.1 #usr/share/man/fr/man1/xzcat.1 +#usr/share/man/fr/man1/xzcmp.1 #usr/share/man/fr/man1/xzdec.1 +#usr/share/man/fr/man1/xzdiff.1 #usr/share/man/fr/man1/xzless.1 +#usr/share/man/fr/man1/xzmore.1 #usr/share/man/ko #usr/share/man/ko/man1 #usr/share/man/ko/man1/lzcat.1 @@ -206,7 +210,6 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/ko/man1/lzless.1 #usr/share/man/ko/man1/lzma.1 #usr/share/man/ko/man1/lzmadec.1 -#usr/share/man/ko/man1/lzmainfo.1 #usr/share/man/ko/man1/lzmore.1 #usr/share/man/ko/man1/unlzma.1 #usr/share/man/ko/man1/unxz.1 @@ -246,16 +249,27 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/pt_BR #usr/share/man/pt_BR/man1 #usr/share/man/pt_BR/man1/lzcat.1 +#usr/share/man/pt_BR/man1/lzcmp.1 +#usr/share/man/pt_BR/man1/lzdiff.1 +#usr/share/man/pt_BR/man1/lzegrep.1 +#usr/share/man/pt_BR/man1/lzfgrep.1 +#usr/share/man/pt_BR/man1/lzgrep.1 #usr/share/man/pt_BR/man1/lzless.1 #usr/share/man/pt_BR/man1/lzma.1 #usr/share/man/pt_BR/man1/lzmadec.1 -#usr/share/man/pt_BR/man1/lzmainfo.1 +#usr/share/man/pt_BR/man1/lzmore.1 #usr/share/man/pt_BR/man1/unlzma.1 #usr/share/man/pt_BR/man1/unxz.1 #usr/share/man/pt_BR/man1/xz.1 #usr/share/man/pt_BR/man1/xzcat.1 +#usr/share/man/pt_BR/man1/xzcmp.1 #usr/share/man/pt_BR/man1/xzdec.1 +#usr/share/man/pt_BR/man1/xzdiff.1 +#usr/share/man/pt_BR/man1/xzegrep.1 +#usr/share/man/pt_BR/man1/xzfgrep.1 +#usr/share/man/pt_BR/man1/xzgrep.1 #usr/share/man/pt_BR/man1/xzless.1 +#usr/share/man/pt_BR/man1/xzmore.1 #usr/share/man/ro #usr/share/man/ro/man1 #usr/share/man/ro/man1/lzcat.1 @@ -267,7 +281,6 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/ro/man1/lzless.1 #usr/share/man/ro/man1/lzma.1 #usr/share/man/ro/man1/lzmadec.1 -#usr/share/man/ro/man1/lzmainfo.1 #usr/share/man/ro/man1/lzmore.1 #usr/share/man/ro/man1/unlzma.1 #usr/share/man/ro/man1/unxz.1 @@ -292,7 +305,6 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/uk/man1/lzless.1 #usr/share/man/uk/man1/lzma.1 #usr/share/man/uk/man1/lzmadec.1 -#usr/share/man/uk/man1/lzmainfo.1 #usr/share/man/uk/man1/lzmore.1 #usr/share/man/uk/man1/unlzma.1 #usr/share/man/uk/man1/unxz.1 diff --git a/config/rootfiles/oldcore/185/filelists/aarch64/boost b/config/rootfiles/oldcore/185/filelists/aarch64/boost new file mode 120000 index 000000000..807ad06be --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/aarch64/boost @@ -0,0 +1 @@ +../../../../common/aarch64/boost \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/aarch64/grub b/config/rootfiles/oldcore/185/filelists/aarch64/grub new file mode 120000 index 000000000..40ae85fb6 --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/aarch64/grub @@ -0,0 +1 @@ +../../../../common/aarch64/grub \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/apache2 b/config/rootfiles/oldcore/185/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/collectd b/config/rootfiles/oldcore/185/filelists/collectd new file mode 120000 index 000000000..871b32f14 --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/files b/config/rootfiles/oldcore/185/filelists/files index 09ce83886..53793fda1 100644 --- a/config/rootfiles/oldcore/185/filelists/files +++ b/config/rootfiles/oldcore/185/filelists/files @@ -50,6 +50,7 @@ srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/time.cgi +usr/lib/python3.10/lib-dynload/_lzma.cpython-310-xxxMACHINExxx-linux-gnu.so usr/local/bin/update-ids-ruleset var/ipfire/backup/bin/backup.pl var/ipfire/ids-functions.pl diff --git a/config/rootfiles/oldcore/185/filelists/kmod b/config/rootfiles/oldcore/185/filelists/kmod new file mode 120000 index 000000000..0020e197e --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/kmod @@ -0,0 +1 @@ +../../../common/kmod \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/libarchive b/config/rootfiles/oldcore/185/filelists/libarchive new file mode 120000 index 000000000..551f1f743 --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/libarchive @@ -0,0 +1 @@ +../../../common/libarchive \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/libtiff b/config/rootfiles/oldcore/185/filelists/libtiff new file mode 120000 index 000000000..dd89e3cda --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/libtiff @@ -0,0 +1 @@ +../../../common/libtiff \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/libxml2 b/config/rootfiles/oldcore/185/filelists/libxml2 new file mode 120000 index 000000000..242e69fa3 --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/libxml2 @@ -0,0 +1 @@ +../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/perl-Archive-Peek-Libarchive b/config/rootfiles/oldcore/185/filelists/perl-Archive-Peek-Libarchive new file mode 120000 index 000000000..328d7c70b --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/perl-Archive-Peek-Libarchive @@ -0,0 +1 @@ +../../../common/perl-Archive-Peek-Libarchive \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/perl-Capture-Tiny b/config/rootfiles/oldcore/185/filelists/perl-Capture-Tiny new file mode 120000 index 000000000..d1f2184c5 --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/perl-Capture-Tiny @@ -0,0 +1 @@ +../../../common/perl-Capture-Tiny \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/perl-Config-AutoConf b/config/rootfiles/oldcore/185/filelists/perl-Config-AutoConf new file mode 120000 index 000000000..d47aca341 --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/perl-Config-AutoConf @@ -0,0 +1 @@ +../../../common/perl-Config-AutoConf \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/perl-Object-Tiny b/config/rootfiles/oldcore/185/filelists/perl-Object-Tiny new file mode 120000 index 000000000..3beaee613 --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/perl-Object-Tiny @@ -0,0 +1 @@ +../../../common/perl-Object-Tiny \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/riscv64/boost b/config/rootfiles/oldcore/185/filelists/riscv64/boost new file mode 120000 index 000000000..cbc461c2b --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/riscv64/boost @@ -0,0 +1 @@ +../../../../common/riscv64/boost \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/riscv64/grub b/config/rootfiles/oldcore/185/filelists/riscv64/grub new file mode 120000 index 000000000..7013c0be5 --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/riscv64/grub @@ -0,0 +1 @@ +../../../../common/riscv64/grub \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/x86_64/boost b/config/rootfiles/oldcore/185/filelists/x86_64/boost new file mode 120000 index 000000000..9ed31e1d5 --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/x86_64/boost @@ -0,0 +1 @@ +../../../../common/x86_64/boost \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/filelists/x86_64/grub b/config/rootfiles/oldcore/185/filelists/x86_64/grub new file mode 120000 index 000000000..78d3bd784 --- /dev/null +++ b/config/rootfiles/oldcore/185/filelists/x86_64/grub @@ -0,0 +1 @@ +../../../../common/x86_64/grub \ No newline at end of file diff --git a/config/rootfiles/oldcore/185/update.sh b/config/rootfiles/oldcore/185/update.sh index f86013c0d..5c76a97b9 100644 --- a/config/rootfiles/oldcore/185/update.sh +++ b/config/rootfiles/oldcore/185/update.sh @@ -67,7 +67,8 @@ rm -rvf \ /var/ipfire/geoip-functions.pl \ /var/ipfire/dhcpc/dhcpcd-hooks/00-linux \ /var/ipfire/dhcpc/dhcpcd-hooks/02-dump \ - /var/lib/location/tmp* + /var/lib/location/tmp* \ + /usr/lib/liblzma.so.5.6.* # update linker config ldconfig @@ -88,12 +89,15 @@ chmod -v 640 /etc/sudoers.d/* # Start services telinit u /etc/init.d/sshd restart +/etc/init.d/apache restart /etc/init.d/suricata restart /etc/init.d/unbound restart /etc/init.d/ntp start if [ -f /var/ipfire/proxy/enable ]; then /etc/init.d/squid start fi +/etc/init.d/collectd restart + ## Modify ovpnconfig according to bug 13548 for no-pass entry for N2N client connections # Check if ovpnconfig exists and is not empty if [ -s /var/ipfire/ovpn/ovpnconfig ]; then diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index ae17b92d8..91b134cf4 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -117,6 +117,7 @@ Hans Horsten, Jakub Ratajczak, Jorrit de Jonge, Przemek Zdroik, +Rico Hoppe, Roberto Peña, Sebastien GISLAIN, Alexander Rudolf Gruber, diff --git a/lfs/foomatic b/lfs/foomatic index d057505a9..21a5a589a 100644 --- a/lfs/foomatic +++ b/lfs/foomatic @@ -37,7 +37,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/foomatic-filters-$(VER_FILTERS) TARGET = $(DIR_INFO)/$(THISAPP) PROG = foomatic -PAK_VER = 9 +PAK_VER = 10 DEPS = cups ghostscript hplip diff --git a/lfs/frr b/lfs/frr index f0954aae5..ea5a6b9e9 100644 --- a/lfs/frr +++ b/lfs/frr @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = frr -PAK_VER = 8 +PAK_VER = 9 DEPS = diff --git a/lfs/perl-Archive-Peek-Libarchive b/lfs/perl-Archive-Peek-Libarchive new file mode 100644 index 000000000..fd1ae85d6 --- /dev/null +++ b/lfs/perl-Archive-Peek-Libarchive @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config +VER = 0.38 + +THISAPP = Archive-Peek-Libarchive-$(VER) +DL_FILE = ${THISAPP}.tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 142d54a6fe6b948129307ef7b0106905b2ddf858682d07a4f0815e6674f7fd425f462a800487949e18442884d6c743aeed049ebef7138fe0bfbbabac588dc3b3 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/perl-Capture-Tiny b/lfs/perl-Capture-Tiny new file mode 100644 index 000000000..bb6b45e82 --- /dev/null +++ b/lfs/perl-Capture-Tiny @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.48 + +THISAPP = Capture-Tiny-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = e6de05459478131c5129dd5ffc84744e2d3440c2e31545ed101c2986b2bc970106f126286dea50350f4b5ea330ffac423693d755e29850883bdc215437bf7488 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/perl-Config-AutoConf b/lfs/perl-Config-AutoConf new file mode 100644 index 000000000..ce12c295b --- /dev/null +++ b/lfs/perl-Config-AutoConf @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.320 + +THISAPP = Config-AutoConf-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 649ef56196a5984437f299f96b156f63560a247a35f0547145e3519648ba5fc86c057957570b45b696c2092a56deaf0595d9191b4fe389e0a0f183b79d6c500a + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/perl-Object-Tiny b/lfs/perl-Object-Tiny new file mode 100644 index 000000000..db19a6a25 --- /dev/null +++ b/lfs/perl-Object-Tiny @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.09 + +THISAPP = Object-Tiny-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 0383d8af24d8c0d76dfc3cb6a65c6422f631d5ca4f9e083cf1077cc220b7aa27852c23ad5535bbcab74c7f5e9d1cba8f0f5c4d8da48c07a300d3b9e995b69d5c + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/sarg b/lfs/sarg index d38933fb0..1b8a077a6 100644 --- a/lfs/sarg +++ b/lfs/sarg @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sarg -PAK_VER = 6 +PAK_VER = 7 DEPS = diff --git a/lfs/tor b/lfs/tor index 74b738512..aed30805f 100644 --- a/lfs/tor +++ b/lfs/tor @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 83 +PAK_VER = 84 DEPS = libseccomp diff --git a/lfs/xz b/lfs/xz index cbec430d4..0a1763340 100644 --- a/lfs/xz +++ b/lfs/xz @@ -24,7 +24,7 @@ include Config -VER = 5.6.1 +VER = 5.4.5 THISAPP = xz-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3a1cf93d7223eb57e78eabe828a3d623acac5824ada299470e3126692ef89d1648293aef32468d70a5289611969d5299180c1b373dfbda002a49f3afc729d925 +$(DL_FILE)_BLAKE2 = 08d9afebd927ea5d155515a4c9eedda4d1a249f2b1ab6ada11f50e5b7a3c90b389b32378ab1c0872c7f4627de8dff37149d85e49f7f4d30614add37320ec4f3e install : $(TARGET) diff --git a/make.sh b/make.sh index e025f260f..f15e93acb 100755 --- a/make.sh +++ b/make.sh @@ -1377,6 +1377,10 @@ buildipfire() { lfsmake2 perl-Crypt-PasswdMD5 lfsmake2 perl-Net-Telnet lfsmake2 perl-JSON + lfsmake2 perl-Capture-Tiny + lfsmake2 perl-Config-AutoConf + lfsmake2 perl-Object-Tiny + lfsmake2 perl-Archive-Peek-Libarchive lfsmake2 python3-inotify lfsmake2 python3-docutils lfsmake2 python3-daemon diff --git a/src/initscripts/packages/frr b/src/initscripts/packages/frr index 867c4b98d..22cf2f7aa 100644 --- a/src/initscripts/packages/frr +++ b/src/initscripts/packages/frr @@ -22,7 +22,7 @@ . /etc/sysconfig/rc . ${rc_functions} -DAEMONS="zebra bgpd ospfd staticd" +DAEMONS="mgmtd zebra bgpd ospfd staticd" case "${1}" in start) @@ -51,8 +51,11 @@ case "${1}" in ;; reload) - boot_mesg "Reloading FRRouting..." - reloadproc /usr/sbin/frr-reload + # Reload all daemons + for daemon in ${DAEMONS}; do + boot_mesg "Reloading FRRouting ${daemon}..." + reloadproc "/usr/sbin/${daemon}" + done ;; restart) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. bb46f3bef8445a0dba2e92bbb614113a9a4adcaf
by Arne Fitzenreiter 31 Mar '24

31 Mar '24

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, master has been updated via bb46f3bef8445a0dba2e92bbb614113a9a4adcaf (commit) from ee08f7aea1f9414bf13ff929a2236d747e7e6546 (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 bb46f3bef8445a0dba2e92bbb614113a9a4adcaf Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Mar 31 13:27:46 2024 +0200 core185: excplicit erase liblzma.so.5.6.* because if this file exist the cleanap script will remove the older version after downgrade and the system still use the malewared version. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/185/update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/update.sh index 28f18a7da..5c76a97b9 100644 --- a/config/rootfiles/core/185/update.sh +++ b/config/rootfiles/core/185/update.sh @@ -67,7 +67,8 @@ rm -rvf \ /var/ipfire/geoip-functions.pl \ /var/ipfire/dhcpc/dhcpcd-hooks/00-linux \ /var/ipfire/dhcpc/dhcpcd-hooks/02-dump \ - /var/lib/location/tmp* + /var/lib/location/tmp* \ + /usr/lib/liblzma.so.5.6.* # update linker config ldconfig hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ce30d74893c436e163633635831453944f370499
by Arne Fitzenreiter 31 Mar '24

31 Mar '24

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 ce30d74893c436e163633635831453944f370499 (commit) from 0a201087fcca5a418cb090b071b0fb3c53cd5e06 (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 ce30d74893c436e163633635831453944f370499 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Mar 31 10:49:46 2024 +0200 kernel: update to 6.6.23 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.x86_64-ipfire | 2 +- lfs/linux | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 319aa2eff..9f7abd58f 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.22-ipfire Kernel Configuration +# Linux/x86 6.6.23-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/lfs/linux b/lfs/linux index 369e94dc1..9383a3296 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.22 +VER = 6.6.23 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = cea542524dbaea79c27e602b3e0534b5b95243ded95abdcab48f7ab1daf5f6de7231b24d2bc42e52fa27f98be9237534fb92f27ff1ba847df72e363b6147d3ab +$(DL_FILE)_BLAKE2 = b00e2c084f9d7a4fcda0a9404fd897ca1fc90d660dd1063d699c8ec612c6a35c494ce14c91f458a1f77f2a70ce6612e019e5fc553b571ee669b5070f97841a02 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. ee08f7aea1f9414bf13ff929a2236d747e7e6546
by Michael Tremer 30 Mar '24

30 Mar '24

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, master has been updated via ee08f7aea1f9414bf13ff929a2236d747e7e6546 (commit) via 56d32cbe9150302ec5516c0c66f8c36aaa0a38a2 (commit) via 7c6b05dfb8a5270a8434f9304ea5b44f6d59da94 (commit) via 0972da95bf50e4528d09097c23673779aaf7a634 (commit) from bd49143228a4c79b8d70edb7ab3922b4d86336fc (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 ee08f7aea1f9414bf13ff929a2236d747e7e6546 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 30 12:14:51 2024 +0000 frr: Bump release version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 56d32cbe9150302ec5516c0c66f8c36aaa0a38a2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 28 17:41:12 2024 +0000 frr: Update reloading all services Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7c6b05dfb8a5270a8434f9304ea5b44f6d59da94 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 28 17:41:11 2024 +0000 frr: Start the management daemon, too This daemon is running the configuration validation and required to run at all times. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0972da95bf50e4528d09097c23673779aaf7a634 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 28 17:41:10 2024 +0000 protobuf-c: Ship libraries FRR links against this and fails to start without. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/protobuf-c | 4 ++-- lfs/frr | 2 +- src/initscripts/packages/frr | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/common/protobuf-c b/config/rootfiles/common/protobuf-c index 56e6a2362..aed0319db 100644 --- a/config/rootfiles/common/protobuf-c +++ b/config/rootfiles/common/protobuf-c @@ -8,6 +8,6 @@ #usr/lib/libprotobuf-c.a #usr/lib/libprotobuf-c.la #usr/lib/libprotobuf-c.so -#usr/lib/libprotobuf-c.so.1 -#usr/lib/libprotobuf-c.so.1.0.0 +usr/lib/libprotobuf-c.so.1 +usr/lib/libprotobuf-c.so.1.0.0 #usr/lib/pkgconfig/libprotobuf-c.pc diff --git a/lfs/frr b/lfs/frr index f0954aae5..ea5a6b9e9 100644 --- a/lfs/frr +++ b/lfs/frr @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = frr -PAK_VER = 8 +PAK_VER = 9 DEPS = diff --git a/src/initscripts/packages/frr b/src/initscripts/packages/frr index 867c4b98d..22cf2f7aa 100644 --- a/src/initscripts/packages/frr +++ b/src/initscripts/packages/frr @@ -22,7 +22,7 @@ . /etc/sysconfig/rc . ${rc_functions} -DAEMONS="zebra bgpd ospfd staticd" +DAEMONS="mgmtd zebra bgpd ospfd staticd" case "${1}" in start) @@ -51,8 +51,11 @@ case "${1}" in ;; reload) - boot_mesg "Reloading FRRouting..." - reloadproc /usr/sbin/frr-reload + # Reload all daemons + for daemon in ${DAEMONS}; do + boot_mesg "Reloading FRRouting ${daemon}..." + reloadproc "/usr/sbin/${daemon}" + done ;; restart) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. bd49143228a4c79b8d70edb7ab3922b4d86336fc
by Michael Tremer 30 Mar '24

30 Mar '24

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, master has been updated via bd49143228a4c79b8d70edb7ab3922b4d86336fc (commit) via 417182c49b3cceaea5925503fd772e66c37775bc (commit) via 64d6bbe5a37ea9fb0de816725e88e0692159b163 (commit) via 21f467d65a7a4d3927601731f59dc6ab5f895142 (commit) via ee16b227a55aa2ee61a906342ca322de3c0fcf67 (commit) via 2ef62acc017de41ff59e0dd76b405374a2b55d18 (commit) via d33b29e2b13de7730cd4a67f7aa2bde000776485 (commit) via c85407615508fb5c62ddc92b7a6e83e4a278901d (commit) via cf94463c4c5c7f7eb71c1ac4bcef2160446fab79 (commit) via c283a6f615f5fe4bea63d5534bda8a0c6270b486 (commit) via 16901fee6aa334a705cf67018277898f42834f5d (commit) via 1b8437340bc1c4b343640690692071795716ba80 (commit) from 9dd2a4635fbc9d3da96c7916cd0bf2d5cd24d145 (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 bd49143228a4c79b8d70edb7ab3922b4d86336fc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 30 12:13:08 2024 +0000 make.sh: Update contributors Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 417182c49b3cceaea5925503fd772e66c37775bc Author: Rico Hoppe <rico.hoppe(a)ipfire.org> Date: Thu Mar 28 09:51:53 2024 +0000 README.md: fix minor typo Signed-off-by: Rico Hoppe <rico.hoppe(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 64d6bbe5a37ea9fb0de816725e88e0692159b163 Author: Rico Hoppe <rico.hoppe(a)ipfire.org> Date: Thu Mar 28 09:51:52 2024 +0000 README.md: update text & adjust links to new URLs - links for: about, documentation, help - wording: wiki to documentation Signed-off-by: Rico Hoppe <rico.hoppe(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 21f467d65a7a4d3927601731f59dc6ab5f895142 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 30 12:11:42 2024 +0000 core185: Ship new perl modules for libarchive Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ee16b227a55aa2ee61a906342ca322de3c0fcf67 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Mar 30 12:35:30 2024 +0100 ids-functions.pl: Use libarchive to extract archives This gives us a lot of benefits: * Speed up the extraction process * More supported archive types due the power of libarchive * Support of passphrase protected archives It also fixes a problem with non extracted files next to a zero sized file inside an archive. Fixes #13632. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2ef62acc017de41ff59e0dd76b405374a2b55d18 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Mar 30 12:35:29 2024 +0100 perl-Archive-Peek-Libarchive: New package As very simple XS based perl binding for libarchive to get header data and extract files. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d33b29e2b13de7730cd4a67f7aa2bde000776485 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Mar 30 12:35:28 2024 +0100 perl-Object-Tiny: New package This is a runtime dependency of perl-Archive-Peek-Libarchive Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c85407615508fb5c62ddc92b7a6e83e4a278901d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Mar 30 12:35:27 2024 +0100 perl-Config-AutoConf: New package This is only a build dependency for perl-Arhive-Peek-Libarchive and will not be installed on a system Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cf94463c4c5c7f7eb71c1ac4bcef2160446fab79 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Mar 30 12:35:26 2024 +0100 perl-Capture-Tiny: New package This is only a build dependency for perl-Config-AutoConf and will not be installed on a system Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c283a6f615f5fe4bea63d5534bda8a0c6270b486 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 30 12:07:22 2024 +0000 core185: Ship everything that is linked against XZ This is a precautionary step to avoid that we have any issues to face because of a downgrade as new symbols have been added to liblzma 5.6.0. Furthermore, this should avoid shipping any traces of any other potential malware in XZ that has been added in 5.6.0 or after. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 16901fee6aa334a705cf67018277898f42834f5d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 30 11:58:24 2024 +0000 xz: Remove excess whitespace Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1b8437340bc1c4b343640690692071795716ba80 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sat Mar 30 09:14:58 2024 +0100 xz: Revert back to version 5.4.5 due to backdoor issue - xz version 5.6.0 and 5.6.1 discovered to have been backdoored by what looks to have been one of the xz devs. - IPFire looks not to be affected by the problem as we don't patch openssh to be linked with liblzma - However due to question marks about what else might be in these 5.6.x versions it is better to revert back to a version that did not have the build-to-host.m4 file with the code that modifies the build if it meets certain criteria. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: README.md | 8 ++-- config/cfgroot/ids-functions.pl | 56 +++++++--------------- .../perl-Archive-Peek-Libarchive} | 16 +++---- .../common/{perl-Try-Tiny => perl-Capture-Tiny} | 12 ++--- config/rootfiles/common/perl-Config-AutoConf | 6 +++ .../common/{perl-Try-Tiny => perl-Object-Tiny} | 12 ++--- config/rootfiles/common/xz | 34 ++++++++----- .../151 => core/185}/filelists/aarch64/boost | 0 .../124 => core/185}/filelists/aarch64/grub | 0 .../{oldcore/114 => core/185}/filelists/apache2 | 0 .../{oldcore/125 => core/185}/filelists/collectd | 0 config/rootfiles/core/185/filelists/files | 1 + .../{oldcore/125 => core/185}/filelists/kmod | 0 .../{oldcore/104 => core/185}/filelists/libarchive | 0 .../{oldcore/169 => core/185}/filelists/libtiff | 0 .../{oldcore/101 => core/185}/filelists/libxml2 | 0 .../185/filelists/perl-Archive-Peek-Libarchive | 1 + .../rootfiles/core/185/filelists/perl-Capture-Tiny | 1 + .../core/185/filelists/perl-Config-AutoConf | 1 + .../rootfiles/core/185/filelists/perl-Object-Tiny | 1 + .../180 => core/185}/filelists/riscv64/boost | 0 .../182 => core/185}/filelists/riscv64/grub | 0 .../151 => core/185}/filelists/x86_64/boost | 0 .../100 => core/185}/filelists/x86_64/grub | 0 config/rootfiles/core/185/update.sh | 3 ++ html/cgi-bin/credits.cgi | 1 + lfs/foomatic | 2 +- ...-Net-CIDR-Lite => perl-Archive-Peek-Libarchive} | 11 ++--- lfs/{perl-MIME-Tools => perl-Capture-Tiny} | 6 +-- lfs/{perl-MIME-Tools => perl-Config-AutoConf} | 6 +-- lfs/{perl-MIME-Tools => perl-Object-Tiny} | 6 +-- lfs/sarg | 2 +- lfs/tor | 2 +- lfs/xz | 4 +- make.sh | 4 ++ 35 files changed, 102 insertions(+), 94 deletions(-) copy config/rootfiles/{packages/perl-gettext => common/perl-Archive-Peek-Libarchive} (66%) copy config/rootfiles/common/{perl-Try-Tiny => perl-Capture-Tiny} (50%) create mode 100644 config/rootfiles/common/perl-Config-AutoConf copy config/rootfiles/common/{perl-Try-Tiny => perl-Object-Tiny} (51%) copy config/rootfiles/{oldcore/151 => core/185}/filelists/aarch64/boost (100%) copy config/rootfiles/{oldcore/124 => core/185}/filelists/aarch64/grub (100%) copy config/rootfiles/{oldcore/114 => core/185}/filelists/apache2 (100%) copy config/rootfiles/{oldcore/125 => core/185}/filelists/collectd (100%) copy config/rootfiles/{oldcore/125 => core/185}/filelists/kmod (100%) copy config/rootfiles/{oldcore/104 => core/185}/filelists/libarchive (100%) copy config/rootfiles/{oldcore/169 => core/185}/filelists/libtiff (100%) copy config/rootfiles/{oldcore/101 => core/185}/filelists/libxml2 (100%) create mode 120000 config/rootfiles/core/185/filelists/perl-Archive-Peek-Libarchive create mode 120000 config/rootfiles/core/185/filelists/perl-Capture-Tiny create mode 120000 config/rootfiles/core/185/filelists/perl-Config-AutoConf create mode 120000 config/rootfiles/core/185/filelists/perl-Object-Tiny copy config/rootfiles/{oldcore/180 => core/185}/filelists/riscv64/boost (100%) copy config/rootfiles/{oldcore/182 => core/185}/filelists/riscv64/grub (100%) copy config/rootfiles/{oldcore/151 => core/185}/filelists/x86_64/boost (100%) copy config/rootfiles/{oldcore/100 => core/185}/filelists/x86_64/grub (100%) copy lfs/{perl-Net-CIDR-Lite => perl-Archive-Peek-Libarchive} (93%) copy lfs/{perl-MIME-Tools => perl-Capture-Tiny} (93%) copy lfs/{perl-MIME-Tools => perl-Config-AutoConf} (93%) copy lfs/{perl-MIME-Tools => perl-Object-Tiny} (93%) Difference in files: diff --git a/README.md b/README.md index df3d35717..03c3d79d1 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ IPFire is a hardened, versatile, state-of-the-art Open Source firewall based on Linux. Its ease of use, high performance in any scenario and extensibility make -it usable for everyone. For a full list of features have a look [here](https://www.ipfire.org/features). +it usable for everyone. For a full list of features have a look [here](https://www.ipfire.org/about). This repository contains the source code of IPFire 2.x which is used to build the whole distribution from scratch, since IPFire is not based on any other @@ -16,13 +16,13 @@ Just head over to https://www.ipfire.org/download # How do I use this software? -We have a long and detailed wiki located [here](https://wiki.ipfire.org/) which -should answers most of your questions. +We have a long and detailed documentation located [here](https://ipfire.org/docs) which +should answer most of your questions. # But I have some questions left. Where can I get support? You can ask your question at our community located [here](https://community.ipfire.org/). -A complete list of our support channels can be found [here](https://www.ipfire.org/support). +A complete list of our support channels can be found [here](https://www.ipfire.org/help). # How can I contribute? diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl index c29a5151f..3eb883aa9 100644 --- a/config/cfgroot/ids-functions.pl +++ b/config/cfgroot/ids-functions.pl @@ -30,7 +30,7 @@ require "${General::swroot}/network-functions.pl"; require "${General::swroot}/suricata/ruleset-sources"; # Load perl module to deal with Archives. -use Archive::Tar; +use Archive::Peek::Libarchive; # Load perl module to deal with files and path. use File::Basename; @@ -515,9 +515,6 @@ sub downloadruleset ($) { sub extractruleset ($) { my ($provider) = @_; - # Disable chown functionality when uncompressing files. - $Archive::Tar::CHOWN = "0"; - # Get full path and downloaded rulesfile for the given provider. my $tarball = &_get_dl_rulesfile($provider); @@ -547,13 +544,11 @@ sub extractruleset ($) { } elsif ( $type eq "archive") { # Initialize the tar module. - my $tar = Archive::Tar->new($tarball); - - # Get the filelist inside the tarball. - my @packed_files = $tar->list_files; + my $tar = Archive::Peek::Libarchive->new(filename => $tarball); - # Loop through the filelist. - foreach my $packed_file (@packed_files) { + # Loop through the archive + $tar->iterate( sub { + my ($packed_file, $content) = @_; my $destination; # Splitt the packed file into chunks. @@ -572,13 +567,13 @@ sub extractruleset ($) { # Handle rules files. } elsif ($file =~ m/\.rules$/) { # Skip rule files which are not located in the rules directory or archive root. - next unless(($packed_file =~ /^rules\//) || ($packed_file =~ /^$provider-rules\//) || ($packed_file !~ /\//)); + return unless(($packed_file =~ /^rules\//) || ($packed_file =~ /^$provider-rules\//) || ($packed_file !~ /\//)); # Skip deleted.rules. # # Mostly they have been taken out for correctness or performance reasons and therfore # it is not a great idea to enable any of them. - next if($file =~ m/deleted.rules$/); + return if($file =~ m/deleted.rules$/); my $rulesfilename; @@ -615,39 +610,24 @@ sub extractruleset ($) { $destination = "$tmp_rules_directory/$rulesfilename"; } else { # Skip all other files. - next; + return; } # Check if the destination file exists. unless(-e "$destination") { - # Extract the file to the temporary directory. - $tar->extract_file("$packed_file", "$destination"); + # Open filehandle to write the content to a new file. + open(FILE, ">", "$destination") or die "Could not open $destination. $!\n"; } else { - # Generate temporary file name, located in the temporary rules directory and a suffix of ".tmp". - my $tmp = File::Temp->new( SUFFIX => ".tmp", DIR => "$tmp_rules_directory", UNLINK => 0 ); - my $tmpfile = $tmp->filename(); - - # Extract the file to the new temporary file name. - $tar->extract_file("$packed_file", "$tmpfile"); - - # Open the the existing file. - open(DESTFILE, ">>", "$destination") or die "Could not open $destination. $!\n"; - open(TMPFILE, "<", "$tmpfile") or die "Could not open $tmpfile. $!\n"; - - # Loop through the content of the temporary file. - while (<TMPFILE>) { - # Append the content line by line to the destination file. - print DESTFILE "$_"; - } + # Open filehandle to append the content to the existing file. + open(FILE, ">>", "$destination") or die "Could not open $destination. $!\n"; + } - # Close the file handles. - close(TMPFILE); - close(DESTFILE); + # Write the extracted file content to the filehandle. + print FILE "$content" if ($content); - # Remove the temporary file. - unlink("$tmpfile"); - } - } + # Close the file handle. + close(FILE); + }); } } diff --git a/config/rootfiles/common/perl-Archive-Peek-Libarchive b/config/rootfiles/common/perl-Archive-Peek-Libarchive new file mode 100644 index 000000000..95e204562 --- /dev/null +++ b/config/rootfiles/common/perl-Archive-Peek-Libarchive @@ -0,0 +1,8 @@ +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Archive +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Archive/Peek +usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Archive/Peek/Libarchive.pm +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Archive/Peek +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Archive/Peek/Libarchive +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Archive/Peek/Libarchive/.packlist +usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Archive/Peek/Libarchive/Libarchive.so +#usr/share/man/man3/Archive::Peek::Libarchive.3 diff --git a/config/rootfiles/common/perl-Capture-Tiny b/config/rootfiles/common/perl-Capture-Tiny new file mode 100644 index 000000000..4fb874d29 --- /dev/null +++ b/config/rootfiles/common/perl-Capture-Tiny @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.36.0/Capture +#usr/lib/perl5/site_perl/5.36.0/Capture/Tiny.pm +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Capture +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Capture/Tiny +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Capture/Tiny/.packlist +#usr/share/man/man3/Capture::Tiny.3 diff --git a/config/rootfiles/common/perl-Config-AutoConf b/config/rootfiles/common/perl-Config-AutoConf new file mode 100644 index 000000000..e46d506cc --- /dev/null +++ b/config/rootfiles/common/perl-Config-AutoConf @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.36.0/Config +#usr/lib/perl5/site_perl/5.36.0/Config/AutoConf.pm +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Config +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Config/AutoConf +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Config/AutoConf/.packlist +#usr/share/man/man3/Config::AutoConf.3 diff --git a/config/rootfiles/common/perl-Object-Tiny b/config/rootfiles/common/perl-Object-Tiny new file mode 100644 index 000000000..3ec9488d8 --- /dev/null +++ b/config/rootfiles/common/perl-Object-Tiny @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.36.0/Object +usr/lib/perl5/site_perl/5.36.0/Object/Tiny.pm +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Object +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Object/Tiny +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Object/Tiny/.packlist +#usr/share/man/man3/Object::Tiny.3 diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz index 73c0e4d24..f3818a083 100644 --- a/config/rootfiles/common/xz +++ b/config/rootfiles/common/xz @@ -41,18 +41,17 @@ usr/bin/xzmore #usr/lib/liblzma.la #usr/lib/liblzma.so usr/lib/liblzma.so.5 -usr/lib/liblzma.so.5.6.1 +usr/lib/liblzma.so.5.4.5 #usr/lib/pkgconfig/liblzma.pc #usr/share/doc/xz #usr/share/doc/xz/AUTHORS #usr/share/doc/xz/COPYING -#usr/share/doc/xz/COPYING.0BSD #usr/share/doc/xz/COPYING.GPLv2 #usr/share/doc/xz/NEWS #usr/share/doc/xz/README #usr/share/doc/xz/THANKS +#usr/share/doc/xz/TODO #usr/share/doc/xz/api -#usr/share/doc/xz/api/COPYING.CC-BY-SA-4.0 #usr/share/doc/xz/api/annotated.html #usr/share/doc/xz/api/base_8h.html #usr/share/doc/xz/api/bc_s.png @@ -121,15 +120,16 @@ usr/lib/liblzma.so.5.6.1 #usr/share/doc/xz/api/tabs.css #usr/share/doc/xz/api/version_8h.html #usr/share/doc/xz/api/vli_8h.html -#usr/share/doc/xz/api/xz-logo.png #usr/share/doc/xz/examples #usr/share/doc/xz/examples/00_README.txt #usr/share/doc/xz/examples/01_compress_easy.c #usr/share/doc/xz/examples/02_decompress.c #usr/share/doc/xz/examples/03_compress_custom.c #usr/share/doc/xz/examples/04_compress_easy_mt.c -#usr/share/doc/xz/examples/11_file_info.c #usr/share/doc/xz/examples/Makefile +#usr/share/doc/xz/examples_old +#usr/share/doc/xz/examples_old/xz_pipe_comp.c +#usr/share/doc/xz/examples_old/xz_pipe_decomp.c #usr/share/doc/xz/faq.txt #usr/share/doc/xz/history.txt #usr/share/doc/xz/lzma-file-format.txt @@ -168,7 +168,6 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/de/man1/lzless.1 #usr/share/man/de/man1/lzma.1 #usr/share/man/de/man1/lzmadec.1 -#usr/share/man/de/man1/lzmainfo.1 #usr/share/man/de/man1/lzmore.1 #usr/share/man/de/man1/unlzma.1 #usr/share/man/de/man1/unxz.1 @@ -185,16 +184,21 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/fr #usr/share/man/fr/man1 #usr/share/man/fr/man1/lzcat.1 +#usr/share/man/fr/man1/lzcmp.1 +#usr/share/man/fr/man1/lzdiff.1 #usr/share/man/fr/man1/lzless.1 #usr/share/man/fr/man1/lzma.1 #usr/share/man/fr/man1/lzmadec.1 -#usr/share/man/fr/man1/lzmainfo.1 +#usr/share/man/fr/man1/lzmore.1 #usr/share/man/fr/man1/unlzma.1 #usr/share/man/fr/man1/unxz.1 #usr/share/man/fr/man1/xz.1 #usr/share/man/fr/man1/xzcat.1 +#usr/share/man/fr/man1/xzcmp.1 #usr/share/man/fr/man1/xzdec.1 +#usr/share/man/fr/man1/xzdiff.1 #usr/share/man/fr/man1/xzless.1 +#usr/share/man/fr/man1/xzmore.1 #usr/share/man/ko #usr/share/man/ko/man1 #usr/share/man/ko/man1/lzcat.1 @@ -206,7 +210,6 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/ko/man1/lzless.1 #usr/share/man/ko/man1/lzma.1 #usr/share/man/ko/man1/lzmadec.1 -#usr/share/man/ko/man1/lzmainfo.1 #usr/share/man/ko/man1/lzmore.1 #usr/share/man/ko/man1/unlzma.1 #usr/share/man/ko/man1/unxz.1 @@ -246,16 +249,27 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/pt_BR #usr/share/man/pt_BR/man1 #usr/share/man/pt_BR/man1/lzcat.1 +#usr/share/man/pt_BR/man1/lzcmp.1 +#usr/share/man/pt_BR/man1/lzdiff.1 +#usr/share/man/pt_BR/man1/lzegrep.1 +#usr/share/man/pt_BR/man1/lzfgrep.1 +#usr/share/man/pt_BR/man1/lzgrep.1 #usr/share/man/pt_BR/man1/lzless.1 #usr/share/man/pt_BR/man1/lzma.1 #usr/share/man/pt_BR/man1/lzmadec.1 -#usr/share/man/pt_BR/man1/lzmainfo.1 +#usr/share/man/pt_BR/man1/lzmore.1 #usr/share/man/pt_BR/man1/unlzma.1 #usr/share/man/pt_BR/man1/unxz.1 #usr/share/man/pt_BR/man1/xz.1 #usr/share/man/pt_BR/man1/xzcat.1 +#usr/share/man/pt_BR/man1/xzcmp.1 #usr/share/man/pt_BR/man1/xzdec.1 +#usr/share/man/pt_BR/man1/xzdiff.1 +#usr/share/man/pt_BR/man1/xzegrep.1 +#usr/share/man/pt_BR/man1/xzfgrep.1 +#usr/share/man/pt_BR/man1/xzgrep.1 #usr/share/man/pt_BR/man1/xzless.1 +#usr/share/man/pt_BR/man1/xzmore.1 #usr/share/man/ro #usr/share/man/ro/man1 #usr/share/man/ro/man1/lzcat.1 @@ -267,7 +281,6 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/ro/man1/lzless.1 #usr/share/man/ro/man1/lzma.1 #usr/share/man/ro/man1/lzmadec.1 -#usr/share/man/ro/man1/lzmainfo.1 #usr/share/man/ro/man1/lzmore.1 #usr/share/man/ro/man1/unlzma.1 #usr/share/man/ro/man1/unxz.1 @@ -292,7 +305,6 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/uk/man1/lzless.1 #usr/share/man/uk/man1/lzma.1 #usr/share/man/uk/man1/lzmadec.1 -#usr/share/man/uk/man1/lzmainfo.1 #usr/share/man/uk/man1/lzmore.1 #usr/share/man/uk/man1/unlzma.1 #usr/share/man/uk/man1/unxz.1 diff --git a/config/rootfiles/core/185/filelists/aarch64/boost b/config/rootfiles/core/185/filelists/aarch64/boost new file mode 120000 index 000000000..807ad06be --- /dev/null +++ b/config/rootfiles/core/185/filelists/aarch64/boost @@ -0,0 +1 @@ +../../../../common/aarch64/boost \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/aarch64/grub b/config/rootfiles/core/185/filelists/aarch64/grub new file mode 120000 index 000000000..40ae85fb6 --- /dev/null +++ b/config/rootfiles/core/185/filelists/aarch64/grub @@ -0,0 +1 @@ +../../../../common/aarch64/grub \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/apache2 b/config/rootfiles/core/185/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/185/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/collectd b/config/rootfiles/core/185/filelists/collectd new file mode 120000 index 000000000..871b32f14 --- /dev/null +++ b/config/rootfiles/core/185/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/files b/config/rootfiles/core/185/filelists/files index 09ce83886..53793fda1 100644 --- a/config/rootfiles/core/185/filelists/files +++ b/config/rootfiles/core/185/filelists/files @@ -50,6 +50,7 @@ srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/time.cgi +usr/lib/python3.10/lib-dynload/_lzma.cpython-310-xxxMACHINExxx-linux-gnu.so usr/local/bin/update-ids-ruleset var/ipfire/backup/bin/backup.pl var/ipfire/ids-functions.pl diff --git a/config/rootfiles/core/185/filelists/kmod b/config/rootfiles/core/185/filelists/kmod new file mode 120000 index 000000000..0020e197e --- /dev/null +++ b/config/rootfiles/core/185/filelists/kmod @@ -0,0 +1 @@ +../../../common/kmod \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/libarchive b/config/rootfiles/core/185/filelists/libarchive new file mode 120000 index 000000000..551f1f743 --- /dev/null +++ b/config/rootfiles/core/185/filelists/libarchive @@ -0,0 +1 @@ +../../../common/libarchive \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/libtiff b/config/rootfiles/core/185/filelists/libtiff new file mode 120000 index 000000000..dd89e3cda --- /dev/null +++ b/config/rootfiles/core/185/filelists/libtiff @@ -0,0 +1 @@ +../../../common/libtiff \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/libxml2 b/config/rootfiles/core/185/filelists/libxml2 new file mode 120000 index 000000000..242e69fa3 --- /dev/null +++ b/config/rootfiles/core/185/filelists/libxml2 @@ -0,0 +1 @@ +../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/perl-Archive-Peek-Libarchive b/config/rootfiles/core/185/filelists/perl-Archive-Peek-Libarchive new file mode 120000 index 000000000..328d7c70b --- /dev/null +++ b/config/rootfiles/core/185/filelists/perl-Archive-Peek-Libarchive @@ -0,0 +1 @@ +../../../common/perl-Archive-Peek-Libarchive \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/perl-Capture-Tiny b/config/rootfiles/core/185/filelists/perl-Capture-Tiny new file mode 120000 index 000000000..d1f2184c5 --- /dev/null +++ b/config/rootfiles/core/185/filelists/perl-Capture-Tiny @@ -0,0 +1 @@ +../../../common/perl-Capture-Tiny \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/perl-Config-AutoConf b/config/rootfiles/core/185/filelists/perl-Config-AutoConf new file mode 120000 index 000000000..d47aca341 --- /dev/null +++ b/config/rootfiles/core/185/filelists/perl-Config-AutoConf @@ -0,0 +1 @@ +../../../common/perl-Config-AutoConf \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/perl-Object-Tiny b/config/rootfiles/core/185/filelists/perl-Object-Tiny new file mode 120000 index 000000000..3beaee613 --- /dev/null +++ b/config/rootfiles/core/185/filelists/perl-Object-Tiny @@ -0,0 +1 @@ +../../../common/perl-Object-Tiny \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/riscv64/boost b/config/rootfiles/core/185/filelists/riscv64/boost new file mode 120000 index 000000000..cbc461c2b --- /dev/null +++ b/config/rootfiles/core/185/filelists/riscv64/boost @@ -0,0 +1 @@ +../../../../common/riscv64/boost \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/riscv64/grub b/config/rootfiles/core/185/filelists/riscv64/grub new file mode 120000 index 000000000..7013c0be5 --- /dev/null +++ b/config/rootfiles/core/185/filelists/riscv64/grub @@ -0,0 +1 @@ +../../../../common/riscv64/grub \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/x86_64/boost b/config/rootfiles/core/185/filelists/x86_64/boost new file mode 120000 index 000000000..9ed31e1d5 --- /dev/null +++ b/config/rootfiles/core/185/filelists/x86_64/boost @@ -0,0 +1 @@ +../../../../common/x86_64/boost \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/x86_64/grub b/config/rootfiles/core/185/filelists/x86_64/grub new file mode 120000 index 000000000..78d3bd784 --- /dev/null +++ b/config/rootfiles/core/185/filelists/x86_64/grub @@ -0,0 +1 @@ +../../../../common/x86_64/grub \ No newline at end of file diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/update.sh index f86013c0d..28f18a7da 100644 --- a/config/rootfiles/core/185/update.sh +++ b/config/rootfiles/core/185/update.sh @@ -88,12 +88,15 @@ chmod -v 640 /etc/sudoers.d/* # Start services telinit u /etc/init.d/sshd restart +/etc/init.d/apache restart /etc/init.d/suricata restart /etc/init.d/unbound restart /etc/init.d/ntp start if [ -f /var/ipfire/proxy/enable ]; then /etc/init.d/squid start fi +/etc/init.d/collectd restart + ## Modify ovpnconfig according to bug 13548 for no-pass entry for N2N client connections # Check if ovpnconfig exists and is not empty if [ -s /var/ipfire/ovpn/ovpnconfig ]; then diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index ae17b92d8..91b134cf4 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -117,6 +117,7 @@ Hans Horsten, Jakub Ratajczak, Jorrit de Jonge, Przemek Zdroik, +Rico Hoppe, Roberto Peña, Sebastien GISLAIN, Alexander Rudolf Gruber, diff --git a/lfs/foomatic b/lfs/foomatic index d057505a9..21a5a589a 100644 --- a/lfs/foomatic +++ b/lfs/foomatic @@ -37,7 +37,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/foomatic-filters-$(VER_FILTERS) TARGET = $(DIR_INFO)/$(THISAPP) PROG = foomatic -PAK_VER = 9 +PAK_VER = 10 DEPS = cups ghostscript hplip diff --git a/lfs/perl-Archive-Peek-Libarchive b/lfs/perl-Archive-Peek-Libarchive new file mode 100644 index 000000000..fd1ae85d6 --- /dev/null +++ b/lfs/perl-Archive-Peek-Libarchive @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config +VER = 0.38 + +THISAPP = Archive-Peek-Libarchive-$(VER) +DL_FILE = ${THISAPP}.tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 142d54a6fe6b948129307ef7b0106905b2ddf858682d07a4f0815e6674f7fd425f462a800487949e18442884d6c743aeed049ebef7138fe0bfbbabac588dc3b3 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/perl-Capture-Tiny b/lfs/perl-Capture-Tiny new file mode 100644 index 000000000..bb6b45e82 --- /dev/null +++ b/lfs/perl-Capture-Tiny @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.48 + +THISAPP = Capture-Tiny-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = e6de05459478131c5129dd5ffc84744e2d3440c2e31545ed101c2986b2bc970106f126286dea50350f4b5ea330ffac423693d755e29850883bdc215437bf7488 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/perl-Config-AutoConf b/lfs/perl-Config-AutoConf new file mode 100644 index 000000000..ce12c295b --- /dev/null +++ b/lfs/perl-Config-AutoConf @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.320 + +THISAPP = Config-AutoConf-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 649ef56196a5984437f299f96b156f63560a247a35f0547145e3519648ba5fc86c057957570b45b696c2092a56deaf0595d9191b4fe389e0a0f183b79d6c500a + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/perl-Object-Tiny b/lfs/perl-Object-Tiny new file mode 100644 index 000000000..db19a6a25 --- /dev/null +++ b/lfs/perl-Object-Tiny @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.09 + +THISAPP = Object-Tiny-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 0383d8af24d8c0d76dfc3cb6a65c6422f631d5ca4f9e083cf1077cc220b7aa27852c23ad5535bbcab74c7f5e9d1cba8f0f5c4d8da48c07a300d3b9e995b69d5c + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/sarg b/lfs/sarg index d38933fb0..1b8a077a6 100644 --- a/lfs/sarg +++ b/lfs/sarg @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sarg -PAK_VER = 6 +PAK_VER = 7 DEPS = diff --git a/lfs/tor b/lfs/tor index 74b738512..aed30805f 100644 --- a/lfs/tor +++ b/lfs/tor @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 83 +PAK_VER = 84 DEPS = libseccomp diff --git a/lfs/xz b/lfs/xz index cbec430d4..0a1763340 100644 --- a/lfs/xz +++ b/lfs/xz @@ -24,7 +24,7 @@ include Config -VER = 5.6.1 +VER = 5.4.5 THISAPP = xz-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3a1cf93d7223eb57e78eabe828a3d623acac5824ada299470e3126692ef89d1648293aef32468d70a5289611969d5299180c1b373dfbda002a49f3afc729d925 +$(DL_FILE)_BLAKE2 = 08d9afebd927ea5d155515a4c9eedda4d1a249f2b1ab6ada11f50e5b7a3c90b389b32378ab1c0872c7f4627de8dff37149d85e49f7f4d30614add37320ec4f3e install : $(TARGET) diff --git a/make.sh b/make.sh index 64dbef5c4..605582672 100755 --- a/make.sh +++ b/make.sh @@ -1377,6 +1377,10 @@ buildipfire() { lfsmake2 perl-Crypt-PasswdMD5 lfsmake2 perl-Net-Telnet lfsmake2 perl-JSON + lfsmake2 perl-Capture-Tiny + lfsmake2 perl-Config-AutoConf + lfsmake2 perl-Object-Tiny + lfsmake2 perl-Archive-Peek-Libarchive lfsmake2 python3-inotify lfsmake2 python3-docutils lfsmake2 python3-daemon hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0a201087fcca5a418cb090b071b0fb3c53cd5e06
by Arne Fitzenreiter 27 Mar '24

27 Mar '24

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 0a201087fcca5a418cb090b071b0fb3c53cd5e06 (commit) via 0239c266d570823820b7ac20ae88b10589deab95 (commit) via 9dd2a4635fbc9d3da96c7916cd0bf2d5cd24d145 (commit) via c2df627c8c29d43d1acfbdf60878f6a3339151e1 (commit) via 3d947e6e6b9f492fa0a12b40db0495b6eac6d967 (commit) from e22ff3c71ba606e11046d17f486fc3ed7fc0ef56 (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 0a201087fcca5a418cb090b071b0fb3c53cd5e06 Merge: 0239c266d5 9dd2a4635f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Mar 27 18:27:30 2024 +0100 Merge remote-tracking branch 'origin/master' into next commit 0239c266d570823820b7ac20ae88b10589deab95 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Mar 27 02:59:07 2024 +0100 grub-btrfs: remove boot/grub/grubenv this file should created by grub-install at installation. Also it is not present on aarch64 builds of grub. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/grub-btrfs | 2 +- config/rootfiles/oldcore/185/update.sh | 14 ++++++++----- doc/language_issues.de | 2 ++ doc/language_issues.en | 1 + doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 15 ++++++++++++++ html/cgi-bin/ids.cgi | 36 +++++++++++++--------------------- langs/en/cgi-bin/en.pl | 1 + 14 files changed, 50 insertions(+), 28 deletions(-) Difference in files: diff --git a/config/rootfiles/common/grub-btrfs b/config/rootfiles/common/grub-btrfs index a612af065..ba7a8fc3e 100644 --- a/config/rootfiles/common/grub-btrfs +++ b/config/rootfiles/common/grub-btrfs @@ -1,4 +1,4 @@ -boot/grub/grubenv +#boot/grub/grubenv etc/default/grub-btrfs etc/default/grub-btrfs/config etc/grub.d/41_snapshots-btrfs diff --git a/config/rootfiles/oldcore/185/update.sh b/config/rootfiles/oldcore/185/update.sh index ec4d8ab82..f86013c0d 100644 --- a/config/rootfiles/oldcore/185/update.sh +++ b/config/rootfiles/oldcore/185/update.sh @@ -117,13 +117,17 @@ chown nobody:nobody /var/ipfire/ovpn/ovpnconfig # Check if the drop hostile in and out logging options need to be added # into the optionsfw settings file and apply to firewall -if ! [ $(grep "LOGDROPHOSTILEIN=on" /var/ipfire/optionsfw/settings) ] && \ - ! [ $(grep "LOGDROPHOSTILEOUT=on" /var/ipfire/optionsfw/settings) ]; then - sed -i '$ a\LOGDROPHOSTILEIN=on' /var/ipfire/optionsfw/settings - sed -i '$ a\LOGDROPHOSTILEOUT=on' /var/ipfire/optionsfw/settings - /usr/local/bin/firewallctrl +if ! grep -q "^LOGDROPHOSTILEIN=" /var/ipfire/optionsfw/settings; then + echo "LOGDROPHOSTILEIN=on" >> /var/ipfire/optionsfw/settings fi +if ! grep -q "^LOGDROPHOSTILEOUT=" /var/ipfire/optionsfw/settings; then + echo "LOGDROPHOSTILEOUT=on" >> /var/ipfire/optionsfw/settings +fi + +# Reload all firewall rules +/usr/local/bin/firewallctrl + # Rebuild initial ramdisks dracut --regenerate-all --force KVER="xxxKVERxxx" diff --git a/doc/language_issues.de b/doc/language_issues.de index 46fb9ee5a..1ba77c94d 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -384,6 +384,7 @@ WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids oinkcode required WARNING: translation string unused: ids rules update +WARNING: translation string unused: ids unsupported provider WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity @@ -927,6 +928,7 @@ WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: hostile networks in = From Hostile Networks WARNING: untranslated string: hostile networks out = To Hostile Networks WARNING: untranslated string: hostile networks total = Total Hostile Networks +WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) diff --git a/doc/language_issues.en b/doc/language_issues.en index 2eca62e60..84bc8cdb0 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1079,6 +1079,7 @@ WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first. WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored WARNING: untranslated string: ids provider = Provider +WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids provider settings = Provider settings WARNING: untranslated string: ids remove rule structures = Remove old rule structures... WARNING: untranslated string: ids reset provider = Reset provider diff --git a/doc/language_issues.es b/doc/language_issues.es index ff5434e05..25ef7f9c5 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -993,6 +993,7 @@ WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilitie WARNING: untranslated string: hostile networks in = From Hostile Networks WARNING: untranslated string: hostile networks out = To Hostile Networks WARNING: untranslated string: hostile networks total = Total Hostile Networks +WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 395afd998..7aafc3053 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -944,6 +944,7 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: hostile networks total = Total Hostile Networks +WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index d9bad7f14..7498e2af1 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1095,6 +1095,7 @@ WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first. WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored WARNING: untranslated string: ids provider = Provider +WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids provider settings = Provider settings WARNING: untranslated string: ids remove rule structures = Remove old rule structures... WARNING: untranslated string: ids reset provider = Reset provider diff --git a/doc/language_issues.nl b/doc/language_issues.nl index b93cc1cd1..16e69bf27 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1100,6 +1100,7 @@ WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first. WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored WARNING: untranslated string: ids provider = Provider +WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids provider settings = Provider settings WARNING: untranslated string: ids remove rule structures = Remove old rule structures... WARNING: untranslated string: ids reset provider = Reset provider diff --git a/doc/language_issues.pl b/doc/language_issues.pl index ab220103f..31c64c164 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1240,6 +1240,7 @@ WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first. WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored WARNING: untranslated string: ids provider = Provider +WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids provider settings = Provider settings WARNING: untranslated string: ids remove rule structures = Remove old rule structures... WARNING: untranslated string: ids reset provider = Reset provider diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 533b21a0d..9495d951e 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1237,6 +1237,7 @@ WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first. WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored WARNING: untranslated string: ids provider = Provider +WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids provider settings = Provider settings WARNING: untranslated string: ids remove rule structures = Remove old rule structures... WARNING: untranslated string: ids reset provider = Reset provider diff --git a/doc/language_issues.tr b/doc/language_issues.tr index d9caa290e..a2c134a2a 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1037,6 +1037,7 @@ WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first. WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored WARNING: untranslated string: ids provider = Provider +WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids provider settings = Provider settings WARNING: untranslated string: ids remove rule structures = Remove old rule structures... WARNING: untranslated string: ids reset provider = Reset provider diff --git a/doc/language_missings b/doc/language_missings index 65d69daee..44d79f352 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -62,6 +62,7 @@ < hostile networks out < hostile networks total < ids automatic rules update +< ids provider eol < ids subscription code required < insert removable device < invalid input for subscription code @@ -123,6 +124,8 @@ < hostile networks in < hostile networks out < hostile networks total +< ids provider eol +< ids unsupported provider < invalid ip or hostname < log drop hostile in < log drop hostile out @@ -148,6 +151,8 @@ < g.dtm < g.lite < hostile networks total +< ids provider eol +< ids unsupported provider < system time < timeformat < upload fcdsl.o @@ -398,6 +403,7 @@ < ids no enabled ruleset provider < ids no network zone < ids provider +< ids provider eol < ids provider settings < ids remove rule structures < ids reset provider @@ -408,6 +414,7 @@ < ids subscription code required < ids the choosen provider is already in use < ids unable to download the ruleset +< ids unsupported provider < ids visit provider website < ids working < incoming compression in bytes per second @@ -924,6 +931,7 @@ < ids no enabled ruleset provider < ids no network zone < ids provider +< ids provider eol < ids provider settings < ids remove rule structures < ids reset provider @@ -934,6 +942,7 @@ < ids subscription code required < ids the choosen provider is already in use < ids unable to download the ruleset +< ids unsupported provider < ids visit provider website < ids working < imei @@ -1755,6 +1764,7 @@ < ids no enabled ruleset provider < ids no network zone < ids provider +< ids provider eol < ids provider settings < ids remove rule structures < ids reset provider @@ -1765,6 +1775,7 @@ < ids subscription code required < ids the choosen provider is already in use < ids unable to download the ruleset +< ids unsupported provider < ids visit provider website < ids working < imei @@ -2754,6 +2765,7 @@ < ids no enabled ruleset provider < ids no network zone < ids provider +< ids provider eol < ids provider settings < ids remove rule structures < ids reset provider @@ -2764,6 +2776,7 @@ < ids subscription code required < ids the choosen provider is already in use < ids unable to download the ruleset +< ids unsupported provider < ids visit provider website < ids working < imei @@ -3345,6 +3358,7 @@ < ids no enabled ruleset provider < ids no network zone < ids provider +< ids provider eol < ids provider settings < ids remove rule structures < ids reset provider @@ -3355,6 +3369,7 @@ < ids subscription code required < ids the choosen provider is already in use < ids unable to download the ruleset +< ids unsupported provider < ids visit provider website < ids working < inodes diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index edab97195..8ace30b02 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -1173,8 +1173,8 @@ END # Handle providers which are not longer supported. unless ($IDS::Ruleset::Providers{$provider}{'dl_url'}) { - # Mark this provider as unsupported. - $unsupported = "<img src='/blob.gif' alt='*'>"; + $col = "bgcolor='$Header::colouryellow'"; + $unsupported = $Lang::tr{'ids provider eol'}; } # Choose icons for the checkboxes. @@ -1203,7 +1203,7 @@ END print <<END; <tr> - <td width='33%' class='base' $col>$provider_name$unsupported</td> + <td width='33%' class='base' $col>$provider_name $unsupported</td> <td width='30%' class='base' $col>$rulesetdate</td> <td align='center' $col> @@ -1254,32 +1254,24 @@ END print "</table>\n"; # Section to add new elements or edit existing ones. -print <<END; + print <<END; <br> <hr> <br> - <table width='100%'> - <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <tr> - <td> -END - print "<img src='/blob.gif' alt='*'> $Lang::tr{'ids unsupported provider'}\n"; -print <<END; - </td> - <td><div align='right'> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <div align='right'> END - # Only show this button if a ruleset provider is configured. - if (%used_providers) { - print "<input type='submit' name='RULESET' value='$Lang::tr{'ids customize ruleset'}'>\n"; - } + # Only show this button if a ruleset provider is configured. + if (%used_providers) { + print "<input type='submit' name='RULESET' value='$Lang::tr{'ids customize ruleset'}'>\n"; + } + print <<END; - <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids add provider'}'> - </div></td> - </tr> - </form> - </table> + <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids add provider'}'> + </div> + </form> END &Header::closebox(); diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 8e4ebf3f2..ee3a6c5aa 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1456,6 +1456,7 @@ 'ids no enabled ruleset provider' => 'No enabled ruleset is available. Please activate or add one first.', 'ids no network zone' => 'Please select at least one network zone to be monitored', 'ids provider' => 'Provider', +'ids provider eol' => '(EOL)', 'ids provider settings' => 'Provider settings', 'ids remove rule structures' => 'Remove old rule structures...', 'ids reset provider' => 'Reset provider', hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM