Development October 2023

development@lists.ipfire.org

11 participants
36 discussions

[PATCH] dnsdist: disabled on riscv64 again
by Arne Fitzenreiter 13 Oct '23

13 Oct '23

dnsdist build on my builder fine but it fails on the buildserver via qemu-user. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- lfs/dnsdist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/dnsdist b/lfs/dnsdist index 3fbdcf505..1608d5673 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2023 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 # @@ -36,7 +36,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = dnsdist PAK_VER = 16 -# SUP_ARCH = x86_64 aarch64 +SUP_ARCH = x86_64 aarch64 DEPS = -- 2.34.1

1 0

[PATCH] kernel: update to 6.1.57
by Arne Fitzenreiter 13 Oct '23

13 Oct '23

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- config/kernel/kernel.config.aarch64-ipfire | 3 ++- config/kernel/kernel.config.riscv64-ipfire | 2 +- config/kernel/kernel.config.x86_64-ipfire | 2 +- config/rootfiles/common/aarch64/linux | 1 + lfs/linux | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 278b51e05..c69c13e71 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.1.56-ipfire Kernel Configuration +# Linux/arm64 6.1.57-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -368,6 +368,7 @@ CONFIG_ARM64_ERRATUM_2054223=y CONFIG_ARM64_ERRATUM_2067961=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire index 26ab45dcd..aafcbba7b 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.1.56-ipfire Kernel Configuration +# Linux/riscv 6.1.57-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 893a3d10a..da8dcad00 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.1.56-ipfire Kernel Configuration +# Linux/x86 6.1.57-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 569f6b834..7c96e2b8d 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -6899,6 +6899,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2441009 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2457168 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2658417 +#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2966298 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_819472 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_824069 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_826319 diff --git a/lfs/linux b/lfs/linux index 4dcac1920..18e55f814 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.1.56 +VER = 6.1.57 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 = c70da3ecb8f849890fe2b5bf2874a2dd4f468508b508aaf1e7e6773c63845e782e2cf5285e0e7e62ce25e7a4485e1cf033122c4d6fbff0e83b92e172423e7a5c +$(DL_FILE)_BLAKE2 = 9fd3b4ffdc392d2bedf1b9366fdd773e006c7148756420ae621285874bb2ec9461199871579ba713ce5df1831ace7392969a97f2d5b90b08695f632b97655f9d arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3 install : $(TARGET) -- 2.34.1

1 0

[PATCH v2] curl: Fix CVE-2023-38545
by Michael Tremer 11 Oct '23

11 Oct '23

2 1

[PATCH] curl: Fix CVE-2023-38545
by Michael Tremer 11 Oct '23

11 Oct '23

