net-dns/bind: Bump

(Portage version: 2.2.0_alpha20-r1/svn/Linux x86_64)

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2836 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2011-02-24 12:16:44 +00:00
parent b92f9eaec3
commit b834e0307b
3 changed files with 375 additions and 1 deletions

View File

@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.310 2011/01/07 23:37:37 robbat2 Exp $ # $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.310 2011/01/07 23:37:37 robbat2 Exp $
*bind-9.8.0_rc1 (24 Feb 2011)
24 Feb 2011; Mario Fetka <mario.fetka@gmail.com> +bind-9.8.0_rc1.ebuild:
Bump
03 Feb 2011; Mario Fetka <mario.fetka@gmail.com> bind-9.8.0_beta1.ebuild: 03 Feb 2011; Mario Fetka <mario.fetka@gmail.com> bind-9.8.0_beta1.ebuild:
add missing link to libdb when build with sdb-ldap add missing link to libdb when build with sdb-ldap

View File

@ -15,10 +15,12 @@ AUX named.init-r7 3622 RMD160 4ed3c76403bf5ddc545b0d681b176fbe5f7f8484 SHA1 dfe2
AUX named.init-r8 4417 RMD160 6aac0609b04e8cb3a1a91bf0532506be151a0e01 SHA1 5754951e9163cb0e7cfc2323c8d759c404ac8a27 SHA256 720880c274f14df595370e3fab257e32f08a0df0f3495a212cff86b6933b83d3 AUX named.init-r8 4417 RMD160 6aac0609b04e8cb3a1a91bf0532506be151a0e01 SHA1 5754951e9163cb0e7cfc2323c8d759c404ac8a27 SHA256 720880c274f14df595370e3fab257e32f08a0df0f3495a212cff86b6933b83d3
AUX named.init-r9 4946 RMD160 48cce5a99a8da1eff3492c4896fbae4c1343a675 SHA1 944ed08d22e70ba93625814695535f58feed2083 SHA256 77fd6b4ecb0f7f4baa872d1be1b18d2ea9a913a15f30f63ab904a62ad4325748 AUX named.init-r9 4946 RMD160 48cce5a99a8da1eff3492c4896fbae4c1343a675 SHA1 944ed08d22e70ba93625814695535f58feed2083 SHA256 77fd6b4ecb0f7f4baa872d1be1b18d2ea9a913a15f30f63ab904a62ad4325748
DIST bind-9.8.0b1.tar.gz 7695239 RMD160 da507be635904bd2c8712d6a372ef14367d1e981 SHA1 0a9b07516ac0610c050743ba1870ea02f9c628ee SHA256 257c14d68759c4ff14fe3cfc34ea4ec7a5b454961b10618d9bec9e24286396eb DIST bind-9.8.0b1.tar.gz 7695239 RMD160 da507be635904bd2c8712d6a372ef14367d1e981 SHA1 0a9b07516ac0610c050743ba1870ea02f9c628ee SHA256 257c14d68759c4ff14fe3cfc34ea4ec7a5b454961b10618d9bec9e24286396eb
DIST bind-9.8.0rc1.tar.gz 7700083 RMD160 c2ccc18bd5fe3485d3a9b03346a6e7ba8e27d261 SHA1 37304ea4dd5b62d4ff79a9922af48029581af845 SHA256 04bb0f6655bfe729965b027f317f422528ec7684ddecc0b9b83682eb89a88a27
DIST bind-geoip-1.3-9.7.2-P2.patch 54084 RMD160 fcc2308bd2832df821f76aeb1ea1c5740fadb6f3 SHA1 786c2fd8dde40f235e292f5bd883094863976580 SHA256 c12c03fc25a679d8d4296142597c698ab934e18cc761113553062a66be2875dd DIST bind-geoip-1.3-9.7.2-P2.patch 54084 RMD160 fcc2308bd2832df821f76aeb1ea1c5740fadb6f3 SHA1 786c2fd8dde40f235e292f5bd883094863976580 SHA256 c12c03fc25a679d8d4296142597c698ab934e18cc761113553062a66be2875dd
DIST bind-geoip-1.3-readme.txt 10040 RMD160 073956324ed4780e0e0cdbf40ae259f85ebef9d2 SHA1 e13ea2f458adfed3f1a20f9fe3eb2bfd484fc0b0 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845 DIST bind-geoip-1.3-readme.txt 10040 RMD160 073956324ed4780e0e0cdbf40ae259f85ebef9d2 SHA1 e13ea2f458adfed3f1a20f9fe3eb2bfd484fc0b0 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845
DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 RMD160 eb7507dc4b1da0064516d9e75dbc435553b1c9ce SHA1 8c269cd172c6d90df38dab201cdd105eff03cbe3 SHA256 fe043a573ba187dcc8b0f7313d4408236e6916ec246b0443b7e71b33c8303ae9 DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 RMD160 eb7507dc4b1da0064516d9e75dbc435553b1c9ce SHA1 8c269cd172c6d90df38dab201cdd105eff03cbe3 SHA256 fe043a573ba187dcc8b0f7313d4408236e6916ec246b0443b7e71b33c8303ae9
DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
EBUILD bind-9.8.0_beta1.ebuild 11566 RMD160 526d767ff3523067c62d13cb622f2ccfc13ac1df SHA1 7d683fe3cec8201f6b478ca9d5809874bac2e2aa SHA256 6d5010a671af08474dc8f7709cae5139726bb3fca5bc7d1493e391a55e5bd66a EBUILD bind-9.8.0_beta1.ebuild 11566 RMD160 526d767ff3523067c62d13cb622f2ccfc13ac1df SHA1 7d683fe3cec8201f6b478ca9d5809874bac2e2aa SHA256 6d5010a671af08474dc8f7709cae5139726bb3fca5bc7d1493e391a55e5bd66a
MISC ChangeLog 53244 RMD160 86679ef4daa7ce8008d77018cd2a945e39018647 SHA1 a46baa2c40df0542936e0c3cb6431c5ccb193104 SHA256 cf5d70bb5d0896ac1e78879fa7e69a68629d9b0754dfdb19fc75f7aacdbd6d62 EBUILD bind-9.8.0_rc1.ebuild 11566 RMD160 2bc8c186b91fbfcfd89f0c49c508ee607fff964f SHA1 6a1d1e54ffb57d455966bfc5a6664f583333f322 SHA256 49ba1eebbe471e2ad1b576180f2fdf7fdcf856b0b79ad046040e2cde3f76e6bd
MISC ChangeLog 53358 RMD160 f40e0598a17ff39d314400683125ce1869dfe3b7 SHA1 7bc8ce9aa010d4dd0a84c5940c5a589f1758fae9 SHA256 1f38ada87c5ea92b68ac8f4312a661e03acb262258f562637e75f030615190c4
MISC metadata.xml 687 RMD160 5fd264ad649f713cca1786a3bbeabf2f45acc05b SHA1 b0f68a06a898ef80202d3827f2ecb3f1df33b27a SHA256 3c72d140cb8dc2f418ab79b1a939c192a5fee691e97db425b489a0feb1f99263 MISC metadata.xml 687 RMD160 5fd264ad649f713cca1786a3bbeabf2f45acc05b SHA1 b0f68a06a898ef80202d3827f2ecb3f1df33b27a SHA256 3c72d140cb8dc2f418ab79b1a939c192a5fee691e97db425b489a0feb1f99263

