From 5dc98070b4ff04e3d47bad475d6032a4bdb41e72 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 25 Aug 2016 10:39:37 +0200 Subject: net-dns/nsd: Minor bugfix in new init script. Revbump so users get the fix. Package-Manager: portage-2.3.0 Signed-off-by: Lars Wendler --- net-dns/nsd/files/nsd.initd-r1 | 2 +- net-dns/nsd/nsd-4.1.11-r1.ebuild | 97 ++++++++++++++++++++++++++++++++++++++++ net-dns/nsd/nsd-4.1.11.ebuild | 97 ---------------------------------------- 3 files changed, 98 insertions(+), 98 deletions(-) create mode 100644 net-dns/nsd/nsd-4.1.11-r1.ebuild delete mode 100644 net-dns/nsd/nsd-4.1.11.ebuild (limited to 'net-dns') diff --git a/net-dns/nsd/files/nsd.initd-r1 b/net-dns/nsd/files/nsd.initd-r1 index 3f71e76b1610..ef81f9e663e1 100755 --- a/net-dns/nsd/files/nsd.initd-r1 +++ b/net-dns/nsd/files/nsd.initd-r1 @@ -42,8 +42,8 @@ configtest() { start_pre() { checkconfig || return $? - checkpath --directory --owner nsd:nsd $(dirname "${pidfile}") pidfile="$(get_pidfile)" + checkpath --directory --owner nsd:nsd "${pidfile%/*}" || return 1 } stop_pre() { diff --git a/net-dns/nsd/nsd-4.1.11-r1.ebuild b/net-dns/nsd/nsd-4.1.11-r1.ebuild new file mode 100644 index 000000000000..3719d0f0ac27 --- /dev/null +++ b/net-dns/nsd/nsd-4.1.11-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit user systemd + +DESCRIPTION="An authoritative only, high performance, open source name server" +HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" +# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1 +MY_PV=${PV/_rc/rc} +MY_PV=${MY_PV/_beta/b} +MY_P=${PN}-${MY_PV} +S="${WORKDIR}/${MY_P}" +SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl" + +RDEPEND=" + virtual/yacc + libevent? ( dev-libs/libevent ) + ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) + munin? ( net-analyzer/munin ) +" +DEPEND=" + ${RDEPEND} + sys-devel/flex +" + +src_prepare() { + # Fix the paths in the munin plugin to match our install + eapply "${FILESDIR}"/nsd_munin_.patch + eapply_user +} + +src_configure() { + econf \ + --enable-pie \ + --enable-relro-now \ + --enable-largefile \ + --with-logfile="${EPREFIX}"/var/log/nsd.log \ + --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid \ + --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \ + --with-xfrdir="${EPREFIX}"/var/db/nsd \ + --with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state \ + --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list \ + --with-zonesdir="${EPREFIX}"/var/lib/nsd \ + $(use_enable bind8-stats) \ + $(use_enable bind8-stats zone-stats) \ + $(use_enable ipv6) \ + $(use_enable minimal-responses) \ + $(use_enable mmap) \ + $(use_enable nsec3) \ + $(use_enable ratelimit) \ + $(use_enable root-server) \ + $(use_enable runtime-checks checking) \ + $(use_with libevent) \ + $(use_with ssl) +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS} + + newinitd "${FILESDIR}"/nsd.initd-r1 nsd + + # install munin plugin and config + if use munin ; then + exeinto /usr/libexec/munin/plugins + doexe contrib/nsd_munin_ + insinto /etc/munin/plugin-conf.d + newins "${FILESDIR}"/nsd.munin-conf nsd_munin + fi + + systemd_dounit "${FILESDIR}"/nsd.service + + # remove the /run directory that usually resides on tmpfs and is + # being taken care of by the nsd init script anyway (checkpath) + rm -r "${ED}"/run || die "Failed to remove /run" +} + +pkg_postinst() { + # Do this in postinst to ensure the uid/gid is consistent for binpkgs + enewgroup nsd + enewuser nsd -1 -1 -1 nsd + + # database directory, writable by nsd for database updates and zone transfers + install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd + + # zones directory, writable by nsd for zone file updates (nsd-control write) + install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd +} diff --git a/net-dns/nsd/nsd-4.1.11.ebuild b/net-dns/nsd/nsd-4.1.11.ebuild deleted file mode 100644 index 3719d0f0ac27..000000000000 --- a/net-dns/nsd/nsd-4.1.11.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit user systemd - -DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" -# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1 -MY_PV=${PV/_rc/rc} -MY_PV=${MY_PV/_beta/b} -MY_P=${PN}-${MY_PV} -S="${WORKDIR}/${MY_P}" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl" - -RDEPEND=" - virtual/yacc - libevent? ( dev-libs/libevent ) - ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) - munin? ( net-analyzer/munin ) -" -DEPEND=" - ${RDEPEND} - sys-devel/flex -" - -src_prepare() { - # Fix the paths in the munin plugin to match our install - eapply "${FILESDIR}"/nsd_munin_.patch - eapply_user -} - -src_configure() { - econf \ - --enable-pie \ - --enable-relro-now \ - --enable-largefile \ - --with-logfile="${EPREFIX}"/var/log/nsd.log \ - --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid \ - --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \ - --with-xfrdir="${EPREFIX}"/var/db/nsd \ - --with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state \ - --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list \ - --with-zonesdir="${EPREFIX}"/var/lib/nsd \ - $(use_enable bind8-stats) \ - $(use_enable bind8-stats zone-stats) \ - $(use_enable ipv6) \ - $(use_enable minimal-responses) \ - $(use_enable mmap) \ - $(use_enable nsec3) \ - $(use_enable ratelimit) \ - $(use_enable root-server) \ - $(use_enable runtime-checks checking) \ - $(use_with libevent) \ - $(use_with ssl) -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS} - - newinitd "${FILESDIR}"/nsd.initd-r1 nsd - - # install munin plugin and config - if use munin ; then - exeinto /usr/libexec/munin/plugins - doexe contrib/nsd_munin_ - insinto /etc/munin/plugin-conf.d - newins "${FILESDIR}"/nsd.munin-conf nsd_munin - fi - - systemd_dounit "${FILESDIR}"/nsd.service - - # remove the /run directory that usually resides on tmpfs and is - # being taken care of by the nsd init script anyway (checkpath) - rm -r "${ED}"/run || die "Failed to remove /run" -} - -pkg_postinst() { - # Do this in postinst to ensure the uid/gid is consistent for binpkgs - enewgroup nsd - enewuser nsd -1 -1 -1 nsd - - # database directory, writable by nsd for database updates and zone transfers - install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd - - # zones directory, writable by nsd for zone file updates (nsd-control write) - install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd -} -- cgit v1.2.3-65-gdbad