Add patch to include the sdb-ldap backend, #160567

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64

3 files changed, 303 insertions, 2 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 8de55497c6be..d77495dd232a 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.201 2008/07/20 09:36:05 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.202 2008/07/20 10:28:05 dertobi123 Exp $
+
+*bind-9.5.0_p1-r1 (20 Jul 2008)
+
+  20 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +bind-9.5.0_p1-r1.ebuild:
+  Add patch to include the sdb-ldap backend, #160567
 
   20 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   -files/bind-9.2.5-berkdb_fix.patch, -files/bind-9.2.5-dlz-mysql.patch,
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index ec01b9e311d5..72278a7567e4 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -16,11 +16,13 @@ DIST bind-9.3.2-P1.tar.gz 5303237 RMD160 49c1f9ba1d9a4d831ed6dfbe7997c8d5fcd3dcf
 DIST bind-9.4.1-P1.tar.gz 6341409 RMD160 ced75a96098d78a7fdd8cc1d1e3daf2ad142ee9f SHA1 c65bfd3d6ff1dd78b678fe350e323bfb6d47fe1b SHA256 912d07be9a6b4fa180d38637bf32ac4e802b087e46fbbf2a76314ecc3444b693
 DIST bind-9.4.2-P1.tar.gz 6451654 RMD160 9771d109aaa7c340bc1af280a8ab713892604ba1 SHA1 71421abc311fbbd6cc9fa7d4400dff4d82a0a6a8 SHA256 eeeb8f89fe6d88b250ad85ee21cfde6f8ac6f425c70c6705352b3fa8c4c4ee84
 DIST bind-9.5.0-P1.tar.gz 6622200 RMD160 33bed2e55b6bb821922e0e4f5bd9992ea493642b SHA1 f7fc538ae919f09496fdf459d63ce8f340f287d8 SHA256 a0a726a83ae0b576a602494c8cda2b03041c5cf09b6423117ff42979c675374d
+DIST bind-sdb-ldap-1.1.0.tar.bz2 5883 RMD160 ec2f684f278e5fa72158486a14dfce3005a62602 SHA1 fae539a29615fda56a2dcb55a1e01d335835b980 SHA256 afe9cc6a99c20f1dc1929b0a30ff815b0aac509a6c12f8df432853c856d35754
 DIST ctrix_dlz_9.3.2b1.patch.bz2 60982 RMD160 dd76c79d58fdcf75d5c991bac4b6de54aeb4f8bb SHA1 a3c65ef330846f62e22655261954a7fe982cb616 SHA256 f0764290a08b4a839eae8b82a6e27301ce9ff41f3132f697139d73698f89cffc
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
 EBUILD bind-9.3.2-r5.ebuild 8593 RMD160 7e17f83d1d8435b1afff008fb0f2b6cbdbedb441 SHA1 1ca6afb0a6cc48648ac55dc28d9b1b322fe42060 SHA256 43377769216a078795c27049ca44142f816b8fd9b6ddb5026a2ea67b0e989411
 EBUILD bind-9.4.1_p1.ebuild 8473 RMD160 ecaecdf9e241bd0a13184b46e41406f57631f24d SHA1 1d72a15d20ef3866913017ad1c2bc6579a5c486b SHA256 97bca63f3d2113a0e8feb4c84fca5bff558eea43cbb8324d6c1f68e8496b0a6e
 EBUILD bind-9.4.2_p1.ebuild 8928 RMD160 1796fc2bca5ba99e6e6869dcafa1e80c94290d33 SHA1 30917086c132e2294cbcb535c9d8a9848bb1534c SHA256 b0124b144338f3179d58fee2b3c71cf3ec3478cfe16473bb17411ed630c378d4
+EBUILD bind-9.5.0_p1-r1.ebuild 9191 RMD160 737696c0b4722229ffcbed08f65408f1a8959dea SHA1 49ac9b1294f16f13ffc78babfe18b4ee1787a937 SHA256 b5d34e00bb34fd0a45f6fb8687a820eceb53ca60c77aa456ff05365e33ed2a5c
 EBUILD bind-9.5.0_p1.ebuild 8920 RMD160 433e7840f98eb5caadfaa782acdd0de03759cc16 SHA1 0597fc253e1eaaba429079c7af359c5f96f44a18 SHA256 6829d98d8caa34f749fe1b6bc74038394eb51c318ca9b5cd163bcec92c3cca66
