From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE682158094 for ; Wed, 29 Jun 2022 17:49:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DC78E0827; Wed, 29 Jun 2022 17:49:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F4036E0827 for ; Wed, 29 Jun 2022 17:49:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 127D9340E94 for ; Wed, 29 Jun 2022 17:49:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCF7D4ED for ; Wed, 29 Jun 2022 17:49:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1656524961.93228c2489743e2c043c4243967b4732a82c4de7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/nsd/nsd-4.5.0-r1.ebuild net-dns/nsd/nsd-9999.ebuild X-VCS-Directories: net-dns/nsd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 93228c2489743e2c043c4243967b4732a82c4de7 X-VCS-Branch: master Date: Wed, 29 Jun 2022 17:49:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9d33c059-d0af-4d9b-b7ca-04b499688678 X-Archives-Hash: db8a832fe8534b2ca6b43b8253d0161a commit: 93228c2489743e2c043c4243967b4732a82c4de7 Author: Sam James gentoo org> AuthorDate: Wed Jun 29 17:39:24 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jun 29 17:49:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93228c24 net-dns/nsd: modernise - Use more skel.ebuild-like structure - Use HTTPS - Drop USE=ipv6 (introduces no deps) - Rename USE=runtime-checks -> USE=debug (it's for controlling assertions) Signed-off-by: Sam James gentoo.org> .../nsd/{nsd-9999.ebuild => nsd-4.5.0-r1.ebuild} | 36 +++++++++++++--------- net-dns/nsd/nsd-9999.ebuild | 36 +++++++++++++--------- 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/net-dns/nsd/nsd-9999.ebuild b/net-dns/nsd/nsd-4.5.0-r1.ebuild similarity index 82% copy from net-dns/nsd/nsd-9999.ebuild copy to net-dns/nsd/nsd-4.5.0-r1.ebuild index a41057e6300d..d3d5d3b51e9d 100644 --- a/net-dns/nsd/nsd-9999.ebuild +++ b/net-dns/nsd/nsd-4.5.0-r1.ebuild @@ -6,10 +6,9 @@ EAPI=8 inherit autotools systemd DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" -LICENSE="BSD" -SLOT="0" -if [[ "${PV}" == *9999 ]] ; then +HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd" + +if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git" else @@ -18,12 +17,17 @@ else MY_PV="${MY_PV/_rc/rc}" MY_P="${PN}-${MY_PV}" - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~amd64 ~x86" - SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" - S="${WORKDIR}/${MY_P}" + if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then + SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" + S="${WORKDIR}"/${MY_P} + + KEYWORDS="~amd64 ~x86" + fi fi -IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd" + +LICENSE="BSD" +SLOT="0" +IUSE="bind8-stats debug dnstap libevent minimal-responses mmap munin +nsec3 ratelimit root-server ssl systemd" RDEPEND=" acct-group/nsd @@ -51,17 +55,20 @@ PATCHES=( src_prepare() { default + # Required to get correct pkg-config macros with USE="systemd" - # see bugs #663618 and #758050 + # See bugs #663618 and #758050 eautoreconf } src_configure() { local myeconfargs=( + --enable-ipv6 --enable-largefile --enable-pie --enable-relro-now --enable-tcp-fastopen + --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db --with-logfile="${EPREFIX}"/var/log/nsd.log --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid @@ -69,20 +76,21 @@ src_configure() { --with-xfrdir="${EPREFIX}"/var/db/nsd --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 debug checking) $(use_enable dnstap) - $(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 systemd) $(use_with libevent) $(use_with ssl) ) + econf "${myeconfargs[@]}" } @@ -93,7 +101,7 @@ src_install() { newinitd "${FILESDIR}"/nsd.initd-r1 nsd - # install munin plugin and config + # Install munin plugin and config if use munin ; then exeinto /usr/libexec/munin/plugins doexe contrib/nsd_munin_ @@ -103,7 +111,7 @@ src_install() { systemd_dounit "${FILESDIR}"/nsd.service - # remove the /run directory that usually resides on tmpfs and is + # 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" diff --git a/net-dns/nsd/nsd-9999.ebuild b/net-dns/nsd/nsd-9999.ebuild index a41057e6300d..d3d5d3b51e9d 100644 --- a/net-dns/nsd/nsd-9999.ebuild +++ b/net-dns/nsd/nsd-9999.ebuild @@ -6,10 +6,9 @@ EAPI=8 inherit autotools systemd DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" -LICENSE="BSD" -SLOT="0" -if [[ "${PV}" == *9999 ]] ; then +HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd" + +if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git" else @@ -18,12 +17,17 @@ else MY_PV="${MY_PV/_rc/rc}" MY_P="${PN}-${MY_PV}" - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~amd64 ~x86" - SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" - S="${WORKDIR}/${MY_P}" + if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then + SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" + S="${WORKDIR}"/${MY_P} + + KEYWORDS="~amd64 ~x86" + fi fi -IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd" + +LICENSE="BSD" +SLOT="0" +IUSE="bind8-stats debug dnstap libevent minimal-responses mmap munin +nsec3 ratelimit root-server ssl systemd" RDEPEND=" acct-group/nsd @@ -51,17 +55,20 @@ PATCHES=( src_prepare() { default + # Required to get correct pkg-config macros with USE="systemd" - # see bugs #663618 and #758050 + # See bugs #663618 and #758050 eautoreconf } src_configure() { local myeconfargs=( + --enable-ipv6 --enable-largefile --enable-pie --enable-relro-now --enable-tcp-fastopen + --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db --with-logfile="${EPREFIX}"/var/log/nsd.log --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid @@ -69,20 +76,21 @@ src_configure() { --with-xfrdir="${EPREFIX}"/var/db/nsd --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 debug checking) $(use_enable dnstap) - $(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 systemd) $(use_with libevent) $(use_with ssl) ) + econf "${myeconfargs[@]}" } @@ -93,7 +101,7 @@ src_install() { newinitd "${FILESDIR}"/nsd.initd-r1 nsd - # install munin plugin and config + # Install munin plugin and config if use munin ; then exeinto /usr/libexec/munin/plugins doexe contrib/nsd_munin_ @@ -103,7 +111,7 @@ src_install() { systemd_dounit "${FILESDIR}"/nsd.service - # remove the /run directory that usually resides on tmpfs and is + # 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"