commit: 720b7d2138131bdad9f430138f328b185158c4fd Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Mon Nov 4 01:19:41 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Mon Nov 4 01:29:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=720b7d21
net-dns/nsd: drop 4.9.1 Bug: https://bugs.gentoo.org/937318 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> net-dns/nsd/Manifest | 1 - .../nsd/files/nsd-4.9.1-systemd-no-pidfile.patch | 16 --- net-dns/nsd/nsd-4.9.1.ebuild | 151 --------------------- 3 files changed, 168 deletions(-) diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest index d2631f26e9a4..32bf4d32a68c 100644 --- a/net-dns/nsd/Manifest +++ b/net-dns/nsd/Manifest @@ -1,2 +1 @@ DIST nsd-4.10.1.tar.gz 1404799 BLAKE2B 7b286ac681c1bb8201654cd2e5fac8a98256f6a595dfbb39bcfed92de63b3337e05d219bc766bab01e4aaf3fb1de3c128d7157caeee3a7f21e4132db9ea72cba SHA512 b0f4bdca8a1c6fbbe99096abc8c5f8b34ef2e66dc0da44da253ab164b35ad0aaef5d05eb682b88cc68d8b1671f7b80abafee242a784ed6deb785adee7f6a53a9 -DIST nsd-4.9.1.tar.gz 1309953 BLAKE2B 4a43db480be7196c0a177cc6ee2b9cd6eaaaa9af4d0c3dc7b8f07a5b9e24fd4eac816a29f83de870efe012f2f3bbcbb9bdbda903d05bf9d96574bddc97f68547 SHA512 65cd38aa8a41aee57a6950747de448bc4007a2d2c095152f1d22006f85faa7f0732ec4aa0aeae9f46bc69bff17164d8fe384bbc3441d0484364c4af938b511c1 diff --git a/net-dns/nsd/files/nsd-4.9.1-systemd-no-pidfile.patch b/net-dns/nsd/files/nsd-4.9.1-systemd-no-pidfile.patch deleted file mode 100644 index 49528723e35b..000000000000 --- a/net-dns/nsd/files/nsd-4.9.1-systemd-no-pidfile.patch +++ /dev/null @@ -1,16 +0,0 @@ -# See: -# https://github.com/NLnetLabs/nsd/issues/317 - -diff --git a/contrib/nsd.service b/contrib/nsd.service -index f45359f91..0cc12cc3c 100644 ---- a/contrib/nsd.service -+++ b/contrib/nsd.service -@@ -4,7 +4,7 @@ After=syslog.target network-online.target - - [Service] - Type=notify --ExecStart=/usr/sbin/nsd -d -c /etc/nsd/nsd.conf $NSD_EXTRA_OPTS -+ExecStart=/usr/sbin/nsd -d -P "" -c /etc/nsd/nsd.conf $NSD_EXTRA_OPTS - ExecReload=/bin/kill -HUP $MAINPID - KillMode=mixed - PrivateTmp=true diff --git a/net-dns/nsd/nsd-4.9.1.ebuild b/net-dns/nsd/nsd-4.9.1.ebuild deleted file mode 100644 index f18bd817fb51..000000000000 --- a/net-dns/nsd/nsd-4.9.1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit autotools systemd tmpfiles - -DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd"; - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git"; -else - # version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1 - MY_PV="${PV/_beta/b}" - MY_PV="${MY_PV/_rc/rc}" - MY_P="${PN}-${MY_PV}" - - 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 - -LICENSE="BSD" -SLOT="0" -IUSE="bind8-stats debug +default-znow dnstap +ipv6 +largefile libevent +lto memclean minimal-responses mmap munin +nsec3 packed +pie +radix-tree ratelimit recvmmsg ssl systemd +tfo year2038" - -RDEPEND=" - acct-group/nsd - acct-user/nsd - dnstap? ( - dev-libs/fstrm - dev-libs/protobuf-c - ) - libevent? ( dev-libs/libevent ) - munin? ( net-analyzer/munin ) - ssl? ( dev-libs/openssl:0= ) - systemd? ( sys-apps/systemd ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/lex - app-alternatives/yacc - systemd? ( virtual/pkgconfig ) -" - -PATCHES=( - "${FILESDIR}/${P}-systemd-no-pidfile.patch" - "${FILESDIR}/${PN}-munin-gentoo-paths.patch" -) - -NSD_CONFD_VER="1" # Cur version of NSD's OpenRC conf.d file. -NSD_INITD_VER="2" # Cur version of NSD's OpenRC init.d script. -NSD_TMPFILESD_VER="1" # Cur version of NSD's tmpfiles.d config. - -NSD_DBDIR="/var/db/nsd" # Default dir for NSD's databases. -NSD_ZNDIR="/var/lib/nsd" # Default dir for NSD's zone files. - -src_prepare() { - default - - # Required to get correct pkg-config macros with USE="systemd". - # See bugs #663618 & #758050. - eautoreconf -} - -src_configure() { - local myconf=( - $(use_enable bind8-stats) - $(use_enable bind8-stats zone-stats) - $(use_enable debug checking) - $(use_enable default-znow relro-now) - $(use_enable dnstap) - $(use_enable ipv6) - $(use_enable largefile) - $(use_enable lto flto) - $(use_enable memclean) - $(use_enable minimal-responses) - $(use_enable mmap) - $(use_enable nsec3) - $(use_enable packed) - $(use_enable pie) - $(use_enable radix-tree) - $(use_enable ratelimit) - $(use_enable recvmmsg) - $(use_enable systemd) - $(use_enable tfo tcp-fastopen) - $(use_with libevent) - $(use_with ssl) - - --with-dbfile="${EPREFIX}${NSD_DBDIR}/nsd.db" - --with-logfile="${EPREFIX}/var/log/nsd.log" - --with-pidfile="${EPREFIX}/run/nsd.pid" - --with-xfrdfile="${EPREFIX}${NSD_DBDIR}/xfrd.state" - --with-xfrdir="${EPREFIX}${NSD_DBDIR}" - --with-zonelistfile="${EPREFIX}${NSD_DBDIR}/zone.list" - --with-zonesdir="${EPREFIX}${NSD_ZNDIR}" - ) - - # This configure switch only appears on glibc-based userlands. - # It enables 64-bit time_t to support timestamps greater than - # the year 2038 (D_TIME_BITS=64). - if use elibc_glibc; then - myconf+=( $(use_enable year2038) ) - fi - - econf "${myconf[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS} - newinitd "${FILESDIR}/nsd.initd-r${NSD_INITD_VER}" nsd - newconfd "${FILESDIR}/nsd.confd-r${NSD_CONFD_VER}" nsd - newtmpfiles "${FILESDIR}/nsd.tmpfilesd-r${NSD_TMPFILESD_VER}" nsd.conf - - # Install munin plugin and config, if requested. - 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 - - # Use the upstream-provided systemd service file. - systemd_dounit "contrib/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" - - keepdir "${NSD_DBDIR}" -} - -pkg_postinst() { - # See eclass/tmpfiles.eclass for info. - tmpfiles_process nsd.conf - - # Database directory - # Writable by nsd:nsd for database updates and zone transfers. - install -d -m 750 -o nsd -g nsd "${EROOT}/${NSD_DBDIR}" - - # Zones directory - # Writable by nsd:nsd for zone file updates (via 'nsd-control write'). - install -d -m 750 -o nsd -g nsd "${EROOT}/${NSD_ZNDIR}" -}
