package/ulogd: add postgresql optional dependency
PATCH 1/2 package/ulogd: add postgresql optional dependency
--- package/ulogd/ulogd.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
package/ulogd/ulogd.mk +8 -2
@@ -7,7 +7,7 @@ ULOGD_VERSION = 2.0.5 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files -ULOGD_CONF_OPTS = --with-dbi=no --with-pgsql=no +ULOGD_CONF_OPTS = --with-dbi=no ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink
@@ -22,11 +22,17 @@ ULOGD_DEPENDENCIES += mysql else ULOGD_CONF_OPTS += --with-mysql=no endif +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +ULOGD_CONF_OPTS += --with-pgsql +ULOGD_DEPENDENCIES += postgresql +else +ULOGD_CONF_OPTS += --without-pgsql +endif ifeq ($(BR2_PACKAGE_SQLITE),y) ULOGD_DEPENDENCIES += sqlite endif else -ULOGD_CONF_OPTS += --with-mysql=no --without-sqlite +ULOGD_CONF_OPTS += --with-mysql=no --without-pgsql --without-sqlite endif ifeq ($(BR2_PACKAGE_LIBPCAP),y)
Signature · 1 line
2.14.1
PATCH 2/2 package/ulogd: bump to version 2.0.7
- Remove three patches (already in version)
- Add hash for license file
--- ...ev-null-as-dummy-logfile-when-logging-to-.patch | 70 -- ...fine-_GNU_SOURCE-to-get-members-of-tcphdr.patch | 44 -- .../ulogd/0003-Use-stdint-types-everywhere.patch | 792 --------------------- package/ulogd/ulogd.hash | 10 +- package/ulogd/ulogd.mk | 2 +- 5 files changed, 8 insertions(+), 910 deletions(-) delete mode 100644 package/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch delete mode 100644 package/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch delete mode 100644 package/ulogd/0003-Use-stdint-types-everywhere.patch
package/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch deleted +0 -70
@@ -1,70 +0,0 @@ -From 8a6ddd1cb2b55c234f1a97f7e5d996f24f46b6f8 Mon Sep 17 00:00:00 2001 -From: Felix Janda <[email protected]> -Date: Sat, 16 May 2015 17:43:23 +0200 -Subject: [PATCH] ulogd: Use /dev/null as dummy logfile when logging to - syslog - -Fixes compilation error with musl libc: - -ulogd.c:86:13: error: storage size of 'syslog_dummy' isn't known - static FILE syslog_dummy; - -Signed-off-by: Felix Janda <[email protected]> -[Rahul Bedarkar: Backported from https://git.netfilter.org/ulogd2/commit/?id=8a6ddd1cb2b55c234f1a97f7e5d996f24f46b6f8] -Signed-off-by: Rahul Bedarkar <[email protected]> ---- - src/ulogd.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/ulogd.c b/src/ulogd.c -index e7cde39..958c30a 100644 ---- a/src/ulogd.c -+++ b/src/ulogd.c -@@ -83,7 +83,7 @@ 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 FILE *syslog_dummy; - - static int info_mode = 0; - -@@ -427,7 +427,7 @@ void __ulogd_log(int level, char *file, int line, const char *format, ...) - if (level < loglevel_ce.u.value) - return; - -- if (logfile == &syslog_dummy) { -+ if (logfile == syslog_dummy) { - /* FIXME: this omits the 'file' string */ - va_start(ap, format); - vsyslog(ulogd2syslog_level(level), format, ap); -@@ -950,7 +950,7 @@ static int logfile_open(const char *name) - logfile = stdout; - } else if (!strcmp(name, "syslog")) { - openlog("ulogd", LOG_PID, LOG_DAEMON); -- logfile = &syslog_dummy; -+ logfile = syslog_dummy = fopen("/dev/null", "w"); - } else { - logfile = fopen(ulogd_logfile, "a"); - if (!logfile) { -@@ -1240,7 +1240,7 @@ static void sigterm_handler(int signal) - unload_plugins(); - #endif - -- if (logfile != NULL && logfile != stdout && logfile != &syslog_dummy) { -+ if (logfile != NULL && logfile != stdout) { - fclose(logfile); - logfile = NULL; - } -@@ -1262,7 +1262,7 @@ static void signal_handler(int signal) - switch (signal) { - case SIGHUP: - /* reopen logfile */ -- if (logfile != stdout && logfile != &syslog_dummy) { -+ if (logfile != stdout && logfile != syslog_dummy) { - fclose(logfile); - logfile = fopen(ulogd_logfile, "a"); - if (!logfile) { --- -2.6.2 -
package/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch deleted +0 -44
44 lines not on this page · raw message
package/ulogd/0003-Use-stdint-types-everywhere.patch deleted +0 -792
792 lines not on this page · raw message
package/ulogd/ulogd.hash +7 -3
@@ -1,3 +1,7 @@ -# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.5.tar.bz2.{md5sum,sha1sum} -md5 f0f8fe1371fa28b5e06cb16aaa0111dd ulogd-2.0.5.tar.bz2 -sha1 828db7849d6788674ecf36b178f107c20e9ac1f0 ulogd-2.0.5.tar.bz2 +# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.7.tar.bz2.{md5sum,sha1sum} +md5 2bb2868cf51acbb90c35763c9f995f31 ulogd-2.0.7.tar.bz2 +sha1 f2d90469e2842e2bfbe19c55cf6d56ac107aa4b9 ulogd-2.0.7.tar.bz2 + +# Locally calculated +sha256 990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b ulogd-2.0.7.tar.bz2 +sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING
package/ulogd/ulogd.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -ULOGD_VERSION = 2.0.5 +ULOGD_VERSION = 2.0.7 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files ULOGD_CONF_OPTS = --with-dbi=no
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH 2/2 package/ulogd: bump to version 2.0.7
Quoted 4 lines · On Wed, 13 Mar 2019 19:15:12 +0100 Fabrice Fontaine…
- Remove three patches (already in version)
- Add hash for license fileSigned-off-by Fabrice Fontaine <[email protected]>
Quoted 10 lines
--- ...ev-null-as-dummy-logfile-when-logging-to-.patch | 70 -- ...fine-_GNU_SOURCE-to-get-members-of-tcphdr.patch | 44 -- .../ulogd/0003-Use-stdint-types-everywhere.patch | 792 --------------------- package/ulogd/ulogd.hash | 10 +- package/ulogd/ulogd.mk | 2 +- 5 files changed, 8 insertions(+), 910 deletions(-) delete mode 100644 package/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch delete mode 100644 package/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch delete mode 100644 package/ulogd/0003-Use-stdint-types-everywhere.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/2 package/ulogd: add postgresql optional dependency
In reply to Fabrice FontaineQuoted 4 lines · On Wed, 13 Mar 2019 19:15:11 +0100 Fabrice Fontaine…
Signed-off-by Fabrice Fontaine <[email protected]>--- package/ulogd/ulogd.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
I've applied, but I have a few comments, see below.
package/ulogd/ulogd.mk line 10
Quoted 11 lines
package/ulogd/ulogd.mk +1
-1@@ -7,7 +7,7 @@ ULOGD_VERSION = 2.0.5 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files -ULOGD_CONF_OPTS = --with-dbi=no --with-pgsql=no +ULOGD_CONF_OPTS = --with-dbi=no
Would be nice to use --without-foo instead of --with-foo=<no>.
package/ulogd/ulogd.mk ULOGD_DEPENDENCIES += mysql · line 23
Quoted 6 lines
package/ulogd/ulogd.mk +0
-0ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink@@ -22,11 +22,17 @@ ULOGD_DEPENDENCIES += mysql else ULOGD_CONF_OPTS += --with-mysql=no
Ditto --without.
package/ulogd/ulogd.mk ULOGD_DEPENDENCIES += mysql · line 32
Quoted 9 lines
package/ulogd/ulogd.mk +6
-0endif +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +ULOGD_CONF_OPTS += --with-pgsql +ULOGD_DEPENDENCIES += postgresql +else +ULOGD_CONF_OPTS += --without-pgsql +endif ifeq ($(BR2_PACKAGE_SQLITE),y) ULOGD_DEPENDENCIES += sqlite
Any idea why we don't do --with-sqlite / --without-sqlite ?
package/ulogd/ulogd.mk ULOGD_DEPENDENCIES += mysql · line 35
Quoted 4 lines
package/ulogd/ulogd.mk +1
-1endif else -ULOGD_CONF_OPTS += --with-mysql=no --without-sqlite +ULOGD_CONF_OPTS += --with-mysql=no --without-pgsql --without-sqlite
Ditto --without.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com