https://curl.se/docs/CVE-2023-38545.html Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- lfs/curl | 1 + ...15d8aee6c1045be932a34fe6107c2f5ed147.patch | 127 ++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 src/patches/curl-8.4.0-fb4415d8aee6c1045be932a34fe6107c2f5ed147.patch diff --git a/lfs/curl b/lfs/curl index fb98b21af..a4fa21b1c 100644 --- a/lfs/curl +++ b/lfs/curl @@ -70,6 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/curl-8.4.0-fb4415d8aee6c1045be932a34fe6107c2f5ed147.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --disable-ipv6 \ diff --git a/src/patches/curl-8.4.0-fb4415d8aee6c1045be932a34fe6107c2f5ed147.patch b/src/patches/curl-8.4.0-fb4415d8aee6c1045be932a34fe6107c2f5ed147.patch new file mode 100644 index 000000000..6dfe98553 --- /dev/null +++ b/src/patches/curl-8.4.0-fb4415d8aee6c1045be932a34fe6107c2f5ed147.patch @@ -0,0 +1,127 @@ +From fb4415d8aee6c1045be932a34fe6107c2f5ed147 Mon Sep 17 00:00:00 2001 +From: Jay Satiro <raysatiro(a)yahoo.com> +Date: Wed, 11 Oct 2023 07:34:19 +0200 +Subject: [PATCH] socks: return error if hostname too long for remote resolve + +Prior to this change the state machine attempted to change the remote +resolve to a local resolve if the hostname was longer than 255 +characters. Unfortunately that did not work as intended and caused a +security issue. + +Bug: https://curl.se/docs/CVE-2023-38545.html +--- + lib/socks.c | 8 +++--- + tests/data/Makefile.inc | 2 +- + tests/data/test728 | 64 +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 69 insertions(+), 5 deletions(-) + create mode 100644 tests/data/test728 + +diff --git a/lib/socks.c b/lib/socks.c +index c492d663c4738..a7b5ab07e47d0 100644 +--- a/lib/socks.c ++++ b/lib/socks.c +@@ -587,9 +587,9 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf, + + /* RFC1928 chapter 5 specifies max 255 chars for domain name in packet */ + if(!socks5_resolve_local && hostname_len > 255) { +- infof(data, "SOCKS5: server resolving disabled for hostnames of " +- "length > 255 [actual len=%zu]", hostname_len); +- socks5_resolve_local = TRUE; ++ failf(data, "SOCKS5: the destination hostname is too long to be " ++ "resolved remotely by the proxy."); ++ return CURLPX_LONG_HOSTNAME; + } + + if(auth & ~(CURLAUTH_BASIC | CURLAUTH_GSSAPI)) +@@ -903,7 +903,7 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf, + } + else { + socksreq[len++] = 3; +- socksreq[len++] = (char) hostname_len; /* one byte address length */ ++ socksreq[len++] = (unsigned char) hostname_len; /* one byte length */ + memcpy(&socksreq[len], sx->hostname, hostname_len); /* w/o NULL */ + len += hostname_len; + } +diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc +index 2eb6b9d981820..1472b19545e7b 100644 +--- a/tests/data/Makefile.inc ++++ b/tests/data/Makefile.inc +@@ -101,7 +101,7 @@ test681 test682 test683 test684 test685 test686 test687 test688 \ + test700 test701 test702 test703 test704 test705 test706 test707 test708 \ + test709 test710 test711 test712 test713 test714 test715 test716 test717 \ + test718 test719 test720 test721 test722 test723 test724 test725 test726 \ +-test727 \ ++test727 test728 \ + \ + test799 test800 test801 test802 test803 test804 test805 test806 test807 \ + test808 test809 test810 test811 test812 test813 test814 test815 test816 \ +diff --git a/tests/data/test728 b/tests/data/test728 +new file mode 100644 +index 0000000000000..05bcf2883357a +--- /dev/null ++++ b/tests/data/test728 +@@ -0,0 +1,64 @@ ++<testcase> ++<info> ++<keywords> ++HTTP ++HTTP GET ++SOCKS5 ++SOCKS5h ++followlocation ++</keywords> ++</info> ++ ++# ++# Server-side ++<reply> ++# The hostname in this redirect is 256 characters and too long (> 255) for ++# SOCKS5 remote resolve. curl must return error CURLE_PROXY in this case. ++<data> ++HTTP/1.1 301 Moved Permanently ++Location: http://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA… ++Content-Length: 0 ++Connection: close ++ ++</data> ++</reply> ++ ++# ++# Client-side ++<client> ++<features> ++proxy ++</features> ++<server> ++http ++socks5 ++</server> ++ <name> ++SOCKS5h with HTTP redirect to hostname too long ++ </name> ++ <command> ++--no-progress-meter --location --proxy socks5h://%HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER ++</command> ++</client> ++ ++# ++# Verify data after the test has been "shot" ++<verify> ++<protocol crlf="yes"> ++GET /%TESTNUMBER HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++User-Agent: curl/%VERSION ++Accept: */* ++ ++</protocol> ++<errorcode> ++97 ++</errorcode> ++# the error message is verified because error code CURLE_PROXY (97) may be ++# returned for any number of reasons and we need to make sure it is ++# specifically for the reason below so that we know the check is working. ++<stderr mode="text"> ++curl: (97) SOCKS5: the destination hostname is too long to be resolved remotely by the proxy. ++</stderr> ++</verify> ++</testcase> -- 2.39.2

1 0

IPFire Wiki is not working
by Adolf Belka 09 Oct '23

09 Oct '23

Hi All, In case you are not aware, the wiki is giving the Error 500 oops, something went wrong message. Regards, Adolf. -- Sent from my laptop

2 1

[PATCH] Postfix: Update to 3.8.2
by Peter Müller 09 Oct '23

