[gentoo-commits] repo/gentoo:master commit in: net-dns/unbound/

[Marc Schiffbauer]

commit:     201bccdc104330bf20c98da94f367dc67d71700a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 22:45:47 2021 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 10:39:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=201bccdc

net-dns/unbound: drop 1.13.0-r4, 1.13.0-r5

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>

 net-dns/unbound/Manifest                 |   1 -
 net-dns/unbound/unbound-1.13.0-r4.ebuild | 201 ------------------------------
 net-dns/unbound/unbound-1.13.0-r5.ebuild | 205 -------------------------------
 3 files changed, 407 deletions(-)

diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index c9c098f4a8f1..db6d10aad7ec 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -1,3 +1,2 @@
-DIST unbound-1.13.0.tar.gz 5950063 BLAKE2B 742eed33845079452a942837a64e80f89ec7ec73459d0045c70ff83d3ba982fae6bade9feb56ef6faa9fca4859222ea00ac587c65c8ad722bef4a6b66a276ade SHA512 d4f3c5a7df5d46f8b1ee32b61e68bdc0d63030820d236ecc51bc3ac356d15248acb9a5e0b6009e1936b03b751e8dd05a071a95ab239fdbbbb308442a59642ad5
 DIST unbound-1.13.1.tar.gz 5976957 BLAKE2B 5fabb9205773a1983842e41cf7a4d6c3878fa8beb7c8ccc71ae1edf7738cb9506c3d7bb32cf887b305317ca695bf876d9f5bf9aeb0129b0e9e926d437b3e6eb3 SHA512 f4d26dca28dbcc33a5e65a55147fa01077c331292e88b6a87798cb6c3d4edb0515015d131fd893c92b74d22d9998a640f0adce404e6192d61ebe69a6a599287c
 DIST unbound-1.13.2.tar.gz 6127915 BLAKE2B 71806edc86b323ff1f9f2d7bd3f699b15da2cd1cfefe9ca6008d74915dd6c7b45690026fb0244531ae563a3ca1b142f21fc8aed97ba4bb0015d8ab9196ff045a SHA512 1e89441446e7a25c6a49bded645f8b348c1758c3be54e3a986041cb1f00c45d152fd469dc52666fb820574db9d51b16f1627dc8afcb9519508d4833ca358191a