-MISC ChangeLog 32959 RMD160 f9293e159f7cc9d268fb6b122b4bb7941fb16fae SHA1 d688997e6fbf69ee581e75856b4f1d326e631f9e SHA256 f32303f6d7eef947ad122448141e1089dced71e75de787273f714bece11badcd
+MISC ChangeLog 33130 RMD160 5142950116811fb3d2b0c8fd7dc942e0102347ee SHA1 0e55c6708d99f3361b3ecb76a5b85c6c754246f2 SHA256 06560d64ede257ad7fe88249d2599e4557394fa37229f343042fc0c116843c6c
 MISC metadata.xml 352 RMD160 0c1a848023a0dd76c5173c0a2135beed46e90263 SHA1 24f998969c955accd1fd4f3719bdf83d4e9d432b SHA256 f6f6ae15da16a20d5e0ce76563e3e27901e25787131b8784ffe872ffe3ddd034
diff --git a/net-dns/bind/bind-9.5.0_p1-r1.ebuild b/net-dns/bind/bind-9.5.0_p1-r1.ebuild
new file mode 100644
index 000000000000..cd54349bfc69
--- /dev/null
+++ b/net-dns/bind/bind-9.5.0_p1-r1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.5.0_p1-r1.ebuild,v 1.1 2008/07/20 10:28:05 dertobi123 Exp $
+
+inherit eutils libtool autotools toolchain-funcs flag-o-matic
+
+MY_PV="${PV/_p1/-P1}"
+SDB_LDAP_VER="1.1.0"
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${PN}-${MY_PV}.tar.gz
+	sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.bz2 )
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+
+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 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 )
+	idn? ( net-dns/idnkit )"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	use threads && {
+		echo
+		ewarn "If you're in vserver enviroment, you're probably want to"
+		ewarn "disable threads support because of linux capabilities dependency"
+		echo
+	}
+
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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}"
+	done
+
+	use dlz && epatch "${FILESDIR}"/${PN}-9.4.0-dlzbdb-close_cursor.patch
+
+	# 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/)
+	use dlz && use mysql && epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
+
+	# should be installed by bind-tools
+	sed -e "s:nsupdate ::g" -i "${S}"/bin/Makefile.in
+
+	# sdb-ldap patch as per  bug #160567
+	# Upstream URL: http://bind9-ldap.bayour.com/
+	use sdb-ldap && epatch "${WORKDIR}"/sdb-ldap/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+
+	# bug #220361
+	rm "${S}"/aclocal.m4 "${S}"/libtool.m4
+	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf
+
+	# bug #151839
+	sed -e \
+		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
+		-i lib/isc/unix/socket.c
+
+	# remove useless c++ checks
+	epunt_cxx
+}
+
+src_compile() {
+	local myconf=""
+
+	use ssl && myconf="${myconf} --with-openssl"
+	use idn && myconf="${myconf} --with-idn"
+
+	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
+			echo
+			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"
+			epause 10
+		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
+
+	# bug #158664
+	gcc-specs-ssp && replace-flags -O[23s] -O
+	export BUILD_CC="${CBUILD}-gcc"
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		`use_enable ipv6` \
+		${myconf} || die "econf failed"
+
+	emake -j1 || die "failed to compile bind"
+}
+
+src_install() {
+	einstall || die "failed to install bind"
+
+	dodoc CHANGES COPYRIGHT FAQ README
+
+	use doc && {
+		docinto misc
+		dodoc doc/misc/*
+
+		docinto html
+		dohtml doc/arm/*
+
+		docinto	draft
+		dodoc doc/draft/*
+
+		docinto rfc
+		dodoc doc/rfc/*
+
+		docinto contrib
+		dodoc contrib/named-bootconf/named-bootconf.sh \
+			contrib/nanny/nanny.pl
+
+		# some handy-dandy dynamic dns examples
+		cd "${D}"/usr/share/doc/${PF}
+		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
+	}
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	dodir /etc/bind /var/bind/{pri,sec}
+	keepdir /var/bind/sec
+
+	insinto /etc/bind ; newins "${FILESDIR}"/named.conf-r3 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.ca:
+	insinto /var/bind ; doins "${FILESDIR}"/named.ca
+
+	insinto /var/bind/pri
+	doins "${FILESDIR}"/127.zone
+	newins "${FILESDIR}"/localhost.zone-r2 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r5 named
+	newconfd "${FILESDIR}"/named.confd-r2 named
+
+	dosym ../../var/bind/named.ca /var/bind/root.cache
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+
+	# 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.1,host.1,nslookup.1}
+	rm -f "${D}"/usr/share/man/man8/{dnssec-keygen.8,nsupdate.8}
+	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+
+	use resolvconf && {
+		exeinto /etc/resolvconf/update.d
+		newexe "${FILESDIR}"/resolvconf.bind bind
+	}
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if [ -c /dev/urandom ]; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a -u named
+			echo
+		fi
+	fi
+
+	install -d -o named -g named "${ROOT}"/var/run/named \
+		"${ROOT}"/var/bind/pri "${ROOT}"/var/bind/sec
+	chown -R named:named "${ROOT}"/var/bind
+
+	elog "The default zone files are now installed as *.zone,"
+	elog "be careful merging config files if you have modified"
+	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
+	elog
+	elog "You can edit /etc/conf.d/named to customize named settings"
+	elog
+	elog "The BIND ebuild now includes chroot support."
+	elog "If you like to run bind in chroot AND this is a new install OR"
+	elog "your bind doesn't already run in chroot, simply run:"
+	elog "\`emerge --config '=${CATEGORY}/${PF}'\`"
+	elog "Before running the above command you might want to change the chroot"
+	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
+	elog
+	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
+	elog "zones making all .com and .net domains appear to be registered"
+	elog "This causes many problems such as breaking important anti-spam checks"
+	elog "which verify source domains exist. ISC released a patch for BIND which"
+	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
+	elog "domain resolution to their normal function."
+	elog
+	elog "There is no need to create a com or net data file. Just the"
+	elog "entries to the named.conf file is enough."
+	elog
+	elog "	zone "com" IN { type delegation-only; };"
+	elog "	zone "net" IN { type delegation-only; };"
+
+	echo
+	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
+	ewarn "when it was previously optional.  If the priority is missing, BIND"
+	ewarn "won't load the zone file at all."
+	echo
+}
+
+pkg_config() {
+	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
+	EXISTS="no"
+
+	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
+		CHROOT="/chroot/dns"
+	elif [ -d ${CHROOT} ]; then
+		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
+	fi
+
+	if [ ! "$EXISTS" = yes ]; then
+		einfo ; einfon "Setting up the chroot directory..."
+		mkdir -m 700 -p ${CHROOT}
+		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
+		chown -R named:named ${CHROOT}/var/run/named
+		cp -R /etc/bind ${CHROOT}/etc/
+		cp /etc/localtime ${CHROOT}/etc/localtime
+		chown named:named ${CHROOT}/etc/bind/rndc.key
+		cp -R /var/bind ${CHROOT}/var/
+		chown -R named:named ${CHROOT}/var/
+		mknod ${CHROOT}/dev/zero c 1 5
+		mknod ${CHROOT}/dev/random c 1 8
+		chmod 666 ${CHROOT}/dev/{random,zero}
+		chown root:named ${CHROOT}
+		chmod 0750 ${CHROOT}
+
+		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
+		if [ $RETVAL = 0 ]; then
+			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
+			mv --force /etc/conf.d/named.orig /etc/conf.d/named
+		fi
+
+		sleep 1; echo " Done."; sleep 1
+		einfo
+		einfo "Add the following to your root .bashrc or .bash_profile: "
+		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
+		einfo "Then do the following: "
+		einfo "   source /root/.bashrc or .bash_profile"
+		einfo
+	fi
+}