[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 94845e08bc2ca9e24e208630979bdcddb84b2682
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 94845e08bc2ca9e24e208630979bdcddb84b2682 (commit) via 461ad995ae8b3443c35ae5a6e7a64d8f65e0995f (commit) via f8648b956351abb936bae94c9cce84b95b7ca23c (commit) via 8e6bf12f14c87854d311682d04e2269a6d96bbc3 (commit) via 475fd9e73a0c873df71929c55b205125a1651a7f (commit) via e0efec97ca1b8979a407865d97d86b44fb6dc859 (commit) via b725a6990fd9ad84273fea908fa7572f89ca0080 (commit) via 8c5e71db2a53b3b443598a53dd01e43832234ca5 (commit) via e5ad33d9eeffbdeb1abbf2575853d880890ed228 (commit) via 14bd32221ecb35fc919c6a808621c63cff423094 (commit) via db1ffe0f5f527e99355c8d14defe41ac37d96925 (commit) via 4322d0c7276f305db3bcf4f09889cb828e54b514 (commit) via 0f334f0ef36c8751fccbdbdbe3c1cae7b7306f7f (commit) via 6d5aecef8c4136fff8c9832324d4614b2b07c3c3 (commit) via 90147c2c330eccc64391cd05e5f2427d3ae11160 (commit) from 7f782be5e35a91d4a5d7e936799b561531f6ebfb (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 94845e08bc2ca9e24e208630979bdcddb84b2682 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 28 09:36:54 2023 +0000
core181: Fix arch-dependendant filelists
I created those in a wrong place :(
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 461ad995ae8b3443c35ae5a6e7a64d8f65e0995f Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 28 09:35:33 2023 +0000
core181: Ship OpenVPN changes
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f8648b956351abb936bae94c9cce84b95b7ca23c Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Sep 25 18:41:56 2023 +0200
update.sh: Adds code to update an existing ovpnconfig with pass or no-pass
- The code checks first if ovpnconfig exists and is not empty. - Then it makes all net2net connections no-pass since they do not use encryption - Then it cycles through all .p12 files and checks with openssl if a password exists or not. If a password is present then pass is added to index 41 and if not then no-pass is added to index 41 - I had to add a blank line to the top of the ovpnconfig file otherwise the awk code treated the first line as a blank line and missed it out of the update. This was the problem that was discovered during the previous Testing Release evaluation. Tested out this time with several existing entries both encrypted and insecure and with additional entries of both added in afterwards and all connection entries were maintained - road warrior and net2net. - This code should be left in update.sh for future Core Updates in case people don't update with Core Update 175 but leave it till later. This code works fine on code that already has pass or no-pass entered into index 41 in ovpnconfig
Fixes: Bug#11048 Suggested-by: Erik Kapfer ummeegge@ipfire.org Suggested-by: Adolf Belka adolf.belka@ipfire.org Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8e6bf12f14c87854d311682d04e2269a6d96bbc3 Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Sep 25 18:41:55 2023 +0200
web-user-interface: Addition of new icon for secure connection certificate download
- This uses a padlock icon from https://commons.wikimedia.org/wiki/File:Encrypted.png - The license for this image is the following:- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library 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 version 2.1 and version 3 of the GNU Lesser General Public License for more details. - Based on the above license I believe it can be used by IPFire covered by the GNU General Public License that is used for it. - The icon image was made by taking the existing openvpn.png file and superimposing the padlock icon on top of it as a 12x12 pixel format and naming it openvpn_encrypted.png
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 475fd9e73a0c873df71929c55b205125a1651a7f Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Sep 25 18:41:54 2023 +0200
nl.pl: Change language text for secure icon wording
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e0efec97ca1b8979a407865d97d86b44fb6dc859 Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Sep 25 18:41:53 2023 +0200
en.pl: Change language text for secure icon wording
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b725a6990fd9ad84273fea908fa7572f89ca0080 Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Sep 25 18:41:52 2023 +0200
de.pl: Change language text for secure icon wording
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8c5e71db2a53b3b443598a53dd01e43832234ca5 Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Sep 25 18:41:51 2023 +0200
ovpnmain.cgi: Fix for bug#11048 - insecure download icon shown for connections with a password
- At long last I have re-visited the patch submission for bug #11048 and fixed the issues that caused the problems last time I evaluated it in Testing. - The insecure package download icon is shown if entry 41 in /var/ipfire/ovpn/ovpnconfig is set to no-pass. The code block on ovpnmain.cgi that deals with this checks if the connection is a host and if the first password entry is a null. Then it adds no-pass to ovpnconfig. - The same block of code is also used for when he connection is edited. However at this stage the password entry is back to null because the password value is only kept until the connection has been saved. Therefore doing an edit results in the password value being taken as null even for connections with a password. - This fix enters no-pass if the connection type is host and the password is null, pass if the connection type is host and the password has characters. If the connection type is net then no-pass is used as net2net connections dop not have encrypted certificates. - The code has been changed to show a different icon for unencrypted and encrypted certificates. - Separate patches are provided for the language file change, the provision of a new icon and the code for the update.sh script for the Core Update to update all existing connections, if any exist, to have either pass or no-pass in index 41. - This patch set was a joint collaboration between Erik Kapfer and Adolf Belka - Patch set, including the code for the Core Update 180 update.sh script has been tested on a vm testbed
Fixes: Bug#11048 Tested-by: Adolf Belka adolf.belka@ipfire.org Suggested-by: Adolf Belka adolf.belka@ipfire.org Suggested-by: Erik Kapfer ummeegge@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e5ad33d9eeffbdeb1abbf2575853d880890ed228 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Sep 16 16:44:38 2023 +0200
kernel: update 6.1.53
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 14bd32221ecb35fc919c6a808621c63cff423094 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Sep 9 17:04:20 2023 +0200
kernel: update to 6.1.52
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit db1ffe0f5f527e99355c8d14defe41ac37d96925 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 28 09:25:16 2023 +0000
Start Core Update 181 (with a kernel)
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/extrahd/extrahd.pl | 17 +++++ config/kernel/kernel.config.aarch64-ipfire | 81 ++------------------- config/kernel/kernel.config.riscv64-ipfire | 79 ++------------------ config/kernel/kernel.config.x86_64-ipfire | 73 ++----------------- config/rootfiles/common/aarch64/linux | 4 +- config/rootfiles/common/bind | 14 ++-- config/rootfiles/common/riscv64/linux | 6 +- config/rootfiles/common/web-user-interface | 1 + config/rootfiles/common/x86_64/linux | 4 +- config/rootfiles/core/{180 => 181}/exclude | 0 .../124 => core/181}/filelists/aarch64/linux | 0 .../core/{180 => 181}/filelists/core-files | 0 config/rootfiles/core/181/filelists/files | 2 + config/rootfiles/core/181/filelists/riscv64/linux | 1 + .../100 => core/181}/filelists/x86_64/linux | 0 .../rootfiles/{oldcore/178 => core/181}/update.sh | 35 +++++++-- config/rootfiles/{core => oldcore}/180/exclude | 0 .../180/filelists/aarch64/binutils | 0 .../{core => oldcore}/180/filelists/aarch64/boost | 0 .../{core => oldcore}/180/filelists/aarch64/gcc | 0 .../{core => oldcore}/180/filelists/aarch64/glibc | 0 .../180/filelists/aarch64/util-linux | 0 .../rootfiles/oldcore/{100 => 180}/filelists/bind | 0 .../{core => oldcore}/180/filelists/core-files | 0 .../{core => oldcore}/180/filelists/dhcpcd | 0 .../{core => oldcore}/180/filelists/files | 1 + .../{core => oldcore}/180/filelists/freetype | 0 .../rootfiles/{core => oldcore}/180/filelists/gzip | 0 .../{core => oldcore}/180/filelists/hwdata | 0 .../{core => oldcore}/180/filelists/iana-etc | 0 .../{core => oldcore}/180/filelists/json-c | 0 .../rootfiles/{core => oldcore}/180/filelists/krb5 | 0 .../{core => oldcore}/180/filelists/libedit | 0 .../{core => oldcore}/180/filelists/libnl-3 | 0 .../{core => oldcore}/180/filelists/libtiff | 0 .../rootfiles/{core => oldcore}/180/filelists/mpfr | 0 .../{core => oldcore}/180/filelists/openssh | 0 .../rootfiles/{core => oldcore}/180/filelists/ppp | 0 .../{core => oldcore}/180/filelists/procps | 0 .../180/filelists/riscv64/binutils | 0 .../{core => oldcore}/180/filelists/riscv64/boost | 0 .../{core => oldcore}/180/filelists/riscv64/gcc | 0 .../{core => oldcore}/180/filelists/riscv64/glibc | 0 .../180/filelists/riscv64/util-linux | 0 .../{core => oldcore}/180/filelists/sqlite | 0 .../{core => oldcore}/180/filelists/squid | 0 .../{core => oldcore}/180/filelists/suricata | 0 .../rootfiles/{core => oldcore}/180/filelists/tcl | 0 .../{core => oldcore}/180/filelists/tzdata | 0 .../rootfiles/{core => oldcore}/180/filelists/udev | 0 .../{core => oldcore}/180/filelists/unbound | 0 .../{core => oldcore}/180/filelists/vnstat | 0 .../rootfiles/{core => oldcore}/180/filelists/wget | 0 .../{core => oldcore}/180/filelists/whois | 0 .../{core => oldcore}/180/filelists/wireless-regdb | 0 .../180/filelists/x86_64/binutils | 0 .../{core => oldcore}/180/filelists/x86_64/boost | 0 .../{core => oldcore}/180/filelists/x86_64/gcc | 0 .../{core => oldcore}/180/filelists/x86_64/glibc | 0 .../180/filelists/x86_64/util-linux | 0 .../rootfiles/{core => oldcore}/180/filelists/zlib | 0 config/rootfiles/{core => oldcore}/180/update.sh | 0 html/cgi-bin/ovpnmain.cgi | 75 +++++++++++-------- html/html/images/openvpn_encrypted.png | Bin 0 -> 7004 bytes langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/nl/cgi-bin/nl.pl | 3 +- lfs/bind | 4 +- lfs/linux | 4 +- make.sh | 2 +- 70 files changed, 136 insertions(+), 274 deletions(-) copy config/rootfiles/core/{180 => 181}/exclude (100%) copy config/rootfiles/{oldcore/124 => core/181}/filelists/aarch64/linux (100%) copy config/rootfiles/core/{180 => 181}/filelists/core-files (100%) create mode 100644 config/rootfiles/core/181/filelists/files create mode 120000 config/rootfiles/core/181/filelists/riscv64/linux copy config/rootfiles/{oldcore/100 => core/181}/filelists/x86_64/linux (100%) copy config/rootfiles/{oldcore/178 => core/181}/update.sh (69%) rename config/rootfiles/{core => oldcore}/180/exclude (100%) rename config/rootfiles/{core => oldcore}/180/filelists/aarch64/binutils (100%) rename config/rootfiles/{core => oldcore}/180/filelists/aarch64/boost (100%) rename config/rootfiles/{core => oldcore}/180/filelists/aarch64/gcc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/aarch64/util-linux (100%) copy config/rootfiles/oldcore/{100 => 180}/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/180/filelists/core-files (100%) rename config/rootfiles/{core => oldcore}/180/filelists/dhcpcd (100%) rename config/rootfiles/{core => oldcore}/180/filelists/files (91%) rename config/rootfiles/{core => oldcore}/180/filelists/freetype (100%) rename config/rootfiles/{core => oldcore}/180/filelists/gzip (100%) rename config/rootfiles/{core => oldcore}/180/filelists/hwdata (100%) rename config/rootfiles/{core => oldcore}/180/filelists/iana-etc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/json-c (100%) rename config/rootfiles/{core => oldcore}/180/filelists/krb5 (100%) rename config/rootfiles/{core => oldcore}/180/filelists/libedit (100%) rename config/rootfiles/{core => oldcore}/180/filelists/libnl-3 (100%) rename config/rootfiles/{core => oldcore}/180/filelists/libtiff (100%) rename config/rootfiles/{core => oldcore}/180/filelists/mpfr (100%) rename config/rootfiles/{core => oldcore}/180/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/180/filelists/ppp (100%) rename config/rootfiles/{core => oldcore}/180/filelists/procps (100%) rename config/rootfiles/{core => oldcore}/180/filelists/riscv64/binutils (100%) rename config/rootfiles/{core => oldcore}/180/filelists/riscv64/boost (100%) rename config/rootfiles/{core => oldcore}/180/filelists/riscv64/gcc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/riscv64/glibc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/riscv64/util-linux (100%) rename config/rootfiles/{core => oldcore}/180/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/180/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/180/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/180/filelists/tcl (100%) rename config/rootfiles/{core => oldcore}/180/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/180/filelists/udev (100%) rename config/rootfiles/{core => oldcore}/180/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/180/filelists/vnstat (100%) rename config/rootfiles/{core => oldcore}/180/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/180/filelists/whois (100%) rename config/rootfiles/{core => oldcore}/180/filelists/wireless-regdb (100%) rename config/rootfiles/{core => oldcore}/180/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/180/filelists/x86_64/boost (100%) rename config/rootfiles/{core => oldcore}/180/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/x86_64/util-linux (100%) rename config/rootfiles/{core => oldcore}/180/filelists/zlib (100%) rename config/rootfiles/{core => oldcore}/180/update.sh (100%) create mode 100644 html/html/images/openvpn_encrypted.png
Difference in files: diff --git a/config/extrahd/extrahd.pl b/config/extrahd/extrahd.pl index cc85228d5..bcde077d0 100644 --- a/config/extrahd/extrahd.pl +++ b/config/extrahd/extrahd.pl @@ -116,7 +116,21 @@ extrahd_umount() { done < /var/ipfire/extrahd/devices }
+handle_udev_event() { + case "${ACTION}" in + add) + if [ -n "${ID_FS_UUID}" ]; then + extrahd_mount "UUID=${ID_FS_UUID}" || return $? + fi + ;; + esac + + return 0 +} + main() { + ( echo "$@"; set ) > /tmp/extrahd.$$ + local command="${1}" shift
@@ -129,6 +143,9 @@ main() { umount) extrahd_umount "${@}" || rc="${rc}" ;; + udev-event) + handle_udev_event "${@}" || rc="${rc}" + ;; scanhd) exec /usr/local/bin/scanhd "${@}" ;; diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 74dec8565..96944c3d5 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.45-ipfire Kernel Configuration +# Linux/arm64 6.1.53-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130100 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24000 +CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24000 +CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -5053,78 +5053,9 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# -# CONFIG_VIDEO_AR0521 is not set -# CONFIG_VIDEO_HI556 is not set -# CONFIG_VIDEO_HI846 is not set -# CONFIG_VIDEO_HI847 is not set -# CONFIG_VIDEO_IMX208 is not set -# CONFIG_VIDEO_IMX214 is not set -# CONFIG_VIDEO_IMX219 is not set -# CONFIG_VIDEO_IMX258 is not set -# CONFIG_VIDEO_IMX274 is not set -# CONFIG_VIDEO_IMX290 is not set -# CONFIG_VIDEO_IMX319 is not set -# CONFIG_VIDEO_IMX334 is not set -# CONFIG_VIDEO_IMX335 is not set -# CONFIG_VIDEO_IMX355 is not set -# CONFIG_VIDEO_IMX412 is not set -# CONFIG_VIDEO_MT9M001 is not set -# CONFIG_VIDEO_MT9M032 is not set -CONFIG_VIDEO_MT9M111=m -# CONFIG_VIDEO_MT9P031 is not set -# CONFIG_VIDEO_MT9T001 is not set -# CONFIG_VIDEO_MT9T112 is not set +# CONFIG_VIDEO_CAMERA_SENSOR is not set CONFIG_VIDEO_MT9V011=m -# CONFIG_VIDEO_MT9V032 is not set -# CONFIG_VIDEO_MT9V111 is not set -# CONFIG_VIDEO_NOON010PC30 is not set -# CONFIG_VIDEO_OG01A1B is not set -# CONFIG_VIDEO_OV02A10 is not set -# CONFIG_VIDEO_OV08D10 is not set -# CONFIG_VIDEO_OV13858 is not set -# CONFIG_VIDEO_OV13B10 is not set CONFIG_VIDEO_OV2640=m -# CONFIG_VIDEO_OV2659 is not set -# CONFIG_VIDEO_OV2680 is not set -# CONFIG_VIDEO_OV2685 is not set -# CONFIG_VIDEO_OV2740 is not set -# CONFIG_VIDEO_OV5640 is not set -# CONFIG_VIDEO_OV5645 is not set -# CONFIG_VIDEO_OV5647 is not set -# CONFIG_VIDEO_OV5648 is not set -# CONFIG_VIDEO_OV5670 is not set -# CONFIG_VIDEO_OV5675 is not set -# CONFIG_VIDEO_OV5693 is not set -# CONFIG_VIDEO_OV5695 is not set -# CONFIG_VIDEO_OV6650 is not set -# CONFIG_VIDEO_OV7251 is not set -# CONFIG_VIDEO_OV7640 is not set -# CONFIG_VIDEO_OV7670 is not set -# CONFIG_VIDEO_OV772X is not set -# CONFIG_VIDEO_OV7740 is not set -# CONFIG_VIDEO_OV8856 is not set -# CONFIG_VIDEO_OV8865 is not set -# CONFIG_VIDEO_OV9282 is not set -# CONFIG_VIDEO_OV9640 is not set -# CONFIG_VIDEO_OV9650 is not set -# CONFIG_VIDEO_OV9734 is not set -# CONFIG_VIDEO_RDACM20 is not set -# CONFIG_VIDEO_RDACM21 is not set -# CONFIG_VIDEO_RJ54N1 is not set -# CONFIG_VIDEO_S5K4ECGX is not set -# CONFIG_VIDEO_S5K5BAF is not set -# CONFIG_VIDEO_S5K6A3 is not set -# CONFIG_VIDEO_S5K6AA is not set -# CONFIG_VIDEO_SR030PC30 is not set -# CONFIG_VIDEO_VS6624 is not set -# CONFIG_VIDEO_CCS is not set -# CONFIG_VIDEO_ET8EK8 is not set -# CONFIG_VIDEO_M5MOLS is not set -# end of Camera sensor devices
# # Lens drivers diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire index aabf98371..fc2bbaf1e 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.1.42-ipfire Kernel Configuration +# Linux/riscv 6.1.53-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130100 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24000 +CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24000 +CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -4332,75 +4332,9 @@ CONFIG_MEDIA_ATTACH=y # CONFIG_VIDEO_IR_I2C=m
-# -# Camera sensor devices -# -# CONFIG_VIDEO_AR0521 is not set -# CONFIG_VIDEO_HI556 is not set -# CONFIG_VIDEO_HI846 is not set -# CONFIG_VIDEO_HI847 is not set -# CONFIG_VIDEO_IMX208 is not set -# CONFIG_VIDEO_IMX214 is not set -# CONFIG_VIDEO_IMX219 is not set -# CONFIG_VIDEO_IMX258 is not set -# CONFIG_VIDEO_IMX274 is not set -# CONFIG_VIDEO_IMX290 is not set -# CONFIG_VIDEO_IMX319 is not set -# CONFIG_VIDEO_IMX334 is not set -# CONFIG_VIDEO_IMX335 is not set -# CONFIG_VIDEO_IMX355 is not set -# CONFIG_VIDEO_IMX412 is not set -# CONFIG_VIDEO_MT9M001 is not set -# CONFIG_VIDEO_MT9M032 is not set -CONFIG_VIDEO_MT9M111=m -# CONFIG_VIDEO_MT9P031 is not set -# CONFIG_VIDEO_MT9T001 is not set -# CONFIG_VIDEO_MT9T112 is not set +# CONFIG_VIDEO_CAMERA_SENSOR is not set CONFIG_VIDEO_MT9V011=m -# CONFIG_VIDEO_MT9V032 is not set -# CONFIG_VIDEO_MT9V111 is not set -# CONFIG_VIDEO_NOON010PC30 is not set -# CONFIG_VIDEO_OG01A1B is not set -# CONFIG_VIDEO_OV02A10 is not set -# CONFIG_VIDEO_OV08D10 is not set -# CONFIG_VIDEO_OV13858 is not set -# CONFIG_VIDEO_OV13B10 is not set CONFIG_VIDEO_OV2640=m -# CONFIG_VIDEO_OV2659 is not set -# CONFIG_VIDEO_OV2680 is not set -# CONFIG_VIDEO_OV2685 is not set -# CONFIG_VIDEO_OV5640 is not set -# CONFIG_VIDEO_OV5645 is not set -# CONFIG_VIDEO_OV5647 is not set -# CONFIG_VIDEO_OV5648 is not set -# CONFIG_VIDEO_OV5670 is not set -# CONFIG_VIDEO_OV5675 is not set -# CONFIG_VIDEO_OV5693 is not set -# CONFIG_VIDEO_OV5695 is not set -# CONFIG_VIDEO_OV6650 is not set -# CONFIG_VIDEO_OV7251 is not set -CONFIG_VIDEO_OV7640=m -CONFIG_VIDEO_OV7670=m -# CONFIG_VIDEO_OV772X is not set -# CONFIG_VIDEO_OV7740 is not set -# CONFIG_VIDEO_OV8856 is not set -# CONFIG_VIDEO_OV8865 is not set -# CONFIG_VIDEO_OV9282 is not set -# CONFIG_VIDEO_OV9640 is not set -# CONFIG_VIDEO_OV9650 is not set -# CONFIG_VIDEO_RDACM20 is not set -# CONFIG_VIDEO_RDACM21 is not set -# CONFIG_VIDEO_RJ54N1 is not set -# CONFIG_VIDEO_S5K4ECGX is not set -# CONFIG_VIDEO_S5K5BAF is not set -# CONFIG_VIDEO_S5K6A3 is not set -# CONFIG_VIDEO_S5K6AA is not set -# CONFIG_VIDEO_SR030PC30 is not set -# CONFIG_VIDEO_VS6624 is not set -# CONFIG_VIDEO_CCS is not set -# CONFIG_VIDEO_ET8EK8 is not set -# CONFIG_VIDEO_M5MOLS is not set -# end of Camera sensor devices
# # Lens drivers @@ -6936,6 +6870,7 @@ CONFIG_DEBUG_MISC=y # # Compile-time checks and compiler options # +CONFIG_AS_HAS_NON_CONST_LEB128=y CONFIG_DEBUG_INFO_NONE=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 7c052fe08..129e0d209 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.45-ipfire Kernel Configuration +# Linux/x86 6.1.53-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130100 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24000 +CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24000 +CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -4761,72 +4761,11 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# -# CONFIG_VIDEO_AR0521 is not set -# CONFIG_VIDEO_HI556 is not set -# CONFIG_VIDEO_HI846 is not set -# CONFIG_VIDEO_HI847 is not set -# CONFIG_VIDEO_IMX208 is not set -# CONFIG_VIDEO_IMX214 is not set -# CONFIG_VIDEO_IMX219 is not set -# CONFIG_VIDEO_IMX258 is not set -# CONFIG_VIDEO_IMX274 is not set -# CONFIG_VIDEO_IMX290 is not set -# CONFIG_VIDEO_IMX319 is not set -# CONFIG_VIDEO_IMX355 is not set -# CONFIG_VIDEO_MT9M001 is not set -# CONFIG_VIDEO_MT9M032 is not set -CONFIG_VIDEO_MT9M111=m -# CONFIG_VIDEO_MT9P031 is not set -# CONFIG_VIDEO_MT9T001 is not set -# CONFIG_VIDEO_MT9T112 is not set +# CONFIG_VIDEO_CAMERA_SENSOR is not set CONFIG_VIDEO_MT9V011=m -# CONFIG_VIDEO_MT9V032 is not set -# CONFIG_VIDEO_MT9V111 is not set -# CONFIG_VIDEO_NOON010PC30 is not set -# CONFIG_VIDEO_OG01A1B is not set -# CONFIG_VIDEO_OV02A10 is not set -# CONFIG_VIDEO_OV08D10 is not set -# CONFIG_VIDEO_OV13858 is not set -# CONFIG_VIDEO_OV13B10 is not set CONFIG_VIDEO_OV2640=m -# CONFIG_VIDEO_OV2659 is not set -# CONFIG_VIDEO_OV2680 is not set -# CONFIG_VIDEO_OV2685 is not set -# CONFIG_VIDEO_OV2740 is not set -# CONFIG_VIDEO_OV5647 is not set -# CONFIG_VIDEO_OV5648 is not set -# CONFIG_VIDEO_OV5670 is not set -# CONFIG_VIDEO_OV5675 is not set -# CONFIG_VIDEO_OV5693 is not set -# CONFIG_VIDEO_OV5695 is not set -# CONFIG_VIDEO_OV6650 is not set -# CONFIG_VIDEO_OV7251 is not set CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_OV7670=m -# CONFIG_VIDEO_OV772X is not set -# CONFIG_VIDEO_OV7740 is not set -# CONFIG_VIDEO_OV8856 is not set -# CONFIG_VIDEO_OV8865 is not set -# CONFIG_VIDEO_OV9640 is not set -# CONFIG_VIDEO_OV9650 is not set -# CONFIG_VIDEO_OV9734 is not set -# CONFIG_VIDEO_RDACM20 is not set -# CONFIG_VIDEO_RDACM21 is not set -# CONFIG_VIDEO_RJ54N1 is not set -# CONFIG_VIDEO_S5K4ECGX is not set -# CONFIG_VIDEO_S5K5BAF is not set -# CONFIG_VIDEO_S5K6A3 is not set -# CONFIG_VIDEO_S5K6AA is not set -# CONFIG_VIDEO_SR030PC30 is not set -# CONFIG_VIDEO_VS6624 is not set -# CONFIG_VIDEO_CCS is not set -# CONFIG_VIDEO_ET8EK8 is not set -# CONFIG_VIDEO_M5MOLS is not set -# end of Camera sensor devices
# # Lens drivers diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 5ed37b7e0..754df396e 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -17587,6 +17587,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/dccp/Makefile #lib/modules/KVER-ipfire/build/net/dccp/ccids #lib/modules/KVER-ipfire/build/net/dccp/ccids/Kconfig +#lib/modules/KVER-ipfire/build/net/devlink +#lib/modules/KVER-ipfire/build/net/devlink/Makefile #lib/modules/KVER-ipfire/build/net/dns_resolver #lib/modules/KVER-ipfire/build/net/dns_resolver/Kconfig #lib/modules/KVER-ipfire/build/net/dns_resolver/Makefile @@ -19159,8 +19161,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix/Makefile -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/mptcp diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index eeeee6e94..ca3f17011 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -271,24 +271,24 @@ usr/bin/nsupdate #usr/include/pk11/site.h #usr/include/pkcs11 #usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.40.so +usr/lib/libbind9-9.16.44.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.40.so +usr/lib/libdns-9.16.44.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.40.so +usr/lib/libirs-9.16.44.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.40.so +usr/lib/libisc-9.16.44.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.40.so +usr/lib/libisccc-9.16.44.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.40.so +usr/lib/libisccfg-9.16.44.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.40.so +usr/lib/libns-9.16.44.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/config/rootfiles/common/riscv64/linux b/config/rootfiles/common/riscv64/linux index bd5439ea4..48660ee40 100644 --- a/config/rootfiles/common/riscv64/linux +++ b/config/rootfiles/common/riscv64/linux @@ -6147,7 +6147,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/asm-generic/bitops/sched.h #lib/modules/KVER-ipfire/build/include/asm-generic/bitsperlong.h #lib/modules/KVER-ipfire/build/include/asm-generic/bug.h -#lib/modules/KVER-ipfire/build/include/asm-generic/bugs.h #lib/modules/KVER-ipfire/build/include/asm-generic/cache.h #lib/modules/KVER-ipfire/build/include/asm-generic/cacheflush.h #lib/modules/KVER-ipfire/build/include/asm-generic/checksum.h @@ -6370,6 +6369,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ASYNC_TX_DMA #lib/modules/KVER-ipfire/build/include/config/ASYNC_XOR #lib/modules/KVER-ipfire/build/include/config/AS_HAS_INSN +#lib/modules/KVER-ipfire/build/include/config/AS_HAS_NON_CONST_LEB128 #lib/modules/KVER-ipfire/build/include/config/AS_IS_GNU #lib/modules/KVER-ipfire/build/include/config/AS_VERSION #lib/modules/KVER-ipfire/build/include/config/AT76C50X_USB @@ -16723,6 +16723,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/dccp/Makefile #lib/modules/KVER-ipfire/build/net/dccp/ccids #lib/modules/KVER-ipfire/build/net/dccp/ccids/Kconfig +#lib/modules/KVER-ipfire/build/net/devlink +#lib/modules/KVER-ipfire/build/net/devlink/Makefile #lib/modules/KVER-ipfire/build/net/dns_resolver #lib/modules/KVER-ipfire/build/net/dns_resolver/Kconfig #lib/modules/KVER-ipfire/build/net/dns_resolver/Makefile @@ -18295,8 +18297,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix/Makefile -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/mptcp diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 52f879d35..6c2a40cc2 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -235,6 +235,7 @@ srv/web/ipfire/html/images/off.gif srv/web/ipfire/html/images/on.gif srv/web/ipfire/html/images/openvpn.gif srv/web/ipfire/html/images/openvpn.png +srv/web/ipfire/html/images/openvpn_encrypted.png srv/web/ipfire/html/images/package-x-generic.png srv/web/ipfire/html/images/printer-error.png srv/web/ipfire/html/images/printer.png diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index f2b488ef9..4ff096b5b 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -17676,6 +17676,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/dccp/Makefile #lib/modules/KVER-ipfire/build/net/dccp/ccids #lib/modules/KVER-ipfire/build/net/dccp/ccids/Kconfig +#lib/modules/KVER-ipfire/build/net/devlink +#lib/modules/KVER-ipfire/build/net/devlink/Makefile #lib/modules/KVER-ipfire/build/net/dns_resolver #lib/modules/KVER-ipfire/build/net/dns_resolver/Kconfig #lib/modules/KVER-ipfire/build/net/dns_resolver/Makefile @@ -19244,8 +19246,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix/Makefile -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/mptcp diff --git a/config/rootfiles/core/180/exclude b/config/rootfiles/core/181/exclude similarity index 100% rename from config/rootfiles/core/180/exclude rename to config/rootfiles/core/181/exclude diff --git a/config/rootfiles/core/181/filelists/aarch64/linux b/config/rootfiles/core/181/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/181/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/180/filelists/core-files b/config/rootfiles/core/181/filelists/core-files similarity index 100% rename from config/rootfiles/core/180/filelists/core-files rename to config/rootfiles/core/181/filelists/core-files diff --git a/config/rootfiles/core/181/filelists/files b/config/rootfiles/core/181/filelists/files new file mode 100644 index 000000000..7d390413f --- /dev/null +++ b/config/rootfiles/core/181/filelists/files @@ -0,0 +1,2 @@ +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/html/images/openvpn_encrypted.png diff --git a/config/rootfiles/core/181/filelists/riscv64/linux b/config/rootfiles/core/181/filelists/riscv64/linux new file mode 120000 index 000000000..c8e8350ca --- /dev/null +++ b/config/rootfiles/core/181/filelists/riscv64/linux @@ -0,0 +1 @@ +../../../../common/riscv64/linux \ No newline at end of file diff --git a/config/rootfiles/core/181/filelists/x86_64/linux b/config/rootfiles/core/181/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/181/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/181/update.sh b/config/rootfiles/core/181/update.sh new file mode 100644 index 000000000..e6098a3c9 --- /dev/null +++ b/config/rootfiles/core/181/update.sh @@ -0,0 +1,170 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2023 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=181 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # force fsck at next boot, this may fix free space on xfs + touch /forcefsck + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks prior to the kernel update +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root +ROOTSPACE=$( df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1 ) + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +# Remove the old kernel +rm -rvf \ + /boot/System.map-* \ + /boot/config-* \ + /boot/ipfirerd-* \ + /boot/initramfs-* \ + /boot/vmlinuz-* \ + /boot/uImage-* \ + /boot/zImage-* \ + /boot/uInit-* \ + /boot/dtb-* \ + /lib/modules + +# Extract files +extract_files + +# Remove files +#rm -rvf \ + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Start services + +# Rebuild initial ramdisks +dracut --regenerate-all --force +KVER="xxxKVERxxx" +case "$(uname -m)" in + aarch64) + mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire + # dont remove initramfs because grub need this to boot. + ;; +esac + +# remove lm_sensor config after collectd was started +# to re-search sensors at next boot with updated kernel +rm -f /etc/sysconfig/lm_sensors + +# Upadate Kernel version in uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# Call user update script (needed for some ARM boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +## Modify ovpnconfig according to bug 11048 for pass, no-pass modification in ovpnconfig index +# Check if ovpnconfig exists and is not empty +if [ -s /var/ipfire/ovpn/ovpnconfig ]; then + # Add blank line at top of ovpnconfig otherwise the first roadwarrior entry is treated like a blank line and missed out from update + awk 'NR==1{print ""}1' /var/ipfire/ovpn/ovpnconfig > /var/ipfire/ovpn/tmp_file && mv /var/ipfire/ovpn/tmp_file /var/ipfire/ovpn/ovpnconfig + + # Make all N2N connections 'no-pass' since they do not use encryption + awk '{FS=OFS=","} {if($5=="net") {$43="no-pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.new + + # Evaluate roadwarrior connection names for *.p12 files + for y in $(awk -F',' '/host/ { print $3 }' /var/ipfire/ovpn/ovpnconfig); do + # Sort all unencrypted roadwarriors out and set 'no-pass' in [43] index + if [[ -n $(openssl pkcs12 -info -in /var/ipfire/ovpn/certs/${y}.p12 -noout -password pass:'' 2>&1 | grep 'Encrypted data') ]]; then + awk -v var="$y" '{FS=OFS=","} {if($3==var) {$43="no-pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.new + fi + # Sort all encrypted roadwarriors out and set 'pass' in [43] index + if [[ -n $(openssl pkcs12 -info -in /var/ipfire/ovpn/certs/${y}.p12 -noout -password pass:'' 2>&1 | grep 'verify error') ]]; then + awk -v var="$y" '{FS=OFS=","} {if($3==var) {$43="pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.new + fi + done +fi + +# Replace existing ovpnconfig with updated index +mv /var/ipfire/ovpn/ovpnconfig.new /var/ipfire/ovpn/ovpnconfig +# Set correct ownership +chown nobody:nobody /var/ipfire/ovpn/ovpnconfig + +# This update needs a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/180/exclude b/config/rootfiles/oldcore/180/exclude new file mode 100644 index 000000000..8ee1c3c2f --- /dev/null +++ b/config/rootfiles/oldcore/180/exclude @@ -0,0 +1,35 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +boot/uEnv.txt +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/firewall/locationblock +var/ipfire/fwhosts/customlocationgrp +var/ipfire/ovpn +var/ipfire/urlfilter/blacklist +var/ipfire/urlfilter/settings +var/lib/alternatives +var/lib/location/database.db +var/lib/location/ipset +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/180/filelists/aarch64/binutils b/config/rootfiles/oldcore/180/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/180/filelists/aarch64/binutils rename to config/rootfiles/oldcore/180/filelists/aarch64/binutils diff --git a/config/rootfiles/core/180/filelists/aarch64/boost b/config/rootfiles/oldcore/180/filelists/aarch64/boost similarity index 100% rename from config/rootfiles/core/180/filelists/aarch64/boost rename to config/rootfiles/oldcore/180/filelists/aarch64/boost diff --git a/config/rootfiles/core/180/filelists/aarch64/gcc b/config/rootfiles/oldcore/180/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/180/filelists/aarch64/gcc rename to config/rootfiles/oldcore/180/filelists/aarch64/gcc diff --git a/config/rootfiles/core/180/filelists/aarch64/glibc b/config/rootfiles/oldcore/180/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/180/filelists/aarch64/glibc rename to config/rootfiles/oldcore/180/filelists/aarch64/glibc diff --git a/config/rootfiles/core/180/filelists/aarch64/util-linux b/config/rootfiles/oldcore/180/filelists/aarch64/util-linux similarity index 100% rename from config/rootfiles/core/180/filelists/aarch64/util-linux rename to config/rootfiles/oldcore/180/filelists/aarch64/util-linux diff --git a/config/rootfiles/oldcore/180/filelists/bind b/config/rootfiles/oldcore/180/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/oldcore/180/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/oldcore/180/filelists/core-files b/config/rootfiles/oldcore/180/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/180/filelists/core-files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/os-release +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/180/filelists/dhcpcd b/config/rootfiles/oldcore/180/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/180/filelists/dhcpcd rename to config/rootfiles/oldcore/180/filelists/dhcpcd diff --git a/config/rootfiles/core/180/filelists/files b/config/rootfiles/oldcore/180/filelists/files similarity index 91% rename from config/rootfiles/core/180/filelists/files rename to config/rootfiles/oldcore/180/filelists/files index 8b44a36b1..986085e5e 100644 --- a/config/rootfiles/core/180/filelists/files +++ b/config/rootfiles/oldcore/180/filelists/files @@ -9,3 +9,4 @@ opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/index.cgi var/ipfire/main/manualpages +var/ipfire/extrahd/bin/extrahd.pl diff --git a/config/rootfiles/core/180/filelists/freetype b/config/rootfiles/oldcore/180/filelists/freetype similarity index 100% rename from config/rootfiles/core/180/filelists/freetype rename to config/rootfiles/oldcore/180/filelists/freetype diff --git a/config/rootfiles/core/180/filelists/gzip b/config/rootfiles/oldcore/180/filelists/gzip similarity index 100% rename from config/rootfiles/core/180/filelists/gzip rename to config/rootfiles/oldcore/180/filelists/gzip diff --git a/config/rootfiles/core/180/filelists/hwdata b/config/rootfiles/oldcore/180/filelists/hwdata similarity index 100% rename from config/rootfiles/core/180/filelists/hwdata rename to config/rootfiles/oldcore/180/filelists/hwdata diff --git a/config/rootfiles/core/180/filelists/iana-etc b/config/rootfiles/oldcore/180/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/180/filelists/iana-etc rename to config/rootfiles/oldcore/180/filelists/iana-etc diff --git a/config/rootfiles/core/180/filelists/json-c b/config/rootfiles/oldcore/180/filelists/json-c similarity index 100% rename from config/rootfiles/core/180/filelists/json-c rename to config/rootfiles/oldcore/180/filelists/json-c diff --git a/config/rootfiles/core/180/filelists/krb5 b/config/rootfiles/oldcore/180/filelists/krb5 similarity index 100% rename from config/rootfiles/core/180/filelists/krb5 rename to config/rootfiles/oldcore/180/filelists/krb5 diff --git a/config/rootfiles/core/180/filelists/libedit b/config/rootfiles/oldcore/180/filelists/libedit similarity index 100% rename from config/rootfiles/core/180/filelists/libedit rename to config/rootfiles/oldcore/180/filelists/libedit diff --git a/config/rootfiles/core/180/filelists/libnl-3 b/config/rootfiles/oldcore/180/filelists/libnl-3 similarity index 100% rename from config/rootfiles/core/180/filelists/libnl-3 rename to config/rootfiles/oldcore/180/filelists/libnl-3 diff --git a/config/rootfiles/core/180/filelists/libtiff b/config/rootfiles/oldcore/180/filelists/libtiff similarity index 100% rename from config/rootfiles/core/180/filelists/libtiff rename to config/rootfiles/oldcore/180/filelists/libtiff diff --git a/config/rootfiles/core/180/filelists/mpfr b/config/rootfiles/oldcore/180/filelists/mpfr similarity index 100% rename from config/rootfiles/core/180/filelists/mpfr rename to config/rootfiles/oldcore/180/filelists/mpfr diff --git a/config/rootfiles/core/180/filelists/openssh b/config/rootfiles/oldcore/180/filelists/openssh similarity index 100% rename from config/rootfiles/core/180/filelists/openssh rename to config/rootfiles/oldcore/180/filelists/openssh diff --git a/config/rootfiles/core/180/filelists/ppp b/config/rootfiles/oldcore/180/filelists/ppp similarity index 100% rename from config/rootfiles/core/180/filelists/ppp rename to config/rootfiles/oldcore/180/filelists/ppp diff --git a/config/rootfiles/core/180/filelists/procps b/config/rootfiles/oldcore/180/filelists/procps similarity index 100% rename from config/rootfiles/core/180/filelists/procps rename to config/rootfiles/oldcore/180/filelists/procps diff --git a/config/rootfiles/core/180/filelists/riscv64/binutils b/config/rootfiles/oldcore/180/filelists/riscv64/binutils similarity index 100% rename from config/rootfiles/core/180/filelists/riscv64/binutils rename to config/rootfiles/oldcore/180/filelists/riscv64/binutils diff --git a/config/rootfiles/core/180/filelists/riscv64/boost b/config/rootfiles/oldcore/180/filelists/riscv64/boost similarity index 100% rename from config/rootfiles/core/180/filelists/riscv64/boost rename to config/rootfiles/oldcore/180/filelists/riscv64/boost diff --git a/config/rootfiles/core/180/filelists/riscv64/gcc b/config/rootfiles/oldcore/180/filelists/riscv64/gcc similarity index 100% rename from config/rootfiles/core/180/filelists/riscv64/gcc rename to config/rootfiles/oldcore/180/filelists/riscv64/gcc diff --git a/config/rootfiles/core/180/filelists/riscv64/glibc b/config/rootfiles/oldcore/180/filelists/riscv64/glibc similarity index 100% rename from config/rootfiles/core/180/filelists/riscv64/glibc rename to config/rootfiles/oldcore/180/filelists/riscv64/glibc diff --git a/config/rootfiles/core/180/filelists/riscv64/util-linux b/config/rootfiles/oldcore/180/filelists/riscv64/util-linux similarity index 100% rename from config/rootfiles/core/180/filelists/riscv64/util-linux rename to config/rootfiles/oldcore/180/filelists/riscv64/util-linux diff --git a/config/rootfiles/core/180/filelists/sqlite b/config/rootfiles/oldcore/180/filelists/sqlite similarity index 100% rename from config/rootfiles/core/180/filelists/sqlite rename to config/rootfiles/oldcore/180/filelists/sqlite diff --git a/config/rootfiles/core/180/filelists/squid b/config/rootfiles/oldcore/180/filelists/squid similarity index 100% rename from config/rootfiles/core/180/filelists/squid rename to config/rootfiles/oldcore/180/filelists/squid diff --git a/config/rootfiles/core/180/filelists/suricata b/config/rootfiles/oldcore/180/filelists/suricata similarity index 100% rename from config/rootfiles/core/180/filelists/suricata rename to config/rootfiles/oldcore/180/filelists/suricata diff --git a/config/rootfiles/core/180/filelists/tcl b/config/rootfiles/oldcore/180/filelists/tcl similarity index 100% rename from config/rootfiles/core/180/filelists/tcl rename to config/rootfiles/oldcore/180/filelists/tcl diff --git a/config/rootfiles/core/180/filelists/tzdata b/config/rootfiles/oldcore/180/filelists/tzdata similarity index 100% rename from config/rootfiles/core/180/filelists/tzdata rename to config/rootfiles/oldcore/180/filelists/tzdata diff --git a/config/rootfiles/core/180/filelists/udev b/config/rootfiles/oldcore/180/filelists/udev similarity index 100% rename from config/rootfiles/core/180/filelists/udev rename to config/rootfiles/oldcore/180/filelists/udev diff --git a/config/rootfiles/core/180/filelists/unbound b/config/rootfiles/oldcore/180/filelists/unbound similarity index 100% rename from config/rootfiles/core/180/filelists/unbound rename to config/rootfiles/oldcore/180/filelists/unbound diff --git a/config/rootfiles/core/180/filelists/vnstat b/config/rootfiles/oldcore/180/filelists/vnstat similarity index 100% rename from config/rootfiles/core/180/filelists/vnstat rename to config/rootfiles/oldcore/180/filelists/vnstat diff --git a/config/rootfiles/core/180/filelists/wget b/config/rootfiles/oldcore/180/filelists/wget similarity index 100% rename from config/rootfiles/core/180/filelists/wget rename to config/rootfiles/oldcore/180/filelists/wget diff --git a/config/rootfiles/core/180/filelists/whois b/config/rootfiles/oldcore/180/filelists/whois similarity index 100% rename from config/rootfiles/core/180/filelists/whois rename to config/rootfiles/oldcore/180/filelists/whois diff --git a/config/rootfiles/core/180/filelists/wireless-regdb b/config/rootfiles/oldcore/180/filelists/wireless-regdb similarity index 100% rename from config/rootfiles/core/180/filelists/wireless-regdb rename to config/rootfiles/oldcore/180/filelists/wireless-regdb diff --git a/config/rootfiles/core/180/filelists/x86_64/binutils b/config/rootfiles/oldcore/180/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/180/filelists/x86_64/binutils rename to config/rootfiles/oldcore/180/filelists/x86_64/binutils diff --git a/config/rootfiles/core/180/filelists/x86_64/boost b/config/rootfiles/oldcore/180/filelists/x86_64/boost similarity index 100% rename from config/rootfiles/core/180/filelists/x86_64/boost rename to config/rootfiles/oldcore/180/filelists/x86_64/boost diff --git a/config/rootfiles/core/180/filelists/x86_64/gcc b/config/rootfiles/oldcore/180/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/180/filelists/x86_64/gcc rename to config/rootfiles/oldcore/180/filelists/x86_64/gcc diff --git a/config/rootfiles/core/180/filelists/x86_64/glibc b/config/rootfiles/oldcore/180/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/180/filelists/x86_64/glibc rename to config/rootfiles/oldcore/180/filelists/x86_64/glibc diff --git a/config/rootfiles/core/180/filelists/x86_64/util-linux b/config/rootfiles/oldcore/180/filelists/x86_64/util-linux similarity index 100% rename from config/rootfiles/core/180/filelists/x86_64/util-linux rename to config/rootfiles/oldcore/180/filelists/x86_64/util-linux diff --git a/config/rootfiles/core/180/filelists/zlib b/config/rootfiles/oldcore/180/filelists/zlib similarity index 100% rename from config/rootfiles/core/180/filelists/zlib rename to config/rootfiles/oldcore/180/filelists/zlib diff --git a/config/rootfiles/core/180/update.sh b/config/rootfiles/oldcore/180/update.sh similarity index 100% rename from config/rootfiles/core/180/update.sh rename to config/rootfiles/oldcore/180/update.sh diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 5afe54f55..eb89c5095 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4370,9 +4370,15 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[39] = $cgiparams{'DAUTH'}; $confighash{$key}[40] = $cgiparams{'DCIPHER'};
- if (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1'} eq "")) { - $confighash{$key}[41] = "no-pass"; - } + if ($confighash{$key}[41] eq "") { + if (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1'} eq "")) { + $confighash{$key}[41] = "no-pass"; + } elsif (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1'} ne "")) { + $confighash{$key}[41] = "pass"; + } elsif ($cgiparams{'TYPE'} eq 'net') { + $confighash{$key}[41] = "no-pass"; + } + }
$confighash{$key}[42] = 'HOTP/T30/6'; $confighash{$key}[43] = $cgiparams{'OTP_STATE'}; @@ -5512,20 +5518,24 @@ END }
- print <<END; - <td align='center' $col1>$active</td> + if ($confighash{$key}[41] eq "pass") { + print <<END; + <td align='center' $col1>$active</td>
- <form method='post' name='frm${key}a'><td align='center' $col> - <input type='image' name='$Lang::tr{'dl client arch'}' src='/images/openvpn.png' alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' /> - <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' /> - <input type='hidden' name='KEY' value='$key' /> - </td></form> + <form method='post' name='frm${key}a'><td align='center' $col> + <input type='image' name='$Lang::tr{'dl client arch'}' src='/images/openvpn_encrypted.png' + alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' /> + <input type='hidden' name='MODE' value='secure' /> + <input type='hidden' name='KEY' value='$key' /> + </td></form> END - ;
- if ($confighash{$key}[41] eq "no-pass") { + ; } elsif ($confighash{$key}[41] eq "no-pass") { print <<END; - <form method='post' name='frm${key}g'><td align='center' $col> + <td align='center' $col1>$active</td> + + <form method='post' name='frm${key}a'><td align='center' $col> <input type='image' name='$Lang::tr{'dl client arch insecure'}' src='/images/openvpn.png' alt='$Lang::tr{'dl client arch insecure'}' title='$Lang::tr{'dl client arch insecure'}' border='0' /> <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' /> @@ -5533,7 +5543,7 @@ END <input type='hidden' name='KEY' value='$key' /> </td></form> END - } else { + ; } else { print "<td $col> </td>"; }
@@ -5609,30 +5619,33 @@ END # If the config file contains entries, print Key to action icons if ( $id ) { print <<END; - <table border='0'> - <tr> + <table width='85%' border='0'> + <tr> <td class='boldbase'> <b>$Lang::tr{'legend'}:</b></td> - <td> <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> - <td class='base'>$Lang::tr{'click to disable'}</td> + <td> <img src='/images/openvpn.png' alt='?RELOAD'/></td> + <td class='base'>$Lang::tr{'dl client arch insecure'}</td> + <td> <img src='/images/openvpn_encrypted.png' alt='?RELOAD'/></td> + <td class='base'>$Lang::tr{'dl client arch'}</td> <td> <img src='/images/info.gif' alt='$Lang::tr{'show certificate'}' /></td> <td class='base'>$Lang::tr{'show certificate'}</td> + <td> <img src='/images/qr-code.png' alt='$Lang::tr{'show otp qrcode'}'/></td> + <td class='base'>$Lang::tr{'show otp qrcode'}</td> + </tr> + <tr> + <td> </td> + <td> <img src='/images/media-floppy.png' alt='?FLOPPY' /></td> + <td class='base'>$Lang::tr{'download certificate'}</td> + <td> <img src='/images/off.gif' alt='?OFF' /></td> + <td class='base'>$Lang::tr{'click to enable'}</td> + <td> <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> + <td class='base'>$Lang::tr{'click to disable'}</td> + <td> <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td> <td class='base'>$Lang::tr{'edit'}</td> <td> <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td> <td class='base'>$Lang::tr{'remove'}</td> - </tr> - <tr> - <td> </td> - <td> <img src='/images/off.gif' alt='?OFF' /></td> - <td class='base'>$Lang::tr{'click to enable'}</td> - <td> <img src='/images/media-floppy.png' alt='?FLOPPY' /></td> - <td class='base'>$Lang::tr{'download certificate'}</td> - <td> <img src='/images/openvpn.png' alt='?RELOAD'/></td> - <td class='base'>$Lang::tr{'dl client arch'}</td> - <td> <img src='/images/qr-code.png' alt='$Lang::tr{'show otp qrcode'}'/></td> - <td class='base'>$Lang::tr{'show otp qrcode'}</td> - </tr> - </table><br> + </tr> + </table><br> END ; } diff --git a/html/html/images/openvpn_encrypted.png b/html/html/images/openvpn_encrypted.png new file mode 100644 index 000000000..873c6c461 Binary files /dev/null and b/html/html/images/openvpn_encrypted.png differ diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 0c2f1af53..140806130 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -818,7 +818,7 @@ 'display hostname in window title' => 'Hostname im Fenstertitel anzeigen', 'display traffic at home' => 'Berechneten Traffic auf der Startseite anzeigen', 'display webinterface effects' => 'Überblendeffekte einschalten', -'dl client arch' => 'Client Paket herunterladen (zip)', +'dl client arch' => 'Verschlüsseltes Client Paket herunterladen (zip)', 'dl client arch insecure' => 'Ungesichertes Client-Paket herunterladen (zip)', 'dmz' => 'DMZ', 'dmz pinhole configuration' => 'Einstellungen des DMZ-Schlupfloches', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 90d6f7739..7bbf7cd32 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -859,7 +859,7 @@ 'display hostname in window title' => 'Display hostname in window title', 'display traffic at home' => 'Display calculated traffic on startpage', 'display webinterface effects' => 'Activate effects', -'dl client arch' => 'Download Client Package (zip)', +'dl client arch' => 'Download Encrypted Client Package (zip)', 'dl client arch insecure' => 'Download insecure Client Package (zip)', 'dmz' => 'DMZ', 'dmz pinhole configuration' => 'DMZ pinhole configuration', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 4da924a74..898d42d28 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -731,7 +731,8 @@ 'display hostname in window title' => 'Toon hostnaam in venstertitel', 'display traffic at home' => 'Toon netwerkverkeer op startpagina', 'display webinterface effects' => 'Activeer effecten', -'dl client arch' => 'Download clientpakket (zip)', +'dl client arch' => 'Download versleuteld clientpakket (zip)', +'dl client arch insecure' => 'Download onveilig clientpakket (zip)', 'dmz' => 'DMZ', 'dmz pinhole configuration' => 'DMZ pinhole configuratie', 'dmz pinhole rule added' => 'DMZ pinhole regel toegevoegd; DMZ regel wordt herstart.', diff --git a/lfs/bind b/lfs/bind index 850e3f93a..6779bb3d9 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@
include Config
-VER = 9.16.40 +VER = 9.16.44
THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1ebfec11cc6902480113b1edadcbdb2f819050d779aaa1556ef79491c580a28106d3eff186da89bdecec03025e4e672342602f54e6b0e6f9619a181a1399e070 +$(DL_FILE)_BLAKE2 = cdca8289639d900ab8162e4b0252a495fa0c579b9399326c7df42699346c2f0bca24762dad29de187f142c0896f4012c3f5f3785126d325e7d30ccb73f1530d8
install : $(TARGET)
diff --git a/lfs/linux b/lfs/linux index 52f1fe167..7dedf390e 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@
include Config
-VER = 6.1.45 +VER = 6.1.53 ARM_PATCHES = 6.1.y-ipfire2
THISAPP = linux-$(VER) @@ -75,7 +75,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_BLAKE2 = 1889f12c4bf9d09a5c3d3addbe5de7989ebacdc89c01973b33e8e11faa989eb7a0f1666c3a78ffeb6b315ec1599ab51490a97079f2d4c2109c8888a88dcf03b7 +$(DL_FILE)_BLAKE2 = c5c082fa08e331ae968e27f6a0aed41f7793ea38c3a32311e4f9b7dda3cf1ce74dfd7f3e4c783f0dd4269b543eddd53e086e523d324da5e7a996aa4d8e6701ea arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3
install : $(TARGET) diff --git a/make.sh b/make.sh index acb692140..1a948f8dd 100755 --- a/make.sh +++ b/make.sh @@ -23,7 +23,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.27" # Version number -CORE="180" # Core Level (Filename) +CORE="181" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer