fix typo in nsd3.initd

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64

4 files changed, 14 insertions, 12 deletions

diff --git a/net-dns/nsd/ChangeLog b/net-dns/nsd/ChangeLog
index daece126e805..d80fa7786a18 100644
--- a/net-dns/nsd/ChangeLog
+++ b/net-dns/nsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/nsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/ChangeLog,v 1.5 2013/04/03 19:10:39 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/ChangeLog,v 1.6 2013/04/03 21:06:18 wschlich Exp $
+
+*nsd-3.2.15-r1 (03 Apr 2013)
+
+  03 Apr 2013; Wolfram Schlich <wschlich@gentoo.org> +files/nsd3.initd-r1,
+  +nsd-3.2.15-r1.ebuild, -files/nsd3.initd, -nsd-3.2.15.ebuild:
+  fix typo in nsd3.initd
 
 *nsd-4.0.0_beta4-r1 (03 Apr 2013)
 *nsd-3.2.15 (03 Apr 2013)
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 1af8523782c3..5bc2fbba67ab 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,10 +1,10 @@
 AUX nsd.initd 1473 SHA256 121a11fb6bb16f6f4a8a7de85fe3b9737240f48a3e01336cfe98c05e67c3fff2 SHA512 7761da45c1cbe0dcd7f27e23efdb194e96c480cd995d0bb1ab714beea47fabd9ede8e02ea275c1f00f1be20f50bd32fdcb4f2d646f6933d58fa60204bce08da2 WHIRLPOOL a21916260ad4cadce53abcd746b09ca91a25085daf30927fb7bea832a1cdb773883b496f9fd2e5262f7010df2338d77049298a2dd213baadad991ea93095834a
 AUX nsd.munin-conf 238 SHA256 41eed9d020fef71324bb80ba291153e62810189057e84446136304490f00507a SHA512 b543f4d604b8abaa88383f413d5b08699c9581fd68f0aafa0df7d0dfaedff12f4c8e00b6787d010dda79eeed1911a9feff63ae66e655382e61c5b7734d3f5249 WHIRLPOOL 110187052074e5501c7e72d4b55fe6a3fcd4830bea4ce40a669405aeeaedce4b030f1a41e763801553910c2f9320e62c6076d2a321b968ef3b2585303931dccf
 AUX nsd3-patch.cron 378 SHA256 c711346df2d9d6ffe6e1fe3e701f5e316078b085a6dcb1091a6909e42141bbb7 SHA512 660321b4df86895c1769671cca6847e36d77d8108ff827d0e338bb052317490582c27967870a866a5fb84088e4a109e2cf5cc67c631f4bd4ef5af1595db47849 WHIRLPOOL d74e3a5da2a67484f922b6bfe5993ff993c7ec6852fb2e50b7d5d69e2e668dba73b4c08b2b4639310be129f485a29bf02c66969ca180c570e93712d1f6903452
