sysklogd: Update to 2.7.2

This replaces syslogd and klogd with a combined daemon.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/sysklogd b/config/rootfiles/common/sysklogd
index f5d55c22022e71a0fbf9b8d5cd2004d7e3b15d75..8f02142e55d0829c3bcccb6e89126364f323190e 100644 (file)
--- 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/lfs/sysklogd b/lfs/sysklogd
index 4e5557264979d613f6ca6386d1f3d8ea6e5ed1d2..1eee3feace0197346b77db95e74d3e701c2b78ca 100644 (file)
--- 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 5618ae3c8306965660a5ce6061eb3f4291948d9e..2590df4ef2e03d4c8263c2474966e59a24ca2d3c 100644 (file)
--- 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
                ;;
 
        *)