summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfram Schlich <wschlich@gentoo.org>2013-04-03 21:06:18 +0000
committerWolfram Schlich <wschlich@gentoo.org>2013-04-03 21:06:18 +0000
commit8221ecd145ecca93fb23c1a8eb781a17566155f3 (patch)
tree4c09a1a9f0828ee6b75430f031da38c6e8aae7bb /net-dns
parentFix build failure with texinfo-5.1, bug 464308. Update EAPI. Specify LICENSE ... (diff)
downloadgentoo-2-8221ecd145ecca93fb23c1a8eb781a17566155f3.tar.gz
gentoo-2-8221ecd145ecca93fb23c1a8eb781a17566155f3.tar.bz2
gentoo-2-8221ecd145ecca93fb23c1a8eb781a17566155f3.zip
fix typo in nsd3.initd
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/nsd/ChangeLog8
-rw-r--r--net-dns/nsd/files/nsd3.initd-r1 (renamed from net-dns/nsd/files/nsd3.initd)8
-rw-r--r--net-dns/nsd/nsd-3.2.15-r1.ebuild (renamed from net-dns/nsd/nsd-3.2.15.ebuild)4
3 files changed, 11 insertions, 9 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/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