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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

4 files changed, 178 insertions, 14 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/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
+}