bug 87104

(Portage version: 2.0.51.22-r2)

7 files changed, 146 insertions, 35 deletions

diff --git a/net-dns/ldapdns/ChangeLog b/net-dns/ldapdns/ChangeLog
index 9a03567977b0..ddbe9c4b6bd7 100644
--- a/net-dns/ldapdns/ChangeLog
+++ b/net-dns/ldapdns/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/ldapdns
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ldapdns/ChangeLog,v 1.12 2005/04/13 17:45:53 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ldapdns/ChangeLog,v 1.13 2005/07/29 21:03:11 vanquirius Exp $
+
+*ldapdns-2.06 (29 Jul 2005)
+
+  29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/ldapdns-2.06-gentoo.patch, -ldapdns-2.03.ebuild,
+  ldapdns-2.05.ebuild, +ldapdns-2.06.ebuild:
+  Remove old version, version bump and patch with fixes. See bug 87104. Thanks
+  to Andrew Knott <aknott@cvent.com>, Stian Skjelstad <stian@nixia.no> and
+  others.
 
   13 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> ldapdns-2.05.ebuild:
   Use enewuser/enewgroup instead of useradd. Thanks to Diego in bug 84730.
diff --git a/net-dns/ldapdns/Manifest b/net-dns/ldapdns/Manifest
index 3b060479e162..e3236142dfef 100644
--- a/net-dns/ldapdns/Manifest
+++ b/net-dns/ldapdns/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fd0730f2812fb85dfa0f0e324431862f ldapdns-2.03.ebuild 1109
-MD5 f811004d1d9f4d645ab8e9328e46aa18 ldapdns-2.05.ebuild 1027
+MD5 ad6056e2b51153b296c5784343e6a1b0 ldapdns-2.05.ebuild 1043
 MD5 80f8122e9b9d4289312277eebf2ef2f7 ldapdns-2.04.ebuild 1108
+MD5 b97fe2ca15734a58c4955cea9848a44f ldapdns-2.06.ebuild 1090
 MD5 27e2a2759b756f842eeb578c69ef7544 ChangeLog 1466
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 87c558c39b51b905f9272fd860140816 files/digest-ldapdns-2.03 63
 MD5 c6ce7d541758b912a1c8fe354c3e40be files/digest-ldapdns-2.04 64
 MD5 ec37ba5cecd0875e155be6aaf955726e files/digest-ldapdns-2.05 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZX27V3J2n04EauwRAkhmAKCYI40RZQZWDI439m0SZokU6eYdEwCg0EU2
