From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Oct 2012 09:56:48 +0000 (+0000)
Subject: ulogd2: Update to 2.0.1.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=856a1edbfe46129788cd76c10077403b53ce80a0;p=ipfire-3.x.git

ulogd2: Update to 2.0.1.
---

diff --git a/ulogd2/patches/0001-sqlite3-Add-more-logging-if-database-initialization-fails.patch b/ulogd2/patches/0001-sqlite3-Add-more-logging-if-database-initialization-fails.patch
deleted file mode 100644
index c2c4e88c3..000000000
--- a/ulogd2/patches/0001-sqlite3-Add-more-logging-if-database-initialization-fails.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c3dbb53b6c206a0fdfacad9915a2df0c3613089a Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Sun, 22 Jul 2012 11:36:11 +0000
-Subject: [PATCH] sqlite3: Add more logging if database initialization fails.
-
----
- output/sqlite3/ulogd_output_SQLITE3.c |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/output/sqlite3/ulogd_output_SQLITE3.c b/output/sqlite3/ulogd_output_SQLITE3.c
-index dffdda3..6f371c3 100644
---- a/output/sqlite3/ulogd_output_SQLITE3.c
-+++ b/output/sqlite3/ulogd_output_SQLITE3.c
-@@ -322,8 +322,10 @@ sqlite3_init_db(struct ulogd_pluginstance *pi)
- 	sqlite3_stmt *schema_stmt;
- 	int col, num_cols;
- 
--	if (priv->dbh == NULL)
-+	if (priv->dbh == NULL) {
-+		ulogd_log(ULOGD_ERROR, "SQLITE3: No database handle.\n");
- 		return -1;
-+	}
- 
- 	num_cols = db_count_cols(pi, &schema_stmt);
- 	if (num_cols <= 0) {
-@@ -397,8 +399,10 @@ sqlite3_start(struct ulogd_pluginstance *pi)
- 	sqlite3_busy_timeout(priv->dbh, SQLITE3_BUSY_TIMEOUT);
- 
- 	/* read the fieldnames to know which values to insert */
--	if (sqlite3_init_db(pi) < 0)
-+	if (sqlite3_init_db(pi) < 0) {
-+		ulogd_log(ULOGD_ERROR, "SQLITE3: Could not read database fieldnames.\n");
- 		return -1;
-+	}
- 
- 	/* initialize our buffer size and counter */
- 	priv->buffer_size = buffer_ce(pi);
--- 
-1.7.8.2
-
diff --git a/ulogd2/ulogd2.nm b/ulogd2/ulogd2.nm
index bb896d747..8c2d48647 100644
--- a/ulogd2/ulogd2.nm
+++ b/ulogd2/ulogd2.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = ulogd2
-version    = 2.0.0
-release    = 1.1
+version    = 2.0.1
+release    = 1
 epoch      = 1
 thisapp    = ulogd-%{version}
 
@@ -22,15 +22,15 @@ description
 	ethernet devices directly.
 end
 
-source_dl += http://ftp.netfilter.org/pub/ulogd/
+source_dl  = http://ftp.netfilter.org/pub/ulogd/
 sources    = %{thisapp}.tar.bz2
 
 build
 	requires
 		libmnl-devel
-		libnfnetlink-devel
-		libnetfilter_acct-devel
-		libnetfilter_conntrack-devel
+		libnfnetlink-devel >= 1.0.1
+		libnetfilter_acct-devel >= 1.0.1
+		libnetfilter_conntrack-devel >= 1.0.2
 		libnetfilter_log-devel
 		libpcap-devel
 		sqlite-devel
@@ -53,6 +53,12 @@ end
 
 packages
 	package %{name}
+		requires
+			libnfnetlink >= 1.0.1
+			libnetfilter_acct >= 1.0.1
+			libnetfilter_conntrack >= 1.0.2
+		end
+
 		configfiles
 			/etc/ulogd.conf
 		end