Restore stable version

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

5 files changed, 260 insertions, 16 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index b6a7143bbde6..1bd7f0d9f3b9 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.84 2014/04/26 11:34:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.85 2014/04/27 09:57:27 hwoarang Exp $
+
+*ulogd-2.0.2 (27 Apr 2014)
+
+  27 Apr 2014; Markos Chandras <hwoarang@gentoo.org>
+  +files/ulogd-2.0.2-automagic.patch, +files/ulogd-2.init, +ulogd-2.0.2.ebuild:
+  Restore stable version
 
   26 Apr 2014; Markos Chandras <hwoarang@gentoo.org>
   -files/ulogd-2.0.2-automagic.patch, -files/ulogd-2.init, -ulogd-2.0.2.ebuild,
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index fbc4a24e7368..79140d86e323 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -2,29 +2,33 @@
 Hash: SHA256
 
 AUX ulogd-2-ng.init 922 SHA256 1dd1fc93a622856a4e576c58bfe7291730a9dbcfa8d4f7f94b19e4cdab02299e SHA512 f91a6f07d18d31c5fa4a84847e508045bc8da7fa8e5e5254d5f078ee840466c0713aadb4189405af4754949d4ebf2e72ecedfa5820cc11b60a705ca7d62f4f7a WHIRLPOOL e4e927783d9da4c3e6f652c2d4ebc26b84c060e107addf2da4d9a8e2eeeb98da8143f025ea7bdd9e831a1df417d47d8e2eb57c7db855f60428dc4d0c0595c1ee
+AUX ulogd-2.0.2-automagic.patch 1879 SHA256 57045fdf9475be4b60a87dc19545515275e1eddfd07aab7b57e92c141232d457 SHA512 a31ab086b82ff88232e984760cf16553cb9c7ef170039da37ea5cdf347eee1fb3a21088e19033499e5940ae0556e7a59e7298749be9fef02dc6b5b30bce318e3 WHIRLPOOL aba1862ac7344111f6aa42910328018e198c19d3e20c6735b19667ac154307ae569dd92511f5888df3eccfe582939c64f5be9f09906405744aae6c226c8db70a
+AUX ulogd-2.init 947 SHA256 b988174c0ad590ed7b9a195e9fb04a85adb86e31dd900b4aa624f98db03cc8ef SHA512 ed7fef40ea92cb6c92ffa7859687b47df8f2fa70adcf9f3b2afd3cc78ffe01b3c4313723ade168d45068edf57730d4830a7b8715ffa1e2b6219555adf6c9993f WHIRLPOOL 4a20ad03168e8c1ccbc04316e03f47d39b19b485e584d34cc1abca3cb731f44df2e5775514ab9229a40b440590dfcdc9eabea6326cef5178e382680661044a09
 AUX ulogd-2.logrotate 212 SHA256 df0f73b4dd4b0c1f6afaf3efc98c99b972e068bcbf8ea768f6522cbebd339669 SHA512 1c29316f42903a8893a110e74c171f2b8b4c9bb2d63221b65e601f077549c7447941ce6257259b4f1042076c1e4b5bfba0bf7c85289519aab6edb27edf6ffc95 WHIRLPOOL 8f2290e7de1e8958c1fc5cf1f075170a691304d1ddbf53a2f14b989925d5da6996ab409442ee9a92852a711f56a2bfe05bd97a55ab2d6be3fd1cca346cd0dd93
+DIST ulogd-2.0.2.tar.bz2 466664 SHA256 a36c4032d83edaef1b13f96b6647e9e150d7f20b5af7035f0a91c17fe2e066c5 SHA512 a7ac243ec67ab4325855df631bae011284c716495e5e2d26c1f392207448b6b793117124c89b66e7745a05b74cdddb5ed7acb44c34c24618cc27948a25e978df WHIRLPOOL 8113b5e35fe236fbcba8239daf13f435949aa7798f23794e1fc138cd6decc4119da3b06fdda1e3ad6f4c45f0521c44f0e1a50a7bef19644263df1972fedb00d8
 DIST ulogd-2.0.3.tar.bz2 447550 SHA256 1ec965073e7f4e5605b2bd1c143b2094e495ad24a298e6fc8f6fcbd131234376 SHA512 09d61cca6cd1c8137b3a4e5ce101f54e48f30c98761602a97766554bc4130eda632b8541f5c1e3e2ac686ec718bb4d440d3bea57c811317cabb274917c996140 WHIRLPOOL f79f0300e610ee9de82aee478dec1c28ffbe10c7b4348ddc586229ac53226f238371f1e71d0b33095904d373c26359b848e18069d8da3d7e22a4819568c1ee44
 DIST ulogd-2.0.4.tar.bz2 452234 SHA256 56b30a13a8832e97178f39b7bb173a0b1dfe173dbb60d99a1a386c0962a2effd SHA512 08e88661fcfbcfd327b03b7a883dc239991f47d5a4e4561f3ada5f6acc8f2349f3bd38c1c67f28e42bbccf4cad63b2b7c3b732c23bf24b7c5f05320d27977773 WHIRLPOOL 94ee731cee8b95295d1c675bb3904be1a5b27a1e901d462f248116c865e79d52703b5330882110d7212bda1bb964fc0c97c3e704589071f47fab4475e1c91161
