Update initscript so it actually works. Again thanks to Ondrej.

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

4 files changed, 49 insertions, 44 deletions

diff --git a/net-dns/knot/ChangeLog b/net-dns/knot/ChangeLog
index 40a33242226d..237238e5adf3 100644
--- a/net-dns/knot/ChangeLog
+++ b/net-dns/knot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/knot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/ChangeLog,v 1.19 2013/08/21 08:21:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/ChangeLog,v 1.20 2013/08/21 09:23:59 scarabeus Exp $
+
+*knot-1.3.0-r1 (21 Aug 2013)
+
+  21 Aug 2013; Tomáš Chvátal <scarabeus@gentoo.org> +knot-1.3.0-r1.ebuild,
+  -knot-1.3.0.ebuild, files/knot.init:
+  Update initscript so it actually works. Again thanks to Ondrej.
 
 *knot-1.3.0 (21 Aug 2013)
 
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index e79609958c6d..e379d6652079 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX knot.init 673 SHA256 730e530a56e233cb92df4edbd918df8da24c62370f472ee449a47a344e7f738d SHA512 421cab56a6f80c15043efbb5006ac67071ac24d29d02fc5113e8c20d61b1633d14456d43fadc6a234a7392db2ef4103c45117fe61de499ea6251c5555d8504d9 WHIRLPOOL 0fe9d8549fce806eb03f3f55f541e70d011c93a35ee1d8c7b14b1c5bb7b87ffa253db686e335ee71c6a8280a8da5ae49a3b6adff3b4ee87c1b09e5a90cdc2928
+AUX knot.init 966 SHA256 16e029a7ebc3589ce12f42fa78892d1132345a1d0a9b31a65931620d2db95202 SHA512 f2a2f40547d20008fbe2187af5e8abccc553bb8799146ad7c63b172b3b981a8cc163a1462941ae9922541d8985c4b41d1133c69d88b303e5333c5dbe0cdc8584 WHIRLPOOL 243d3d903ff195781561da3a3d27fa39c4eb1bb0806da64f06ec4533ea8f2c3a8b7973fcb4e69e20dcca3fa0f0aec1bf148927dbb84c1e2a56fa89584335b346
 DIST knot-1.3.0.tar.gz 1160045 SHA256 02731a6410513b5944bdf96c6da7ce70ab356fb4e1c51258265ffd9b577dee4c SHA512 5af6e8a1cb9eb1dc72d3ee0d738cdf78eb8e922356691b09f8021f5f5e8f7946482582ff534832ac3dc56b9bbcabec0d6b19b441206e5d02d38acd80789a2b56 WHIRLPOOL dd25d8640c70aa1bbe5474cd9e63c54a1a4f0bc349ca44d95f709c9a69c7b2fbde9c292ec8ad7b1ff5bb32ed4fdc57cd98bdaa85ab95c73c079bcf1c11f3f712
