From 6eeeb9c08a32ab91c6bc604e389e8999726446eb Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Thu, 6 Sep 2018 11:54:13 -0700 Subject: [PATCH] ulogd: update to 2.0.7. Add runit service, logrotate file, and system account --- srcpkgs/ulogd/files/ulogd.logrotate | 9 ++++ srcpkgs/ulogd/files/ulogd/run | 2 + srcpkgs/ulogd/patches/00-musl-path.patch | 10 ++++ srcpkgs/ulogd/patches/musl-fixes.patch | 62 ------------------------ srcpkgs/ulogd/template | 23 ++++++--- 5 files changed, 36 insertions(+), 70 deletions(-) create mode 100644 srcpkgs/ulogd/files/ulogd.logrotate create mode 100644 srcpkgs/ulogd/files/ulogd/run create mode 100644 srcpkgs/ulogd/patches/00-musl-path.patch delete mode 100644 srcpkgs/ulogd/patches/musl-fixes.patch diff --git a/srcpkgs/ulogd/files/ulogd.logrotate b/srcpkgs/ulogd/files/ulogd.logrotate new file mode 100644 index 0000000000..c50479d92c --- /dev/null +++ b/srcpkgs/ulogd/files/ulogd.logrotate @@ -0,0 +1,9 @@ +/var/log/ulog.log /var/log/ulog.pcap { + missingok + compress + sharedscripts + create 640 _ulogd adm + postrotate + sv hup ulogd + endscript +} diff --git a/srcpkgs/ulogd/files/ulogd/run b/srcpkgs/ulogd/files/ulogd/run new file mode 100644 index 0000000000..0f7e286e6e --- /dev/null +++ b/srcpkgs/ulogd/files/ulogd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec ulogd -u _ulogd diff --git a/srcpkgs/ulogd/patches/00-musl-path.patch b/srcpkgs/ulogd/patches/00-musl-path.patch new file mode 100644 index 0000000000..39a02d9a43 --- /dev/null +++ b/srcpkgs/ulogd/patches/00-musl-path.patch @@ -0,0 +1,10 @@ +--- src/ulogd.c ++++ src/ulogd.c +@@ -65,6 +65,7 @@ + #include + #include + #include ++#include + #include + #include + #ifdef DEBUG diff --git a/srcpkgs/ulogd/patches/musl-fixes.patch b/srcpkgs/ulogd/patches/musl-fixes.patch deleted file mode 100644 index 1b23de7dfe..0000000000 --- a/srcpkgs/ulogd/patches/musl-fixes.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- ulogd-2.0.3.orig/filter/raw2packet/ulogd_raw2packet_BASE.c -+++ ulogd-2.0.3/filter/raw2packet/ulogd_raw2packet_BASE.c -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - - enum input_keys { - INKEY_RAW_PCKT, ---- ulogd-2.0.3.orig/src/ulogd.c -+++ ulogd-2.0.3/src/ulogd.c -@@ -78,12 +78,12 @@ - "(C) 2008-2012 Eric Leblond \n" - - /* global variables */ -+static int log_to_syslog = 0; - static FILE *logfile = NULL; /* logfile pointer */ - static char *ulogd_logfile = NULL; - static const char *ulogd_configfile = ULOGD_CONFIGFILE; - static const char *ulogd_pidfile = NULL; - static int ulogd_pidfile_fd = -1; --static FILE syslog_dummy; - - static int info_mode = 0; - -@@ -427,7 +427,7 @@ - if (level < loglevel_ce.u.value) - return; - -- if (logfile == &syslog_dummy) { -+ if (log_to_syslog) { - /* FIXME: this omits the 'file' string */ - va_start(ap, format); - vsyslog(ulogd2syslog_level(level), format, ap); -@@ -950,7 +950,7 @@ - logfile = stdout; - } else if (!strcmp(name, "syslog")) { - openlog("ulogd", LOG_PID, LOG_DAEMON); -- logfile = &syslog_dummy; -+ log_to_syslog = 1; - } else { - logfile = fopen(ulogd_logfile, "a"); - if (!logfile) { -@@ -1240,7 +1240,7 @@ - unload_plugins(); - #endif - -- if (logfile != NULL && logfile != stdout && logfile != &syslog_dummy) { -+ if (logfile != NULL && logfile != stdout) { - fclose(logfile); - logfile = NULL; - } -@@ -1262,7 +1262,7 @@ - switch (signal) { - case SIGHUP: - /* reopen logfile */ -- if (logfile != stdout && logfile != &syslog_dummy) { -+ if (logfile != stdout && logfile != NULL) { - fclose(logfile); - logfile = fopen(ulogd_logfile, "a"); - if (!logfile) { diff --git a/srcpkgs/ulogd/template b/srcpkgs/ulogd/template index cf76146785..4a01741865 100644 --- a/srcpkgs/ulogd/template +++ b/srcpkgs/ulogd/template @@ -1,16 +1,23 @@ # Template file for 'ulogd' pkgname=ulogd -version=2.0.5 -revision=3 +version=2.0.7 +revision=1 build_style=gnu-configure -maintainer="Orphaned " +maintainer="Cameron Nemo " hostmakedepends="pkg-config automake" -makedepends="libnfnetlink-devel libmnl-devel libnetfilter_log-devel libnetfilter_conntrack-devel libnetfilter_acct-devel" -license="GPL-2" +makedepends="libnfnetlink-devel libmnl-devel libnetfilter_log-devel + libnetfilter_conntrack-devel libnetfilter_acct-devel" +license="GPL-2.0-only" homepage="http://www.netfilter.org/projects/ulogd/" short_desc="A userspace logging daemon for netfilter/iptables related logging" -distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2" -checksum=a221cb9f77347c0ca00d0937e27c1b90e3291a553cc62a4139b788e2e420e8c0 +distfiles="${homepage}/files/${pkgname}-${version}.tar.bz2" +checksum=990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b configure_args="--sbindir=/usr/bin" -patch_args="-Np1" CFLAGS="-D_GNU_SOURCE" +system_accounts="_ulogd" + +post_install() { + vinstall ulogd.conf 644 etc + vinstall ${FILESDIR}/ulogd.logrotate 644 etc/logrotate.d ulogd + vsv ulogd +}