[git.ipfire.org] IPFire 2.x development tree branch, master, updated. bf4bd9dd36470b9091ad03856e9f7cfd89d9e98d
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 bf4bd9dd36470b9091ad03856e9f7cfd89d9e98d (commit) via 6515a2780201e9209e370cd4562bef5cb771f1a5 (commit) via 25b6a76646691f91f6f267792700dde6adcfc91b (commit) via dde0e0ce8709beac6ff8f3b177361efba5443801 (commit) via d467baeda26323dea38ab00c277f0d6b74b1b004 (commit) via c2955d0127d190e6aab6347f4cf21e2e0d34d426 (commit) via 7825fd0f4b084d6c0ca606439f047180bf476146 (commit) via 731d944b2b82ce30f604f7d79cc91f6a29ec637d (commit) via d10fa6e64b5126b1116068d8540c68ecd18c8f79 (commit) via 3bacd534a9d34290115eb0935eb45c7c376704f3 (commit) via d8c4aaddc396dc0cffd1313bbf3c7362c54d9fb0 (commit) via b46314bf7aadc0dbe27ad64d877ddc8a6e67a611 (commit) via d258c7a47add5954a68c894dc91934d1c534e1d8 (commit) via bafa45ed843d2799136158caf6a31adadf648eb3 (commit) via c522d8109dcfa95c5a9b054276cbfb768af51b69 (commit) from 6158761b2f81a08f115f5b614ad29fdc4bd210cf (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 bf4bd9dd36470b9091ad03856e9f7cfd89d9e98d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun May 19 15:13:23 2024 +0200
core186: ship header.pl
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 6515a2780201e9209e370cd4562bef5cb771f1a5 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 15 13:20:03 2024 +0000
header.pl: Fix parsing BOOTP leases
If the lease has been handed out over BOOTP, it will never expire. However, the parser did not account for this case at all which is fixed in this patch.
Fixes: #13689 - BOOTP breaks the list of DHCP leases due to erroneous parsing Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 25b6a76646691f91f6f267792700dde6adcfc91b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun May 19 13:26:52 2024 +0200
kernel: update to 6.6.31
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit dde0e0ce8709beac6ff8f3b177361efba5443801 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun May 19 13:25:44 2024 +0200
core186: ship intel-microcode
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d467baeda26323dea38ab00c277f0d6b74b1b004 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed May 15 17:32:09 2024 +0200
intel-microcode: Update to version 20240514
- Update from version 20240312 to 20240514 - Update of rootfile not required. - For the changelog details see the releasenote.md file in the source tarball.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c2955d0127d190e6aab6347f4cf21e2e0d34d426 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri May 10 18:13:24 2024 +0200
mympd: update to 15.0.1
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 7825fd0f4b084d6c0ca606439f047180bf476146 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 10 12:02:34 2024 +0000
Revert "oci-setup: Fixes bug12763"
This reverts commit 238a47874fe044ae90129bde10b267063c4305f5.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 731d944b2b82ce30f604f7d79cc91f6a29ec637d Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 10 12:02:33 2024 +0000
Revert "gcp-setup: Fixes bug12763"
This reverts commit 2841a675482879a5eb6bfeaabb268066af762e9d.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d10fa6e64b5126b1116068d8540c68ecd18c8f79 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 10 12:02:32 2024 +0000
Revert "exoscale-setup: Fixes bug12763"
This reverts commit 3162b6ccfa2fb22513c7d23d29f0509343f46828.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 3bacd534a9d34290115eb0935eb45c7c376704f3 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 10 12:02:31 2024 +0000
Revert "azure-setup: Fixes bug12763"
This reverts commit 1db5f96c5ebbb2074c9c0a3edf29866c4769da11.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d8c4aaddc396dc0cffd1313bbf3c7362c54d9fb0 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 10 12:02:30 2024 +0000
Revert "aws-setup: Fixes bug12763"
This reverts commit eb0de6531c441663477cf7e139f1bd5321630eef.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit b46314bf7aadc0dbe27ad64d877ddc8a6e67a611 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 10 12:02:29 2024 +0000
Revert "ip-up: Fixes bug12763"
This reverts commit 4f455c488ee8542bea4ccbe439351b3e9973c6e4.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d258c7a47add5954a68c894dc91934d1c534e1d8 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 10 12:02:28 2024 +0000
Revert "red: Fixes bug12763"
This reverts commit 9c28cd59c1b4f535382e5e4e7952d921af8cc03b.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit bafa45ed843d2799136158caf6a31adadf648eb3 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 10 12:02:27 2024 +0000
Revert "static-routes: Fixes bug12763"
This reverts commit e33ee46e621eb6967c954a9d3b4683880e372579.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c522d8109dcfa95c5a9b054276cbfb768af51b69 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 10 12:02:26 2024 +0000
ipsec-interfaces: Don't throw away errors when creating routes
This partly reverts 87a97a431915849cf6d19e1b7137b4fb0b6dd91d.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/header.pl | 8 ++++++-- config/kernel/kernel.config.aarch64-ipfire | 2 +- config/kernel/kernel.config.x86_64-ipfire | 2 +- config/rootfiles/core/186/filelists/files | 1 + .../{oldcore/121 => core/186}/filelists/x86_64/intel-microcode | 0 config/rootfiles/packages/mympd | 2 ++ lfs/intel-microcode | 4 ++-- lfs/linux | 4 ++-- lfs/mympd | 6 +++--- src/initscripts/helper/aws-setup | 2 +- src/initscripts/helper/azure-setup | 2 +- src/initscripts/helper/exoscale-setup | 2 +- src/initscripts/helper/gcp-setup | 4 ++-- src/initscripts/helper/oci-setup | 4 ++-- src/initscripts/networking/red | 4 ++-- src/initscripts/system/static-routes | 4 ++-- src/ppp/ip-up | 2 +- src/scripts/ipsec-interfaces | 4 ++-- 18 files changed, 32 insertions(+), 25 deletions(-) copy config/rootfiles/{oldcore/121 => core/186}/filelists/x86_64/intel-microcode (100%)
Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 5164e9731b..a67ff92ee1 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -454,12 +454,16 @@ END $hostname = ""; }
- if ($line =~ /^\s*ends/) { - $line =~ /(\d+)/(\d+)/(\d+) (\d+):(\d+):(\d+)/; + if ($line =~ /^\s*ends \d (\d+)/(\d+)/(\d+) (\d+):(\d+):(\d+)/) { $endtime = timegm($6, $5, $4, $3, $2 - 1, $1 - 1900); ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $dst) = localtime($endtime); $endtime_print = sprintf ("%02d/%02d/%d %02d:%02d:%02d",$mday,$mon+1,$year+1900,$hour,$min,$sec); $expired = $endtime < time(); + + } elsif ($line =~ /^\s*ends never/) { + $endtime = 0; + $endtime_print = $Lang::tr{'never'}; + $expired = 0; }
if ($line =~ /^\s*hardware ethernet/) { diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index f78d754846..af3601ec04 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.30-ipfire Kernel Configuration +# Linux/arm64 6.6.31-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 002fb85024..af4bd81d00 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.30-ipfire Kernel Configuration +# Linux/x86 6.6.31-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/config/rootfiles/core/186/filelists/files b/config/rootfiles/core/186/filelists/files index c3c0fc8bc5..3f0d11ae2d 100644 --- a/config/rootfiles/core/186/filelists/files +++ b/config/rootfiles/core/186/filelists/files @@ -15,4 +15,5 @@ etc/rc.d/rc6.d/K01grub-btrfsd srv/web/ipfire/cgi-bin/vulnerabilities.cgi usr/local/bin/ipsec-interfaces usr/sbin/unbound-dhcp-leases-bridge +var/ipfire/header.pl var/ipfire/ipblocklist/sources diff --git a/config/rootfiles/core/186/filelists/x86_64/intel-microcode b/config/rootfiles/core/186/filelists/x86_64/intel-microcode new file mode 120000 index 0000000000..d5ac074e2e --- /dev/null +++ b/config/rootfiles/core/186/filelists/x86_64/intel-microcode @@ -0,0 +1 @@ +../../../../common/x86_64/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/packages/mympd b/config/rootfiles/packages/mympd index b0ac2859fc..3b93618b78 100644 --- a/config/rootfiles/packages/mympd +++ b/config/rootfiles/packages/mympd @@ -3,6 +3,8 @@ usr/bin/mympd usr/bin/mympd-config usr/bin/mympd-script #usr/lib/systemd/system/mympd.service +#usr/lib/systemd/user +#usr/lib/systemd/user/mympd.service #usr/share/doc/mympd #usr/share/doc/mympd/CHANGELOG.md #usr/share/doc/mympd/LICENSE.md diff --git a/lfs/intel-microcode b/lfs/intel-microcode index 785b2303b6..a1f7d6737a 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -24,7 +24,7 @@
include Config
-VER = 20240312 +VER = 20240514
THISAPP = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 43c771becef0f6dbfd41bf78a9a3cc8f6679a43ea48765d0e7f555c138dca6e3db42a4d33f743d8d51f38b0b6aa69322bba0c00ae9f1ff4c533b52166ee54747 +$(DL_FILE)_BLAKE2 = 2a3a357ecf8d9f17fd20cd651386e5687fbbca8a3a323caf846e7c84d440241c3c99cadd00016642c8d11f297c1d2ab63c54ea062644839b74f84d66b04c703e
install : $(TARGET)
diff --git a/lfs/linux b/lfs/linux index ef6b2cd04f..42d61e67d8 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@
include Config
-VER = 6.6.30 +VER = 6.6.31
THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 815c85dae71784bc1eb722fc7651abebf344a960f51c473daa50f51f9097b8d64c68c033a3d488f7780cebd29e360c6df6ceff255a1a07d18533d7d950e77db8 +$(DL_FILE)_BLAKE2 = 521d01b10be736cc7be1108ad0fe9b046aad0ba5af02539d3d0425e424d5c081aaa69446e9f861e5ff4166c0f99201cb827b044d5a70816e4059f53f417c945f
install : $(TARGET)
diff --git a/lfs/mympd b/lfs/mympd index 012f867dac..1dd1c530d6 100644 --- a/lfs/mympd +++ b/lfs/mympd @@ -26,7 +26,7 @@ include Config
SUMMARY = Webfrontend for Music Player Daemon
-VER = 14.1.2 +VER = 15.0.1
THISAPP = myMPD-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mympd -PAK_VER = 5 +PAK_VER = 6
DEPS = mpd libmpdclient
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 59a5d62ed1e91d422f091f331bd935b0988715fd641b81f48e19a37694cc14da2c78d4563bb149767afd873bcebdfaccfd984b63f45a6bb321214eebb3807ddf +$(DL_FILE)_BLAKE2 = ebd28edb73a884cbb30a5ceefc20813c678c28b03601f97ac9889c2c242dd7a2f7934d98b1f92bf148283ad9f026ac0994b75a1d046d3694160871523dc8a7ca
install : $(TARGET)
diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index 0bcf755720..f14f4eb578 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -278,7 +278,7 @@ case "${reason}" in ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
# Add the default route - ip route add default via "${new_routers}" >/dev/null 2>&1 + ip route add default via "${new_routers}"
# Setup DNS for domain_name_server in ${new_domain_name_servers}; do diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup index eff963a4b1..7a4422a353 100644 --- a/src/initscripts/helper/azure-setup +++ b/src/initscripts/helper/azure-setup @@ -298,7 +298,7 @@ case "${reason}" in ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
# Add the default route - ip route add default via "${new_routers}" >/dev/null 2>&1 + ip route add default via "${new_routers}"
# Setup DNS for domain_name_server in ${new_domain_name_servers}; do diff --git a/src/initscripts/helper/exoscale-setup b/src/initscripts/helper/exoscale-setup index acf5e4e4b9..02fdda2a35 100644 --- a/src/initscripts/helper/exoscale-setup +++ b/src/initscripts/helper/exoscale-setup @@ -227,7 +227,7 @@ case "${reason}" in ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
# Add the default route - ip route add default via "${new_routers}" >/dev/null 2>&1 + ip route add default via "${new_routers}"
# Setup DNS for domain_name_server in ${new_domain_name_servers}; do diff --git a/src/initscripts/helper/gcp-setup b/src/initscripts/helper/gcp-setup index 8273b70b4f..4f5148c3e2 100644 --- a/src/initscripts/helper/gcp-setup +++ b/src/initscripts/helper/gcp-setup @@ -268,8 +268,8 @@ case "${reason}" in ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
# Add the default route - ip route add "${new_routers}" dev "${interface}" >/dev/null 2>&1 - ip route add default via "${new_routers}" >/dev/null 2>&1 + ip route add "${new_routers}" dev "${interface}" + ip route add default via "${new_routers}"
# Setup DNS for domain_name_server in ${new_domain_name_servers}; do diff --git a/src/initscripts/helper/oci-setup b/src/initscripts/helper/oci-setup index 7275373438..312014b74c 100644 --- a/src/initscripts/helper/oci-setup +++ b/src/initscripts/helper/oci-setup @@ -304,8 +304,8 @@ case "${reason}" in ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
# Add the default route - ip route add "${new_routers}" dev "${interface}" >/dev/null 2>&1 - ip route add default via "${new_routers}" >/dev/null 2>&1 + ip route add "${new_routers}" dev "${interface}" + ip route add default via "${new_routers}"
# Setup DNS for domain_name_server in ${new_domain_name_servers}; do diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index 51bf95a436..beb665e5f4 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -129,10 +129,10 @@ case "${1}" in touch /var/ipfire/red/active
# Create route to default gateway - ip route add ${GATEWAY} dev ${DEVICE} >/dev/null 2>&1 + ip route add ${GATEWAY} dev ${DEVICE}
boot_mesg "Setting up default gateway ${GATEWAY}..." - ip route add default via ${GATEWAY} dev ${DEVICE} >/dev/null 2>&1 + ip route add default via ${GATEWAY} dev ${DEVICE} evaluate_retval
if [ -d "/sys/class/net/${DEVICE}" ]; then diff --git a/src/initscripts/system/static-routes b/src/initscripts/system/static-routes index 9aacc8db5f..9029c94dbf 100644 --- a/src/initscripts/system/static-routes +++ b/src/initscripts/system/static-routes @@ -29,7 +29,7 @@ function init_table() { return fi
- ip rule add table static >/dev/null 2>&1 + ip rule add table static }
function create_all_routes() { @@ -54,7 +54,7 @@ function create_all_routes() { continue fi
- ip route add ${network} via ${gateway} table static proto static >/dev/null 2>&1 + ip route add ${network} via ${gateway} table static proto static done < ${file} }
diff --git a/src/ppp/ip-up b/src/ppp/ip-up index 5f4ee77265..2e636e72d9 100644 --- a/src/ppp/ip-up +++ b/src/ppp/ip-up @@ -33,7 +33,7 @@ echo -n "$4" > /var/ipfire/red/local-ipaddress echo -n "$5" > /var/ipfire/red/remote-ipaddress touch /var/ipfire/red/active
-/sbin/ip route replace default via ${IPREMOTE} dev ppp0 >/dev/null 2>&1 +/sbin/ip route replace default via ${IPREMOTE} dev ppp0 run_subdir ${rc_base}/init.d/networking/red.up/
#Check if gateway has answerd to ping, if not replace with ping.ipfire.org diff --git a/src/scripts/ipsec-interfaces b/src/scripts/ipsec-interfaces index 974d3ac845..b05b2009c4 100644 --- a/src/scripts/ipsec-interfaces +++ b/src/scripts/ipsec-interfaces @@ -115,7 +115,7 @@ main() { # We are done when IPsec is not enabled if [ "${ENABLED}" = "on" ]; then # Enable route table lookup - ip rule add lookup "${ROUTE_TABLE}" prio "${ROUTE_TABLE_PRIO}" >/dev/null 2>&1 + ip rule add lookup "${ROUTE_TABLE}" prio "${ROUTE_TABLE_PRIO}"
while IFS="," read -r "${VARS[@]}"; do # Check if the connection is enabled @@ -158,7 +158,7 @@ main() {
log "Creating route to ${rightsubnet} (via ${address} and ${RED_INTF})" ip route add table "${ROUTE_TABLE}" "${rightsubnet}" proto static \ - dev "${RED_INTF}" src "${address}" >/dev/null 2>&1 + dev "${RED_INTF}" src "${address}" done
# No interface processing required
hooks/post-receive -- IPFire 2.x development tree
-
Arne Fitzenreiter