From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4fnJWl4Jrpz2yDM for ; Fri, 03 Apr 2026 12:51:47 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4fnJWl3yQJz2xMP for ; Fri, 03 Apr 2026 12:51:47 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bit raw public key) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4fnJWk6Kzyz3Mb for ; Fri, 03 Apr 2026 12:51:46 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1775220706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=oVYJAD8PpvCAB/L4uB7WE5XtjKjKHZ/oCeUKgJFszyk=; b=LHKBt+SKhonay1HMvZLZ4EvhvXlwboNgwVTSHhnE2j+5I1AdjQbrQ56/5c00+uyX1BtUGt Nwjoe6Ix/PY8gSDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1775220706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=oVYJAD8PpvCAB/L4uB7WE5XtjKjKHZ/oCeUKgJFszyk=; b=tpSp+kU5LQRSkEK00SJGsoXbVSbe+qAWZmq2f9aWQL4viypWGnCHoeSdP2S2Z5YWSHo9Pe Q9GVSPZuPuJCzBU6MKFT9/oNY9/NfmoFOkIFJ64JgplbmZKCUpqbGlwvH5Px3+sRiPWhbU rybwGfzqEW2WHL1EK1faX+NixPNc6wGOuBLg2Lfn1W4I7oOB5kP17cJn16WHW82ezNYmvx u0ldcefOWvYkCaCqBh8EK3Q9w3a5LDPL7zRCPPkdk8rbMTsTxcry2s4GUAqKuln2MBMUom aMoj1Azj5DG9I2dPcbHWv8lRTCMa4KcohN9VKYQCcLGXKw1IFVv6bLxXenU+Mg== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4fnJWk4FF1z2xRZ; Fri, 03 Apr 2026 12:51:46 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. bb27cc32ea7251674b2b1c1ea0db2faf74747014 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: a59092963939a1c88fd02d51b70da1d96f2c70b2 X-Git-Newrev: bb27cc32ea7251674b2b1c1ea0db2faf74747014 Message-Id: <4fnJWk4FF1z2xRZ@people01.haj.ipfire.org> Date: Fri, 03 Apr 2026 12:51:46 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via bb27cc32ea7251674b2b1c1ea0db2faf74747014 (commit) via 14fcc77abb2367deedaba96f0227c5ae12d15741 (commit) via 8c01bd65bdf0336cfcd1989ce8dcbf608dfbfe77 (commit) via 41ef0795be6e31407468b346b587d8c1ee5727b3 (commit) via 8794f2161d72ee32f1306f03f89cdca8d354e8f0 (commit) via 3d6aa351c2a467e59111c1e5a0861af81dbb24d1 (commit) via bb6047bad4a8e5b93d192c6af632c5fa5065a4de (commit) from a59092963939a1c88fd02d51b70da1d96f2c70b2 (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 bb27cc32ea7251674b2b1c1ea0db2faf74747014 Author: Michael Tremer Date: Fri Apr 3 12:51:26 2026 +0000 core201: Ship autoupdate.pl Signed-off-by: Michael Tremer commit 14fcc77abb2367deedaba96f0227c5ae12d15741 Author: Michael Tremer Date: Fri Apr 3 12:49:14 2026 +0000 urlfilter: Remove everything when clearing out old blacklists Signed-off-by: Michael Tremer commit 8c01bd65bdf0336cfcd1989ce8dcbf608dfbfe77 Author: Michael Tremer Date: Fri Apr 3 12:38:34 2026 +0000 zabbix-agent: Bump release Signed-off-by: Michael Tremer commit 41ef0795be6e31407468b346b587d8c1ee5727b3 Author: Michael Tremer Date: Fri Apr 3 12:37:16 2026 +0000 core201: Ship sysklogd changes Signed-off-by: Michael Tremer commit 8794f2161d72ee32f1306f03f89cdca8d354e8f0 Author: Michael Tremer Date: Fri Apr 3 12:33:26 2026 +0000 services.cgi: Remove klogd Signed-off-by: Michael Tremer commit 3d6aa351c2a467e59111c1e5a0861af81dbb24d1 Author: Michael Tremer Date: Fri Apr 3 12:33:10 2026 +0000 zabbix: Remove monitoring of klogd Signed-off-by: Michael Tremer commit bb6047bad4a8e5b93d192c6af632c5fa5065a4de Author: Michael Tremer Date: Fri Apr 3 12:32:31 2026 +0000 sysklogd: Update to 2.7.2 This replaces syslogd and klogd with a combined daemon. Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/sysklogd | 20 +++++++++++++++++--- config/rootfiles/core/201/filelists/files | 3 +++ .../{oldcore/109 => core/201}/filelists/sysklogd | 0 config/rootfiles/core/201/update.sh | 6 ++++++ config/urlfilter/autoupdate.pl | 3 --- config/zabbix_agentd/ipfire_services.pl | 5 ----- doc/language_issues.de | 1 + doc/language_issues.en | 1 - doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_issues.tw | 1 + doc/language_issues.zh | 1 + html/cgi-bin/services.cgi | 5 ----- lfs/sysklogd | 20 ++++++++++---------- lfs/zabbix_agentd | 2 +- src/initscripts/system/sysklogd | 9 +-------- 21 files changed, 48 insertions(+), 36 deletions(-) copy config/rootfiles/{oldcore/109 => core/201}/filelists/sysklogd (100%) Difference in files: diff --git a/config/rootfiles/common/sysklogd b/config/rootfiles/common/sysklogd index f5d55c220..8f02142e5 100644 --- a/config/rootfiles/common/sysklogd +++ b/config/rootfiles/common/sysklogd @@ -1,8 +1,22 @@ -usr/sbin/klogd +#usr/include/syslog +#usr/include/syslog/syslog.h +#usr/lib/libsyslog.la +#usr/lib/libsyslog.so +usr/lib/libsyslog.so.0 +usr/lib/libsyslog.so.0.2.0 +#usr/lib/pkgconfig/libsyslog.pc usr/sbin/syslogd +#usr/share/doc/sysklogd +#usr/share/doc/sysklogd/ChangeLog.md +#usr/share/doc/sysklogd/LICENSE +#usr/share/doc/sysklogd/README.md +#usr/share/doc/sysklogd/example +#usr/share/doc/sysklogd/example/README.md +#usr/share/doc/sysklogd/example/example.c +#usr/share/doc/sysklogd/example/example.mk +#usr/share/doc/sysklogd/syslog.conf +#usr/share/man/man3/syslogp.3 #usr/share/man/man5/syslog.conf.5 -#usr/share/man/man8/klogd.8 -#usr/share/man/man8/sysklogd.8 #usr/share/man/man8/syslogd.8 var/log/dhcpcd.log var/log/messages diff --git a/config/rootfiles/core/201/filelists/files b/config/rootfiles/core/201/filelists/files index a8a7519e9..ef9e832d2 100644 --- a/config/rootfiles/core/201/filelists/files +++ b/config/rootfiles/core/201/filelists/files @@ -1,13 +1,16 @@ etc/rc.d/init.d/rc etc/rc.d/init.d/squid +etc/rc.d/init.d/sysklogd etc/rc.d/init.d/unbound etc/unbound/unbound.conf srv/web/ipfire/cgi-bin/dnsbl.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/ids.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/html/themes/ipfire/include/css/style.css usr/bin/suricata-report-cron var/ipfire/dns/dnsbl.json var/ipfire/ids-functions.pl var/ipfire/menu.d/50-firewall.menu +var/ipfire/urlfilter/bin/autoupdate.pl diff --git a/config/rootfiles/core/201/filelists/sysklogd b/config/rootfiles/core/201/filelists/sysklogd new file mode 120000 index 000000000..e166ef225 --- /dev/null +++ b/config/rootfiles/core/201/filelists/sysklogd @@ -0,0 +1 @@ +../../../common/sysklogd \ No newline at end of file diff --git a/config/rootfiles/core/201/update.sh b/config/rootfiles/core/201/update.sh index b4fd88cdd..4af6c0d25 100644 --- a/config/rootfiles/core/201/update.sh +++ b/config/rootfiles/core/201/update.sh @@ -32,6 +32,11 @@ for (( i=1; i<=$core; i++ )); do done # Remove files +rm -vf \ + /usr/sbin/klogd + +# Terminate the kernel logger +killall klogd # Remove dropped packages for package in 7zip; do \ @@ -76,6 +81,7 @@ if [ ! -e "/var/ipfire/dns/custom_domains" ]; then fi # Start services +/etc/init.d/sysklogd restart /etc/init.d/openvpn-rw restart /etc/init.d/openvpn-n2n restart /etc/init.d/unbound restart diff --git a/config/urlfilter/autoupdate.pl b/config/urlfilter/autoupdate.pl index ea79c329b..0326f4402 100644 --- a/config/urlfilter/autoupdate.pl +++ b/config/urlfilter/autoupdate.pl @@ -233,9 +233,6 @@ sub cleanupdbdir { # Generate absolute path. my $abs_path = "$dbdir/$item"; - # Skip anything which is not a directory. - next unless (-d "$abs_path"); - # Remove the directory and the content. &File::Path::remove_tree($abs_path); } diff --git a/config/zabbix_agentd/ipfire_services.pl b/config/zabbix_agentd/ipfire_services.pl index d3f9855ba..2fd5b34cd 100755 --- a/config/zabbix_agentd/ipfire_services.pl +++ b/config/zabbix_agentd/ipfire_services.pl @@ -66,11 +66,6 @@ my %services = ( "process" => "syslogd", }, - # Kernel Logger - 'Kernel Logging Server' => { - "process" => "klogd", - }, - # Time Server 'NTP Server' => { "process" => "ntpd", diff --git a/doc/language_issues.de b/doc/language_issues.de index 79fe15493..2930f02ca 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -470,6 +470,7 @@ WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 +WARNING: translation string unused: kernel logging server WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset diff --git a/doc/language_issues.en b/doc/language_issues.en index 2c672dfd2..70377df36 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1226,7 +1226,6 @@ WARNING: untranslated string: january = January WARNING: untranslated string: july = July WARNING: untranslated string: june = June WARNING: untranslated string: kernel = Kernel -WARNING: untranslated string: kernel logging server = Kernel Logging Server WARNING: untranslated string: lan = LAN WARNING: untranslated string: languagepurpose = Select the language you wish IPFire to display in: WARNING: untranslated string: last = Last diff --git a/doc/language_issues.es b/doc/language_issues.es index 17514abf4..d44baf3a0 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -496,6 +496,7 @@ WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 +WARNING: translation string unused: kernel logging server WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset diff --git a/doc/language_issues.fr b/doc/language_issues.fr index f631303ea..142caa588 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -493,6 +493,7 @@ WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 +WARNING: translation string unused: kernel logging server WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset diff --git a/doc/language_issues.it b/doc/language_issues.it index c49e324b2..ed649b021 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -450,6 +450,7 @@ WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 +WARNING: translation string unused: kernel logging server WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 4d4b9fbf8..03f163ee7 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -452,6 +452,7 @@ WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 +WARNING: translation string unused: kernel logging server WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset diff --git a/doc/language_issues.pl b/doc/language_issues.pl index ad8914649..6fbda032d 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -384,6 +384,7 @@ WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 +WARNING: translation string unused: kernel logging server WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset diff --git a/doc/language_issues.ru b/doc/language_issues.ru index cb7867caf..261b917d9 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -380,6 +380,7 @@ WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 +WARNING: translation string unused: kernel logging server WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset diff --git a/doc/language_issues.tr b/doc/language_issues.tr index f76ae830a..856be4dde 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -476,6 +476,7 @@ WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 +WARNING: translation string unused: kernel logging server WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset diff --git a/doc/language_issues.tw b/doc/language_issues.tw index c7b0f39a8..c6299c27e 100644 --- a/doc/language_issues.tw +++ b/doc/language_issues.tw @@ -498,6 +498,7 @@ WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 +WARNING: translation string unused: kernel logging server WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset diff --git a/doc/language_issues.zh b/doc/language_issues.zh index c7b0f39a8..c6299c27e 100644 --- a/doc/language_issues.zh +++ b/doc/language_issues.zh @@ -498,6 +498,7 @@ WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 +WARNING: translation string unused: kernel logging server WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 4530d27f4..428ad074f 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -81,11 +81,6 @@ $querry[1] = 'hour' unless defined $querry[1]; "process" => "syslogd", }, - # Kernel Logger - $Lang::tr{'kernel logging server'} => { - "process" => "klogd", - }, - # Time Server $Lang::tr{'ntp server'} => { "process" => "ntpd", diff --git a/lfs/sysklogd b/lfs/sysklogd index 4e5557264..1eee3feac 100644 --- a/lfs/sysklogd +++ b/lfs/sysklogd @@ -24,7 +24,7 @@ include Config -VER = 1.5.1 +VER = 2.7.2 THISAPP = sysklogd-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,9 +32,6 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -# Fix build with GCC 15 -CFLAGS += -std=gnu17 - ############################################################################### # Top-level Rules ############################################################################### @@ -43,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = c40bd8d5769f7d3d4141d602c74ac41e05a140743d18c4923d9368da7ba193ccb89a6837173994f0b7a9c290cc23f64513040434d7ab8df81b5d09b73b0263ad +$(DL_FILE)_BLAKE2 = 6a42e049140ab64c5658b7fc112ee33b39481ebe78079271fe6fd7ad44976d3a6e861a4c42a8958599bc83c096e2d7e09cb0c447ffd46e4844c8cfdab13dace2 install : $(TARGET) @@ -73,11 +70,14 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - # Compile fix - cd $(DIR_APP) && sed -i "s/union wait/int/" syslogd.c - - cd $(DIR_APP) && make $(MAKETUNING) RPM_OPT_FLAGS="$(CFLAGS)" + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --without-logger \ + --without-systemd \ + --disable-static + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install touch /var/log/{dhcpcd.log,messages} chmod 664 /var/log/{dhcpcd.log,messages} diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index be61ca02e..ac61e29f5 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = zabbix_agentd -PAK_VER = 20 +PAK_VER = 21 DEPS = fping diff --git a/src/initscripts/system/sysklogd b/src/initscripts/system/sysklogd index 5618ae3c8..2590df4ef 100644 --- a/src/initscripts/system/sysklogd +++ b/src/initscripts/system/sysklogd @@ -24,11 +24,8 @@ case "${1}" in start) - boot_mesg "Starting kernel log daemon..." - loadproc klogd -c 1 - boot_mesg "Starting system log daemon..." - loadproc syslogd -m 0 -r + loadproc syslogd -s -m 0 -r -k boot_mesg "Saving Bootlog..." if [ -e /var/log/bootlog ]; then @@ -38,9 +35,6 @@ case "${1}" in evaluate_retval ;; stop) - boot_mesg "Stopping kernel log daemon..." - killproc klogd - boot_mesg "Stopping system log daemon..." killproc syslogd ;; @@ -58,7 +52,6 @@ case "${1}" in status) statusproc syslogd - statusproc klogd ;; *) hooks/post-receive -- IPFire 2.x development tree