-EBUILD knot-1.3.0.ebuild 1264 SHA256 1485d19883c56f5b39976df3bf6e7063fb14feff13a42760ad99dd73d1756897 SHA512 32e25334db108b409e040749deadda39c3b82fc42ecefd49bf37c5141f00b74ba7859e21ae7ff8805b0aa8bd13e0b3a21a83f9602e17d2e1165ca10d5c5cb259 WHIRLPOOL dfff711ccdfc1fd9c1749030bfee15276687f46afbe8cb7a604223b0dd3328e4ed23c729a94d986e9d5aac94f9e9f0769e6d10955c0a000abd0283243b2d0bfc
-MISC ChangeLog 3533 SHA256 ccb4f4066e3ba7591e1adb3dc48b8702fc5148c643e01283916cf919f918496c SHA512 e1adafbcfe96cc17d603c6d41d5aca3a45efb5e85e4b1fff137b54806bc7e2317c97f030c48ffa55e78df8b73b1f26c77b090ac3d661c6f937c150b5c2c121cd WHIRLPOOL 6dfd0089ddfd5c8c80f2b96707a73e4c46990985b7d9ad239b5707991643aceed36d109a3d0a0343fe52e2bb7b94b7ed3192c5af5108cf7fbba6b8a4d8fff5e6
+EBUILD knot-1.3.0-r1.ebuild 1267 SHA256 6ceb9d9b6e0bf82cf2ab4f442fa13ed86f60d50b8151ae05ca20f662d2044f0a SHA512 b9303ac044e4cc34e557d6d6f4e3c64f5ccd9949d8db379a9a814e6c39c6308c7265b2167e125accb32d05d819ebe46acf200435c3828e8ba56db0f5e977919e WHIRLPOOL 5b6b10bccc9563e60fa70babdc4f568bc8d2fa4bf5318bc8e7aff645ac26ab89460b262e3b44b37cf4e50cb0997cd55d3cdef3b839319f6319f8b214afff039c
+MISC ChangeLog 3747 SHA256 c0786d6c88a4106403af150e5a4520dfb784d6085b4ce5507fea277a3a16fb4a SHA512 7a17c3f8f32909717ba1de73fb6dfd60407ecb4855c9a3a67fb49183c3abd3ab352b514424c08fb66f6d559465a1d28f825f6aad9d3f8255901e164b030c20b2 WHIRLPOOL 1f9a1dbdb645756f167490e097867a182d99b08d4a1d809bf69da19a5510edc2925720ba49d7d41f47e2b06921b76ec80e301ae77a8c362c7579887aa188030d
 MISC metadata.xml 284 SHA256 5ada7d7b77c07b75f58239708f487f36f4225c157fe3deef60bdba80866b43e7 SHA512 81c675bdf98a98c0f586dc1c380155e6874dac7681088100890da8d1d5baa33af3d5565f7a49edd2a76f13f0d5cc6d3524afec47b8dff8fc173e29ad197e6d5d WHIRLPOOL c0335259eae04dd1185fd04277cdc436c3f43147e01272863caf6bad220a3e395a29f144ca439f99be81a84e01571d49e0de819b29618b019c09b01d84d619b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSFHifAAoJEOSiRoyO7jvoqTAP/AzlkT8ZVVpdB+jr1/1XDwmu
-lnJbWcJBQ5oirbirCzrPMVEp/Lglu5FKnkeJ8PXf3Su7oB9eK0z12GviuTXinWGJ
-NrOeSla4gYDZk3Ia9cImnP1mdMNywM4ySjJ4xCRVAcusBTS1hcjfuNcJXNvsXG2i
-M/lRynqXeehW8kM4yXoaS9ZXNSz/zF3geVyp7JRFkCGCG7A24/hVZpVcqisGHAPZ
-aV4IAxupzhHWj15LEjqWapTWPkr5SeggdpCk47Nu8JBpnOR5wXYJ3ewxROwn3sow
-WVsCjqUSY/1kxTtcxNsplZLITuEhuvE9eiIHbcncv5CNVgktzXzDLUBxh7PLTuN8
-nzFLVQwdYKv7ifeDcgXy0p1IJPXmOyeBUXp129W5+4x39MaoVcIFgCC9WRoa4/SE
-ChZSuWpHWqVZsRgxrzkGg1BB722hfCyT997feT5gzDUyR4z4JSoPyPkqj4pc+mvS
-1mkQnF+zxl/oCp9twmGEDzl57+V8Q6xR7OvPkaLNyY+aNIBztg6pJFhC5AUfji0Y
-yEDOdE8kW4r8Fqbk8A0R725IXhEDFzaqWd3hsbO7XCjFYREwcvjpuJo2yiHPknr7
-9Xytw4PPcclyrYL0OCAUi6T0HNoIxmwVhEpPcghCO29t1j3JPrTEXUj+6s7d5H3q
-YoMmnks88t2M1EI69n7l
-=zi5s
+iQIbBAEBCAAGBQJSFIdFAAoJEOSiRoyO7jvow3MP+JPMIspMqQs20MgqRibn39WR
+Qgi8/MczozbgOGOcP3UvD8x8j9p+VhZjEyjUdwnU9kt2qIiwX9msaP4Yny3PDs/D
+lAuhh+cwXzcMVtMvSbeLFsM0BO0Y73Y3fkUfkd9Y941Eu2BOX4vbBX1dTpteDJSa
+EKscv87F6N/tTa+8D73IB+zczGqmon4rJuBgTCScPPvq8e3s6j6JfxUpP1OwdqVE
+gwfWpQFJZQ52JgmQPRYZ2C+7V83VUbVC8qSIDtvuC8XNlyxh5pVECUxAI/pGywOa
+PCGCRupJznNeHin8QTVnGY3UWGjyZS5nTomnxnS9cmX8lsleF6HHwsHT/nxcn176
+moMVFiQpH8ZYrhesb1tKNQzNzIe8lKHJj1mXmuMwDkM8swPDZEylS4WYQzPDJ5t1
+XsM6oiVCFz+LSZmb2TtXLrqs4S6y99Zx1qlhg9NtfJNWVK3b9oUV2kszJRGTgnWg
+OZXiRWyS0q/PXmqMGw/0n8tRVQelBPU7V0AhN+OeU4bv1Ygb+uaovHuC7Etcqt9u
+SUnJYAkspkwkdQMkm74nhNmNshJabueBjISIsL3pqBMeTZsfHWiqHemJ0wJcifAe
+R0nm3F26YqEHueL8rJ9E7REC84SEmY+qa/7OXQGZsHTuY3Z0AKQb2t8OR9PI7XPx
+7r8dIENiPWRa500KD6U=
+=Zxse
 -----END PGP SIGNATURE-----
