From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 23 Nov 2022 09:34:00 +0000 (+0000)
Subject: ulogd2: Update to 2.0.8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8eda5eeb293e46dea535f0adbaad13a587ec212;p=ipfire-3.x.git

ulogd2: Update to 2.0.8

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

diff --git a/ulogd2/patches/ulogd2-2.0.5-better-sqlite-debugging.patch b/ulogd2/patches/ulogd2-2.0.5-better-sqlite-debugging.patch
deleted file mode 100644
index f9c5f7d79..000000000
--- a/ulogd2/patches/ulogd2-2.0.5-better-sqlite-debugging.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/output/sqlite3/ulogd_output_SQLITE3.c b/output/sqlite3/ulogd_output_SQLITE3.c
-index 5c49055..e3eff6f 100644
---- a/output/sqlite3/ulogd_output_SQLITE3.c
-+++ b/output/sqlite3/ulogd_output_SQLITE3.c
-@@ -212,7 +212,8 @@ sqlite3_interp(struct ulogd_pluginstance *pi)
- 	return ULOGD_IRET_OK;
- 
-  err_bind:
--	ulogd_log(ULOGD_ERROR, "SQLITE: bind: %s\n", sqlite3_errmsg(priv->dbh));
-+	ulogd_log(ULOGD_ERROR, "SQLITE: bind: %s (field: %s)\n", sqlite3_errmsg(priv->dbh),
-+		f->key->name);
- 	
- 	return ULOGD_IRET_ERR;
- }
-@@ -353,8 +354,10 @@ sqlite3_init_db(struct ulogd_pluginstance *pi)
- 		}
- 		strncpy(f->name, buf, ULOGD_MAX_KEYLEN);
- 
--		if ((f->key = ulogd_find_key(pi, buf)) == NULL)
-+		if ((f->key = ulogd_find_key(pi, buf)) == NULL) {
-+			ulogd_log(ULOGD_ERROR, "SQLITE3: Could not find field %s\n", buf);
- 			return -1;
-+		}
- 
- 		TAILQ_INSERT_TAIL(&priv->fields, f, link);
- 	}
diff --git a/ulogd2/ulogd2.nm b/ulogd2/ulogd2.nm
index 4d639a872..401c48885 100644
--- a/ulogd2/ulogd2.nm
+++ b/ulogd2/ulogd2.nm
@@ -4,16 +4,16 @@
 ###############################################################################
 
 name       = ulogd2
-version    = 2.0.5
+version    = 2.0.8
 release    = 1
 epoch      = 1
 
 thisapp    = ulogd-%{version}
 
 groups     = Networking/Statistics
-url        = http://netfilter.org/projects/ulogd/index.html
+url        = https://netfilter.org/projects/ulogd/index.html
 license    = GPLv2
-summary    = The userspace logging daemon for netfilter.
+summary    = The userspace logging daemon for netfilter
 
 description
 	This package contains utilities for configuring the linux ethernet
@@ -23,7 +23,7 @@ description
 	ethernet devices directly.
 end
 
-source_dl  = http://ftp.netfilter.org/pub/ulogd/
+source_dl  = https://www.netfilter.org/projects/ulogd/files/
 sources    = %{thisapp}.tar.bz2
 
 build