From d22aad22dfb1c32921888f9a45a93e4ce9bc03ec Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Fri, 1 May 2015 23:07:34 +0200
Subject: [PATCH 1/3] proper name for ulogd recipe (fixes build)

---
 recipes-extra/{ulogd2/ulogd2_2.0.4.bb => ulogd/ulogd_2.0.4.bb} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename recipes-extra/{ulogd2/ulogd2_2.0.4.bb => ulogd/ulogd_2.0.4.bb} (100%)

diff --git a/recipes-extra/ulogd2/ulogd2_2.0.4.bb b/recipes-extra/ulogd/ulogd_2.0.4.bb
similarity index 100%
rename from recipes-extra/ulogd2/ulogd2_2.0.4.bb
rename to recipes-extra/ulogd/ulogd_2.0.4.bb

From 59e8120312b0e8a87518e5f1d9e4843a8b5b1be5 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Fri, 1 May 2015 23:08:31 +0200
Subject: [PATCH 2/3] add jansson recipe (from meta-openembedded.git)

jansson is required for the ulogd JSON output plugin.
---
 recipes-extra/jansson/jansson_2.4.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 recipes-extra/jansson/jansson_2.4.bb

diff --git a/recipes-extra/jansson/jansson_2.4.bb b/recipes-extra/jansson/jansson_2.4.bb
new file mode 100644
index 0000000000..c235729fec
--- /dev/null
+++ b/recipes-extra/jansson/jansson_2.4.bb
@@ -0,0 +1,12 @@
+SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON data"
+HOMEPAGE = "http://www.digip.org/jansson/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6946b728e700de875e60ebb453cc3a20"
+
+SRC_URI = "http://www.digip.org/jansson/releases/${BPN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "c4629b89bf0432f3158c461e88fe0113"
+SRC_URI[sha256sum] = "1fcbd1ac3d8b610644acf86a5731d760bb228c9acbace20a2ad0f23baec79b41"
+
+inherit autotools pkgconfig
+

From 66b18ff049314e3ad2c9ddd92b64ae319470ed7f Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Fri, 1 May 2015 23:29:18 +0200
Subject: [PATCH 3/3] ulogd: split out some plugins in sub-packages

some plugins have external dependencies (jansson for JSON, ...) and we
dont want to pull those dependencies for all users.
---
 recipes-extra/ulogd/ulogd_2.0.4.bb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/recipes-extra/ulogd/ulogd_2.0.4.bb b/recipes-extra/ulogd/ulogd_2.0.4.bb
index 2e7854f2d5..afd10e5fff 100644
--- a/recipes-extra/ulogd/ulogd_2.0.4.bb
+++ b/recipes-extra/ulogd/ulogd_2.0.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Userspace logging daemon for netfilter/iptables related logging"
 HOMEPAGE = "http://www.netfilter.org/projects/ulogd/index.html"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
-DEPENDS = "libnfnetlink libnetfilter-log libnetfilter-conntrack libmnl libnetfilter-acct"
+DEPENDS = "libnfnetlink libnetfilter-log libnetfilter-conntrack libmnl libnetfilter-acct sqlite3 jansson"
 PR = "r1"
 
 SRC_URI = " \
@@ -14,3 +14,14 @@ SRC_URI[tar.sha256sum] = "56b30a13a8832e97178f39b7bb173a0b1dfe173dbb60d99a1a386c
 PARALLEL_MAKE = ""
 
 inherit autotools
+
+PACKAGES =+ "ulogd-in-nfacct ulogd-in-nfct ulogd-in-nflog ulogd-in-ulog ulogd-out-sqlite3 ulogd-out-json ulogd-out-pcap"
+
+FILES_ulogd-in-nfacct = "${libdir}/ulogd/ulogd_inpflow_NFACCT.so"
+FILES_ulogd-in-nfct = "${libdir}/ulogd/ulogd_inpflow_NFCT.so"
+FILES_ulogd-in-nflog = "${libdir}/ulogd/ulogd_inppkt_NFLOG.so"
+FILES_ulogd-in-ulog = "${libdir}/ulogd/ulogd_inppkt_ULOG.so"
+FILES_ulogd-out-sqlite3 = "${libdir}/ulogd/ulogd_output_SQLITE3.so"
+FILES_ulogd-out-json = "${libdir}/ulogd/ulogd_output_JSON.so"
+FILES_ulogd-out-pcap = "${libdir}/ulogd/ulogd_output_PCAP.so"
+FILES_ulogd-out-json = "${libdir}/ulogd/ulogd_output_JSON.so"