Fixed bug #299803.

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

4 files changed, 114 insertions, 3 deletions

diff --git a/net-libs/ldns/ChangeLog b/net-libs/ldns/ChangeLog
index 15fa264c6768..e0be68b9d9ec 100644
--- a/net-libs/ldns/ChangeLog
+++ b/net-libs/ldns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/ldns
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.3 2009/12/04 16:36:34 matsuu Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.4 2010/01/11 03:17:24 matsuu Exp $
+
+*ldns-1.6.3-r1 (11 Jan 2010)
+
+  11 Jan 2010; MATSUU Takuto <matsuu@gentoo.org> +ldns-1.6.3-r1.ebuild,
+  +files/ldns-1.6.3-r3151-fix-double-free.patch:
+  Fixed bug #299803.
 
 *ldns-1.6.3 (04 Dec 2009)
 
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index e6ee8b825abd..9f047c650002 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,6 +1,8 @@
+AUX ldns-1.6.3-r3151-fix-double-free.patch 1264 RMD160 18f47bab53b72cfb9658fca61b3057ce186a3f34 SHA1 0aa15c79b258ca73780aa8e8355cea9dc9101fbe SHA256 35b87013de606bff37f18ce7f9f6bc9c7cb49c0daa1655d2268cd5414330e46b
 DIST ldns-1.6.2.tar.gz 828024 RMD160 2c701d5bb8710f0d5808ead1bdcc2c0ef4e09875 SHA1 d8650b9466f5f2793ef72a1e571606c8479b5cf7 SHA256 65b54523cefd3922a874865e68d072bcb5af21bbf9c676afcbc7506f34209e64
 DIST ldns-1.6.3.tar.gz 832093 RMD160 83c314455f286d698d2d8017dc9b1c841fad0823 SHA1 87ce9cc8e4bf82f6d8668c915a08dfba20dd1b7c SHA256 eaa760bc8d58b65dee49d7072a281bef86b394045b21e0c1d6a5233049f4ddfa
 EBUILD ldns-1.6.2.ebuild 1127 RMD160 a4184a124dfdf44fbf109360b86bfab2427625ec SHA1 1f8cfc532763bcfd5f4cd54efca68b6dbc529aab SHA256 688ab00223ab1e355334d2ca529c92bb346839984ea5a06500b5fea894f0ca48
+EBUILD ldns-1.6.3-r1.ebuild 1221 RMD160 a0e63164c2c3c4850679629af1295d3239a02188 SHA1 238f3cbf9b73f8251ad85efdb5667e28fadceb7f SHA256 bfbc0ef97358e0b11e05b0b1069f3fdfaf194d49c75001aed0fb515424634e6d
 EBUILD ldns-1.6.3.ebuild 1129 RMD160 76a58088f80bf803bdf3fce78a6e44786610ec06 SHA1 964d70ee4937265f7b5bc9cda23b1e793611ac36 SHA256 3d949e7231a9800f05efce890dabc8f37bcb72d2fc39381bb667bf0c4c752dc7
-MISC ChangeLog 571 RMD160 9237e08f5f29ac7dae9f0b7ee84e4d8ef8529ab9 SHA1 793239acfd92b78ae4065293f6e290d98e35ebac SHA256 dd3b44066aabe2d0950878822413fac9239a423f6254767f95e66401acb583a6
+MISC ChangeLog 744 RMD160 c9599051edd2064d607c7b99996e9a2e66d3c3dc SHA1 7fecb34282dcb888f5c90bb4821f5f4a1a1f586e SHA256 38baa909c5461139bcdc066d3baf17e888e30d65d92377032032394425b698f6
 MISC metadata.xml 484 RMD160 dee5f1cbdb0ad0101faac5676ab4378cd0290b6d SHA1 01b8d1137de017a179d538fcdf0d1f2958fe986f SHA256 d2d57f3f2c90ccc8eb3e3768a151a1c0bf944335b8a994b35e268e176a5ab768
diff --git a/net-libs/ldns/files/ldns-1.6.3-r3151-fix-double-free.patch b/net-libs/ldns/files/ldns-1.6.3-r3151-fix-double-free.patch
new file mode 100644
index 000000000000..8dd310d430e0
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.6.3-r3151-fix-double-free.patch
@@ -0,0 +1,52 @@
+Index: higher.c
+===================================================================
+--- higher.c	(revision 3150)
++++ higher.c	(revision 3151)
+@@ -198,7 +198,7 @@
+ 						break;
+ 					}
+ 				}
+-				strncpy(addr, word, LDNS_IP6ADDRLEN);
++				strlcpy(addr, word, LDNS_MAX_LINELEN+1);
+ 			} else {
+ 				/* la al la la */
+ 				if (ip6) {
+Index: packet.c
+===================================================================
+--- packet.c	(revision 3150)
++++ packet.c	(revision 3151)
+@@ -456,17 +456,12 @@
+ {
+ 	uint16_t rid = 0;
+ #ifdef HAVE_SSL
+-	unsigned char *rb;
+-	rb = LDNS_XMALLOC(unsigned char, 2);
+-	if (RAND_bytes(rb, 2) == 1) {
+-		rid = ldns_read_uint16(rb);
+-	}
+-	LDNS_FREE(rb);
+-#endif
+-	if (rid == 0) {
++	if (RAND_bytes((unsigned char*)&rid, 2) != 1) {
+ 		rid = (uint16_t) random();
+ 	}
+-
++#else
++	rid = (uint16_t) random();
++#endif
+ 	ldns_pkt_set_id(packet, rid);
+ }
+ 
+Index: net.c
+===================================================================
+--- net.c	(revision 3150)
++++ net.c	(revision 3151)
+@@ -652,6 +652,8 @@
+         if (!data) {
+                 return NULL;
+         }
++	/* zero the structure for portability */
++        memset(data, 0, sizeof(struct sockaddr_storage));
+         if (port == 0) {
+                 port =  LDNS_PORT;
+         }
diff --git a/net-libs/ldns/ldns-1.6.3-r1.ebuild b/net-libs/ldns/ldns-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..285ee733aefa
--- /dev/null
+++ b/net-libs/ldns/ldns-1.6.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.3-r1.ebuild,v 1.1 2010/01/11 03:17:24 matsuu Exp $
+
+EAPI="2"
+inherit eutils
+
+DESCRIPTION="ldns is a library with the aim to simplify DNS programing in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ssl vim-syntax"
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7 )"
+DEPEND="${DEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-r3151-fix-double-free.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_enable ssl sha2) \
+		$(use_with ssl) \
+		--disable-rpath || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use doc ; then
+		emake doxygen || die "emake doxygen failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc Changelog README* || die "dodoc failed"
+
+	if use doc ; then
+		dohtml doc/html/* || die "dohtml failed"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins libdns.vim || die "doins libdns.vim failed"
+	fi
+}