09 Oct '23

Refer to https://www.postfix.org/announcements/postfix-3.8.2.html for the changelog of this version. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/postfix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/postfix b/lfs/postfix index f2ae45007..532ec37ca 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -26,7 +26,7 @@ include Config SUMMARY = A fast, secure, and flexible mailer -VER = 3.8.1 +VER = 3.8.2 THISAPP = postfix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 41 +PAK_VER = 42 DEPS = @@ -70,7 +70,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 83c043d6e74cbbf0c5d739838ff99d4905aa711b13483fe0f427956b962c432e6f76d9828b5c141260e210c9605ac260df950d273d5729c36666c935a3ed4518 +$(DL_FILE)_BLAKE2 = 233693e088901e8ed986e34d60b55fb6b786c37868095ab914e6049c5ad6aee09f07d3b5d1f2bec64d8570e215bb15196760d30074cd8ddfaeff3897ad117b81 install : $(TARGET) -- 2.35.3

2 1

[PATCH] Tor: Update to 0.4.8.7
by Peter Müller 09 Oct '23

09 Oct '23

Changes in version 0.4.8.7 - 2023-09-25 This version fixes a single major bug in the Conflux subsystem on the client side. See below for more information. The upcoming Tor Browser 13 stable will pick this up. o Major bugfixes (conflux): - Fix an issue that prevented us from pre-building more conflux sets after existing sets had been used. Fixes bug 40862; bugfix on 0.4.8.1-alpha. o Minor features (fallbackdir): - Regenerate fallback directories generated on September 25, 2023. o Minor features (geoip data): - Update the geoip files to match the IPFire Location Database, as retrieved on 2023/09/25. Changes in version 0.4.8.6 - 2023-09-18 This version contains an important fix for onion service regarding congestion control and its reliability. Apart from that, uneeded BUG warnings have been suppressed especially about a compression bomb seen on relays. We strongly recommend, in particular onion service operators, to upgrade as soon as possible to this latest stable. o Major bugfixes (onion service): - Fix a reliability issue where services were expiring their introduction points every consensus update. This caused connectivity issues for clients caching the old descriptor and intro points. Bug reported and fixed by gitlab user @hyunsoo.kim676. Fixes bug 40858; bugfix on 0.4.7.5-alpha. o Minor features (debugging, compression): - Log the input and output buffer sizes when we detect a potential compression bomb. Diagnostic for ticket 40739. o Minor features (fallbackdir): - Regenerate fallback directories generated on September 18, 2023. o Minor features (geoip data): - Update the geoip files to match the IPFire Location Database, as retrieved on 2023/09/18. o Minor bugfix (defensive programming): - Disable multiple BUG warnings of a missing relay identity key when starting an instance of Tor compiled without relay support. Fixes bug 40848; bugfix on 0.4.3.1-alpha. o Minor bugfixes (bridge authority): - When reporting a pseudo-networkstatus as a bridge authority, or answering "ns/purpose/*" controller requests, include accurate published-on dates from our list of router descriptors. Fixes bug 40855; bugfix on 0.4.8.1-alpha. o Minor bugfixes (compression, zstd): - Use less frightening language and lower the log-level of our run- time ABI compatibility check message in our Zstd compression subsystem. Fixes bug 40815; bugfix on 0.4.3.1-alpha. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/tor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/tor b/lfs/tor index d7be53a1c..7a9ca4128 100644 --- a/lfs/tor +++ b/lfs/tor @@ -26,7 +26,7 @@ include Config SUMMARY = Anonymizing overlay network for TCP (The onion router) -VER = 0.4.8.5 +VER = 0.4.8.7 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 80 +PAK_VER = 81 DEPS = libseccomp @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 71a4807284ecefc4a18d6bc15ce798844304f860338b786590779fb171f851d630e8af3114dbc84fe854561e0085dcb147b4dd87787988a8fb6c3628bfcc8175 +$(DL_FILE)_BLAKE2 = 4d0cde752a729c64e380663e4438398fe768a8657e9aa3246bdf0ec9a4b4e01e277cb594ae0cb44cc66ea8c6080f2e58c6daf1bf01dc51b678d228e8e38fc971 install : $(TARGET) -- 2.35.3

2 1

