From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- net-dns/Manifest.gz | Bin 8526 -> 8530 bytes net-dns/avahi/Manifest | 11 +- net-dns/avahi/avahi-0.7-r6.ebuild | 215 ------------ net-dns/avahi/avahi-0.7-r7.ebuild | 212 ------------ net-dns/avahi/files/avahi-0.7-CVE-2017-6519.patch | 45 --- net-dns/avahi/files/avahi-0.7-python3-gdbm.patch | 234 ------------- .../avahi/files/avahi-0.7-python3-unittest.patch | 151 -------- net-dns/avahi/files/avahi-0.7-python3.patch | 94 ----- net-dns/avahi/files/avahi-0.7-qt5.patch | 187 ---------- .../avahi-0.7-remove-empty-avahi_discover.patch | 77 ----- net-dns/avahi/metadata.xml | 6 +- net-dns/bind/Manifest | 3 +- net-dns/bind/bind-9.16.6-r1.ebuild | 379 -------------------- net-dns/bind/bind-9.16.6-r2.ebuild | 381 +++++++++++++++++++++ .../ldap-library-path-on-multilib-machines.patch | 13 + net-dns/maradns/Manifest | 4 +- net-dns/maradns/maradns-2.0.16.ebuild | 111 ------ net-dns/maradns/metadata.xml | 3 - net-dns/mdns-repeater/Manifest | 7 +- ...dns-repeater-1.11-system-compiler-options.patch | 33 ++ net-dns/mdns-repeater/mdns-repeater-1.11.ebuild | 27 ++ .../mdns-repeater/mdns-repeater-20110921.ebuild | 28 -- net-dns/mdns-repeater/metadata.xml | 2 +- net-dns/pdns/Manifest | 4 +- net-dns/pdns/files/pdns-r1 | 4 +- net-dns/pdns/pdns-4.3.1.ebuild | 170 +++++++++ net-dns/unbound/Manifest | 2 +- net-dns/unbound/unbound-1.11.0.ebuild | 2 +- 28 files changed, 642 insertions(+), 1763 deletions(-) delete mode 100644 net-dns/avahi/avahi-0.7-r6.ebuild delete mode 100644 net-dns/avahi/avahi-0.7-r7.ebuild delete mode 100644 net-dns/avahi/files/avahi-0.7-CVE-2017-6519.patch delete mode 100644 net-dns/avahi/files/avahi-0.7-python3-gdbm.patch delete mode 100644 net-dns/avahi/files/avahi-0.7-python3-unittest.patch delete mode 100644 net-dns/avahi/files/avahi-0.7-python3.patch delete mode 100644 net-dns/avahi/files/avahi-0.7-qt5.patch delete mode 100644 net-dns/avahi/files/avahi-0.7-remove-empty-avahi_discover.patch delete mode 100644 net-dns/bind/bind-9.16.6-r1.ebuild create mode 100644 net-dns/bind/bind-9.16.6-r2.ebuild create mode 100644 net-dns/bind/files/ldap-library-path-on-multilib-machines.patch delete mode 100644 net-dns/maradns/maradns-2.0.16.ebuild create mode 100644 net-dns/mdns-repeater/files/mdns-repeater-1.11-system-compiler-options.patch create mode 100644 net-dns/mdns-repeater/mdns-repeater-1.11.ebuild delete mode 100644 net-dns/mdns-repeater/mdns-repeater-20110921.ebuild create mode 100644 net-dns/pdns/pdns-4.3.1.ebuild (limited to 'net-dns') diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz index 4b52a0e3d21f..a2f0f265654f 100644 Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest index 6804a11e69a1..c094cb4b775b 100644 --- a/net-dns/avahi/Manifest +++ b/net-dns/avahi/Manifest @@ -1,14 +1,5 @@ AUX autoipd-openrc.sh 700 BLAKE2B e71e5583db890f8ee1bbe9c03fc42285871089b2ea2d4549d553f14a20a3aa97c519b298bfaaccf02346c911f65f8e3f8bab7b2dc8270a5d35c471cc6bf31f6b SHA512 a5dbbac4d6d1959db3a07a63acb7569dbeba33d2274a1dd3253dc27687549371611cf08bad3998d89efb3ace63b5541a4d225e484274450e0c82661f5a1dbc32 AUX autoipd.sh 1271 BLAKE2B 815c5776afff71489826eb8338535df1af6fbf02f3d42eedb6ebb69e5fff181e7252060818dd2dd67141a40c097ded8b7ac4210cb9929bab4b68ea99533bcf26 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3 -AUX avahi-0.7-CVE-2017-6519.patch 1578 BLAKE2B 87fce922927e1217802ce0f7b2a1a6f22649903a495817e224a37e7fc5c76d0d2a6cfbb50a1373a950a75a45a68bfbcba9f2155ed24940e3ffb994b862c00e4c SHA512 6c30c0d095f42b9bd289a1ac7b42287cd109bf0bad480d13eec70bedb65e7e1ab495600703f39f1caf73c3c0617c72940c33462586d68deb0a416d7c93964997 -AUX avahi-0.7-python3-gdbm.patch 7138 BLAKE2B 0ec244db80c4fd5eb896ce32ce78223e5cff3c8b0b7ecf690042489682423651f7f8c9b15d593088abbde56534e35dc2e5802b6d73d38c0cc0a112a234776237 SHA512 7b287062d605c0dd0c5a0a78ccc072ea31d2a4d158a804133e5ea8056a8f1eecf7f4833d2078c2349e01f0e97d269efb944c883a543f8f4fc3f5d538bc2c0cbe -AUX avahi-0.7-python3-unittest.patch 4772 BLAKE2B 2b1a7affc0bf4ad136f71af5c1bd03acff90c175a1efc18b63adfad7381471f06c187ef1bf0c702391dcc86cffe2e9041f0a0266a01f36b4810f53f2cb096159 SHA512 c598a3eb6aab93f58ee24ca77a2ae0a12b081a4c4e91f1f83c57dc1f62abf40dd3f914bff3ab17ac7032a45e9f30df6f8e7913ac5eaf5ea6c673dda47e878501 -AUX avahi-0.7-python3.patch 2810 BLAKE2B 523515d5d324e5b74d60abbdbc88469fec55ce31cb9d0803e9255f82aedb36fec4740d507c326166d73fb64316ad2490850d795aed27c9bef1249022be008656 SHA512 90ed5a68f39d135edec7264786eec6e0adba420cfcbf220bfc64b2739a7c0a72a869760cf4a1830949502660bfe324bf60918c71183cc68abfdf090bbeb10d92 -AUX avahi-0.7-qt5.patch 6033 BLAKE2B 10c7879f6e28942a32497c84dcf523f742cb13112d9e9c23f74967c2d6c05e6f463406716c144edc1bd4588c8c76693473765d9d678f6517c4a57615d0364b91 SHA512 cd8b900a5a068add3b7aa9080491938d469795c26e1a1869ee581b95d877ded4d120cb4db768fb4d97535a72e66c3fabf6617cdca2c9bdb50ff54e24d17b1f51 -AUX avahi-0.7-remove-empty-avahi_discover.patch 2593 BLAKE2B 0fddfd46a3fc3e66960e7c2b6028e825e703e2e3f5b3d672dc204e37b87d101bffa285857c5dc41c69fc03bb3e7935fdec774492a31d4ce59ed9b06c4a0a20f4 SHA512 7bdd2ec5f16fb2850a78c983d35ca1d76b6e0d45eb17267213d3fb95b07d213f042bfa9ae07fd16b6334cc4459c5e87ae28942db69cb1987a074d6e787f19f70 -DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc86825cae303f94c44482eea07cf6570d970ca286e81a787d6a64598b7123f2ac17a259ddc50ef431b9c94b530 SHA512 61f656da7614d8cca1862180038f571db3474c84f05db4d3509f614cdbf8b1a1047661b7e24d63682d5b48ed1bfa1b08b3c9e6dbe9222bcd62d99bc168a11abe DIST avahi-0.8.tar.gz 953319 BLAKE2B ddede1b8790ff3057ea5f4bb710e95578229e078a7abac83121e043017dda1ab3d971c723f920fdd4f3d98b88bd2cf21f9645bec1b7bbd2ea194cb399a5f5b46 SHA512 27bba9a551152dfc7e721f326042e7bfce55d227044a6cbaee04d6fb0e3f59c36e159c2b7a4dd42d1c955cdf37cc1c303e91991c08928bbded91d796e9a22abe -EBUILD avahi-0.7-r6.ebuild 5057 BLAKE2B 6512d8e94969d029cc3b8d215d9c01b9fad1ee4d9f0fd139978b4526b53ef61420165bc9bf1765a7b3f4f0507787c1ba5b75b229c24d2d9c38c262c965df9565 SHA512 3f105ff9efaa1ea15a1cc60ccde00f34279b4502e8af402064f3e220d9f21c70a69f1d31654fa7f4ccd6e600559c2c4623b37cd4ffeaa789f1a7b25d09fda1dc -EBUILD avahi-0.7-r7.ebuild 5164 BLAKE2B 37771549b464d8babca363865d587af1f556adac15a91d73d2211afbcad349ba11297ba72c7d9bce903be303dd65dc611afc667661c56feb3eb09a524ff62b4d SHA512 2a2608b421853ae582d810de898a7156d81757783d186287317edde864fad851d3ef8f79e107c839cd22c0ad293103e167d0d26fcfbaced4659cc372c83f57d5 EBUILD avahi-0.8-r2.ebuild 5277 BLAKE2B 66e5dced6dda8efeffa023bd689a8bd38ca6bffc0a39402ef48d6664224949d715b8c91704e17e2a86d079eb9e1e9cd67ab7e9869de79a681c5a240035a76bec SHA512 eff5a6a557c40930917a4d670671af7b9a19b72f6f61dc31938514d467dda69b9530082e60d959002c43ba19753e22855c2eed05c93e36b3155af9fb91193eac -MISC metadata.xml 1381 BLAKE2B 8cb0652562c645d37af7992e3c7aef13b2188b0f3747ff08c79a3da42b004e848690b2587253e9aab17ffb90c72bdd5de6f055310499b26f22a6e125d1ac4a39 SHA512 6ba95a2a869bffeb5df08db973b4154749f668500b004fb6f0a08f829ab1528e8366ba6cc0a0c005055e84d361432f62998eea944085c312d7c7adfe4c7b6af7 +MISC metadata.xml 1002 BLAKE2B 5da5858bd8f074d636e9d08eaa3b91504fa1741def8e09a6c0234e0ac24734288971f502d7a894ffbf2fefdfc247336675b20e22ba46bf3d572f0db0d731152e SHA512 bd79bbb98f43867b91f5b8a5046beec5b91e66c72134ebc794e651f256c65f2efe964d40f641dbc544fd036bb98831a20280f5ffecbf07d349d9d5f7e4e93e58 diff --git a/net-dns/avahi/avahi-0.7-r6.ebuild b/net-dns/avahi/avahi-0.7-r6.ebuild deleted file mode 100644 index c1aaac9fe646..000000000000 --- a/net-dns/avahi/avahi-0.7-r6.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="gdbm" - -inherit autotools eutils flag-o-matic ltprune multilib multilib-minimal mono-env python-r1 systemd user - -DESCRIPTION="System which facilitates service discovery on a local network" -HOMEPAGE="http://avahi.org/" -SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="autoipd dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( dbus gdbm ${PYTHON_REQUIRED_USE} ) - mono? ( dbus ) - howl-compat? ( dbus ) - mdnsresponder-compat? ( dbus ) -" - -COMMON_DEPEND=" - dev-libs/libdaemon - dev-libs/expat - dev-libs/glib:2[${MULTILIB_USEDEP}] - gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] ) - qt5? ( dev-qt/qtcore:5 ) - gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] ) - gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - kernel_linux? ( sys-libs/libcap ) - introspection? ( dev-libs/gobject-introspection:= ) - mono? ( - dev-lang/mono - gtk? ( dev-dotnet/gtk-sharp:2 ) - ) - python? ( - ${PYTHON_DEPS} - dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) - introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] ) - ) -" - -DEPEND=" - ${COMMON_DEPEND} - dev-util/glib-utils - doc? ( app-doc/doxygen ) - app-doc/xmltoman - dev-util/intltool - virtual/pkgconfig -" - -RDEPEND=" - ${COMMON_DEPEND} - howl-compat? ( !net-misc/howl ) - mdnsresponder-compat? ( !net-misc/mDNSResponder ) - selinux? ( sec-policy/selinux-avahi ) -" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h ) - -PATCHES=( - "${FILESDIR}/${P}-qt5.patch" - "${FILESDIR}/${P}-CVE-2017-6519.patch" -) - -pkg_preinst() { - enewgroup netdev - enewgroup avahi - enewuser avahi -1 -1 -1 avahi - - if use autoipd; then - enewgroup avahi-autoipd - enewuser avahi-autoipd -1 -1 -1 avahi-autoipd - fi -} - -pkg_setup() { - use mono && mono-env_pkg_setup -} - -src_prepare() { - default - - if ! use ipv6; then - sed -i \ - -e s/use-ipv6=yes/use-ipv6=no/ \ - avahi-daemon/avahi-daemon.conf || die - fi - - sed -i\ - -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ - doxygen_to_devhelp.xsl || die - - # Prevent .pyc files in DESTDIR - >py-compile - - eautoreconf - - # bundled manpages - multilib_copy_sources -} - -src_configure() { - # those steps should be done once-per-ebuild rather than per-ABI - use python && python_setup - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( --disable-static ) - - if use python; then - myconf+=( - $(multilib_native_use_enable dbus python-dbus) - $(multilib_native_use_enable introspection pygobject) - ) - fi - - if use mono; then - myconf+=( $(multilib_native_use_enable doc monodoc) ) - fi - - if ! multilib_is_native_abi; then - myconf+=( - # used by daemons only - --disable-libdaemon - --with-xml=none - ) - fi - - myconf+=( $(multilib_native_use_enable qt5) ) - - econf \ - --localstatedir="${EPREFIX}/var" \ - --with-distro=gentoo \ - --disable-python-dbus \ - --enable-manpages \ - --enable-xmltoman \ - --disable-monodoc \ - --enable-glib \ - --enable-gobject \ - $(multilib_native_use_enable test tests) \ - $(multilib_native_use_enable autoipd) \ - $(use_enable mdnsresponder-compat compat-libdns_sd) \ - $(use_enable howl-compat compat-howl) \ - $(multilib_native_use_enable doc doxygen-doc) \ - $(multilib_native_use_enable mono) \ - $(use_enable dbus) \ - $(multilib_native_use_enable python) \ - $(use_enable gtk) \ - $(use_enable gtk3) \ - $(use_enable nls) \ - $(multilib_native_use_enable introspection) \ - --disable-qt3 \ - --disable-qt4 \ - $(use_enable gdbm) \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - "${myconf[@]}" -} - -multilib_src_compile() { - emake - - multilib_is_native_abi && use doc && emake avahi.devhelp -} - -multilib_src_install() { - emake install DESTDIR="${D}" - rm -f "${ED}"/usr/bin/avahi-bookmarks - - # https://github.com/lathiat/avahi/issues/28 - use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc - use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h - - if multilib_is_native_abi && use doc; then - docinto html - dodoc -r doxygen/html/. - insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp - fi - - # The build system creates an empty "/run" directory, so we clean it up here - rmdir "${ED}"/run -} - -multilib_src_install_all() { - if use autoipd; then - insinto /lib/rcscripts/net - doins "${FILESDIR}"/autoipd.sh - - insinto /lib/netifrc/net - newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh - fi - - dodoc docs/{AUTHORS,NEWS,README,TODO} - - prune_libtool_files --all -} - -pkg_postinst() { - if use autoipd; then - elog - elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" - elog "addresses, just set config_=( autoipd ) in /etc/conf.d/net!" - elog - fi -} diff --git a/net-dns/avahi/avahi-0.7-r7.ebuild b/net-dns/avahi/avahi-0.7-r7.ebuild deleted file mode 100644 index e9e84e60c397..000000000000 --- a/net-dns/avahi/avahi-0.7-r7.ebuild +++ /dev/null @@ -1,212 +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} ) -PYTHON_REQ_USE="gdbm" -inherit autotools flag-o-matic multilib-minimal mono-env python-r1 systemd - -DESCRIPTION="System which facilitates service discovery on a local network" -HOMEPAGE="http://avahi.org/" -SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux systemd test" - -REQUIRED_USE=" - python? ( dbus gdbm ${PYTHON_REQUIRED_USE} ) - mono? ( dbus ) - howl-compat? ( dbus ) - mdnsresponder-compat? ( dbus ) - systemd? ( dbus ) -" - -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/libdaemon - dev-libs/expat - dev-libs/glib:2[${MULTILIB_USEDEP}] - gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] ) - qt5? ( dev-qt/qtcore:5 ) - gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] ) - gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - kernel_linux? ( sys-libs/libcap ) - introspection? ( dev-libs/gobject-introspection:= ) - mono? ( - dev-lang/mono - gtk? ( dev-dotnet/gtk-sharp:2 ) - ) - python? ( - ${PYTHON_DEPS} - dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) - introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] ) - ) - bookmarks? ( - ${PYTHON_DEPS} - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - ) -" -RDEPEND=" - acct-user/avahi - acct-group/avahi - acct-group/netdev - autoipd? ( - acct-user/avahi-autoipd - acct-group/avahi-autoipd - ) - ${DEPEND} - howl-compat? ( !net-misc/howl ) - mdnsresponder-compat? ( !net-misc/mDNSResponder ) - selinux? ( sec-policy/selinux-avahi ) -" -BDEPEND=" - dev-util/glib-utils - doc? ( app-doc/doxygen ) - app-doc/xmltoman - dev-util/intltool - virtual/pkgconfig -" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h ) - -PATCHES=( - "${FILESDIR}/${P}-qt5.patch" - "${FILESDIR}/${P}-CVE-2017-6519.patch" - "${FILESDIR}/${P}-remove-empty-avahi_discover.patch" - "${FILESDIR}/${P}-python3.patch" - "${FILESDIR}/${P}-python3-unittest.patch" - "${FILESDIR}/${P}-python3-gdbm.patch" -) - -pkg_setup() { - use mono && mono-env_pkg_setup - use python || use bookmarks && python_setup -} - -src_prepare() { - default - - if ! use ipv6; then - sed -i \ - -e "s/use-ipv6=yes/use-ipv6=no/" \ - avahi-daemon/avahi-daemon.conf || die - fi - - sed -i \ - -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ - doxygen_to_devhelp.xsl || die - - eautoreconf - - # bundled manpages - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - --disable-monodoc - --disable-python-dbus - --disable-qt3 - --disable-qt4 - --disable-static - --enable-manpages - --enable-glib - --enable-gobject - --enable-xmltoman - --localstatedir="${EPREFIX}/var" - --with-distro=gentoo - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable dbus) - $(use_enable gdbm) - $(use_enable gtk) - $(use_enable gtk3) - $(use_enable howl-compat compat-howl) - $(use_enable mdnsresponder-compat compat-libdns_sd) - $(use_enable nls) - $(multilib_native_use_enable autoipd) - $(multilib_native_use_enable doc doxygen-doc) - $(multilib_native_use_enable introspection) - $(multilib_native_use_enable mono) - $(multilib_native_use_enable python) - $(multilib_native_use_enable test tests) - ) - - if use python; then - myconf+=( - $(multilib_native_use_enable dbus python-dbus) - $(multilib_native_use_enable introspection pygobject) - ) - fi - - if use mono; then - myconf+=( $(multilib_native_use_enable doc monodoc) ) - fi - - if ! multilib_is_native_abi; then - myconf+=( - # used by daemons only - --disable-libdaemon - --with-xml=none - ) - fi - - myconf+=( $(multilib_native_use_enable qt5) ) - - econf "${myconf[@]}" -} - -multilib_src_compile() { - emake - - multilib_is_native_abi && use doc && emake avahi.devhelp -} - -multilib_src_install() { - emake install DESTDIR="${D}" - use bookmarks && use python && use dbus && use gtk || \ - rm -f "${ED}"/usr/bin/avahi-bookmarks - - # https://github.com/lathiat/avahi/issues/28 - use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc - use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h - - if multilib_is_native_abi && use doc; then - docinto html - dodoc -r doxygen/html/. - insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp - fi - - # The build system creates an empty "/run" directory, so we clean it up here - rmdir "${ED}"/run || die -} - -multilib_src_install_all() { - if use autoipd; then - insinto /lib/rcscripts/net - doins "${FILESDIR}"/autoipd.sh - - insinto /lib/netifrc/net - newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh - fi - - dodoc docs/{AUTHORS,NEWS,README,TODO} - - find "${ED}" -name '*.la' -type f -delete || die -} - -pkg_postinst() { - if use autoipd; then - elog - elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" - elog "addresses, just set config_=( autoipd ) in /etc/conf.d/net!" - elog - fi - - systemd_reenable avahi-daemon.service -} diff --git a/net-dns/avahi/files/avahi-0.7-CVE-2017-6519.patch b/net-dns/avahi/files/avahi-0.7-CVE-2017-6519.patch deleted file mode 100644 index 5fadfbc28928..000000000000 --- a/net-dns/avahi/files/avahi-0.7-CVE-2017-6519.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001 -From: Trent Lloyd -Date: Sat, 22 Dec 2018 09:06:07 +0800 -Subject: [PATCH] Drop legacy unicast queries from address not on local link - -When handling legacy unicast queries, ensure that the source IP is -inside a subnet on the local link, otherwise drop the packet. - -Fixes #145 -Fixes #203 -CVE-2017-6519 -CVE-2018-100084 ---- - avahi-core/server.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/avahi-core/server.c b/avahi-core/server.c -index a2cb19a..a2580e3 100644 ---- a/avahi-core/server.c -+++ b/avahi-core/server.c -@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres - - if (avahi_dns_packet_is_query(p)) { - int legacy_unicast = 0; -+ char t[AVAHI_ADDRESS_STR_MAX]; - - /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the - * AR section completely here, so far. Until the day we add -@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres - legacy_unicast = 1; - } - -+ if (!is_mdns_mcast_address(dst_address) && -+ !avahi_interface_address_on_link(i, src_address)) { -+ -+ avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol); -+ return; -+ } -+ - if (legacy_unicast) - reflect_legacy_unicast_query_packet(s, p, i, src_address, port); - --- -2.21.0 - diff --git a/net-dns/avahi/files/avahi-0.7-python3-gdbm.patch b/net-dns/avahi/files/avahi-0.7-python3-gdbm.patch deleted file mode 100644 index 3976b8df2e76..000000000000 --- a/net-dns/avahi/files/avahi-0.7-python3-gdbm.patch +++ /dev/null @@ -1,234 +0,0 @@ -From 63750f1be96ad08c407193b08bf3b9ee74310e2d Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Tue, 11 Jul 2017 21:52:37 +0200 -Subject: [PATCH] avahi-python: Use the agnostic DBM interface - -Also fixes configure failing if Python 3 is the build python and GDBM is -enabled, since Py3 only has anydbm under the name of 'dbm'. - -Not enough to make ServiceTypeDatabase.py compatible with Py3, but it's -a start. ---- - avahi-python/avahi/Makefile.am | 15 +-------- - avahi-python/avahi/ServiceTypeDatabase.py.in | 33 ++++++++++++++----- - configure.ac | 9 +++-- - service-type-database/.gitignore | 1 - - service-type-database/Makefile.am | 18 +++------- - .../{build-db.in => build-db} | 13 +++++--- - 6 files changed, 42 insertions(+), 47 deletions(-) - rename service-type-database/{build-db.in => build-db} (87%) - -diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am -index 3eb67d0d..c906b9bf 100644 ---- a/avahi-python/avahi/Makefile.am -+++ b/avahi-python/avahi/Makefile.am -@@ -25,29 +25,16 @@ avahidir = $(pythondir)/avahi - - if HAVE_GDBM - nodist_avahi_SCRIPTS = ServiceTypeDatabase.py -- --ServiceTypeDatabase.py: ServiceTypeDatabase.py.in -- $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -- -e 's,@DBM\@,gdbm,g' \ -- -e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \ -- -e 's,@CHECK_KEY\@,while key is not None:,g' \ -- -e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \ -- -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ -- chmod +x $@ - endif - - if HAVE_DBM - nodist_avahi_SCRIPTS = ServiceTypeDatabase.py -+endif - - ServiceTypeDatabase.py: ServiceTypeDatabase.py.in - $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -- -e 's,@DBM\@,dbm,g' \ -- -e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \ -- -e 's,@CHECK_KEY\@,for key in keys:,g' \ -- -e 's,@NEXT_KEY\@,,g' \ - -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ - chmod +x $@ --endif - - avahi_PYTHON = $(avahi_SCRIPTS) - -diff --git a/avahi-python/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in -index 4ddd6544..d7f9969b 100644 ---- a/avahi-python/avahi/ServiceTypeDatabase.py.in -+++ b/avahi-python/avahi/ServiceTypeDatabase.py.in -@@ -17,7 +17,11 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - # USA. - --import @DBM@ -+try: -+ import anydbm as dbm -+except ImportError: -+ import dbm -+ - import locale - import re - -@@ -28,7 +32,7 @@ class ServiceTypeDatabase: - - def __init__(self, filename = "@pkglibdatadir@/service-types.db"): - -- self.db = @DBM@.open(filename, "r") -+ self.db = dbm.open(filename, "r") - - l = locale.getlocale(locale.LC_MESSAGES) - -@@ -90,13 +94,24 @@ class ServiceTypeDatabase: - - def __iter__(self): - -- @FIRST_KEY@ -- @CHECK_KEY@ -- -- if re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+', key) and not re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+\[.*\]', key): -- yield key -- -- @NEXT_KEY@ -+ def want_key(key): -+ if not re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+', key): -+ return False -+ if re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+\[.*\]', key): -+ return False -+ return True -+ -+ try: -+ key = self.db.firstkey() -+ except AttributeError: -+ for key in self.db.keys(): -+ if want_key(key): -+ yield key -+ else: -+ while key is not None: -+ if want_key(key): -+ yield key -+ key = self.db.nextkey(key) - - def __len__(self): - -diff --git a/configure.ac b/configure.ac -index 66789718..fbbf7cf3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -824,11 +824,10 @@ if test "x$HAVE_PYTHON" = "xyes" ; then - fi - - AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)]) -- if test "x$HAVE_GDBM" = "xyes"; then -- AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)]) -- fi -- if test "x$HAVE_DBM" = "xyes"; then -- AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)]) -+ if test "x$HAVE_GDBM" = "xyes" || test "x$HAVE_DBM" = "xyes"; then -+ AM_CHECK_PYMOD(anydbm,,,[ -+ AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)]) -+ ]) - fi - fi - fi -diff --git a/service-type-database/.gitignore b/service-type-database/.gitignore -index 581f1929..51b02600 100644 ---- a/service-type-database/.gitignore -+++ b/service-type-database/.gitignore -@@ -1,4 +1,3 @@ - Makefile - Makefile.in - service-types.db --build-db -diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am -index d184fde3..f9fa0825 100644 ---- a/service-type-database/Makefile.am -+++ b/service-type-database/Makefile.am -@@ -15,7 +15,7 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - # USA. - --EXTRA_DIST=build-db.in service-types -+EXTRA_DIST=service-types - - pkglibdatadir=$(libdir)/avahi - -@@ -27,16 +27,11 @@ if HAVE_GDBM - noinst_SCRIPTS=build-db - pkglibdata_DATA+=service-types.db - --build-db: build-db.in -- $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -- -e 's,@DBM\@,gdbm,g' $< > $@ && \ -- chmod +x $@ -- --service-types.db: service-types build-db -+service-types.db: service-types - $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \ - mv $@.coming $@ - --CLEANFILES = service-types.db build-db -+CLEANFILES = service-types.db - - endif - if HAVE_DBM -@@ -44,11 +39,6 @@ if HAVE_DBM - noinst_SCRIPTS=build-db - pkglibdata_DATA+=service-types.db.pag service-types.db.dir - --build-db: build-db.in -- $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -- -e 's,@DBM\@,dbm,g' $< > $@ && \ -- chmod +x $@ -- - service-types.db.pag: service-types.db - $(AM_V_GEN)mv service-types.db.coming.pag service-types.db.pag - service-types.db.dir: service-types.db -@@ -57,7 +47,7 @@ service-types.db: service-types build-db - $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \ - if test -f "$@.coming"; then mv $@.coming $@; fi - --CLEANFILES = service-types.db* build-db -+CLEANFILES = service-types.db* - - endif - endif -diff --git a/service-type-database/build-db.in b/service-type-database/build-db -similarity index 87% -rename from service-type-database/build-db.in -rename to service-type-database/build-db -index 4cda4253..78ee892f 100755 ---- a/service-type-database/build-db.in -+++ b/service-type-database/build-db -@@ -1,4 +1,4 @@ --#!@PYTHON@ -+#!/usr/bin/env python - # -*-python-*- - # This file is part of avahi. - # -@@ -17,7 +17,12 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - # USA. - --import @DBM@, sys -+try: -+ import anydbm as dbm -+except ImportError: -+ import dbm -+ -+import sys - - if len(sys.argv) > 1: - infn = sys.argv[1] -@@ -29,9 +34,9 @@ if len(sys.argv) > 2: - else: - outfn = infn + ".db" - --db = @DBM@.open(outfn, "n") -+db = dbm.open(outfn, "n") - --for ln in file(infn, "r"): -+for ln in open(infn, "r"): - ln = ln.strip(" \r\n\t") - - if ln == "" or ln.startswith("#"): diff --git a/net-dns/avahi/files/avahi-0.7-python3-unittest.patch b/net-dns/avahi/files/avahi-0.7-python3-unittest.patch deleted file mode 100644 index 9d735a1780c2..000000000000 --- a/net-dns/avahi/files/avahi-0.7-python3-unittest.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 62fe263662b52a462895fd8d21cf29b2fa22fe86 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Fri, 27 Apr 2018 11:10:57 +0100 -Subject: [PATCH] avahi-python: Add a unit test for string and bytestring - conversions - -Signed-off-by: Simon McVittie ---- - .gitignore | 1 + - avahi-python/avahi/.gitignore | 5 ++ - avahi-python/avahi/Makefile.am | 7 +++ - avahi-python/avahi/test.py | 85 ++++++++++++++++++++++++++++++++++ - 4 files changed, 98 insertions(+) - create mode 100755 avahi-python/avahi/test.py - -diff --git a/.gitignore b/.gitignore -index beab8d94..06565f06 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -32,3 +32,4 @@ ltmain.sh - missing - py-compile - stamp-h1 -+test-driver -diff --git a/avahi-python/avahi/.gitignore b/avahi-python/avahi/.gitignore -index 118a34de..9b0f6e3c 100644 ---- a/avahi-python/avahi/.gitignore -+++ b/avahi-python/avahi/.gitignore -@@ -1 +1,6 @@ -+*.log -+*.pyc -+*.pyo -+*.trs - ServiceTypeDatabase.py -+__pycache__/ -diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am -index 3eb67d0d..cf527aff 100644 ---- a/avahi-python/avahi/Makefile.am -+++ b/avahi-python/avahi/Makefile.am -@@ -16,6 +16,11 @@ - # USA. - - EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in -+EXTRA_DIST += test.py -+ -+TESTS = -+TEST_EXTENSIONS = .py -+PY_LOG_COMPILER = $(PYTHON) - - pkglibdatadir=$(libdir)/avahi - -@@ -55,6 +60,8 @@ if HAVE_PYTHON_DBUS - - avahi_PYTHON += __init__.py - -+TESTS += test.py -+ - endif - endif - -diff --git a/avahi-python/avahi/test.py b/avahi-python/avahi/test.py -new file mode 100755 -index 00000000..7afc4809 ---- /dev/null -+++ b/avahi-python/avahi/test.py -@@ -0,0 +1,85 @@ -+#!/usr/bin/python -+# -+# Copyright 2018 Simon McVittie -+# -+# This file is part of avahi. -+# -+# avahi is free software; you can redistribute it and/or modify it -+# under the terms of the GNU Lesser General Public License as -+# published by the Free Software Foundation; either version 2 of the -+# License, or (at your option) any later version. -+# -+# avahi is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -+# License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with avahi; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -+# USA. -+ -+import os -+import os.path -+import sys -+import unittest -+from collections import OrderedDict -+ -+sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir)) -+ -+import avahi -+import dbus -+ -+class TestUtilityMethods(unittest.TestCase): -+ def test_byte_array_to_string(self): -+ self.assertEqual( -+ avahi.byte_array_to_string([1, 2, 127, 128]), -+ '....') -+ self.assertEqual( -+ avahi.byte_array_to_string([ord('a'), ord(' '), ord('b')]), -+ 'a b') -+ -+ def test_txt_array_to_string_array(self): -+ self.assertEqual( -+ avahi.txt_array_to_string_array([[1, 2], [ord('a'), ord('b')]]), -+ ['..', 'ab']) -+ -+ def test_string_to_byte_array(self): -+ self.assertEqual( -+ avahi.string_to_byte_array('abc'), -+ [dbus.Byte(97), dbus.Byte(98), dbus.Byte(99)]) -+ self.assertIsInstance( -+ avahi.string_to_byte_array('abc')[0], -+ dbus.Byte) -+ self.assertEqual( -+ avahi.string_to_byte_array(b'\x01\xff'), -+ [dbus.Byte(0x01), dbus.Byte(0xff)]) -+ self.assertEqual( -+ avahi.string_to_byte_array(u'\u00e1'), -+ [dbus.Byte(0xc3), dbus.Byte(0xa1)]) -+ -+ def test_string_array_to_txt_array(self): -+ self.assertEqual( -+ avahi.string_array_to_txt_array(['abc', b'\x01', u'\u00e1']), -+ [ -+ [dbus.Byte(97), dbus.Byte(98), dbus.Byte(99)], -+ [dbus.Byte(0x01)], -+ [dbus.Byte(0xc3), dbus.Byte(0xa1)]]) -+ self.assertIsInstance( -+ avahi.string_array_to_txt_array(['abc'])[0][0], -+ dbus.Byte) -+ -+ def test_dict_to_txt_array(self): -+ self.assertEqual( -+ avahi.dict_to_txt_array( -+ OrderedDict((('a', 'abc'), ('b', b'\x01'), ('c', u'\u00e1')))), -+ [ -+ [dbus.Byte(97), dbus.Byte(ord('=')), dbus.Byte(97), dbus.Byte(98), dbus.Byte(99)], -+ [dbus.Byte(98), dbus.Byte(ord('=')), dbus.Byte(0x01)], -+ [dbus.Byte(99), dbus.Byte(ord('=')), dbus.Byte(0xc3), dbus.Byte(0xa1)]]) -+ self.assertIsInstance( -+ avahi.dict_to_txt_array({'a': 'abc'})[0][0], -+ dbus.Byte) -+ -+if __name__ == '__main__': -+ unittest.main() diff --git a/net-dns/avahi/files/avahi-0.7-python3.patch b/net-dns/avahi/files/avahi-0.7-python3.patch deleted file mode 100644 index a4bb34029964..000000000000 --- a/net-dns/avahi/files/avahi-0.7-python3.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 169e85dbc13dcaae8a699618883e512614f540b7 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Fri, 27 Apr 2018 11:09:07 +0100 -Subject: [PATCH] avahi-python: Encode unicode strings as UTF-8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Previously, we would effectively encode anything representable in -Latin-1 as Latin-1, and crash on anything not representable in Latin-1: - ->>> import avahi ->>> avahi.string_to_byte_array(u'©') -[dbus.Byte(169)] ->>> avahi.string_to_byte_array(u'\ufeff') -Traceback (most recent call last): - File "", line 1, in - File "/usr/lib/python2.7/dist-packages/avahi/__init__.py", line 94, in string_to_byte_array - r.append(dbus.Byte(ord(c))) -ValueError: Integer outside range 0-255 - -This is particularly important for Python 3, where the str type -is a Unicode string. - -The b'' syntax for bytestrings is supported since at least Python 2.7. - -These functions now accept either Unicode strings (Python 2 unicode, -Python 3 str), which are encoded in UTF-8, or bytestrings -(Python 2 str, Python 3 bytes) which are taken as-is. - -Signed-off-by: Simon McVittie ---- - avahi-python/avahi/__init__.py | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/avahi-python/avahi/__init__.py b/avahi-python/avahi/__init__.py -index 7b450293..02305b02 100644 ---- a/avahi-python/avahi/__init__.py -+++ b/avahi-python/avahi/__init__.py -@@ -17,6 +17,8 @@ - - # Some definitions matching those in avahi-common/defs.h - -+import sys -+ - import dbus - - SERVER_INVALID, SERVER_REGISTERING, SERVER_RUNNING, SERVER_COLLISION, SERVER_FAILURE = range(0, 5) -@@ -66,6 +68,9 @@ - DBUS_INTERFACE_SERVICE_RESOLVER = DBUS_NAME + ".ServiceResolver" - DBUS_INTERFACE_RECORD_BROWSER = DBUS_NAME + ".RecordBrowser" - -+if sys.version_info[0] >= 3: -+ unicode = str -+ - def byte_array_to_string(s): - r = "" - -@@ -86,12 +91,19 @@ def txt_array_to_string_array(t): - - return l - -- - def string_to_byte_array(s): -+ if isinstance(s, unicode): -+ s = s.encode('utf-8') -+ - r = [] - - for c in s: -- r.append(dbus.Byte(ord(c))) -+ if isinstance(c, int): -+ # Python 3: iterating over bytes yields ints -+ r.append(dbus.Byte(c)) -+ else: -+ # Python 2: iterating over str yields str -+ r.append(dbus.Byte(ord(c))) - - return r - -@@ -107,6 +119,12 @@ def dict_to_txt_array(txt_dict): - l = [] - - for k,v in txt_dict.items(): -- l.append(string_to_byte_array("%s=%s" % (k,v))) -+ if isinstance(k, unicode): -+ k = k.encode('utf-8') -+ -+ if isinstance(v, unicode): -+ v = v.encode('utf-8') -+ -+ l.append(string_to_byte_array(b"%s=%s" % (k,v))) - - return l diff --git a/net-dns/avahi/files/avahi-0.7-qt5.patch b/net-dns/avahi/files/avahi-0.7-qt5.patch deleted file mode 100644 index aa7e4a5c812c..000000000000 --- a/net-dns/avahi/files/avahi-0.7-qt5.patch +++ /dev/null @@ -1,187 +0,0 @@ -diff -rupN avahi-0.6.31/avahi-qt/Makefile.am avahi-qt5/avahi-qt/Makefile.am ---- avahi-0.6.31/avahi-qt/Makefile.am 2010-08-25 19:51:39.011153001 -0500 -+++ avahi-qt5/avahi-qt/Makefile.am 2014-10-19 13:55:14.825086832 -0500 -@@ -65,4 +65,26 @@ libavahi_qt4_la_LIBADD = $(AM_LDADD) ../ - libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO) - endif - -+if HAVE_QT5 -+ -+avahiqt5includedir=$(includedir)/avahi-qt5 -+avahiqt5include_HEADERS = \ -+ qt-watch.h -+ -+lib_LTLIBRARIES += \ -+ libavahi-qt5.la -+ -+BUILT_SOURCES += qt-watch.moc5 -+ -+libavahi_qt5_la_SOURCES = \ -+ qt-watch.cpp -+ -+qt-watch.moc5: qt-watch.cpp -+ $(AM_V_GEN)$(MOC_QT5) $^ > $@ -+ -+libavahi_qt5_la_CPPFLAGS = $(AM_CFLAGS) --std=gnu++11 $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS) -+libavahi_qt5_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT5_LIBS) -+libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO) -+endif -+ - CLEANFILES = $(BUILT_SOURCES) -diff -rupN avahi-0.6.31/avahi-qt/qt-watch.cpp avahi-qt5/avahi-qt/qt-watch.cpp ---- avahi-0.6.31/avahi-qt/qt-watch.cpp 2010-08-25 19:51:39.011153001 -0500 -+++ avahi-qt5/avahi-qt/qt-watch.cpp 2014-10-19 13:56:14.076226518 -0500 -@@ -18,10 +18,10 @@ - ***/ - - #include --#ifdef QT4 --#include --#include --#include -+#if defined(QT5) || defined(QT4) -+#include -+#include -+#include - #else - #include - #include -@@ -114,7 +114,7 @@ AvahiTimeout::AvahiTimeout(const struct - m_callback(callback), m_userdata(userdata) - { - connect(&m_timer, SIGNAL(timeout()), this, SLOT(timeout())); --#ifdef QT4 -+#if defined(QT5) || defined(QT4) - m_timer.setSingleShot(true); - #endif - update(tv); -@@ -125,7 +125,7 @@ void AvahiTimeout::update(const struct t - m_timer.stop(); - if (tv) { - AvahiUsec u = avahi_age(tv)/1000; --#ifdef QT4 -+#if defined(QT5) || defined(QT4) - m_timer.start( (u>0) ? 0 : -u); - #else - m_timer.start( (u>0) ? 0 : -u,true); -@@ -191,8 +191,10 @@ const AvahiPoll* avahi_qt_poll_get(void) - return &qt_poll; - } - --#ifdef QT4 -+#if defined(QT5) -+#include "qt-watch.moc5" -+#elif defined(QT4) - #include "qt-watch.moc4" --#else -+#elif defined(QT3) - #include "qt-watch.moc3" - #endif -diff -rupN avahi-0.6.31/avahi-qt5.pc.in avahi-qt5/avahi-qt5.pc.in ---- avahi-0.6.31/avahi-qt5.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ avahi-qt5/avahi-qt5.pc.in 2014-10-19 13:55:14.825086832 -0500 -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=${prefix} -+libdir=@libdir@ -+includedir=${prefix}/include -+ -+Name: avahi-qt5 -+Description: Avahi Multicast DNS Responder (QT5 Support) -+Version: @PACKAGE_VERSION@ -+Requires: Qt5Core >= 5.0.0 -+Libs: -L${libdir} -lavahi-qt5 -+Cflags: -D_REENTRANT -I${includedir} -diff -rupN avahi-0.6.31/configure.ac avahi-qt5/configure.ac ---- avahi-0.6.31/configure.ac 2012-02-14 15:44:25.484742099 -0600 -+++ avahi-qt5/configure.ac 2014-10-19 13:55:14.825086832 -0500 -@@ -34,6 +34,7 @@ AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1: - AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:4:0]) - AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:2:0]) - AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:2:0]) -+AC_SUBST(LIBAVAHI_QT5_VERSION_INFO, [1:2:0]) - AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:4:1]) - - # Do not touch these, since they we took this version-info from upstream HOWL/Bonjour -@@ -525,6 +526,31 @@ fi - AM_CONDITIONAL(HAVE_QT4, test "x$HAVE_QT4" = "xyes") - - # -+# Check for Qt 5 -+# -+AC_ARG_ENABLE(qt5, -+ AS_HELP_STRING([--disable-qt5],[Disable building of Qt5Core mainloop integration]), -+ [case "${enableval}" in -+ yes) HAVE_QT5=yes ;; -+ no) HAVE_QT5=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-qt5) ;; -+ esac], -+ [HAVE_QT5=yes]) -+ -+if test "x$HAVE_QT5" = "xyes" ; then -+ PKG_CHECK_MODULES( QT5, [ Qt5Core >= 5.0.0 ]) -+ AC_SUBST(QT5_CFLAGS) -+ AC_SUBST(QT5_LIBS) -+ QT5_PREFIX="`$PKG_CONFIG --variable=host_bins Qt5Core`" -+ AC_PATH_PROGS(MOC_QT5, [moc-qt5 moc], no, [$QT5_PREFIX]) -+ if test "$MOC_QT5" = no; then -+ AC_MSG_ERROR([Could not find QT5 moc]) -+ fi -+ AC_SUBST(MOC_QT5) -+fi -+AM_CONDITIONAL(HAVE_QT5, test "x$HAVE_QT5" = "xyes") -+ -+# - # Check for GTK+ 2.0 - # - AC_ARG_ENABLE(gtk, -@@ -1157,6 +1183,7 @@ echo " - Enable python-dbus: ${HAVE_PYTHON_DBUS} - Enable QT3: ${HAVE_QT3} - Enable QT4: ${HAVE_QT4} -+ Enable QT5: ${HAVE_QT5} - Enable Mono: ${HAVE_MONO} - Enable Monodoc: ${HAVE_MONODOC} - Distribution/OS: ${with_distro} -@@ -1226,6 +1253,7 @@ echo "\ - Building avahi-discover-standalone: ${HAVE_GTK2OR3} - Building libavahi-qt3: ${HAVE_QT3} - Building libavahi-qt4: ${HAVE_QT4} -+ Building libavahi-qt5: ${HAVE_QT5} - Building avahi-sharp: ${HAVE_MONO} - Building avahi-compat-libdns_sd: ${ENABLE_COMPAT_LIBDNS_SD} - Building avahi-compat-howl: ${ENABLE_COMPAT_HOWL} -diff -rupN avahi-0.6.31/Makefile.am avahi-qt5/Makefile.am ---- avahi-0.6.31/Makefile.am 2011-12-30 15:26:44.925511922 -0600 -+++ avahi-qt5/Makefile.am 2014-10-19 13:55:14.825086832 -0500 -@@ -43,6 +43,7 @@ EXTRA_DIST = \ - avahi-gobject.pc.in \ - avahi-qt3.pc.in \ - avahi-qt4.pc.in \ -+ avahi-qt5.pc.in \ - avahi-sharp.pc.in \ - avahi-ui-sharp.pc.in \ - avahi-compat-libdns_sd.pc.in \ -@@ -101,6 +102,10 @@ if HAVE_QT4 - DX_INPUT += \ - $(srcdir)/avahi-qt/qt-watch.h - endif -+if HAVE_QT5 -+DX_INPUT += \ -+ $(srcdir)/avahi-qt/qt-watch.h -+endif - endif - - if HAVE_GLIB -@@ -216,6 +221,11 @@ pkgconfig_DATA += avahi-qt4.pc - CLEANFILES += avahi-qt4.pc - endif - -+if HAVE_QT5 -+pkgconfig_DATA += avahi-qt5.pc -+CLEANFILES += avahi-qt5.pc -+endif -+ - CLEANFILES += avahi.devhelp - - avahi.devhelp: doxygen-run diff --git a/net-dns/avahi/files/avahi-0.7-remove-empty-avahi_discover.patch b/net-dns/avahi/files/avahi-0.7-remove-empty-avahi_discover.patch deleted file mode 100644 index 702499e22185..000000000000 --- a/net-dns/avahi/files/avahi-0.7-remove-empty-avahi_discover.patch +++ /dev/null @@ -1,77 +0,0 @@ -From ffb19d8f3c7f1fe4f31f79f8601dd3079730401b Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Fri, 27 Apr 2018 09:01:13 +0100 -Subject: [PATCH] Remove empty avahi_discover Python module - -The avahi-discover tool no longer has any code outside its main -executable, so it does not need to install library modules. Its only -library code was avahi_discover.SimpleGladeApp, which was removed -in 2009. - -Signed-off-by: Simon McVittie ---- - avahi-python/avahi-discover/Makefile.am | 6 ------ - avahi-python/avahi-discover/__init__.py | 18 ------------------ - 2 files changed, 24 deletions(-) - delete mode 100755 avahi-python/avahi-discover/__init__.py - -diff --git a/avahi-python/avahi-discover/Makefile.am b/avahi-python/avahi-discover/Makefile.am -index 5fc4b25f..bb4d7172 100644 ---- a/avahi-python/avahi-discover/Makefile.am -+++ b/avahi-python/avahi-discover/Makefile.am -@@ -18,7 +18,6 @@ - AM_CFLAGS=-I$(top_srcdir) - - EXTRA_DIST = \ -- __init__.py \ - avahi-discover.py \ - avahi-discover.desktop.in.in - -@@ -31,15 +30,11 @@ pythonscripts = - desktopdir = $(datadir)/applications - desktop_DATA = - --avahi_discoverdir = $(pythondir)/avahi_discover --avahi_discover_PYTHON = -- - if HAVE_GDBM - pythonscripts += \ - avahi-discover - desktop_DATA += avahi-discover.desktop - @INTLTOOL_DESKTOP_RULE@ --avahi_discover_PYTHON += __init__.py - endif - - if HAVE_DBM -@@ -47,7 +42,6 @@ pythonscripts += \ - avahi-discover - desktop_DATA += avahi-discover.desktop - @INTLTOOL_DESKTOP_RULE@ --avahi_discover_PYTHON += __init__.py - endif - - avahi-discover.desktop.in: avahi-discover.desktop.in.in -diff --git a/avahi-python/avahi-discover/__init__.py b/avahi-python/avahi-discover/__init__.py -deleted file mode 100755 -index 6f3ec7f9..00000000 ---- a/avahi-python/avahi-discover/__init__.py -+++ /dev/null -@@ -1,18 +0,0 @@ --#!@PYTHON@ --# -*-python-*- --# This file is part of avahi. --# --# avahi is free software; you can redistribute it and/or modify it --# under the terms of the GNU Lesser General Public License as --# published by the Free Software Foundation; either version 2 of the --# License, or (at your option) any later version. --# --# avahi is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public --# License for more details. --# --# You should have received a copy of the GNU Lesser General Public --# License along with avahi; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 --# USA. diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml index 0832dd78f287..403d3fbd5a5f 100644 --- a/net-dns/avahi/metadata.xml +++ b/net-dns/avahi/metadata.xml @@ -9,10 +9,8 @@ Build and install the IPv4LL (RFC3927) network address configuration daemon Install the avahi-bookmarks application (requires dev-python/twisted) Enable compat libraries for howl - Use gtk2 for the avahi utilities (overridden by USE=gtk3) and build the avahi-ui library - Use gtk3 for the avahi utilities (overrides USE=gtk) and build the avahi-ui-gtk3 library - Use gtk2 for the avahi utilities (overridden by USE=gtk) and build the avahi-ui library - Use gtk3 for the avahi utilities (overrides USE=gtk2) and build the avahi-ui-gtk3 library + Use gtk2 for the avahi utilities (overridden by USE=gtk) and build the avahi-ui library + Use gtk3 for the avahi utilities (overrides USE=gtk2) and build the avahi-ui-gtk3 library Enable compat libraries for mDNSResponder diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index 87392dfbae4a..d3b21f2054a4 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -1,6 +1,7 @@ AUX 10bind.env 27 BLAKE2B e5ddb2daced1b9430cb8e4b691bc0f1164f71a6e2032fa4efd18b629a6aeb971336d5eaa38c6474a3143cb34691c22d4564ebb010d9efd00cf6e2634daa8e68c SHA512 8ae5326b158b8a3eeaab667c84dd712fefd25d10832598783fa497285183cbdee554796c22d32fec54cd00461469f29ed473a730304a00aacdf06c1bb6c33d55 AUX bind-9.16.6-bug-741162.patch 1137 BLAKE2B 426e3091e0d6c002ce081adc264d9e4ec5e3d803b881d39662fe7d6ea687f2851a65e6b28bf6d1c3ceeac27277aceaae7df800cf8f1c2b621db83351dee59cc1 SHA512 e6c09d10df3fbd1edcab27f9fbeaaca8474b663cef933b537a803417242d4588d71fb960ede96f1c424be472aacaf248fd8c8338a2e5513080e9f53b6777caf4 AUX generate-rndc-key.sh 183 BLAKE2B 33f2297745ef8e5aed09107cee6d0017d3870ea9db249a17850ae7a55f613b03a136bc61b8ac4526858178a0f8713eabda6c5f30917415f9a3ad6b34668f45ab SHA512 6c611120185c1a61b2b6da228efc28302ebd36c819b97793920543ce2cfff4da84f43ec53ddd072f008b04c7087cc19108c4279cb962d12a7e073b47235d14ee +AUX ldap-library-path-on-multilib-machines.patch 431 BLAKE2B d067f241334742ec093af75e83e2b0678f04048b73e7f97e637b42fad301f48fa930b10ac4b8c24ea86c7fe011eb598e21ada7514b47b2c05a9c14feb8b1487b SHA512 9c668a117a5ae5fc8414eb545b4a69e40826982092190cdb36e67092c98f4c148ac749988da3ed6f9b32f6559e13046c50a77a7e307cd8bd6256d1f44ba44468 AUX localhost.zone-r3 426 BLAKE2B d34cf12d484c6bb705d3bd8bfbf93514e504497a99da983f6176234239cc664131502744f3cd743d938dec0309f0d8df2c1d0c5325b5cb61023ed192d32bbedd SHA512 979d8693046033c24490dca536f0d649795bbdf57eed32017b32d07d7d3c51b35197e4edd79d8258074a1bf14b71376472ba6ae749f62ceaf74d7a6a0559fa89 AUX named.cache-r3 3316 BLAKE2B 09a17fbb29f2122a61c7e17a8dfc8eef3b0fdaa94e8dbe17a0b188946fe8017c65599fbb84c0f88123f0e0f17faae2b9a1ffbc0ee17bcf62c1cbf34f064b9c36 SHA512 3608f29d356bf853145e14c1f81fdccf7090f63e95573234221711b7b6084fbc806817c41daa5d6072a4955a714f9e1cbd6cdcabd7cd1833c3e5f8387bc1ba20 AUX named.conf 32 BLAKE2B 15548145717b526be3d7898a0c2144a13e29b0595a3c27d220cc45646156cc8ddae954cb3b3907ca845765fc8ce30508d8e570c0a492b965027531a0f6df43ac SHA512 c344fd4949eb80114d0c157517ece3f4b9505b94e3de00489d4b2b23beb74612f38cf3443f2f3b98fe01d98ad1842f45ff1d1826d67937e72e4629bbdf683a59 @@ -10,6 +11,6 @@ AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d950383 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4 DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac -EBUILD bind-9.16.6-r1.ebuild 10954 BLAKE2B 90aa875a56e9332e124fb05c0520879d94e04762b31757b948296960ad3e53fabc2f74eff7cebe43df63f8b5b38db75ccbf779db0711f3ce630a99ddad2dedb6 SHA512 5a4f106469ca8d5745eb5dcfef78ddde666d916e52ebdc8c0b053b22974430bc17d49fb6dd706e247cdccc5bef60e2102df0c993c4abbb6d0ee043a9bf8cf93f +EBUILD bind-9.16.6-r2.ebuild 11015 BLAKE2B f33043400501d72dc1f85cdf5c45c9a5b27851d112f21e99c2cc59e31b7b699099c82e13ae08d9331c4f6ac9cfc0d599d42f0162df7bfdd580c525b58c49b53c SHA512 d4454404172a98224d2323dc46e590b61f792b9c6341037d5d3ac03731baba6f8d011c2c2e2c66428734ae836285e076b49531fa7d6d32cb92d0321948cad962 EBUILD bind-9.16.6.ebuild 10766 BLAKE2B 83963e592f2ab27789a0f4642ba5dd9d2cd6dab28e444b502962d140694293c4ef7d7bf60c68e709093fd2e9cf34af3f28b3768683e2bde20aaf208abbedefa2 SHA512 5de5ce0d73fba42a52c9e516682f50878033e4a9cdc6866f9b7d159efb640feb29b2643b43bc4542a5e2b46349ba2e11593dac9d767eb37d4ad5dd9e45ba5f2d MISC metadata.xml 1043 BLAKE2B 3bf699db16f6883700e32e5f0debc534fa2d763aca0cf8fe3878dedcbb110410d88c2dbb69b4d4df09df62943416de3aaed7d53a2371d004b8c19a2a5a609bc1 SHA512 137093eabcbda1feb7cdac0cb0b2eeb808a47062b4e8d114874ee4019847ecbf5996c7b19055981a5ebffd099b5a96ce6ada919719017d83f93bc679334845b9 diff --git a/net-dns/bind/bind-9.16.6-r1.ebuild b/net-dns/bind/bind-9.16.6-r1.ebuild deleted file mode 100644 index 4cce9cdc72a8..000000000000 --- a/net-dns/bind/bind-9.16.6-r1.ebuild +++ /dev/null @@ -1,379 +0,0 @@ -# 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_{6..9} ) - -inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use 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 )" - -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" -# -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=" - acct-group/named - acct-user/named - !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}" - -PATCHES=( - # should fix https://bugs.gentoo.org/741162 taken from: - # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/4073 - "${FILESDIR}/bind-9.16.6-bug-741162.patch" -) - -# bug 479092, requires networking -# bug 710840, cmocka fails LDFLAGS='-Wl,-O1' -#RESTRICT="test" - -src_prepare() { - default - - # 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 - - use python && python_copy_sources -} - -src_configure() { - bind_configure --without-python - use python && python_foreach_impl python_configure -} - -bind_configure() { - local myeconfargs=( - AR="$(type -P $(tc-getAR))" - --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 xml libxml2) - $(use_with zlib) - "${@}" - ) - - use geoip && myeconfargs+=( --enable-geoip ) - use geoip2 && myeconfargs+=( --with-maxminddb ) - - # 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 -} - -python_configure() { - pushd "${BUILD_DIR}" >/dev/null || die - bind_configure --with-python - popd >/dev/null || die -} - -src_compile() { - default - use python && python_foreach_impl python_compile -} - -python_compile() { - pushd "${BUILD_DIR}"/bin/python >/dev/null || die - emake - popd >/dev/null || die -} - -src_install() { - default - - # don't create /var/run - rmdir "${ED}"/var/run || die - - dodoc CHANGES README - - if use doc; then - 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,delv,nsupdate}.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 - - use python && python_foreach_impl python_install - - # 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} /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" -} - -python_install() { - pushd "${BUILD_DIR}"/bin/python >/dev/null || die - emake DESTDIR="${D}" install - python_scriptinto /usr/sbin - python_doscript dnssec-{checkds,coverage} - python_optimize - popd >/dev/null || die -} - -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.6-r2.ebuild b/net-dns/bind/bind-9.16.6-r2.ebuild new file mode 100644 index 000000000000..4f12a967f86b --- /dev/null +++ b/net-dns/bind/bind-9.16.6-r2.ebuild @@ -0,0 +1,381 @@ +# 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_{6..9} ) + +inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use 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 )" + +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" +# -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=" + acct-group/named + acct-user/named + !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}" + +PATCHES=( + # should fix https://bugs.gentoo.org/741162 taken from: + # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/4073 + "${FILESDIR}/bind-9.16.6-bug-741162.patch" + + "${FILESDIR}/ldap-library-path-on-multilib-machines.patch" +) + +# bug 479092, requires networking +# bug 710840, cmocka fails LDFLAGS='-Wl,-O1' +#RESTRICT="test" + +src_prepare() { + default + + # 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 + + use python && python_copy_sources +} + +src_configure() { + bind_configure --without-python + use python && python_foreach_impl python_configure +} + +bind_configure() { + local myeconfargs=( + AR="$(type -P $(tc-getAR))" + --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 xml libxml2) + $(use_with zlib) + "${@}" + ) + + use geoip && myeconfargs+=( --enable-geoip ) + use geoip2 && myeconfargs+=( --with-maxminddb ) + + # 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 +} + +python_configure() { + pushd "${BUILD_DIR}" >/dev/null || die + bind_configure --with-python + popd >/dev/null || die +} + +src_compile() { + default + use python && python_foreach_impl python_compile +} + +python_compile() { + pushd "${BUILD_DIR}"/bin/python >/dev/null || die + emake + popd >/dev/null || die +} + +src_install() { + default + + # don't create /var/run + rmdir "${ED}"/var/run || die + + dodoc CHANGES README + + if use doc; then + 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,delv,nsupdate}.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 + + use python && python_foreach_impl python_install + + # 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} /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" +} + +python_install() { + pushd "${BUILD_DIR}"/bin/python >/dev/null || die + emake DESTDIR="${D}" install + python_scriptinto /usr/sbin + python_doscript dnssec-{checkds,coverage} + python_optimize + popd >/dev/null || die +} + +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/files/ldap-library-path-on-multilib-machines.patch b/net-dns/bind/files/ldap-library-path-on-multilib-machines.patch new file mode 100644 index 000000000000..5286c72f11be --- /dev/null +++ b/net-dns/bind/files/ldap-library-path-on-multilib-machines.patch @@ -0,0 +1,13 @@ +diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in +index f769cf1..721d480 100644 +--- a/contrib/dlz/config.dlz.in ++++ b/contrib/dlz/config.dlz.in +@@ -396,7 +396,7 @@ case "$use_dlz_ldap" in + *) + DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver, + [-I$use_dlz_ldap/include], +- [-L$use_dlz_ldap/lib -lldap -llber]) ++ [-lldap -llber]) + + AC_MSG_RESULT( + [using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include]) diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest index ad1717394568..aca1b3ceb38a 100644 --- a/net-dns/maradns/Manifest +++ b/net-dns/maradns/Manifest @@ -2,8 +2,6 @@ AUX deadwood 475 BLAKE2B 1f5f669b22011bf38e077d21278ebfbff72ba45782b863044d868f3 AUX maradns.service.in 159 BLAKE2B 2ecd43d92a6c804fd713c0e1e22a18049ab410ccb0b92ec9ffe7621605e1dfea65c880369d0530e59cf061f6fb402cd83175f38be27b43d82b65a7175434e648 SHA512 0de3b9141b8266cb6443b8a7fcb6243782059d2ea45b89421158ded607413eb491542c279f2a9b4455e9396e6ba20e46aed8f46eba3b04e5bd428f335c4b9582 AUX maradns2 481 BLAKE2B 486711875cc3ad29066cbe52d16fb29c6ba35473ec0ffe63fb8039e208e90009900faf8f93c9c43ae80fe0b618202b2aff5cd2302af253a4d38d7d6486c8bc05 SHA512 e893020a934c5927b772189c034469055cd0d8a8ab3e066fe063e30999be6a6679e7b95c2761dec1326cec37fe5261541fbb27e9be796681764c75252b10e90b AUX zoneserver2 483 BLAKE2B fcae510c7d5719df0b018976052fb0b6ccb3af1324b607ccfb93a3e5d822d1ee5460424f2b05e1f2b3f09f7d445242f58f55abbc5ba88adeb25861c3eae29e90 SHA512 dc5dd43b043417002fce4c3d6c2e5417bc68fae7a0ac4db03f7cb382d348ed6b2c7042c38ffc2db3a4c36abf734e9d34124042a4077090bd7947241aab955ab7 -DIST maradns-2.0.16.tar.bz2 1127504 BLAKE2B 142166370efed2d52c0a1e659bf0056f8d13cc5eca3c1d30c0278b81047aa58ce6c6f3f8496e982841b9dcd541ffd2c24467b8062aa5a7ffb1f31ef6cf841a15 SHA512 9959a7b6724aff5561fa9303b3d7c967e298fd63d95ef7e34d80514dde8871c19887c184a6466779f2833c295233dd1d54a7c06928ac58dcbb374281deb13f17 DIST maradns-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d -EBUILD maradns-2.0.16.ebuild 2814 BLAKE2B 5c7baba17ac15bcfe55c3e1600f4139e62564443647b53def559468c6c4a75c1dfad0212ccf7ac0ff73d4f8b7c241351629766d5b10f12c29a2c7a118e073ed6 SHA512 155e04103597ec88ad5f4e47ceb2829cc6d64e5971f7fd9f2a5198f0def046612fdfa29f14b7b45a173909585e84c0d3a6fd2f3854faf489de7f5261fa7eba49 EBUILD maradns-3.5.0005.ebuild 2358 BLAKE2B 7c373874d41e64d27631edf7c2933684a28f1acf2fd3f51aef942f744afecb5d0a6391322c7dc9944afe20dd0caa4650443993b5540410246eaa1879daaac269 SHA512 a4ae540ebfc23a0675445ccbb00a3c26c91efd90034241e2a9f27173c286747432c13430141c1056a844502cbe2cf596fc323aa865268e7d290b50697e167780 -MISC metadata.xml 728 BLAKE2B 07077c81b008d0ab019995c21873fcf61ff636a346eb582d966f81dabd4a9a7e3ad2a9879c6ca33708828b54b3ae2dcafb8c89716dd571c95a456add01e43863 SHA512 0b0c7db834ae6a1a94069873c72cfe2e87840d89d556ffc7a2887c426321ced9b474dc32292010f4dd8918389906cda16b2f3ae1251c7a9ab6be055763ae8330 +MISC metadata.xml 620 BLAKE2B fabe3ba11ebb5211d8ed8b51912a22515e9a299195abf2c6a7a14f552837ffa4a080e681c01a058afac19187cc3ae41f677d13598fe9b01738457c360dd1e0bb SHA512 0394942fe14d585a9ecbbff325cc34dafa16a4d438334620a25ed009454724e9ed6e8b5f8f5f89f359a2141eb1031b0180eeba7ed99d6995f21e549f753f3fa2 diff --git a/net-dns/maradns/maradns-2.0.16.ebuild b/net-dns/maradns/maradns-2.0.16.ebuild deleted file mode 100644 index 17e475eff849..000000000000 --- a/net-dns/maradns/maradns-2.0.16.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 systemd toolchain-funcs user - -DEADWOOD_VER="3.2.12" - -DESCRIPTION="A security-aware DNS server" -HOMEPAGE="http://www.maradns.org/" -SRC_URI="http://www.maradns.org/download/${PV%.*}/${PV}/${P}.tar.bz2" - -# The GPL-2 covers the init script, bug 426018. -LICENSE="BSD-2 GPL-2" -SLOT="0" -KEYWORDS="amd64 ~mips ~ppc x86" -IUSE="authonly examples ipv6" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - dev-lang/perl" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # Use duende-ng.c. - cp tools/duende{,-ng}.c \ - || die "failed to rename duende-ng.c" - # replace "make" by "$(MAKE)" to avoid GNU Make warning - sed -i 's/\ make\ /\ \$\(MAKE\)\ /g' build/Makefile.linux \ - || die "can't patch build/Makefile.linux" - - python_fix_shebang tools/bind2csv2.py -} - -src_configure() { - tc-export CC - ./configure $(use ipv6 && echo "--ipv6") || die "Failed to configure ${PN}" -} - -src_install() { - # Install the MaraDNS and Deadwood binaries - dosbin server/maradns - dosbin tcp/zoneserver - if ! use authonly; then - dosbin deadwood-${DEADWOOD_VER}/src/Deadwood - fi - dobin tcp/{getzone,fetchzone} - dobin tools/{askmara,askmara-tcp,duende,bind2csv2.py,csv1tocsv2.pl} - - # MaraDNS docs, manpages, misc - dodoc doc/en/{QuickStart,README,*.txt,*.html} - dodoc -r doc/en/{text,webpage,tutorial} - dodoc maradns.gpg.key - if ! use authonly; then - docinto deadwood - dodoc deadwood-${DEADWOOD_VER}/doc/{*.txt,*.html,CHANGELOG,Deadwood-HOWTO} - dodoc -r deadwood-${DEADWOOD_VER}/doc/internals - fi - - # Install examples (optional) - if use examples ; then - docinto examples - dodoc doc/en/examples/example_* - fi - - # Install manpages - doman doc/en/man/*.[1-9] - if ! use authonly; then - doman deadwood-${DEADWOOD_VER}/doc/{Deadwood,Duende}.1 - fi - - # Example configurations. - insinto /etc/maradns - newins doc/en/examples/example_full_mararc mararc_full.dist - newins doc/en/examples/example_csv2 example_csv2.dist - if ! use authonly; then - newins deadwood-${DEADWOOD_VER}/doc/dwood3rc-all dwood3rc_all.dist - fi - keepdir /etc/maradns/logger - - # Init scripts. - newinitd "${FILESDIR}"/maradns2 maradns - newinitd "${FILESDIR}"/zoneserver2 zoneserver - if ! use authonly; then - newinitd "${FILESDIR}"/deadwood deadwood - fi - - # systemd unit - # please keep paths in sync! - sed -e "s^@bindir@^${EPREFIX}/usr/sbin^" \ - -e "s^@sysconfdir@^${EPREFIX}/etc/maradns^" \ - "${FILESDIR}"/maradns.service.in > "${T}"/maradns.service \ - || die "failed to create the maradns.service file (sed)" - - systemd_dounit "${T}"/maradns.service -} - -pkg_preinst() { - enewgroup maradns 99 - enewuser duende 66 -1 -1 maradns - enewuser maradns 99 -1 -1 maradns -} diff --git a/net-dns/maradns/metadata.xml b/net-dns/maradns/metadata.xml index 1989b4903ef9..aa20f8fb6d0d 100644 --- a/net-dns/maradns/metadata.xml +++ b/net-dns/maradns/metadata.xml @@ -13,9 +13,6 @@ proxy-maint@gentoo.org Proxy Maintainers - - Allows one to build only authoritative DNS server - samboy/MaraDNS diff --git a/net-dns/mdns-repeater/Manifest b/net-dns/mdns-repeater/Manifest index 96e664e9bb91..37a32840596d 100644 --- a/net-dns/mdns-repeater/Manifest +++ b/net-dns/mdns-repeater/Manifest @@ -1,3 +1,4 @@ -DIST mdns-repeater-28ecc2ab9a0e.tar.gz 10697 BLAKE2B 4272f20d08db060c27a0f1e6cd9cea6896b8f119e8b751cc25f64ecb4a542adaf55b31d8a380058371bcf7e26c4e13fd34dec8a11a58f37e270af9be6b04fc3b SHA512 06b8365a389ccc77bc31ebcbf7089e59bd2e03e4996e719f369e7c54dbc96b1ea57c9e0b82d4376fcb165160e04a48a3a679f9ab431344f46d74a3602e58a0d8 -EBUILD mdns-repeater-20110921.ebuild 556 BLAKE2B acdbf33470f73559b315da56d6cbcae75e81d1be94334d27adc1b2d82fae6efdc1902eff9e7767b2766d33d783844116a98621619fa7fec17a5f4cd6150943b8 SHA512 7036958a0de08911d7696367f79fd5d8c770b3909ca5d600c4323caf6d29663e214f6bc6b4136769f0067d69d55a2e8bbbebc3b39dafd12a9b4d60e3c4b0331c -MISC metadata.xml 472 BLAKE2B 82d6d18d384de972128c0d31714691eaf78df68e0168692e1594bd49a90b605029b93ebc2437d476379a04b1a41cd2591a7aebe3f1bb08997e31eea6a51fff89 SHA512 b26c5d02e9325075a58b99844baa558b5822ca39d9e35965aed9ad4480a702bd079236ad73a815a1977f2cbdf2f57fab6570b71536b64cb9221d2efb87bd9219 +AUX mdns-repeater-1.11-system-compiler-options.patch 687 BLAKE2B e806dcb148b5db8c4559fbbb51843efaac5e73565551ffb98d008e380a3192533851bf20da2cc92bf9945238d87939b6af511a3ebcc39aa64f90529207e2a3e7 SHA512 fc78f8c2b40846811d04e731404d7ed3ebdc3863870c5ddb457b4f2443d2c31c2b3a580e7dc0dae5b6f11f765fd09d33b0d471bc4d486fe64ddbae0e0cf669ca +DIST mdns-repeater-1.11.tar.gz 11220 BLAKE2B 88e6b68635be152c2fcd7eb0e5be038d694bae590edde283dec83b896c2380d83cc84d5e4cfb02b6ae957d75dd7525975e31c418d05f5732b5f41382fb130c31 SHA512 3f2fc83448db7ed84512ddc42d1769d1d7fa52aa92a4205d9956685fd5fd8b5c050b8a2c44d4b834e242568671fa278ac912f0b35f3c7cf41aa0ae8f1cf2a310 +EBUILD mdns-repeater-1.11.ebuild 550 BLAKE2B ff3bf7c106d4b143f3fd700e00213a3135dc50db2d75f8c4627a4e3b3101eeaebb097280188f71ff5afe4a3649f2e6228b501d6e0caee187044656cf09adaa2e SHA512 c43c1fc07d980881b27f46e6f63143b40a429ddf33ef569cfcf1d4d9a2d6bdd9b50b850c3a273c362ac59e99fe8906bbd5d0357da8f5ae0c2acfe7de8ae78c29 +MISC metadata.xml 475 BLAKE2B aaa3ba749586ffab285b5b3bea63d8b2d0433399a2a95080e1b1387ca48830d458156bb0f89a4c955202ddd651d548441db0adad2630b27f6877093f838139b1 SHA512 c2e5468b6a3606eafaa2caee43921a914e4758d6b66e417791247eaa97c688967e7e3617af1d0dceffc3924f9a87423a66652499880564e5ff7a7b2661177958 diff --git a/net-dns/mdns-repeater/files/mdns-repeater-1.11-system-compiler-options.patch b/net-dns/mdns-repeater/files/mdns-repeater-1.11-system-compiler-options.patch new file mode 100644 index 000000000000..35eaa3675283 --- /dev/null +++ b/net-dns/mdns-repeater/files/mdns-repeater-1.11-system-compiler-options.patch @@ -0,0 +1,33 @@ +From 4d4f022eef0d0d14936288a5f6374c7a4b85c77c Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Sun, 23 Aug 2020 04:06:15 +0300 +Subject: [PATCH] Respect system CFLAGS and LDFLAGS + +--- + Makefile | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index a04f707..ae4fe32 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,15 +9,7 @@ ZIP_FILES = mdns-repeater \ + + HGVERSION=$(shell hg parents --template "{latesttag}.{latesttagdistance}") + +-CFLAGS=-Wall +- +-ifdef DEBUG +-CFLAGS+= -g +-else +-CFLAGS+= -Os +-LDFLAGS+= -s +-endif +- ++CFLAGS+=-Wall + CFLAGS+= -DHGVERSION="\"${HGVERSION}\"" + + .PHONY: all clean +-- +2.26.2 + diff --git a/net-dns/mdns-repeater/mdns-repeater-1.11.ebuild b/net-dns/mdns-repeater/mdns-repeater-1.11.ebuild new file mode 100644 index 000000000000..70e66393f0c6 --- /dev/null +++ b/net-dns/mdns-repeater/mdns-repeater-1.11.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Multicast DNS repeater" +HOMEPAGE="https://github.com/kennylevinsen/mdns-repeater" +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm" + +SRC_URI="https://github.com/kennylevinsen/mdns-repeater/archive/${PV}.tar.gz -> ${P}.tar.gz" + +PATCHES=( + "${FILESDIR}/${P}-system-compiler-options.patch" +) + +src_compile() { + emake HGVERSION="${PV}" CC=$(tc-getCC) +} + +src_install() { + dobin "${PN}" + dodoc README.txt +} diff --git a/net-dns/mdns-repeater/mdns-repeater-20110921.ebuild b/net-dns/mdns-repeater/mdns-repeater-20110921.ebuild deleted file mode 100644 index 262d90f35c60..000000000000 --- a/net-dns/mdns-repeater/mdns-repeater-20110921.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Multicast DNS repeater" -HOMEPAGE="https://bitbucket.org/geekman/mdns-repeater/" -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm" - -REV="28ecc2ab9a0e" -SRC_URI="https://bitbucket.org/geekman/mdns-repeater/get/${REV}.tar.gz -> ${PN}-${REV}.tar.gz" -S="${WORKDIR}/geekman-mdns-repeater-${REV}" - -src_configure() { - tc-export CC -} - -src_compile() { - emake HGVERSION="${REV}" -} - -src_install() { - dobin "${PN}" -} diff --git a/net-dns/mdns-repeater/metadata.xml b/net-dns/mdns-repeater/metadata.xml index 1306680b2568..4a16a9ff3c07 100644 --- a/net-dns/mdns-repeater/metadata.xml +++ b/net-dns/mdns-repeater/metadata.xml @@ -10,6 +10,6 @@ Gentoo Proxy Maintainers Project - geekman/mdns-repeater + kennylevinsen/mdns-repeater diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest index 1d60ee0991f9..743aa9f23dd4 100644 --- a/net-dns/pdns/Manifest +++ b/net-dns/pdns/Manifest @@ -1,6 +1,8 @@ AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf403453422888e2cb44fa4fed7891241919a39c8c6f539a61de032654650a45ea548a6983777ea1bfe029e817f2c315 SHA512 ac16f8d528d6138d3c2cbf997fd8fbb467d388aa63eb6ed4e7780a3dad11ea885b91252ff0809b1d2cf7d5200814b8963aab890af84741ea86d35b2f5955a7ea AUX pdns-4.3.0-boost-1.73-compatibility.patch 2676 BLAKE2B 9b6a5e56915abc80fb354f0bf68732270823fb2b5a2d603bfd0f1a24bb346d44ea137de3e835018327f4216ea3e6288d625493540598e9c15ac719441d01f001 SHA512 306a1c14479b1078a4025efacaa893b2ef3a2f64f7dd5d06a2a18e3a23098f810f8fbb9f443015d6071c1e794a13c75f581b0da78ddd5e4737886a1419cf250c -AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02f2ad4324cb7c99a05736bac7cbe80e1b9081832cac95d8c482eb4d1a8c344a6b55da623e3 SHA512 6392f59f82b82621b6cab6823f7761cd875bc6818c48db846df289057c02d8119a1024c5ecdf70a5ca8a55c00a2c3c56240d36b42cc038a25e8616ab9b966dd6 +AUX pdns-r1 2535 BLAKE2B 4e718bbba73b20a86dd11acc07ce91d259d82a3fc3e6133cac0d7fb2b24d2b5ff3e3596d00c4289017845c7a1751d0a43e83ba67e4b8e55e10aca892ba3d3aea SHA512 5ebc7cd236195543e67db5ed2c831ff6a1b9bdba5a72c179df72f84e4ade2dfc962a988ab02a7b893c62a7c3d8df7a15e2de3ae02413ff296a6404a7937eb8de DIST pdns-4.3.0.tar.bz2 1211536 BLAKE2B 3291597c4f0c39e23f793b128ef26b1ce3dc77640ddf6979242ab291b0e2780ae5c19b18591ea90f5282810044959feca265a245e27eca1f2ebacbdeeb8a3785 SHA512 0734dbfb83a2e5080dc54cfc016ceb3e1f7e15a2de2f33392b2f3c995357fa97f9e87ff21e969f148c3e881165471d3058eb2b9cf632117ebce0d7818e025fe2 +DIST pdns-4.3.1.tar.bz2 1216876 BLAKE2B 0449835d104ec430329dc88087b489e29f1e1fa0c2a22af8715883a0a80d73f3a4848df207abbf986b946c640c4f1d35a1c8335f13f96a00915e4a40bcbecc9f SHA512 e61e23544f1e57c1ec3a85b4edbc3ff3e8e831410237afdc8896e9f34602774c1dc8bd02eb7440e765262fcc988f98e47b6f1b7945427b1f4a59dd6b84b9437e EBUILD pdns-4.3.0.ebuild 4610 BLAKE2B e9780e7d468a487f822c695a9cb590aa687ac1c7cdb40cdab1927ae3f22a273012141bff264320df0cb94060cf474ff2e47b9ff4657c034aa47b0c305032eec0 SHA512 3ba103d2a7ae26e524e56ae7bd01d4f260d9b511eeaf1f46e72c489594a5eb1bcc2ce213f21c0fca518c89841b25ecf0a1a60bc913ff3a60ae8632ef31aaeaf1 +EBUILD pdns-4.3.1.ebuild 4619 BLAKE2B 9fb5559e5fce3c1275fe8dcccb50ca3bc4db91f55ccbb9a610802c765d82c16d96a661c5a642b084e6449d5f28c2222ad7e0e1f5a40d6c631f8309cd9c5482ed SHA512 23ea084439881b6d50535d92eb73b38979c3940936d6b6f8538ef899da24f2f8e1c5f5e1f786cf0bfbccf38621f75edc963579744bfbb42dc6c4016c7b7b803d MISC metadata.xml 1111 BLAKE2B 5a55e94593f1c010f9ee71fa2d3bc887a0eddc8627db36a1792b911a1cfe3fa3d5a33923b95d18a02f36097717d76ed2aae711c2deb793625b1186090ad072c8 SHA512 c010bbd0daa87980a4d9f164fc3d15239251890e56c63b1165d55a92b9c0f24e5f141439bdfc13b4efa4483e0fc199cd6107e2f152d26d4ca954f4c3d0cc4913 diff --git a/net-dns/pdns/files/pdns-r1 b/net-dns/pdns/files/pdns-r1 index 76c4a3f1bbf5..4c5241e5155f 100644 --- a/net-dns/pdns/files/pdns-r1 +++ b/net-dns/pdns/files/pdns-r1 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}" @@ -10,7 +10,7 @@ PDNS_STOP_TIMEOUT="${PDNS_STOP_TIMEOUT:-10}" PDNS_CONFIG="${PDNS_CONFIGDIR}/pdns${PDNS_INSTANCE:+-${PDNS_INSTANCE}}.conf" PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )" PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" )" -[ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run" +[ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run/pdns" name="PowerDNS Authoritative Server${PDNS_INSTANCE:+ (${PDNS_INSTANCE})}" description="Authoritative name server" diff --git a/net-dns/pdns/pdns-4.3.1.ebuild b/net-dns/pdns/pdns-4.3.1.ebuild new file mode 100644 index 000000000000..7765dcc623c3 --- /dev/null +++ b/net-dns/pdns/pdns-4.3.1.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit multilib + +DESCRIPTION="The PowerDNS Daemon" +HOMEPAGE="https://www.powerdns.com/" +SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# other possible flags: +# db2: we lack the dep +# oracle: dito (need Oracle Client Libraries) +# xdb: (almost) dead, surely not supported + +IUSE="debug doc geoip ldap libressl luajit lua-records mydns mysql postgres protobuf remote sodium sqlite systemd tools tinydns test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="mydns? ( mysql )" + +RDEPEND=" + libressl? ( dev-libs/libressl:= ) + !libressl? ( dev-libs/openssl:= ) + >=dev-libs/boost-1.35:= + !luajit? ( dev-lang/lua:= ) + luajit? ( dev-lang/luajit:= ) + lua-records? ( >=net-misc/curl-7.21.3 ) + mysql? ( dev-db/mysql-connector-c:= ) + postgres? ( dev-db/postgresql:= ) + ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) + sqlite? ( dev-db/sqlite:3 ) + geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) + sodium? ( dev-libs/libsodium:= ) + tinydns? ( >=dev-db/tinycdb-0.77 ) + protobuf? ( dev-libs/protobuf )" +DEPEND="${RDEPEND}" +RDEPEND="${RDEPEND} + acct-user/pdns + acct-group/pdns" + +BDEPEND="virtual/pkgconfig + doc? ( app-doc/doxygen )" + +S="${WORKDIR}"/${P/_/-} + +PATCHES=( "${FILESDIR}"/${PN}-4.3.0-boost-1.73-compatibility.patch ) + +src_configure() { + local dynmodules="pipe bind" # the default backends, always enabled + + #use db2 && dynmodules+=" db2" + use ldap && dynmodules+=" ldap" + use mydns && dynmodules+=" mydns" + use mysql && dynmodules+=" gmysql" + #use oracle && dynmodules+=" goracle oracle" + use postgres && dynmodules+=" gpgsql" + use remote && dynmodules+=" remote" + use sqlite && dynmodules+=" gsqlite3" + use tinydns && dynmodules+=" tinydns" + use geoip && dynmodules+=" geoip" + #use xdb && dynmodules+=" xdb" + + econf \ + --disable-static \ + --sysconfdir=/etc/powerdns \ + --libdir=/usr/$(get_libdir)/powerdns \ + --with-modules= \ + --with-dynmodules="${dynmodules}" \ + --with-mysql-lib=/usr/$(get_libdir) \ + --with-lua=$(usex luajit luajit lua) \ + $(use_enable debug verbose-logging) \ + $(use_enable lua-records) \ + $(use_enable test unit-tests) \ + $(use_enable tools) \ + $(use_enable systemd) \ + $(use_with sodium libsodium) \ + $(use_with protobuf) \ + ${myconf} +} + +src_compile() { + default + use doc && emake -C codedocs codedocs +} + +src_install() { + default + + mv "${D}"/etc/powerdns/pdns.conf{-dist,} + + fperms 0700 /etc/powerdns + fperms 0600 /etc/powerdns/pdns.conf + + # set defaults: setuid=pdns, setgid=pdns + sed -i \ + -e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \ + "${D}"/etc/powerdns/pdns.conf + + newinitd "${FILESDIR}"/pdns-r1 pdns + + keepdir /var/empty + + if use doc; then + docinto html + dodoc -r codedocs/html/. + fi + + # Install development headers + insinto /usr/include/pdns + doins pdns/*.hh + insinto /usr/include/pdns/backends/gsql + doins pdns/backends/gsql/*.hh + + if use ldap ; then + insinto /etc/openldap/schema + doins "${FILESDIR}"/dnsdomain2.schema + fi + + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + elog "PowerDNS provides multiple instances support. You can create more instances" + elog "by symlinking the pdns init script to another name." + elog + elog "The name must be in the format pdns. and PowerDNS will use the" + elog "/etc/powerdns/pdns-.conf configuration file instead of the default." + + if use ldap ; then + echo + ewarn "The official LDAP backend module is only compile-tested by upstream." + ewarn "Try net-dns/pdns-ldap-backend if you have problems with it." + fi + + local old + for old in ${REPLACING_VERSIONS}; do + ver_test ${old} -lt 3.2 || continue + + echo + ewarn "To fix a security bug (bug #458018) had the following" + ewarn "files/directories the world-readable bit removed (if set):" + ewarn " ${EPREFIX}/etc/powerdns" + ewarn " ${EPREFIX}/etc/powerdns/pdns.conf" + ewarn "Check if this is correct for your setup" + ewarn "This is a one-time change and will not happen on subsequent updates." + chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf} + + break + done + + if use postgres; then + for old in ${REPLACING_VERSIONS}; do + ver_test ${old} -lt 4.1.11-r1 || continue + + echo + ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend." + ewarn "This security fix needs to be applied manually to the database schema." + ewarn "Please refer to the official security advisory for more information:" + ewarn + ewarn " https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html" + + break + done + fi +} diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest index b07c33423680..b9e4765edb37 100644 --- a/net-dns/unbound/Manifest +++ b/net-dns/unbound/Manifest @@ -10,5 +10,5 @@ AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a7 DIST unbound-1.10.1.tar.gz 5729334 BLAKE2B 7ca4f23c12a551bc6e5d6ec32f19ca0f54526b9a4c868ced8f31cfd31dec23f8240b78f0c00d2cc6f9aa21f6c1b98697c85ef3ebd804a838a5a082893fe98094 SHA512 d07f3ac0e751c17a3ff7d99518c22529cf6856861218564a2ca073422905525cb9ddaf76c9600187946fadb7324343bcd85c34ff06bd322e0ea621a2d258bb85 DIST unbound-1.11.0.tar.gz 5900967 BLAKE2B 3119bbcd78fa19c610937215abc64abcc1ca96ba42b6753a1e36fef501f68971ac2ee0cb9bde377e0b257c57f505aeac2315a6bf031626874d30967b0a5eb46a SHA512 511e787c5f9647286b07028702a8909390e0e6eafe7224459d5f1eee8a8dfb09c71e33f291e30851dc57411123b91dfe0e124787109a7e4afdf6f3b02768e7cd EBUILD unbound-1.10.1-r1.ebuild 5424 BLAKE2B 85fe1509a5c82edf8985ce6cfa80325db99959566a7f63b9407d3c19311d420e98cfb29674538325740b485b48351a2e7621f6afdeb13c4f3152bff8c880b996 SHA512 8d65dadb63f9a70ee72e7cbadfc45a5921d4ec886540d01cab588696b0bbf7b30d502bcef1c0ae38d0e554979ca9cbe90bb7444ed00e87defb687640f9ea0546 -EBUILD unbound-1.11.0.ebuild 6005 BLAKE2B 266bfe78fc35e0a814ea702685ec7ba833aba636adff28b4586fca80f0333d48657c709c64cbb681b8a99b7e01757f2c22034ebca7124b15a0aee63e45fd5069 SHA512 f56324207be1326b41bb7aa5db37d16a32017ef60bc95ae3135811bdbd47c5e98a2e9b5105dc827be8f8ed129ba3e2227dc1e3881ad1a1a30bfedbab6475b06c +EBUILD unbound-1.11.0.ebuild 6003 BLAKE2B 5e92333ca334d085b994fd9dcfc4b9eb97c0355b130472dd434b6a892bcde8439ae33f4413f8aa5e9e6867891750e152c28892a88f9d88e5848f20ebcee459b0 SHA512 4d6061372950b54091b0fae9c1e2d8eb93b75a60a081d0f8431239457bd5311bdb78109f55e08779c50cab4a8bc0f07281f95d51b8b1dd83f4eac03b40b6e2b7 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525 diff --git a/net-dns/unbound/unbound-1.11.0.ebuild b/net-dns/unbound/unbound-1.11.0.ebuild index 6152a8247d14..e3b440c03b93 100644 --- a/net-dns/unbound/unbound-1.11.0.ebuild +++ b/net-dns/unbound/unbound-1.11.0.ebuild @@ -13,7 +13,7 @@ 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" +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 )" -- cgit v1.2.3