commit: 5180c7569d058ba8265c2eacaee2d097111fcd38
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Fri Oct 30 13:54:53 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 16:26:20 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5180c756
app-admin/ulogd: add 200 ms delay on daemon start
Gentoo-Bug: 564396
app-admin/ulogd/files/ulogd.init-r2 | 42 ++++++++++
app-admin/ulogd/ulogd-2.0.5-r3.ebuild | 145 ++++++++++++++++++++++++++++++++++
2 files changed, 187 insertions(+)
diff --git a/app-admin/ulogd/files/ulogd.init-r2
b/app-admin/ulogd/files/ulogd.init-r2
new file mode 100644
index 0000000..c994507
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd.init-r2
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_started_commands="reload reopen"
+
+: ${ULOGD_BINARY:=/usr/sbin/ulogd}
+: ${ULOGD_PIDFILE:=/run/${SVCNAME}.pid}
+: ${ULOGD_WAIT:=200}
+: ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}}
+
+depend() {
+ before iptables ip6tables ebtables nftables firewall
+ after mysql postgresql
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start \
+ --exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} --wait
${ULOGD_WAIT} \
+ -- ${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() {
+ ebegin "Reopening ${SVCNAME} logfiles"
+ start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
+ eend $?
+}
diff --git a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
new file mode 100644
index 0000000..71cf91e
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils eutils flag-o-matic 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-firewall/nftables )
+ >=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 "ulogd 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 ulogd 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'
+
+ append-lfs-flags
+ 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 bitmap font files generation
+ 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-r2" ${PN}
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ diropts -o ulogd -g ulogd
+ keepdir /var/log/ulogd
+}
