Version bump: drop redundant src_configure, fix path to lock directory, wrt bug #474858. Thanks to Jeroen Roovers for discovering this issue

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 195 insertions, 5 deletions

diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog
index 859470503b47..9b6f2fcb0121 100644
--- a/net-firewall/conntrack-tools/ChangeLog
+++ b/net-firewall/conntrack-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/conntrack-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.64 2013/06/26 12:26:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.65 2013/08/20 09:46:53 pinkbyte Exp $
+
+*conntrack-tools-1.4.2 (20 Aug 2013)
+
+  20 Aug 2013; Sergey Popov <pinkbyte@gentoo.org>
+  +conntrack-tools-1.4.2.ebuild, +files/conntrackd.confd-r2,
+  +files/conntrackd.initd-r3:
+  Version bump: drop redundant src_configure, fix path to lock directory, wrt
+  bug #474858. Thanks to Jeroen Roovers for discovering this issue
 
   26 Jun 2013; Jeroen Roovers <jer@gentoo.org> conntrack-tools-1.4.1.ebuild:
   Stable for HPPA (bug #474268).
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index 733c4e3c2e28..ee367879f404 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -4,21 +4,29 @@ Hash: SHA256
 AUX conntrack-tools-0.9.14-include.patch 238 SHA256 a6be7f0257afbed76dcec42b766912454236e49c85a056548cb57ccca13c7bca SHA512 fbef68087c5fd8ca79f7ca8f3e7fc83cea9a21ae97e7dee1b2f14fddc00c7c3ba326a3e5bb684b6b85ada8b6629ebcde958ca4f9b1254bc3d93dbb76ae90bb99 WHIRLPOOL f69fcfe2836f82299eb24f654a7512a331a9c897cbad7583f0fd1f4f1914540bd9c0f880e01e4638ee7509fc05709b607280b4910867cb6314b1ca70a4135144
 AUX conntrack-tools-1.4.1-version.patch 556 SHA256 666e8e037198cce0d203877c0d24f0072257bbe220b197a1ac93302b409d4bfd SHA512 81d368ccb71265b4a13fccd261cc6958b577f130cdb9f7b06627c0d6514e8b74d077f3d5e4c74af7a78e98abce8f94aacf202fbe1fd0d3b3b84794cae590d60a WHIRLPOOL 63bb9f25d0c80e69a00f76272befb87ab39876d08a23e16d3dcb12ab785c4ae694eb5e9fd6a3340e036ce38b626342ed2024b2ee0439806cdde8473297adfb73
 AUX conntrackd.confd-r1 498 SHA256 6171121881f824bccc2709d6e74e2d5955391fbb9c591afcca741a3239fd3ed7 SHA512 fd8cfab207867844db6671a8395efadca792d6085c3436381e574dc52f3b4e41d9526b3db6114dd98e534a5419ca19f291d21c091f8cf0426024d73d18133e6f WHIRLPOOL eecdb58fc2c3ab7656feb994394d947a1860ef118ee7ac6e850ecdb2f65cc597045a3f32bab5615fe1b8a819772c5ff651b396c51edb437fd43fcb6825a681a8
+AUX conntrackd.confd-r2 441 SHA256 355f91c830f82343a058060e5dd060f72a940471f43c970d46a5ea63c40987c0 SHA512 3d72d56d44094593f6ff1eac421fe6a4f0d20450ce698c175adf1b18a859b1a24c7120fa60431b2a00da62ae3749c4619106c8e93fb8fc763ceefc26a82d2ed2 WHIRLPOOL d583647cca267234ef942a27159203317391c990b997a139c9251b43788fbcc1284d5e6cf8f15570dc4803d7dae7283a8bc6d4c9ffc76a4710b0de784c3a69ad
 AUX conntrackd.initd-r1 2897 SHA256 34a88a0e9291d4473f72b246e12ebe00121dff9b06c6b54c1da5f06045a2fc09 SHA512 deaee64007106cf9d4e397bef7f7408ea372427b2361f0b72ecc545de1e45607049281c1c38942139c6269af88d62f18113ed105b6c468f27ce03d0bb1f9c1d8 WHIRLPOOL e3cdbeb5aa8fb57f8991f5e89c0d4d3e162dee51e69cdea513d7c208c5d3335404840045e96dcaad3cf71b96caf89418cb2c8fc4572b6b2878dd9c1d291e246c
 AUX conntrackd.initd-r2 2239 SHA256 a1a0e2453ec8f5dee58f8cd95e6e969794ee9dfbc55236e7fd3eef5116cacab5 SHA512 faa5d8ebbea4fee39740f09ec983f29239b3cc17d75c0f70f3108c017e9f90f4754da3deca13412bf84ac365487c1f11fa80b6b15d44ad1659727d5deb144b97 WHIRLPOOL 3975490f89d58bd7c79a878012c3ff4b18840dc2d0e5bfd0981a33248567c93fb7e5246e70ed9c8eefff29abfd6d4ed04a049dfdc31908aaa2c1120e2ab47298
+AUX conntrackd.initd-r3 2239 SHA256 8a3990cfbf0da0ceae9ea1584f6c0e74f81fb395b35dd80bf413f43845610f8b SHA512 5067d08ca8a1c8da805699a037d55bba1df57282572d8041939428d30a6ffdc321b579472072ffd919cd29a6c465f61a0287f17b90c0b626e9e60a62d4e2ffae WHIRLPOOL f57bba81a8d4735dd9bde7d0b05f8048b41bd886dd5a93ba0318e8ee9b2ce3be2c70526b1a8af621e61fdab0e4b11e8df4da86b87ec375a831485cd25378e0a6
 DIST conntrack-tools-0.9.14.tar.bz2 433383 SHA256 2e36744da83eb2e6e54a5769aa1abf044d53089470d646898222936e7e8da6ac SHA512 7fd96e26b9f9747aca529a6ae81212206470794f6c83d47cdcc87d9de62a7700badc093c25ee81a268a2aab5cca40976d0432a91925647118e5eaef87cfa763b WHIRLPOOL eac8d2e6566b610b85b4f25b2a2616892106cc4eb40a0aeab0ce999c979902a195440c0cf6b3eff792327ab4f903d0505478a1c124d3bccfe4b09a732c5c7d2d
 DIST conntrack-tools-1.2.2.tar.bz2 476888 SHA256 e1da5f4c46094c252df5a167b28ecf2085dd73d1258316021d80612e5c9e332b SHA512 461ae67a5b8af2f43df393c6e5204a88c9f1e2bbfe40bb954fdb18e5c7855fb80cc446d51924546198d2626ebba404d86dd0bf3e94da0735d8a5caa741605f99 WHIRLPOOL edfb63e1edd9cef59f77e0851e715b157d11737c44afe5b4e682faa09b17181d2f8f2de6476a922ba6dc9d5e2caf1611231cc6a26c2d6c7f75840db75f5d5c5f
 DIST conntrack-tools-1.4.1.tar.bz2 495439 SHA256 d4b0f42a9e814e9f2c95bb5dbaa7bd02a418114e019d6fa85d6b22ff20c95b6a SHA512 57ca11c212aa836c65d6c2d1393e27f8a54077228686e00687abfa87a206d9412f0ffe7704f275450254c58fc2d17957681495b103079a29834ecb52c52f716f WHIRLPOOL 1f8ff9d633ea321b16c8e679aa3b4661c3d2b2552fb0b4ff4dccd2452578da8e2e7c0d12069a0392d97fb6efeee228105488253264454cfb871a5c45c67af37b
+DIST conntrack-tools-1.4.2.tar.bz2 472074 SHA256 e5c423dc077f9ca8767eaa6cf40446943905711c6a8fe27f9cc1977d4d6aa11e SHA512 1fed742593caf8bbac96a58df8f7e806d1c0f1dfea8fc601d65aa89b4243b1022949a2bf03ab0ca25994a13e50b3b1ee43a31827e0dc4da1399801ddac623d56 WHIRLPOOL 7405e8b812c98c06bdcdbfea983178f5830001cf247b9a63aac6e19e2497b1bf2bdf8c7c6445dad60f5463eff6cc0ea58d14eca2990b2b3b3f54032daca85572
 EBUILD conntrack-tools-0.9.14.ebuild 1771 SHA256 02afb9fd7ee79d070450041d4f1ff4fe6e8b72b0b150d063e25a12c7ba2779c9 SHA512 40c82558a0604c1ce008e0eeff86758a2011d0575f73cd610e443e0febf1f936cd66502adb589c2b6d2c97043b4bbfe34a5cd8c052b6b272297a30db90e3a48d WHIRLPOOL c699b53b9a3db757f903c34c87ce07d15743e44592f26242115b25146d8107cf3e74f7ceb899c74194d0cfd4c4054af8c2a5c8d1f4d4f49ce381109c2d6870eb
 EBUILD conntrack-tools-1.2.2-r1.ebuild 1807 SHA256 ff32b14215aa9fc94ea8f8d4f5f441e9f6f53838b44bf0515842c21e66d7ea40 SHA512 6010abb3a02f0fddbfc7a5f8d8714073611f06e1bc2737f1b4676f8e6f74170249cee6cd7a53421c4eb51c0be95f85a4167ef4ab754103619e5347b988e9986a WHIRLPOOL c28865da58cf76be187a65ae36b976f0c81212ff295b31840dfa2cbbd2fbcae6da92113556a9b745ed083f8bd3b6e51b5271b437069a5cfc85d158cc95b53477
 EBUILD conntrack-tools-1.2.2.ebuild 1632 SHA256 21047d2dc283ab75fa42baa616003d09d6ccf2629910f44a5d9845b5a27803d1 SHA512 e5a8304cd06b35cbfc12d08b641003294c30f34d9dbf118c4a86073f486f7b417d05c2707a640f9fa8089fc8738491c156632883d17f39403afbbf55a5b6b10c WHIRLPOOL 7c3a4e1fb96c2d07cf101abe01dd794f6e355b8cdc15a68a859bb18c8815e0c3e2dae9f7d986d1affaccdc83049e53e9e41246563064864e9b458a192e6105d5
 EBUILD conntrack-tools-1.4.1.ebuild 1977 SHA256 6e0ec09e4f721e936488e5149d89a07df62c7955a19c82d993487d50ba5ef41a SHA512 10dbe15caf3be064a07a5f7d0427a0260ab7503949f3b48827c9dd2337265dc793e7f6eaf9a89f2e72d28d9b7bad9cd2a997aac0df98bd4fac57f69fdc209c15 WHIRLPOOL 4a9765b262ae88d32f86739268d27ec49e617f521c31c999b69157aa31feeee860aca81b56a0c1445433ab215eb4a01ee7fa2358b107df3524155429f4908bb2
-MISC ChangeLog 10131 SHA256 7300be276934202a1fd2471155235841fd071f68180ee641ef998fefc1340029 SHA512 1b6e2908bdf4df2f94b25a2dceda40e9525eacc2886612a180f48e73e3b410bc45d61679c3386d437d443e728f2afd2a84107193902d0138d6dbcdd3bb114e5f WHIRLPOOL 1cf8c7935969fb9a68a4943add6064b7a8fe5d8a4d0f4a01cd6a08b03decee9b1797f868a117fd2db1c578c930b8d2c7f2af374b40e75050ae9365b85e7f1687
+EBUILD conntrack-tools-1.4.2.ebuild 2069 SHA256 6e1a305e48182f463a7b4a0fc6d0a8b4cc1494b477a6871d8ac957f2e1ba2467 SHA512 e184c9616152668a2d5598223e7ed237a4830625255729aa2b961e50f4e0bb1101a4bbc7f557db6f5c9e6a2c4461ed20bbc59e447eb15e87361fd711c3577747 WHIRLPOOL 96457c87d7bf5505d726ae39155192ec33568aac85cb71123d6eebdc224271631844ac083762657c8e61ec68c9e53e6c28d476b54fce9cc1e6f0fbaea686d42e
+MISC ChangeLog 10461 SHA256 6300c7a5dd335ac044cc591f58e776db165ee965ab52ae47dd25725cd49de759 SHA512 0a6173eda01193e509d86f51ac519efd313cf6dd2d055b75636d2acb17e64b31ecbe88033e17781efa3de73dd2463b0b43cedcebde18f26f637dec7c784b000d WHIRLPOOL 0d4d85637be2c228e409ad7ba423b74461bbbd55b2567f79c1ce9bb84c5ce231abc1ed31502124438c9d3e4b89c60df94ffe8d7c71688d5aeda4524658f7fb95
 MISC metadata.xml 508 SHA256 132640a00c1abc763124df5f76fc93f798bc2d1d687d97fe8dd8fdda45b01ee2 SHA512 d6bb940589d1ad480ecc6241e24debc15ac44863b4389a6fa7eadae91a030d9414fec2a162c836e044564a3aa83a2035710a4e24e0e382fbcc2827b91276da2a WHIRLPOOL 3f564b43f63e1344b187560d7ca6dcb0fef96d9029dd658152eb605c68835950988e8b670da8c57faf4b1a1ec36d59f6f0c66565ed9ba07f5216fc9694b82363
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHK3gIACgkQVWmRsqeSphNGIQCfSoP5ukl4MaSBPjfzunVy41xp
-yaQAn2QGX7iEJykSUGQcr0dmUFIq9+61
-=BrGi
+iQEcBAEBCAAGBQJSEzquAAoJECo/aRed9267cWQIAI6VymhUngX2lBW+m1hNlfgq
+dLDL1Vi6qwCBo9BiRe24oIE150prdozfEEHej40TvbSI8vYDCSXrZhcGH5merF+C
+SlB0RwqtDvuS9lQOjE2LTWBEVRFEZwLSAN64VNYzmV7YIgP5q3j9oJ1c7b7pXX0V
+WjyoLTBNeimgHLjp6i3bdgopNa/zANG9Yqx0OT/eOdp7G92pekrQiiQQJrZ+Rlij
+Y7iDXwUaA6Y2pIhG6PtA6BgVJZFtxDOrkLScJJEf56Ap9kvV2bGl19wLh3JAc2Bz
+8vJ/c9mW19UIjUatVQ56MVZgwmytIEk2UzSmxYHxfnfH2mvB7PoVYKldCAaovmM=
+=hhiN
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.2.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.2.ebuild
new file mode 100644
index 000000000000..50664104bea2
--- /dev/null
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-1.4.2.ebuild,v 1.1 2013/08/20 09:46:53 pinkbyte Exp $
+
+EAPI=5
+inherit autotools eutils linux-info
+
+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 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.3
+	>=net-libs/libnetfilter_conntrack-1.0.4
+	>=net-libs/libnetfilter_cthelper-1.0.0
+	>=net-libs/libnetfilter_cttimeout-1.0.0
+	>=net-libs/libnetfilter_queue-1.0.2
+	>=net-libs/libnfnetlink-1.0.1
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	)
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex"
+
+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
+		~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS"
+
+	check_extra_config
+
+	linux_config_exists || \
+		linux_chkconfig_present "NF_CONNTRACK_IPV4" || \
+		linux_chkconfig_present "NF_CONNTRACK_IPV6" || \
+		ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \
+			"are not set when one at least should be."
+}
+
+src_prepare() {
+	# bug #474858
+	sed -i -e 's:/var/lock:/run/lock:' doc/stats/conntrackd.conf || die 'sed on doc/stat/conntrackd.conf failed'
+
+	epatch_user
+	eautoreconf
+}
+
+src_compile() {
+	default
+	use doc && emake -C doc/manual
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/conntrackd.initd-r3" conntrackd
+	newconfd "${FILESDIR}/conntrackd.confd-r2" conntrackd
+
+	insinto /etc/conntrackd
+	doins doc/stats/conntrackd.conf
+
+	dodoc -r doc/sync doc/stats AUTHORS TODO
+	use doc && dohtml doc/manual/${PN}.html
+}
diff --git a/net-firewall/conntrack-tools/files/conntrackd.confd-r2 b/net-firewall/conntrack-tools/files/conntrackd.confd-r2
new file mode 100644
index 000000000000..01c0633809d5
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrackd.confd-r2
@@ -0,0 +1,14 @@
+# 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: /run/lock/conntrack.lock
+#CONNTRACKD_LOCK=/run/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"
diff --git a/net-firewall/conntrack-tools/files/conntrackd.initd-r3 b/net-firewall/conntrack-tools/files/conntrackd.initd-r3
new file mode 100644
index 000000000000..5309321ff8ab
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrackd.initd-r3
@@ -0,0 +1,77 @@
+#!/sbin/runscript
+# Copyright 1999-2013 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:-/run/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 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 $?
+}