revbump; upgrade -2.0.4 with support of systemd via new system files listed. bump; additional support as for revbump, all files and patches by maintainer from bug #550330, add use flag ulog to metadata, rm old version -2.0.3

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

10 files changed, 265 insertions, 48 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index a58582f28f60..96e32b0025b0 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.97 2015/01/28 10:26:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.98 2015/05/30 09:38:29 idella4 Exp $
+
+*ulogd-2.0.4-r1 (30 May 2015)
+*ulogd-2.0.5 (30 May 2015)
+
+  30 May 2015; Ian Delaney <idella4@gentoo.org>
+  +files/ulogd-2.0.5-remove-db-automagic.patch, +files/ulogd.init,
+  +files/ulogd.logrotate, +files/ulogd.service, +ulogd-2.0.4-r1.ebuild,
+  +ulogd-2.0.5.ebuild, -files/ulogd-2-ng.init, -files/ulogd-2.logrotate,
+  -ulogd-2.0.3.ebuild, metadata.xml:
+  revbump; upgrade -2.0.4 with support of systemd via new system files listed.
+  bump; additional support as for revbump, all files and patches by maintainer
+  from bug #550330, add use flag ulog to metadata, rm old version -2.0.3
 
   28 Jan 2015; Agostino Sarubbo <ago@gentoo.org> ulogd-2.0.4.ebuild:
   Stable for ppc, wrt bug #534240
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 12324b3dcd0b..446259481d6e 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,29 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ulogd-2-ng.init 1000 SHA256 72e5ef08facee693fdbd264bcc42d8277220706b2539150fef97a31b6039c44a SHA512 de80e76ef91b7913b4eb0a28f6632700c8944dd0a29a8e7a1f7365f8523ef79bd52e1e873bc94dc3958c5b4224680457b7b6d4ef0e196dc0179af50c6a9c6a92 WHIRLPOOL b2c4d7eef3ba5d2d2c9777fdafcc08137b78000a2558e894dfa737997ed236e4796abf2a9011e055237e233fd7217cad26e8607c19f6cc34226c5dd74df42e28
 AUX ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch 3187 SHA256 aa1226e726e255024862436533f3ca03673cb60b9b71ecca956f2390e5d76202 SHA512 b1dda5ff80913d104941be9bf67fa72a07729b93de297a18a754c6ee41398d603e410324ffb39932142cb6b7a58d681a3d7c4a1bcefa9fa781b452ac2ba42d42 WHIRLPOOL 2255640dc07e6b7a81f72b44b71510c341b49f4918c1b36321778d57f4bca06e74e4972cccdb8853e328d046a3dbc3f5f7be0ef82d958187cde0ef9c4d9cc64e
