From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- net-dns/Manifest.gz | Bin 8715 -> 8706 bytes net-dns/bind-tools/Manifest | 8 +- net-dns/bind-tools/bind-tools-9.16.10.ebuild | 149 ----- net-dns/bind-tools/bind-tools-9.16.11.ebuild | 149 ----- net-dns/bind-tools/bind-tools-9.16.12.ebuild | 149 +++++ net-dns/bind-tools/bind-tools-9.16.8.ebuild | 149 ----- net-dns/bind/Manifest | 8 +- net-dns/bind/bind-9.16.10.ebuild | 389 ------------- net-dns/bind/bind-9.16.11.ebuild | 389 ------------- net-dns/bind/bind-9.16.12.ebuild | 390 +++++++++++++ net-dns/bind/bind-9.16.8.ebuild | 389 ------------- net-dns/pdns-recursor/Manifest | 1 - .../files/pdns-recursor-4.3.5-boost-1.73.0.patch | 47 -- net-dns/pdns/Manifest | 1 - .../pdns-4.3.0-boost-1.73-compatibility.patch | 57 -- net-dns/pdnsd/Manifest | 1 - net-dns/pdnsd/files/pdnsd.resolvconf-r1 | 631 --------------------- 17 files changed, 543 insertions(+), 2364 deletions(-) delete mode 100644 net-dns/bind-tools/bind-tools-9.16.10.ebuild delete mode 100644 net-dns/bind-tools/bind-tools-9.16.11.ebuild create mode 100644 net-dns/bind-tools/bind-tools-9.16.12.ebuild delete mode 100644 net-dns/bind-tools/bind-tools-9.16.8.ebuild delete mode 100644 net-dns/bind/bind-9.16.10.ebuild delete mode 100644 net-dns/bind/bind-9.16.11.ebuild create mode 100644 net-dns/bind/bind-9.16.12.ebuild delete mode 100644 net-dns/bind/bind-9.16.8.ebuild delete mode 100644 net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch delete mode 100644 net-dns/pdns/files/pdns-4.3.0-boost-1.73-compatibility.patch delete mode 100644 net-dns/pdnsd/files/pdnsd.resolvconf-r1 (limited to 'net-dns') diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz index c28111f3319e..10794a034971 100644 Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest index e7348d18846e..3a3469baec17 100644 --- a/net-dns/bind-tools/Manifest +++ b/net-dns/bind-tools/Manifest @@ -1,7 +1,3 @@ -DIST bind-9.16.10.tar.xz 3269696 BLAKE2B f262235164584173ac757bff6a177751e4cc19a9b68fe240f06c5bc3e0a51b9a05edc18a00342016b5546c531678894bccb7d7a353c5a0cb8b4f1cd89b50e504 SHA512 cb140fd577042ddeb7a47bc5e132d405d885bed22c9aeecb3d91a9115481ce4380ef191f78ba7acc9580ad0d4c8ed2658643007adf5b5527060879f34efdf8f7 -DIST bind-9.16.11.tar.xz 5007520 BLAKE2B 05d251ecdd2b5f6ce5fd5bdfd60c933015a5fd0a1ae0a050f2b97cf53211ea94c77e0b481d4de7dc741d37cd664a495f5293080d6f36add7dcfc24220fd1b572 SHA512 5ed632df7c74f5e6693db9b378450ea3073b8002e9924df1d0465f8b8edb933df3a853d3965a290a0477a67ca2bfa79f679d7e344db08a65462860c58d04dc1b -DIST bind-9.16.8.tar.xz 3253744 BLAKE2B 013c61d7298f334aae0165fa0ddaf4eb8fc22021b161f3a53843b4860456c133f1f33316387fcf2d7267a992844de44467eaec70c8064c77f9baef00f37fb98f SHA512 803af842b4f83c16556036f3a2a52b4aeab4781bafb35385b786a3331cf17ef6148c23928f6903fd371337ba92870d7a8548f5d178b805d160d0af34af45fee7 -EBUILD bind-tools-9.16.10.ebuild 3463 BLAKE2B 07d1e5e6668b942085d7d2c3a45ef81c6fa974a6f7e384dfb1c354b97c6b575ccf0b82c4bee3ef457b24298c74045b6ad782a8d6dc0c5dd5237b522db013c7d2 SHA512 d1a444d02b76802bfe6b6f33db0415c311f9a94cc60d6e9d1744235744711fcba7540b153784e873bc9df8b36437f775527a82ad886c281e52403e99f7bb8473 -EBUILD bind-tools-9.16.11.ebuild 3463 BLAKE2B 07d1e5e6668b942085d7d2c3a45ef81c6fa974a6f7e384dfb1c354b97c6b575ccf0b82c4bee3ef457b24298c74045b6ad782a8d6dc0c5dd5237b522db013c7d2 SHA512 d1a444d02b76802bfe6b6f33db0415c311f9a94cc60d6e9d1744235744711fcba7540b153784e873bc9df8b36437f775527a82ad886c281e52403e99f7bb8473 -EBUILD bind-tools-9.16.8.ebuild 3456 BLAKE2B 577787845f7cd50c9e13b9d61ed0635ab504f58c26ccdc04639793f9aee427369baa57e44d10fe23454f3cfa072abba1156ad2042827d1e93bbd05cebcdb50e8 SHA512 735208c923d7f2c6d751318138a0ba7f95692073cc41ebb9f875cc6c96faa6a9a37fd38b43376b8c015a3dcaa9f7d81146bb3e36ce69722282048717f48a2e10 +DIST bind-9.16.12.tar.xz 5017756 BLAKE2B e48fe94432a93df1f7f61b2d7ecb596e82a156deab3ee8dd3f5f11139028d42f839c483200ca6954076dfb68e768353a0ceb0d360d9e1dff3e36cf5ad06e8c43 SHA512 001613bd3c8bfc73d60bf3c053b233233a981132206e1ae5847820c5416ba0d65b0e026817ea3a718c7d3745c28a8de8dd9fb4355344955bead7bc2e1433e074 +EBUILD bind-tools-9.16.12.ebuild 3456 BLAKE2B 577787845f7cd50c9e13b9d61ed0635ab504f58c26ccdc04639793f9aee427369baa57e44d10fe23454f3cfa072abba1156ad2042827d1e93bbd05cebcdb50e8 SHA512 735208c923d7f2c6d751318138a0ba7f95692073cc41ebb9f875cc6c96faa6a9a37fd38b43376b8c015a3dcaa9f7d81146bb3e36ce69722282048717f48a2e10 MISC metadata.xml 533 BLAKE2B d04998d5522ccca610384cf5d46f955831d4fdd9da02266680aed6ed680bdd1bd92262fb0c31f6b0c27b15f1b987058c13260d43bb4313b23e5bd288e5f812e9 SHA512 ba16d092633db22a6f419ef4dfdacf3a1c3037dcbe764bbf525f5708f74a1d6857de5cb8fd740dc7309f085360dc3222f949476fd3e2ebb6a8dbce4fb6c08ab4 diff --git a/net-dns/bind-tools/bind-tools-9.16.10.ebuild b/net-dns/bind-tools/bind-tools-9.16.10.ebuild deleted file mode 100644 index f983773f1fac..000000000000 --- a/net-dns/bind-tools/bind-tools-9.16.10.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -MY_PN=${PN//-tools} -MY_PV=${PV/_p/-P} -MY_PV=${MY_PV/_rc/rc} -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" -HOMEPAGE="https://www.isc.org/software/bind" -SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" - -LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 - -COMMON_DEPEND=" - dev-libs/libuv:= - caps? ( sys-libs/libcap ) - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) - xml? ( dev-libs/libxml2 ) - idn? ( net-dns/libidn2:= ) - gssapi? ( virtual/krb5 ) - libedit? ( dev-libs/libedit ) - !libedit? ( - readline? ( sys-libs/readline:= ) - ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -# sphinx required for man-page and html creation -BDEPEND=" - doc? ( dev-python/sphinx ) - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -# bug 479092, requires networking -RESTRICT="test" - -src_prepare() { - default - - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" - - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die - - # bug #220361 - rm aclocal.m4 || die - rm -rf libtool.m4/ || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - --without-python - --without-libjson - --without-zlib - --without-lmdb - --without-maxminddb - --disable-geoip - --with-openssl="${EPREFIX}"/usr - $(use_with idn libidn2) - $(use_with xml libxml2) - $(use_with gssapi) - $(use_with readline) - $(use_enable caps linux-caps) - AR="$(type -P $(tc-getAR))" - ) - - # bug 607400 - if use libedit ; then - myeconfargs+=( --with-readline=-ledit ) - elif use readline ; then - myeconfargs+=( --with-readline=-lreadline ) - else - myeconfargs+=( --without-readline ) - fi - - # bug 344029 - append-cflags "-DDIG_SIGCHASE" - - # to expose CMSG_* macros from sys/sockets.h - [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" - - # localstatedir for nsupdate -l, bug 395785 - tc-export BUILD_CC - econf "${myeconfargs[@]}" - - # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h -} - -src_compile() { - local AR=$(tc-getAR) - - emake AR="${AR}" -C lib/ - emake AR="${AR}" -C bin/delv/ - emake AR="${AR}" -C bin/dig/ - emake AR="${AR}" -C bin/nsupdate/ - emake AR="${AR}" -C bin/dnssec/ - emake -C doc/man/ man $(usev doc) -} - -src_install() { - local man_dir="${S}/doc/man" - local html_dir="${man_dir}/_build/html" - - dodoc README CHANGES - - cd "${S}"/bin/delv || die - dobin delv - doman ${man_dir}/delv.1 - - cd "${S}"/bin/dig || die - dobin dig host nslookup - doman ${man_dir}/{dig,host,nslookup}.1 - - cd "${S}"/bin/nsupdate || die - dobin nsupdate - doman ${man_dir}/nsupdate.1 - if use doc; then - docinto html - dodoc ${html_dir}/nsupdate.html - fi - - cd "${S}"/bin/dnssec || die - for tool in dsfromkey importkey keyfromlabel keygen \ - revoke settime signzone verify; do - dobin dnssec-"${tool}" - doman ${man_dir}/dnssec-"${tool}".8 - if use doc; then - docinto html - dodoc ${html_dir}/dnssec-"${tool}".html - fi - done -} diff --git a/net-dns/bind-tools/bind-tools-9.16.11.ebuild b/net-dns/bind-tools/bind-tools-9.16.11.ebuild deleted file mode 100644 index f983773f1fac..000000000000 --- a/net-dns/bind-tools/bind-tools-9.16.11.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -MY_PN=${PN//-tools} -MY_PV=${PV/_p/-P} -MY_PV=${MY_PV/_rc/rc} -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" -HOMEPAGE="https://www.isc.org/software/bind" -SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" - -LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 - -COMMON_DEPEND=" - dev-libs/libuv:= - caps? ( sys-libs/libcap ) - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) - xml? ( dev-libs/libxml2 ) - idn? ( net-dns/libidn2:= ) - gssapi? ( virtual/krb5 ) - libedit? ( dev-libs/libedit ) - !libedit? ( - readline? ( sys-libs/readline:= ) - ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -# sphinx required for man-page and html creation -BDEPEND=" - doc? ( dev-python/sphinx ) - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -# bug 479092, requires networking -RESTRICT="test" - -src_prepare() { - default - - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" - - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die - - # bug #220361 - rm aclocal.m4 || die - rm -rf libtool.m4/ || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - --without-python - --without-libjson - --without-zlib - --without-lmdb - --without-maxminddb - --disable-geoip - --with-openssl="${EPREFIX}"/usr - $(use_with idn libidn2) - $(use_with xml libxml2) - $(use_with gssapi) - $(use_with readline) - $(use_enable caps linux-caps) - AR="$(type -P $(tc-getAR))" - ) - - # bug 607400 - if use libedit ; then - myeconfargs+=( --with-readline=-ledit ) - elif use readline ; then - myeconfargs+=( --with-readline=-lreadline ) - else - myeconfargs+=( --without-readline ) - fi - - # bug 344029 - append-cflags "-DDIG_SIGCHASE" - - # to expose CMSG_* macros from sys/sockets.h - [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" - - # localstatedir for nsupdate -l, bug 395785 - tc-export BUILD_CC - econf "${myeconfargs[@]}" - - # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h -} - -src_compile() { - local AR=$(tc-getAR) - - emake AR="${AR}" -C lib/ - emake AR="${AR}" -C bin/delv/ - emake AR="${AR}" -C bin/dig/ - emake AR="${AR}" -C bin/nsupdate/ - emake AR="${AR}" -C bin/dnssec/ - emake -C doc/man/ man $(usev doc) -} - -src_install() { - local man_dir="${S}/doc/man" - local html_dir="${man_dir}/_build/html" - - dodoc README CHANGES - - cd "${S}"/bin/delv || die - dobin delv - doman ${man_dir}/delv.1 - - cd "${S}"/bin/dig || die - dobin dig host nslookup - doman ${man_dir}/{dig,host,nslookup}.1 - - cd "${S}"/bin/nsupdate || die - dobin nsupdate - doman ${man_dir}/nsupdate.1 - if use doc; then - docinto html - dodoc ${html_dir}/nsupdate.html - fi - - cd "${S}"/bin/dnssec || die - for tool in dsfromkey importkey keyfromlabel keygen \ - revoke settime signzone verify; do - dobin dnssec-"${tool}" - doman ${man_dir}/dnssec-"${tool}".8 - if use doc; then - docinto html - dodoc ${html_dir}/dnssec-"${tool}".html - fi - done -} diff --git a/net-dns/bind-tools/bind-tools-9.16.12.ebuild b/net-dns/bind-tools/bind-tools-9.16.12.ebuild new file mode 100644 index 000000000000..2020b8a84d1e --- /dev/null +++ b/net-dns/bind-tools/bind-tools-9.16.12.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs + +MY_PN=${PN//-tools} +MY_PV=${PV/_p/-P} +MY_PV=${MY_PV/_rc/rc} +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" +HOMEPAGE="https://www.isc.org/software/bind" +SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +COMMON_DEPEND=" + dev-libs/libuv:= + caps? ( sys-libs/libcap ) + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + xml? ( dev-libs/libxml2 ) + idn? ( net-dns/libidn2:= ) + gssapi? ( virtual/krb5 ) + libedit? ( dev-libs/libedit ) + !libedit? ( + readline? ( sys-libs/readline:= ) + ) +" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +# sphinx required for man-page and html creation +BDEPEND=" + doc? ( dev-python/sphinx ) + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +RESTRICT="test" + +src_prepare() { + default + + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --localstatedir="${EPREFIX}"/var + --without-python + --without-libjson + --without-zlib + --without-lmdb + --without-maxminddb + --disable-geoip + --with-openssl="${EPREFIX}"/usr + $(use_with idn libidn2) + $(use_with xml libxml2) + $(use_with gssapi) + $(use_with readline) + $(use_enable caps linux-caps) + AR="$(type -P $(tc-getAR))" + ) + + # bug 607400 + if use libedit ; then + myeconfargs+=( --with-readline=-ledit ) + elif use readline ; then + myeconfargs+=( --with-readline=-lreadline ) + else + myeconfargs+=( --without-readline ) + fi + + # bug 344029 + append-cflags "-DDIG_SIGCHASE" + + # to expose CMSG_* macros from sys/sockets.h + [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" + + # localstatedir for nsupdate -l, bug 395785 + tc-export BUILD_CC + econf "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_compile() { + local AR=$(tc-getAR) + + emake AR="${AR}" -C lib/ + emake AR="${AR}" -C bin/delv/ + emake AR="${AR}" -C bin/dig/ + emake AR="${AR}" -C bin/nsupdate/ + emake AR="${AR}" -C bin/dnssec/ + emake -C doc/man/ man $(usev doc) +} + +src_install() { + local man_dir="${S}/doc/man" + local html_dir="${man_dir}/_build/html" + + dodoc README CHANGES + + cd "${S}"/bin/delv || die + dobin delv + doman ${man_dir}/delv.1 + + cd "${S}"/bin/dig || die + dobin dig host nslookup + doman ${man_dir}/{dig,host,nslookup}.1 + + cd "${S}"/bin/nsupdate || die + dobin nsupdate + doman ${man_dir}/nsupdate.1 + if use doc; then + docinto html + dodoc ${html_dir}/nsupdate.html + fi + + cd "${S}"/bin/dnssec || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + dobin dnssec-"${tool}" + doman ${man_dir}/dnssec-"${tool}".8 + if use doc; then + docinto html + dodoc ${html_dir}/dnssec-"${tool}".html + fi + done +} diff --git a/net-dns/bind-tools/bind-tools-9.16.8.ebuild b/net-dns/bind-tools/bind-tools-9.16.8.ebuild deleted file mode 100644 index 2020b8a84d1e..000000000000 --- a/net-dns/bind-tools/bind-tools-9.16.8.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -MY_PN=${PN//-tools} -MY_PV=${PV/_p/-P} -MY_PV=${MY_PV/_rc/rc} -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" -HOMEPAGE="https://www.isc.org/software/bind" -SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" - -LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 - -COMMON_DEPEND=" - dev-libs/libuv:= - caps? ( sys-libs/libcap ) - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) - xml? ( dev-libs/libxml2 ) - idn? ( net-dns/libidn2:= ) - gssapi? ( virtual/krb5 ) - libedit? ( dev-libs/libedit ) - !libedit? ( - readline? ( sys-libs/readline:= ) - ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -# sphinx required for man-page and html creation -BDEPEND=" - doc? ( dev-python/sphinx ) - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -# bug 479092, requires networking -RESTRICT="test" - -src_prepare() { - default - - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" - - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die - - # bug #220361 - rm aclocal.m4 || die - rm -rf libtool.m4/ || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - --without-python - --without-libjson - --without-zlib - --without-lmdb - --without-maxminddb - --disable-geoip - --with-openssl="${EPREFIX}"/usr - $(use_with idn libidn2) - $(use_with xml libxml2) - $(use_with gssapi) - $(use_with readline) - $(use_enable caps linux-caps) - AR="$(type -P $(tc-getAR))" - ) - - # bug 607400 - if use libedit ; then - myeconfargs+=( --with-readline=-ledit ) - elif use readline ; then - myeconfargs+=( --with-readline=-lreadline ) - else - myeconfargs+=( --without-readline ) - fi - - # bug 344029 - append-cflags "-DDIG_SIGCHASE" - - # to expose CMSG_* macros from sys/sockets.h - [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" - - # localstatedir for nsupdate -l, bug 395785 - tc-export BUILD_CC - econf "${myeconfargs[@]}" - - # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h -} - -src_compile() { - local AR=$(tc-getAR) - - emake AR="${AR}" -C lib/ - emake AR="${AR}" -C bin/delv/ - emake AR="${AR}" -C bin/dig/ - emake AR="${AR}" -C bin/nsupdate/ - emake AR="${AR}" -C bin/dnssec/ - emake -C doc/man/ man $(usev doc) -} - -src_install() { - local man_dir="${S}/doc/man" - local html_dir="${man_dir}/_build/html" - - dodoc README CHANGES - - cd "${S}"/bin/delv || die - dobin delv - doman ${man_dir}/delv.1 - - cd "${S}"/bin/dig || die - dobin dig host nslookup - doman ${man_dir}/{dig,host,nslookup}.1 - - cd "${S}"/bin/nsupdate || die - dobin nsupdate - doman ${man_dir}/nsupdate.1 - if use doc; then - docinto html - dodoc ${html_dir}/nsupdate.html - fi - - cd "${S}"/bin/dnssec || die - for tool in dsfromkey importkey keyfromlabel keygen \ - revoke settime signzone verify; do - dobin dnssec-"${tool}" - doman ${man_dir}/dnssec-"${tool}".8 - if use doc; then - docinto html - dodoc ${html_dir}/dnssec-"${tool}".html - fi - done -} diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index 4f762379caac..0439a7b87893 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -8,11 +8,7 @@ AUX named.conf-r8 4020 BLAKE2B beb900a89be0f2acc1b08a8d29443c87b098e5ac1f1de9c63 AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f5bae6c2313485808b99a1a46fc10431913d187ed67cc1e6bad019a9192638bc7fdf97c951e2326ce SHA512 68fa7c8963ac59349de3d05972c07aa0123b7bebbe0ba9604463ccfd1b377c2babe01eed4745cbe0f7d3831d1b47c2fa620f8092c67465fb771cae4932b0861a AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4 -DIST bind-9.16.10.tar.xz 3269696 BLAKE2B f262235164584173ac757bff6a177751e4cc19a9b68fe240f06c5bc3e0a51b9a05edc18a00342016b5546c531678894bccb7d7a353c5a0cb8b4f1cd89b50e504 SHA512 cb140fd577042ddeb7a47bc5e132d405d885bed22c9aeecb3d91a9115481ce4380ef191f78ba7acc9580ad0d4c8ed2658643007adf5b5527060879f34efdf8f7 -DIST bind-9.16.11.tar.xz 5007520 BLAKE2B 05d251ecdd2b5f6ce5fd5bdfd60c933015a5fd0a1ae0a050f2b97cf53211ea94c77e0b481d4de7dc741d37cd664a495f5293080d6f36add7dcfc24220fd1b572 SHA512 5ed632df7c74f5e6693db9b378450ea3073b8002e9924df1d0465f8b8edb933df3a853d3965a290a0477a67ca2bfa79f679d7e344db08a65462860c58d04dc1b -DIST bind-9.16.8.tar.xz 3253744 BLAKE2B 013c61d7298f334aae0165fa0ddaf4eb8fc22021b161f3a53843b4860456c133f1f33316387fcf2d7267a992844de44467eaec70c8064c77f9baef00f37fb98f SHA512 803af842b4f83c16556036f3a2a52b4aeab4781bafb35385b786a3331cf17ef6148c23928f6903fd371337ba92870d7a8548f5d178b805d160d0af34af45fee7 +DIST bind-9.16.12.tar.xz 5017756 BLAKE2B e48fe94432a93df1f7f61b2d7ecb596e82a156deab3ee8dd3f5f11139028d42f839c483200ca6954076dfb68e768353a0ceb0d360d9e1dff3e36cf5ad06e8c43 SHA512 001613bd3c8bfc73d60bf3c053b233233a981132206e1ae5847820c5416ba0d65b0e026817ea3a718c7d3745c28a8de8dd9fb4355344955bead7bc2e1433e074 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac -EBUILD bind-9.16.10.ebuild 11341 BLAKE2B 353c675908bc46b84ce9696220e97f0d348a5e321a739cfa66ea900403176ae0905a7e48b79d4edac6db696fc967605aadff1916a634a7262897e20e985099a6 SHA512 fea9d1292a7842cefda9c1653bed9ed65dd623467ec55bc9adfd696000443135e929311adcd63a06cea78d91e05ac6d312f058f38cead58dc194f504ef9e6d74 -EBUILD bind-9.16.11.ebuild 11341 BLAKE2B 353c675908bc46b84ce9696220e97f0d348a5e321a739cfa66ea900403176ae0905a7e48b79d4edac6db696fc967605aadff1916a634a7262897e20e985099a6 SHA512 fea9d1292a7842cefda9c1653bed9ed65dd623467ec55bc9adfd696000443135e929311adcd63a06cea78d91e05ac6d312f058f38cead58dc194f504ef9e6d74 -EBUILD bind-9.16.8.ebuild 11304 BLAKE2B b2a637637793942fd54256b607eb84ba3d7f238bf2744b400f7f1c503515d61b4e0d1605db4c829b86ea9efb2c9a874ae413c53158291b28937051b13a7635d1 SHA512 3a0a8b9caf2daa976e6c7a4d76304fd2edc9ddf705e767587623d5597dde8ac59a120c25a7b59a263f0e266d067449da6bac30d3fd18e9a61399483bd79f4b98 +EBUILD bind-9.16.12.ebuild 11361 BLAKE2B 28ceffbe13e3e8b1ae72b45b3202f5d4e9a63edb7334fd9d577d49c3642f1e521b7bc8dabdf229c87313063c6b0f4e7578f903d748df2fad1e247507ca237dc7 SHA512 9b5dd53fa798e14e2ddeef10cfc8bfcda32acfb93466addafbe28aed651624dfa9fdae0f41864d728f021f055e9efc6d48741cc48f149142f5aef39afc949d22 MISC metadata.xml 1043 BLAKE2B 3bf699db16f6883700e32e5f0debc534fa2d763aca0cf8fe3878dedcbb110410d88c2dbb69b4d4df09df62943416de3aaed7d53a2371d004b8c19a2a5a609bc1 SHA512 137093eabcbda1feb7cdac0cb0b2eeb808a47062b4e8d114874ee4019847ecbf5996c7b19055981a5ebffd099b5a96ce6ada919719017d83f93bc679334845b9 diff --git a/net-dns/bind/bind-9.16.10.ebuild b/net-dns/bind/bind-9.16.10.ebuild deleted file mode 100644 index 4de4141f7803..000000000000 --- a/net-dns/bind/bind-9.16.10.ebuild +++ /dev/null @@ -1,389 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Re dlz/mysql and threads, needs to be verified.. -# MySQL uses thread local storage in its C api. Thus MySQL -# requires that each thread of an application execute a MySQL -# thread initialization to setup the thread local storage. -# This is impossible to do safely while staying within the DLZ -# driver API. This is a limitation caused by MySQL, and not the DLZ API. -# Because of this BIND MUST only run with a single thread when -# using the MySQL driver. - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit python-r1 autotools toolchain-funcs flag-o-matic db-use systemd tmpfiles - -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 - -# Upstream dropped the old geoip library, but the BIND configuration for using -# GeoIP remained the same. -REQUIRED_USE=" - 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/libmaxminddb ) - 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=( - "${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) - "${@}" - ) - # This is for users to start to migrate back to USE=geoip, rather than - # USE=geoip2 - if use geoip ; then - myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip ) - elif use geoip2 ; then - # Added 2020/09/30 - # Remove USE=geoip2 support after 2020/03/01 - ewarn "USE=geoip2 is deprecated; update your USE flags!" - myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip ) - else - myeconfargs+=( --without-maxminddb --disable-geoip ) - fi - - # 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 - dotmpfiles "${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() { - tmpfiles_process "${FILESDIR}"/named.conf - - if [ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]; 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.11.ebuild b/net-dns/bind/bind-9.16.11.ebuild deleted file mode 100644 index 4de4141f7803..000000000000 --- a/net-dns/bind/bind-9.16.11.ebuild +++ /dev/null @@ -1,389 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Re dlz/mysql and threads, needs to be verified.. -# MySQL uses thread local storage in its C api. Thus MySQL -# requires that each thread of an application execute a MySQL -# thread initialization to setup the thread local storage. -# This is impossible to do safely while staying within the DLZ -# driver API. This is a limitation caused by MySQL, and not the DLZ API. -# Because of this BIND MUST only run with a single thread when -# using the MySQL driver. - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit python-r1 autotools toolchain-funcs flag-o-matic db-use systemd tmpfiles - -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 - -# Upstream dropped the old geoip library, but the BIND configuration for using -# GeoIP remained the same. -REQUIRED_USE=" - 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/libmaxminddb ) - 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=( - "${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) - "${@}" - ) - # This is for users to start to migrate back to USE=geoip, rather than - # USE=geoip2 - if use geoip ; then - myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip ) - elif use geoip2 ; then - # Added 2020/09/30 - # Remove USE=geoip2 support after 2020/03/01 - ewarn "USE=geoip2 is deprecated; update your USE flags!" - myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip ) - else - myeconfargs+=( --without-maxminddb --disable-geoip ) - fi - - # 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 - dotmpfiles "${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() { - tmpfiles_process "${FILESDIR}"/named.conf - - if [ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]; 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.12.ebuild b/net-dns/bind/bind-9.16.12.ebuild new file mode 100644 index 000000000000..01ba68b8dcbb --- /dev/null +++ b/net-dns/bind/bind-9.16.12.ebuild @@ -0,0 +1,390 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Re dlz/mysql and threads, needs to be verified.. +# MySQL uses thread local storage in its C api. Thus MySQL +# requires that each thread of an application execute a MySQL +# thread initialization to setup the thread local storage. +# This is impossible to do safely while staying within the DLZ +# driver API. This is a limitation caused by MySQL, and not the DLZ API. +# Because of this BIND MUST only run with a single thread when +# using the MySQL driver. + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit python-r1 autotools toolchain-funcs flag-o-matic db-use systemd tmpfiles + +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 + +# Upstream dropped the old geoip library, but the BIND configuration for using +# GeoIP remained the same. +REQUIRED_USE=" + postgres? ( dlz ) + berkdb? ( dlz ) + mysql? ( dlz ) + odbc? ( dlz ) + ldap? ( dlz ) + dnsrps? ( dlz ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +DEPEND=" + acct-group/named + acct-user/named + berkdb? ( sys-libs/db:= ) + !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/libmaxminddb ) + 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=( + "${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) + "${@}" + ) + # This is for users to start to migrate back to USE=geoip, rather than + # USE=geoip2 + if use geoip ; then + myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip ) + elif use geoip2 ; then + # Added 2020/09/30 + # Remove USE=geoip2 support after 2020/03/01 + ewarn "USE=geoip2 is deprecated; update your USE flags!" + myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip ) + else + myeconfargs+=( --without-maxminddb --disable-geoip ) + fi + + # 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 + dotmpfiles "${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() { + tmpfiles_process "${FILESDIR}"/named.conf + + if [ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]; 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.8.ebuild b/net-dns/bind/bind-9.16.8.ebuild deleted file mode 100644 index e64dd219e6c9..000000000000 --- a/net-dns/bind/bind-9.16.8.ebuild +++ /dev/null @@ -1,389 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Re dlz/mysql and threads, needs to be verified.. -# MySQL uses thread local storage in its C api. Thus MySQL -# requires that each thread of an application execute a MySQL -# thread initialization to setup the thread local storage. -# This is impossible to do safely while staying within the DLZ -# driver API. This is a limitation caused by MySQL, and not the DLZ API. -# Because of this BIND MUST only run with a single thread when -# using the MySQL driver. - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit python-r1 autotools toolchain-funcs flag-o-matic db-use systemd tmpfiles - -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 - -# Upstream dropped the old geoip library, but the BIND configuration for using -# GeoIP remained the same. -REQUIRED_USE=" - 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/libmaxminddb ) - 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=( - "${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) - "${@}" - ) - # This is for users to start to migrate back to USE=geoip, rather than - # USE=geoip2 - if use geoip ; then - myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip ) - elif use geoip2 ; then - # Added 2020/09/30 - # Remove USE=geoip2 support after 2020/03/01 - ewarn "USE=geoip2 is deprecated; update your USE flags!" - myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip ) - else - myeconfargs+=( --without-maxminddb --disable-geoip ) - fi - - # 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 - dotmpfiles "${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() { - tmpfiles_process "${FILESDIR}"/named.conf - - 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/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest index 902a6a6a893e..4c58acf81e96 100644 --- a/net-dns/pdns-recursor/Manifest +++ b/net-dns/pdns-recursor/Manifest @@ -1,4 +1,3 @@ -AUX pdns-recursor-4.3.5-boost-1.73.0.patch 2071 BLAKE2B fdf1477fe0af5d943223c589aba3b4469b52b353542fb167ceb352248ff88871b2e329b087c4d7c3abebcdf9b8a0084fe5516a086927454166c4ac4beca2d296 SHA512 22871d24190699d7b3e79b04d235af2b44b4bca24d3a26630966650aee2b6c399fe3c6a73d0125fe3430248aea13f5b8057b127251686307c7f0c735a8034d41 AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c DIST pdns-recursor-4.4.2.tar.bz2 1396763 BLAKE2B f8dad7694ac13ed8d824ddaf613d1a001452ab2c08fcbb0e00d2b2258464b754809746b89998b818c44866f9e4b22c87c1cebf2da852fb7b6247ac6b9fd4b99d SHA512 31fdf62d87e5ee8f9570c6b738339bc8cc65c43800f18c7fb49aa5c53fc9ad76a1ddf02cc44f7129e06b41700b5cb3768ff8f81cc521c28147ea6538c73f8781 EBUILD pdns-recursor-4.4.2-r100.ebuild 2002 BLAKE2B 9edb0aa92f545c91b1eadf5426ad3652e522b0b7e35a9ae5ea22c4632fa5907a475b873c6caa99b9beede497b298709c5fbebc4c5c6e68841c140ed719729497 SHA512 f9bb8eba62146a30e0bb8b2abdddfcfac9cc4766f3009686f56fc978dd625cda49ea4d5b1e294a1a20b82ceb4d64ee68542aea2daa98305c2c4328700f0d1f72 diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch deleted file mode 100644 index 40a6ae565847..000000000000 --- a/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 71246536642590e8e8b21c11307ec4bd0e165066 Mon Sep 17 00:00:00 2001 -From: Remi Gacogne -Date: Tue, 28 Apr 2020 17:51:47 +0200 -Subject: [PATCH] Replace boost's placeholders with the ones from the std - namespace - -Boost 1.73 moved boost::bind placeholders to the placeholders -namespace which did not exist before 1.60, let's switch to -std::bind and std::placeholders instead of doing per-version handling. ---- - pdns/ixfrdist-web.cc | 2 +- - pdns/webserver.cc | 6 +++--- - pdns/ws-auth.cc | 4 ++-- - pdns/ws-recursor.cc | 12 ++++++------ - 4 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/webserver.cc b/webserver.cc -index eafd3059a0..b47cc6d7e0 100644 ---- a/webserver.cc -+++ b/webserver.cc -@@ -107,7 +107,7 @@ static void bareHandlerWrapper(WebServer::HandlerFunction handler, YaHTTP::Reque - - void WebServer::registerBareHandler(const string& url, HandlerFunction handler) - { -- YaHTTP::THandlerFunction f = boost::bind(&bareHandlerWrapper, handler, _1, _2); -+ YaHTTP::THandlerFunction f = std::bind(&bareHandlerWrapper, handler, std::placeholders::_1, std::placeholders::_2); - YaHTTP::Router::Any(url, f); - } - -@@ -179,7 +179,7 @@ void WebServer::apiWrapper(WebServer::HandlerFunction handler, HttpRequest* req, - } - - void WebServer::registerApiHandler(const string& url, HandlerFunction handler, bool allowPassword) { -- HandlerFunction f = boost::bind(&WebServer::apiWrapper, this, handler, _1, _2, allowPassword); -+ HandlerFunction f = std::bind(&WebServer::apiWrapper, this, handler, std::placeholders::_1, std::placeholders::_2, allowPassword); - registerBareHandler(url, f); - } - -@@ -196,7 +196,7 @@ void WebServer::webWrapper(WebServer::HandlerFunction handler, HttpRequest* req, - } - - void WebServer::registerWebHandler(const string& url, HandlerFunction handler) { -- HandlerFunction f = boost::bind(&WebServer::webWrapper, this, handler, _1, _2); -+ HandlerFunction f = std::bind(&WebServer::webWrapper, this, handler, std::placeholders::_1, std::placeholders::_2); - registerBareHandler(url, f); - } - diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest index 8b74798dc77a..7c3dd22442b1 100644 --- a/net-dns/pdns/Manifest +++ b/net-dns/pdns/Manifest @@ -1,5 +1,4 @@ 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 2535 BLAKE2B 4e718bbba73b20a86dd11acc07ce91d259d82a3fc3e6133cac0d7fb2b24d2b5ff3e3596d00c4289017845c7a1751d0a43e83ba67e4b8e55e10aca892ba3d3aea SHA512 5ebc7cd236195543e67db5ed2c831ff6a1b9bdba5a72c179df72f84e4ade2dfc962a988ab02a7b893c62a7c3d8df7a15e2de3ae02413ff296a6404a7937eb8de DIST pdns-4.4.0.tar.bz2 1270854 BLAKE2B 2c855197d0b5f8fc141e4fa19268e68b9114353c7f89157023b9cd6b9559e788b55a9b0eeebea55d4ba0a206229d9c032f0c84c40ffd91c7277eb611a4bc966a SHA512 e7f35539915ee7945b537cfedae72e2b83c86b39c5e44a9268b8a086f44b30a33a64e0b65aad140ba02c349cedaa12820226578dea87c9b666dc75f8bd15c1f6 DIST pdns-4.4.1.tar.bz2 1276990 BLAKE2B 9771cf3273ab7e8ab4607a91563bfe0dc3f4532b5420861d816eacd2798d66de3a1eb824c191264f9106ec47bd6003d99108b8df678190055948779b9b3b070f SHA512 a6f31972f77ded8ecfb523e8810dd90e5b7aa628746fee2a9a0daae2a7935800f111ce8617ffd71d5ce3881947d4ffc36c9cb37996a7bcc514536bb4abe1f79e diff --git a/net-dns/pdns/files/pdns-4.3.0-boost-1.73-compatibility.patch b/net-dns/pdns/files/pdns-4.3.0-boost-1.73-compatibility.patch deleted file mode 100644 index 5975b09f0991..000000000000 --- a/net-dns/pdns/files/pdns-4.3.0-boost-1.73-compatibility.patch +++ /dev/null @@ -1,57 +0,0 @@ -Fix compatibility with boost-1.73+ - -Backport of https://github.com/PowerDNS/pdns/commit/71246536642590e8e8b21c11307ec4bd0e165066 - ---- a/pdns/ixfrdist-web.cc -+++ b/pdns/ixfrdist-web.cc -@@ -32,7 +32,7 @@ IXFRDistWebServer::IXFRDistWebServer(const ComboAddress &listenAddress, const Ne - { - d_ws->setACL(acl); - d_ws->setLogLevel(loglevel); -- d_ws->registerWebHandler("/metrics", boost::bind(&IXFRDistWebServer::getMetrics, this, _1, _2)); -+ d_ws->registerWebHandler("/metrics", std::bind(&IXFRDistWebServer::getMetrics, this, std::placeholders::_1, std::placeholders::_2)); - d_ws->bind(); - } - ---- a/pdns/webserver.cc -+++ b/pdns/webserver.cc -@@ -107,7 +107,7 @@ static void bareHandlerWrapper(WebServer::HandlerFunction handler, YaHTTP::Reque - - void WebServer::registerBareHandler(const string& url, HandlerFunction handler) - { -- YaHTTP::THandlerFunction f = boost::bind(&bareHandlerWrapper, handler, _1, _2); -+ YaHTTP::THandlerFunction f = std::bind(&bareHandlerWrapper, handler, std::placeholders::_1, std::placeholders::_2); - YaHTTP::Router::Any(url, f); - } - -@@ -179,7 +179,7 @@ void WebServer::apiWrapper(WebServer::HandlerFunction handler, HttpRequest* req, - } - - void WebServer::registerApiHandler(const string& url, HandlerFunction handler, bool allowPassword) { -- HandlerFunction f = boost::bind(&WebServer::apiWrapper, this, handler, _1, _2, allowPassword); -+ HandlerFunction f = std::bind(&WebServer::apiWrapper, this, handler, std::placeholders::_1, std::placeholders::_2, allowPassword); - registerBareHandler(url, f); - } - -@@ -196,7 +196,7 @@ void WebServer::webWrapper(WebServer::HandlerFunction handler, HttpRequest* req, - } - - void WebServer::registerWebHandler(const string& url, HandlerFunction handler) { -- HandlerFunction f = boost::bind(&WebServer::webWrapper, this, handler, _1, _2); -+ HandlerFunction f = std::bind(&WebServer::webWrapper, this, handler, std::placeholders::_1, std::placeholders::_2); - registerBareHandler(url, f); - } - ---- a/pdns/ws-auth.cc -+++ b/pdns/ws-auth.cc -@@ -2328,8 +2328,8 @@ void AuthWebServer::webThread() - d_ws->registerApiHandler("/api", &apiDiscovery); - } - if (::arg().mustDo("webserver")) { -- d_ws->registerWebHandler("/style.css", boost::bind(&AuthWebServer::cssfunction, this, _1, _2)); -- d_ws->registerWebHandler("/", boost::bind(&AuthWebServer::indexfunction, this, _1, _2)); -+ d_ws->registerWebHandler("/style.css", std::bind(&AuthWebServer::cssfunction, this, std::placeholders::_1, std::placeholders::_2)); -+ d_ws->registerWebHandler("/", std::bind(&AuthWebServer::indexfunction, this, std::placeholders::_1, std::placeholders::_2)); - } - d_ws->go(); - } diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest index 7388be544cbc..f2d535c85e05 100644 --- a/net-dns/pdnsd/Manifest +++ b/net-dns/pdnsd/Manifest @@ -3,7 +3,6 @@ AUX pdnsd.conf.test 370 BLAKE2B f48396e0f78954a6c0c21df19776b1bb8f221b5325612413 AUX pdnsd.confd 232 BLAKE2B 227f6f6aff676221021619bf3bb3052f8c8c3729eedc3f58e1e56cd69cff014276564e47ac293108576c163159571623ac701657ef844c537d7263f46bf9f72b SHA512 e50abe37c914d070b44c8aa63d57924840ba07c5668a0760dfc89e05a25176e76d96e9c7acfef5010750fa2cee38f01dfddc60b3a526f87763ab130caf7b5d8c AUX pdnsd.online.2 568 BLAKE2B 05c51f8769c6d32ada77f8a0f1784680ff6a3156d46e478442d90b5b240a568ef0ff65a52cfe261fb4de6fd76f5c41bb54e535dd690de3026861b0c7e2a28d84 SHA512 15d0be2ec2c6e9c9b598bc63a30d72e77ea7b80a14547f0a1c7af1680afabc4fe56eb4ff8ad8470642ed1b441acff11d6b4f01f14e9486d1502f9b841beab99d AUX pdnsd.rc8 573 BLAKE2B 9ba317e4c8df4c351452cb2de554c38b341e3ddf621d40c1486baec2312cc300091590a0afe6bd0e279f7371d003a3e95a6fd413eca7601245a22c3c3d705856 SHA512 be012cc164301bada209dfa26087eac85735fae2dd82d76e3f1154ba21df122be2be05bc029e9219c69514de4835495aed51dcbb99e19daf3fec75110b5d941c -AUX pdnsd.resolvconf-r1 17538 BLAKE2B 0797bf3800e5ca1bf3d4c55cbd0862bb8a6964b5b1c4554fa9e500368909a8fb2d309a561d5b097ac828f1e1dd5601df3a7a112ae9dd4132fdae2731a3cd3096 SHA512 22a92df825d560ec03860c1a9a6000f32e19b33ccda0f6412830ebca13499e6d45161267bb30658aa9ed4b5862bae04e304e25358c30ee6d80a9deea90ba989f AUX pdnsd.service 269 BLAKE2B b14978db01ec729a6e04d4849a468fd45999c1fbd7d21e986b2034edb81f645df7f5ce8924d72e11b04a548c6957964c936442f1d57c5fa9a327667b331ce4f4 SHA512 c1504f52fb30ba197bd3c3450f200f2f274bf73f7a6436bc317ad9affc18e9c5edcb8555913a4aa9c6bf44b935e0c9cd005b4f5b0fd56eed6e11914f63db9ef2 AUX pdnsd.tmpfiles 37 BLAKE2B c4da53c3d0ebea88e456e6ea07b2505ed187e074286bb40fabde6a27c4cc017dabea3207e8fde80aa3fe38957b12ce8e09c809b369f06356c1737ae0825cdbff SHA512 7beacc66e8504ca0f8e613dfc8ed2479362f1ebc98ffab902622b36c795fe75e176d9f0a330ad74e10a7f7b1597cce068d94eea6511a75b941e42b2458b76df5 DIST pdnsd-1.2.9a-par.tar.gz 516061 BLAKE2B 33f2fa85f4b2fa3b709e612c12c8a6edff67f3d2203a8ccd9e838f72b8ab2664eb2e88c0957c08c64568581d9eeb4bede9157ba0928fa6d28ccca279f71fbd1a SHA512 4fde296642306aa986ddb7cad0b5991bcd397656d93ef4962706276848c7fa62c664a40198e807d029637f116e8000c237d98b91cbbfec5c08b134d8bb3adf81 diff --git a/net-dns/pdnsd/files/pdnsd.resolvconf-r1 b/net-dns/pdnsd/files/pdnsd.resolvconf-r1 deleted file mode 100644 index edc1c9994f0a..000000000000 --- a/net-dns/pdnsd/files/pdnsd.resolvconf-r1 +++ /dev/null @@ -1,631 +0,0 @@ -#!/bin/bash -# Copyright 2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# /etc/pdnsd/pdnsd.conf updater -# Written by Oldrich Jedlicka (oldium.pro@seznam.cz) - -# Implementation notes: -# * The assumptions are same as for other scripts like bind and dnsmasq: -# - We assume that we are a local dns cache - after all, why would a server -# use resolvconf? -# - Now that we have assumed this, we also assume that generic DHCP clients -# will enter their domains and search domains ONLY in the "search" field -# in their resolv.confs and VPN clients will put the domain they are for -# into the domain field only. -# - This allows pdnsd to forward domains for a specific VPN domain to the -# VPN nameserver and everything else to the standard name servers. -# -# HOW-TO CONFIGURE: -# -# To get this working, you need to do only two steps -# -# 1. Create a basic configuration of /etc/pdnsd/pdnsd.conf, you can use -# /etc/pdnsd/pdnsd.conf.example to start. -# -# Additional configuration will be created automatically be resolvconf. -# The generated server sections has labels starting with "resolvconf", so -# -# DO NOT USE "resolvconf" IN YOUR LABELS! -# -# Check if the status_ctl is set to "on", otherwise the configuration -# will not be automatically reloaded - see sample config file. -# -# You are free to edit automatically created server sections, but always -# write one option per line. There are few options that are always recreated -# and your changes in them will be lost. Here is the list (with example -# values): -# -# preset=on; -# ip="192.168.0.1","192.168.0.2"; -# include=".net",".com";' -# -# The exclude directive in "resolvconf" server section is partly recreated. -# Known (configured) domains in the form "." or ".." are -# added and removed automatically, unknown domains (also those not in -# the format above) found in this directive are kept. -# -# The sample configuration file /etc/pdnsd/pdnsd.conf prepared to work -# with resolvconf would look like this: -# -#global { -# perm_cache=2048; -# run_as="pdnsd"; -# status_ctl = on; # Important to enable status control -# run_ipv4=on; -# par_queries=2; # How many servers are probed in parallel -# interface = "lo"; # Interface on which the pdnsd listens -#} -# -# 2. The last step is to configure dns configuration for /etc/resolv.conf -# for the lo interface. In Gentoo we set it up like so in /etc/conf.d/net -# -# dns_servers_lo=( "127.0.0.1" ) - -# pdnsd config file -PDNSDCONFIG="/etc/pdnsd/pdnsd.conf" - -# Backup suffix -BACKUPSUFFIX=".backup" - -# Load our variables from resolvconf -VARS="$(resolvconf -v)" -eval "${VARS}" - -COMMENT=' -# Automatically generated by resolvconf. -# -# Following server sections are automatically enabled and disabled. -# -# !!! WARNING !!! -# DO NOT RENAME LABELS! -# -# No section will be deleted and only some options are automatically changed. -# Feel free to add your own options, but do not use pair comments /* */ as they -# are not recognised. -# -# DO NOT USE resolvconf ANYWHERE IN YOUR LABELS! -# -# Automatically changed options are (with examples): -# preset=on; -# ip="192.168.0.1","192.168.0.2"; -# include=".net",".com"; -# exclude=".domain.net",".domain.com"; -# policy=excluded; -# -# The exclude directive is changed automatically only in "resolvconf" server -# section. Not handled servers are kept in the directive. -#' -BASIC_SETTINGS='server { - label="resolvconf"; - preset=off; -}' - -INSTALLATION_CHECK='^[[:space:]]*label[[:space:]]*=[[:space:]]*"resolvconf"' - -### -# Sed script configuration -# -# Composed sequence of lines: -# -# (1) SED_LOOP with @MATCH_LABELS@ substituted by several SED_MATCH_ONE_LABEL -# (2) SED_EDIT_ONE_SERVER several times -# (3) SED_ADDING with new servers -# -# Notes: -# -# * @LABEL@ is a string "resolvconf-" or "resolvconf" for global -# section -# * @RULE@ is @LABEL@ with translated characters '-' and '.' into '_'. -### - -### -# Main loop with label match - it will redirect the processing to -# SED_EDIT_ONE_SERVER, when the label match is found. Special match is -# for "resolvconf" label - the control flow is redirected to SED_ADDING to -# allow adding new sections. -# -# To summarize: Old sections are edited as they appear in the file and new -# sections are added before the "resolvconf" section. -SED_LOOP=\ -'/^[[:space:]]*server[[:space:]]*[\{]/ b server; -p; d; -:server; h; -:server_loop; n; -/^[[:space:]]*server[[:space:]]*[\{]/ { x; p; b server_loop; }; -@MATCH_LABELS@ -/^[[:space:]]*label[[:space:]]*=[[:space:]]*"resolvconf"/ { H; b adding; }; -/^[[:space:]]*[\}]/ { H; x; p; d; }; -H; -b server_loop; -' - -### -# Match for one label with a jump to SED_EDIT_ONE_SERVER -SED_MATCH_ONE_LABEL=\ -'/^[[:space:]]*label[[:space:]]*=[[:space:]]*"@LABEL@"/ { H; x; b main_@RULE@; }; -' - -### -# Editing one server. New lines are put into @SETUP@, lines are composed -# in function compose_lines(). After the new lines are added, all "preset", -# "ip" and "include" options are removed (not printed). -# -# Sanity checks: Check if there is a second label or another server directive. -# In both cases, there is some error in the file, so go to the beginning by -# jumping to SED_LOOP's :server. -SED_EDIT_ONE_SERVER=\ -':main_@RULE@; -p; @SETUP@ -:loop_@RULE@; -n; -/^[[:space:]]*server[[:space:]]*[\{]/ b server; -/^[[:space:]]*label[[:space:]]*=/ b server; -/^[[:space:]]*preset[[:space:]]*=/ b loop_@RULE@; -/^[[:space:]]*ip[[:space:]]*=/ b loop_@RULE@; -/^[[:space:]]*include[[:space:]]*=/ b loop_@RULE@; -/^[[:space:]]*policy[[:space:]]*=/ b loop_@RULE@; -/^[[:space:]]*exclude[[:space:]]*=/ b exclude_logic_@RULE; -p; -/^[[:space:]]*[\}]/ d; -b loop_@RULE@; - -:exclude_logic_@RULE; -@EXCLUDE_LOGIC@ -b loop_@RULE@; -' - -### -# Add new servers. All lines composed by function compose_lines() are put into -# @SETUP@. Then the control flow is returned to one special SED_EDIT_ONE_SERVER -# section with label "resolvconf". -SED_ADDING=\ -':adding; -@SETUP@ -x; b main_resolvconf; -' - - -### -# Edit the domain list (include/exclude). All empty fields and matching domains -# are removed. Unmaintained domains (not in resolvconf-) are kept. All -# domains should be in a pipe (|) separated list and should begin, but not end -# with a dot. The list is put into @DOMAINS@. The control flow continues, where -# it ended in SED_EDIT_ONE_SERVER. -# -SED_DOMAIN_LIST_LOGIC=\ -'h; -s/^([[:space:]]*@DIRECTIVE@[[:space:]]*=[[:space:]]*).*/\\1/; -x; -s/^[[:space:]]*@DIRECTIVE@[[:space:]]*=[[:space:]]*//; - -:@DIRECTIVE@_loop_@RULE@; -/([[:space:]]*("[^"]"*|[^,;]*)[[:space:]]*,)*[[:space:]]*("(@DOMAINS@|)\.?"|(@DOMAINS@)\.?|,)[[:space:]]*[,;]/ { - s/(([[:space:]]*("[^"]"*|[^,;]*)[[:space:]]*,)*[[:space:]]*)("(@DOMAINS@|)\.?"|(@DOMAINS@)\.?|,)[[:space:]]*([,;])/\\1\\7/; - b @DIRECTIVE@_loop_@RULE@; -}; - -s/^[,;]//g; -/^[[:space:]]*$/ b @DIRECTIVE@_end_@RULE@; -H; x; s/\\n//; p; -:@DIRECTIVE@_end_@RULE@; -' - -################################################################################ -# Functions - -### -# char* [] uniqify(char* list[]) -# -# Uniqify the items in the list -uniqify() { - local result= - while [ -n "$1" ] ; do - case " ${result} " in - *" $1 "*) ;; - *) result="${result} $1" ;; - esac - shift - done - echo "${result# *}" -} - -### -# char *make_pdnsd_label(char *domain) -# -# Translate domain name into pdnsd's label -make_pdnsd_label() { - local domain=$1 - if [[ -n ${domain} ]] ; then - echo -n "resolvconf-${domain}" - else - echo -n "resolvconf" - fi -} - -### -# char *make_sed_label(char *pdnsd_label) -# -# Translate pdnsd's label into sed's label -make_sed_label() { - local label="$1" - label="${label//-/_}" - label="${label//./_}" - echo -n "${label}" -} - -# char *compose_lines(...) -# -# Compose a sed command that prints lines -compose_lines() { - local line result - for line in "$@" ; do - result="${result}i\\\\\\n${line// /\\t}\\n" - done - echo "${result}" -} - -### -# char *build_settings(char *nameservers, char *domains, char *directive) -# -# Builds configuration part @SETUP@ of sed script. The directive parameter denotes -# if the domains are to be included ("include") or excluded ("exclude"). This -# involves options like -# -# (1) # [nameserver list is empty] -# preset=off; -# -# (2) # [domain list is empty] -# preset=on; -# ip="address","address"...; -# -# (3) # [directive=="include"] -# preset=on; -# ip="address","address"...; -# include=".domain.",".domain."...; -# policy=excluded; -# -# (4) # [directive=="exclude"] -# preset=on; -# ip="address","address"...; -# exclude=".domain.",".domain."...; -# policy=included; -# -# Note: Currently there will always be only one domain in "include" directive. -# -build_settings() { - local ns="$1" domains="$2" directive="$3" - if [[ -n ${ns} ]] ; then - local x list_ns list_domains - for x in ${ns} ; do - list_ns="${list_ns},\"${x}\"" - done - list_ns="${list_ns#,}" - if [[ -n ${domains} ]] ; then - for x in ${domains} ; do - list_domains="${list_domains},\".${x}.\"" - done - list_domains="${list_domains#,}" - if [[ $directive == "include" ]]; then - compose_lines \ - " preset=on;" \ - " ip=${list_ns};" \ - " include=${list_domains};" \ - " policy=excluded;" - else - compose_lines \ - " preset=on;" \ - " ip=${list_ns};" \ - " exclude=${list_domains};" \ - " policy=included;" - fi - else - compose_lines \ - " preset=on;" \ - " ip=${list_ns};" - fi - else - compose_lines \ - " preset=off;" - fi -} - -### -# char *build_match_labels(char *domains...) -# -# Build the label match part of the sed script -# -build_match_labels() { - local domain result label destination new_match - for domain in "$@" ; do - label="$(make_pdnsd_label "${domain}")" - rule="$(make_sed_label "${label}")" - new_match="${SED_MATCH_ONE_LABEL//@LABEL@/${label}}" - new_match="${new_match//@RULE@/${rule}}" - result="${result}${new_match}" - done - echo "${result}" -} - -### -# char *build_domain_list_logic(char *domains, char *directive) -# -# Build a logic for changing (removing) domains from a directive. -# -build_domain_list_logic() { - local domains="$1" directive="$2" - local x domain_list logic - - # Domains should be pipe separated list - for x in ${domains}; do - x=".${x%.}" - x="${x//./\.}" - domain_list="${domain_list}|${x}" - done - domain_list="${domain_list#|}" - - if [[ -z ${domain_list} ]]; then - logic="p;" - else - logic="${SED_DOMAIN_LIST_LOGIC//@DOMAINS@/${domain_list}}" - logic="${logic//@DIRECTIVE@/${directive}}" - fi - echo "${logic}" -} - -### -# char *build_edit_part(char *domain, char *nameservers, \ -# char *add_domains, char *remove_domains, -# char *directive) -# -# Build edit part of the sed script for a particular domain. Domain can be -# empty in the case it is the "resolvconf" server part. -# -build_edit_part() { - local domain="$1" nameservers="$2" add_domains="$3" remove_domains="$4" - local directive="$5" - local setup label rule logic result - - setup="$(build_settings "${nameservers}" "${add_domains}" "${directive}")" - label="$(make_pdnsd_label "${domain}")" - rule="$(make_sed_label "${label}")" - logic="$(build_domain_list_logic "${remove_domains}" "${directive}")" - result="${SED_EDIT_ONE_SERVER//@SETUP@/${setup}}" - result="${result//@EXCLUDE_LOGIC@/${logic}}" - result="${result//@RULE@/${rule}}" - echo "${result}" -} - -### -# char *get_domain_nameservers(char *domain, char *domain_config...) -# -# Get the list of nameservers belonging to one particular domain. -# -# Domain configuration is a space separated list of pair ,. -# -get_domain_nameservers() { - local domain="$1" ns - shift - for x in "$@" ; do - if [[ ${x%,*} == ${domain} ]] ; then - ns="${ns} ${x#*,}" - fi - done - ns="$(uniqify ${ns})" - echo -n "${ns}" -} - -### -# char *build_domain_edit_part(char *domain, char *domain_config...) -# -# Parse the list of domain configurations and build settings for one particular -# domain for the sed script. -# -# Domain configuration is a space separated list of pair ,. -# -build_domain_edit_part() { - local domain="$1" ns - shift - ns="$(get_domain_nameservers "${domain}" "$@")" - build_edit_part "${domain}" "${ns}" "${domain}" "" "include" -} - -### -# char *build_add_part(char *add, char *domains...) -# -# Build add part of the sed script for all domains that needs to be added -# -build_add_part() { - local add="$1" x label rule add_part new_part result - shift - for x in ${add} ; do - local domain="${x}" ns - ns="$(get_domain_nameservers "${domain}" "$@")" - label="$(make_pdnsd_label "${domain}")" - rule="$(make_sed_label ${label})" - new_part="$(compose_lines "server {" " label=\"${label}\";")" - new_part="${new_part}$(build_settings "${ns}" "${domain}" "include")" - new_part="${new_part}$(compose_lines "}" "")" - add_part="${add_part}${new_part}" - done - result="${SED_ADDING//@SETUP@/${add_part}}" - echo "${result}" -} - -### -# char *build_sed_script(char *nameservers, char *domain_config, -# char *change, char *add, -# char *active_domains, char *known_domains) -# -# Build the full sed script from the list of nameservers, list of domains -# (in format ,), list of changed domains, list of added domains, -# list of activly used domains and a list of all known domains. -# -build_sed_script() { - local ns="$1" domain_config="$2" change="$3" add="$4" - local active_domains="$5" known_domains="$6" - - local match_labels="$(build_match_labels ${change})" - - local edit_changed x - for x in ${change} ; do - edit_changed="${edit_changed}$( \ - build_domain_edit_part "${x}" ${domain_config})" - done - edit_changed="${edit_changed}$( \ - build_edit_part "" "${ns}" "${active_domains}" "${known_domains}" "exclude")" - - local added - added="$(build_add_part "${add}" ${domain_config})" - - local full - full="${SED_LOOP//@MATCH_LABELS@/${match_labels}}" - echo -ne "${full}" - echo -ne "${edit_changed}" - echo -ne "${added}" -} - -### -# char *read_configured_domains(char *config_file) -# -# Reads labels of servers starting with resolvconf* from the configuration file. -# -read_configured_domains() { - local config_file="$1" result - result="\ - $(sed -nre 's/^[[:space:]]+label=\"?resolvconf-([^;\"]*)\";.*/\1/p' \ - ${config_file})" - echo -n "${result}" -} - -### -# void installation_check(char *config_file) -# -# Check if the pdnsd is installed and can be configured. Prepare also the file -# for resolvconf. -# -installation_check() { - local config_file="$1" - if [[ -e ${config_file} ]] ; then - if ! grep ${INSTALLATION_CHECK} ${config_file} &>/dev/null ; then - echo -e "${COMMENT}" >> ${config_file} - echo -e "\n${BASIC_SETTINGS}" >> ${config_file} - fi - return 0 - else - return 1 - fi -} - -### -# void initialization(char *config_file) -# -# Setup basic variables NAMESERVERS, DOMAINS an CONFIGURED_DOMAINS -# -initialization() { - local config_file="$1" - - for N in ${NEWNS} ; do - NAMESERVERS="${NAMESERVERS} ${N}" - done - - for N in ${NEWSEARCH} ; do - NAMESERVERS="${NAMESERVERS} ${N#*,}" - done - - for DN in ${NEWDOMAIN} ; do - DOMAINS="${DOMAINS} ${DN%,*}" - done - - CONFIGURED_DOMAINS=$(read_configured_domains ${config_file}) - - NAMESERVERS=$(uniqify ${NAMESERVERS}) - DOMAINS=$(uniqify ${DOMAINS}) - CONFIGURED_DOMAINS=$(uniqify ${CONFIGURED_DOMAINS}) -} - -### -# void find_changed_and_added(char *configured, char *domains) -# -# Find already configured and newly added domains. Sets variables -# CHANGE_DOMAINS, ADD_DOMAINS and KNOWN_DOMAINS. -# -find_changed_and_added() { - local configured="$1" domains="$2" x - - KNOWN_DOMAINS="${CONFIGURED_DOMAINS} ${DOMAINS}" - - # Find what has to be disabled - for x in ${configured} ; do - if [[ " ${domains} " != *" ${x} "* ]] ; then - CHANGE_DOMAINS="${CHANGE_DOMAINS} ${x}" - fi - done - - # Find what has to be added - for x in ${domains} ; do - if [[ " ${configured} " != *" ${x} "* ]] ; then - ADD_DOMAINS="${ADD_DOMAINS} ${x}" - else - CHANGE_DOMAINS="${CHANGE_DOMAINS} ${x}" - fi - done - - ADD_DOMAINS=$(uniqify ${ADD_DOMAINS}) - CHANGE_DOMAINS=$(uniqify ${CHANGE_DOMAINS}) - KNOWN_DOMAINS=$(uniqify ${KNOWN_DOMAINS}) -} - -### -# bool make_configuration_change(char *config_file, char *backup_suffix, -# char *sed_script) -# -# Applies any configuration change. Returns true, if there was a change. -# -make_configuration_change() { - local config_file="$1" backup_suffix="$2" sed_script="$3" - local old_config new_config - - old_config=$(< ${config_file}) - - # Sanity check: add '}' at the end of the file - new_config=$( (echo -n "${old_config}" && echo -ne "\n}" ) | \ - sed -nre "${sed_script}") - # Now remove what we added - new_config=${new_config%?\}} - - if [[ "${old_config}" != "${new_config}" ]] ; then - cp ${config_file} ${config_file}${backup_suffix} - echo "${new_config}" > "${config_file}" - return 0 - else - return 1 - fi -} - -################################################################################ -# Main part - -# Check, if pdnsd configuration file is installed and possibly prepare it -installation_check "${PDNSDCONFIG}" || exit 0 - -# Basic initialization of NAMESERVERS, DOMAINS and CONFIGURED_DOMAINS -initialization "${PDNSDCONFIG}" - -find_changed_and_added "${CONFIGURED_DOMAINS}" "${DOMAINS}" - -sed_script="$(build_sed_script "${NAMESERVERS}" "${NEWDOMAIN}" \ - "${CHANGE_DOMAINS}" "${ADD_DOMAINS}" \ - "${DOMAINS}" "${KNOWN_DOMAINS}")" - -# Check if the config changed -if make_configuration_change "${PDNSDCONFIG}" "${BACKUPSUFFIX}" "${sed_script}" ; then - # Checks for running pdnsd - [ -x /usr/sbin/pdnsd-ctl ] || exit 0 - [ -e /var/cache/pdnsd/pdnsd.status ] || exit 0 - - # Reload config files - /usr/sbin/pdnsd-ctl config &>/dev/null -fi - -exit 0 -- cgit v1.2.3