Version bump. Thanks to Coacher <itumaykin@gmail.com>. Bug #493202

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 199 insertions, 24 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 937cc76718ef..c2b780792e45 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.81 2013/04/25 13:55:06 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.82 2013/12/17 21:38:07 hwoarang Exp $
+
+*ulogd-2.0.3 (17 Dec 2013)
+
+  17 Dec 2013; Markos Chandras <hwoarang@gentoo.org> +files/ulogd-2-ng.init,
+  +ulogd-2.0.3.ebuild, files/ulogd-2.logrotate:
+  Version bump. Thanks to Coacher <itumaykin@gmail.com>. Bug #493202
 
   25 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> -files/ulogd-0.98,
   -ulogd-1.23-r1.ebuild,
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 711169c188ac..c8229f50f090 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,21 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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 75ef1c4e75ef1ef2af7fdd108e89efa7280c800959c24001102147261f7375d8 SHA512 feead73345fa85029f9db2be988bdbd8f284900ab5d5f0dd5c219df3c2300c57ac1690cf102467a6371c8ab751c488c665ed8657b99db940954f73ffae22bfab WHIRLPOOL 4c048f8fb6c1454b47b80b3b8b4ed53d2917572e5e9e1c4cc59dfb23035ad337b4abf7a7aadceea47de84095dcc28f9439a5e5276d4788fa1b6ef7dc76de4f79
-AUX ulogd-2.logrotate 367 SHA256 c87f4265a35900b61108820a8841bdc24b3849e2dd36f35c2999495e2279ee67 SHA512 19856428420bfac4d94bc85908cf4a29c0dd6502ff43d212fdeabea59e9d7867bc3229c4895929fa0a423947b82e29e8234bc052dda5bf34e4566c520cec2675 WHIRLPOOL 05bf6fae2e42475f558d57d627b58ec2ab1319b453d92784ca699eab0d8db35cc6be151571614bdeaef8be4962b048a47ee704b5b99655566c4fed27d26dcc91
+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
 EBUILD ulogd-2.0.2.ebuild 3174 SHA256 513816c8090c3a894023dc5c8dafd04800b98478c400ec3616761147c1174632 SHA512 759b32215872ecd680c8a1b25ea130b2e902180a190b7ca120cae63e8d527db4e4c9665f4b2e65ae24791effc6afd14e752bb68eab56ff6b987747bdc94ab7ca WHIRLPOOL 28eb628bb0cfce91b290dbfce835131fa571a92c3f85e64c58029d4e4a2f66d935d78bbb1d6d2674258c3a7e92d6943cc28207a8aa070d28d2f1e9d3ecc4edf6
