commit: 1735225a0a1171145304687edf7cf775aec5ad3e Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Wed Dec 23 01:10:12 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Wed Dec 23 01:10:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1735225a
net-dns/unbound: security cleanup (bug #758974) Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> net-dns/unbound/Manifest | 3 - net-dns/unbound/unbound-1.10.1-r1.ebuild | 184 ---------------------------- net-dns/unbound/unbound-1.11.0.ebuild | 200 ------------------------------ net-dns/unbound/unbound-1.12.0-r1.ebuild | 202 ------------------------------- net-dns/unbound/unbound-1.12.0.ebuild | 200 ------------------------------ 5 files changed, 789 deletions(-) diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest index 189f7665dcd..723f087a1a7 100644 --- a/net-dns/unbound/Manifest +++ b/net-dns/unbound/Manifest @@ -1,4 +1 @@ -DIST unbound-1.10.1.tar.gz 5729334 BLAKE2B 7ca4f23c12a551bc6e5d6ec32f19ca0f54526b9a4c868ced8f31cfd31dec23f8240b78f0c00d2cc6f9aa21f6c1b98697c85ef3ebd804a838a5a082893fe98094 SHA512 d07f3ac0e751c17a3ff7d99518c22529cf6856861218564a2ca073422905525cb9ddaf76c9600187946fadb7324343bcd85c34ff06bd322e0ea621a2d258bb85 -DIST unbound-1.11.0.tar.gz 5900967 BLAKE2B 3119bbcd78fa19c610937215abc64abcc1ca96ba42b6753a1e36fef501f68971ac2ee0cb9bde377e0b257c57f505aeac2315a6bf031626874d30967b0a5eb46a SHA512 511e787c5f9647286b07028702a8909390e0e6eafe7224459d5f1eee8a8dfb09c71e33f291e30851dc57411123b91dfe0e124787109a7e4afdf6f3b02768e7cd -DIST unbound-1.12.0.tar.gz 5918399 BLAKE2B b3dccecb1fd019f36e47c62583348a375f5eed7c84094c48def1ff9e73dc283911a2a9b318c8a4be45f5cd4bfb17f26722a9b900aa1980f49790cc55f6412d1d SHA512 90d99bc65e9ba62e50a7809dbf1e98889d0fc9fd50cf3cc99b726c67bcaeda0c2bc176d09f84771adb9796833b595591462f96e949d6969a47d6898d8fae3479 DIST unbound-1.13.0.tar.gz 5950063 BLAKE2B 742eed33845079452a942837a64e80f89ec7ec73459d0045c70ff83d3ba982fae6bade9feb56ef6faa9fca4859222ea00ac587c65c8ad722bef4a6b66a276ade SHA512 d4f3c5a7df5d46f8b1ee32b61e68bdc0d63030820d236ecc51bc3ac356d15248acb9a5e0b6009e1936b03b751e8dd05a071a95ab239fdbbbb308442a59642ad5 diff --git a/net-dns/unbound/unbound-1.10.1-r1.ebuild b/net-dns/unbound/unbound-1.10.1-r1.ebuild deleted file mode 100644 index f4046ee8042..00000000000 --- a/net-dns/unbound/unbound-1.10.1-r1.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{6,7} ) - -inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user - -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 libressl 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=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] - >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}] - libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] ) - !libressl? ( >=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? ( - !libressl? ( dev-libs/openssl:0[-bindist] ) - ) - 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}"/${P}-find-ar.patch -) - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup unbound - enewuser unbound -1 -1 /etc/unbound unbound - # improve security on existing installs (bug #641042) - # as well as new installs where unbound homedir has just been created - if [[ -d "${ROOT}/etc/unbound" ]]; then - chown --no-dereference --from=unbound root "${ROOT}/etc/unbound" - fi - - 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) \ - --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 - # ... 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 0750 /var/lib/${PN} - - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} - -pkg_postinst() { - # make var/ writable by unbound - if [[ -d "${EROOT}/etc/unbound/var" ]]; then - chown --no-dereference --from=root unbound: "${EROOT}/etc/unbound/var" - fi - - 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 "" -} diff --git a/net-dns/unbound/unbound-1.11.0.ebuild b/net-dns/unbound/unbound-1.11.0.ebuild deleted file mode 100644 index e3b440c03b9..00000000000 --- a/net-dns/unbound/unbound-1.11.0.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{6,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 libressl 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}] - libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] ) - !libressl? ( >=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? ( - !libressl? ( dev-libs/openssl:0[-bindist] ) - ) - 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) \ - --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.12.0-r1.ebuild b/net-dns/unbound/unbound-1.12.0-r1.ebuild deleted file mode 100644 index b899f7ff0e3..00000000000 --- a/net-dns/unbound/unbound-1.12.0-r1.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{6,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 libressl 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}] - libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] ) - !libressl? ( >=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? ( - !libressl? ( dev-libs/openssl:0[-bindist] ) - ) - http2? ( net-libs/nghttp2 ) - 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.12.0.ebuild b/net-dns/unbound/unbound-1.12.0.ebuild deleted file mode 100644 index 30cafd751b1..00000000000 --- a/net-dns/unbound/unbound-1.12.0.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{6,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 libressl 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}] - libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] ) - !libressl? ( >=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? ( - !libressl? ( dev-libs/openssl:0[-bindist] ) - ) - 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) \ - --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 -}