improve init script, fix *DEPEND

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.24-gentoo-r5-1 i686
RepoMan-Options: --force

6 files changed, 188 insertions, 4 deletions

diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog
index 8e10090e1d93..74f1cd494cbf 100644
--- a/net-firewall/conntrack-tools/ChangeLog
+++ b/net-firewall/conntrack-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/conntrack-tools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.20 2008/11/01 15:38:32 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.21 2008/11/20 12:06:32 wschlich Exp $
+
+*conntrack-tools-0.9.8-r1 (17 Nov 2008)
+
+  17 Nov 2008; Wolfram Schlich <wschlich@gentoo.org>
+  +files/conntrackd.confd-r1, +files/conntrackd.initd-r1, metadata.xml,
+  +conntrack-tools-0.9.8-r1.ebuild:
+  improve init script, fix *DEPEND
 
   01 Nov 2008; Cédric Krier <cedk@gentoo.org>
   conntrack-tools-0.9.6-r1.ebuild, conntrack-tools-0.9.7-r2.ebuild,
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index 00d21b649595..f08ef40816de 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,12 +1,15 @@
 AUX conntrack-tools-0.9.7-int_max.patch 487 RMD160 50520ca93b666047bcccd9ae8ca469f523f8b064 SHA1 5847cf04206f27098f1fc30c777cfdd3f81de198 SHA256 ac13cc57dca7891c72a51af825bdc65f6f2d4bd90052357fe4495c4ae1c86f99
 AUX conntrack-tools-0.9.7-path_max.patch 380 RMD160 eb3b471a7aa9b5af6cb6c396ebd3ae7a5bcbf665 SHA1 7bc9dde2467205e96381bdbd3dd017fa5b499025 SHA256 876515e3f5b83d1f782f0921f8e24deba349cd447b5e314c7b98a8a240b378d0
 AUX conntrackd.confd 52 RMD160 47916dc2eb970b2eec7c5c1bc9d2e733c8308b30 SHA1 2c816f7e8a5eae3dab9a08d97587803206054916 SHA256 81890c5d01142dad0f16ffd3d29019058063d77bb0233a7ed412f84519078421
+AUX conntrackd.confd-r1 498 RMD160 bf3f8cb47793be3021beaa470c1af86777c321ee SHA1 72a737edb54f073aab93eaf4fce87fd944f47981 SHA256 6171121881f824bccc2709d6e74e2d5955391fbb9c591afcca741a3239fd3ed7
 AUX conntrackd.initd 728 RMD160 02179d3615234779aa370759926c0d3eb9764a68 SHA1 495d0c1416f015c1caa464e6d9900a271062ee63 SHA256 314a10e560dc7af439df7710668c8a3b13e719c0b7fb8c90c7a5090f1289a415
+AUX conntrackd.initd-r1 2897 RMD160 546341a39f97edcd834c1d94c54c6aecbbafba63 SHA1 f67e6729c257187c020ecbc3eae5cc59be57cab4 SHA256 34a88a0e9291d4473f72b246e12ebe00121dff9b06c6b54c1da5f06045a2fc09
 DIST conntrack-tools-0.9.6.tar.bz2 364694 RMD160 9cc9b0354dceffc1496b93b1946c3fe956aded6b SHA1 7580e5a233be54480547bef9ae76f25282ee03ee SHA256 be75ecf9b6ca9f3562552332e623e2bbfb8a2210e81df0f49ad320353c4b7bf7
 DIST conntrack-tools-0.9.7.tar.bz2 370540 RMD160 1ec78505d91a0f9671cc66f1c47909e3c49f1954 SHA1 1c6aebe151f3ca4afdce4c340625cddb9d285a05 SHA256 d7a24b950b6108196d78f9cec56873bfc2cf2169f882d287130017063a8c5398
 DIST conntrack-tools-0.9.8.tar.bz2 385389 RMD160 b31f25bea1cb92b82da7ac796ecaf78a3e454e91 SHA1 006e35ccab904c4670f55ee43b019e650ba93580 SHA256 3518c466daf756e684654eae4028baa961d2738af65f3659ee928ed316e4abad
 EBUILD conntrack-tools-0.9.6-r1.ebuild 1611 RMD160 c6fde9dc35163fd5c175f152daebd6d36986eb6e SHA1 f92f2983e149a5c604049fd192b8d036a540eeff SHA256 4456b51b286a7a07eeb99399da9f8f4703aa98906486f876da04561c2719e313
 EBUILD conntrack-tools-0.9.7-r2.ebuild 1607 RMD160 18afa88d1f3a53673a0d2272ca055133c8365dd4 SHA1 55feff3b2da45305aec19f3839be3741b0e23b58 SHA256 2c64d2df378bb50dd0200079b40cd0f99ebfff96a80329304948c1f13af6f4ae