-AUX ulogd-2.logrotate 212 SHA256 df0f73b4dd4b0c1f6afaf3efc98c99b972e068bcbf8ea768f6522cbebd339669 SHA512 1c29316f42903a8893a110e74c171f2b8b4c9bb2d63221b65e601f077549c7447941ce6257259b4f1042076c1e4b5bfba0bf7c85289519aab6edb27edf6ffc95 WHIRLPOOL 8f2290e7de1e8958c1fc5cf1f075170a691304d1ddbf53a2f14b989925d5da6996ab409442ee9a92852a711f56a2bfe05bd97a55ab2d6be3fd1cca346cd0dd93
-DIST ulogd-2.0.3.tar.bz2 447550 SHA256 1ec965073e7f4e5605b2bd1c143b2094e495ad24a298e6fc8f6fcbd131234376 SHA512 09d61cca6cd1c8137b3a4e5ce101f54e48f30c98761602a97766554bc4130eda632b8541f5c1e3e2ac686ec718bb4d440d3bea57c811317cabb274917c996140 WHIRLPOOL f79f0300e610ee9de82aee478dec1c28ffbe10c7b4348ddc586229ac53226f238371f1e71d0b33095904d373c26359b848e18069d8da3d7e22a4819568c1ee44
+AUX ulogd-2.0.5-remove-db-automagic.patch 1464 SHA256 40188b4d15f59b63d4a7d5aa2852546f78e7d0b101afb9a13c4145c48bf65921 SHA512 9bf3c5c1c8ecf0d8d40f2eb56004ce8843d5aa40273539f6b34b163db60fc90bb4305e1f9b680ccefcdce33aa47e0e248df314578fc6dfb94beb346c63163897 WHIRLPOOL e4ae6b3c027215d2eac98daea795f1b4d73de07c424a1bbe5bcbd05ad5397214f0f14cb3ab65fea588f3afc58f888f8b49c4f18c98219ed876c28663813b9bdf
+AUX ulogd.init 1005 SHA256 d3bb0244aad499b77ec5b8eaadfcc4b1189645423116d5af01f1777b1ee8bc50 SHA512 0fa76a0dbeb570f1b1e5c168729b2afe3c5ada855f421fe278d04e543f24624fc1fe2344cc226c95ff0283675481283a3d9dd4b806b3456915fc9e53e4e56981 WHIRLPOOL 8721814537e12e58168b6ca8fa8d800bdc7aea6ce8baf0aac44405e9121ce7487e59aee48b2257efb3d61197837334b88df98b4291cd5a09be42b425dee4d9a5
+AUX ulogd.logrotate 193 SHA256 f5253a7906b2dc08c3ff5afe2c07f51aa77541c1ba65a5d2292099893827f66c SHA512 be62a8c63d567d90ab07d9a9e86fb85d868683c385de598b81fa369fd13581a144a0be1aedd2b899d653d94475679eee1fd4939ae72a35777d75208584b2f17a WHIRLPOOL c10c9003fbfc367ae556ccef60eb453f736235c01e6fcf7252ed0bb7626ecf80fc2858408accc08987340008450a4405425bba93c13c25b6b47150e3702fcd25
+AUX ulogd.service 323 SHA256 3954f11da533bf6c20cfe2dc2b4f7b26ff2f94401c5bd80c3715a397e2d9bd94 SHA512 c7414c8c981cfa4ad1f01387c050328ff90623d4b19885adebac51060eff480549635d801f48d392748e3def7428b793de6dd78277e2e60549b02ebe49a21696 WHIRLPOOL 89b4fde7ed8a758fac5346366fbe8b435da1217eab9a55a5e8be233a029d71e0068bdcbe86d08a5a66b95bb32e35b6ce018dd2ee9873271340ace3b057222a63
 DIST ulogd-2.0.4.tar.bz2 452234 SHA256 56b30a13a8832e97178f39b7bb173a0b1dfe173dbb60d99a1a386c0962a2effd SHA512 08e88661fcfbcfd327b03b7a883dc239991f47d5a4e4561f3ada5f6acc8f2349f3bd38c1c67f28e42bbccf4cad63b2b7c3b732c23bf24b7c5f05320d27977773 WHIRLPOOL 94ee731cee8b95295d1c675bb3904be1a5b27a1e901d462f248116c865e79d52703b5330882110d7212bda1bb964fc0c97c3e704589071f47fab4475e1c91161
-EBUILD ulogd-2.0.3.ebuild 3070 SHA256 b859826f4f043171d77b83ebf1db27cd94866fa6a5c67e78823394d41710956e SHA512 c938afb025d6fe8843095d03365fec6b0f65240d4c20f5426712acd38d1393bfeac699ab6a645816e65848dd2b49fe64c7894777a97718e81aad0d0e1e13f70e WHIRLPOOL 34e6f91f5a633df086c98e329157ad2cee1ad0c56cfdc1f76b8037c0063f4c0f0fb9bc748d8354a62914e90af26a73d6b48b0d945fc01011db7587c709266fbb
+DIST ulogd-2.0.5.tar.bz2 456258 SHA256 a221cb9f77347c0ca00d0937e27c1b90e3291a553cc62a4139b788e2e420e8c0 SHA512 bf00b8adaad7bd04077a83521b0d7accc26e644c8f3386819e7f91476178b6733f1c6554fb82dd0d3913398c83a61d65f61dc973f199f610bfaadc6251504819 WHIRLPOOL fe499ac7b4070581439a05f4f2245f7a42fe5630da5dc32b9b069511ed1faa15fe482eee08d50477d3fb1d0bf0d3855a69fc82fb0f3e8eecdf082fb642519f91
+EBUILD ulogd-2.0.4-r1.ebuild 3504 SHA256 272504f91b88b8bc5a9474e44276985850810cab133dfe54cc150732fa5e49a6 SHA512 7ec12678326f6ed9270af0dd24e6379096aa66fdc6f49382abfacff03fba04c5f01e9ba9111524391b635e852060ac73013ec02e493776a142b5d0160096d3e7 WHIRLPOOL a6ed2cdfd0e037a7cdf3dc6399e72b899b1e87b057afcfcd6bee9fc1980388601e999c8fcedabc12827c481a5267afb37f00188e8a7e8c2c2b07553cc5858507
 EBUILD ulogd-2.0.4.ebuild 3445 SHA256 37232ff4bc482649326d5b8d3715765f3f5f134c56b3e591e3a8a6ff2125d632 SHA512 3401c80ccaa55d49d289d6b09c28ced256214b138ddca0e1902dfb96c75e540b846ec9227afd5ae86f94b32c355174c77d2149c4e3f8d2b47ea39252377e67ad WHIRLPOOL 759eff342120195984c3c9f4c1d0554878855a4ab4769c29c97625d7328fd5e5efd4ed1c7a26948cce5cf69247d11bd1e973a1c9a3a4cef9d7fa678940d5a980