View File

@ -0,0 +1,367 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit eutils autotools toolchain-funcs flag-o-matic
MY_PV="${PV/_rc/rc}"
MY_P="${PN}-${MY_PV}"
SDB_LDAP_VER="1.1.0-fc14"
GEOIP_PV=1.3
#GEOIP_PV_AGAINST="${MY_PV}"
GEOIP_PV_AGAINST="9.7.2-P2"
GEOIP_P="bind-geoip-${GEOIP_PV}"
GEOIP_PATCH_A="${GEOIP_P}-${GEOIP_PV_AGAINST}.patch"
GEOIP_DOC_A="${GEOIP_P}-readme.txt"
GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
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}
${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} )
sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 )"
LICENSE="as-is"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads
resolvconf urandom xml geoip gssapi sdb-ldap"
DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
mysql? ( >=virtual/mysql-4.0 )
odbc? ( >=dev-db/unixODBC-2.2.6 )
ldap? ( net-nds/openldap )
sdb-ldap? ( net-nds/openldap )
idn? ( net-dns/idnkit )
postgres? ( dev-db/postgresql-base )
threads? ( >=sys-libs/libcap-2.1.0 )
xml? ( dev-libs/libxml2 )
geoip? ( >=dev-libs/geoip-1.4.6 )
gssapi? ( virtual/krb5 )"
RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-bind )
resolvconf? ( net-dns/openresolv )
sys-process/psmisc"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
use threads && {
ewarn
ewarn "If you're in vserver enviroment, you're probably want to"
ewarn "disable threads support because of linux capabilities dependency"
ewarn
}
ebegin "Creating named group and user"
enewgroup named 40
enewuser named 40 -1 /etc/bind named
eend ${?}
}
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
fi
# should be installed by bind-tools
sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die
# sdb-ldap patch as per bug #160567
# Upstream URL: http://bind9-ldap.bayour.com/
if use sdb-ldap; then
# epatch "${FILESDIR}"/bind-9.8.0b1-sdb-ldap-1.patch
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
if use geoip; then
cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
sed -i -e 's/ MINORVER=7/ MINORVER=8/' \
-e 's/ PATCHVER=2/ PATCHVER=0/' \
-e 's/ RELEASETYPE=-P/ RELEASETYPE=rc/' \
-e 's/-RELEASEVER=2/-RELEASEVER=1/' \
-e 's/+RELEASEVER=2-geoip-1.3/+RELEASEVER=1-geoip-1.3/' \
${GEOIP_PATCH_A} || die
epatch ${GEOIP_PATCH_A}
fi
# bug #220361
rm {aclocal,libtool}.m4
WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf
# remove useless c++ checks
epunt_cxx
}
src_configure() {
local myconf=""
use dlz && {
myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
use postgres && myconf="${myconf} --with-dlz-postgres"
use mysql && myconf="${myconf} --with-dlz-mysql"
use berkdb && myconf="${myconf} --with-dlz-bdb"
use ldap && myconf="${myconf} --with-dlz-ldap"
use odbc && myconf="${myconf} --with-dlz-odbc"
}
if use threads; then
if use dlz && use mysql; then
ewarn
ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
ewarn "requires that each thread of an application execute a MySQL"
ewarn "\"thread initialization\" to setup the thread local storage."
ewarn "This is impossible to do safely while staying within the DLZ"
ewarn "driver API. This is a limitation caused by MySQL, and not"
ewarn "the DLZ API."
ewarn "Because of this BIND MUST only run with a single thread when"
ewarn "using the MySQL driver."
ewarn
myconf="${myconf} --disable-linux-caps --disable-threads"
ewarn "Threading support disabled"
else
myconf="${myconf} --enable-linux-caps --enable-threads"
einfo "Threading support enabled"
fi
else
myconf="${myconf} --disable-linux-caps --disable-threads"
fi
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
export BUILD_CC=$(tc-getBUILD_CC)
econf \
--sysconfdir=/etc/bind \
--localstatedir=/var \
--with-libtool \
$(use_with ssl openssl) \
$(use_with idn) \
$(use_enable ipv6) \
$(use_with xml libxml2) \
$(use_with gssapi) \
${myconf}
# bug #151839
echo '#undef SO_BSDCOMPAT' >> config.h
}
src_compile() {
emake -j1 || die
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc CHANGES FAQ README
if use idn; then
dodoc contrib/idn/README.idnkit || die
fi
if use doc; then
dodoc doc/arm/Bv9ARM.pdf || die
docinto misc
dodoc doc/misc/* || die
# might a 'html' useflag make sense?
docinto html
dohtml -r doc/arm/* || die
docinto draft
dodoc doc/draft/* || die
docinto rfc
dodoc doc/rfc/* || die
docinto contrib
dodoc contrib/named-bootconf/named-bootconf.sh \
contrib/nanny/nanny.pl || die
# some handy-dandy dynamic dns examples
cd "${D}"/usr/share/doc/${PF}
tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
fi
use geoip && dodoc "${DISTDIR}"/${GEOIP_P}-readme.txt
insinto /etc/bind
newins "${FILESDIR}"/named.conf-r5 named.conf || die
# ftp://ftp.rs.internic.net/domain/named.cache:
insinto /var/bind
doins "${FILESDIR}"/named.cache || die
insinto /var/bind/pri
newins "${FILESDIR}"/127.zone-r1 127.zone || die
newins "${FILESDIR}"/localhost.zone-r3 localhost.zone || die
newinitd "${FILESDIR}"/named.init-r9 named || die
newconfd "${FILESDIR}"/named.confd-r5 named || die
newenvd "${FILESDIR}"/10bind.env 10bind || die
# 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}
dosym /var/bind/named.cache /var/bind/root.cache || die
dosym /var/bind/pri /etc/bind/pri || die
dosym /var/bind/sec /etc/bind/sec || die
keepdir /var/bind/sec
dodir /var/{run,log}/named || die
fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri}
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}
}
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 <net-dns/bind-9.4.3_p5-r1, you may encounter permission problems"
ewarn "To fix the permissions do:"
ewarn "chown root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri}"
ewarn "chown root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
ewarn "chmod 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
ewarn "chmod 0750 /etc/bind /var/bind/pri"
ewarn "chmod 0770 /var/{run,log}/named /var/bind/{,sec}"
ewarn
}
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}
mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/{run,log}}
mkdir -m 0750 -p ${CHROOT}/etc/bind
mkdir -m 0770 -p ${CHROOT}/var/{bind,{run,log}/named}
chown root:named ${CHROOT} ${CHROOT}/var/{bind,{run,log}/named} ${CHROOT}/etc/bind
cp /etc/localtime ${CHROOT}/etc/localtime
mknod ${CHROOT}/dev/null c 1 3
chmod 0666 ${CHROOT}/dev/null
mknod ${CHROOT}/dev/zero c 1 5
chmod 0666 ${CHROOT}/dev/zero
if use urandom; then
mknod ${CHROOT}/dev/urandom c 1 9
chmod 0666 ${CHROOT}/dev/urandom
else
mknod ${CHROOT}/dev/random c 1 8
chmod 0666 ${CHROOT}/dev/random
fi
if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
cp -a /etc/bind ${CHROOT}/etc/
cp -a /var/bind ${CHROOT}/var/
fi
if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
fi
elog "You may need to add the following line to your syslog-ng.conf:"
elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
}