From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 856a1edbfe46129788cd76c10077403b53ce80a0
Date: Tue, 09 Oct 2012 11:59:47 +0200 [thread overview]
Message-ID: <20121009095948.32B8D200C5@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 6844 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 856a1edbfe46129788cd76c10077403b53ce80a0 (commit)
via be94c8bedc9c8fa0e2498c72d57b7f9739864ada (commit)
via b9a6259a29c69222161033748be9ac6deee43075 (commit)
via 119505c094ab3e288a9de86247bec512ff1b2d30 (commit)
from 54ff5e028f5127c2137e186e2baf4331c993d1e3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 856a1edbfe46129788cd76c10077403b53ce80a0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 9 09:56:48 2012 +0000
ulogd2: Update to 2.0.1.
commit be94c8bedc9c8fa0e2498c72d57b7f9739864ada
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 9 09:55:49 2012 +0000
libnfnetlink: Update to 1.0.1.
commit b9a6259a29c69222161033748be9ac6deee43075
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 9 09:55:27 2012 +0000
libnetfilter_conntrack: Update to 1.0.2.
commit 119505c094ab3e288a9de86247bec512ff1b2d30
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 9 09:54:59 2012 +0000
libnetfilter_acct: Update to 1.0.1.
-----------------------------------------------------------------------
Summary of changes:
libnetfilter_acct/libnetfilter_acct.nm | 2 +-
libnetfilter_conntrack/libnetfilter_conntrack.nm | 3 +-
libnfnetlink/libnfnetlink.nm | 5 +-
...-logging-if-database-initialization-fails.patch | 40 --------------------
ulogd2/ulogd2.nm | 18 ++++++---
5 files changed, 17 insertions(+), 51 deletions(-)
delete mode 100644 ulogd2/patches/0001-sqlite3-Add-more-logging-if-database-initialization-fails.patch
Difference in files:
diff --git a/libnetfilter_acct/libnetfilter_acct.nm b/libnetfilter_acct/libnetfilter_acct.nm
index 30a3a4a..8051aec 100644
--- a/libnetfilter_acct/libnetfilter_acct.nm
+++ b/libnetfilter_acct/libnetfilter_acct.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libnetfilter_acct
-version = 1.0.0
+version = 1.0.1
release = 1
groups = System/Libraries
diff --git a/libnetfilter_conntrack/libnetfilter_conntrack.nm b/libnetfilter_conntrack/libnetfilter_conntrack.nm
index 44079c1..78aa8ab 100644
--- a/libnetfilter_conntrack/libnetfilter_conntrack.nm
+++ b/libnetfilter_conntrack/libnetfilter_conntrack.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libnetfilter_conntrack
-version = 1.0.0
+version = 1.0.2
release = 1
groups = System/Libraries
@@ -23,6 +23,7 @@ sources = %{thisapp}.tar.bz2
build
requires
+ libmnl-devel >= 1.0.3
libnfnetlink-devel
pkg-config
end
diff --git a/libnfnetlink/libnfnetlink.nm b/libnfnetlink/libnfnetlink.nm
index 411a22d..d2ad699 100644
--- a/libnfnetlink/libnfnetlink.nm
+++ b/libnfnetlink/libnfnetlink.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libnfnetlink
-version = 1.0.0
+version = 1.0.1
release = 1
groups = System/Libraries
@@ -20,12 +20,11 @@ description
with the netfilter subsystem of the Linux kernel.
end
-source_dl =
+source_dl = http://www.netfilter.org/projects/libnfnetlink/files/
sources = %{thisapp}.tar.bz2
packages
package %{name}
- end
package %{name}-devel
template DEVEL
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 c2c4e88..0000000
--- 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(a)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 bb896d7..8c2d486 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
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2012-10-09 9:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121009095948.32B8D200C5@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox