Version bumps, remove old. Install systemd unit, bug 522290. Move user creation to pkg_postinst for improved binpkg handling.

(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

6 files changed, 59 insertions, 209 deletions

diff --git a/net-dns/nsd/ChangeLog b/net-dns/nsd/ChangeLog
index 1cb7a546dbec..3cda93854d4e 100644
--- a/net-dns/nsd/ChangeLog
+++ b/net-dns/nsd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/nsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/ChangeLog,v 1.10 2014/03/26 07:50:41 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/ChangeLog,v 1.11 2014/09/28 18:12:51 floppym Exp $
+
+*nsd-3.2.18 (28 Sep 2014)
+*nsd-4.1.0 (28 Sep 2014)
+
+  28 Sep 2014; Mike Gilbert <floppym@gentoo.org> +files/nsd.service,
+  +nsd-3.2.18.ebuild, +nsd-4.1.0.ebuild, -nsd-3.2.16.ebuild, -nsd-3.2.17.ebuild,
+  -nsd-4.0.0.ebuild, -nsd-4.0.3.ebuild:
+  Version bumps, remove old. Install systemd unit, bug 522290. Move user
+  creation to pkg_postinst for improved binpkg handling.
 
   26 Mar 2014; Wolfram Schlich <wschlich@gentoo.org> files/nsd.munin-conf:
   munin config update by tom@whyscream.net (bug #505360, comment 3)
diff --git a/net-dns/nsd/files/nsd.service b/net-dns/nsd/files/nsd.service
new file mode 100644
index 000000000000..8337557faeef
--- /dev/null
+++ b/net-dns/nsd/files/nsd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=NSD authoritative DNS server
+Wants=network.target
+After=network.target
+
+[Service]
+Type=forking
+ExecStartPre=/usr/bin/install -d -o nsd -g nsd /run/nsd
+ExecStart=/usr/sbin/nsd
+KillMode=mixed
+PIDFile=/run/nsd/nsd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-dns/nsd/nsd-3.2.16.ebuild b/net-dns/nsd/nsd-3.2.16.ebuild
deleted file mode 100644
index f461b9ad0694..000000000000
--- a/net-dns/nsd/nsd-3.2.16.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.16.ebuild,v 1.1 2013/08/12 11:23:45 wschlich Exp $
-
-EAPI=4
-
-inherit user
-
-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 minimal-responses mmap +nsec3 ratelimit 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 minimal-responses) \
-		$(use_enable mmap) \
-		$(use_enable nsec3) \
-		$(use_enable ratelimit) \
-		$(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
-	newexe "${FILESDIR}"/nsd3-patch.cron nsd-patch.cron
-
-	newinitd "${FILESDIR}"/nsd3.initd-r1 nsd
-
-	# database directory, writable by nsd for database updates and zone transfers
-	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 -r "${D}"/var/run || die "could not remove /var/run/ directory"
-
-}
diff --git a/net-dns/nsd/nsd-3.2.17.ebuild b/net-dns/nsd/nsd-3.2.18.ebuild
index 1a9d79e3661c..cad2bb1378c8 100644
--- a/net-dns/nsd/nsd-3.2.17.ebuild
+++ b/net-dns/nsd/nsd-3.2.18.ebuild
@@ -1,14 +1,18 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-3.2.17.ebuild,v 1.1 2014/03/25 22:29:20 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-3.2.18.ebuild,v 1.1 2014/09/28 18:12:51 floppym Exp $
 
-EAPI=4
+EAPI=5
 
 inherit user
 
 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"
+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"
@@ -24,11 +28,6 @@ DEPEND="
 	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
@@ -61,17 +60,18 @@ src_install() {
 
 	newinitd "${FILESDIR}"/nsd3.initd-r1 nsd
 
-	# database directory, writable by nsd for database updates and zone transfers
-	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 -r "${D}"/var/run || die "could not remove /var/run/ directory"
 
 }
+
+pkg_postinst() {
+	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 root for 'nsdc patch'
+	install -d -m 750 -o root -g nsd "${EROOT%/}"/var//nsd
+}
diff --git a/net-dns/nsd/nsd-4.0.0.ebuild b/net-dns/nsd/nsd-4.0.0.ebuild
deleted file mode 100644
index 1dde9dd0fafc..000000000000
--- a/net-dns/nsd/nsd-4.0.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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-4.0.0.ebuild,v 1.1 2013/10/30 10:51:57 wschlich Exp $
-
-EAPI=4
-
-inherit user eutils
-
-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=${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"
-
-RDEPEND="
-	dev-libs/openssl
-	virtual/yacc
-	libevent? ( dev-libs/libevent )
-	ssl? ( dev-libs/openssl )
-	munin? ( net-analyzer/munin )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-"
-
-pkg_setup() {
-	enewgroup nsd
-	enewuser nsd -1 -1 -1 nsd
-}
-
-src_prepare() {
-	# Fix the paths in the munin plugin to match our install
-	epatch "${FILESDIR}"/nsd_munin_.patch
-}
-
-src_configure() {
-	econf \
-		--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 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 nsd
-
-	# database directory, writable by nsd for database updates and zone transfers
-	dodir /var/db/nsd
-	fowners nsd:nsd /var/db/nsd
-	fperms 750 /var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	dodir /var/lib/nsd
-	fowners nsd:nsd /var/lib/nsd
-	fperms 750 /var/lib/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
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -rf "${D}"/run || die "Failed to remove /run"
-}
diff --git a/net-dns/nsd/nsd-4.0.3.ebuild b/net-dns/nsd/nsd-4.1.0.ebuild
index e5f3f7220b44..1b3633eb8d1c 100644
--- a/net-dns/nsd/nsd-4.0.3.ebuild
+++ b/net-dns/nsd/nsd-4.1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-4.0.3.ebuild,v 1.1 2014/03/25 22:29:20 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-4.1.0.ebuild,v 1.1 2014/09/28 18:12:51 floppym Exp $
 
-EAPI=4
+EAPI=5
 
-inherit user eutils
+inherit user eutils systemd
 
 DESCRIPTION="An authoritative only, high performance, open source name server"
 HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
@@ -32,11 +32,6 @@ DEPEND="
 	sys-devel/flex
 "
 
-pkg_setup() {
-	enewgroup nsd
-	enewuser nsd -1 -1 -1 nsd
-}
-
 src_prepare() {
 	# Fix the paths in the munin plugin to match our install
 	epatch "${FILESDIR}"/nsd_munin_.patch
@@ -71,16 +66,6 @@ src_install() {
 
 	newinitd "${FILESDIR}"/nsd.initd nsd
 
-	# database directory, writable by nsd for database updates and zone transfers
-	dodir /var/db/nsd
-	fowners nsd:nsd /var/db/nsd
-	fperms 750 /var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	dodir /var/lib/nsd
-	fowners nsd:nsd /var/lib/nsd
-	fperms 750 /var/lib/nsd
-
 	# install munin plugin and config
 	if use munin; then
 		exeinto /usr/libexec/munin/plugins
@@ -89,7 +74,21 @@ src_install() {
 		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 -rf "${D}"/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
+}