From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- net-dns/Manifest.gz | Bin 8537 -> 8529 bytes net-dns/bind-tools/Manifest | 4 + net-dns/bind-tools/bind-tools-9.14.12.ebuild | 137 ++++++++ net-dns/bind-tools/bind-tools-9.16.3.ebuild | 138 ++++++++ net-dns/bind/Manifest | 4 + net-dns/bind/bind-9.14.12.ebuild | 378 +++++++++++++++++++++ net-dns/bind/bind-9.16.3.ebuild | 376 ++++++++++++++++++++ net-dns/c-ares/Manifest | 2 + net-dns/c-ares/c-ares-1.16.1.ebuild | 42 +++ net-dns/dnsmasq/Manifest | 7 +- net-dns/dnsmasq/dnsmasq-2.80-r2.ebuild | 214 ------------ net-dns/dnsmasq/dnsmasq-2.81.ebuild | 2 +- .../files/dnsmasq-2.80-cve-2019-14834.patch | 39 --- .../files/dnsmasq-2.80-linux-headers-5.2.patch | 25 -- .../dnsmasq/files/dnsmasq-2.80-nettle-3.5.patch | 42 --- net-dns/pdns-recursor/Manifest | 3 + .../files/pdns-recursor-4.3.1-boost-1.73.0.patch | 89 +++++ net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild | 82 +++++ net-dns/s6-dns/Manifest | 2 +- net-dns/s6-dns/metadata.xml | 8 - net-dns/unbound/Manifest | 4 +- net-dns/unbound/unbound-1.10.0.ebuild | 183 ---------- net-dns/unbound/unbound-1.10.1.ebuild | 183 ++++++++++ 23 files changed, 1443 insertions(+), 521 deletions(-) create mode 100644 net-dns/bind-tools/bind-tools-9.14.12.ebuild create mode 100644 net-dns/bind-tools/bind-tools-9.16.3.ebuild create mode 100644 net-dns/bind/bind-9.14.12.ebuild create mode 100644 net-dns/bind/bind-9.16.3.ebuild create mode 100644 net-dns/c-ares/c-ares-1.16.1.ebuild delete mode 100644 net-dns/dnsmasq/dnsmasq-2.80-r2.ebuild delete mode 100644 net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch delete mode 100644 net-dns/dnsmasq/files/dnsmasq-2.80-linux-headers-5.2.patch delete mode 100644 net-dns/dnsmasq/files/dnsmasq-2.80-nettle-3.5.patch create mode 100644 net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch create mode 100644 net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild delete mode 100644 net-dns/unbound/unbound-1.10.0.ebuild create mode 100644 net-dns/unbound/unbound-1.10.1.ebuild (limited to 'net-dns') diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz index f6b3dca039b5..0d87b0896893 100644 Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest index c62e58cf07a1..9f6070035d4c 100644 --- a/net-dns/bind-tools/Manifest +++ b/net-dns/bind-tools/Manifest @@ -1,9 +1,13 @@ DIST bind-9.14.11.tar.gz 6310200 BLAKE2B 90fccfa24f576b3e028b947a1c9b6ca05c03175675e9573129068534f1e7cfb89a46f7de21b6ad1fabc7bb68d56997c4bf8a2309dd5f29b52fc61d4d271bd131 SHA512 ec34254d6fe5d72c704ba743d1af5582f2ea6b79363f132013ea9ebebed72c74a3ea9ae8a7978ca2b28f908ef848b9c2961cec85254b7d88680c269233b40524 +DIST bind-9.14.12.tar.gz 6318913 BLAKE2B 38cad65923666afa5d83434c43a1b5577fe9555ca637489f780996a1b439955169c859c690f6fb96b003976eca482fe57c9226797cda5b124dc2073a90ef0515 SHA512 f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf DIST bind-9.14.8.tar.gz 6403140 BLAKE2B 45cb06ce8564880d501c63d25c7af8567184e4e4293e01886620cf655449c972ab55c77c7aded07838c61557bc56d9edac26097715c1121fcfb6b606d7a29365 SHA512 eb52760982ebd246e6e1945684771193fc7364324a6d6a95a0cae33afa0a4fa24ffe8313b5f9094420c7c2ec932b1b1a9fb19f6e673ff3c5583ab5e3ff04eb6a DIST bind-9.14.9.tar.gz 6296339 BLAKE2B 65496ab94a83ddd1c519df4519373aa77858c6d66efed9342e962cd61943b12e9ecb2f74132015b3f835d0368d1cc59be23e0db92d4780f9f367c0d0fe8c3ada SHA512 aa6b1273f06fc16c842b7012a4d09cb65325a44ee88fea8bea8264ffa907ef4a6f8d5e09384599b2d6f5cea66c0dc220765c245814f54b2f09a5b6e65f97964b DIST bind-9.16.1.tar.xz 4541768 BLAKE2B 4a2697c5317b2e186e57ef6613bdaedddb0f371c5a3d6a18b93c8e20de553eaa4d81d567e49b5ea395506e1d8aee729dcfa10896ed6dc8fee268d9ed5c7670d8 SHA512 9a1e8987f312b09a16c2ee0fd1d1eb8e4951b8dbcf3c0d51a1a1fb179a261028239ab2bebc3e559592cc766de57a26ba37b27621a0c5e1711d36c2416f0a0c26 +DIST bind-9.16.3.tar.xz 4573044 BLAKE2B 0630c1225984dbe301ca3e4d768d402e3293eee0ae186257d05e9f9999cdfc9538baf015155471f8abe2e725fe8bdb08c0f45bb8619a4a35b781606ee09e708c SHA512 aded208ab8b10cac275512eb4cb19f4eabd654ef3c14ab0c635f7d09194df4f6dfa84d0b5d69ce93854ceb26a93e21d7122b01ce4f3996da807249ca41d877df EBUILD bind-tools-9.14.11.ebuild 3131 BLAKE2B 112a3438c465ee190a48162de12262c72be3d7e632d3a9f7072956571365216cb72dff0d8828bb0fed64533c37325786070203b72e2ab8b2cf35ff17f81574ca SHA512 e8eb7b1b8ee08d6aeabc62df4f86315068c161693aba50a7a5363f869ab09866914bf13739e9574e8106bdd09b2d580aba832f1099903bf1dffc0cfcdced8b22 +EBUILD bind-tools-9.14.12.ebuild 3131 BLAKE2B 112a3438c465ee190a48162de12262c72be3d7e632d3a9f7072956571365216cb72dff0d8828bb0fed64533c37325786070203b72e2ab8b2cf35ff17f81574ca SHA512 e8eb7b1b8ee08d6aeabc62df4f86315068c161693aba50a7a5363f869ab09866914bf13739e9574e8106bdd09b2d580aba832f1099903bf1dffc0cfcdced8b22 EBUILD bind-tools-9.14.8.ebuild 3123 BLAKE2B b835f6a2f94f61506b32c27d20d3971141f2f4edbd0a57aa77900375cfbbce52337aeda9fbc042daabc884117bf946b5ea8b7c2b656ef016d52faaab119eff58 SHA512 fa4804481455dd2852284ac0c9f0c50f3348b8a786ac4b45b441265c023d72c61f6a9ad6b2a5627376a4e8eaeed8c8c5d521098f6186c73a2b955aba50010d05 EBUILD bind-tools-9.14.9.ebuild 3131 BLAKE2B 112a3438c465ee190a48162de12262c72be3d7e632d3a9f7072956571365216cb72dff0d8828bb0fed64533c37325786070203b72e2ab8b2cf35ff17f81574ca SHA512 e8eb7b1b8ee08d6aeabc62df4f86315068c161693aba50a7a5363f869ab09866914bf13739e9574e8106bdd09b2d580aba832f1099903bf1dffc0cfcdced8b22 EBUILD bind-tools-9.16.1.ebuild 3149 BLAKE2B 447f8836c020b27c6a11715572ba0cd1038207e2bf2cd01e34bf00a2dd9403f8108892bc1bd899376979c64d8803af280acc5ac6e35f6f4b8033f32c118ba903 SHA512 ffdce682e5cf47da43ad16e705c2282397b1d9ab0bca22d810d818b129532c68d8b8baf4de1db1bc3dc6b2fcbf987ed49938bc93eb7d88775602b2921703d85d +EBUILD bind-tools-9.16.3.ebuild 3149 BLAKE2B 447f8836c020b27c6a11715572ba0cd1038207e2bf2cd01e34bf00a2dd9403f8108892bc1bd899376979c64d8803af280acc5ac6e35f6f4b8033f32c118ba903 SHA512 ffdce682e5cf47da43ad16e705c2282397b1d9ab0bca22d810d818b129532c68d8b8baf4de1db1bc3dc6b2fcbf987ed49938bc93eb7d88775602b2921703d85d MISC metadata.xml 423 BLAKE2B 6424fc07b8bba765fa045750b1de629ae57a7004ef10839a3069dab45f20e01e6b50ae755e344f77130edc639aee17c9320dcbb64ed5289fb86a9fb129967617 SHA512 1ec81bf782ad0014c890349248d8ec0302c1940fb13953754ee03f8ea907b0edae79b436e7983982e8f273d04112c8263c416b06e973eba22ac179dd9c68f649 diff --git a/net-dns/bind-tools/bind-tools-9.14.12.ebuild b/net-dns/bind-tools/bind-tools-9.14.12.ebuild new file mode 100644 index 000000000000..b4e1f595e910 --- /dev/null +++ b/net-dns/bind-tools/bind-tools-9.14.12.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs + +MY_PN=${PN//-tools} +MY_PV=${PV/_p/-P} +MY_PV=${MY_PV/_rc/rc} +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" +HOMEPAGE="https://www.isc.org/software/bind" +SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +COMMON_DEPEND=" + caps? ( sys-libs/libcap ) + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + xml? ( dev-libs/libxml2 ) + idn? ( net-dns/libidn2:= ) + gssapi? ( virtual/krb5 ) + libedit? ( dev-libs/libedit ) + !libedit? ( + readline? ( sys-libs/readline:= ) + )" +DEPEND="${COMMON_DEPEND}" + +RDEPEND="${COMMON_DEPEND}" + +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +RESTRICT="test" + +src_prepare() { + default + + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --localstatedir="${EPREFIX}"/var + --without-python + --without-libjson + --without-zlib + --without-lmdb + --with-openssl="${EPREFIX}"/usr + $(use_with idn libidn2) + $(use_with xml libxml2) + $(use_with gssapi) + $(use_with readline) + $(use_enable caps linux-caps) + ) + + # bug 607400 + if use libedit ; then + myeconfargs+=( --with-readline=-ledit ) + elif use readline ; then + myeconfargs+=( --with-readline=-lreadline ) + else + myeconfargs+=( --without-readline ) + fi + + # bug 344029 + append-cflags "-DDIG_SIGCHASE" + + # to expose CMSG_* macros from sys/sockets.h + [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" + + # localstatedir for nsupdate -l, bug 395785 + tc-export BUILD_CC + econf "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_compile() { + local AR=$(tc-getAR) + + emake AR="${AR}" -C lib/ + emake AR="${AR}" -C bin/delv/ + emake AR="${AR}" -C bin/dig/ + emake AR="${AR}" -C bin/nsupdate/ + emake AR="${AR}" -C bin/dnssec/ +} + +src_install() { + dodoc README CHANGES + + cd "${S}"/bin/delv || die + dobin delv + doman delv.1 + + cd "${S}"/bin/dig || die + dobin dig host nslookup + doman {dig,host,nslookup}.1 + + cd "${S}"/bin/nsupdate || die + dobin nsupdate + doman nsupdate.1 + if use doc; then + docinto html + dodoc nsupdate.html + fi + + cd "${S}"/bin/dnssec || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + dobin dnssec-"${tool}" + doman dnssec-"${tool}".8 + if use doc; then + docinto html + dodoc dnssec-"${tool}".html + fi + done +} diff --git a/net-dns/bind-tools/bind-tools-9.16.3.ebuild b/net-dns/bind-tools/bind-tools-9.16.3.ebuild new file mode 100644 index 000000000000..430038762701 --- /dev/null +++ b/net-dns/bind-tools/bind-tools-9.16.3.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs + +MY_PN=${PN//-tools} +MY_PV=${PV/_p/-P} +MY_PV=${MY_PV/_rc/rc} +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" +HOMEPAGE="https://www.isc.org/software/bind" +SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +COMMON_DEPEND=" + dev-libs/libuv:= + caps? ( sys-libs/libcap ) + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + xml? ( dev-libs/libxml2 ) + idn? ( net-dns/libidn2:= ) + gssapi? ( virtual/krb5 ) + libedit? ( dev-libs/libedit ) + !libedit? ( + readline? ( sys-libs/readline:= ) + )" +DEPEND="${COMMON_DEPEND}" + +RDEPEND="${COMMON_DEPEND}" + +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +RESTRICT="test" + +src_prepare() { + default + + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --localstatedir="${EPREFIX}"/var + --without-python + --without-libjson + --without-zlib + --without-lmdb + --with-openssl="${EPREFIX}"/usr + $(use_with idn libidn2) + $(use_with xml libxml2) + $(use_with gssapi) + $(use_with readline) + $(use_enable caps linux-caps) + ) + + # bug 607400 + if use libedit ; then + myeconfargs+=( --with-readline=-ledit ) + elif use readline ; then + myeconfargs+=( --with-readline=-lreadline ) + else + myeconfargs+=( --without-readline ) + fi + + # bug 344029 + append-cflags "-DDIG_SIGCHASE" + + # to expose CMSG_* macros from sys/sockets.h + [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" + + # localstatedir for nsupdate -l, bug 395785 + tc-export BUILD_CC + econf "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_compile() { + local AR=$(tc-getAR) + + emake AR="${AR}" -C lib/ + emake AR="${AR}" -C bin/delv/ + emake AR="${AR}" -C bin/dig/ + emake AR="${AR}" -C bin/nsupdate/ + emake AR="${AR}" -C bin/dnssec/ +} + +src_install() { + dodoc README CHANGES + + cd "${S}"/bin/delv || die + dobin delv + doman delv.1 + + cd "${S}"/bin/dig || die + dobin dig host nslookup + doman {dig,host,nslookup}.1 + + cd "${S}"/bin/nsupdate || die + dobin nsupdate + doman nsupdate.1 + if use doc; then + docinto html + dodoc nsupdate.html + fi + + cd "${S}"/bin/dnssec || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + dobin dnssec-"${tool}" + doman dnssec-"${tool}".8 + if use doc; then + docinto html + dodoc dnssec-"${tool}".html + fi + done +} diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index 2b023f94efbf..a1105e058a2a 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -9,12 +9,16 @@ AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4 DIST bind-9.14.11.tar.gz 6310200 BLAKE2B 90fccfa24f576b3e028b947a1c9b6ca05c03175675e9573129068534f1e7cfb89a46f7de21b6ad1fabc7bb68d56997c4bf8a2309dd5f29b52fc61d4d271bd131 SHA512 ec34254d6fe5d72c704ba743d1af5582f2ea6b79363f132013ea9ebebed72c74a3ea9ae8a7978ca2b28f908ef848b9c2961cec85254b7d88680c269233b40524 +DIST bind-9.14.12.tar.gz 6318913 BLAKE2B 38cad65923666afa5d83434c43a1b5577fe9555ca637489f780996a1b439955169c859c690f6fb96b003976eca482fe57c9226797cda5b124dc2073a90ef0515 SHA512 f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf DIST bind-9.14.8.tar.gz 6403140 BLAKE2B 45cb06ce8564880d501c63d25c7af8567184e4e4293e01886620cf655449c972ab55c77c7aded07838c61557bc56d9edac26097715c1121fcfb6b606d7a29365 SHA512 eb52760982ebd246e6e1945684771193fc7364324a6d6a95a0cae33afa0a4fa24ffe8313b5f9094420c7c2ec932b1b1a9fb19f6e673ff3c5583ab5e3ff04eb6a DIST bind-9.14.9.tar.gz 6296339 BLAKE2B 65496ab94a83ddd1c519df4519373aa77858c6d66efed9342e962cd61943b12e9ecb2f74132015b3f835d0368d1cc59be23e0db92d4780f9f367c0d0fe8c3ada SHA512 aa6b1273f06fc16c842b7012a4d09cb65325a44ee88fea8bea8264ffa907ef4a6f8d5e09384599b2d6f5cea66c0dc220765c245814f54b2f09a5b6e65f97964b DIST bind-9.16.1.tar.xz 4541768 BLAKE2B 4a2697c5317b2e186e57ef6613bdaedddb0f371c5a3d6a18b93c8e20de553eaa4d81d567e49b5ea395506e1d8aee729dcfa10896ed6dc8fee268d9ed5c7670d8 SHA512 9a1e8987f312b09a16c2ee0fd1d1eb8e4951b8dbcf3c0d51a1a1fb179a261028239ab2bebc3e559592cc766de57a26ba37b27621a0c5e1711d36c2416f0a0c26 +DIST bind-9.16.3.tar.xz 4573044 BLAKE2B 0630c1225984dbe301ca3e4d768d402e3293eee0ae186257d05e9f9999cdfc9538baf015155471f8abe2e725fe8bdb08c0f45bb8619a4a35b781606ee09e708c SHA512 aded208ab8b10cac275512eb4cb19f4eabd654ef3c14ab0c635f7d09194df4f6dfa84d0b5d69ce93854ceb26a93e21d7122b01ce4f3996da807249ca41d877df DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac EBUILD bind-9.14.11.ebuild 11360 BLAKE2B de639a334f5f44e73d24fb3fc7cbfe08d9990e64f4efcd03ad6da2ade7adb9480c1538f572cdcd080533d57eb85d33c375cc262004946f1b4ff7959b516ccdb3 SHA512 ba89c0de1b98c6e2334caaecf5c7eb99e7fc8e1b96568ad75274d0015b574d58390b451b06f77cfe4eb657b6a7b7b78cedc3da7283257c6785fc231753d4f50b +EBUILD bind-9.14.12.ebuild 11356 BLAKE2B 4fcb1bd8548e6745f4ae1ec33f8252ffd006ee5a1673ee1edc36aef4f37ff74831051e3f135c4d5dbe8c7f1a6ba58bc7420525700302ae3f45f23ca13110ff64 SHA512 78559c54841a5735e74715a1283b46de349d079be7685133d6802daf297916a873705d607826a1149d4f0e39c833978d64a8b4aa8359e40441b618d1a9c2a4a8 EBUILD bind-9.14.8.ebuild 11353 BLAKE2B ad192b5823ca915511b4a12325b3585ad6cd518f4d969b22fd91222628215b112f504d3df5c5ce9b0d3e7c6136b9153f8e7c6d4f5398a6c80660c373d6e61aa0 SHA512 df8f92513d2d53a3977ee2b270273a79ecff104ed21ec70309a5141d81611c2ab15e0504a4f23bd3ea122caa0a92d53257373b6f265873b2dee8783f61ee2df1 EBUILD bind-9.14.9.ebuild 11360 BLAKE2B de639a334f5f44e73d24fb3fc7cbfe08d9990e64f4efcd03ad6da2ade7adb9480c1538f572cdcd080533d57eb85d33c375cc262004946f1b4ff7959b516ccdb3 SHA512 ba89c0de1b98c6e2334caaecf5c7eb99e7fc8e1b96568ad75274d0015b574d58390b451b06f77cfe4eb657b6a7b7b78cedc3da7283257c6785fc231753d4f50b EBUILD bind-9.16.1.ebuild 11358 BLAKE2B a6cd6c275843327119193e86a708b4debac55d42984fa320364b6c0b9e2934b881c0a05b5fe2b70e84a9b41922688a2c61af185754817718c11dde2269de67ca SHA512 801bab9fbbd0693459085f3135219ea6f1bc74af5cff6fc2790281e94818658b6d10c53d45a15382979e592dd1487126c40d48b635a32af7dcae51bdbba01dcb +EBUILD bind-9.16.3.ebuild 11354 BLAKE2B 74241d9d6118e43d1ddf7c0d414c4dfb66011a9bf33a905c9a7dc106282a988be25adfa40a3ed14ffd1d948909627ab210d1c749e02fa2c6a3e2823f594f6e51 SHA512 cb67132274c37d5f1746d6b18067e72c09efd9bfe1232443a92dc27e75812be783b1d8864677cc73415c1b212e035e8070201411fb0388290c5a26137d1ec6c4 MISC metadata.xml 1043 BLAKE2B c4b1341082f3bd13a93ea378f61608a65ac7f904273932dcdbcf2a73ea8b4c7610ced855ed4a3fb61c7b02044db23bd0effda02d71b3114c7b4017c06784ac31 SHA512 879eca4059049ced098da9afe6aec250d174fabbc701e55ca6c22cfdf050b7c49289113a7e9ad99fa90685ca62c5f672201e04c7f0c766b55d780e26f8da59a2 diff --git a/net-dns/bind/bind-9.14.12.ebuild b/net-dns/bind/bind-9.14.12.ebuild new file mode 100644 index 000000000000..49e92059321e --- /dev/null +++ b/net-dns/bind/bind-9.14.12.ebuild @@ -0,0 +1,378 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Re dlz/mysql and threads, needs to be verified.. +# MySQL uses thread local storage in its C api. Thus MySQL +# requires that each thread of an application execute a MySQL +# thread initialization to setup the thread local storage. +# This is impossible to do safely while staying within the DLZ +# driver API. This is a limitation caused by MySQL, and not the DLZ API. +# Because of this BIND MUST only run with a single thread when +# using the MySQL driver. + +EAPI=7 + +PYTHON_COMPAT=( python3_7 ) + +inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd + +MY_PV="${PV/_p/-P}" +MY_PV="${MY_PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" + +SDB_LDAP_VER="1.1.0-fc14" + +RRL_PV="${MY_PV}" + +# SDB-LDAP: http://bind9-ldap.bayour.com/ + +DESCRIPTION="Berkeley Internet Name Domain - Name Server" +HOMEPAGE="https://www.isc.org/software/bind" +SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz + doc? ( mirror://gentoo/dyndns-samples.tbz2 )" +# sdb-ldap? ( +# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 +# )" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# -berkdb by default re bug 602682 +IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi +json ldap libressl lmdb mysql odbc postgres python selinux static-libs +urandom xml +zlib" +# sdb-ldap - patch broken +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +REQUIRED_USE=" + ?? ( geoip geoip2 ) + postgres? ( dlz ) + berkdb? ( dlz ) + mysql? ( dlz ) + odbc? ( dlz ) + ldap? ( dlz ) + dnsrps? ( dlz ) + python? ( ${PYTHON_REQUIRED_USE} )" +# sdb-ldap? ( dlz ) + +DEPEND="!libressl? ( dev-libs/openssl:=[-bindist] ) + libressl? ( dev-libs/libressl:= ) + mysql? ( dev-db/mysql-connector-c:0= ) + odbc? ( >=dev-db/unixODBC-2.2.6 ) + ldap? ( net-nds/openldap ) + postgres? ( dev-db/postgresql:= ) + caps? ( >=sys-libs/libcap-2.1.0 ) + xml? ( dev-libs/libxml2 ) + geoip? ( >=dev-libs/geoip-1.4.6 ) + geoip2? ( dev-libs/libmaxminddb ) + gssapi? ( virtual/krb5 ) + json? ( dev-libs/json-c:= ) + lmdb? ( dev-db/lmdb ) + zlib? ( sys-libs/zlib ) + dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) + python? ( + ${PYTHON_DEPS} + dev-python/ply[${PYTHON_USEDEP}] + )" +# sdb-ldap? ( net-nds/openldap ) + +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-bind ) + sys-process/psmisc" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/bind-9.14.8-mysql8-bool.patch +) + +pkg_setup() { + ebegin "Creating named group and user" + enewgroup named 40 + enewuser named 40 -1 /etc/bind named + eend ${?} +} + +src_prepare() { + default + + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir) -ldl" + + # Adjusting PATHs in manpages + for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do + sed -i \ + -e 's:/etc/named.conf:/etc/bind/named.conf:g' \ + -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \ + -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \ + "${i}" || die "sed failed, ${i} doesn't exist" + done + +# if use dlz; then +# # sdb-ldap patch as per bug #160567 +# # Upstream URL: http://bind9-ldap.bayour.com/ +# # New patch take from bug 302735 +# if use sdb-ldap; then +# epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch +# cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/ +# cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/ +# cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/ +# fi +# fi + + # should be installed by bind-tools + sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --sysconfdir=/etc/bind + --localstatedir=/var + --with-libtool + --enable-full-report + --without-readline + --with-openssl="${EPREFIX}"/usr + $(use_enable caps linux-caps) + $(use_enable dnsrps) + $(use_enable dnstap) + $(use_enable fixed-rrset) + # $(use_enable static-libs static) + $(use_with berkdb dlz-bdb) + $(use_with dlz dlopen) + $(use_with dlz dlz-filesystem) + $(use_with dlz dlz-stub) + $(use_with gssapi) + $(use_with json libjson) + $(use_with ldap dlz-ldap) + $(use_with mysql dlz-mysql) + $(use_with odbc dlz-odbc) + $(use_with postgres dlz-postgres) + $(use_with lmdb) + $(use_with python) + $(use_with xml libxml2) + $(use_with zlib) + ) + + use geoip && myeconfargs+=( --with-geoip ) + use geoip2 && myeconfargs+=( --with-geoip2 ) + + # bug #158664 +# gcc-specs-ssp && replace-flags -O[23s] -O + + # To include db.h from proper path + use berkdb && append-flags "-I$(db_includedir)" + + export BUILD_CC=$(tc-getBUILD_CC) + econf "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_install() { + default + + dodoc CHANGES README + + if use doc; then + dodoc doc/arm/Bv9ARM.pdf + + docinto misc + dodoc -r doc/misc/ + + # might a 'html' useflag make sense? + docinto html + dodoc -r doc/arm/ + + docinto contrib + dodoc contrib/scripts/{nanny.pl,named-bootconf.sh} + + # some handy-dandy dynamic dns examples + pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die + tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die + popd 1>/dev/null || die + fi + + insinto /etc/bind + newins "${FILESDIR}"/named.conf-r8 named.conf + + # ftp://ftp.rs.internic.net/domain/named.cache: + insinto /var/bind + newins "${FILESDIR}"/named.cache-r3 named.cache + + insinto /var/bind/pri + newins "${FILESDIR}"/localhost.zone-r3 localhost.zone + + newinitd "${FILESDIR}"/named.init-r13 named + newconfd "${FILESDIR}"/named.confd-r7 named + + newenvd "${FILESDIR}"/10bind.env 10bind + + # Let's get rid of those tools and their manpages since they're provided by bind-tools + rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die + rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die + rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die + rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die + rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die + done + + # bug 405251, library archives aren't properly handled by --enable/disable-static + if ! use static-libs; then + find "${ED}" -type f -name '*.a' -delete || die + fi + + # bug 405251 + find "${ED}" -type f -name '*.la' -delete || die + + if use python; then + install_python_tools() { + dosbin bin/python/dnssec-{checkds,coverage} + } + python_foreach_impl install_python_tools + + python_replicate_script "${ED}/usr/sbin/dnssec-checkds" + python_replicate_script "${ED}/usr/sbin/dnssec-coverage" + fi + + # bug 450406 + dosym named.cache /var/bind/root.cache + + dosym ../../var/bind/pri /etc/bind/pri + dosym ../../var/bind/sec /etc/bind/sec + dosym ../../var/bind/dyn /etc/bind/dyn + keepdir /var/bind/{pri,sec,dyn} + + dodir /var/log/named + + fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn} + fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0750 /etc/bind /var/bind/pri + fperms 0770 /var/log/named /var/bind/{,sec,dyn} + + systemd_newunit "${FILESDIR}/named.service-r1" named.service + systemd_dotmpfilesd "${FILESDIR}"/named.conf + exeinto /usr/libexec + doexe "${FILESDIR}/generate-rndc-key.sh" +} + +pkg_postinst() { + if [ ! -f '/etc/bind/rndc.key' ]; then + if use urandom; then + einfo "Using /dev/urandom for generating rndc.key" + /usr/sbin/rndc-confgen -r /dev/urandom -a + echo + else + einfo "Using /dev/random for generating rndc.key" + /usr/sbin/rndc-confgen -a + echo + fi + chown root:named /etc/bind/rndc.key || die + chmod 0640 /etc/bind/rndc.key || die + fi + + einfo + einfo "You can edit /etc/conf.d/named to customize named settings" + einfo + use mysql || use postgres || use ldap && { + elog "If your named depends on MySQL/PostgreSQL or LDAP," + elog "uncomment the specified rc_named_* lines in your" + elog "/etc/conf.d/named config to ensure they'll start before bind" + einfo + } + einfo "If you'd like to run bind in a chroot AND this is a new" + einfo "install OR your bind doesn't already run in a chroot:" + einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named." + einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`" + einfo + + CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) + if [[ -n ${CHROOT} ]]; then + elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + elog "To enable the old behaviour (without using mount) uncomment the" + elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + elog "If you decide to use the new/default method, ensure to make backup" + elog "first and merge your existing configs/zones to /etc/bind and" + elog "/var/bind because bind will now mount the needed directories into" + elog "the chroot dir." + fi +} + +pkg_config() { + CHROOT=$(source /etc/conf.d/named; echo ${CHROOT}) + CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT}) + CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP}) + + if [[ -z "${CHROOT}" ]]; then + eerror "This config script is designed to automate setting up" + eerror "a chrooted bind/named. To do so, please first uncomment" + eerror "and set the CHROOT variable in '/etc/conf.d/named'." + die "Unset CHROOT" + fi + if [[ -d "${CHROOT}" ]]; then + ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + ewarn "To enable the old behaviour (without using mount) uncomment the" + ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + ewarn + ewarn "${CHROOT} already exists... some things might become overridden" + ewarn "press CTRL+C if you don't want to continue" + sleep 10 + fi + + echo; einfo "Setting up the chroot directory..." + + mkdir -m 0750 -p ${CHROOT} || die + mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die + mkdir -m 0750 -p ${CHROOT}/etc/bind || die + mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die + + chown root:named \ + ${CHROOT} \ + ${CHROOT}/var/{bind,log/named} \ + ${CHROOT}/run/named/ \ + ${CHROOT}/etc/bind \ + || die + + mknod ${CHROOT}/dev/null c 1 3 || die + chmod 0666 ${CHROOT}/dev/null || die + + mknod ${CHROOT}/dev/zero c 1 5 || die + chmod 0666 ${CHROOT}/dev/zero || die + + if use urandom; then + mknod ${CHROOT}/dev/urandom c 1 9 || die + chmod 0666 ${CHROOT}/dev/urandom || die + else + mknod ${CHROOT}/dev/random c 1 8 || die + chmod 0666 ${CHROOT}/dev/random || die + fi + + if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then + cp -a /etc/bind ${CHROOT}/etc/ || die + cp -a /var/bind ${CHROOT}/var/ || die + fi + + if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then + if use geoip; then + mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die + elif use geoip2; then + mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die + fi + fi + + elog "You may need to add the following line to your syslog-ng.conf:" + elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" +} diff --git a/net-dns/bind/bind-9.16.3.ebuild b/net-dns/bind/bind-9.16.3.ebuild new file mode 100644 index 000000000000..df80f163de4b --- /dev/null +++ b/net-dns/bind/bind-9.16.3.ebuild @@ -0,0 +1,376 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Re dlz/mysql and threads, needs to be verified.. +# MySQL uses thread local storage in its C api. Thus MySQL +# requires that each thread of an application execute a MySQL +# thread initialization to setup the thread local storage. +# This is impossible to do safely while staying within the DLZ +# driver API. This is a limitation caused by MySQL, and not the DLZ API. +# Because of this BIND MUST only run with a single thread when +# using the MySQL driver. + +EAPI=7 + +PYTHON_COMPAT=( python3_7 ) + +inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd + +MY_PV="${PV/_p/-P}" +MY_PV="${MY_PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" + +SDB_LDAP_VER="1.1.0-fc14" + +RRL_PV="${MY_PV}" + +# SDB-LDAP: http://bind9-ldap.bayour.com/ + +DESCRIPTION="Berkeley Internet Name Domain - Name Server" +HOMEPAGE="https://www.isc.org/software/bind" +SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz + doc? ( mirror://gentoo/dyndns-samples.tbz2 )" +# sdb-ldap? ( +# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 +# )" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# -berkdb by default re bug 602682 +IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi +json ldap libressl lmdb mysql odbc postgres python selinux static-libs +urandom xml +zlib" +# sdb-ldap - patch broken +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +REQUIRED_USE=" + ?? ( geoip geoip2 ) + postgres? ( dlz ) + berkdb? ( dlz ) + mysql? ( dlz ) + odbc? ( dlz ) + ldap? ( dlz ) + dnsrps? ( dlz ) + python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="!libressl? ( dev-libs/openssl:=[-bindist] ) + libressl? ( dev-libs/libressl:= ) + mysql? ( dev-db/mysql-connector-c:0= ) + odbc? ( >=dev-db/unixODBC-2.2.6 ) + ldap? ( net-nds/openldap ) + postgres? ( dev-db/postgresql:= ) + caps? ( >=sys-libs/libcap-2.1.0 ) + xml? ( dev-libs/libxml2 ) + geoip? ( >=dev-libs/geoip-1.4.6 ) + geoip2? ( dev-libs/libmaxminddb ) + gssapi? ( virtual/krb5 ) + json? ( dev-libs/json-c:= ) + lmdb? ( dev-db/lmdb ) + zlib? ( sys-libs/zlib ) + dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) + python? ( + ${PYTHON_DEPS} + dev-python/ply[${PYTHON_USEDEP}] + ) + dev-libs/libuv:=" + +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-bind ) + sys-process/psmisc" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +# bug 710840, cmocka fails LDFLAGS='-Wl,-O1' +RESTRICT="test" + +pkg_setup() { + ebegin "Creating named group and user" + enewgroup named 40 + enewuser named 40 -1 /etc/bind named + eend ${?} +} + +src_prepare() { + default + + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir) -ldl" + + # Adjusting PATHs in manpages + for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do + sed -i \ + -e 's:/etc/named.conf:/etc/bind/named.conf:g' \ + -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \ + -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \ + "${i}" || die "sed failed, ${i} doesn't exist" + done + +# if use dlz; then +# # sdb-ldap patch as per bug #160567 +# # Upstream URL: http://bind9-ldap.bayour.com/ +# # New patch take from bug 302735 +# if use sdb-ldap; then +# epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch +# cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/ +# cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/ +# cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/ +# fi +# fi + + # should be installed by bind-tools + sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --prefix="${EPREFIX}"/usr + --sysconfdir=/etc/bind + --localstatedir=/var + --with-libtool + --enable-full-report + --without-readline + --with-openssl="${EPREFIX}"/usr + --without-cmocka + $(use_enable caps linux-caps) + $(use_enable dnsrps) + $(use_enable dnstap) + $(use_enable fixed-rrset) + # $(use_enable static-libs static) + $(use_with berkdb dlz-bdb) + $(use_with dlz dlopen) + $(use_with dlz dlz-filesystem) + $(use_with dlz dlz-stub) + $(use_with gssapi) + $(use_with json json-c) + $(use_with ldap dlz-ldap) + $(use_with mysql dlz-mysql) + $(use_with odbc dlz-odbc) + $(use_with postgres dlz-postgres) + $(use_with lmdb) + $(use_with python) + $(use_with xml libxml2) + $(use_with zlib) + ) + + use geoip && myeconfargs+=( --with-geoip ) + use geoip2 && myeconfargs+=( --with-geoip2 ) + + # bug #158664 +# gcc-specs-ssp && replace-flags -O[23s] -O + + # To include db.h from proper path + use berkdb && append-flags "-I$(db_includedir)" + + export BUILD_CC=$(tc-getBUILD_CC) + econf "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_install() { + default + + dodoc CHANGES README + + if use doc; then + dodoc doc/arm/Bv9ARM.pdf + + docinto misc + dodoc -r doc/misc/ + + # might a 'html' useflag make sense? + docinto html + dodoc -r doc/arm/ + + docinto contrib + dodoc contrib/scripts/{nanny.pl,named-bootconf.sh} + + # some handy-dandy dynamic dns examples + pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die + tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die + popd 1>/dev/null || die + fi + + insinto /etc/bind + newins "${FILESDIR}"/named.conf-r8 named.conf + + # ftp://ftp.rs.internic.net/domain/named.cache: + insinto /var/bind + newins "${FILESDIR}"/named.cache-r3 named.cache + + insinto /var/bind/pri + newins "${FILESDIR}"/localhost.zone-r3 localhost.zone + + newinitd "${FILESDIR}"/named.init-r13 named + newconfd "${FILESDIR}"/named.confd-r7 named + + newenvd "${FILESDIR}"/10bind.env 10bind + + # Let's get rid of those tools and their manpages since they're provided by bind-tools + rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die + rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die + rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die + rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die + rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die + done + + # bug 405251, library archives aren't properly handled by --enable/disable-static + if ! use static-libs; then + find "${ED}" -type f -name '*.a' -delete || die + fi + + # bug 405251 + find "${ED}" -type f -name '*.la' -delete || die + + if use python; then + install_python_tools() { + dosbin bin/python/dnssec-{checkds,coverage} + } + python_foreach_impl install_python_tools + + python_replicate_script "${ED}/usr/sbin/dnssec-checkds" + python_replicate_script "${ED}/usr/sbin/dnssec-coverage" + fi + + # bug 450406 + dosym named.cache /var/bind/root.cache + + dosym ../../var/bind/pri /etc/bind/pri + dosym ../../var/bind/sec /etc/bind/sec + dosym ../../var/bind/dyn /etc/bind/dyn + keepdir /var/bind/{pri,sec,dyn} + + dodir /var/log/named + + fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn} + fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0750 /etc/bind /var/bind/pri + fperms 0770 /var/log/named /var/bind/{,sec,dyn} + + systemd_newunit "${FILESDIR}/named.service-r1" named.service + systemd_dotmpfilesd "${FILESDIR}"/named.conf + exeinto /usr/libexec + doexe "${FILESDIR}/generate-rndc-key.sh" +} + +pkg_postinst() { + if [ ! -f '/etc/bind/rndc.key' ]; then + if use urandom; then + einfo "Using /dev/urandom for generating rndc.key" + /usr/sbin/rndc-confgen -r /dev/urandom -a + echo + else + einfo "Using /dev/random for generating rndc.key" + /usr/sbin/rndc-confgen -a + echo + fi + chown root:named /etc/bind/rndc.key || die + chmod 0640 /etc/bind/rndc.key || die + fi + + einfo + einfo "You can edit /etc/conf.d/named to customize named settings" + einfo + use mysql || use postgres || use ldap && { + elog "If your named depends on MySQL/PostgreSQL or LDAP," + elog "uncomment the specified rc_named_* lines in your" + elog "/etc/conf.d/named config to ensure they'll start before bind" + einfo + } + einfo "If you'd like to run bind in a chroot AND this is a new" + einfo "install OR your bind doesn't already run in a chroot:" + einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named." + einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`" + einfo + + CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) + if [[ -n ${CHROOT} ]]; then + elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + elog "To enable the old behaviour (without using mount) uncomment the" + elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + elog "If you decide to use the new/default method, ensure to make backup" + elog "first and merge your existing configs/zones to /etc/bind and" + elog "/var/bind because bind will now mount the needed directories into" + elog "the chroot dir." + fi +} + +pkg_config() { + CHROOT=$(source /etc/conf.d/named; echo ${CHROOT}) + CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT}) + CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP}) + + if [[ -z "${CHROOT}" ]]; then + eerror "This config script is designed to automate setting up" + eerror "a chrooted bind/named. To do so, please first uncomment" + eerror "and set the CHROOT variable in '/etc/conf.d/named'." + die "Unset CHROOT" + fi + if [[ -d "${CHROOT}" ]]; then + ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + ewarn "To enable the old behaviour (without using mount) uncomment the" + ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + ewarn + ewarn "${CHROOT} already exists... some things might become overridden" + ewarn "press CTRL+C if you don't want to continue" + sleep 10 + fi + + echo; einfo "Setting up the chroot directory..." + + mkdir -m 0750 -p ${CHROOT} || die + mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die + mkdir -m 0750 -p ${CHROOT}/etc/bind || die + mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die + + chown root:named \ + ${CHROOT} \ + ${CHROOT}/var/{bind,log/named} \ + ${CHROOT}/run/named/ \ + ${CHROOT}/etc/bind \ + || die + + mknod ${CHROOT}/dev/null c 1 3 || die + chmod 0666 ${CHROOT}/dev/null || die + + mknod ${CHROOT}/dev/zero c 1 5 || die + chmod 0666 ${CHROOT}/dev/zero || die + + if use urandom; then + mknod ${CHROOT}/dev/urandom c 1 9 || die + chmod 0666 ${CHROOT}/dev/urandom || die + else + mknod ${CHROOT}/dev/random c 1 8 || die + chmod 0666 ${CHROOT}/dev/random || die + fi + + if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then + cp -a /etc/bind ${CHROOT}/etc/ || die + cp -a /var/bind ${CHROOT}/var/ || die + fi + + if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then + if use geoip; then + mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die + elif use geoip2; then + mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die + fi + fi + + elog "You may need to add the following line to your syslog-ng.conf:" + elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" +} diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest index e90dc42b4ef6..a1409476b2d5 100644 --- a/net-dns/c-ares/Manifest +++ b/net-dns/c-ares/Manifest @@ -3,8 +3,10 @@ DIST c-ares-1.13.0.tar.gz 1446797 BLAKE2B 9d7daaad8e35242f110ee8b4abf20619e46beb DIST c-ares-1.14.0.tar.gz 1335940 BLAKE2B d62a0b6d5ea4a2926ff8f2f719d267f9a0c97fa9756b80fcf7c97822f3dd7a1ce9587d9db0ea5217f052f54f5858c68e71c78c33f32fe60df81f456cd9719ac6 SHA512 30cd3f8c4eea15f994b2ceb44d84e506858f69f624e651e39bb4db523fea9ad5e8906b75abf07131ae364be19172274ed4053059669091f21ce4463cdbb857bf DIST c-ares-1.15.0.tar.gz 1347687 BLAKE2B c4028bb2840af23274b79c73600bfcf73a348c7ab63ae3c215829e0fe2cf149f4ad38a3ec657c3997bad818ced3cacaed0579dd0dd2ef42eaffd074bdc4f22ed SHA512 a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50 DIST c-ares-1.16.0.tar.gz 1374180 BLAKE2B e12be58153b98cb99c5760d3687a5464ec21b63c01d7d5d028c6b55bff5dca06c263188fdb84ff8975e4f482343f11eb4b0554b18ded90af5aaa64523a1341fe SHA512 9f5def3206d61682e66c2173b18a8dd76138e6eb53bfe06a5830408cce9a70895d2148be23064ff18e0fd25b4f4b2c3cfe77e040744cc80dcce6ffec3ea534a9 +DIST c-ares-1.16.1.tar.gz 1374637 BLAKE2B 0d87538f5d6cac5b6b9c92d6ba5525af0e580e6506bee9270318f0951aaccdc7e135b446381e8150241d367789ccf2f73dbb333d45de4dbb5a87af05483063a8 SHA512 4ac2a5d5c6da74eb1d6155c4eadc7127ab1b53a8d13caec41bd6172db5417a79f3ab022e77ba37d8b13da6893d7ced5fd8baf5cc3950a4154b4de8743ad31471 EBUILD c-ares-1.13.0.ebuild 974 BLAKE2B 0e9b50022def2e41acd61928b086fab3b77fa966131e3b09c48b6facebe5cb122dcc61e44421c3c9bb016c3fc00d4bff445ee163b8ba56f012ff2c7798b0c0ac SHA512 fe9ffaf09ca0f06e8ac033feab35d4f201a086d30a75ed1f1d38d364d79980d5277a5b1eb2dd678fc67b00973555563e1b49bdf6075807c4581804fd08973805 EBUILD c-ares-1.14.0.ebuild 983 BLAKE2B e626899e3caba69343c8455b1e9c8d9d6905ac03548a8c1b86cc8d6fc76bbe33f395881ff173d95aadb05627803e7b3d05b4ebb648aa6676345cbb0d9172ec2e SHA512 9af3795654dbdcdb15a5337c932b59a96485a859aedd5667fd8b274742998210af6bb9e7c56666135d599484bfba5be67ba8c7b93d1ce7204baf0fb00554b236 EBUILD c-ares-1.15.0.ebuild 981 BLAKE2B 4d20cf42383b320b43d75de1d62346d19027b2f9e4dbc055184034985ba4945a9699bf08ff94e49f648c1df57c62e316b46e26a6ca8755d4542db41a4b057407 SHA512 64f0df8e932e2963c3ad6b613d3f821b19cf5b16f363c634890ab081129278eea971b770a7076fcc624887acb08aa01798e9430265b7ce9ee69b44124653ff22 EBUILD c-ares-1.16.0.ebuild 997 BLAKE2B 5c3ed333c9e933887ea63c120bb8de2e3a473833d9950321754f2e8c0fc382ff1a3abe6dc79246d45321ae9634c603fcbea51d9eb516ce10d6768d5a1c3f02b6 SHA512 8c3a2802bae071d181312870792490caf29064715e7d4efb621b774b3b0ef43071a01bd5bde63621c798b3db867c2aee6e1ad48a118c28d52cce8a8984e88804 +EBUILD c-ares-1.16.1.ebuild 988 BLAKE2B 10888b2bef7f28d894619b3b1613f8e848fef68ce34e1c288ea3d375778e99531005d1b4cf9b24e9f7a64bfe94bea93cfed87dd6faf85d0e743af6d53a1bc54a SHA512 ead0865956916fa988e035a0bf552580df2bb76fffee7ec069835096173a551513858446aedf1511554ca7d0b3f58b570a7c640e1da05e4d3e043389e32ce359 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755 diff --git a/net-dns/c-ares/c-ares-1.16.1.ebuild b/net-dns/c-ares/c-ares-1.16.1.ebuild new file mode 100644 index 000000000000..b2ec52821ee8 --- /dev/null +++ b/net-dns/c-ares/c-ares-1.16.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools eutils multilib-minimal + +DESCRIPTION="C library that resolves names asynchronously" +HOMEPAGE="https://c-ares.haxx.se/" +SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris" +IUSE="static-libs" + +# Subslot = SONAME of libcares.so.2 +SLOT="0/2" + +DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ares_build.h +) + +src_prepare() { + eapply "${FILESDIR}"/${PN}-1.12.0-remove-tests.patch + eapply_user + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf \ + --enable-nonblocking \ + --enable-symbol-hiding \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name "*.la" -delete || die +} diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest index 148c462b3f42..9d7f25295d2a 100644 --- a/net-dns/dnsmasq/Manifest +++ b/net-dns/dnsmasq/Manifest @@ -1,13 +1,8 @@ -AUX dnsmasq-2.80-cve-2019-14834.patch 1514 BLAKE2B 24aad94e0a324007c782337b94ee88dc61fdb3e23b06717a4f09255dfcadfa9091c211994d5b842a898692bd5302d96a2b2c4c2a551863a1f0bd7ff7a62c3df4 SHA512 1cb0148d93388c09762d770719dc842aa0b04c0770fb82ae6f3de4cf7c2742055cf54f1915d93bfaac543ccccd48d66fd6191758f0541ba8c30936af97b96296 -AUX dnsmasq-2.80-linux-headers-5.2.patch 696 BLAKE2B 10f39e0e7eab2f6d4b621bd33d558a93ff310c9800d0a8db3ff280f77556d0e9e05287d50e14f95661aaf56c2456939605bf0541fc0bd2d96b0d27d9f14cb85a SHA512 5a46deec52d18fe231c0f794c39ce97414c9fb0a1e26fda5e1d3c350a6c00652d193d1e4f55b14adbaa61a23c97683cde172711e8934b271b33ee9d4e0889135 -AUX dnsmasq-2.80-nettle-3.5.patch 1494 BLAKE2B e65092e18f8fbaa3b0f8be637b18ec976da1a1752b621ce1e1337bdc85e529ccf4bb21988296cae6574e8ff26983c32731656a751631455713afd93c0f7ea41d SHA512 df64088b22f996ff228fce18dd05b329d9fdf7b02290bc3992546004394e662be7bc416dc718ea866341403234eb20efd5bbf1eec96df1cb6ab099ebfd3fdee4 AUX dnsmasq-init-dhcp-r3 721 BLAKE2B 94a7542419e2c931149edbd5a5167c7fcbe0233e48f3ed854dfe26090b596c4f2549e37d2680bfceb1c6d21f475012f81a2102bde85e7cd609979e555dbcfa3d SHA512 f7a64fb84a7877b5ec629f9ed92419799913b8f2f73594c510aedc083d72c5c1862da7e5aed4485102c3b89ca7217bcca88e7cdde82f5a65d4cd4bb19017c2fe AUX dnsmasq-init-r4 613 BLAKE2B 7ea82e879f8770c3f4b764a9044ef585cc6e91de793c56733a6af1d9e138ca6e55813ad1720a70d0a5a61f6815d094574ae04f9761b2e2846c6267c6a4e97780 SHA512 72ae659a62c61495dc575fa590cbf1352c4bd4f374a6e0a56fce9c641c163b882d8b8097d27605d102e47df49eb68c456baf7b11009a7bb7db98e99429bd80a6 AUX dnsmasq.confd-r1 170 BLAKE2B 84d5cdb15236c9e1c83fa53d0e401df90e86c6687cc88f9ebba3e2a0987cad2ccf9bb82ac7b1fcd77a81fa6058a3cd3276fb8a8a76e13983628e92be95b39af1 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f9002a3426c05632896a5f94a84ada168d672cb38e236cbde72b59201c970e348ba052dff655be1a9a57b4 SHA512 b59b299849487dcdfc18ab30ded0605e2df4876cb778b2d1cd03b740406a5580001028eb33f1ecf0dc910f393c58b7cad7c28801aa4641c3fa376e3dac997abf AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1 -DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068 DIST dnsmasq-2.81.tar.xz 510648 BLAKE2B 07861888df11f6e2e02d1b80f4e82a407b558ddb34e016f7bda5cb449ee870db000683264b2e36987ece16d50ab773f239bf12dd3468b9529ae4dccd77ecb8ee SHA512 85550c9782fef9b0710d0e233523ed1fe26e877a8bc53fcea3f7cf1fb17c3a79c46f284a99dab2bdaf6a107ea3f1a71cec476ab6d4e1b936da6591aaef42c88e -EBUILD dnsmasq-2.80-r2.ebuild 4831 BLAKE2B 6f9d26f373d551c7e623126daac06236dfd28a6bb1e8b240ce7cc67e925d1613463e2c8e95549aaad04566712ab697a57f039593dd94feb3e96768074831d90f SHA512 ded0f38b712acb054ebb2ddf13defbb79a162857d0432f781dad8d2aa63a115a6367fa679f2d39563a8f189b549060d119fec98f9832300e61339f03031b6efb -EBUILD dnsmasq-2.81.ebuild 4663 BLAKE2B 869e862f77fe47fb4a77bea55b409587d0d1ec9acab83541ef483452de088aeba39940d624ebcc17c4b657385a54878c0604352c2949fc855beaaa921e198902 SHA512 ee64334926b4d97de11dfb317604022cb5acb25f611cce9ffa705af34c3fcfba3ac63a5484195173830a929e324a6a66d63ece8a936c8453dab972bd2f96ce63 +EBUILD dnsmasq-2.81.ebuild 4662 BLAKE2B 09eae0e81f63cfccdc78288c3816f1aa70441730c5bdb8318021bd729fe89f9dff0ba0e2a121bb08cba3be7db617bf575654cb17b9ed87e7f240747837ce63e3 SHA512 92407c5cc1f50619fdb7ab9b84ba502d3da21c7fc47c4b8b736e03c57fc681f75c0e3edac939c7ac772e92a9d39cd07a17e6487d532c81fca1c97b27d965ffc1 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r2.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r2.ebuild deleted file mode 100644 index b1920a182914..000000000000 --- a/net-dns/dnsmasq/dnsmasq-2.80-r2.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs flag-o-matic user systemd - -DESCRIPTION="Small forwarding DNS server" -HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" -SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" - -IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2" -IUSE+=" +inotify ipv6 lua nls script selinux static tftp" - -DM_LINGUAS=(de es fi fr id it no pl pt_BR ro) - -BDEPEND="app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -COMMON_DEPEND="dbus? ( sys-apps/dbus:= ) - idn? ( - !libidn2? ( net-dns/libidn:0= ) - libidn2? ( >=net-dns/libidn2-2.0:= ) - ) - lua? ( dev-lang/lua:* ) - conntrack? ( net-libs/libnetfilter_conntrack:= ) - nls? ( sys-devel/gettext ) -" - -DEPEND="${COMMON_DEPEND} - dnssec? ( - dev-libs/nettle:=[gmp] - static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) - ) -" - -RDEPEND="${COMMON_DEPEND} - dnssec? ( - !static? ( - >=dev-libs/nettle-3.4:=[gmp] - ) - ) - selinux? ( sec-policy/selinux-dnsmasq ) -" - -REQUIRED_USE="dhcp-tools? ( dhcp ) - lua? ( script ) - libidn2? ( idn )" - -PATCHES=( - "${FILESDIR}/dnsmasq-2.80-nettle-3.5.patch" - "${FILESDIR}/dnsmasq-2.80-linux-headers-5.2.patch" - "${FILESDIR}/dnsmasq-2.80-cve-2019-14834.patch" -) - -use_have() { - local useflag no_only uword - if [[ ${1} == '-n' ]]; then - no_only=1 - shift - fi - useflag="${1}" - shift - - uword="${1:-${useflag}}" - shift - - while [[ ${uword} ]]; do - uword="${uword^^}" - - if ! use "${useflag}"; then - printf -- " -DNO_%s" "${uword}" - elif [[ -z "${no_only}" ]]; then - printf -- " -DHAVE_%s" "${uword}" - fi - uword="${1}" - shift - done -} - -pkg_pretend() { - if use static; then - einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked." - use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \ - "the static USE flag is ignored." - fi -} - -pkg_setup() { - enewgroup dnsmasq - enewuser dnsmasq -1 -1 /dev/null dnsmasq -} - -src_prepare() { - default - - sed -i -r 's:lua5.[0-9]+:lua:' Makefile - sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example -} - -src_configure() { - COPTS=( - "$(use_have -n auth-dns auth)" - "$(use_have conntrack)" - "$(use_have dbus)" - "$(use libidn2 || use_have idn)" - "$(use_have libidn2)" - "$(use_have -n inotify)" - "$(use_have -n dhcp dhcp dhcp6)" - "$(use_have -n ipv6 ipv6 dhcp6)" - "$(use_have -n id id)" - "$(use_have lua luascript)" - "$(use_have -n script)" - "$(use_have -n tftp)" - "$(use_have dnssec)" - "$(use_have static dnssec_static)" - "$(use_have -n dumpfile)" - ) -} - -src_compile() { - emake \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - COPTS="${COPTS[*]}" \ - CONFFILE="/etc/${PN}.conf" \ - all$(use nls && printf -- "-i18n\n") - - use dhcp-tools && emake -C contrib/lease-tools \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - all -} - -src_install() { - local lingua puid - emake \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - COPTS="${COPTS[*]}" \ - DESTDIR="${ED}" \ - install$(use nls && printf -- "-i18n\n") - - for lingua in "${DM_LINGUAS[@]}"; do - has ${lingua} ${LINGUAS-${lingua}} \ - || rm -rf "${ED}"/usr/share/locale/${lingua} - done - [[ -d "${D}"/usr/share/locale/ ]] && \ - rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/ - - dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example - dodoc -r logo - - docinto html/ - dodoc *.html - - newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN} - newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} - - insinto /etc/logrotate.d - newins "${FILESDIR}"/dnsmasq.logrotate ${PN} - - insinto /etc - newins dnsmasq.conf.example dnsmasq.conf - - insinto /usr/share/dnsmasq - doins trust-anchors.conf - - if use dhcp; then - keepdir /var/lib/misc - newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN} - fi - if use dbus; then - insinto /etc/dbus-1/system.d - doins dbus/dnsmasq.conf - fi - - if use dhcp-tools; then - dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time} - doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 - if use ipv6; then - dosbin contrib/lease-tools/dhcp_release6 - doman contrib/lease-tools/dhcp_release6.1 - fi - fi - - systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service -} - -pkg_preinst() { - # temporary workaround to (hopefully) prevent leases file from being removed - [[ -f /var/lib/misc/dnsmasq.leases ]] && \ - cp /var/lib/misc/dnsmasq.leases "${T}" -} - -pkg_postinst() { - # temporary workaround to (hopefully) prevent leases file from being removed - [[ -f "${T}"/dnsmasq.leases ]] && \ - cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases -} diff --git a/net-dns/dnsmasq/dnsmasq-2.81.ebuild b/net-dns/dnsmasq/dnsmasq-2.81.ebuild index 4566d33354fd..73c40c738af4 100644 --- a/net-dns/dnsmasq/dnsmasq-2.81.ebuild +++ b/net-dns/dnsmasq/dnsmasq-2.81.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2" IUSE+=" +inotify ipv6 lua nls script selinux static tftp" diff --git a/net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch b/net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch deleted file mode 100644 index a44ceabece71..000000000000 --- a/net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix memory leak in helper.c - -Thanks to Xu Mingjie for spotting this. - -author: Simon Kelley -commit-url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=69bc94779c2f035a9fffdb5327a54c3aeca73ed5 -diff --git a/src/helper.c b/src/helper.c -index 33ba120..c392eec 100644 (file) ---- a/src/helper.c -+++ b/src/helper.c -@@ -80,7 +80,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) - pid_t pid; - int i, pipefd[2]; - struct sigaction sigact; -- -+ unsigned char *alloc_buff = NULL; -+ - /* create the pipe through which the main program sends us commands, - then fork our process. */ - if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1) -@@ -186,11 +187,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) - struct script_data data; - char *p, *action_str, *hostname = NULL, *domain = NULL; - unsigned char *buf = (unsigned char *)daemon->namebuff; -- unsigned char *end, *extradata, *alloc_buff = NULL; -+ unsigned char *end, *extradata; - int is6, err = 0; - int pipeout[2]; - -- free(alloc_buff); -+ /* Free rarely-allocated memory from previous iteration. */ -+ if (alloc_buff) -+ { -+ free(alloc_buff); -+ alloc_buff = NULL; -+ } - - /* we read zero bytes when pipe closed: this is our signal to exit */ - if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1)) diff --git a/net-dns/dnsmasq/files/dnsmasq-2.80-linux-headers-5.2.patch b/net-dns/dnsmasq/files/dnsmasq-2.80-linux-headers-5.2.patch deleted file mode 100644 index 21bd7cd39ff6..000000000000 --- a/net-dns/dnsmasq/files/dnsmasq-2.80-linux-headers-5.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3052ce208acf602f0163166dcefb7330d537cedb Mon Sep 17 00:00:00 2001 -From: Jiri Slaby -Date: Wed, 24 Jul 2019 17:34:48 +0100 -Subject: [PATCH] Fix build after y2038 changes in glib. - -SIOCGSTAMP is defined in linux/sockios.h, not asm/sockios.h now. ---- - src/dnsmasq.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dnsmasq.h b/src/dnsmasq.h -index ff3204a..3ef04ad 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -137,6 +137,7 @@ typedef unsigned long long u64; - #endif - - #if defined(HAVE_LINUX_NETWORK) -+#include - #include - /* There doesn't seem to be a universally-available - userspace header for these. */ --- -1.7.10.4 - diff --git a/net-dns/dnsmasq/files/dnsmasq-2.80-nettle-3.5.patch b/net-dns/dnsmasq/files/dnsmasq-2.80-nettle-3.5.patch deleted file mode 100644 index 7d77a21de7cb..000000000000 --- a/net-dns/dnsmasq/files/dnsmasq-2.80-nettle-3.5.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6fd9aba7abe1e084123bc5002959350897774ace Mon Sep 17 00:00:00 2001 -From: Vladislav Grishenko -Date: Wed, 26 Jun 2019 20:27:11 +0500 -Subject: [PATCH] Fix build with libnettle 3.5 - ---- - src/crypto.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/crypto.c b/src/crypto.c -index 1f1c12b..9cfe371 100644 ---- a/src/crypto.c -+++ b/src/crypto.c -@@ -296,6 +296,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len - static struct ecc_point *key_256 = NULL, *key_384 = NULL; - static mpz_t x, y; - static struct dsa_signature *sig_struct; -+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4 -+#define nettle_get_secp_256r1() (&nettle_secp_256r1) -+#define nettle_get_secp_384r1() (&nettle_secp_384r1) -+#endif - - if (!sig_struct) - { -@@ -315,7 +319,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len - if (!(key_256 = whine_malloc(sizeof(struct ecc_point)))) - return 0; - -- nettle_ecc_point_init(key_256, &nettle_secp_256r1); -+ nettle_ecc_point_init(key_256, nettle_get_secp_256r1()); - } - - key = key_256; -@@ -328,7 +332,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len - if (!(key_384 = whine_malloc(sizeof(struct ecc_point)))) - return 0; - -- nettle_ecc_point_init(key_384, &nettle_secp_384r1); -+ nettle_ecc_point_init(key_384, nettle_get_secp_384r1()); - } - - key = key_384; diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest index 3a4c3d54a643..43622ccee803 100644 --- a/net-dns/pdns-recursor/Manifest +++ b/net-dns/pdns-recursor/Manifest @@ -1,3 +1,4 @@ +AUX pdns-recursor-4.3.1-boost-1.73.0.patch 4563 BLAKE2B 81f5f33939f9937b78235c3ff3859f09ac162350f8b855c28e0235e0ca414716c03d0866c13d055ac55d8896c11c6c1b149b5f29baa105be7b3338c06081a886 SHA512 8dd57a7423cdf4b33c59dece2ee63829c9d88ee60635a7441c6e17e0fac5762319b5c913ed4454f38926c0b3cc9489a9d12360b35f3c632607cd26f7b7b2018b AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48 AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c DIST pdns-recursor-4.1.14.tar.bz2 1249908 BLAKE2B 8918cbfa2b8ef91b18b7ef79c94bb2ae5e73f2dd835e810aca6480b7338be19e9d151f6ace6cd42bba6c71123378b95811dfa570d31ce2aa3e141b9e49753c8e SHA512 9b1842df5d32f0f7a7080bedb98d8f9e36c08cbf7427c9ba1bd07bae40ef48ad4a843d6eaff336d1fe9869c209c05f4edf1117b994b6ed5818146445b28b3011 @@ -5,9 +6,11 @@ DIST pdns-recursor-4.1.15.tar.bz2 1252518 BLAKE2B 11eecf1ca69e6855be1cb1a1a6bfef DIST pdns-recursor-4.2.0.tar.bz2 1316156 BLAKE2B 3ceb71695b0d5aa2826e28975f45d03910b23f2d7dfbe7388ffd19ea51c37bf6758ea6f90f1772b0c4ed217ef844e112961f51c04dee4db20a05f1e25ae6b71f SHA512 e4be63c1be70f0dfd7aab71f1184d5cc1d15e60e775451a96e8472db6fb3825762ebd6f51b593b167389868bbfde0538612b14a04c03f3f60a7e49f7882e78bf DIST pdns-recursor-4.2.1.tar.bz2 1318022 BLAKE2B 19fba9dae26d27f68ceaf70f15f2fb27ec030fa64d5dfdfe7bf482293ed5aac6b8eb6ed47a75c2b88f4d481794695d66f0ce1cbc71d8eedeabd86d8ce8c382ba SHA512 ebd7ff40def4b5c9398dee5ceae0aaf762982be4124773002b3f603b18cab2a6df667524a268e72268032334ae29d32b42294cbae68dcdc154e08b8a38f75dff DIST pdns-recursor-4.3.0.tar.bz2 1349359 BLAKE2B cdb9d38a350ef371c3675185c0f52f416d55338df034ff32a9d9fc85d783de04513555ec96fbc1dd07ecd7214d889cfe6fba80bc6981e66a6b8d4fe6f1da7dfa SHA512 6ba4721f502e1e483d04e8d8cafa35d1cc088c6b3c73120a0cc90ff9c8e8f495a1591e01f0daf30d00f020e3aa06b1cf092ed6b8a0786070c307a6564812c085 +DIST pdns-recursor-4.3.1.tar.bz2 1334817 BLAKE2B 1972259e42b1cefd9069a36d2bb235652ce234d525a2e3f19c96a93bf26f34063e6d04240146bba0560573c1d2ad042a579d6ab557fc7ac0aadee09fa15ee397 SHA512 49ae4957ef202f94ec87e6449dfa9c147689b5576ca1002e0155319099d698300c113e221571f6d41cb1cdc1649619621c2ccf8105620c25452ac30bd83e46b8 EBUILD pdns-recursor-4.1.14.ebuild 1802 BLAKE2B 2943554881f1873014e5712c2baef1ef4bd9e3f0e7061ab576aac0d23c7ae8657a744d257b015532f6c57c3086ec748e3f1faaa4e12f70f626ad7096e7c81511 SHA512 31141369c4c6229c9dd13309d5b0cce47cac7c0ef6d765ff72eb4515691a9742fc510bc80cbd4c71fbf739829e157d29565df0f8240f84a5a1767e021fb484d7 EBUILD pdns-recursor-4.1.15.ebuild 1804 BLAKE2B 7cea57f7268aab9d16b526e070f7e8b999788f6d28707376eb4451b86af87b5f57b1ca14758b4e7e9e44833ac8583bd9ae24a7c3d4674ff373f2dbcc4f32cd71 SHA512 96e29573690bd3b44b31e2f80ebfd049f21d57fbc01de38d53e4804608cf3a61d0821a79baa3d3bc2a46f7cb6285641a876a6a331dea074a7163a0d8edac8b0f EBUILD pdns-recursor-4.2.0.ebuild 1785 BLAKE2B 82cbbf5546fdafc609cf894d6d1db631617bfc99c5e41268a1cef72904b31f88499c79d0a0c2e7af478a408f9e199b60888248382c768e335b6f6782d309ee6a SHA512 8148cd27aa5d133ad4a111ca832672900759d09b8ec7de1a1c7f97f4eb85af48983a58734310ddd7889c5f2e1d0369cbd94c2046c9a2b9b0c663f7d5b903a14b EBUILD pdns-recursor-4.2.1.ebuild 1783 BLAKE2B 85b1dfe2efe41551397d6a1ad8d41ee779f841ca965359a0904902e7d78637fd4308a095034ccbc6d3bf72da6ee4b1efbb04ba082b8527255b599a5edb4a5a15 SHA512 06e83d7bd1d7e048abda6d5d4f9d0f8a3fc0eb86a1e4e14ef5f6c935fceae4542579897fe10c31391d01fae793d1e401e5cc49df484ef89b5a0834437f1d5587 EBUILD pdns-recursor-4.3.0-r1.ebuild 1788 BLAKE2B fcb244abbc5c831806206768cfc72c5e4455ba2b43ab98156a2fbcedad2651ec821e62e73a0898e5a8963f8370cdeaca025c9584bc5d02d5d637f9ad06ca18ba SHA512 c3e4c7b3042146f8643e520c3abbd92d3d870acb588c12fdd09054f38f163b0df06130e85ff8ae1a254f5c3dadadd8e323294c78928b615623c8c2537f83c41b +EBUILD pdns-recursor-4.3.1.ebuild 1838 BLAKE2B 389c8d068c0f4113c5b9744d36dd6d391a837b778c5b3e2d407da76ae8bf74712668e10832967f55e7e62816a85a70e031d96d6fd4a028535744056eb7741e1b SHA512 5be2829788177687609fccfd370b5108d85bc2504022bd88e695b362833a9b75870106fa71a8764dd2cee92ee9780f22c466d55ff558503580da6d4efbfd21a0 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch new file mode 100644 index 000000000000..02b8df751ef9 --- /dev/null +++ b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch @@ -0,0 +1,89 @@ +From 71246536642590e8e8b21c11307ec4bd0e165066 Mon Sep 17 00:00:00 2001 +From: Remi Gacogne +Date: Tue, 28 Apr 2020 17:51:47 +0200 +Subject: [PATCH] Replace boost's placeholders with the ones from the std + namespace + +Boost 1.73 moved boost::bind placeholders to the placeholders +namespace which did not exist before 1.60, let's switch to +std::bind and std::placeholders instead of doing per-version handling. +--- + pdns/ixfrdist-web.cc | 2 +- + pdns/webserver.cc | 6 +++--- + pdns/ws-auth.cc | 4 ++-- + pdns/ws-recursor.cc | 12 ++++++------ + 4 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/webserver.cc b/webserver.cc +index eafd3059a0..b47cc6d7e0 100644 +--- a/webserver.cc ++++ b/webserver.cc +@@ -107,7 +107,7 @@ static void bareHandlerWrapper(WebServer::HandlerFunction handler, YaHTTP::Reque + + void WebServer::registerBareHandler(const string& url, HandlerFunction handler) + { +- YaHTTP::THandlerFunction f = boost::bind(&bareHandlerWrapper, handler, _1, _2); ++ YaHTTP::THandlerFunction f = std::bind(&bareHandlerWrapper, handler, std::placeholders::_1, std::placeholders::_2); + YaHTTP::Router::Any(url, f); + } + +@@ -179,7 +179,7 @@ void WebServer::apiWrapper(WebServer::HandlerFunction handler, HttpRequest* req, + } + + void WebServer::registerApiHandler(const string& url, HandlerFunction handler, bool allowPassword) { +- HandlerFunction f = boost::bind(&WebServer::apiWrapper, this, handler, _1, _2, allowPassword); ++ HandlerFunction f = std::bind(&WebServer::apiWrapper, this, handler, std::placeholders::_1, std::placeholders::_2, allowPassword); + registerBareHandler(url, f); + } + +@@ -196,7 +196,7 @@ void WebServer::webWrapper(WebServer::HandlerFunction handler, HttpRequest* req, + } + + void WebServer::registerWebHandler(const string& url, HandlerFunction handler) { +- HandlerFunction f = boost::bind(&WebServer::webWrapper, this, handler, _1, _2); ++ HandlerFunction f = std::bind(&WebServer::webWrapper, this, handler, std::placeholders::_1, std::placeholders::_2); + registerBareHandler(url, f); + } + +diff --git a/ws-recursor.cc b/ws-recursor.cc +index cd8997309f..a074460c2f 100644 +--- a/ws-recursor.cc ++++ b/ws-recursor.cc +@@ -382,9 +382,9 @@ static void apiServerCacheFlush(HttpRequest* req, HttpResponse* resp) { + DNSName canon = apiNameToDNSName(req->getvars["domain"]); + bool subtree = (req->getvars.count("subtree") > 0 && req->getvars["subtree"].compare("true") == 0); + +- int count = broadcastAccFunction(boost::bind(pleaseWipeCache, canon, subtree)); +- count += broadcastAccFunction(boost::bind(pleaseWipePacketCache, canon, subtree)); +- count += broadcastAccFunction(boost::bind(pleaseWipeAndCountNegCache, canon, subtree)); ++ int count = broadcastAccFunction(std::bind(pleaseWipeCache, canon, subtree)); ++ count += broadcastAccFunction(std::bind(pleaseWipePacketCache, canon, subtree)); ++ count += broadcastAccFunction(std::bind(pleaseWipeAndCountNegCache, canon, subtree)); + resp->setBody(Json::object { + { "count", count }, + { "result", "Flushed cache." } +@@ -512,7 +512,7 @@ RecursorWebServer::RecursorWebServer(FDMultiplexer* fdm) + d_ws->bind(); + + // legacy dispatch +- d_ws->registerApiHandler("/jsonstat", boost::bind(&RecursorWebServer::jsonstat, this, _1, _2), true); ++ d_ws->registerApiHandler("/jsonstat", std::bind(&RecursorWebServer::jsonstat, this, std::placeholders::_1, std::placeholders::_2), true); + d_ws->registerApiHandler("/api/v1/servers/localhost/cache/flush", &apiServerCacheFlush); + d_ws->registerApiHandler("/api/v1/servers/localhost/config/allow-from", &apiServerConfigAllowFrom); + d_ws->registerApiHandler("/api/v1/servers/localhost/config", &apiServerConfig); +@@ -664,7 +664,7 @@ void AsyncServerNewConnectionMT(void *p) { + void AsyncServer::asyncWaitForConnections(FDMultiplexer* fdm, const newconnectioncb_t& callback) + { + d_asyncNewConnectionCallback = callback; +- fdm->addReadFD(d_server_socket.getHandle(), boost::bind(&AsyncServer::newConnection, this)); ++ fdm->addReadFD(d_server_socket.getHandle(), std::bind(&AsyncServer::newConnection, this)); + } + + void AsyncServer::newConnection() +@@ -743,5 +743,5 @@ void AsyncWebServer::go() { + auto server = std::dynamic_pointer_cast(d_server); + if (!server) + return; +- server->asyncWaitForConnections(d_fdm, boost::bind(&AsyncWebServer::serveConnection, this, _1)); ++ server->asyncWaitForConnections(d_fdm, std::bind(&AsyncWebServer::serveConnection, this, std::placeholders::_1)); + } diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild new file mode 100644 index 000000000000..30eca37b6ed7 --- /dev/null +++ b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic + +DESCRIPTION="The PowerDNS Recursor" +HOMEPAGE="https://www.powerdns.com/" +SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm x86" +IUSE="debug libressl luajit protobuf snmp sodium systemd" + +DEPEND="!luajit? ( >=dev-lang/lua-5.1:= ) + luajit? ( dev-lang/luajit:= ) + protobuf? ( + dev-libs/protobuf + >=dev-libs/boost-1.42:= + ) + systemd? ( sys-apps/systemd:0= ) + snmp? ( net-analyzer/net-snmp ) + sodium? ( dev-libs/libsodium:= ) + libressl? ( dev-libs/libressl:= ) + !libressl? ( dev-libs/openssl:= ) + >=dev-libs/boost-1.35:=" +RDEPEND="${DEPEND} + ! - - samuel@sholland.org - Samuel Holland - williamh@gentoo.org William Hubbs - - proxy-maint@gentoo.org - Proxy Maintainers - s6-dns is a suite of DNS client programs and libraries for Unix systems, as an alternative to the BIND, djbdns or other DNS clients. diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest index 3c17b9d66b89..1e1fae06b9be 100644 --- a/net-dns/unbound/Manifest +++ b/net-dns/unbound/Manifest @@ -6,6 +6,6 @@ AUX unbound-r1.initd 3901 BLAKE2B d8db1b5342781566f57d801d077aec20d7911a39d5a453 AUX unbound.service 247 BLAKE2B d986319f9b43600d4f6443f50e214efd39fd20be6a7067b55f98b82cb5d2c12c85b7db2a3c9ced0caf3db303f1ff0fd4eff511dbede3ab101e4b558681872351 SHA512 7904225d0e9fb3ea5b97521ed24f24fcc4db650cfff8523b896ddd9edfccbd61e817775ad0449acf30d02dba5f714d633b60cace6010d472f438df7c22381dfc AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0bde11bc2a2a994d55670c992b42ea1b4bbee98d04a12f4e7e7517bd0e9caa74d8cac2d1dc0c33274 SHA512 935ab3bd5bc3d3347e44c20482aa19396d243b89f2dbc7bf9f89b16a2559715866e16dfd9f5c4866222d8ee968f158a773475d94629f0ef9fa9b8fd23f0fbc2e AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a73b0c6148f4df336c4c07e8da19320df6bedb49cb6884da565543f78456d38dc3000ca2a1abde84816be SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3 -DIST unbound-1.10.0.tar.gz 5727902 BLAKE2B 64285aa60a11afa84f7fd30c2727de2831a0e418186f7665a3529a2fa2150f8d616838bcdad23aa69e4e761ad0764ead47aee1cddbcf82101a64cf5974c29700 SHA512 a64514990f5d614d749045a11f5ce9bb33cf856cc31895b4db3503f2b05a98f1ca57945b17dd7ec5befbd0c356fc42a717d3e2bae3d3510a0507d0445b1f6d59 -EBUILD unbound-1.10.0.ebuild 5390 BLAKE2B ce7620d0f76f8ec2b304cb73e7f875938957f285bdf73741e7c43f3d720853500d0ff857d2ec101bacbd3d8a61e270c42d9aebb4365718b1cc434519b387d48b SHA512 2e9305db63c2889389362ea48938d0cdd66aeb3fc15636004b43ba2a9ab0a2c8ccf934125fc253c89927e24bbe68ce2e21ee2c736835d4fe8eedb560e996d3b3 +DIST unbound-1.10.1.tar.gz 5729334 BLAKE2B 7ca4f23c12a551bc6e5d6ec32f19ca0f54526b9a4c868ced8f31cfd31dec23f8240b78f0c00d2cc6f9aa21f6c1b98697c85ef3ebd804a838a5a082893fe98094 SHA512 d07f3ac0e751c17a3ff7d99518c22529cf6856861218564a2ca073422905525cb9ddaf76c9600187946fadb7324343bcd85c34ff06bd322e0ea621a2d258bb85 +EBUILD unbound-1.10.1.ebuild 5390 BLAKE2B ce7620d0f76f8ec2b304cb73e7f875938957f285bdf73741e7c43f3d720853500d0ff857d2ec101bacbd3d8a61e270c42d9aebb4365718b1cc434519b387d48b SHA512 2e9305db63c2889389362ea48938d0cdd66aeb3fc15636004b43ba2a9ab0a2c8ccf934125fc253c89927e24bbe68ce2e21ee2c736835d4fe8eedb560e996d3b3 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525 diff --git a/net-dns/unbound/unbound-1.10.0.ebuild b/net-dns/unbound/unbound-1.10.0.ebuild deleted file mode 100644 index 704a3c262452..000000000000 --- a/net-dns/unbound/unbound-1.10.0.ebuild +++ /dev/null @@ -1,183 +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 -) - -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.10.1.ebuild b/net-dns/unbound/unbound-1.10.1.ebuild new file mode 100644 index 000000000000..704a3c262452 --- /dev/null +++ b/net-dns/unbound/unbound-1.10.1.ebuild @@ -0,0 +1,183 @@ +# 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 +) + +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 "" +} -- cgit v1.2.3