From 2eea1729457b4346659ea024d21e65391417a463 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Mon, 23 Dec 2013 17:02:50 +0000 Subject: Version bump. Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xB427ABC8 --- net-dns/bind/ChangeLog | 8 +- net-dns/bind/Manifest | 22 +- net-dns/bind/bind-9.9.4.ebuild | 430 -------------------------------------- net-dns/bind/bind-9.9.4_p1.ebuild | 430 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 448 insertions(+), 442 deletions(-) delete mode 100644 net-dns/bind/bind-9.9.4.ebuild create mode 100644 net-dns/bind/bind-9.9.4_p1.ebuild (limited to 'net-dns') diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index 9ce4f55216ea..3b0e9af46d62 100644 --- a/net-dns/bind/ChangeLog +++ b/net-dns/bind/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dns/bind # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.473 2013/10/13 15:07:21 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.474 2013/12/23 17:02:40 idl0r Exp $ + +*bind-9.9.4_p1 (23 Dec 2013) + + 23 Dec 2013; Christian Ruppert -bind-9.9.4.ebuild, + +bind-9.9.4_p1.ebuild: + Version bump. *bind-9.9.4 (13 Oct 2013) *bind-9.8.6 (13 Oct 2013) diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index dff0bb2b710b..2da4d6e48b69 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -17,8 +17,8 @@ DIST bind-9.8.3-P1-geoip-1.3.patch 54137 SHA256 9d5716d661fc3d76b3f201a0bcf563f4 DIST bind-9.8.6.tar.gz 7275769 SHA256 01cc3a0105b47833b99e61b69acd824be4eeefd6557fffa26eced8e03f1249cd SHA512 09e94e1baa78ba05766078e98251e048aacb440487c8fd72d76e369abc1869fd62d8e8f67f7c12cdd06dca823fc98288c38e41602ad394b00dee4e9db01677b6 WHIRLPOOL d2de919082ac78961df3a14c69386a6c42bbcedbd561f5902fcbd920183a7cd171b2e5e69e451fc3df3568985941ce1842fc27a43a44dea0071fe2154f233b02 DIST bind-9.9.2-geoip-1.3.patch 54328 SHA256 0d87a1b547b42c775ffb591bc8104f92c18e99ebe2ab3a97e8c5bc5731be6fba SHA512 7673b3001bc7d64e80ee548c63ab083141affdd76edf6704da6980c26de341be7341d7566dd9bc8d3b02a0a08934ccd513bd61d2a426f61b3b47959ec14d21ae WHIRLPOOL f561baae427ff4141022b94ca557e2c3fba58434531f45c28b153ada537cadec2388694689b30c1a5b5db9c10e9cbaaad6c7a42797effc7c429c4403c6516404 DIST bind-9.9.3-P2.tar.gz 7459422 SHA256 5e8ab06c7b73f38b47ce9ad12ca0afa7c714bbba2f6b7421c26c0d8b84b6c678 SHA512 def149b8b4050d65bf35109db5843502aaf785cd331d041b9336e0e25a43ede3c7337d5ef46f4726542bf1126bddb5e9404eaaad8f4ff9bcb464ef52df31225a WHIRLPOOL dd5ec585c33a3e6c2d1347d450fc7db8a55b1b321523ce695232c2d544761891c48b95447ded818b4333874607b53689feab6d41eb2d4421239f4d2ffc3e2e83 -DIST bind-9.9.4-geoip.patch 54898 SHA256 b61e0a8c32ce39920541bac726b2ca0af6d2935b4cb16bf5a914e2ade5e4fde3 SHA512 9bdbb0540eb378460ec52173991c65e74e3bd61904647bc889126cd714f5ed809f8ffa0a139bb7bf2382825cb1caefae8e5f4770b95aa94aafd467272adb7841 WHIRLPOOL 38ba21bf841c8ce6b00db89eb445ea2b5755a4f309ff98c68a746cd55d82f6b80265de03de2728a3301258df850a4443fd173e20388e5d0200d59a93e82cfa37 -DIST bind-9.9.4.tar.gz 7513017 SHA256 fe0f16653382e428b10282ce9850722d19589d66f2b45a528e98be3153f654c8 SHA512 3355ecbefaa851f286798cc7a43e7b04a8585423f04d5cc8c1f7b7d0f3adb28684d14b3699258b535ba79187cc9b17be18e52ff95077b50db46a516df7891d4d WHIRLPOOL c68bcc6c000181dd0c4afee055612aa1268f265e80dcb7a93515a37d3c4640a409e59609e88f1b57fe3b52531c1f8396acf82ef76ce58b5791ef3983680e2c17 +DIST bind-9.9.4-P1.tar.gz 7512868 SHA256 48f6ab5f31728164587cb4e943a4d25f0d02665d6f2c7f67f2204a2af257fd80 SHA512 761f60d9197bcb08c3ac150190194c90c2848478bfb61769c8a5325b5060ce81ff6f5d03fcb69445cf954acfeb0f307ef3a9f10351e03f51d638fc482250ed53 WHIRLPOOL ac7d8873079f32db0ab9065ad8325beda741579def399485b424817baeba6e12b796cc8d6d61f51635cedeb379c81f33102cfd602f4b86ace94f15355953b69c +DIST bind-9.9.4_p1-geoip.patch 54902 SHA256 8f92aab89a668fca239bde9a1803c98a61a862e460a83d296a3300d80a0fec9c SHA512 f5f4125792163a682a1817af6237b623abd0bd3ec458891f824c624e47bd1d5c177f7b57d574e617f3234ae5f0db907d1df3af047eb5552f5920499920d8b2a4 WHIRLPOOL f793682cf0e2f3c3ef5373aca90e481099872565f4fc0e4b327728336ce8892337a7973ab57857289f26483bdf5f5dab472320e216b60afa8875b1cc6fc7047f DIST bind-geoip-1.3-readme.txt 10040 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845 SHA512 463b9c5178cd00b8c3626fafc32e2c4db5005b9442c364525a22a3bd20b6f3ff99fab32e9103355d08546b349398499e221109a96d8d073d1fbe9a1f3d385ae9 WHIRLPOOL a00f0e5564f37b434f84d152e797c249640913e13ab7f109e2ff0abc45c519a28ad24e4f6173fa587c4774653f4c9381f9b8ab33c5697f47b30fa139eed48569 DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 SHA256 fe043a573ba187dcc8b0f7313d4408236e6916ec246b0443b7e71b33c8303ae9 SHA512 62690ef3471055e4ae3d8dcedd296c0a5c3a75a3be237c76fdea07aa879f2bb1df4c56b8ca1e3ed9b488a980d16f9c9a3a12a53ef3208607472d18c225916ac5 WHIRLPOOL da3683f815509c5adf0ef819cf1165b64ba35efc6c588fd46b1c6b3d0374766442acb02ecf19dd90bbad5afb174dd27fd3e0894166ea8e78901e95ae870f9f5e DIST dyndns-samples.tbz2 22866 SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac WHIRLPOOL 08d4e6a817f1d02597631e18152dbd55ea1bc4c82174be150cc77efc9e1f0f03b6471d1cefbe4229cd3161de752ef232a43ca274a07b78e9c974ceb04cfe99a2 @@ -26,17 +26,17 @@ DIST rl-9.8.6.patch 103547 SHA256 97ecf02d25334c9d9e32fc8a8fdca7dadd58174872568d DIST rl-9.9.3-P2.patch 104064 SHA256 9aff9d39077160a7a156aa40456f19779b7f5ed2e5b42903b6c0f865acae2fae SHA512 f6e057cf33dd3baf95773637dc75ea1b3fc834e908048e096e57482b583f502cfe73a82104f4045d7f1668cfb531b18429c53b77caba9f12d3c4e605e4b51efa WHIRLPOOL e1a53d0cc7d3a2133e11b5d29e481deefda1562f8f335fc385c3f75205a229f1f861b78218a02e25871a55f572edceca49372e87e81a58dd62bca8d752abeccb EBUILD bind-9.8.6.ebuild 13002 SHA256 599e45aebf88a766b72f3e3d7f06c84f8e7b559eba6f582f472d76d168c23af3 SHA512 2fbb4549382d499de6dd80ee88d6556b697cba24353a6e2b605f667993136b41ec4557c55fa0f084e22b2774aca1066730e4249a4c1be57fd24a7ba71bf32bb6 WHIRLPOOL 95f5ed3f28eebd5c14d84c7170643c494572e1bb64709b9e2894acda0049816df6aa282fdbb642ed78ef90ae0398c6eedf2df77be3dfb926680fc457970cceea EBUILD bind-9.9.3_p2.ebuild 13724 SHA256 0e9fde4f883f96ef8e05c268bdfb593a73c9f7bcf3b4e32461a1118af6c0447c SHA512 a15247529c9086fec20da5c3463e6e2e355a7ba90c39b581b82085ba7e590af4eb8f965be30a2e350b0a7225cff3acf0604498018f2c6bc54969840ec8673aec WHIRLPOOL a4378b5266f40ef987db65b9133f0a5d9b3e95dc63e53af70571078cb1ca9e4d38abd2a582e9786ae44a81c06f6ac2f22f8ccc5ec57f4e3aa2e7f5ffc1bc2fe0 -EBUILD bind-9.9.4.ebuild 13766 SHA256 ca22d150be64372b72c7ffe116a674ebfb1c1fba1c40fdc14a311035ba35a67c SHA512 0062c1789331767eb9c478b97bb5a5bf1a40bde0f019550a561cd45f10beab637f9c3a79b6300b9821eadb3ec5d71af04b94960f6f8fa8902e6518106fb2407c WHIRLPOOL e4a9038feacaf98d9b96b80ccda6f987d1b83c651b7b32410d58c7c51e45b3948c5408a77207809d23a8d12cad0260a0bfb2b374f7969c4f3cab34ea2bace484 -MISC ChangeLog 76302 SHA256 dd5ee33e87c29fd46abcb8cee8d80b2a0b3683c6cef91896a3e2c3fca23fcd28 SHA512 e017042c071ad30e44f847c67689747af958a535d29c8650303681a0b974a58a6c75abeebc40bdd03cce26620b852711826c9f01cb38755eb407c318efbc3ad6 WHIRLPOOL 8337ab51700e79e259a6c8d854d91c9ddf8f815edc2473c85bd58b7184f08070bcf6a17f7d6ce66ecddea6dcbc8ad1f05de08d3737e4644a7ebcb1f31ca2b0d4 +EBUILD bind-9.9.4_p1.ebuild 13769 SHA256 bf3c0cfbd5098319e04ce7b96df3b392a62a51b0a600f1474e245dec07a077d6 SHA512 424bb49e8c90819df43d426b9e9b6fc47081085af5c20c149256407ed8d98a445b8e0f51d30fdc823c459b34710976cc3fc19f0a2574f83355fd2df0573053c4 WHIRLPOOL b43185d8e373c2859b0431a4a69cc39a76b2fffa3e6654690ec849f1d296f7a083c2ae4b2e25e0c83106eba19657c478f805e1bdd67cd64c3cf984a513216b2d +MISC ChangeLog 76446 SHA256 dc84c21cee901419c74358d323f94dc18670fe83f79b016396984e2dd826dc85 SHA512 0a4fe7b6f1f230e1ba551ba40d193d269db871d18a2c85d1d39eeafbdae9f29aed6701f8a7d8d178821a09174453673c520ba1922a09011a705093c72529ae4b WHIRLPOOL d326523c46d2f0926d9932a446547cd9d8cc1b1763ae29a5ec4d07cb141775c1ee758a5c2a60cea130f1d49c160dd2922b1fd6534be9e10b4666718f85dea05f MISC metadata.xml 927 SHA256 d2d095b814e2df50ca39c1493c5d4315ad1d5b4b37aec7b34385771d10ae5d9d SHA512 6ac8c5a70b5cc01d0fac54118066a9ea626d089f9e5a2d45ea4b1b9cedacfafa46e5da60717c2d6f872657f8bc780ea223149afbaa51bdeaa3effef1e01dd218 WHIRLPOOL 7ede42b528d5132c0f0e5d6a3c765154ead764d590975472960cee48fce2f23e6e9687c6fc64f610101758c09b50da61c10f00267582dc708fd57e7f7f984e8f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJSWrcwAAoJEMOx0zmdw4Z1JHgH/i1VDtDv6WsFGHUS9gKPuENp -JyQsZpFBqD8os0AhJB2S/TsJCcMFweK0BZxNREt1u9Js6gnWX7ysQ/w3WI4kW3Dh -zuY+WwNolyK9L3VM2087Lqf47SkROjhQZbg5Irkdr4qud7bL/wZa6jA7Y7yI4oH6 -WkDhAMc2w4SDbsFB756rdZamilfdQ/WTwNlhutTqz595ubDkvezvPwuYTQzHZfww -ZUkPTieEdwZuaADhjrFhKialVl0Gca0VNbDVR4WRSumMdbjIi+VUfD+0K4uCMQXE -odd6khHwxp2Mr3phSWBkEhEHd8DIby/y7pwjqRXG6afGFT5OrPMWbZNz5SPPfdo= -=c8Y4 +iQEcBAEBCAAGBQJSuGy1AAoJEMOx0zmdw4Z1sckIAKuJlHZeESqW/CGguTiH0K+k ++4DahsR4hH/cQQBBKaEp5OtFB/30dbKWUA50qS7oZE4y2fMQ+pkHRDKfCFCbSquT +8k5CpkPW6pcUXIEUvIABUELm8IqRR72ln0BUn62k+VNBqtLD66mXyS/KyIWvDkV1 +W7eKQqJczC9+L3PsN9PQ2oYN0SSNzM6wFTYHvNh1MaRsYvxUBVIvfcbBiMwkekZX +exFNGd2KKDddzQ9+4USGbwUfQ/eu0nrhVtdtTEhkBORPiA2UFl2IwPucUuunw9Mt +ttPWVz89K4NFynJtDihQyTYWeU8I6sP+Kzmvr+4BE/H3WJe8Me/JJK4ckQnfEoM= +=Iy0+ -----END PGP SIGNATURE----- diff --git a/net-dns/bind/bind-9.9.4.ebuild b/net-dns/bind/bind-9.9.4.ebuild deleted file mode 100644 index 4d76c2acf035..000000000000 --- a/net-dns/bind/bind-9.9.4.ebuild +++ /dev/null @@ -1,430 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.4.ebuild,v 1.1 2013/10/13 15:07:21 idl0r Exp $ - -# 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="5" - -PYTHON_DEPEND="python? 2:2.7 3" -SUPPORT_PYTHON_ABIS="1" - -inherit python eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd - -MY_PV="${PV/_p/-P}" -MY_PV="${MY_PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -SDB_LDAP_VER="1.1.0-fc14" - -# bind-9.8.0-P1-geoip-1.3.patch -GEOIP_PV=1.3 -#GEOIP_PV_AGAINST="${MY_PV}" -GEOIP_PV_AGAINST="9.9.2" -GEOIP_P="bind-${GEOIP_PV_AGAINST}-geoip-${GEOIP_PV}" -GEOIP_PATCH_A="${GEOIP_P}.patch" -GEOIP_DOC_A="bind-geoip-1.3-readme.txt" -GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/" - -RRL_PV="${MY_PV}" - -# GeoIP: http://bind-geoip.googlecode.com/ -# SDB-LDAP: http://bind9-ldap.bayour.com/ - -# geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A} -# ${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} ) - -DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server" -HOMEPAGE="http://www.isc.org/software/bind" -SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz - doc? ( mirror://gentoo/dyndns-samples.tbz2 ) - geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A} - http://dev.gentoo.org/~idl0r/${P}-geoip.patch ) - sdb-ldap? ( - http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 - )" - -LICENSE="ISC BSD BSD-2 HPND JNIC openssl" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="berkdb caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6 -ldap mysql odbc postgres python rpz rrl sdb-ldap selinux ssl static-libs threads -urandom xml" -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 - -REQUIRED_USE="postgres? ( dlz ) - berkdb? ( dlz ) - mysql? ( dlz !threads ) - odbc? ( dlz ) - ldap? ( dlz ) - sdb-ldap? ( dlz ) - gost? ( ssl ) - threads? ( caps )" - -DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g[-bindist] ) - mysql? ( >=virtual/mysql-4.0 ) - odbc? ( >=dev-db/unixODBC-2.2.6 ) - ldap? ( net-nds/openldap ) - idn? ( net-dns/idnkit ) - postgres? ( dev-db/postgresql-base ) - caps? ( >=sys-libs/libcap-2.1.0 ) - xml? ( dev-libs/libxml2 ) - geoip? ( >=dev-libs/geoip-1.4.6 ) - gssapi? ( virtual/krb5 ) - sdb-ldap? ( net-nds/openldap ) - gost? ( >=dev-libs/openssl-1.0.0[-bindist] ) - python? ( virtual/python-argparse )" - -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-bind ) - || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - ebegin "Creating named group and user" - enewgroup named 40 - enewuser named 40 -1 /etc/bind named - eend ${?} - - if use python; then - python_pkg_setup - fi -} - -src_prepare() { - # Adjusting PATHs in manpages - for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do - sed -i \ - -e 's:/etc/named.conf:/etc/bind/named.conf:g' \ - -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \ - -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \ - "${i}" || die "sed failed, ${i} doesn't exist" - done - - if use dlz; then - # bind fails to reconnect to MySQL5 databases, bug #180720, patch by Nicolas Brousse - # (http://www.shell-tips.com/2007/09/04/bind-950-patch-dlz-mysql-5-for-auto-reconnect/) - if use mysql && has_version ">=dev-db/mysql-5"; then - epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch - fi - - if use odbc; then - epatch "${FILESDIR}/${PN}-9.7.3-odbc-dlz-detect.patch" - fi - - # sdb-ldap patch as per bug #160567 - # Upstream URL: http://bind9-ldap.bayour.com/ - # New patch take from bug 302735 - if use sdb-ldap; then - epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch - cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/ - cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/ - cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/ - fi - fi - - # should be installed by bind-tools - sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die - - if use geoip; then -# cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die -# sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \ -# -e 's:RELEASEVER=:RELEASEVER=2:' \ -# ${GEOIP_PATCH_A} || die -# sed -i -e 's:^ PATCHVER=2: PATCHVER=4:' ${GEOIP_PATCH_A} || die -# epatch -F0 ${GEOIP_PATCH_A} - epatch -F0 "${DISTDIR}/${P}-geoip.patch" - fi - - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die - - # bug #220361 - rm aclocal.m4 - rm -rf libtool.m4/ - eautoreconf -} - -src_configure() { - local myconf="" - - if use urandom; then - myconf="${myconf} --with-randomdev=/dev/urandom" - else - myconf="${myconf} --with-randomdev=/dev/random" - fi - - use geoip && myconf="${myconf} --with-geoip" - - # 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 \ - --sysconfdir=/etc/bind \ - --localstatedir=/var \ - --with-libtool \ - --enable-full-report \ - $(use_enable threads) \ - $(use_with dlz dlopen) \ - $(use_with dlz dlz-filesystem) \ - $(use_with dlz dlz-stub) \ - $(use_with postgres dlz-postgres) \ - $(use_with mysql dlz-mysql) \ - $(use_with berkdb dlz-bdb) \ - $(use_with ldap dlz-ldap) \ - $(use_with odbc dlz-odbc) \ - $(use_with ssl openssl "${EPREFIX}"/usr) \ - $(use_with ssl ecdsa) \ - $(use_with idn) \ - $(use_enable ipv6) \ - $(use_with xml libxml2) \ - $(use_enable xml newstats) \ - $(use_with gssapi) \ - $(use_enable rpz rpz-nsip) \ - $(use_enable rpz rpz-nsdname) \ - $(use_enable caps linux-caps) \ - $(use_with gost) \ - $(use_enable filter-aaaa) \ - $(use_enable fixed-rrset) \ - $(use_enable rrl) \ - $(use_with python) \ - --without-readline \ - ${myconf} - - # $(use_enable static-libs static) \ - - # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc CHANGES FAQ README - - if use idn; then - dodoc contrib/idn/README.idnkit - fi - - if use doc; then - dodoc doc/arm/Bv9ARM.pdf - - docinto misc - dodoc doc/misc/* - - # might a 'html' useflag make sense? - docinto html - dohtml -r doc/arm/* - - docinto contrib - dodoc contrib/named-bootconf/named-bootconf.sh \ - contrib/nanny/nanny.pl - - # some handy-dandy dynamic dns examples - pushd "${D}"/usr/share/doc/${PF} 1>/dev/null - tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die - popd 1>/dev/null - fi - - use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A} - - insinto /etc/bind - newins "${FILESDIR}"/named.conf-r6 named.conf - - # ftp://ftp.rs.internic.net/domain/named.cache: - insinto /var/bind - doins "${FILESDIR}"/named.cache - - insinto /var/bind/pri - newins "${FILESDIR}"/127.zone-r1 127.zone - newins "${FILESDIR}"/localhost.zone-r3 localhost.zone - - newinitd "${FILESDIR}"/named.init-r12 named - newconfd "${FILESDIR}"/named.confd-r6 named - - if use gost; then - sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die - else - sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die - fi - - newenvd "${FILESDIR}"/10bind.env 10bind - - # Let's get rid of those tools and their manpages since they're provided by bind-tools - rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1* - rm -f "${D}"/usr/share/man/man8/{dnssec-keygen,nsupdate}.8* - rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate} - rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate} - - # bug 405251, library archives aren't properly handled by --enable/disable-static - if ! use static-libs; then - find "${D}" -type f -name '*.la' -delete || die - fi - - if use python; then - install_python_tools() { - python_convert_shebangs $PYTHON_ABI bin/python/dnssec-checkds bin/python/dnssec-coverage - exeinto /usr/sbin - newexe bin/python/dnssec-checkds dnssec-checkds-${PYTHON_ABI} - newexe bin/python/dnssec-coverage dnssec-coverage-${PYTHON_ABI} - } - python_execute_function install_python_tools - - rm -f "${D}/usr/sbin/dnssec-"{checkds,coverage} - python_generate_wrapper_scripts "${D}usr/sbin/dnssec-checkds" - python_generate_wrapper_scripts "${D}usr/sbin/dnssec-coverage" - fi - - # bug 450406 - dosym named.cache /var/bind/root.cache - - dosym /var/bind/pri /etc/bind/pri - dosym /var/bind/sec /etc/bind/sec - dosym /var/bind/dyn /etc/bind/dyn - keepdir /var/bind/{pri,sec,dyn} - - dodir /var/{run,log}/named - - fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn} - fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf} - fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf} - fperms 0750 /etc/bind /var/bind/pri - fperms 0770 /var/{run,log}/named /var/bind/{,sec,dyn} - - systemd_dounit "${FILESDIR}/named.service" - systemd_dotmpfilesd "${FILESDIR}/named.conf" - exeinto /usr/libexec - doexe "${FILESDIR}/generate-rndc-key.sh" -} - -pkg_postinst() { - if [ ! -f '/etc/bind/rndc.key' ]; then - if use urandom; then - einfo "Using /dev/urandom for generating rndc.key" - /usr/sbin/rndc-confgen -r /dev/urandom -a - echo - else - einfo "Using /dev/random for generating rndc.key" - /usr/sbin/rndc-confgen -a - echo - fi - chown root:named /etc/bind/rndc.key - chmod 0640 /etc/bind/rndc.key - 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 - - ewarn - ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache" - ewarn "you may need to fix your named.conf!" - ewarn - ewarn "NOTE: If you upgrade from =dev-db/mysql-5"; then + epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch + fi + + if use odbc; then + epatch "${FILESDIR}/${PN}-9.7.3-odbc-dlz-detect.patch" + fi + + # sdb-ldap patch as per bug #160567 + # Upstream URL: http://bind9-ldap.bayour.com/ + # New patch take from bug 302735 + if use sdb-ldap; then + epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch + cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/ + cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/ + cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/ + fi + fi + + # should be installed by bind-tools + sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die + + if use geoip; then +# cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die +# sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \ +# -e 's:RELEASEVER=:RELEASEVER=2:' \ +# ${GEOIP_PATCH_A} || die +# sed -i -e 's:^ PATCHVER=2: PATCHVER=4:' ${GEOIP_PATCH_A} || die +# epatch -F0 ${GEOIP_PATCH_A} + epatch -F0 "${DISTDIR}/${P}-geoip.patch" + fi + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 + rm -rf libtool.m4/ + eautoreconf +} + +src_configure() { + local myconf="" + + if use urandom; then + myconf="${myconf} --with-randomdev=/dev/urandom" + else + myconf="${myconf} --with-randomdev=/dev/random" + fi + + use geoip && myconf="${myconf} --with-geoip" + + # 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 \ + --sysconfdir=/etc/bind \ + --localstatedir=/var \ + --with-libtool \ + --enable-full-report \ + $(use_enable threads) \ + $(use_with dlz dlopen) \ + $(use_with dlz dlz-filesystem) \ + $(use_with dlz dlz-stub) \ + $(use_with postgres dlz-postgres) \ + $(use_with mysql dlz-mysql) \ + $(use_with berkdb dlz-bdb) \ + $(use_with ldap dlz-ldap) \ + $(use_with odbc dlz-odbc) \ + $(use_with ssl openssl "${EPREFIX}"/usr) \ + $(use_with ssl ecdsa) \ + $(use_with idn) \ + $(use_enable ipv6) \ + $(use_with xml libxml2) \ + $(use_enable xml newstats) \ + $(use_with gssapi) \ + $(use_enable rpz rpz-nsip) \ + $(use_enable rpz rpz-nsdname) \ + $(use_enable caps linux-caps) \ + $(use_with gost) \ + $(use_enable filter-aaaa) \ + $(use_enable fixed-rrset) \ + $(use_enable rrl) \ + $(use_with python) \ + --without-readline \ + ${myconf} + + # $(use_enable static-libs static) \ + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc CHANGES FAQ README + + if use idn; then + dodoc contrib/idn/README.idnkit + fi + + if use doc; then + dodoc doc/arm/Bv9ARM.pdf + + docinto misc + dodoc doc/misc/* + + # might a 'html' useflag make sense? + docinto html + dohtml -r doc/arm/* + + docinto contrib + dodoc contrib/named-bootconf/named-bootconf.sh \ + contrib/nanny/nanny.pl + + # some handy-dandy dynamic dns examples + pushd "${D}"/usr/share/doc/${PF} 1>/dev/null + tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die + popd 1>/dev/null + fi + + use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A} + + insinto /etc/bind + newins "${FILESDIR}"/named.conf-r6 named.conf + + # ftp://ftp.rs.internic.net/domain/named.cache: + insinto /var/bind + doins "${FILESDIR}"/named.cache + + insinto /var/bind/pri + newins "${FILESDIR}"/127.zone-r1 127.zone + newins "${FILESDIR}"/localhost.zone-r3 localhost.zone + + newinitd "${FILESDIR}"/named.init-r12 named + newconfd "${FILESDIR}"/named.confd-r6 named + + if use gost; then + sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die + else + sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die + fi + + newenvd "${FILESDIR}"/10bind.env 10bind + + # Let's get rid of those tools and their manpages since they're provided by bind-tools + rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1* + rm -f "${D}"/usr/share/man/man8/{dnssec-keygen,nsupdate}.8* + rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate} + rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate} + + # bug 405251, library archives aren't properly handled by --enable/disable-static + if ! use static-libs; then + find "${D}" -type f -name '*.la' -delete || die + fi + + if use python; then + install_python_tools() { + python_convert_shebangs $PYTHON_ABI bin/python/dnssec-checkds bin/python/dnssec-coverage + exeinto /usr/sbin + newexe bin/python/dnssec-checkds dnssec-checkds-${PYTHON_ABI} + newexe bin/python/dnssec-coverage dnssec-coverage-${PYTHON_ABI} + } + python_execute_function install_python_tools + + rm -f "${D}/usr/sbin/dnssec-"{checkds,coverage} + python_generate_wrapper_scripts "${D}usr/sbin/dnssec-checkds" + python_generate_wrapper_scripts "${D}usr/sbin/dnssec-coverage" + fi + + # bug 450406 + dosym named.cache /var/bind/root.cache + + dosym /var/bind/pri /etc/bind/pri + dosym /var/bind/sec /etc/bind/sec + dosym /var/bind/dyn /etc/bind/dyn + keepdir /var/bind/{pri,sec,dyn} + + dodir /var/{run,log}/named + + fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn} + fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf} + fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf} + fperms 0750 /etc/bind /var/bind/pri + fperms 0770 /var/{run,log}/named /var/bind/{,sec,dyn} + + systemd_dounit "${FILESDIR}/named.service" + systemd_dotmpfilesd "${FILESDIR}/named.conf" + exeinto /usr/libexec + doexe "${FILESDIR}/generate-rndc-key.sh" +} + +pkg_postinst() { + if [ ! -f '/etc/bind/rndc.key' ]; then + if use urandom; then + einfo "Using /dev/urandom for generating rndc.key" + /usr/sbin/rndc-confgen -r /dev/urandom -a + echo + else + einfo "Using /dev/random for generating rndc.key" + /usr/sbin/rndc-confgen -a + echo + fi + chown root:named /etc/bind/rndc.key + chmod 0640 /etc/bind/rndc.key + 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 + + ewarn + ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache" + ewarn "you may need to fix your named.conf!" + ewarn + ewarn "NOTE: If you upgrade from