Version bumped, bug #384249.

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

5 files changed, 33 insertions, 90 deletions

diff --git a/net-libs/ldns/ChangeLog b/net-libs/ldns/ChangeLog
index 8dbe50afc2b8..61f53d8b883a 100644
--- a/net-libs/ldns/ChangeLog
+++ b/net-libs/ldns/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/ldns
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.18 2011/06/01 23:05:47 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.19 2011/09/30 14:56:58 matsuu Exp $
+
+*ldns-1.6.11 (30 Sep 2011)
+
+  30 Sep 2011; MATSUU Takuto <matsuu@gentoo.org>
+  -files/ldns-1.6.3-r3151-fix-double-free.patch, -ldns-1.6.8-r1.ebuild,
+  -files/ldns-1.6.8-swig.patch, +ldns-1.6.11.ebuild:
+  Version bumped, bug #384249. Removed old versions.
 
 *ldns-1.6.10 (01 Jun 2011)
 
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index ecda51a42dd6..d99eade5ae0c 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,24 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX ldns-1.6.3-r3151-fix-double-free.patch 1264 RMD160 18f47bab53b72cfb9658fca61b3057ce186a3f34 SHA1 0aa15c79b258ca73780aa8e8355cea9dc9101fbe SHA256 35b87013de606bff37f18ce7f9f6bc9c7cb49c0daa1655d2268cd5414330e46b
-AUX ldns-1.6.8-swig.patch 658 RMD160 1416571f7afa6ca7171bb0da8e068d78c8805b20 SHA1 be20a8596cb399e0f69a3637fcae60aa21a98c1c SHA256 870ce09cd4a6c4ec82bc21822a26c4d62fcfa99f8283d225ec15ec0c37d2dfdc
 DIST ldns-1.6.10.tar.gz 999717 RMD160 0401368c96c5b1ae9a781ee4c9441652a5e86af5 SHA1 7798a32c6f50a4fb7d56ddf772163dc1cb79c1a4 SHA256 a421aa71230045e0d22a97db8c4ffbc049ee06b064de141912da270db7217a8f
+DIST ldns-1.6.11.tar.gz 1018369 RMD160 7580869e4b8bdd2d31cb08cb690c2e3d0663f381 SHA1 2c4537eee39a1af63e8dde4f35498ce78c968c1f SHA256 6891b8ea8e9ded3e7d2caaaf494a8c2459bab729cdd1716f6db2ba375f628888
 DIST ldns-1.6.4.tar.gz 895432 RMD160 1c9d78c01bc8ba6825cdc56b0be81236015e9ebd SHA1 9015968ad3ddd015c750c15b60e60b9cccd393ec SHA256 ad4d0142a84463ea646571656254694b5325545bc12bbb238358a0506e6eeb05
-DIST ldns-1.6.8.tar.gz 968066 RMD160 480e85795ed48725e41fdb18770235a35030af54 SHA1 e736160f36b7dcc0303269d3c0a9be88b7ad10c4 SHA256 8f0180aa742964f7d14256c48fd4a4d175d192422dd7d00b1dbc2d5281db403e
 DIST ldns-1.6.9.tar.gz 984563 RMD160 525fc08801500681257342e8789f0afc813b2b28 SHA1 30d136792433bef44454dc1c70bf55449160c3ad SHA256 13a0b666ba391920e1e584b773ccb07f5f2227020763b4777689b9bb635b871e
 EBUILD ldns-1.6.10.ebuild 1672 RMD160 adc32995e9b8848580265807d42581586fa9da84 SHA1 b7bcd1071dace103ab0ef9d5f5cf2d7de6bf204e SHA256 d9b3710aca2e11c3573960bae51c2ca7c1f47d25b3b072a9b6b81501c804412d
+EBUILD ldns-1.6.11.ebuild 1672 RMD160 852d607cf3065b6a1f7e08dea7203bba6da0b052 SHA1 2d371dc455638de8416e4174373ed9cc5fb1521f SHA256 843b674f74c912e3d0b22e97eaa3d9b1504e6b3ae6cd3d5828c7acb14bd16571
 EBUILD ldns-1.6.4.ebuild 1273 RMD160 3e1aabc1d815c0362c24ba3ab11b7dec01fec90e SHA1 e6cc54421d884962be66728e9ba09cc81ae43729 SHA256 8c5e383c95ee23744d21d653a8c092c092d0f1c7d6bb8487d6429eafe9e13b81
-EBUILD ldns-1.6.8-r1.ebuild 1606 RMD160 e1fe1f91d52c4634e8e18cfa63081c7f278ae816 SHA1 404c161059a032e0f05d80ac960a6547b11b7062 SHA256 f311fc0f6789b9bd12f45db7f300f5552fb9e6d109f08c1b0199be8249887652
 EBUILD ldns-1.6.9.ebuild 1585 RMD160 f91e21160cdc7a8f8ddbe24adea6cd0cdd632b18 SHA1 57057f378263bf814df33934deef6a860108c70a SHA256 6ac1541a6d9a0a37698846d434b8bfa6538e71c819ef9efdea5d7c5a2bf71c07