+EBUILD ulogd-2.0.2.ebuild 3179 SHA256 37420f11b149eeccba025acd698affafc1fdec3a25a196e095368357df5087a6 SHA512 5ac08f7cb92388199d09599b8da5da5fddba452645e7b233e6adc13a4b5dd8d9f34abeb3a91713cc969c140b614b604b0a78bafa56ce3130fec3238f613fa9b5 WHIRLPOOL 456dbb76782ad5841feca9ca1aeb890091b83fe15b901c7787d97629d99417551b98877d50011e7d1f85a305697fa44b21350dfda42377c70827ffdea16e4701
 EBUILD ulogd-2.0.3.ebuild 3076 SHA256 278b92b6d7d0d46b593b64b7788aec1b7cad7a0f5858c06bd90414d1c7579418 SHA512 5529c1a640bc1bda56e452a227611c16b229e344f58ab6a167767692202d6208a922f1cec3ab9737975953f11b5a1f6f002d771d61f9924f36c135b290c27c53 WHIRLPOOL 0d5af0e60173e781860ea2c54d13695543744524bb679971bf5257087e93961506339bad60d8f0aa623cf486da4d470492779c16bc802b93e840b64a33538c4e
 EBUILD ulogd-2.0.4.ebuild 3147 SHA256 d0b578eaf6158249bd728cb50e7bfef7e12e13345ed09730d4867c1ca64b7c21 SHA512 c2f84d6fc451ad117f3323586b27e3d86e5cf5a33e85d19116f277bf02a3f18a45ba734b0ff433f0fa969b20505933a9afcc226504aeed85084719967e785143 WHIRLPOOL e0b3322565957dfbab48294a9d0b93c7c355a2603ffcaf4d7fa92774630f56cdc90c27aefbd60588ea397ecede2ced7427ea68efcf09be467534f42c7605497e
