* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4e9ba5b5676c4a427fedec952237cf181bc644ed
@ 2026-04-03 12:52 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-04-03 12:52 UTC (permalink / raw)
To: ipfire-scm
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 4e9ba5b5676c4a427fedec952237cf181bc644ed (commit)
via c7da4742ed788dd12b33deb2ce093e2e420204d5 (commit)
via bb27cc32ea7251674b2b1c1ea0db2faf74747014 (commit)
via 14fcc77abb2367deedaba96f0227c5ae12d15741 (commit)
via 270115f90f1e9f4ab513081d441872a818526435 (commit)
via e2cafa8efa1cd25f592952e20cdd93f5e04a6bb3 (commit)
via 73a864196b065e1c81510e92e0f68a02e451f47f (commit)
via 03b47a48a0bd707eabc982fc3c68a9fda3ee75ea (commit)
via 8c01bd65bdf0336cfcd1989ce8dcbf608dfbfe77 (commit)
via 41ef0795be6e31407468b346b587d8c1ee5727b3 (commit)
via 8794f2161d72ee32f1306f03f89cdca8d354e8f0 (commit)
via 3d6aa351c2a467e59111c1e5a0861af81dbb24d1 (commit)
via bb6047bad4a8e5b93d192c6af632c5fa5065a4de (commit)
via 4b184e6ba762e33cd5dc245e7199fab617073216 (commit)
via 63d75c5b76f15dd95d8c713299e568769ac7d0c9 (commit)
via 3b32430a4d16d9d5f2334b3acbc94f1f88fad7c8 (commit)
via 3dd21886edcddcd6701a824875bdf436f79bdf1f (commit)
via a59092963939a1c88fd02d51b70da1d96f2c70b2 (commit)
via ad881f154354204d7f6410a9a020e635c6575e2e (commit)
via f6c693ff2908e15cf02042cee77d654d6e5d5d4f (commit)
via 8b2b09b0e33f0548013a47a1c557797898684645 (commit)
from 4a9158dfdbe9767865784582dc05ff943f74460e (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 4e9ba5b5676c4a427fedec952237cf181bc644ed
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Apr 3 12:52:17 2026 +0000
core202: Ship autoupdate.pl
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit c7da4742ed788dd12b33deb2ce093e2e420204d5
Merge: 270115f90 bb27cc32e
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Apr 3 12:52:01 2026 +0000
Merge branch 'master' into next
commit 270115f90f1e9f4ab513081d441872a818526435
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Apr 3 12:44:03 2026 +0000
core202: Ship strongSwan
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit e2cafa8efa1cd25f592952e20cdd93f5e04a6bb3
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Apr 3 12:41:31 2026 +0000
strongswan: Fix chain name when removing rules
This caused that a lot of rules have been appended to IPSECOUTPUT which
never were removed again. There were no implications but a very log
chain with a lot of redundant rules.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 73a864196b065e1c81510e92e0f68a02e451f47f
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Apr 3 12:40:54 2026 +0000
core202: Ship sysklogd again
Since this was a last-minute change in c201, we should ship it all
again.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 03b47a48a0bd707eabc982fc3c68a9fda3ee75ea
Merge: 4b184e6ba 8c01bd65b
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Apr 3 12:39:23 2026 +0000
Merge branch 'master' into next
commit 4b184e6ba762e33cd5dc245e7199fab617073216
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Apr 3 12:33:26 2026 +0000
services.cgi: Remove klogd
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 63d75c5b76f15dd95d8c713299e568769ac7d0c9
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Apr 3 12:33:10 2026 +0000
zabbix: Remove monitoring of klogd
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 3b32430a4d16d9d5f2334b3acbc94f1f88fad7c8
Author: Michael Tremer <michael.tremer@ipfire.org>
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 <michael.tremer@ipfire.org>
commit 3dd21886edcddcd6701a824875bdf436f79bdf1f
Author: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Thu Apr 2 21:24:04 2026 +0200
bind: Update to 9.20.22
For details see:
https://downloads.isc.org/isc/bind9/9.20.22/doc/arm/html/notes.html#notes-for-bind-9-20-22
"Notes for BIND 9.20.22
Security Fixes
Fix crash when reconfiguring zone update policy during active updates.
We fixed a crash that could occur when running rndc reconfig to change
a zone's update policy (e.g., from allow-update to update-policy) while
DNS UPDATE requests were being processed for that zone.
ISC would like to thank Vitaly Simonovich for bringing this issue to
our attention. [GL #5817]
Bug Fixes
Fix intermittent named crashes during asynchronous zone operations.
Asynchronous zone loading and dumping operations occasionally
dispatched tasks to the wrong internal event loop. This threading
violation triggered internal safety assertions that abruptly terminated
named. Strict loop affinity is now enforced for these tasks, ensuring
they execute on their designated threads and preventing the crashes.
[GL #4882]
Count temporal problems with DNSSEC validation as attempts.
After the KeyTrap vulnerability (CVE-2023-50387), any temporal DNSSEC
errors were originally hard errors that caused validation failures,
even if the records had another valid signature. This has been changed;
RRSIGs outside of the inception and expiration time are not counted as
hard errors. However, these errors were not even counted as validation
attempts, so an excessive number of expired RRSIGs would cause some
non-cryptographic extra work for the validator. This has been fixed and
the temporal errors are now correctly counted as validation attempts.
[GL #5760]
Fix a possible deadlock in RPZ processing.
The named process could hang when processing a maliciously crafted
update for a response policy zone (RPZ). This has been fixed. [GL
#5775]
Fix a crash triggered by rndc modzone on a zone from a configuration
file.
Calling rndc modzone on a zone that was configured in the configuration
file caused a crash. This has been fixed. [GL #5800]
Fix the processing of empty catalog zone ACLs.
The named process could terminate unexpectedly when processing a
catalog zone ACL in an APL resource record that was completely empty.
This has been fixed. [GL #5801]
Fix a crash triggered by rndc modzone on zone that already existed in
NZF file.
Calling rndc modzone didn't work properly for a zone that was
configured in the configuration file. It could crash if BIND 9 was
built without LMDB or if there was already an NZF file for the zone.
This has been fixed. [GL #5826]
Fix potential resource leak during resolver error handling.
Under specific error conditions during query processing, resources were
not being properly released, which could eventually lead to unnecessary
memory consumption for the server. A potential resource leak in the
resolver has been fixed. [GL !11658]"
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/bind | 10 +++++-----
config/rootfiles/common/sysklogd | 20 +++++++++++++++++---
config/rootfiles/core/202/filelists/files | 3 +++
.../{oldcore/106 => core/202}/filelists/strongswan | 0
.../{oldcore/109 => core/202}/filelists/sysklogd | 0
config/rootfiles/core/202/update.sh | 11 +++++++++++
config/rootfiles/oldcore/201/filelists/files | 3 +++
.../oldcore/{109 => 201}/filelists/sysklogd | 0
config/rootfiles/oldcore/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/bind | 4 ++--
lfs/sysklogd | 20 ++++++++++----------
src/initscripts/system/sysklogd | 9 +--------
src/patches/strongswan-ipfire.patch | 6 +++---
27 files changed, 71 insertions(+), 45 deletions(-)
copy config/rootfiles/{oldcore/106 => core/202}/filelists/strongswan (100%)
copy config/rootfiles/{oldcore/109 => core/202}/filelists/sysklogd (100%)
copy config/rootfiles/oldcore/{109 => 201}/filelists/sysklogd (100%)
Difference in files:
diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind
index ad7f23645..63816f380 100644
--- a/config/rootfiles/common/bind
+++ b/config/rootfiles/common/bind
@@ -241,18 +241,18 @@ usr/bin/nsupdate
#usr/include/ns/types.h
#usr/include/ns/update.h
#usr/include/ns/xfrout.h
-usr/lib/libdns-9.20.21.so
+usr/lib/libdns-9.20.22.so
#usr/lib/libdns.la
#usr/lib/libdns.so
-usr/lib/libisc-9.20.21.so
+usr/lib/libisc-9.20.22.so
#usr/lib/libisc.la
#usr/lib/libisc.so
-usr/lib/libisccc-9.20.21.so
+usr/lib/libisccc-9.20.22.so
#usr/lib/libisccc.la
#usr/lib/libisccc.so
-usr/lib/libisccfg-9.20.21.so
+usr/lib/libisccfg-9.20.22.so
#usr/lib/libisccfg.la
#usr/lib/libisccfg.so
-usr/lib/libns-9.20.21.so
+usr/lib/libns-9.20.22.so
#usr/lib/libns.la
#usr/lib/libns.so
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/202/filelists/files b/config/rootfiles/core/202/filelists/files
index 67fc81b91..36268b9e6 100644
--- a/config/rootfiles/core/202/filelists/files
+++ b/config/rootfiles/core/202/filelists/files
@@ -1,4 +1,7 @@
etc/rc.d/init.d/firewall
+etc/rc.d/init.d/sysklogd
srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/services.cgi
var/ipfire/dns/dnsbl.json
+var/ipfire/urlfilter/bin/autoupdate.pl
var/spool/cron/root.orig
diff --git a/config/rootfiles/core/202/filelists/strongswan b/config/rootfiles/core/202/filelists/strongswan
new file mode 120000
index 000000000..90c727e26
--- /dev/null
+++ b/config/rootfiles/core/202/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/202/filelists/sysklogd b/config/rootfiles/core/202/filelists/sysklogd
new file mode 120000
index 000000000..e166ef225
--- /dev/null
+++ b/config/rootfiles/core/202/filelists/sysklogd
@@ -0,0 +1 @@
+../../../common/sysklogd
\ No newline at end of file
diff --git a/config/rootfiles/core/202/update.sh b/config/rootfiles/core/202/update.sh
index 51eb36a58..838c1b353 100644
--- a/config/rootfiles/core/202/update.sh
+++ b/config/rootfiles/core/202/update.sh
@@ -55,6 +55,11 @@ if ! getent passwd unbound >/dev/null; then
fi
# Remove files
+rm -vf \
+ /usr/sbin/klogd
+
+# Terminate the kernel logger
+killall klogd
# Extract files
extract_files
@@ -78,10 +83,16 @@ chown unbound:unbound -Rv /var/lib/unbound/ /var/cache/unbound/
/usr/local/bin/sshctrl
# Start services
+/etc/init.d/sysklogd restart
/etc/init.d/firewall restart
/etc/init.d/suricata restart
/etc/init.d/unbound restart
+# Restart IPsec
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+ /etc/init.d/ipsec restart
+fi
+
# Reload cronjobs
fcrontab -z
diff --git a/config/rootfiles/oldcore/201/filelists/files b/config/rootfiles/oldcore/201/filelists/files
index a8a7519e9..ef9e832d2 100644
--- a/config/rootfiles/oldcore/201/filelists/files
+++ b/config/rootfiles/oldcore/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/oldcore/201/filelists/sysklogd b/config/rootfiles/oldcore/201/filelists/sysklogd
new file mode 120000
index 000000000..e166ef225
--- /dev/null
+++ b/config/rootfiles/oldcore/201/filelists/sysklogd
@@ -0,0 +1 @@
+../../../common/sysklogd
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/201/update.sh b/config/rootfiles/oldcore/201/update.sh
index b4fd88cdd..4af6c0d25 100644
--- a/config/rootfiles/oldcore/201/update.sh
+++ b/config/rootfiles/oldcore/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 a2949f729..7d7c8e609 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/bind b/lfs/bind
index 9a52fcdde..5dfedca9c 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -25,7 +25,7 @@
include Config
-VER = 9.20.21
+VER = 9.20.22
THISAPP = bind-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 20c2acac40242516da10cc8e45074de3d5d8906e4c4e216f6d69cba0585816aba4ec77adda8142294623eef5b045ec64cc8a18c721ece6af939741903558454b
+$(DL_FILE)_BLAKE2 = 74537646d8c08c4874548b064ab62bab3721d22e2654feed54ea0b61c087018b24f725d0cfaf8298bc71a1be280c753c86449b13e5d9ec26f84ba7e9f61b7a5a
install : $(TARGET)
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/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
;;
*)
diff --git a/src/patches/strongswan-ipfire.patch b/src/patches/strongswan-ipfire.patch
index a1f80d361..f2723c813 100644
--- a/src/patches/strongswan-ipfire.patch
+++ b/src/patches/strongswan-ipfire.patch
@@ -185,13 +185,13 @@ index 34eaf68c7..38aa63354 100644
+ iptables --wait -D IPSECINPUT -i $PLUTO_INTERFACE -p ESP \
+ -s $PLUTO_PEER $S_PEER_PORT \
+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
-+ iptables --wait -D IPSECINPUT -o $PLUTO_INTERFACE -p IPIP \
++ iptables --wait -D IPSECOUTPUT -o $PLUTO_INTERFACE -p IPIP \
+ -s $PLUTO_ME $D_MY_PORT \
+ -d $PLUTO_PEER $S_PEER_PORT -j ACCEPT
-+ iptables --wait -D IPSECINPUT -o $PLUTO_INTERFACE -p AH \
++ iptables --wait -D IPSECOUTPUT -o $PLUTO_INTERFACE -p AH \
+ -s $PLUTO_ME $D_MY_PORT \
+ -d $PLUTO_PEER $S_PEER_PORT -j ACCEPT
-+ iptables --wait -D IPSECINPUT -o $PLUTO_INTERFACE -p ESP \
++ iptables --wait -D IPSECOUTPUT -o $PLUTO_INTERFACE -p ESP \
+ -s $PLUTO_ME $D_MY_PORT \
+ -d $PLUTO_PEER $S_PEER_PORT -j ACCEPT
;;
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-04-03 12:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-04-03 12:52 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4e9ba5b5676c4a427fedec952237cf181bc644ed Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox