From 4bbed71c295caeccd6e0cbb0ea17022c1f92aa73 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 29 May 2022 19:32:23 +0200 Subject: [PATCH] Move debian/ dir to separate branch to ease packaging downstream Signed-off-by: Joachim Wiberg --- Makefile.am | 6 -- debian/.gitignore | 15 ----- debian/changelog | 48 ---------------- debian/compat | 1 - debian/control | 60 -------------------- debian/copyright | 37 ------------- debian/docs | 1 - debian/init.d | 103 ----------------------------------- debian/libsyslog-dev.install | 6 -- debian/libsyslog0.install | 1 - debian/libsyslog0.symbols | 22 -------- debian/logger.install | 2 - debian/rules | 19 ------- debian/source/format | 1 - debian/syslogd.default | 8 --- debian/syslogd.install | 5 -- 16 files changed, 335 deletions(-) delete mode 100644 debian/.gitignore delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/docs delete mode 100755 debian/init.d delete mode 100644 debian/libsyslog-dev.install delete mode 100644 debian/libsyslog0.install delete mode 100644 debian/libsyslog0.symbols delete mode 100644 debian/logger.install delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/syslogd.default delete mode 100644 debian/syslogd.install diff --git a/Makefile.am b/Makefile.am index 4330b3f..3c2d99d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,12 +53,6 @@ release-hook: echo; \ fi -# -# Generate .deb package(s) -# -package: - @debuild -uc -us -B --lintian-opts --profile debian -i -I --show-overrides - # # Target to run when building a release # diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index 31780f7..0000000 --- a/debian/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.log -*.substvars -.debhelper/ -autoreconf.* -debhelper-build-stamp -files -libsyslog0/ -libsyslog-dev/ -libsyslog/ -logger/ -syslogd.debhelper.log -syslogd.post* -syslogd.pre* -syslogd/ -tmp/ diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index d1aa25e..0000000 --- a/debian/changelog +++ /dev/null @@ -1,48 +0,0 @@ -sysklogd (2.3.0) stable; urgency=medium - - * Support for `logger -k`, early log to /dev/kmsg. Useful when logging - from early system startup scripts before syslogd has started - * Support for extracting non-kernel log messages from /dev/kmsg - * Ignore EINVAL from kernel, caused warning message at first startup - * Add support for `syslogd -C file` to use `file` for caching - the last seen kernel sequence number, default: /run/syslogd.cache - * Fix regression from v2.2.3, causing loss of syslogd log messages - like `syslogd v2.2.3: restart.` - * Fix man page, listed `-v` as verbose mode, is actually version - * Fix man page, missing documentation for `-H` option - * Fix DNS lookup handling of remote syslog servers, call res_init() - before getaddrinfo() and re-check more often than every 180 sec. - * Add option `-K` to trust kernel timestamps after startup - * Avoid asserting (exiting) on and around Jan 19, 2038, UNIX epoch - wraparound on 32-bit systems. Also, handle `EOVERFLOW` from the - gettimeofday() function in libsyslog - * Avoid NULL pointers in internal logging functions when in debug mode - * Replace `\m` with `\n` (missing newline) in `logger` usage text - * Use systemd KillMode=process - * Let syslogd use another socket when journald is active (systemd systems) - - -- Joachim Wiberg Sat, 27 Nov 2021 21:19:54 +0100 - -sysklogd (2.2.3) stable; urgency=medium - - * Fix problem with log messages stuck in 1969. When not using libsyslog, - or the bundled logger, the syslog() API in the C library is used, which - may not necessarily set the timestamp. When sysklogd infers timestamp - it was offset by the number of years since 1969, i.e., boot_time. - * Fix problem with repeating kernel messages if syslogd is restarted. - This introduces a new state file, /var/run/syslogd.cache, which saves - the last seen/logged sequence id read from `/dev/kmsg` - * Fix log message time calculation issue on 32-bit systems. - * Fix remote kernel messages being mapped to uucp instead of user - * Fix man page syslogd(8), name of PID file (syslog.pid -> syslogd.pid) - - -- Joachim Wiberg Tue, 11 May 2021 11:20:25 +0200 - -sysklogd (2.2.2) stable; urgency=low - - * Initial release. - * Fix issue with parsing /dev/kmsg time - * Fix spelling issues in syslogd and man pages, found by lintian - * Load and reload timezone, with tzset(), on init/SIGHUP. - - -- Joachim Wiberg Mon, 08 Mar 2021 11:36:46 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control deleted file mode 100644 index 520af23..0000000 --- a/debian/control +++ /dev/null @@ -1,60 +0,0 @@ -Source: sysklogd -Priority: important -Section: admin -Maintainer: Joachim Wiberg -Build-Depends: debhelper (>= 10), pkg-config -Standards-Version: 4.3.0 -Homepage: https://troglobit.com/sysklogd.html -Vcs-Browser: https://github.com/troglobit/sysklogd -Vcs-Git: https://github.com/troglobit/sysklogd.git - -Package: syslogd -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6) -Provides: syslogd, linux-kernel-log-daemon, system-log-daemon -Conflicts: syslogd, linux-kernel-log-daemon, system-log-daemon -Description: system logging daemon - Continuation of the original syslog daemon for Linux, based on the *BSD - syslog daemon. Now with kernel logging and log rotation built-in. It - can both receive from and send to remote syslog servers. Since v2.0 it - also includes support for RFC5424 with the new syslogp() API extension - from NetBSD for clients. - -Package: libsyslog-dev -Priority: optional -Section: libdevel -Architecture: any -Depends: ${misc:Depends}, libsyslog0 (= ${binary:Version}) -Description: new syslogp() API from NetBSD, development files - Development files for building applications that use the syslogp() - API from NetBSD. - . - This package includes the static library, header files, and docs. - -Package: libsyslog0 -Priority: optional -Section: libs -Provides: libsyslog -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: new syslogp() API from NetBSD for use with sysklogd - This library provides the new syslogp() API from NetBSD. It provides - applications with the full RFC5424 logging API. The intended use is - with the sysklogd package. - -Package: logger -Priority: optional -Section: admin -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libsyslog0 (= ${binary:Version}) -Conflicts: bsdutils -Description: enter messages into the system log - This version of logger is recommended for use with sysklogd. - It makes use of the new syslogp() API for RFC5424 style logs, - e.g. MSGID, strucutred data (SD), etc. - . - The BusyBox, or util-linux, logger tools can also be used, but - are limited to RFC3164 style messages. - . - Note: on Debian this conflicts with bsdutils, which is the - main package for providing logger. Use that. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index ebbb17d..0000000 --- a/debian/copyright +++ /dev/null @@ -1,37 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: sysklogd -Upstream-Contact: troglobit@gmail.com -Source: https://github.com/troglobit/sysklogd - -Files: debian/* -Copyright: 2021 Joachim Wiberg -License: BSD-3-clause - -Files: * -Copyright: 1983, 1988, 1993 The Regents of the University of California. All rights reserved. -License: BSD-3-clause - -License: BSD-3-clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index b43bf86..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README.md diff --git a/debian/init.d b/debian/init.d deleted file mode 100755 index 691d123..0000000 --- a/debian/init.d +++ /dev/null @@ -1,103 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: syslogd -# Required-Start: $network $remote_fs $time -# Required-Stop: $network $remote_fs $time -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: System logging daemon -# Description: The original Linux syslog daemon -### END INIT INFO -. /lib/lsb/init-functions - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DESC="System logging daemon" -NAME=syslogd - -DAEMON=/usr/sbin/syslogd -PIDFILE=/var/run/syslogd.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Define LSB log_* functions. -. /lib/lsb/init-functions - -do_start() -{ - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $SYSLOGD_OPTS -} - -do_signal() -{ - start-stop-daemon --stop --quiet --signal $1 $2 --pidfile $PIDFILE --exec $DAEMON -} - -do_stop() -{ - do_signal TERM --oknodo -} - -do_reload() -{ - do_signal HUP -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_progress_msg "already started" - log_end_msg 0 ;; - *) log_end_msg 1 ;; - esac - ;; - - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0) log_end_msg 0 ;; - 1) log_progress_msg "already stopped" - log_end_msg 0 ;; - *) log_end_msg 1 ;; - esac - ;; - - reload) - log_daemon_msg "Reloading $DESC" "$NAME" - do_reload - case "$?" in - 0) log_end_msg 0 ;; - 1) log_progress_msg "not running" - log_end_msg 1 ;; - *) log_end_msg 1 ;; - esac - ;; - - restart|force-reload) - $0 stop - $0 start - ;; - - try-restart) - $0 status >/dev/null 2>&1 && $0 restart - ;; - - status) - status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? - ;; - - *) - echo "Usage: $SCRIPTNAME {start|stop|reload|restart|force-reload|try-restart|status}" >&2 - exit 3 - ;; -esac - -: diff --git a/debian/libsyslog-dev.install b/debian/libsyslog-dev.install deleted file mode 100644 index d57c0a9..0000000 --- a/debian/libsyslog-dev.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/include/syslog/*.h -usr/lib/*/libsyslog.a -usr/lib/*/libsyslog.so -usr/lib/*/pkgconfig/lib*.pc -usr/share/doc/sysklogd/example/* -usr/share/man/man3/* diff --git a/debian/libsyslog0.install b/debian/libsyslog0.install deleted file mode 100644 index 3ddde58..0000000 --- a/debian/libsyslog0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/lib*.so.* diff --git a/debian/libsyslog0.symbols b/debian/libsyslog0.symbols deleted file mode 100644 index 7ef1b67..0000000 --- a/debian/libsyslog0.symbols +++ /dev/null @@ -1,22 +0,0 @@ -libsyslog.so.0 libsyslog0 #MINVER# -* Build-Depends-Package: libsyslog-dev - __pidfile@Base 2.0 - __pidfile_name@Base 2.0 - __pidfile_path@Base 2.0 - __strlcat@Base 2.0 - __strlcpy@Base 2.0 - __syslog_chk@Base 2.0 - closelog@Base 2.0 - closelog_r@Base 2.0 - openlog@Base 2.0 - openlog_r@Base 2.0 - setlogmask@Base 2.0 - setlogmask_r@Base 2.0 - syslog@Base 2.0 - syslog_r@Base 2.0 - syslogp@Base 2.0 - syslogp_r@Base 2.0 - vsyslog@Base 2.0 - vsyslog_r@Base 2.0 - vsyslogp@Base 2.0 - vsyslogp_r@Base 2.0 diff --git a/debian/logger.install b/debian/logger.install deleted file mode 100644 index f3331b3..0000000 --- a/debian/logger.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/logger -usr/share/man/man1/logger.1 diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 5609457..0000000 --- a/debian/rules +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/make -f -# export DH_VERBOSE=1 -export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_CFLAGS_MAINT_APPEND = -g -Og -rdynamic - -%: - dh $@ --with autoreconf,systemd - -override_dh_installchangelogs: - dh_installchangelogs ChangeLog.md - -# Remove LICENSE and ChangeLog.md per Debian Policy -override_dh_auto_install: - dh_auto_install - rm -v debian/tmp/usr/share/doc/sysklogd/LICENSE - rm -v debian/tmp/usr/share/doc/sysklogd/ChangeLog.md - -override_dh_auto_test: - $(MAKE) check diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 9f67427..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (native) \ No newline at end of file diff --git a/debian/syslogd.default b/debian/syslogd.default deleted file mode 100644 index be33dc7..0000000 --- a/debian/syslogd.default +++ /dev/null @@ -1,8 +0,0 @@ -# -# syslogd defaults -# - -# Secure mode enabled, forwarding to remote servers allowed, disable -# with another '-s', logging from remote servers disallowed. -# Default log rotation at 10 MiB, keeping 10 backlog copies. -SYSLOGD_OPTS="-s -r 10M:10" diff --git a/debian/syslogd.install b/debian/syslogd.install deleted file mode 100644 index 071ea27..0000000 --- a/debian/syslogd.install +++ /dev/null @@ -1,5 +0,0 @@ -syslog.conf etc -syslogd.service lib/systemd/system/ -usr/sbin/syslogd -usr/share/man/man5/syslog.conf.5 -usr/share/man/man8/syslogd.8