-AUX nsd3.initd 1934 SHA256 ddd10c750165cb00b02f9761e95f12627b96c90430b795769092e88b8a489cb9 SHA512 0a25d47839b881844df4cb05039fac8e2a72165744b367de62bcac2fbc60d37a8f4e7797ccb9c972c2f7c4c7c62514e8c215c80ec9bdb75acfc8f51aa65ce5b7 WHIRLPOOL 6c8e275dde4c0dca96b2aa64a6cc7be0e6bf53fc8586b4911f03b919722540206250ac4e2a8eadee30ea329a6d2668d65d806f4edc6e693c3096479ccff7c08c
+AUX nsd3.initd-r1 1817 SHA256 32c2980a0d72f0069e21967cdc64432289fa28172d90e915b51824f0818f8c41 SHA512 eeb697d61e9423dd5ff7264a5cdcc61efaa1113f0c7d402384567fc33b7c4974d0c694226d94167c42ba72c981ab546a3d5f66ceade5cf3a8209c44822f36851 WHIRLPOOL 2e3863b6795397d74b7148d24d23d1b6098fb6bcc0be25a1db8d2e9abc25f39b0f816c15363d752a634c1135cb765ef2d42b60d31fce8593727ba9c2c043ea75
 DIST nsd-3.2.15.tar.gz 909346 SHA256 a1a0eaf88c2d788fcdafd6848a1ff45e113e95cfc17a87fb0e71eab34ffdad64 SHA512 ed431f8b4ed2d28bba3ec05db7ea9d176b5be6daee4ca086a5bad65606c82abb15653ae6c664b3a32b88becf8a99f3aa6b447583af12ac677bd5dd84962b070b WHIRLPOOL 1c230c08a7af92bf2c67b467fdf1f5f6807c3ff6e04657d80bd3496c7e999baa16ca007294318e72279ac4da2c311d0f952b13fafcc0d7dab1096f699373700a
 DIST nsd-4.0.0b4.tar.gz 1014056 SHA256 ed29019d6e8aface4c32e22c9968aa9688acf98f8356112c4ee89a923022cc2b SHA512 5ad0de69b1cf85ecb3f54c0741969e67657c94c4c9646a3191d3b0a6fc08d9ac3b544e3c3fc99e09791ff9f4fb11f255308a3049648c0d6cdf718e2376cc1cd4 WHIRLPOOL 2784005e5fceb63bf058f8afa91d0fbf829707a5e8cb833ff9c5b440a2208357c0363041ac9e831374d9208093a4d29d88ac079bc02616922b8793e3a262883b
-EBUILD nsd-3.2.15.ebuild 2064 SHA256 e90d985df2eb70527b3ced24bce18fb6b74848506fadfca8d5312630399ca7bf SHA512 7c36af21a527f4ba79ac6f705f3335469d2338b5c761b00a4dc69f03f81e2e2ce415c51eec502b551cb25c4e0bbcf7a455c3ac382f8062e07a73861e124b5295 WHIRLPOOL 6e9c40403356dc060e2a1dab3487310d62e1b280df59aae2efe4e53a4fb03aa535b8edf38029c1623bfb45e0a01ed4608a0488e816712dd248fc2b4ba543639f
+EBUILD nsd-3.2.15-r1.ebuild 2070 SHA256 c263b5b3f28b6b820b7780152451fdc74283c17289b6d45c7e24b0733a8f709c SHA512 a9c834140cc97d2ffc03c1e800afe330e5630d769dc413c17667c2d4770c19c229265cd062a62b1a7dbb6ad3a5c59e9c2b7fe82ca989358948c4c81256c1ae0e WHIRLPOOL be894d2151620231b8a32e85f2783085f4726957fd9a5f2f0a7844130a71f52355a13cbf9df7d25faf5c205225a0f0db2fdf7b128540b7b36f4a638d7ec40f11
 EBUILD nsd-4.0.0_beta4-r1.ebuild 2541 SHA256 b5f7039f439a1fd26815eb352b1bfc92fc7a7f040373733499daba1b9379e5d6 SHA512 a849107b6d25a2cc868bb04dbfdf21f70e411f288a71316302a3b66385e6f034f1fd5fd08cbfd35b4d1ad0c3946fd45ce35ff6960c893a41d7fa86804275ca02 WHIRLPOOL adae537818f1f2eb5239351124712e9a81e62f78e6f7e388a36cf506118a8418197a3dc7363dcf10015345611656a0081cd2b5b35b911fd0878d30087d73cc1f
