commit: ded6a8ffe0e800dc4eec9de69feb67b5434f0dd9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 8 08:30:38 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 8 08:34:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded6a8ff
net-dns/nsd: drop 4.6.1-r1 Signed-off-by: Sam James <sam <AT> gentoo.org> net-dns/nsd/Manifest | 1 - .../files/nsd-4.6.1-incompatible-ptr-types.patch | 24 ---- net-dns/nsd/nsd-4.6.1-r1.ebuild | 128 --------------------- 3 files changed, 153 deletions(-) diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest index eca0f072344b..5ba3d093bc34 100644 --- a/net-dns/nsd/Manifest +++ b/net-dns/nsd/Manifest @@ -1,2 +1 @@ -DIST nsd-4.6.1.tar.gz 1281583 BLAKE2B 5eff5560ce16451a57905bb9d979c81918b6b55f72e1f1b89ab8d2e479ac36bf4f95152c77b1f1b3ce0af90bde8f25d2cad7226450c5cbc879f112adea2b3a69 SHA512 cab557a20cf8564cbf6e38405ca28b00baa6e14105527c3b16f49f57fed5e39cdb2bcd62999bad4aff2c69e0967bdba66a1eaa7b73a0d4d99d97535cc5860bfe DIST nsd-4.7.0.tar.gz 1289477 BLAKE2B d3949c8b65376ea78c700efaeb988acbfac5a5ba338f9bf29035176a7da6730ee8b7a2b6bfc5573ad178db80166ca74d71d313bf3d405acc666bf87f17dac63b SHA512 387e66993517c015ea49fc7a985c1f746623ae30a82bd01f224efbdb7c58d1d2f3e5a5a3574203959047876c632ec464b6682d1644f0e0f157ec0e6fb3f0cdbb diff --git a/net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch b/net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch deleted file mode 100644 index 4b87be966eb0..000000000000 --- a/net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/NLnetLabs/nsd/issues/239 -https://github.com/NLnetLabs/nsd/commit/7162600301205c3c62a1695c0b29e079694b65ae - -From 7162600301205c3c62a1695c0b29e079694b65ae Mon Sep 17 00:00:00 2001 -From: "W.C.A. Wijngaards" <wou...@nlnetlabs.nl> -Date: Thu, 10 Nov 2022 09:47:59 +0100 -Subject: [PATCH] - Fix #239: -Wincompatible-pointer-types warning in remote.c. - ---- a/remote.c -+++ b/remote.c -@@ -1212,8 +1212,11 @@ do_stats(struct daemon_remote* rc, int peek, struct rc_state* rs) - /* force a reload */ - xfrd_set_reload_now(xfrd); - #else -+ RES res; -+ res.ssl = rs->ssl; -+ res.fd = rs->fd; - (void)rc; (void)peek; -- (void)ssl_printf(rs->ssl, "error no stats enabled at compile time\n"); -+ (void)ssl_printf(&res, "error no stats enabled at compile time\n"); - #endif /* BIND8_STATS */ - } - - diff --git a/net-dns/nsd/nsd-4.6.1-r1.ebuild b/net-dns/nsd/nsd-4.6.1-r1.ebuild deleted file mode 100644 index df0ec4a834af..000000000000 --- a/net-dns/nsd/nsd-4.6.1-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd - -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 dnstap libevent minimal-responses mmap munin +nsec3 ratelimit root-server ssl systemd" - -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=" - sys-devel/flex - app-alternatives/yacc - systemd? ( virtual/pkgconfig ) -" - -PATCHES=( - # Fix the paths in the munin plugin to match our install - "${FILESDIR}"/nsd_munin_.patch - "${FILESDIR}"/${P}-incompatible-ptr-types.patch -) - -src_prepare() { - default - - # Required to get correct pkg-config macros with USE="systemd" - # 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 - --with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state - --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 minimal-responses) - $(use_enable mmap) - $(use_enable nsec3) - $(use_enable ratelimit) - $(use_enable root-server) - $(use_enable systemd) - $(use_with libevent) - $(use_with ssl) - ) - - econf "${myeconfargs[@]}" -} - -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" - - keepdir /var/db/${PN} -} - -pkg_postinst() { - # 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 -}
