diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
commit | e68d405c5d712af4387159df07e226217bdda049 (patch) | |
tree | 009ab0f3d427f0813e62930d71802cb054c07e30 /net-dns/unbound | |
parent | 401101f9c8077911929d3f2b60a37098460a5d89 (diff) |
gentoo resync : 06.04.2022
Diffstat (limited to 'net-dns/unbound')
-rw-r--r-- | net-dns/unbound/Manifest | 8 | ||||
-rw-r--r-- | net-dns/unbound/unbound-1.13.2-r1.ebuild | 8 | ||||
-rw-r--r-- | net-dns/unbound/unbound-1.14.0-r1.ebuild (renamed from net-dns/unbound/unbound-1.14.0.ebuild) | 17 | ||||
-rw-r--r-- | net-dns/unbound/unbound-1.15.0.ebuild | 213 |
4 files changed, 233 insertions, 13 deletions
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest index 34dcd87c392a..437834275b3c 100644 --- a/net-dns/unbound/Manifest +++ b/net-dns/unbound/Manifest @@ -10,7 +10,11 @@ AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a7 DIST unbound-1.13.1.tar.gz 5976957 BLAKE2B 5fabb9205773a1983842e41cf7a4d6c3878fa8beb7c8ccc71ae1edf7738cb9506c3d7bb32cf887b305317ca695bf876d9f5bf9aeb0129b0e9e926d437b3e6eb3 SHA512 f4d26dca28dbcc33a5e65a55147fa01077c331292e88b6a87798cb6c3d4edb0515015d131fd893c92b74d22d9998a640f0adce404e6192d61ebe69a6a599287c DIST unbound-1.13.2.tar.gz 6127915 BLAKE2B 71806edc86b323ff1f9f2d7bd3f699b15da2cd1cfefe9ca6008d74915dd6c7b45690026fb0244531ae563a3ca1b142f21fc8aed97ba4bb0015d8ab9196ff045a SHA512 1e89441446e7a25c6a49bded645f8b348c1758c3be54e3a986041cb1f00c45d152fd469dc52666fb820574db9d51b16f1627dc8afcb9519508d4833ca358191a DIST unbound-1.14.0.tar.gz 6152326 BLAKE2B ceccfbcbc16370153005f32d19be44bd41a4ac935cb7b9a90128d604c9874b06cc7de8b92dc34585d7957f0ad90ce2f441c2ed092c9307bcf4335f8d99eb8bd3 SHA512 57f91d898b0a5d42e6a2ff1ccaec474f04dd5ad3c98e7eb7aa8d5eaa23b587f3077cf7eddf4df38f537c6d387028f12c2518ff13b7249aa7a1155cd6532a46b5 +DIST unbound-1.14.0.tar.gz.asc 833 BLAKE2B 21df47fba46db82ce8fcbf9f39e8e16f8d5ece493dbdc8fe8cad749e3f8e1af164c4280f9722d9f507199ae59a851925a7856bc9e11926b05f253b4342b06383 SHA512 5f77f33040bd783c8d67a50cb5a97435842203e6c2152f40994fba772777db60f01ab76156aa95a477ee50ae22f4227162cdd1fc0e4ae388c6b47f91ac9a5b95 +DIST unbound-1.15.0.tar.gz 6163470 BLAKE2B e67756fb28aac784431484e5f834cbe3864a0ec021a8c9eb3124a6d5732fea99a073815a624210e43e50b3b59ce943c5cc6a4e5e1c743b91f5803e2dcf5c9870 SHA512 c5dab305694c14f64e05080700bb52f6e6bf5b76f15e1fde34e35c932cb3ffed0de2c03b570cf4bfe18165cb10e82e67ee9b12c6583295380f88c2c03800cc1f +DIST unbound-1.15.0.tar.gz.asc 833 BLAKE2B 166cbb1caf14fb4a4375d609c740e7305ed4ee19c1e307caf1e780eb3f53e86db2d34b3f21e1d0c5f1496eac9211ce795c085ab9944f66f9a2f54d08479254db SHA512 123818a855689ee3d402fd8f4b5a4646c08d5602e4544ce872d132c4c0de4a79c9efcc2d49324bf58ab06521f02deef795d89bdf632eee758e6ec36b408ea54a EBUILD unbound-1.13.1-r3.ebuild 6088 BLAKE2B a59345ef64e907346092bff8160a41fe00b0a02c123e920cb177161e9093bef6017f41ee7ce41edde432ac21aefeeb2d5e87500aeffdabc04031f29309299e4d SHA512 632ff673ff3076bf80a29bff1fce1eaef334571d11d1acb27a5ce562ade71bd0fb5bebe5f9a236fad38c9dcf2655aee29e022465714163483380435b7103a7f1 -EBUILD unbound-1.13.2-r1.ebuild 6115 BLAKE2B 5a512adf26837b1620104205c22ff0a5823f3988d755ce03ad0e138125ffd247edefd9f467cfd47f01514ece74a28ee7aacf45b7dd59ef211be0fc5eb6bb98b3 SHA512 0614e7410328c18e8535dd78e7c02b3fe0d4005095aea001bb79e19d095cc8b8dfc22c9e73647596cbe3835aab32d7391f8d89f1f63edef01f22365c6b38e753 -EBUILD unbound-1.14.0.ebuild 6119 BLAKE2B b116d221aacecd067268e3c15de1f7ed9d588a2d3a6df7cb6447e92224c77454d5604e6acd00ac561234d2307b4a2babd4b19e60b88e6821b815ccd28d05eafa SHA512 2b8e8db6b2201fcf00d1932a07c4298924c5e69abb5f5c17057a350762db0b78a561455ac085f264d3290a760671438c49dde50a9a4af4750829c8bcab53a8b3 +EBUILD unbound-1.13.2-r1.ebuild 6119 BLAKE2B 9fd3134031787cf87bc4a6f2948a6fce93805a363d7cb828fa4c8731872d4679b02d2fc8de79266cb5fd2e375bd75c36528b77c200443e498db0a1aacac4f923 SHA512 e296ef9d32b32e5872c51664602011b895b98f7809340c77daf12db18f57cae796dc67db2f71e086f54cd595d586cf349435fe5c615993531061b28fdd78b282 +EBUILD unbound-1.14.0-r1.ebuild 6332 BLAKE2B d42509d073111cb24390522afc68bafcce9b4a9c1a3cbcf48db72ce7e3ae7bd81d9f46a8a59f03daebdade722705713fb6d4059cf5792e76d49a3eec63a0fc11 SHA512 ff4235f6aebfb1b6b4a62e6bf0a445d8a7c8fc5b605a91de8db5c4e55504e3b516c51f7ecd4dbf4c1d6b0b82ff62643436c90aa0f19208dfdc319e0275a12f5c +EBUILD unbound-1.15.0.ebuild 6332 BLAKE2B d42509d073111cb24390522afc68bafcce9b4a9c1a3cbcf48db72ce7e3ae7bd81d9f46a8a59f03daebdade722705713fb6d4059cf5792e76d49a3eec63a0fc11 SHA512 ff4235f6aebfb1b6b4a62e6bf0a445d8a7c8fc5b605a91de8db5c4e55504e3b516c51f7ecd4dbf4c1d6b0b82ff62643436c90aa0f19208dfdc319e0275a12f5c MISC metadata.xml 1593 BLAKE2B d262cac4efcdc37b123fa3098212f0d3b0e948cadd5afab491696568b8c83e2f72844f482ba10b27fec2d319de2a7b8c7befe58302296808ab521cfe5af091cd SHA512 38bbc03a0263d83b7aa8ad08e0032d158612a3820667a4c8c19e3e0073f9f644792bfc5acc6b2f7ae658abc36a321f844d5dd14d13adfb6b0173e86387ddebc2 diff --git a/net-dns/unbound/unbound-1.13.2-r1.ebuild b/net-dns/unbound/unbound-1.13.2-r1.ebuild index 8b892a13ee54..52208581e7b2 100644 --- a/net-dns/unbound/unbound-1.13.2-r1.ebuild +++ b/net-dns/unbound/unbound-1.13.2-r1.ebuild @@ -111,12 +111,12 @@ multilib_src_configure() { --disable-rpath \ --enable-event-api \ --enable-ipsecmod \ - --with-libevent="${EPREFIX}"/usr \ - $(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \ + --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="${EPREFIX}"/usr \ - --with-libexpat="${EPREFIX}"/usr + --with-ssl="${ESYSROOT}"/usr \ + --with-libexpat="${ESYSROOT}"/usr # http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html # $(use_enable debug lock-checks) \ diff --git a/net-dns/unbound/unbound-1.14.0.ebuild b/net-dns/unbound/unbound-1.14.0-r1.ebuild index 127dcb9a51ac..5d8427f124b1 100644 --- a/net-dns/unbound/unbound-1.14.0.ebuild +++ b/net-dns/unbound/unbound-1.14.0-r1.ebuild @@ -1,15 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" PYTHON_COMPAT=( python3_{8,9,10} ) -inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd +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" +SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz + verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc )" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/unbound.net.asc LICENSE="BSD GPL-2" SLOT="0/8" # ABI version of libunbound.so @@ -52,6 +54,7 @@ BDEPEND="virtual/pkgconfig dev-util/splint app-text/wdiff ) + verify-sig? ( sec-keys/openpgp-keys-unbound ) " DEPEND="${CDEPEND}" @@ -111,12 +114,12 @@ multilib_src_configure() { --disable-rpath \ --enable-event-api \ --enable-ipsecmod \ - --with-libevent="${EPREFIX}"/usr \ - $(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \ + --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="${EPREFIX}"/usr \ - --with-libexpat="${EPREFIX}"/usr + --with-ssl="${ESYSROOT}"/usr \ + --with-libexpat="${ESYSROOT}"/usr # http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html # $(use_enable debug lock-checks) \ diff --git a/net-dns/unbound/unbound-1.15.0.ebuild b/net-dns/unbound/unbound-1.15.0.ebuild new file mode 100644 index 000000000000..5d8427f124b1 --- /dev/null +++ b/net-dns/unbound/unbound-1.15.0.ebuild @@ -0,0 +1,213 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +PYTHON_COMPAT=( python3_{8,9,10} ) + +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 )" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/unbound.net.asc + +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 +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. + +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:= ) + systemd? ( sys-apps/systemd ) +" + +BDEPEND="virtual/pkgconfig + python? ( dev-lang/swig ) + test? ( + || ( + net-libs/ldns[examples(-)] + net-dns/ldns-utils[examples(-)] + ) + dev-util/splint + app-text/wdiff + ) + verify-sig? ( sec-keys/openpgp-keys-unbound ) +" + +DEPEND="${CDEPEND}" + +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) \ + $(use_enable tfo tfo-client) \ + $(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) \ +} + +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 +} |