[PATCH] bind: Update to 9.16.44
by Matthias Fischer 09 Oct '23

09 Oct '23

For details see: https://downloads.isc.org/isc/bind9/9.16.44/doc/arm/html/notes.html#notes-f… Changes since 9.16.40: 9.16.44: "Previously, sending a specially crafted message over the control channel could cause the packet-parsing code to run out of available stack memory, causing named to terminate unexpectedly. This has been fixed. (CVE-2023-3341)" 9.16.43: "Processing already-queued queries received over TCP could cause an assertion failure, when the server was reconfigured at the same time or the cache was being flushed. This has been fixed." 9.16.42: "The overmem cleaning process has been improved, to prevent the cache from significantly exceeding the configured max-cache-size limit. (CVE-2023-2828) A query that prioritizes stale data over lookup triggers a fetch to refresh the stale data in cache. If the fetch is aborted for exceeding the recursion quota, it was possible for named to enter an infinite callback loop and crash due to stack overflow. This has been fixed. (CVE-2023-2911) Previously, it was possible for a delegation from cache to be returned to the client after the stale-answer-client-timeout duration. This has been fixed." 9.16.41: "When removing delegations from an opt-out range, empty-non-terminal NSEC3 records generated by those delegations were not cleaned up. This has been fixed." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/bind | 14 +++++++------- lfs/bind | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) 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/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) -- 2.34.1

2 1

[PATCH] Lynis: Update to 3.0.9
by Peter Müller 09 Oct '23

09 Oct '23

Changelog according to https://cisofy.com/changelog/lynis/#309: - DBS-1820 - Added newer style format for Mongo authorization setting - FILE-6410 - Locations added for plocate - SSH-7408 - Only test Compression if sshd version < 7.4 - Improved fetching timestamp - Minor changes such as typos Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/lynis | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/lynis b/lfs/lynis index afc109945..eb906dbeb 100644 --- a/lfs/lynis +++ b/lfs/lynis @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2023 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Security and System auditing tool -VER = 3.0.8 +VER = 3.0.9 THISAPP = lynis-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lynis -PAK_VER = 12 +PAK_VER = 13 DEPS = @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 490bd6799619a4247c3fa68cc96f2f1fead651b23db0ffb512394960f8ca0360ab7f25d2bb8d9e742641558972e1fdd4b1e18d7de0d13007988276eed3a97b1f +$(DL_FILE)_BLAKE2 = dc7912c7d1782c3ffdf369cc7f0f004267bd2a2c408982909e654db14ecfa83ebdbd2f731c3d3ee8864e7de21945b1faa2f9d2845dedf3e742a4c79c62373eda install : $(TARGET) -- 2.35.3

2 1

[PATCH] sysvinit: Update to version 3.08
by Adolf Belka 08 Oct '23

08 Oct '23