+EBUILD conntrack-tools-0.9.8-r1.ebuild 1479 RMD160 a1d7796c96eb260cdf1a54e0bba8de8731b176bc SHA1 cf70f1b55d0b3ae69cf608547876ac7eca418290 SHA256 b5ab81558805952f76adf72de0f54e3b39c02e388204b02b6a0e47c0b136a22c
 EBUILD conntrack-tools-0.9.8.ebuild 1420 RMD160 660e34c8757a59090ebc58f7b0e1a980361e13a2 SHA1 42adb47009e8a3203b25957e0dc050baea5a4c83 SHA256 0d73b39ebed20d59cc9893213626d56b513ce4e23319aedc0aa80a1c02616043
-MISC ChangeLog 3249 RMD160 56819b6abdd96a57008326db462ee45ad737d693 SHA1 abf533a9f990c522904715cea5cfccc199caa19f SHA256 678997e000303f6ead2379e4fe12021b27a9f1871c07172092b361f16b08da50
-MISC metadata.xml 453 RMD160 c711e2b9c00f47256f72e44eb70a14ee38ebc6a8 SHA1 68cd8e4d747510d6a01865c0fa17d5df604aaf83 SHA256 6a1b60775d924781e96bc2ffd94ffb47c5c041e2b9aba10b1a3e8239cb855f91
+MISC ChangeLog 3491 RMD160 60f6354871edba55063cc3ad26fe8fc9d412ad74 SHA1 b11cad679c1054101cdd5a70b33307ef8e795246 SHA256 fef469412aa3dd827900108a23b668cdfe388b9ccf89c157b68d01e33d429544
+MISC metadata.xml 647 RMD160 a50c408eb92b00628a99f69dd3d7845da9d9b794 SHA1 e6a729b1528e3c2c0653bad8b50e2291ddb2dabf SHA256 b4a43fb3d145d95a50c2612d43e69894277644779e734bf2f0d4c2d6579121f0
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.8-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..7536b413d8fd
--- /dev/null
+++ b/net-firewall/conntrack-tools/conntrack-tools-0.9.8-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.8-r1.ebuild,v 1.1 2008/11/20 12:06:32 wschlich Exp $
+
+inherit linux-info eutils
+
+DESCRIPTION="Connection tracking userspace tools"
+HOMEPAGE="http://conntrack-tools.netfilter.org"
+SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-libs/libnfnetlink-0.0.33
+	>=net-libs/libnetfilter_conntrack-0.0.97
+	!net-firewall/conntrack"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 18 ; then
+		die "${PN} requires at least 2.6.18 kernel version"
+	fi
+
+	#netfilter core team has changed some option names with kernel 2.6.20
+	if kernel_is lt 2 6 20 ; then
+		CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
+	else
+		CONFIG_CHECK="NF_CT_NETLINK"
+	fi
+	CONFIG_CHECK="${CONFIG_CHECK} NF_CONNTRACK NF_CONNTRACK_IPV4
+		NETFILTER_NETLINK NF_CONNTRACK_EVENTS"
+
+	check_extra_config
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	newinitd "${FILESDIR}/conntrackd.initd-r1" conntrackd
+	newconfd "${FILESDIR}/conntrackd.confd-r1" conntrackd
+
+	insinto /etc/conntrackd
+	doins doc/stats/conntrackd.conf
+
+	dodoc AUTHORS ChangeLog
+
+	insinto /usr/share/doc/${PF}
+	pushd doc &>/dev/null && doins -r . && popd &>/dev/null
+}
diff --git a/net-firewall/conntrack-tools/files/conntrackd.confd-r1 b/net-firewall/conntrack-tools/files/conntrackd.confd-r1
new file mode 100644
index 000000000000..7c937cbd9e3e
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrackd.confd-r1
@@ -0,0 +1,15 @@
+# conntrackd config file
+# default: /etc/conntrackd/conntrackd.conf
+#CONNTRACKD_CFG=/etc/conntrackd/conntrackd.conf
+
+# conntrackd lockfile (must match the "LockFile" entry
+# from the "General" section in the config file)
+# default: /var/lock/conntrack.lock
+#CONNTRACKD_LOCK=/var/lock/conntrack.lock
+
+# extra options for conntrackd
+#CONNTRACKD_OPTS="" # you must NOT use -C here!
+
+# depend on a specific network interface
+#RC_NEED="net.eth1" # baselayout-1
+#rc_need="net.eth1" # baselayout-2/OpenRC
diff --git a/net-firewall/conntrack-tools/files/conntrackd.initd-r1 b/net-firewall/conntrack-tools/files/conntrackd.initd-r1
new file mode 100644
index 000000000000..9394badca125
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrackd.initd-r1
@@ -0,0 +1,99 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+CONNTRACKD_BIN="/usr/sbin/conntrackd"
+CONNTRACKD_CFG=${CONNTRACKD_CFG:-/etc/conntrackd/conntrackd.conf}
+CONNTRACKD_LOCK=${CONNTRACKD_LOCK:-/var/lock/conntrack.lock}
+
+depend() {
+	use logger
+	need net
+}
+
+checkconfig() {
+	# check for netfilter conntrack kernel support
+	local nf_ct_available=0
+	for k in net.netfilter.nf_conntrack_max \
+		net.ipv4.netfilter.ip_conntrack_max \
+		net.nf_conntrack_max; do
+		if sysctl -e -n ${k} &>/dev/null; then
+			nf_ct_available=1 # sysctl key found
+			break
+		fi
+	done
+	if [ ${nf_ct_available} -eq 0 ]; then
+		eerror
+		eerror "Your kernel is missing netfilter conntrack support!"
+		eerror "Make sure your kernel was compiled with netfilter conntrack support."
+		eerror
+		eerror "If it was compiled as a module you need to ensure the module is being"
+		eerror "loaded before starting conntrackd."
+		eerror "Either add an entry to /etc/modules.autoload/[...] (for baselayout-1)"
+		eerror "or /etc/conf.d/modules (for baselayout-2/OpenRC) or load the module"
+		eerror "by hand like this, depending on your kernel version:"
+		eerror
+		eerror "  modprobe nf_conntrack # (for newer kernels)"
+		eerror "  modprobe ip_conntrack # (for older kernels)"
+		eerror
+		return 1
+	fi
+	# check if netfilter conntrack TCP window tracking is disabled
+	local nf_ct_tcp_be_liberal=0
+	for k in net.netfilter.nf_conntrack_tcp_be_liberal \
+		net.ipv4.netfilter.ip_conntrack_tcp_be_liberal; do
+		nf_ct_tcp_be_liberal=$(sysctl -e -n ${k} 2>/dev/null)
+		if [ ${?} -ne 0 ]; then
+			continue # sysctl key not found
+		else
+			break # sysctl key found
+		fi
+	done
+	if [ ${nf_ct_tcp_be_liberal} -ne 1 ]; then
+		eerror
+		eerror "You need to disable TCP window tracking!"
+		eerror "Add the following line to your /etc/sysctl.conf:"
+		eerror
+		eerror "  ${k} = 1"
+		eerror
+		eerror "...and run this to activate the setting: sysctl -q -p"
+		eerror
+		return 1
+	fi
+	# check for config file
+	if [ ! -e "${CONNTRACKD_CFG}" ]; then
+		eerror
+		eerror "The conntrackd config file (${CONNTRACKD_CFG})"
+		eerror "is missing!"
+		eerror
+		return 1
+	fi
+	# check for leftover lockfile
+	if [ -f "${CONNTRACKD_LOCK}" ]; then
+		ewarn
+		ewarn "The conntrackd lockfile (${CONNTRACKD_LOCK})"
+		ewarn "exists although the service is not marked as started."
+		ewarn "Will remove the lockfile and start the service in 10s"
+		ewarn "if not interrupted..."
+		ewarn
+		sleep 10
+		if ! rm -f "${CONNTRACKD_LOCK}"; then
+			eerror "Failed to remove the conntrackd lockfile (${CONNTRACKD_LOCK})"
+			return 1
+		fi
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting conntrackd"
+	start-stop-daemon --start --exec "${CONNTRACKD_BIN}" \
+		-- -d -C "${CONNTRACKD_CFG}" ${CONNTRACKD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping conntrackd"
+	start-stop-daemon --stop --exec "${CONNTRACKD_BIN}"
+	eend $?
+}
diff --git a/net-firewall/conntrack-tools/metadata.xml b/net-firewall/conntrack-tools/metadata.xml
index e70c6ec9dab7..161a8f14146b 100644
--- a/net-firewall/conntrack-tools/metadata.xml
+++ b/net-firewall/conntrack-tools/metadata.xml
@@ -5,6 +5,12 @@
 	<maintainer>
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer>
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+		<description>Secondary maintainer</description>
 	</maintainer>
 	<longdescription lang="en">
 		A set of tools targeted at system administrators. They are conntrack,
@@ -12,4 +18,3 @@
 		daemon.
 	</longdescription>
 </pkgmetadata>
-