diff options
| -rw-r--r-- | net-dns/bind/Manifest | 2 | ||||
| -rw-r--r-- | net-dns/bind/bind-9.18.29.ebuild (renamed from net-dns/bind/bind-9.18.0.ebuild) | 63 |
2 files changed, 30 insertions, 35 deletions
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index 8e14a31310ce..4bdb68cfc756 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -1,4 +1,4 @@ DIST bind-9.16.48.tar.xz 5131176 BLAKE2B 4a503b45df412c435cb0f75b54ee1270140cccce7ecc159cdf3e0e3cbd3c0a0866b7472782f20aacf130f57df12d20a102ac6979498138ce00a2655806d003e7 SHA512 83829a5045e2a29dd2b491d3ab72b545f5664023fcd4aa205a44dbb7bcc5c737b4466c0d73f124b8d88fd33c56776871a07dde1ba0530d43eec8e7304a08d353 DIST bind-9.16.48.tar.xz.asc 833 BLAKE2B 740ed58863ed3a7dee6ada4edd03cad5378ea0aa53cd6f071ca1911bb2d6b285ed292f32846790d42b97e8d9bb72588f1cd30c4e10557ac1e9f1df545923a9b1 SHA512 7bd813b5ab6f9677fc4ef21e0c3930f6319fa6c49d6869570794bc28212fe8935b72f9f217cfce692a2dec9ec29994f345d1b1145cef1ca976c5361f6ce0f75d -DIST bind-9.18.0.tar.xz 5292320 BLAKE2B 3ed32880bcaf47d3a56a59cf35506c6f28acdfa52365615a3cd9671bbbc6437a1aab8cebb3ed6dec61af25b71357f8924ae8aae8779cdd422e8a3ff6ee3ef4e5 SHA512 941fe32499e1e7b08c2554f2e68a4886160d239ae23c9810f0cc0565636b5ce218dad5d332c1f4d101ce15f85b6cc2cd877fbf9ebdafb693a83ae57f999cab12 +DIST bind-9.18.29.tar.xz 5562720 BLAKE2B f3e7de6936362bcce4993e401ed8fdd9d597459e82ad908a918fff1da619f91ef4896595ea210b43f2b492d763d7be2b71105495858da55431b60874c7fd2312 SHA512 6c2676e2e2cb90f3bd73afb367813c54d1c961e12df1e12e41b9d0ee5a1d5cdf368d81410469753eaef37e43358b56796f078f3b2f20c3b247c4bef91d56c716 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac diff --git a/net-dns/bind/bind-9.18.0.ebuild b/net-dns/bind/bind-9.18.29.ebuild index 2174fab36659..18f4f0168c82 100644 --- a/net-dns/bind/bind-9.18.0.ebuild +++ b/net-dns/bind/bind-9.18.29.ebuild @@ -3,8 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -inherit python-any-r1 systemd tmpfiles +inherit multiprocessing systemd tmpfiles MY_PV="${PV/_p/-P}" MY_PV="${MY_PV/_rc/rc}" @@ -15,23 +14,27 @@ RRL_PV="${MY_PV}" 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" +S="${WORKDIR}/${MY_P}" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+caps dnsrps dnstap doc doh fixed-rrset idn geoip gssapi lmdb selinux static-libs test xml" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+caps dnsrps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml" RESTRICT="!test? ( test )" DEPEND=" acct-group/named acct-user/named dev-libs/json-c:= - dev-libs/libuv:= + >=dev-libs/libuv-1.37.0:= sys-libs/zlib dev-libs/openssl:=[-bindist(-)] caps? ( >=sys-libs/libcap-2.1.0 ) - dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) - doh? ( net-libs/nghttp2 ) + dnstap? ( + dev-libs/fstrm + dev-libs/protobuf-c + ) + doh? ( net-libs/nghttp2:= ) geoip? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) @@ -39,21 +42,21 @@ DEPEND=" lmdb? ( dev-db/lmdb ) xml? ( dev-libs/libxml2 ) " +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-bind ) + sys-process/psmisc + !<net-dns/bind-tools-9.18.0 +" +# sphinx required for man-page and html creation BDEPEND=" + virtual/pkgconfig + doc? ( dev-python/sphinx ) test? ( - ${PYTHON_DEPS} - dev-python/pytest - dev-perl/Net-DNS-SEC dev-util/cmocka + dev-util/kyua ) " -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-bind ) - sys-process/psmisc - !net-dns/bind-tools -" - -S="${WORKDIR}/${MY_P}" src_configure() { local myeconfargs=( @@ -85,12 +88,9 @@ src_configure() { } src_test() { - # "${WORKDIR}/${P}"/bin/tests/system/README - # ifconfig.sh up and then down as root - #default - - # just run the tests that dont mock around with IPs - emake -C lib/ check + # system tests ('emake test') require network configuration for IPs etc + # so we run the unit tests instead. + TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit } src_install() { @@ -120,11 +120,13 @@ src_install() { newenvd "${FILESDIR}"/10bind.env 10bind - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete + if ! use static-libs ; then + find "${ED}"/usr/lib* -name '*.la' -delete || die + fi - dosym ../../var/bind/pri /etc/bind/pri - dosym ../../var/bind/sec /etc/bind/sec - dosym ../../var/bind/dyn /etc/bind/dyn + dosym -r /var/bind/pri /etc/bind/pri + dosym -r /var/bind/sec /etc/bind/sec + dosym -r /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} @@ -153,13 +155,6 @@ pkg_postinst() { 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." |