Fix threading, add dep on libcap (#220167)

(Portage version: 2.2_rc6/cvs/Linux 2.6.25-gentoo-r6 x86_64)

4 files changed, 321 insertions, 3 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index f8cc5a503029..3ea7511b5927 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,13 @@
 # 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.209 2008/08/02 20:03:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.210 2008/08/03 15:59:48 dertobi123 Exp $
+
+*bind-9.5.0_p2-r1 (03 Aug 2008)
+*bind-9.4.2_p2-r1 (03 Aug 2008)
+
+  03 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org> +files/libcap.patch,
+  +bind-9.4.2_p2-r1.ebuild, -bind-9.5.0_p2.ebuild, +bind-9.5.0_p2-r1.ebuild:
+  Fix threading, add dep on libcap (#220167)
 
   02 Aug 2008; Raúl Porcel <armin76@gentoo.org> bind-9.4.2_p2.ebuild:
   alpha/ia64/sparc/x86 stable wrt #233675
diff --git a/net-dns/bind/bind-9.4.2_p2-r1.ebuild b/net-dns/bind/bind-9.4.2_p2-r1.ebuild
new file mode 100644
index 000000000000..40542c596750
--- /dev/null
+++ b/net-dns/bind/bind-9.4.2_p2-r1.ebuild
@@ -0,0 +1,292 @@
+# 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.4.2_p2-r1.ebuild,v 1.1 2008/08/03 15:59:48 dertobi123 Exp $
+
+inherit eutils libtool autotools toolchain-funcs flag-o-matic
+
+DLZ_VERSION="9.3.3"
+MY_PV="${PV/_p2/-P2}"
+
+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
+	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"
+
+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 )
+	threads? ( >=sys-libs/libcap-2.1.0 )"
+
+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
+
+	# bind needs a newer libcap #220167
+	use threads && epatch "${FILESDIR}"/libcap.patch
+
+	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
+
+	# 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
+}
diff --git a/net-dns/bind/bind-9.5.0_p2.ebuild b/net-dns/bind/bind-9.5.0_p2-r1.ebuild
index e13c9370729b..cbfe3bda2a84 100644
--- a/net-dns/bind/bind-9.5.0_p2.ebuild
+++ b/net-dns/bind/bind-9.5.0_p2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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_p2.ebuild,v 1.1 2008/08/02 07:21:14 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.5.0_p2-r1.ebuild,v 1.1 2008/08/03 15:59:48 dertobi123 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -22,7 +22,8 @@ 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 )"
+	idn? ( net-dns/idnkit )
+	threads? ( >=sys-libs/libcap-2.1.0 )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
@@ -57,6 +58,9 @@ src_unpack() {
 			"${i}"
 	done
 
+	# bind needs a newer libcap #220167
+	use threads && epatch "${FILESDIR}"/libcap.patch
+
 	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
diff --git a/net-dns/bind/files/libcap.patch b/net-dns/bind/files/libcap.patch
new file mode 100644
index 000000000000..50cf69df57e7
--- /dev/null
+++ b/net-dns/bind/files/libcap.patch
@@ -0,0 +1,15 @@
+diff -Naur bind-9.5.0-P2.orig/bin/named/unix/os.c bind-9.5.0-P2/bin/named/unix/os.c
+--- bind-9.5.0-P2.orig/bin/named/unix/os.c	2008-05-06 03:32:51.000000000 +0200
++++ bind-9.5.0-P2/bin/named/unix/os.c	2008-08-03 17:46:19.000000000 +0200
+@@ -170,7 +170,11 @@
+ 		return;
+ #ifndef HAVE_LIBCAP
+ 	memset(&caphead, 0, sizeof(caphead));
++#ifdef _LINUX_CAPABILITY_VERSION_3
++	caphead.version = _LINUX_CAPABILITY_VERSION_3;
++#else
+ 	caphead.version = _LINUX_CAPABILITY_VERSION;
++#endif
+ 	caphead.pid = 0;
+ 	memset(&cap, 0, sizeof(cap));
+ 	cap.effective = caps;