- Update from version 3.00 to 3.08 - Update of rootfile - All the other patches and sed modifications are now built mintyo the source tarball, except for the mountpoint patch which is stilol needed - Changelog 3.08 This release focuses on three changes which are basically imports of patches from Gentoo. Special thanks to floppym for supplying these. Applied a patch from floppm which adds kexec option to the halt command. This can be used as "halt -k". floppym provided patch which causes the halt command to call "shutdown -h -H" instead of "shutdown -h" when halt is invoked without parameters. This forces the shutdown command to set the INIT_HALT variable and assume, unless other conditions apply, that the "halt" call really wants to halt the machine and INIT_HALT should be set. In other words we assume halt wants to halt unless told otherwise. Addresses downstream Gentoo bug ID 911257. Updated halt documentation and help output to display parameters in alphabetical order. 3.07 The 3.07 release of SysV init mostly introduces fixes and improvements for the killall5 and pidof programs. (These are actually the same program, but are invoked with two different names, which result in different behaviour. The main highlights in this release are: Fixed killall5 so that processes in the omit list are not sent any signals, including SIGSTOP. Fixed usage message for killall5 to be more accurate. pidof was not returning PIDs of programs which were launched using a symbolic link. This has been fixed so programs run from a symbolic link show up in process lists. 3.06 Mark Hindley fixed typo in es.po Mark Hindley cleaned up translation code in src/Makefile. Drop sulogin from Debian build. Removed libcrypt-dev dependency. Fixed pt translation pages which were failing due to mis-matched open/close tags. Makefile now respects ROOT prefix when setting up pidof-to-killall5 symbolic link. Removed redundant translation files from man directory. Makefile now respects DESTDIR. User can specify either ROOT= or DESTDIR= to set install prefix. 3.05 This release (3.05) focuses on two things: Updating the translation framework. Fixing compiling issues on various systems. The second point, compiling, encompasses a few minor changes to get SysV init to build properly on GNU Hurd, systems without certain GNU assumptions, and systems running the latest glibc library (2.36 at time of writing). 3.04 This release contains one minor fix which allows the bootlogd code to properly compile on Debian's GNU Hurd branch. 3.03 This release includes two minor changes. One is fixing a typo in the init manual page (init.8). this fix was offered by Mark hindley. Mark, and a few other people, also pointed out that a fix in 3.02 for bootlogd introduced reliance on a defined PATH_MAX constant. This is used elsewhere in the code, but is not explicitly defined in bootlogd, which caused bootlogd to not build properly on GNU Hurd and musl C systems. This has been fixed. 3.02 Added q and Q flags to synopsis in shutdown manual page. Applied fixes for markup and spacing in manual pages. Patch provided by Mario Blattermann. Added translation framework (po4a) from Mario Blttermann. Added Makefile for man/ directory. Will handle translations and substitutions. Applied new translations for multiple languages from Mario Blattermann. Added ability to use "@" symbol in command named in the inittab file. This treats commands as literal and does not launch a shell to interpret them. Updated inittab manual page to include overview of symbols which trigger a shell interpretor and how to disable them using the @ symbol. Introduced change which adds error checking in bootlogd when performing chdir(). - Provided by Alexander Vickberg Add check for console using TIOCGDEV on Linux systems in bootlogd to make finding console more robust. - Provided by Alexander Vickberg 3.01 Default to showing processes in the uninterruptable state (D). The -z flag no longer affects whether processes in D state are shown. The -z flag does still toggle whether zombie (Z) processes are shown. Removed unnecessary check which is always true from init tab parsing. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/sysvinit | 65 +++++++++++++++++++ lfs/sysvinit | 18 ++--- ...sysvinit-3.00-fix-glibc-2.36-headers.patch | 10 --- ...h => sysvinit-3.08_build_mountpoint.patch} | 0 4 files changed, 71 insertions(+), 22 deletions(-) delete mode 100644 src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch rename src/patches/{sysvinit-2.98_build_mountpoint.patch => sysvinit-3.08_build_mountpoint.patch} (100%) diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit index f97745760..d7a63e76a 100644 --- a/config/rootfiles/common/sysvinit +++ b/config/rootfiles/common/sysvinit @@ -20,6 +20,40 @@ usr/bin/mesg usr/bin/utmpdump usr/bin/wall #usr/include/initreq.h +#usr/share/man/de/man1/last.1 +#usr/share/man/de/man1/mesg.1 +#usr/share/man/de/man1/mountpoint.1 +#usr/share/man/de/man1/readbootlog.1 +#usr/share/man/de/man1/utmpdump.1 +#usr/share/man/de/man1/wall.1 +#usr/share/man/de/man5 +#usr/share/man/de/man5/initctl.5 +#usr/share/man/de/man5/initscript.5 +#usr/share/man/de/man5/inittab.5 +#usr/share/man/de/man8 +#usr/share/man/de/man8/bootlogd.8 +#usr/share/man/de/man8/fstab-decode.8 +#usr/share/man/de/man8/halt.8 +#usr/share/man/de/man8/init.8 +#usr/share/man/de/man8/killall5.8 +#usr/share/man/de/man8/logsave.8 +#usr/share/man/de/man8/pidof.8 +#usr/share/man/de/man8/runlevel.8 +#usr/share/man/de/man8/shutdown.8 +#usr/share/man/de/man8/sulogin.8 +#usr/share/man/es +#usr/share/man/es/man5 +#usr/share/man/es/man5/initscript.5 +#usr/share/man/es/man5/inittab.5 +#usr/share/man/fr/man5 +#usr/share/man/fr/man5/initscript.5 +#usr/share/man/fr/man5/inittab.5 +#usr/share/man/fr/man8 +#usr/share/man/fr/man8/bootlogd.8 +#usr/share/man/fr/man8/fstab-decode.8 +#usr/share/man/fr/man8/init.8 +#usr/share/man/fr/man8/killall5.8 +#usr/share/man/fr/man8/pidof.8 #usr/share/man/man1/last.1 #usr/share/man/man1/lastb.1 #usr/share/man/man1/mesg.1 @@ -43,3 +77,34 @@ usr/bin/wall #usr/share/man/man8/shutdown.8 #usr/share/man/man8/sulogin.8 #usr/share/man/man8/telinit.8 +#usr/share/man/pl +#usr/share/man/pl/man5 +#usr/share/man/pl/man5/initscript.5 +#usr/share/man/pl/man5/inittab.5 +#usr/share/man/pl/man8 +#usr/share/man/pl/man8/init.8 +#usr/share/man/pl/man8/killall5.8 +#usr/share/man/pl/man8/pidof.8 +#usr/share/man/pt +#usr/share/man/pt/man1 +#usr/share/man/pt/man1/last.1 +#usr/share/man/pt/man1/mesg.1 +#usr/share/man/pt/man1/mountpoint.1 +#usr/share/man/pt/man1/readbootlog.1 +#usr/share/man/pt/man1/utmpdump.1 +#usr/share/man/pt/man1/wall.1 +#usr/share/man/pt/man5 +#usr/share/man/pt/man5/initctl.5 +#usr/share/man/pt/man5/initscript.5 +#usr/share/man/pt/man5/inittab.5 +#usr/share/man/pt/man8 +#usr/share/man/pt/man8/bootlogd.8 +#usr/share/man/pt/man8/fstab-decode.8 +#usr/share/man/pt/man8/halt.8 +#usr/share/man/pt/man8/init.8 +#usr/share/man/pt/man8/killall5.8 +#usr/share/man/pt/man8/logsave.8 +#usr/share/man/pt/man8/pidof.8 +#usr/share/man/pt/man8/runlevel.8 +#usr/share/man/pt/man8/shutdown.8 +#usr/share/man/pt/man8/sulogin.8 diff --git a/lfs/sysvinit b/lfs/sysvinit index ec0a5c292..4da1b185e 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2023 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 # @@ -24,7 +24,7 @@ include Config -VER = 3.00 +VER = 3.08 THISAPP = sysvinit-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d1c4e509d7c13cf0fb9da290f875e7c0ab0666d843d75d4dd6885112248a859dd077bdf9cc926c4af58473da99a5229bb879c7094afd648d5ebe72597a3ba6a7 +$(DL_FILE)_BLAKE2 = ec4a4ff3663ac7d67808b50b67631ff4fe1ab56d376df15868df0eb79cbc329b192af124380eec6a797d827c3c7c5586058310d803f42ee1934dcffbfbe876f7 install : $(TARGET) @@ -70,14 +70,8 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - # Newer C libraries omit this include from sys/types.h. - # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-2.98_build_mountpoint.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch - cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \ - -e "/include.*sys\/stat.h/a#include <sys/sysmacros.h>\n" - cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile - cd $(DIR_APP) && make $(MAKETUNING) -C src - cd $(DIR_APP) && make -C src install + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-3.08_build_mountpoint.patch + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch b/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch deleted file mode 100644 index ee6f621b5..000000000 --- a/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- sysvinit-3.00/src/sulogin.c~ 2022-08-09 09:43:41.993484098 +0000 -+++ sysvinit-3.00/src/sulogin.c 2022-08-09 09:45:04.897252500 +0000 -@@ -51,7 +51,6 @@ - #ifdef __linux__ - # include <sys/statfs.h> - # include <sys/mount.h> --# include <linux/fs.h> - # include <linux/magic.h> - # include <linux/major.h> - # ifndef TMPFS_MAGIC diff --git a/src/patches/sysvinit-2.98_build_mountpoint.patch b/src/patches/sysvinit-3.08_build_mountpoint.patch similarity index 100% rename from src/patches/sysvinit-2.98_build_mountpoint.patch rename to src/patches/sysvinit-3.08_build_mountpoint.patch -- 2.42.0

1 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development October 2023