-MISC ChangeLog 14102 SHA256 a907ee86949a137bda7bb8a09dbb5763042db791a55ceba86fa0fd89bba12dd8 SHA512 39be9c99e408326469855b7584d9351030210b0ed2009a9e08ef4a53c423d0215e31b35f34069686fcaa39d1da9d3d630199f4032b7e6d983e0b1b18d3b299dc WHIRLPOOL ad4f3b52a5131325073492903404506416e2b01e2b2e7868f319b877c862fa234aa22e4a90b255d2c98c58ae20b07c4eb5ac8802494d7309d84f44779faffd33
+MISC ChangeLog 14289 SHA256 142fbf55ea7aa5021b7b88f94a9d313e296d3da8035456ab8ac744f29a84775a SHA512 0511a975756f21bc814fd4e601c4eec8588e21acd591dc49876a607969f62ddb13130a8656f638ef5b3ffb8e04a4c390c32c287ee497e097fcad9fb12f32c4ff WHIRLPOOL 29dc1ab2ff7ec6a22cc7ead1a27b0b0646274eb89579711affe260607da66d070d0ed458582e0a2dc8c2c2d5dbd19c5c4a5ccf4d3bc3a746981870c203b3c298
 MISC metadata.xml 1045 SHA256 8fca8605bebf933527d992e67d15b73a73ffb10ceaa23369b9243f9aca546a94 SHA512 95b9494ea6fa7771e53b2300e7bb3c795f0869e2aea0f8c56e307836cb152082c584daa935eb99416e1cacec4e22a370812da7dca7689d408b232c58eb4cd514 WHIRLPOOL 895778a343a2f24edf5083236e8489570e739ce3023491c8b6f483a14c3343931e340fec227fb5f0250c902692dcc8841d4bd976d13490d361e4599424658693
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTW5lWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTXNQyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88Bf0QAIJg5S4KDwauxcCR8mb81Kfs
-5B1VC0cZhSMdzdQp2Ib72+AqK67YWSyP4+DJ1OXF/WreesuouMFaVHAzPjmCcxu2
-6meMmh/VBFK0m5/iqJ2gyqSbFh/Xr0BIrOtgrWlEkO1s4OA9p8NP9WonZlMkJz0c
-Ij4yrW5qhxfxO1VzVyna84OpwWFe6fBjUJUMeVoofHc438HwRRWAxipZ5xwMDRVQ
-vDgI2JQ46CMDaw3DsFo0NhhMT0HUDWQBhotnHDYI/LPuYyn/i5E6fBs/g+xRCWr0
-yUrNAy+5bS/uup4YwXWcfBBaxHEVG9kj3ANYdd8FwAhBD6O9bzJXiWCcZ3UrPS+i
-3YE/eaoh0N3DHGyOIYMFvOmnuITxDMRIjzOPuvoxQzEwRkux+Ak3ro+AudgMWzMm
-eHHV4PuteTwDB+SvP4PnZg5BtD4Iwvsv6PuqUOFQhGPY67FBDLBeH6x+QG1vWvUZ
-zLFvPSzraG3ToyoWZEeYQwUuBi7jMxxKcvCuYbV4Vdduwp8j39hpOmmM52zDwzyy
-bpzs9H09Dl2+zim2HhFyQrYzS50SGFxSu1gHVQylpZTpeV081yciqtQgknGS/q5q
-rRStQUZla2yyyKPGvZ6KKCIYG0iqPXx3zDrEmT5GSFRKGvJWxpTdGXKHblaiIqeE
-rXFAbdnWLo9i6xzdnykx
-=Wvk6
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88DOoP/AhWWvswCa8vjFBPeNplzA8T
+VFABMJR+zx+LjGQv1PvNZMQKM+d848A2BGQ6MArzta+WoY6LPJWEEV4y0fNx117R
+QOPyLgQRuvSNoNBnQ9cccHTWmJ6W3TUFolg8kHQtmCYJ3iCsCCLEeM3si9qbSW4J
+GyQry/ygOYjjciGsNCvcq7zRhQ6//GsQjX0dHnSm10U5ScEEr4dx/witSFBc2Axb
+I36U8TgeyjLXM8/iamIZFtnVGbxF/U/rY0aM3uYXkTAhPgqpKqyZz8w5/k573jUL
+Vi9SChI/v1TVuVGk723NKxgqc00ejYt6nwBVWlsVd9E6yY/7/4sgIM1dSESr91bz
+YJiuoHN648LNOOP8/IM8Edc9C02cuumKli7+x48bz8LythsOgLG8TWn2f2MPaC5f
+w86voyZdSf5Oc2GIbJtSGEbhUlQOynicE8dG4mReA/CCnWUwqbe0ImgCIFE8ZvJT
+MuMP2eyYvy2q0HoNYqCeCo6nmg6wsDo3zqDMABN0MQFAS0lAgRFc/FYOQPD3Pnt2
+jB5byoq7I290u86Z3bi5VrlPr75OZQVo43GFU6OQTFRTrzhVpE6fb9+wastLQYa1
+y4mv59mt7ayMkip/Hm4zO1FOQnagBou8t1wldAA++tVQAUA3RoK3bpfIlmH1tOmE
+N7KU08kKnkLgdJ/8lkDP
+=xjoe
 -----END PGP SIGNATURE-----