-pf5GGesIwKxUmOyJ7VTjXp0=
-=AsrC
------END PGP SIGNATURE-----
+MD5 8a1918bcbbf60f3919c57b45110f230e files/digest-ldapdns-2.06 64
+MD5 5bc2ba46693dafcbcd9621f4221b14e0 files/ldapdns-2.06-gentoo.patch 3676
diff --git a/net-dns/ldapdns/files/digest-ldapdns-2.03 b/net-dns/ldapdns/files/digest-ldapdns-2.03
deleted file mode 100644
index 04b9689f4f80..000000000000
--- a/net-dns/ldapdns/files/digest-ldapdns-2.03
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f19050a08c43df4f3dc0bd7c5cefa3d ldapdns-2.03.tar.gz 99061
diff --git a/net-dns/ldapdns/files/digest-ldapdns-2.06 b/net-dns/ldapdns/files/digest-ldapdns-2.06
new file mode 100644
index 000000000000..838c425a46ff
--- /dev/null
+++ b/net-dns/ldapdns/files/digest-ldapdns-2.06
@@ -0,0 +1 @@
+MD5 abb062444703c82f6d7322aae793780f ldapdns-2.06.tar.gz 120593
diff --git a/net-dns/ldapdns/files/ldapdns-2.06-gentoo.patch b/net-dns/ldapdns/files/ldapdns-2.06-gentoo.patch
new file mode 100644
index 000000000000..dd7725186fe8
--- /dev/null
+++ b/net-dns/ldapdns/files/ldapdns-2.06-gentoo.patch
@@ -0,0 +1,107 @@
+diff --exclude='*~' -Naur ldapdns-2.06.orig/engine.c ldapdns-2.06/engine.c
+--- ldapdns-2.06.orig/engine.c	2005-07-29 17:42:40.000000000 -0300
++++ ldapdns-2.06/engine.c	2005-07-29 17:49:44.000000000 -0300
+@@ -101,7 +101,7 @@
+ 			engine_message = 1;
+ 			pthread_mutex_unlock(&engine_message_mutex);
+ 			pthread_mutex_lock(&log_lock);
+-			log(log_info, "pausing");
++			dolog(log_info, "pausing");
+ 			pthread_mutex_unlock(&log_lock);
+ 		}
+ 		break;
+@@ -112,14 +112,14 @@
+ 			pthread_cond_broadcast(&engine_pause_cond);
+ 			pthread_mutex_unlock(&engine_message_mutex);
+ 			pthread_mutex_lock(&log_lock);
+-			log(log_info, "resuming");
++			dolog(log_info, "resuming");
+ 			pthread_mutex_unlock(&log_lock);
+ 		}
+ 		break;
+ 	case SIGTERM:
+ 	case SIGINT:
+ 		pthread_mutex_lock(&log_lock);
+-		log(log_info, "shutting down");
++		dolog(log_info, "shutting down");
+ 		pthread_mutex_unlock(&log_lock);
+ 		pthread_mutex_lock(&engine_message_mutex);
+ 		if (engine_message == 1) {
+@@ -2601,7 +2601,7 @@
+ 
+ finish_axfr_l:
+ 	if (!response_axstart(c, 1, c->request_name, DNS_T_SOA, DNS_C_IN, c->ttl)
+-	|| !response_addname(c, ldapdns.self_ns ? ldapdns.self_ns : c->ns->str)
++	|| !response_addname(c, ldapdns.self_ns ? ldapdns.self_ns : (c->ns ? c->ns->str : ""))
+ 	|| !response_addname(c, c->ADM ? c->ADM->str : ldapdns.hostmaster)
+ 	|| !response_addulong(c, c->serial)
+ 	|| !response_addulong(c, c->refresh)
+@@ -2693,7 +2693,7 @@
+ 	/* SOA comes first...
+ 	 */
+ 	if (!response_axstart(c, 1, c->request_name, DNS_T_SOA, DNS_C_IN, c->ttl)
+-	|| !response_addname(c, ldapdns.self_ns ? ldapdns.self_ns : c->ns->str)
++	|| !response_addname(c, ldapdns.self_ns ? ldapdns.self_ns : (c->ns ? c->ns->str : ""))
+ 	|| !response_addname(c, c->ADM ? c->ADM->str : ldapdns.hostmaster)
+ 	|| !response_addulong(c, c->serial)
+ 	|| !response_addulong(c, c->refresh)
+@@ -3855,10 +3855,10 @@
+ 	if (ldapdns.one2one_mode) {
+ #ifdef ACCELERATE_CACHE
+ 		if (ldapdns.accelerate_cache)
+-			log(log_info, "ldap client caching enabled!");
++			dolog(log_info, "ldap client caching enabled!");
+ #endif
+ 
+-		log(log_info, "starting ldapdns %s (1:1/%d)", VERSION,
++		dolog(log_info, "starting ldapdns %s (1:1/%d)", VERSION,
+ 				ldapdns.handlers);
+ 
+ 		/* alternate message loop */
+@@ -3891,9 +3891,9 @@
+ 	}
+ 
+ 	if (ldapdns.accelerate_cache)
+-		log(log_info, "ldap client caching enabled!");
++		dolog(log_info, "ldap client caching enabled!");
+ 
+-	log(log_info, "starting ldapdns %s (%d:%d/%d)", VERSION,
++	dolog(log_info, "starting ldapdns %s (%d:%d/%d)", VERSION,
+ 				ldapdns.ldap_threads, ldapdns.dns_threads,
+ 				ldapdns.handlers);
+ 
+diff --exclude='*~' -Naur ldapdns-2.06.orig/error.c ldapdns-2.06/error.c
+--- ldapdns-2.06.orig/error.c	2005-07-29 17:42:40.000000000 -0300
++++ ldapdns-2.06/error.c	2005-07-29 17:48:54.000000000 -0300
+@@ -173,7 +173,7 @@
+ 	fflush(logfp);
+ 	va_end(ap);
+ }
+-void inline log(int lev, const char *m, ...)
++void inline dolog(int lev, const char *m, ...)
+ {
+ 	va_list ap;
+ 	va_start(ap, m);
+diff --exclude='*~' -Naur ldapdns-2.06.orig/error.h ldapdns-2.06/error.h
+--- ldapdns-2.06.orig/error.h	2005-07-29 17:42:40.000000000 -0300
++++ ldapdns-2.06/error.h	2005-07-29 17:49:07.000000000 -0300
+@@ -23,7 +23,7 @@
+ 
+ void log_init(char *s);
+ 
+-void inline log(int lev, const char *m, ...);
++void inline dolog(int lev, const char *m, ...);
+ 
+ void inline debug(const char *m, ...);
+ 
+diff --exclude='*~' -Naur ldapdns-2.06.orig/ldapdns.c ldapdns-2.06/ldapdns.c
+--- ldapdns-2.06.orig/ldapdns.c	2005-07-29 17:42:40.000000000 -0300
++++ ldapdns-2.06/ldapdns.c	2005-07-29 17:50:21.000000000 -0300
+@@ -21,6 +21,7 @@
+ 		list_push(&x, lp->str);
+ 		list_push(&seen, lp->str);
+ HIT:
++	continue;
+ 	}
+ 
+ 	lp = *p;
diff --git a/net-dns/ldapdns/ldapdns-2.05.ebuild b/net-dns/ldapdns/ldapdns-2.05.ebuild
index 054d4ca9106c..8f41d4aa4103 100644
--- a/net-dns/ldapdns/ldapdns-2.05.ebuild
+++ b/net-dns/ldapdns/ldapdns-2.05.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ldapdns/ldapdns-2.05.ebuild,v 1.6 2005/04/13 17:45:53 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ldapdns/ldapdns-2.05.ebuild,v 1.7 2005/07/29 21:03:11 vanquirius Exp $
+
+inherit eutils
 
 DESCRIPTION="A tiny, fast authoritative nameserver that queries LDAP and can be updated instantly"
 SRC_URI="http://www.nimh.org/dl/${P}.tar.gz"
diff --git a/net-dns/ldapdns/ldapdns-2.03.ebuild b/net-dns/ldapdns/ldapdns-2.06.ebuild
index 43d2d953161f..6cc7bfc72bd8 100644
--- a/net-dns/ldapdns/ldapdns-2.03.ebuild
+++ b/net-dns/ldapdns/ldapdns-2.06.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ldapdns/ldapdns-2.03.ebuild,v 1.10 2005/03/03 18:18:57 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ldapdns/ldapdns-2.06.ebuild,v 1.1 2005/07/29 21:03:11 vanquirius Exp $
+
+inherit eutils
 
 DESCRIPTION="A tiny, fast authoritative nameserver that queries LDAP and can be updated instantly"
-SRC_URI="http://www.nimh.org/dl/${P}.tar.gz"
 HOMEPAGE="http://www.nimh.org/code/ldapdns/"
-IUSE=""
-
-SLOT="0"
+SRC_URI="http://www.nimh.org/dl/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
 
 DEPEND="virtual/libc
 	>=net-nds/openldap-2"
@@ -17,29 +18,30 @@ RDEPEND="${DEPEND}
 	>=sys-process/daemontools-0.70
 	sys-apps/ucspi-tcp"
 
+pkg_setup() {
+	enewgroup nofiles
+	enewuser ldapdns -1 /bin/false /nonexistent nofiles
+	enewuser dnslog -1 /bin/false /nonexistent nofiles
+}
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
 src_compile() {
 	local myconf="--prefix=/usr "
 
 	cd ${S}
 	./configure ${myconf}
-	emake || die "Compilation failed"
+	emake || die
 }
 
 src_install() {
-	einstall || die "Installation failed"
-
-
-	dodoc AUTHORS CHANGELOG FAQ INSTALL  COPYING NEWS README* TODO
+	einstall || die
+	dodoc AUTHORS CHANGELOG FAQ INSTALL COPYING NEWS README* TODO
 }
 
 pkg_postinst() {
-
-	groupadd &>/dev/null nofiles
-
-	id &>/dev/null ldapdns || \
-		useradd -g nofiles -d /nonexistent -s /bin/false ldapdns
-	id &>/dev/null dnslog || \
-		useradd -g nofiles -d /nonexistent -s /bin/false dnslog
-
 	einfo "Read the readme.configure and use ldapdns-conf to setup"
 }