gentoo auto-resync : 25:10:2024 - 04:04:26

3 files changed, 223 insertions, 2 deletions

diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index a5964d874794..e06701dae747 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -11,6 +11,9 @@ DIST unbound-1.19.3.tar.gz 6338685 BLAKE2B 5d9cbc26510afc2b92ecce6307cd9924a1b45
 DIST unbound-1.19.3.tar.gz.asc 833 BLAKE2B 6eb71dde451a123ffba44c298d83256613c6325b26adffb6f0347b468bf84e63b090655d12b323f8c187ad4782fad06514fe5ab0246087bd129393d1bdb1533c SHA512 1b6437d7ac4394ab7d6eb0d12f22b39538152f9c88175a5368263059950b8e6b093fa5392d1ff37874effef7a422afa9c690f766802208979a99500a4bea5906
 DIST unbound-1.20.0.tar.gz 6550938 BLAKE2B b272a6b8c0118819d9803f0c7f7a4b7eff77e37682f4a9a0f749cafa08da4d4de01cd7bf71698b8fc5a7cdf5ca03685978e6b4395c586c35d1d13bebb7cbb538 SHA512 2f6bc76c03b71ca1c2cd2331dc72d62f51493d15e17c59af46b400e542fcabff22e6b9d33f750a3e5f918a0116f45afa760651b2d5aa2feadac151cbbd71b0bd
 DIST unbound-1.20.0.tar.gz.asc 833 BLAKE2B 14e53fcb692c1e078ae334d298c76ed30b8dd58fc0ba396c6b46edc7a4af49e4a3d2a15874f2a6a59365b129bb819b47327a5cc6e0589c06471a466d84d15785 SHA512 1586a320077c606c5c19f251615df54a61854f51acca02df1d391dcc2287aff2c641b009aeee1a98392f63719d70b6bac23ebb7d86b780f8a27cda6e114fc0ad
+DIST unbound-1.22.0.tar.gz 6682466 BLAKE2B 28cf5c6c5e29d4026beb33e8a17b012d1185a3a100fafd3e2717233f47c7b0ad2bf7b7fc2d5ad8c15b6fef496ed9d9c95d116535c3c34c945b27c2a42fa197ff SHA512 6c873e19902ce6cd59cec7084d5dba1a5bd5fe4437c827ae69bdf9273bcd8d2d1ec0dc183076f8d2e1fd38730bf8c10852d678399f0b2ea8ccf7e39119568978
+DIST unbound-1.22.0.tar.gz.asc 833 BLAKE2B 02e582f5c77d8aee1a19ebb67ab081972461c298983f407d3e1d4daf6d771f087b95a19c93b7368cb3d76c350e40c3b886088d5772d5c259d0f2672a8f009153 SHA512 afbf5a125f104a25576b1c416b32f68d715b41a025fc3a61e6ee3bc28f9988b4277c7f0dd188c51cbe5641f51ade20f740ea131d1a7b5db38e2d1462a9edbb69
 EBUILD unbound-1.19.3.ebuild 6499 BLAKE2B cd4b63183a3c40ae340466593ad65f59b528951b18111e053d49e71826bcff4b7b2cf0d5e92e9597557cc76c08c64bcaadd004224101f2169f6bddda37ed5de6 SHA512 9d2dbf869631feb4b663743e3e243f922ead89501420bc5baeb533ff60f3a6a418836aca62558e69bcb76c27fd16372c3246e80468a6000aaf10085752d86d14
