Merge remote-tracking branch 'remotes/Coacher/ulogd-bug-564396'

johu · Nov 3, 2015 · 008ccfd · 008ccfd
2 parents cc0cd07 + 0c147c1
commit 008ccfd
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 135 deletions.
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
@@ -1,2 +1 @@
-DIST ulogd-2.0.4.tar.bz2 452234 SHA256 56b30a13a8832e97178f39b7bb173a0b1dfe173dbb60d99a1a386c0962a2effd SHA512 08e88661fcfbcfd327b03b7a883dc239991f47d5a4e4561f3ada5f6acc8f2349f3bd38c1c67f28e42bbccf4cad63b2b7c3b732c23bf24b7c5f05320d27977773 WHIRLPOOL 94ee731cee8b95295d1c675bb3904be1a5b27a1e901d462f248116c865e79d52703b5330882110d7212bda1bb964fc0c97c3e704589071f47fab4475e1c91161
 DIST ulogd-2.0.5.tar.bz2 456258 SHA256 a221cb9f77347c0ca00d0937e27c1b90e3291a553cc62a4139b788e2e420e8c0 SHA512 bf00b8adaad7bd04077a83521b0d7accc26e644c8f3386819e7f91476178b6733f1c6554fb82dd0d3913398c83a61d65f61dc973f199f610bfaadc6251504819 WHIRLPOOL fe499ac7b4070581439a05f4f2245f7a42fe5630da5dc32b9b069511ed1faa15fe482eee08d50477d3fb1d0bf0d3855a69fc82fb0f3e8eecdf082fb642519f91
diff --git a/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch b/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch
diff --git a/app-admin/ulogd/files/ulogd.init → app-admin/ulogd/files/ulogd.init-r2 b/app-admin/ulogd/files/ulogd.init → app-admin/ulogd/files/ulogd.init-r2
@@ -7,17 +7,18 @@ 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 firewall
+	before iptables ip6tables ebtables nftables firewall
 	after mysql postgresql
 }
 
 start() {
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --start \
-		--exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} \
+		--exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} --wait ${ULOGD_WAIT} \
 		-- ${ULOGD_OPTS}
 	eend $?
 }

diff --git a/app-admin/ulogd/files/ulogd.service b/app-admin/ulogd/files/ulogd.service
diff --git a/app-admin/ulogd/ulogd-2.0.4-r1.ebuild → app-admin/ulogd/ulogd-2.0.5-r3.ebuild b/app-admin/ulogd/ulogd-2.0.4-r1.ebuild → app-admin/ulogd/ulogd-2.0.5-r3.ebuild
@@ -2,11 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils linux-info readme.gentoo systemd user
+
+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"
@@ -15,10 +16,11 @@ SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
 
-RDEPEND="net-firewall/iptables
+RDEPEND="
+	|| ( net-firewall/iptables net-firewall/nftables )
 	>=net-libs/libnfnetlink-1.0.1
 	dbi? ( dev-db/libdbi )
 	json? ( dev-libs/jansson )
@@ -31,20 +33,23 @@ RDEPEND="net-firewall/iptables
 	mysql? ( virtual/mysql )
 	pcap? ( net-libs/libpcap )
 	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )"
-
+	sqlite? ( dev-db/sqlite:3 )
+"
 DEPEND="${RDEPEND}
 	doc? (
 		app-text/linuxdoc-tools
 		app-text/texlive-core
 		virtual/latex-base
-	)"
+	)
+"
 
-PATCHES=( "${FILESDIR}/${P}-linux-headers-3.17-ipt_ulog.patch" )
+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"
+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
@@ -53,21 +58,19 @@ pkg_setup() {
 	linux-info_pkg_setup
 
 	if kernel_is lt 2 6 14; then
-		die "ulogd2 requires kernel newer than 2.6.14"
+		die "ulogd 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
+		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 nfacct && ! use nfct && ! use nflog && kernel_is gt 3 17 0; then
+	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
@@ -81,6 +84,7 @@ src_prepare() {
 		-e 's:tmp:run:g' \
 		ulogd.conf.in || die 'sed on ulogd.conf.in failed'
 
+	append-lfs-flags
 	autotools-utils_src_prepare
 }
 
@@ -95,6 +99,7 @@ src_configure() {
 		$(use_with pcap)
 		$(use_with postgres pgsql)
 		$(use_with sqlite)
+		$(use_enable ulog)
 	)
 	autotools-utils_src_configure
 }
@@ -103,7 +108,7 @@ src_compile() {
 	autotools-utils_src_compile
 
 	if use doc; then
-		# prevent access violations from generation of bitmap font files
+		# Prevent access violations from bitmap font files generation
 		export VARTEXFONTS="${T}"/fonts
 		emake -C doc
 	fi
@@ -129,8 +134,8 @@ src_install() {
 	fowners root:ulogd /etc/ulogd.conf
 	fperms 640 /etc/ulogd.conf
 
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/${PN}.init-r2" ${PN}
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${PN}.logrotate" ${PN}