diff --git a/net-dns/knot/files/knot.init b/net-dns/knot/files/knot.init
index cf73f6240454..42eae81844e1 100644
--- a/net-dns/knot/files/knot.init
+++ b/net-dns/knot/files/knot.init
@@ -1,43 +1,42 @@
 #!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/files/knot.init,v 1.2 2013/08/21 09:23:59 scarabeus Exp $
+
+command=/usr/sbin/knotd
+command_args="-d"
+pidfile=/var/run/knot/knot.pid
+required_files=/etc/knot/knot.conf
+extra_started_commands="reload"
+description_reload="Reload configuration and changed zones."
 
 depend() {
 	need net
 }
 
-check_config() {
-	# we need to ensure that var is created for runtime
-	if [ ! -d /var/lib/knot/ ]; then
-		mkdir -p /var/lib/knot/
-	fi
-	# without config dns is kinda useless
-	if [ ! -f /etc/knot/knot.conf ]; then
-		eerror "This script requires configured knot-dns at /etc/knot/knot.conf."
-		return 1
-	fi
-}
-
 start() {
-	check_config || return 1
+	checkpath -d -m 0750 -o knot:knot /var/run/knot/ /var/lib/knot/
 
-	ebegin "Starting knot-dns"
-	/usr/sbin/knotc start
+	ebegin "Starting knot"
+	start-stop-daemon --start \
+		--pidfile $pidfile --exec $command -- $command_args
 	eend $?
 }
 
 stop() {
-	ebegin "Stoping knot-dns"
-	/usr/sbin/knotc stop
-	eend $?
-}
-
-restart() {
-	ebegin "Restarting knot-dns"
-	/usr/sbin/knotc restart
-	eend $?
+	ebegin "Stoping knot"
+	/usr/sbin/knotc stop >/dev/null 2>&1
+	# In case remote control is not working
+	if [ "$?" != 0 ]; then
+		if [ -f $pidfile ]; then
+			start-stop-daemon --stop --pidfile $pidfile
+		fi
+	fi
+	ewend $?
 }
 
 reload() {
-	ebegin "Reloading knot-dns"
-	/usr/sbin/knotc reload
+	ebegin "Reloading knot"
+	/usr/sbin/knotc reload >/dev/null
 	eend $?
 }
diff --git a/net-dns/knot/knot-1.3.0.ebuild b/net-dns/knot/knot-1.3.0-r1.ebuild
index 0ded794ee49f..3df494d0bcf3 100644
--- a/net-dns/knot/knot-1.3.0.ebuild
+++ b/net-dns/knot/knot-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/knot-1.3.0.ebuild,v 1.1 2013/08/21 08:21:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/knot-1.3.0-r1.ebuild,v 1.1 2013/08/21 09:23:59 scarabeus Exp $
 
 EAPI=5