diff --git a/app-admin/ulogd/files/ulogd-2.0.2-automagic.patch b/app-admin/ulogd/files/ulogd-2.0.2-automagic.patch
new file mode 100644
index 000000000000..b3d269b9d7c3
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd-2.0.2-automagic.patch
@@ -0,0 +1,60 @@
+--- configure.ac.orig	2013-03-01 19:45:23.285968838 +0400
++++ configure.ac	2013-03-15 03:38:50.587620528 +0400
+@@ -20,14 +20,6 @@ AC_PROG_LIBTOOL
+ dnl Checks for libraries.
+ AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""])
+ AC_SUBST([libdl_LIBS])
+-AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
+-AC_SUBST([libpcap_LIBS])
+-AM_CONDITIONAL([HAVE_PCAP], [test -n "$libpcap_LIBS"])
+-if test "x$libpcap_LIBS" != "x"; then
+-	enable_pcap="yes"
+-else
+-	enable_pcap="no"
+-fi
+ 
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+@@ -88,7 +80,10 @@ else
+ 	enable_mysql="no"
+ fi
+ 
+-PKG_CHECK_MODULES([libsqlite3], [sqlite3], [], [:])
++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], [], [:])
++])
+ AM_CONDITIONAL([HAVE_SQLITE3], [test -n "$libsqlite3_LIBS"])
+ if test "x$libsqlite3_LIBS" != "x"; then
+ 	enable_sqlite3="yes"
+@@ -96,7 +91,10 @@ else
+ 	enable_sqlite3="no"
+ fi
+ 
+-CT_CHECK_DBI()
++AC_ARG_WITH([dbi], AS_HELP_STRING([--without-dbi], [Build without DBI output plugin (default: test)]))
++AS_IF([test "x$with_dbi" != "xno"], [
++    CT_CHECK_DBI()
++])
+ AM_CONDITIONAL(HAVE_DBI, test "x$DBI_LIB" != "x")
+ if test "x$DBI_LIB" != "x"; then
+ 	enable_dbi="yes"
+@@ -104,6 +102,18 @@ else
+ 	enable_dbi="no"
+ fi
+ 
++AC_ARG_WITH([pcap], AS_HELP_STRING([--without-pcap], [Build without PCAP output plugin (default: test)]))
++AS_IF([test "x$with_pcap" != "xno"], [
++    AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
++    AC_SUBST([libpcap_LIBS])
++])
++AM_CONDITIONAL([HAVE_PCAP], [test -n "$libpcap_LIBS"])
++if test "x$libpcap_LIBS" != "x"; then
++	enable_pcap="yes"
++else
++	enable_pcap="no"
++fi
++
+ dnl AC_SUBST(DATABASE_DIR)
+ dnl AC_SUBST(DATABASE_LIB)
+ dnl AC_SUBST(DATABASE_LIB_DIR)
diff --git a/app-admin/ulogd/files/ulogd-2.init b/app-admin/ulogd/files/ulogd-2.init
new file mode 100644
index 000000000000..68718f3b0e85
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd-2.init
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2.init,v 1.3 2014/04/27 09:57:27 hwoarang Exp $
+
+ULOGD_PIDFILE="/run/ulogd.pid"
+ULOGD_EXEC="/usr/sbin/ulogd"
+ULOGD_OPTS="-u ulogd"
+
+extra_started_commands="reload reopen_logs"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --quiet \
+		--make-pidfile \
+		--pidfile ${ULOGD_PIDFILE} \
+		--background \
+		--exec ${ULOGD_EXEC} \
+		-- ${ULOGD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME} configuration"
+	start-stop-daemon --signal USR1 --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
+
+reopen_logs() {
+	ebegin "Reopening ${SVCNAME} logfiles"
+	start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
diff --git a/app-admin/ulogd/ulogd-2.0.2.ebuild b/app-admin/ulogd/ulogd-2.0.2.ebuild
new file mode 100644
index 000000000000..7d19be0f7b67
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.2.ebuild,v 1.9 2014/04/27 09:57:27 hwoarang Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils eutils linux-info readme.gentoo 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86"
+IUSE="dbi doc mysql nfacct +nfct +nflog pcap postgres sqlite"
+
+RDEPEND="net-firewall/iptables
+	>=net-libs/libnfnetlink-1.0.1
+	>=net-libs/libmnl-1.0.3
+	dbi? ( dev-db/libdbi )
+	nfacct? ( >=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-base )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		virtual/latex-base
+	)"
+
+DOCS=( AUTHORS README TODO )
+PATCHES=(
+	# fix automagic support of dbi, pcap and sqlite3 output plugins
+	"${FILESDIR}/${P}-automagic.patch"
+)
+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
+		ewarn "You are using kernel older than 2.6.18"
+		ewarn "Some ulogd2 features may be unavailable"
+		ewarn
+	fi
+
+	if use nfacct && kernel_is lt 3 3 0; then
+		ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
+	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_enable nfacct)
+		$(use_enable nfct)
+		$(use_enable nflog)
+		$(use_with mysql)
+		$(use_with pcap)
+		$(use_with postgres pgsql)
+		$(use_with sqlite)
+	)
+	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}-2.init" ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}