-MISC ChangeLog 15950 SHA256 1ebf28b66b3f2feacf5340103f05d2d1e75724f243c736989bb700169b752c4b SHA512 bed33be33e9528353c6bac23eed575bc6995c037b75b55b87b050c3fa891107da1f26c3a00aea54b90525ddf40274e3479c335f44ab8740c76abde6814c12ca2 WHIRLPOOL 4d43f179ecbc8af37c47db8cca2aa536c0a2496cb7d16e3b059b8b4947dac5007936f6be3dc749397a798ab78228154a1f65a1c07683c5074a8fead0fb6eda83
-MISC metadata.xml 1045 SHA256 8fca8605bebf933527d992e67d15b73a73ffb10ceaa23369b9243f9aca546a94 SHA512 95b9494ea6fa7771e53b2300e7bb3c795f0869e2aea0f8c56e307836cb152082c584daa935eb99416e1cacec4e22a370812da7dca7689d408b232c58eb4cd514 WHIRLPOOL 895778a343a2f24edf5083236e8489570e739ce3023491c8b6f483a14c3343931e340fec227fb5f0250c902692dcc8841d4bd976d13490d361e4599424658693
+EBUILD ulogd-2.0.5.ebuild 3472 SHA256 ddbc342533b8ebfa1422945e2465c0284cc1bf71f31c4bce8d5399d47e72dfd2 SHA512 159d612cb8ac94783b5cdac64304a76aef78932ab7a5040757976a7025aa9866de82ffdee926e744d53460981319a53ea43bbce6529d4f9a3bc2cbab9d0dba0b WHIRLPOOL 3cbf16e966be16da8bf9408ff6e2737b607cde9fd8653eec6e10cd09ff0e3fb87e7a4a8a186ca7afc934f5d9e35e73ff563fd7ec7e5104fca41ed7a567c662ba
+MISC ChangeLog 16541 SHA256 c1e6556417801133f6ab7961cca7cb0a70efa420dd5480d7da73b64acd457c86 SHA512 a927b83c2329cc49adb6209d50be15d89e0d41263131b803e720ad7813ec33c67e4a548bff72bf3eec0ce2f6ca100b80bd7e6592d4f1820b47e81c5cd8590955 WHIRLPOOL ab64809d62ad4312e9e1b4ed4f159f993c1608090d628d3a7cee277241b9ac54885fadd0eee53911127a14fafd4b2800d32a326ece4c2cb2ae40c77676468b41
+MISC metadata.xml 1156 SHA256 119b498c8b5e49ea329f9ed25bf34f196755a74e4f115a460cee094448f708f1 SHA512 207b7acf22409612440f7217afdc0467a2a4c9a9c05c091c1309e9f96e18b4509ba5ecebff40e93f8c1e14deec1bf447fc8ef158fb65beb01e5d5ac39aefc133 WHIRLPOOL 3793e337c21a832b93fc67387b66211906b385e6f4bfee7e116868150e8b416b14617c205bcb7149908f804af8813fca8dac0d87ef7f66a814bfb4df273ef8a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUyLk6AAoJELp701BxlEWfX/MP/0GG1dcKjdCGiSIii59z3Pm8
-Iq+L3iTghhypbni8YRpTUV/ZdHsaUxWCQJ8FTEP3dkzptA5+SSgIr+CdCjUbcYmK
-OYveSiTIobOpK3eSGgeAZHDBrYIjGcs6IkIv4wKc09vD3LI3W9J5lfFcwFqkBMHP
-coxpefnsXSD8SMTnTwFZwxTgyzIAQy45v7GlGnwtsdpIggOU2GwXuxQI5kx/lBWR
-ZZ8TIkGg9toLZEEV25iaRfdKh63CBiVOWf2K1zfSM4lhjwOb9pMk31uBUhVa/nGG
-dfqBT/oHFLe9ijtxZgOiztiuqvvHBWqbCaeXa8kcj6evdYxxOXmQ6hFHrDvZM4x0
-Pd5FVmrHjoqVBbWZrSK2mxTGQMhk0CZzctUbhY+RpyqHkBaFOKkbhRXq7ITKWFEW
-+wroh0KiYyxQEWdqlLkkGqR+D4f+rTa9tU1hZivP6v1ziIFx9iqZ7XhZV0L6lR+9
-Br40ekOPTbGMPQUutJsHN7j3iH0V1NycPz8ekcDjMmFEXF4Ev5378eB0OQEC9j9c
-EJ28tqpTJgMR6A13u13fuUpxH7DRdOiVx7cd7fDLDxn5YcTRIMAY6UFk1V1tIt6L
-ljMeIZ4nDycfDH/eTvWFyyDZ4BFSWaWzLWBk7/y14cGK1ge6LsBxaPzO6Jdfl6q4
-TsvGIhgAc/lmsymq99CF
-=wh/G
+iKYEAREIAGYFAlVphSRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw1kNACg4FUkhWJ/Znr+4892A3JhD0Zv
+kC8AoKIJq8bbHDkjc22ewPp/OIW/SrKp
+=s4fl
 -----END PGP SIGNATURE-----