-MISC ChangeLog 1296 SHA256 69cf9ccfb3e709d8051ae6b67792cf20a12801efc0e4d6a5f9d776ba50ee261e SHA512 0a2b7c39a65fc62dc9fe59dad8e81401aa00550e554f2ef35680782755ae79a7815e7b1663c718eda0f2143a036b392fcd949bad22b5a9bc54f296cbc89b9b7c WHIRLPOOL 6fad62350fb09087d39041bca3469aa363356659eb4735cedbbddfd350f5670ffa657f581d13aa76541158f6df911146128f11916887b1978bb7c0fc1d02b497
+MISC ChangeLog 1491 SHA256 4bf0255eda28505348099ec39812ca8f0dc18bebbc4c216424a55ca4ba1256de SHA512 c1a2bf89673b5cc3ccc578c62be76f2cc1bf7acbb386306210d67221b1a888c88ec351ba6f921968a1ce7339e209b405f3d504f6ac2f672052f0874d4d918fc3 WHIRLPOOL bb442127887d995558c16b4c15a083dc493fa36cc975f1aebdfa25d0f1a6de788255ce9a2595bc828271b3146a72173a48ffa87da49777a0f29b01c0a902f076
 MISC metadata.xml 1351 SHA256 9242e72da72026ab7eb633fd3c54165f7f209ed2b7db5b1f9f458b2fc7b86487 SHA512 0e3960a410aed0b061efe259689926eb39c0d81037bdcdcc6553b25e341967ffc5929d53c00bc7bedb7ce7b9d0188e5179ee4eb0b5648db82609458e4e06986b WHIRLPOOL bb3a0cae913b9f743a57976f1a6e80dec1943f32ca2550612116f9636a17f363376ae00e64e0f5dee3c4c0ab436d6cf4af227a8db6164c7041c6ffd509eb91e6
diff --git a/net-dns/nsd/files/nsd3.initd b/net-dns/nsd/files/nsd3.initd-r1
index c3acd93aedfd..35ae73fd8854 100644
--- a/net-dns/nsd/files/nsd3.initd
+++ b/net-dns/nsd/files/nsd3.initd-r1
@@ -1,7 +1,7 @@
 #!/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/nsd/files/nsd3.initd,v 1.1 2013/04/03 19:10:39 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/files/nsd3.initd-r1,v 1.1 2013/04/03 21:06:18 wschlich Exp $
 
 description="NSD is an authoritative-only, high performance, open source name server"
 extra_commands="configtest patch"
@@ -10,7 +10,7 @@ extra_commands="configtest patch"
 NSD_CONFIG="${NSD_CONFIG:-/etc/nsd/nsd.conf}"
 NSD_BINARY="${NSD_BINARY:-/usr/sbin/nsd}"
 NSD_CHECKCONF="${NSD_CHECKCONF:-/usr/sbin/nsd-checkconf}"
-NSDC_BINARY="${NSD_BINARY:-/usr/sbin/nsdc}"
+NSDC_BINARY="${NSDC_BINARY:-/usr/sbin/nsdc}"
 
 depend() {
 	need net
@@ -36,10 +36,6 @@ checkconfig() {
 }
 
 patch() {
-	if ! test -x "${NSDC_BINARY}"; then
-		# nsdc binary only available in nsd3, patching not needed for nsd4
-		return 0
-	fi
 	local difffile=$(${NSD_CHECKCONF} -o difffile "${NSD_CONFIG}")
 	if ! test -s "${difffile}"; then
 		# no difffile found or difffile empty, so no patching required
diff --git a/net-dns/nsd/nsd-3.2.15.ebuild b/net-dns/nsd/nsd-3.2.15-r1.ebuild
index 227ff1ec68e1..2e407a42031e 100644
--- a/net-dns/nsd/nsd-3.2.15.ebuild
+++ b/net-dns/nsd/nsd-3.2.15-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/nsd/nsd-3.2.15.ebuild,v 1.1 2013/04/03 19:10:39 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-3.2.15-r1.ebuild,v 1.1 2013/04/03 21:06:18 wschlich Exp $
 
 EAPI=4
 
@@ -59,7 +59,7 @@ src_install() {
 	exeinto /etc/cron.daily
 	newexe "${FILESDIR}"/nsd3-patch.cron nsd-patch.cron
 
-	newinitd "${FILESDIR}"/nsd3.initd nsd
+	newinitd "${FILESDIR}"/nsd3.initd-r1 nsd
 
 	# database directory, writable by nsd for database updates and zone transfers
 	dodir /var/db/nsd