From 489683fbd0ea3f8a1f8db12f84e0372ec4acb23e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 1 Apr 2025 10:14:02 +0000 Subject: sysklogd: upgrade 2.7.1 -> 2.7.2 Add tag to SRC_URI to verify SRCREV. Rename files directory to be recipe specific. (From OE-Core rev: ac814e329c90348802ec6d56c1ea647c434ba59c) Signed-off-by: Richard Purdie --- meta/recipes-extended/sysklogd/files/sysklogd | 154 ----------------------- meta/recipes-extended/sysklogd/sysklogd/sysklogd | 154 +++++++++++++++++++++++ meta/recipes-extended/sysklogd/sysklogd_2.7.1.bb | 56 --------- meta/recipes-extended/sysklogd/sysklogd_2.7.2.bb | 56 +++++++++ 4 files changed, 210 insertions(+), 210 deletions(-) delete mode 100755 meta/recipes-extended/sysklogd/files/sysklogd create mode 100755 meta/recipes-extended/sysklogd/sysklogd/sysklogd delete mode 100644 meta/recipes-extended/sysklogd/sysklogd_2.7.1.bb create mode 100644 meta/recipes-extended/sysklogd/sysklogd_2.7.2.bb diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/meta/recipes-extended/sysklogd/files/sysklogd deleted file mode 100755 index 050772b59d..0000000000 --- a/meta/recipes-extended/sysklogd/files/sysklogd +++ /dev/null @@ -1,154 +0,0 @@ -#! /bin/sh -# /etc/init.d/sysklogd: start the system log daemon. - -### BEGIN INIT INFO -# Provides: sysklogd -# Required-Start: $remote_fs $time -# Required-Stop: $remote_fs $time -# Should-Start: $network -# Should-Stop: $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: System logger -### END INIT INFO - -# Source function library. -. /etc/init.d/functions - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -pidfile_syslogd=/var/run/syslogd.pid -binpath_syslogd=/usr/sbin/syslogd - -test -x $binpath || exit 0 - -# run secure by default -SYSLOGD="-ss" - -test ! -r /etc/default/syslogd || . /etc/default/syslogd - -create_xconsole() -{ - # Only proceed if /dev/xconsole is used at all - if ! grep -q '^[^#].*/dev/xconsole' /etc/syslog.conf - then - return - fi - - if [ ! -e /dev/xconsole ]; then - mknod -m 640 /dev/xconsole p - else - chmod 0640 /dev/xconsole - fi - chown root:adm /dev/xconsole - test ! -x /sbin/restorecon || /sbin/restorecon /dev/xconsole -} - -log_begin_msg () { - echo -n $1 -} - -log_end_msg () { - echo $1 -} - -log_success_msg () { - echo $1 -} - -running() -{ - # No pidfile, probably no daemon present - # - if [ ! -f $pidfile ] - then - return 1 - fi - - pid=`cat $pidfile_syslogd` - - # No pid, probably no daemon present - # - if [ -z "$pid" ] - then - return 1 - fi - - if [ ! -d /proc/$pid ] - then - return 1 - fi - - cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1` - - # No syslogd? - # - if [ "$cmd" != "$binpath" ] - then - return 1 - fi - - return 0 -} - -waitpid () -{ - pid=$1 - # Give pid a chance to exit before we restart with a 5s timeout in 1s intervals - if [ -z "$pid" ]; then - return - fi - timeout=5; - while [ $timeout -gt 0 ] - do - timeout=$(( $timeout-1 )) - kill -0 $pid 2> /dev/null || break - sleep 1 - done -} - -case "$1" in - start) - log_begin_msg "Starting system log daemon..." - create_xconsole - start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD - log_end_msg $? - ;; - stop) - log_begin_msg "Stopping system log daemon..." - start-stop-daemon --stop --quiet --pidfile $pidfile_syslogd --name syslogd - log_end_msg $? - ;; - reload|force-reload) - log_begin_msg "Reloading system log daemon..." - start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile_syslogd --name syslogd - log_end_msg $? - ;; - restart) - log_begin_msg "Restarting system log daemon..." - pid=`cat $pidfile_syslogd 2> /dev/null` - start-stop-daemon --stop --retry 5 --quiet --pidfile $pidfile_syslogd --name syslogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD - log_end_msg $? - ;; - reload-or-restart) - if running - then - $0 reload - else - $0 start - fi - ;; - status) - status syslogd - RETVAL=$? - [ $RETVAL -eq 0 ] && exit $rval - exit $RETVAL - ;; - *) - log_success_msg "Usage: /etc/init.d/sysklogd {start|stop|reload|restart|force-reload|reload-or-restart|status}" - exit 1 -esac - -exit 0 diff --git a/meta/recipes-extended/sysklogd/sysklogd/sysklogd b/meta/recipes-extended/sysklogd/sysklogd/sysklogd new file mode 100755 index 0000000000..050772b59d --- /dev/null +++ b/meta/recipes-extended/sysklogd/sysklogd/sysklogd @@ -0,0 +1,154 @@ +#! /bin/sh +# /etc/init.d/sysklogd: start the system log daemon. + +### BEGIN INIT INFO +# Provides: sysklogd +# Required-Start: $remote_fs $time +# Required-Stop: $remote_fs $time +# Should-Start: $network +# Should-Stop: $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: System logger +### END INIT INFO + +# Source function library. +. /etc/init.d/functions + +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +pidfile_syslogd=/var/run/syslogd.pid +binpath_syslogd=/usr/sbin/syslogd + +test -x $binpath || exit 0 + +# run secure by default +SYSLOGD="-ss" + +test ! -r /etc/default/syslogd || . /etc/default/syslogd + +create_xconsole() +{ + # Only proceed if /dev/xconsole is used at all + if ! grep -q '^[^#].*/dev/xconsole' /etc/syslog.conf + then + return + fi + + if [ ! -e /dev/xconsole ]; then + mknod -m 640 /dev/xconsole p + else + chmod 0640 /dev/xconsole + fi + chown root:adm /dev/xconsole + test ! -x /sbin/restorecon || /sbin/restorecon /dev/xconsole +} + +log_begin_msg () { + echo -n $1 +} + +log_end_msg () { + echo $1 +} + +log_success_msg () { + echo $1 +} + +running() +{ + # No pidfile, probably no daemon present + # + if [ ! -f $pidfile ] + then + return 1 + fi + + pid=`cat $pidfile_syslogd` + + # No pid, probably no daemon present + # + if [ -z "$pid" ] + then + return 1 + fi + + if [ ! -d /proc/$pid ] + then + return 1 + fi + + cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1` + + # No syslogd? + # + if [ "$cmd" != "$binpath" ] + then + return 1 + fi + + return 0 +} + +waitpid () +{ + pid=$1 + # Give pid a chance to exit before we restart with a 5s timeout in 1s intervals + if [ -z "$pid" ]; then + return + fi + timeout=5; + while [ $timeout -gt 0 ] + do + timeout=$(( $timeout-1 )) + kill -0 $pid 2> /dev/null || break + sleep 1 + done +} + +case "$1" in + start) + log_begin_msg "Starting system log daemon..." + create_xconsole + start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD + log_end_msg $? + ;; + stop) + log_begin_msg "Stopping system log daemon..." + start-stop-daemon --stop --quiet --pidfile $pidfile_syslogd --name syslogd + log_end_msg $? + ;; + reload|force-reload) + log_begin_msg "Reloading system log daemon..." + start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile_syslogd --name syslogd + log_end_msg $? + ;; + restart) + log_begin_msg "Restarting system log daemon..." + pid=`cat $pidfile_syslogd 2> /dev/null` + start-stop-daemon --stop --retry 5 --quiet --pidfile $pidfile_syslogd --name syslogd + waitpid $pid + start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD + log_end_msg $? + ;; + reload-or-restart) + if running + then + $0 reload + else + $0 start + fi + ;; + status) + status syslogd + RETVAL=$? + [ $RETVAL -eq 0 ] && exit $rval + exit $RETVAL + ;; + *) + log_success_msg "Usage: /etc/init.d/sysklogd {start|stop|reload|restart|force-reload|reload-or-restart|status}" + exit 1 +esac + +exit 0 diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.7.1.bb b/meta/recipes-extended/sysklogd/sysklogd_2.7.1.bb deleted file mode 100644 index b7e3254277..0000000000 --- a/meta/recipes-extended/sysklogd/sysklogd_2.7.1.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "System Log Daemons" -DESCRIPTION = "The sysklogd package implements system log daemons: syslogd" -HOMEPAGE = "http://www.infodrom.org/projects/sysklogd/" -SECTION = "base" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5b4be4b2549338526758ef479c040943 \ - file://src/syslogd.c;beginline=2;endline=15;md5=a880fecbc04503f071c494a9c0dd4f97 \ - " - -inherit update-rc.d update-alternatives systemd autotools - -SRC_URI = "git://github.com/troglobit/sysklogd.git;branch=master;protocol=https \ - file://sysklogd \ - " - -SRCREV = "5552a3ea0d025573a5e212d62ee3e04bd376c7c4" - -S = "${WORKDIR}/git" - -EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger" - -do_install:append () { - install -d ${D}${sysconfdir} - install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf - install -d ${D}${sysconfdir}/init.d - install -m 755 ${UNPACKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog -} - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "syslogd.service" -SYSTEMD_AUTO_ENABLE = "enable" - -INITSCRIPT_NAME = "syslog" -CONFFILES:${PN} = "${sysconfdir}/syslog.conf" -RCONFLICTS:${PN} = "rsyslog busybox-syslog syslog-ng" - -FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/sysklogd.conf', '', d)}" - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE:${PN}-doc = "syslogd.8" -ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" - -pkg_prerm:${PN} () { - if test "x$D" = "x"; then - if test "$1" = "upgrade" -o "$1" = "remove"; then - /etc/init.d/syslog stop || : - fi - fi -} - -python () { - if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") -} diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.7.2.bb b/meta/recipes-extended/sysklogd/sysklogd_2.7.2.bb new file mode 100644 index 0000000000..ba69a7a8b8 --- /dev/null +++ b/meta/recipes-extended/sysklogd/sysklogd_2.7.2.bb @@ -0,0 +1,56 @@ +SUMMARY = "System Log Daemons" +DESCRIPTION = "The sysklogd package implements system log daemons: syslogd" +HOMEPAGE = "http://www.infodrom.org/projects/sysklogd/" +SECTION = "base" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5b4be4b2549338526758ef479c040943 \ + file://src/syslogd.c;beginline=2;endline=15;md5=a880fecbc04503f071c494a9c0dd4f97 \ + " + +inherit update-rc.d update-alternatives systemd autotools + +SRC_URI = "git://github.com/troglobit/sysklogd.git;branch=master;protocol=https;tag=v${PV} \ + file://sysklogd \ + " + +SRCREV = "5fb314cb9060afa3bd4eed2f0be3200f02f729e9" + +S = "${WORKDIR}/git" + +EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger" + +do_install:append () { + install -d ${D}${sysconfdir} + install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf + install -d ${D}${sysconfdir}/init.d + install -m 755 ${UNPACKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog +} + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "syslogd.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_NAME = "syslog" +CONFFILES:${PN} = "${sysconfdir}/syslog.conf" +RCONFLICTS:${PN} = "rsyslog busybox-syslog syslog-ng" + +FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/sysklogd.conf', '', d)}" + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE:${PN}-doc = "syslogd.8" +ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" + +pkg_prerm:${PN} () { + if test "x$D" = "x"; then + if test "$1" = "upgrade" -o "$1" = "remove"; then + /etc/init.d/syslog stop || : + fi + fi +} + +python () { + if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") +} -- cgit v1.2.3-54-g00ecf