diff --git a/app-admin/ulogd/files/ulogd-2.0.5-remove-db-automagic.patch b/app-admin/ulogd/files/ulogd-2.0.5-remove-db-automagic.patch
new file mode 100644
index 000000000000..dfa51112e063
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd-2.0.5-remove-db-automagic.patch
@@ -0,0 +1,45 @@
+commit c61c05c2d050410c24346d42b013d7cb39149949
+Author: Harald Welte <laforge@gnumonks.org>
+Date:   Sun May 3 11:08:54 2015 +0200
+
+    configure.ac: Add --without-{mysql,pgsql}
+    
+    In some cases you may not want to build a certain output plugin, even
+    if the headers/libraries actually exist on the build host.
+
+diff --git a/configure.ac b/configure.ac
+index c814bec..1a7f8de 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -85,7 +85,10 @@ if [! test "x$enable_nfacct" = "xyes"]; then
+ 	enable_nfacct="no"
+ fi
+ 
+-CT_CHECK_POSTGRES_DB()
++AC_ARG_WITH([pgsql], AS_HELP_STRING([--without-pgsql], [Build without postgresql output plugin [default=test]]))
++AS_IF([test "x$with_pgsql" != "xno"], [
++	CT_CHECK_POSTGRES_DB()
++])
+ AM_CONDITIONAL(HAVE_PGSQL, test "x$PQLIBPATH" != "x")
+ if test "x$PQLIBPATH" != "x"; then
+ 	enable_pgsql="yes"
+@@ -93,7 +96,10 @@ else
+ 	enable_pgsql="no"
+ fi
+ 
+-CT_CHECK_MYSQL_DB()
++AC_ARG_WITH([mysql], AS_HELP_STRING([--without-mysql], [Build without mysql output plugin [default=test]]))
++AS_IF([test "x$with_mysql" != "xno"], [
++	CT_CHECK_MYSQL_DB()
++])
+ AM_CONDITIONAL(HAVE_MYSQL, test "x$MYSQL_LIB" != "x")
+ if test "x$MYSQL_LIB" != "x"; then
+ 	enable_mysql="yes"
+@@ -101,6 +107,7 @@ else
+ 	enable_mysql="no"
+ fi
+ 
++
+ AC_ARG_WITH([sqlite], AS_HELP_STRING([--without-sqlite], [Build without SQLITE3 output plugin [default=test]]))
+ AS_IF([test "x$with_sqlite" != "xno"], [
+     PKG_CHECK_MODULES([libsqlite3], [sqlite3], [], [:])
diff --git a/app-admin/ulogd/files/ulogd-2.logrotate b/app-admin/ulogd/files/ulogd-2.logrotate
deleted file mode 100644
index 787f49b6fcb0..000000000000
--- a/app-admin/ulogd/files/ulogd-2.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/ulogd/ulogd.log /var/log/ulogd/ulogd_syslogemu.log {
-    sharedscripts
-    missingok
-    notifempty
-    create 0640 ulogd
-    postrotate
-        /etc/init.d/ulogd reopen_logs > /dev/null
-    endscript
-}
diff --git a/app-admin/ulogd/files/ulogd-2-ng.init b/app-admin/ulogd/files/ulogd.init
index b1c5d616dc12..38b0fa9d76e8 100644
--- a/app-admin/ulogd/files/ulogd-2-ng.init
+++ b/app-admin/ulogd/files/ulogd.init
@@ -1,13 +1,13 @@
 #!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2-ng.init,v 1.2 2014/08/22 10:31:59 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd.init,v 1.1 2015/05/30 09:38:29 idella4 Exp $
 
-ULOGD_PIDFILE="/run/ulogd.pid"
-ULOGD_BINARY="/usr/sbin/ulogd"
-ULOGD_OPTS="--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}"
+extra_started_commands="reload reopen"
 
-extra_started_commands="reload reopen_logs"
+: ${ULOGD_BINARY:=/usr/sbin/ulogd}
+: ${ULOGD_PIDFILE:=/run/${SVCNAME}.pid}
+: ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}}
 
 depend() {
 	before iptables ip6tables ebtables firewall
@@ -34,7 +34,7 @@ reload() {
 	eend $?
 }
 
-reopen_logs() {
+reopen() {
 	ebegin "Reopening ${SVCNAME} logfiles"
 	start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
 	eend $?
diff --git a/app-admin/ulogd/files/ulogd.logrotate b/app-admin/ulogd/files/ulogd.logrotate
new file mode 100644
index 000000000000..777e40097a5e
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd.logrotate
@@ -0,0 +1,9 @@
+/var/log/ulogd/*.log {
+    sharedscripts
+    missingok
+    notifempty
+    create 0640 ulogd
+    postrotate
+        [ -f /run/ulogd.pid ] && /bin/kill -HUP $(cat /run/ulogd.pid)
+    endscript
+}
diff --git a/app-admin/ulogd/files/ulogd.service b/app-admin/ulogd/files/ulogd.service
new file mode 100644
index 000000000000..6cd49997617a
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=A userspace logging daemon for netfilter/iptables related logging
+Before=iptables.service ip6tables.service
+After=mysql.service postgresql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/ulogd --uid ulogd --pidfile /run/ulogd.pid
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=network.target
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
index ce6670bd908a..f36297741c42 100644
--- a/app-admin/ulogd/metadata.xml
+++ b/app-admin/ulogd/metadata.xml
@@ -14,5 +14,6 @@
 		<flag name='nflog'>Build NFLOG input plugin to support stateless packet-based logging via nfnetlink_queue.</flag>
 		<flag name='nfct'>Build NFCT input plugin to support stateful flow-based via nf_conntrack_netlink.</flag>
 		<flag name='nfacct'>Build NFACCT input plugin to support traffic accounting via nfnetlink_acct.</flag>
+		<flag name='ulog'>Build ULOG input plugin to support deprecated packet-based logging via ULOG target.</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-admin/ulogd/ulogd-2.0.3.ebuild b/app-admin/ulogd/ulogd-2.0.4-r1.ebuild
index 3a068aa80632..c9541a559f7a 100644
--- a/app-admin/ulogd/ulogd-2.0.3.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.4-r1.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.3.ebuild,v 1.6 2014/12/28 14:40:24 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.4-r1.ebuild,v 1.1 2015/05/30 09:38:29 idella4 Exp $
 
 EAPI="5"
 
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils linux-info readme.gentoo user
+inherit autotools-utils eutils linux-info readme.gentoo systemd user
 
 DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
 HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
-SRC_URI="http://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
+		http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="dbi doc mysql nfacct +nfct +nflog pcap postgres sqlite"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite"
 
 RDEPEND="net-firewall/iptables
 	>=net-libs/libnfnetlink-1.0.1
 	dbi? ( dev-db/libdbi )
+	json? ( dev-libs/jansson )
 	nfacct? (
 		>=net-libs/libmnl-1.0.3
 		>=net-libs/libnetfilter_acct-1.0.1
@@ -28,7 +30,7 @@ RDEPEND="net-firewall/iptables
 	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
 	mysql? ( virtual/mysql )
 	pcap? ( net-libs/libpcap )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:= )
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
@@ -38,6 +40,8 @@ DEPEND="${RDEPEND}
 		virtual/latex-base
 	)"
 
+PATCHES=( "${FILESDIR}/${P}-linux-headers-3.17-ipt_ulog.patch" )
+
 DOCS=( AUTHORS README TODO )
 DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work.
 Please edit example configuration located at /etc/ulogd.conf"
@@ -62,6 +66,11 @@ pkg_setup() {
 	if use nfacct && kernel_is lt 3 3 0; then
 		ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
 	fi
+
+	if ! use nfacct && ! use nfct && ! use nflog && kernel_is gt 3 17 0; then
+		ewarn "ULOG target was removed since 3.17.0 kernel release"
+		ewarn "Consider enabling NFACCT, NFCT or NFLOG support"
+	fi
 }
 
 src_prepare() {
@@ -78,6 +87,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		$(use_with dbi)
+		$(use_with json jansson)
 		$(use_enable nfacct)
 		$(use_enable nfct)
 		$(use_enable nflog)
@@ -92,7 +102,7 @@ src_configure() {
 src_compile() {
 	autotools-utils_src_compile
 
-	if use doc ; then
+	if use doc; then
 		# prevent access violations from generation of bitmap font files
 		export VARTEXFONTS="${T}"/fonts
 		emake -C doc
@@ -104,7 +114,7 @@ src_install() {
 	readme.gentoo_create_doc
 	prune_libtool_files --modules
 
-	if use doc ; then
+	if use doc; then
 		dohtml doc/${PN}.html
 		dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps
 	fi
@@ -119,10 +129,11 @@ src_install() {
 	fowners root:ulogd /etc/ulogd.conf
 	fperms 640 /etc/ulogd.conf
 
-	newinitd "${FILESDIR}/${PN}-2-ng.init" ${PN}
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-2.logrotate" ${PN}
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
 
 	diropts -o ulogd -g ulogd
 	keepdir /var/log/ulogd
diff --git a/app-admin/ulogd/ulogd-2.0.5.ebuild b/app-admin/ulogd/ulogd-2.0.5.ebuild
new file mode 100644
index 000000000000..15c179ff7b87
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.5.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.5.ebuild,v 1.1 2015/05/30 09:38:29 idella4 Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils eutils linux-info readme.gentoo systemd user
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
+SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
+		http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
+
+RDEPEND="
+	net-firewall/iptables
+	>=net-libs/libnfnetlink-1.0.1
+	dbi? ( dev-db/libdbi )
+	json? ( dev-libs/jansson )
+	nfacct? (
+		>=net-libs/libmnl-1.0.3
+		>=net-libs/libnetfilter_acct-1.0.1
+	)
+	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+	mysql? ( virtual/mysql )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" )
+
+DOCS=( AUTHORS README TODO )
+DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work.
+Please edit example configuration located at /etc/ulogd.conf"
+
+pkg_setup() {
+	enewgroup ulogd
+	enewuser ulogd -1 -1 /var/log/ulogd ulogd
+
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 14; then
+		die "ulogd2 requires kernel newer than 2.6.14"
+	fi
+
+	if kernel_is lt 2 6 18; then
+		ewarn "You are using kernel older than 2.6.18"
+		ewarn "Some ulogd2 features may be unavailable"
+	fi
+
+	if use nfacct && kernel_is lt 3 3 0; then
+		ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
+	fi
+
+	if use ulog && kernel_is gt 3 17 0; then
+		ewarn "ULOG target was removed since 3.17.0 kernel release"
+		ewarn "Consider enabling NFACCT, NFCT or NFLOG support"
+	fi
+}
+
+src_prepare() {
+	# - make all logs to be kept in a single dir /var/log/ulogd
+	# - place sockets in /run instead of /tmp
+	sed -i \
+		-e 's:var/log:var/log/ulogd:g' \
+		-e 's:tmp:run:g' \
+		ulogd.conf.in || die 'sed on ulogd.conf.in failed'
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with dbi)
+		$(use_with json jansson)
+		$(use_enable nfacct)
+		$(use_enable nfct)
+		$(use_enable nflog)
+		$(use_with mysql)
+		$(use_with pcap)
+		$(use_with postgres pgsql)
+		$(use_with sqlite)
+		$(use_enable ulog)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use doc; then
+		# prevent access violations from generation of bitmap font files
+		export VARTEXFONTS="${T}"/fonts
+		emake -C doc
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	readme.gentoo_create_doc
+	prune_libtool_files --modules
+
+	if use doc; then
+		dohtml doc/${PN}.html
+		dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps
+	fi
+
+	use sqlite && dodoc doc/sqlite3.table
+	use mysql && dodoc doc/mysql-*.sql
+	use postgres && dodoc doc/pgsql-*.sql
+	doman ${PN}.8
+
+	insinto /etc
+	doins ${PN}.conf
+	fowners root:ulogd /etc/ulogd.conf
+	fperms 640 /etc/ulogd.conf
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}