diff options
| author |   Tom Hendrikx (whyscream) <tom@whyscream.net> | 2012-01-06 20:55:37 +0000 |
|---|---|---|
| committer | Tom Hendrikx (whyscream) <tom@whyscream.net> | 2012-01-06 20:55:37 +0000 |
| commit | 504d92eddfd4bdf5a1ae0c320dc5937bb0054534 (patch) | |
| tree | a2286e668f9acdf3b6c313ef2a7acbe1521c46c6 /net-dns | |
| parent | x11-misc/webilder: New Ebuild for bug 291057 (diff) | |
| download | sunrise-504d92eddfd4bdf5a1ae0c320dc5937bb0054534.tar.gz sunrise-504d92eddfd4bdf5a1ae0c320dc5937bb0054534.tar.bz2 sunrise-504d92eddfd4bdf5a1ae0c320dc5937bb0054534.zip | |
net-dns/nsd: correct $extra_commands usage
svn path=/sunrise/; revision=12633
Diffstat (limited to 'net-dns')
| -rw-r--r-- | net-dns/nsd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dns/nsd/Manifest | 6 | ||||
| -rw-r--r-- | net-dns/nsd/files/nsd.initd | 16 | ||||
| -rw-r--r-- | net-dns/nsd/nsd-3.2.9.ebuild | 4 |
4 files changed, 19 insertions, 13 deletions
diff --git a/net-dns/nsd/ChangeLog b/net-dns/nsd/ChangeLog index 93cd747a5..1245deed2 100644 --- a/net-dns/nsd/ChangeLog +++ b/net-dns/nsd/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for net-dns/nsd -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Jan 2012; Tom Hendrikx (whyscream) <tom@whyscream.net> nsd-3.2.9.ebuild, + files/nsd.initd: + correct $extra_commands usage + 09 Dec 2011; Tom Hendrikx (whyscream) <tom@whyscream.net> files/nsd.initd: updated init script, replaced deprecated $opts with new $extra_commands (no version bump necessary) diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest index 14aa53900..d06fbba0a 100644 --- a/net-dns/nsd/Manifest +++ b/net-dns/nsd/Manifest @@ -1,7 +1,7 @@ AUX nsd.confd 104 RMD160 cd15a20757fd4db72a2da5327d68f4d6561bb271 SHA1 5fab374d008609d8aba9adb2a6eb0574f4ea4596 SHA256 de3c05a7b898b86f544ebc5804540dbf9736695cb21d614964561294533f2050 AUX nsd.cron 262 RMD160 3fd5de5c7a3496d14705a5bb83d4632ce097b276 SHA1 6fc62e72e16fffd1d6e996cf616c9beb534a207d SHA256 c7b1d0141be64800fe88054b589afa0dc25d21ab42f40ee46e5b1ec659bfc8da -AUX nsd.initd 1740 RMD160 f83613eafd3a09b117509527c3ffd93c33f03196 SHA1 89d33ae85041812cac139b32b14785baf21bc9a4 SHA256 f6fab222e7cb8209dd1fe492418d62d38f20be345d301587c341c17d34e18d99 +AUX nsd.initd 1793 RMD160 015bd3524e1da7409e155bf43ee6a1f59f5c6328 SHA1 52971337fb7184027eaae53ce0aed9cfc8226474 SHA256 4b6338b97adba127e29d536dc7bfcedb2860ed34d949a2407f87f9a4321e9d5b DIST nsd-3.2.9.tar.gz 877836 RMD160 4b0363a51a4f493f302a4451e5cab9f51d009127 SHA1 66e17e5801e94da1a21f0f2a4dd7a4ab4ffe0dd9 SHA256 3bb0e07e9e2ba863f08f56ca766f201b04fe8e5131ce02e1982b631033939146 -EBUILD nsd-3.2.9.ebuild 2084 RMD160 4c32466b2a441dd23867c165f39ca9e06bf2542a SHA1 2d31237a88644ae2f80d1aa247d2e75508c75960 SHA256 2cbff4909213ee08241ded9a3cab539c369989839da5e9180a33d797fc17aeb1 -MISC ChangeLog 3592 RMD160 a37af7f51a006a75df25a6b866461dcb6ca7bad3 SHA1 ef112346525c4bc612f5ab5ff124422b07e67503 SHA256 6d3c3f8a8187048a8914e7a0fe48bc361dbc25910ef677f4258295163c033292 +EBUILD nsd-3.2.9.ebuild 2085 RMD160 7f6b2100befab5bb709e85e5a4835bf494905e2a SHA1 b33fca668edc0f3e6d4b9433e8011c7a729beaec SHA256 80dc5c7f216fe76b14e2cf60de816f589a9ac0333e5ff790c51d9d1069802cbf +MISC ChangeLog 3722 RMD160 3de3a5165266ab43c120643633ac0c0c6192f2f2 SHA1 fa3fa7094d447e553d288f3a18603d7a8210fe0e SHA256 d312c96da80fd84265b8b00f1684c08947b3fa8e879e70b5a7390ea4a2c004bd MISC metadata.xml 472 RMD160 a598246ecb755ea526707cd20a3950929edb602b SHA1 5a4e9c06700d13b9fd7d92e2c65b3bcab66eee5b SHA256 84691567761773c3ccf9e9cc7a26edec1ceccf9a0a4596863779404380b0b0e9 diff --git a/net-dns/nsd/files/nsd.initd b/net-dns/nsd/files/nsd.initd index cc64bd11e..c9c687fb1 100644 --- a/net-dns/nsd/files/nsd.initd +++ b/net-dns/nsd/files/nsd.initd @@ -1,9 +1,10 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ # -extra_commands="reload" +extra_commands="rebuild" +extra_started_commands="reload" description="NSD is an authoritative only, high performance, open source name server" description_reload="Rebuild zone database and reload it" @@ -49,18 +50,19 @@ _patch() { fi } -_rebuild() { +rebuild() { + ebegin "Rebuilding NSD zone database" if ! ${my_nsdc} rebuild > /dev/null; then eerror "There was an error rebuilding the database. Please review your zone files." return 1 fi - return 0 + eend $? } start() { ebegin "Starting NSD" _checkconf || return 1 - _checkdb || _rebuild || return 1 + _checkdb || rebuild || return 1 ${my_nsdc} start ${my_nsdc} running eend $? @@ -74,9 +76,9 @@ stop() { } reload() { - ebegin "Rebuilding and reloading NSD zone database" _checkconf || return 1 - _rebuild || return 1 + rebuild || return 1 + ebegin "Reloading NSD zone database" ${my_nsdc} reload eend $? } diff --git a/net-dns/nsd/nsd-3.2.9.ebuild b/net-dns/nsd/nsd-3.2.9.ebuild index fc97e461f..e0713f2aa 100644 --- a/net-dns/nsd/nsd-3.2.9.ebuild +++ b/net-dns/nsd/nsd-3.2.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -74,6 +74,6 @@ pkg_postinst() { version_compare "3.2.9" "${REPLACING_VERSIONS}" if test $? -eq 3; then ewarn "In ${PN}-3.2.9, the database format was changed." - ewarn "Please run '/usr/sbin/nsdc rebuild' to rebuild the database, then restart nsd." + ewarn "Please run '/etc/init.d/nsd rebuild' to rebuild the database, then restart nsd." fi } |