diff --git a/net-dns/unbound/unbound-1.13.0-r4.ebuild b/net-dns/unbound/unbound-1.13.0-r4.ebuild
deleted file mode 100644
index 22dc5675ff0b..000000000000
--- a/net-dns/unbound/unbound-1.13.0-r4.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
-SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0/8" # ABI version of libunbound.so
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86"
-IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# Note: expat is needed by executable only but the Makefile is custom
-# and doesn't make it possible to easily install the library without
-# the executables. MULTILIB_USEDEP may be dropped once build system
-# is fixed.
-
-CDEPEND="acct-group/unbound
-	acct-user/unbound
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
-	>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-	dnscrypt? ( dev-libs/libsodium:=[${MULTILIB_USEDEP}] )
-	dnstap? (
-		dev-libs/fstrm[${MULTILIB_USEDEP}]
-		>=dev-libs/protobuf-c-1.0.2-r1:=[${MULTILIB_USEDEP}]
-	)
-	ecdsa? (
-		dev-libs/openssl:0[-bindist(-)]
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( dev-libs/hiredis:= )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)
-	systemd? ( sys-apps/systemd )"
-
-RDEPEND="${CDEPEND}
-	net-dns/dnssec-root
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
-	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# required for the python part
-	multilib_copy_sources
-}
-
-src_configure() {
-	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable gost) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_enable ecdsa) \
-		$(use_enable ecs subnet) \
-		$(multilib_native_use_enable redis cachedb) \
-		$(use_enable static-libs static) \
-		$(use_enable systemd) \
-		$(multilib_native_use_with python pythonmodule) \
-		$(multilib_native_use_with python pyunbound) \
-		$(use_with threads pthreads) \
-		$(use_with http2 libnghttp2) \
-		--disable-flto \
-		--disable-rpath \
-		--enable-event-api \
-		--enable-ipsecmod \
-		--enable-tfo-client \
-		--enable-tfo-server \
-		--with-libevent="${EPREFIX}"/usr \
-		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
-		--with-pidfile="${EPREFIX}"/run/unbound.pid \
-		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
-		--with-ssl="${EPREFIX}"/usr \
-		--with-libexpat="${EPREFIX}"/usr
-
-		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
-		# $(use_enable debug lock-checks) \
-		# $(use_enable debug alloc-checks) \
-		# $(use_enable debug alloc-lite) \
-		# $(use_enable debug alloc-nonregional) \
-}
-
-multilib_src_install_all() {
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound-r1.initd unbound
-	newconfd "${FILESDIR}"/unbound-r1.confd unbound
-
-	systemd_dounit "${FILESDIR}"/unbound.service
-	systemd_dounit "${FILESDIR}"/unbound.socket
-	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
-	systemd_dounit "${FILESDIR}"/unbound-anchor.service
-
-	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
-
-	# bug #315519
-	dodoc contrib/unbound_munin_
-
-	docinto selinux
-	dodoc contrib/selinux/*
-
-	exeinto /usr/share/${PN}
-	doexe contrib/update-anchor.sh
-
-	# create space for auto-trust-anchor-file...
-	keepdir /etc/unbound/var
-	fowners root:unbound /etc/unbound/var
-	fperms 0770 /etc/unbound/var
-	# ... and point example config to it
-	sed -i \
-		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
-		"${ED}/etc/unbound/unbound.conf" \
-		|| die
-
-	# Used to store cache data
-	keepdir /var/lib/${PN}
-	fowners root:unbound /var/lib/${PN}
-	fperms 0770 /var/lib/${PN}
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then
-		einfo "Trying to create unbound control key ..."
-		if ! unbound-control-setup &>/dev/null ; then
-			ewarn "Failed to create unbound control key!"
-		fi
-	fi
-
-	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then
-		einfo ""
-		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
-		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
-		einfo "and run"
-		einfo ""
-		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
-		einfo ""
-		einfo "as root to create it initially before starting unbound for the first time after enabling this."
-		einfo ""
-	fi
-
-	# Our user is not available on prefix
-	use prefix && return
-
-	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
-	if [ $? -ne 0 ] ; then
-		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
-		ewarn "Run the following commands to restore default permission:"
-		ewarn ""
-		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
-		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
-	else
-		# Cleanup -- no reason to die here!
-		rm -f "${_perm_check_testfile}"
-	fi
-}

diff --git a/net-dns/unbound/unbound-1.13.0-r5.ebuild b/net-dns/unbound/unbound-1.13.0-r5.ebuild
deleted file mode 100644
index 599a521515cc..000000000000
--- a/net-dns/unbound/unbound-1.13.0-r5.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
-SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0/8" # ABI version of libunbound.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# Note: expat is needed by executable only but the Makefile is custom
-# and doesn't make it possible to easily install the library without
-# the executables. MULTILIB_USEDEP may be dropped once build system
-# is fixed.
-
-CDEPEND="acct-group/unbound
-	acct-user/unbound
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
-	>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-	dnscrypt? ( dev-libs/libsodium:=[${MULTILIB_USEDEP}] )
-	dnstap? (
-		dev-libs/fstrm[${MULTILIB_USEDEP}]
-		>=dev-libs/protobuf-c-1.0.2-r1:=[${MULTILIB_USEDEP}]
-	)
-	ecdsa? (
-		dev-libs/openssl:0[-bindist(-)]
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( dev-libs/hiredis:= )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)
-	systemd? ( sys-apps/systemd )"
-
-RDEPEND="${CDEPEND}
-	net-dns/dnssec-root
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
-	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# required for the python part
-	multilib_copy_sources
-}
-
-src_configure() {
-	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable gost) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_enable ecdsa) \
-		$(use_enable ecs subnet) \
-		$(multilib_native_use_enable redis cachedb) \
-		$(use_enable static-libs static) \
-		$(use_enable systemd) \
-		$(multilib_native_use_with python pythonmodule) \
-		$(multilib_native_use_with python pyunbound) \
-		$(use_with threads pthreads) \
-		$(use_with http2 libnghttp2) \
-		--disable-flto \
-		--disable-rpath \
-		--enable-event-api \
-		--enable-ipsecmod \
-		--enable-tfo-client \
-		--enable-tfo-server \
-		--with-libevent="${EPREFIX}"/usr \
-		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
-		--with-pidfile="${EPREFIX}"/run/unbound.pid \
-		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
-		--with-ssl="${EPREFIX}"/usr \
-		--with-libexpat="${EPREFIX}"/usr
-
-		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
-		# $(use_enable debug lock-checks) \
-		# $(use_enable debug alloc-checks) \
-		# $(use_enable debug alloc-lite) \
-		# $(use_enable debug alloc-nonregional) \
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	systemd_dounit contrib/unbound.service
-	systemd_dounit contrib/unbound.socket
-}
-
-multilib_src_install_all() {
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound-r1.initd unbound
-	newconfd "${FILESDIR}"/unbound-r1.confd unbound
-
-	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
-	systemd_dounit "${FILESDIR}"/unbound-anchor.service
-
-	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
-
-	# bug #315519
-	dodoc contrib/unbound_munin_
-
-	docinto selinux
-	dodoc contrib/selinux/*
-
-	exeinto /usr/share/${PN}
-	doexe contrib/update-anchor.sh
-
-	# create space for auto-trust-anchor-file...
-	keepdir /etc/unbound/var
-	fowners root:unbound /etc/unbound/var
-	fperms 0770 /etc/unbound/var
-	# ... and point example config to it
-	sed -i \
-		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
-		"${ED}/etc/unbound/unbound.conf" \
-		|| die
-
-	# Used to store cache data
-	keepdir /var/lib/${PN}
-	fowners root:unbound /var/lib/${PN}
-	fperms 0770 /var/lib/${PN}
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then
-		einfo "Trying to create unbound control key ..."
-		if ! unbound-control-setup &>/dev/null ; then
-			ewarn "Failed to create unbound control key!"
-		fi
-	fi
-
-	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then
-		einfo ""
-		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
-		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
-		einfo "and run"
-		einfo ""
-		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
-		einfo ""
-		einfo "as root to create it initially before starting unbound for the first time after enabling this."
-		einfo ""
-	fi
-
-	# Our user is not available on prefix
-	use prefix && return
-
-	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
-	if [ $? -ne 0 ] ; then
-		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
-		ewarn "Run the following commands to restore default permission:"
-		ewarn ""
-		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
-		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
-	else
-		# Cleanup -- no reason to die here!
-		rm -f "${_perm_check_testfile}"
-	fi
-}