-MISC ChangeLog 13495 SHA256 22df75b4eb7c640bde61d554d80a87a0f5debf6e9b35b6628dd7820f8df56c19 SHA512 2526833a6dbf7ba6882f8a19364c3bb4b8aeabb68bbbdaf0dc227d2ede4c5807c316cead409432ecf86233a8ecfac29ef9be4ab1fa0887583da218133f2c0d1a WHIRLPOOL 02b93f3c4461d80933affaa78622f6337b89be44f795467c0848252d53ccb072ae5f066491648b292845a8cdf0083ec7db92c55cf64e7956e0eaacc04a2a6c2b
+EBUILD ulogd-2.0.3.ebuild 3076 SHA256 278b92b6d7d0d46b593b64b7788aec1b7cad7a0f5858c06bd90414d1c7579418 SHA512 5529c1a640bc1bda56e452a227611c16b229e344f58ab6a167767692202d6208a922f1cec3ab9737975953f11b5a1f6f002d771d61f9924f36c135b290c27c53 WHIRLPOOL 0d5af0e60173e781860ea2c54d13695543744524bb679971bf5257087e93961506339bad60d8f0aa623cf486da4d470492779c16bc802b93e840b64a33538c4e
+MISC ChangeLog 13718 SHA256 9e65db65fc55ebc6162557b034ab627b85f49808ce695dcbca0b9fc24f0b7e3a SHA512 4bf5e4e9d181e2d0f785e8f103890c68278aa1768e780cf0cc656287289d6dfd4307d2ab3b1b10420355cfaa79efcd95ce2ad46f5c62930ec858a0691c61599d WHIRLPOOL bbc9e514aaf29ef64e96b3eb475cb92dba99d475b8a7a8339feb0415b5a3c189aa9e2779a0e0438b5e5738de79114e52476b7442184fe5055628f365fbce3908
 MISC metadata.xml 956 SHA256 469b00574493871ad713d12f111c020f43572a57d0262d1877cd4d4c8fee4c05 SHA512 77fb7e819d67cc1ebd17aa9e55058cff72c4e57faf3b341e0a0014caabbaf5b1b191c44b6256fd353aafbede644953b73613d749f4c699a750108fd238395b18 WHIRLPOOL 215ff35462ee55ac3d2a541fbd4e0c0d59bd341f264f62de84218fbc420098b63ae249516d9b176722895a4ed8bd846157616da71b7ad6d3a36bedb9fe684b30
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJReTW7AAoJECo/aRed9267o/8H/2I2YY3oCBQ7gmxCOXPuVocs
-2xmckUv4eBVXXo3Z5xxr3F2JJFOvmh7WNNZC5EqE5GrJa21Nam4L1mEMCqsg8zip
-kbSusqSinnXKZFy1nvbvugGyTxAIiCqx8zTDy6mDIVO5eZWwHl9OVr3IPUqXztEO
-JMtUapFjzie+8nHnlfCCbt1AyU1I6hNGfSVDYGSojQXX+z1bPAbpQyKpLaKhDB6c
-8HMFQfQQmoob3IPy8t1fu2GW9pb9yP+yEETK5NWgHp3SRlh5xlIWfwVduWmaAzP3
-f5cJgQSkQC7hiX3iNyk4a8tRMbWseHr2D6CwE0fLPMWXnBs4MMtbY2njeINBCqQ=
-=OYd4
+iQJ8BAEBCABmBQJSsMQvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88TWwQAJU/TQsqC+nTS+BQmndr1wwh
+IG7GHzrJhAIUo3r+Rt6erSTSpSV7j9kH/zGp3gb0gBgvecaYrarOZE2h+js8LYxW
+C9b65wOql3DgRl404TEv3AELSrXGerTLPMjMbnLyZAo25hNovEYfXAyMm9lUnGtk
+ZIMnKUfmMr9+kn95vcKZQy+E/rSdl77bukuUsQik8w4ROdsMexxgigsYublxmhjL
+1HcRkXL31FE5x/dSa0uhwQe2hd7LY6Lto48WDkKr2UuEfcFxufw/ToTcEGAwudwN
+Tnva/IcqgkClPZBltTagXsIqlozVHnjr7NN4asHXCKdK3nQOjA6DREbH6d4LliFt
+f7NpxxyHMniC/szXx21jg8wnXhABPC6fPe4FkMc+ygM9nSvWs2v3WRAiEaBNv3PR
+Doss0kfv9bmWwh3g/84wes3Z+8E/KrtpMFUjDmu/sCOjPg6bhhGCxtF3PuxxQCd/
+sePaHirbhn3W5MP4j/cl6KpvhniTXhA9SiLGJHTg6E7giaembHE9c4E6wI5E2txH
+3wgR5pd64shaWaW+xgAOGpQfsjdgk+edr/ilacaiK3Hll2SBIP3M5vR/Osb+vDD/
+vdnrg+E00EJXB4aQXegJcFcfOGcmWv30e1evSxShfrJI5SAvvRvnJu2fZ1noXFOm
+f9FEMR3AyFxbNeSUfpGr
+=lzis
 -----END PGP SIGNATURE-----
diff --git a/app-admin/ulogd/files/ulogd-2-ng.init b/app-admin/ulogd/files/ulogd-2-ng.init
new file mode 100644
index 000000000000..a818ce2ab0e1
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd-2-ng.init
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2013 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.1 2013/12/17 21:38:07 hwoarang Exp $
+
+ULOGD_PIDFILE="/run/ulogd.pid"
+ULOGD_EXEC="/usr/sbin/ulogd"
+ULOGD_OPTS="--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}"
+
+extra_started_commands="reload reopen_logs"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --quiet \
+		--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/files/ulogd-2.logrotate b/app-admin/ulogd/files/ulogd-2.logrotate
index c57583c76ffa..787f49b6fcb0 100644
--- a/app-admin/ulogd/files/ulogd-2.logrotate
+++ b/app-admin/ulogd/files/ulogd-2.logrotate
@@ -1,18 +1,7 @@
-/var/log/ulogd/ulogd.log {
-    notifempty
+/var/log/ulogd/ulogd.log /var/log/ulogd/ulogd_syslogemu.log {
+    sharedscripts
     missingok
-    size 1M
-    create 0640 ulogd
-    postrotate
-        /etc/init.d/ulogd reopen_logs > /dev/null
-    endscript
-}
-
-/var/log/ulogd/ulogd_syslogemu.log {
-    rotate 12
-    size 5M
     notifempty
-    missingok
     create 0640 ulogd
     postrotate
         /etc/init.d/ulogd reopen_logs > /dev/null
diff --git a/app-admin/ulogd/ulogd-2.0.3.ebuild b/app-admin/ulogd/ulogd-2.0.3.ebuild
new file mode 100644
index 000000000000..6b1074457a26
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 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.1 2013/12/17 21:38:07 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
+	dbi? ( dev-db/libdbi )
+	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-base )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		virtual/latex-base
+	)"
+
+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
+		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-ng.init" ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}