From 9e130be7ad809d9aaee0268e6ef264361803f1d9 Mon Sep 17 00:00:00 2001 From: "Tom Hendrikx (whyscream)" Date: Mon, 26 Nov 2012 23:22:23 +0100 Subject: net-dns/nsd: Move /var/run/nsd/ creation to init script --- net-dns/nsd/ChangeLog | 6 +++ net-dns/nsd/Manifest | 6 +-- net-dns/nsd/files/nsd.initd | 4 ++ net-dns/nsd/nsd-3.2.14-r1.ebuild | 84 ++++++++++++++++++++++++++++++++++++++++ net-dns/nsd/nsd-3.2.14.ebuild | 84 ---------------------------------------- 5 files changed, 97 insertions(+), 87 deletions(-) create mode 100644 net-dns/nsd/nsd-3.2.14-r1.ebuild delete mode 100644 net-dns/nsd/nsd-3.2.14.ebuild (limited to 'net-dns') diff --git a/net-dns/nsd/ChangeLog b/net-dns/nsd/ChangeLog index 1a5a0501c..4365cfd64 100644 --- a/net-dns/nsd/ChangeLog +++ b/net-dns/nsd/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*nsd-3.2.14-r1 (26 Nov 2012) + + 26 Nov 2012; Tom Hendrikx (whyscream) -nsd-3.2.14.ebuild, + +nsd-3.2.14-r1.ebuild, files/nsd.initd: + Move /var/run/nsd/ creation to init script + *nsd-3.2.14 (02 Nov 2012) 02 Nov 2012; Tom Hendrikx (whyscream) -nsd-3.2.13.ebuild, diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest index 0a8fb36d4..69edb4169 100644 --- a/net-dns/nsd/Manifest +++ b/net-dns/nsd/Manifest @@ -1,7 +1,7 @@ AUX nsd.confd 104 SHA256 de3c05a7b898b86f544ebc5804540dbf9736695cb21d614964561294533f2050 SHA512 ffe01f32b79d14eccaf0a7697b7eaddf8d0522015586744f28107b3397ee04021f702325cc9b2c3ab3eb9ae06fbad5c96b044551005e7e6149f8798300bac98a WHIRLPOOL f5e7baa796830d777764c7f7dcd831b3994986814cdd6944df289f5055120f896b178514684c8b557d8b70ef1023242ccae3d45b510710bb73108f63065dfe77 AUX nsd.cron 262 SHA256 c7b1d0141be64800fe88054b589afa0dc25d21ab42f40ee46e5b1ec659bfc8da SHA512 91919b37ac9eaf0e787a19ca59f85366a6660883722c167bc0bfdc18c2ffdfb8770df505d5bfb33235a21cd993b7f0a29f99017aac1cc2a04f31590ff289ff1c WHIRLPOOL a0d59373f112bee23e58000216dbb4c9642e505f650a87d134b1fe07a2694a6ea77e9d3effb33e61fcaaa6d8540f2e46b64eb326d7c16ffd1a167a74ef76b585 -AUX nsd.initd 1825 SHA256 f58d7c403636d39b5211cb293931625764e77debae3907c09d8a3f7eb2fd3b15 SHA512 dbf34189d733bc24f1d6d2a972bc01931204c52e4a9a5bafcc099780e42b838558dcd76cbb7319527b7f0e3ecd5abf4aca3d1b9422556d2bd0f86c506217c379 WHIRLPOOL c04a4927e0f181b2a47231b791e15fe6025b067749994ac97c045bac4516f3a5bc651389e2075eb417b161115dd8df8e1cc0d24e95c49415152619eb86d24218 +AUX nsd.initd 1938 SHA256 990fccc16593dd8e04a5669ee759a62d0b4b304a304fad39d239fe08de39a5ac SHA512 0d1131e3a61a0972b193de178cc902515c06af374b87b7b6795f5b09322fb94d80bb345a4175cf292015015163f210adbbe25b0faef499cce5de89d003331592 WHIRLPOOL 79735d7ed779024e7f2700ed5e1aa507286e89a2a0f4c4f0dcbe0d63a79ccfcfd4dee6171fb27b11c0a3c757955f57919e86ff9b58f4445ccf9c8aeadf27ccfd DIST nsd-3.2.14.tar.gz 890523 SHA256 c338780412f330e492e74a51fb99a4610d1f4c9095293a231e42e29d045a104c SHA512 673b9b7d744b6336f0ae350a158b3cc7bdddb9c984d1c274a3b49962fb0fef3aac1e4911f4b7bed1688a1c09f40d98e1585c2a38b28b7d8086ca81e2e63b66d4 WHIRLPOOL c7090b7bfa44235e8604af057bf6511a2da1336fdd714c64d49b94e2d732c8ce67c59c1b21928cec297690f4487559b3abb4d132758bd8c32f8d658ef73959f5 -EBUILD nsd-3.2.14.ebuild 2068 SHA256 c4d7a4d474ff1fd20fd3b5872732424201ae95511c0f1fe556683e02fa262ba8 SHA512 f5020598fa1b60640c0a6bf63708626d9ff0157e5524af4eb8997118e602b7538e7086c0ed1ae8b3cf7d13db0d3162405d3c80b2e8aa10dc2089c946b7daa66c WHIRLPOOL e7cba0a9a32600bbd3739a900dc10e717374b3fae2db4ce9ad710191d39ba7525c376d36d4957b7cf960308fd4464afd204b14e06bd4e352217968f6cf73fa9b -MISC ChangeLog 4793 SHA256 7f3375e6be0dfe315a3fa52e7e0b144401cab2697168a5fc59552a65c4abe3f9 SHA512 962158d9092a8d8740f173f76e756e6a06528fb0d57138b58420b51a84c07972796af8eece74fc176c7406088e8f9858e819f7ca8d7e69a24e6359be54b4b342 WHIRLPOOL f274bc1237035dec972096aa57a587bf89a5b41c4c2e5a4e232ed6a63106f33ab1374384d9998e02debeb92817cdde4e99fa7ebf41d81d295a722bd7661f02eb +EBUILD nsd-3.2.14-r1.ebuild 2129 SHA256 8c51fe84d6c2e8ed09b087203dfbc3d64e2aecb15eae734bcd4f9af48040a1b0 SHA512 2295635157bbb1d9d666af80ecaeb58ca43611a978d55f181daace8d1bf6c807f01150479f1e2d8cbc9fea9042caac8b5046d20062178202a79010b0e284a3cc WHIRLPOOL e413f4721870ea9e3e9787d5650741e5ee8d11bea95d31eb4019380b2fd3ea4f0ace1d6ec67a2544ba847da6e997169a6e6158484266e1adba7559106f8ac018 +MISC ChangeLog 4991 SHA256 032101fec1df2272fe81c99453b28e0d577db703b55493e9652ea4413b1b008b SHA512 572531b716bd280581813c8c9690a2413511b41cef9748ed3c6793c18988c3d4e64c2132483c4fd51562fae351e64f99137ed7bb7ec5e5b66ead560730f2575d WHIRLPOOL 1e9d375c790a7b8b0ba021747f5bd4181151f2f8b94a2bbd0faaf40fe103c7bdee2e039d965f0992b5438a506ece25e77329c1807e465a20e0e8fc9e846f5dd0 MISC metadata.xml 632 SHA256 fd58c2c3edd0ed6c7cef499ba635cfa475ab347d0dd5bba6912abb83796d421f SHA512 8ed1eb4ca29b5b3da5ba5ccb18562fcd80f1a0fa4d72aa0168c77c860b8b9b00531dc2ed6e77af4f6afb97ac99062e8324f19b4595b644fbf11edb810fa634d8 WHIRLPOOL 19f936611ae370a2e9b4fd23bfbcf6650d9e1e2d49c5b695592627253a4e21929fff399ad1375b1002281ffd97dd06d50c0ee65f8f0ba0f2652277d005a43a78 diff --git a/net-dns/nsd/files/nsd.initd b/net-dns/nsd/files/nsd.initd index 891df962e..1325420aa 100644 --- a/net-dns/nsd/files/nsd.initd +++ b/net-dns/nsd/files/nsd.initd @@ -62,6 +62,10 @@ rebuild() { start() { ebegin "Starting NSD" + + local pidfile=$(${my_nsd_checkconf} -o pidfile ${config_file}) + checkpath -d -o nsd:nsd $(dirname ${pidfile}) + _checkconf || return 1 _checkdb || return 1 ${my_nsdc} start diff --git a/net-dns/nsd/nsd-3.2.14-r1.ebuild b/net-dns/nsd/nsd-3.2.14-r1.ebuild new file mode 100644 index 000000000..e25ce7c06 --- /dev/null +++ b/net-dns/nsd/nsd-3.2.14-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit user versionator + +DESCRIPTION="An authoritative only, high performance, open source name server" +HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" +SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bind8-stats ipv6 mmap +nsec3 root-server runtime-checks zone-stats" + +RDEPEND=" + dev-libs/openssl + virtual/yacc +" +DEPEND=" + ${RDEPEND} + sys-devel/flex +" + +pkg_setup() { + enewgroup nsd + enewuser nsd -1 -1 -1 nsd +} + +src_configure() { + # ebuild.sh sets localstatedir to /var/lib, but nsd expects /var in several locations + # some of these cannot be changed by arguments to econf/configure, f.i. logfile + econf \ + --localstatedir="${EPREFIX}/var" \ + --with-pidfile="${EPREFIX}/var/run/nsd/nsd.pid" \ + --with-zonesdir="${EPREFIX}/var/lib/nsd" \ + --enable-largefile \ + $(use_enable bind8-stats) \ + $(use_enable ipv6) \ + $(use_enable mmap) \ + $(use_enable nsec3) \ + $(use_enable root-server) \ + $(use_enable runtime-checks checking) \ + $(use_enable zone-stats) +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc doc/{ChangeLog,CREDITS,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS} + + insinto /usr/share/nsd + doins contrib/nsd.zones2nsd.conf + + exeinto /etc/cron.daily + doexe "${FILESDIR}"/nsd.cron + + newinitd "${FILESDIR}"/nsd.initd nsd + newconfd "${FILESDIR}"/nsd.confd nsd + + # database directory, writable by nsd for ixfr.db file + dodir /var/db/nsd + fowners nsd:nsd /var/db/nsd + fperms 750 /var/db/nsd + + # zones directory, writable by root for 'nsdc patch' + dodir /var/lib/nsd + fowners root:nsd /var/lib/nsd + fperms 750 /var/lib/nsd + + # remove /var/run data created by Makefile, handled by initd script + rm -rf "${D}"/var/run || die "could not remove /var/run/ directory" + +} + +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 '/etc/init.d/nsd rebuild' to rebuild the database, then restart nsd." + fi +} diff --git a/net-dns/nsd/nsd-3.2.14.ebuild b/net-dns/nsd/nsd-3.2.14.ebuild deleted file mode 100644 index 6ab5454b3..000000000 --- a/net-dns/nsd/nsd-3.2.14.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit user versionator - -DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bind8-stats ipv6 mmap +nsec3 root-server runtime-checks zone-stats" - -RDEPEND=" - dev-libs/openssl - virtual/yacc -" -DEPEND=" - ${RDEPEND} - sys-devel/flex -" - -pkg_setup() { - enewgroup nsd - enewuser nsd -1 -1 -1 nsd -} - -src_configure() { - # ebuild.sh sets localstatedir to /var/lib, but nsd expects /var in several locations - # some of these cannot be changed by arguments to econf/configure, f.i. logfile - econf \ - --localstatedir="${EPREFIX}/var" \ - --with-pidfile="${EPREFIX}/var/run/nsd/nsd.pid" \ - --with-zonesdir="${EPREFIX}/var/lib/nsd" \ - --enable-largefile \ - $(use_enable bind8-stats) \ - $(use_enable ipv6) \ - $(use_enable mmap) \ - $(use_enable nsec3) \ - $(use_enable root-server) \ - $(use_enable runtime-checks checking) \ - $(use_enable zone-stats) -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc doc/{ChangeLog,CREDITS,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS} - - insinto /usr/share/nsd - doins contrib/nsd.zones2nsd.conf - - exeinto /etc/cron.daily - doexe "${FILESDIR}"/nsd.cron - - newinitd "${FILESDIR}"/nsd.initd nsd - newconfd "${FILESDIR}"/nsd.confd nsd - - # database directory, writable by nsd for ixfr.db file - dodir /var/db/nsd - fowners nsd:nsd /var/db/nsd - fperms 750 /var/db/nsd - - # zones directory, writable by root for 'nsdc patch' - dodir /var/lib/nsd - fowners root:nsd /var/lib/nsd - fperms 750 /var/lib/nsd - - # pid dir, writable by nsd - dodir /var/run/nsd - fowners nsd:nsd /var/run/nsd -} - -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 '/etc/init.d/nsd rebuild' to rebuild the database, then restart nsd." - fi -} -- cgit v1.2.3-65-gdbad