-EBUILD unbound-1.20.0.ebuild 6505 BLAKE2B fe2434f5ba333740f3b908048732893fc32c4ac412f7e852bb21e95ffccc4b91ba778ff8a461db651021c2d1e880f993e26326fa3b7d3ecb6adb5b71468a0ad7 SHA512 bb14da8c754cdb83f381c3f58eb3dd6111bc3ee182657699a5e83f7d273e525a5918a1d516ce15f9f36312ce5cf816ecc1b7978cf0a01f930cb2c46eef0daa24
+EBUILD unbound-1.20.0.ebuild 6503 BLAKE2B f67ed1609632c9ad3b8bce93f6a2624992b53f3fbaa8ccec27e10ec94192b61fd5ec505116b092e0c60e7a9998da493d8c283c508185134658e11ec3c892fed3 SHA512 aae6244faafd4ed466b8d4f363a8bda3fb734929ab81c9023779a71d20002c35d0cbc29656da16586b173b18412c968e121c8878cda9a4be1d7f7ea97698225a
+EBUILD unbound-1.22.0.ebuild 6505 BLAKE2B fe2434f5ba333740f3b908048732893fc32c4ac412f7e852bb21e95ffccc4b91ba778ff8a461db651021c2d1e880f993e26326fa3b7d3ecb6adb5b71468a0ad7 SHA512 bb14da8c754cdb83f381c3f58eb3dd6111bc3ee182657699a5e83f7d273e525a5918a1d516ce15f9f36312ce5cf816ecc1b7978cf0a01f930cb2c46eef0daa24
 MISC metadata.xml 1475 BLAKE2B d0e34f4ba056c090af979f2686d5dece53a554c7ea7612fee1991ce6838ce161359bd8405d6358c5e184b6721affeee5d6e1bd93095b92765cd38dba928daa5b SHA512 8fba72eba420d4c06fb3a9119c3f324c5679fe268b65fac23878ef15f3c3d784d372874c7d6428d1c7c2eb3a75380ad2e4d5fc1691e7c2d1b426b8cfa381222b
diff --git a/net-dns/unbound/unbound-1.20.0.ebuild b/net-dns/unbound/unbound-1.20.0.ebuild
index 67da62c07740..3175b1e15ddd 100644
--- a/net-dns/unbound/unbound-1.20.0.ebuild
+++ b/net-dns/unbound/unbound-1.20.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc ~x86"
 fi
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-dns/unbound/unbound-1.22.0.ebuild b/net-dns/unbound/unbound-1.22.0.ebuild
new file mode 100644
index 000000000000..67da62c07740
--- /dev/null
+++ b/net-dns/unbound/unbound-1.22.0.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/unbound.net.asc
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig
+
+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
+	verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo 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.
+DEPEND="
+	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:= )
+	systemd? ( sys-apps/systemd )
+"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( dev-lang/swig )
+	test? (
+		net-libs/ldns[examples(-)]
+		dev-util/splint
+		app-text/wdiff
+	)
+	verify-sig? ( sec-keys/openpgp-keys-unbound )
+"
+RDEPEND="
+	${DEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	ioctlsocket # not on Linux (bug #900060)
+)
+
+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
+)
+
+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() {
+	local myeconfargs=(
+		$(multilib_native_use_enable debug)
+		$(multilib_native_use_enable gost)
+		$(multilib_native_use_enable dnscrypt)
+		$(multilib_native_use_enable dnstap)
+		$(multilib_native_use_enable ecdsa)
+		$(multilib_native_use_enable ecs subnet)
+		$(multilib_native_use_enable redis cachedb)
+		$(multilib_native_use_enable static-libs static)
+		$(multilib_native_use_enable systemd)
+		$(multilib_native_use_with python pythonmodule)
+		$(multilib_native_use_with python pyunbound)
+		$(multilib_native_use_with threads pthreads)
+		$(multilib_native_use_with http2 libnghttp2)
+		$(multilib_native_use_enable tfo tfo-client)
+		$(multilib_native_use_enable tfo tfo-server)
+
+		--disable-flto
+		--disable-rpath
+		--enable-event-api
+		--enable-ipsecmod
+
+		--with-libevent="${ESYSROOT}"/usr
+		$(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis)
+
+		--with-pidfile="${EPREFIX}"/run/unbound.pid
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
+		--with-ssl="${ESYSROOT}"/usr
+		--with-libexpat="${ESYSROOT}"/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)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+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
+}