-MISC ChangeLog 2676 RMD160 73884f34b5169527cf00d7b02b7e9eeb05d75895 SHA1 c185423b7aee83bde3ff623bcf28fb3c6ba44d4f SHA256 7e78798dfd14b94706eb0eb022456b7207e41f01f13e1c91fccbf0d592828ef1
+MISC ChangeLog 2932 RMD160 17cf8710edb5646d8775628a81392a886abefe7a SHA1 3d8245da3b1d87ff08f9d1eb235e8de3dd634b91 SHA256 4e1bb95e609ebe02e903d2e36886180aec00c498a01769b2148d742f90c05c7b
 MISC metadata.xml 522 RMD160 4f1173d7ac98d44d8f82029285ed669a5323823c SHA1 ea1b07b44f442429cff45dfbccfee89a5f644845 SHA256 624abeb470d3376958e49dce8675f024b4c56ec50171805fa212fee6a496a920
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rU4ACgkQfXuS5UK5QB084QP9FXc05gp7cQ57OsR5Dgath5vc
-cu9mndAWewjRkxVcJVNgEhBHFIySK6c/8Yx4rLPoW0ZXBtrlTTtSO6by/rro5UtI
-cjrzljqmApUlE8fi+17JlDdy+unCTDOqzQUpMpawrIfo7jmGdyLfJyE9cWVBYSz8
-iHwpi6wQG0o/0/UqBos=
-=WkYs
+iQIcBAEBAgAGBQJOhdjLAAoJECaGw+YFKA1pZngP/1vmOTAxzsr12qHyxFfkZZ2F
+u66iw7VolRrXgpWwds1W3sCjDHCyEPi6FKFy/df1P6jmhNPRvG4cpT04TJKVv99z
+LBGfM4WtrS7p7dWtmjaX4cKI5GTodeQrrBgK7ommqE38k0DEFHe6oSlo37sXS0iS
+Am6C28+uW4Qz6ccPKJUXBu/31cKuo8r4iHl79LdFuos78EG05iJwXkQhEviVCoyq
+7P3H/u3S8UjmM2kZzOFI+VKXXBK+cge5u2fpdMubjvQ6ujekaDlzeqRccmL/QyHl
+tqWcIKPUrAqdw9VuWNYGXxgxSMtHrg7DNFrCJnYRU+u2r32SG9Hg2GXmYiobgsRh
+fd4aLoKkJM2Uakv7h5zqWZhw3t5ImIv8CmDOLlQPMugJb8A6+TYjYqrp28Li8osT
+0eRzfnGJc4isOEySUd/UqYpi+Blfl/mXJYT3WoyWi09EN7t3EaR2tJUiPUq9EhQR
+mJHnTxz1IKrtoogHDJQ4Bm8KQ2lS8ACxFTeuI2YBCPyHRgTx9v1NL33CbCQlFUov
+uOautFsMG9T9f6KdyX7Hz6onRYQFrWS5+QmS5atrIVDenFP2daYP0l7WiA9XLMqG
+wwaZsThkdecCbeT1tuuZTLY3ryvoWFO6RI7+40O6QC/jpJdEyF1byMnNS0pedZJi
+WA8SUz2zwCI4/UzKPRPC
+=v0RS
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 8dd310d430e0..000000000000
--- a/net-libs/ldns/files/ldns-1.6.3-r3151-fix-double-free.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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/files/ldns-1.6.8-swig.patch b/net-libs/ldns/files/ldns-1.6.8-swig.patch
deleted file mode 100644
index bad69831fd8a..000000000000
--- a/net-libs/ldns/files/ldns-1.6.8-swig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: trunk/contrib/python/ldns.i
-===================================================================
---- trunk/contrib/python/ldns.i	(revision 3440)
-+++ trunk/contrib/python/ldns.i	(revision 3441)
-@@ -113,13 +113,13 @@
- %include <ldns/higher.h>
-   %include <ldns/host2str.h>
-   %include <ldns/host2wire.h>
--%include <ldns/net.h>//ruzne fce
-+%include <ldns/net.h>
-   %include <ldns/packet.h>
-   %include <ldns/rdata.h>
-   %include <ldns/resolver.h>
-   %include <ldns/rr.h>
- %include <ldns/str2host.h>
--%include <ldns/tsig.h> //potrebuje wire
-+%include <ldns/tsig.h>
-   %include <ldns/update.h>
- %include <ldns/wire2host.h>
-   %include <ldns/rr_functions.h>
diff --git a/net-libs/ldns/ldns-1.6.8-r1.ebuild b/net-libs/ldns/ldns-1.6.11.ebuild
index 3d14b057fa22..e91624c797fc 100644
--- a/net-libs/ldns/ldns-1.6.8-r1.ebuild
+++ b/net-libs/ldns/ldns-1.6.11.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.8-r1.ebuild,v 1.1 2011/03/03 04:46:43 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.11.ebuild,v 1.1 2011/09/30 14:56:58 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.4"
 
-inherit eutils python
+inherit python
 
 DESCRIPTION="ldns is a library with the aim to simplify DNS programing in C"
 HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
 IUSE="doc gost python ssl static-libs vim-syntax"
 
+RESTRICT="test" # 1.6.9 has no test directory
+
 RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7 )
 	gost? ( >=dev-libs/openssl-1 )"
 DEPEND="${RDEPEND}
@@ -26,10 +28,6 @@ pkg_setup() {
 	python_set_active_version 2
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-swig.patch"
-}
-
 src_configure() {
 	econf \
 		$(use_enable gost) \
@@ -55,6 +53,10 @@ src_install() {
 		find "${ED}$(python_get_sitedir)" "(" -name "*.a" -o -name "*.la" ")" -type f -delete || die
 	fi
 
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -type f -delete || die
+	fi
+
 	if use doc ; then
 		dohtml doc/html/* || die "dohtml failed"
 	fi