Version bump, contains fixes for CVE-2011-4093 and CVE-2011-4091, drop old

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 26 insertions, 60 deletions

diff --git a/net-libs/net6/ChangeLog b/net-libs/net6/ChangeLog
index 6a300a51133e..715d6a0a0ee5 100644
--- a/net-libs/net6/ChangeLog
+++ b/net-libs/net6/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/net6
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/ChangeLog,v 1.41 2011/10/30 09:08:38 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/ChangeLog,v 1.42 2011/10/31 20:28:13 xarthisius Exp $
+
+*net6-1.3.14 (31 Oct 2011)
+
+  31 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> -net6-1.3.13.ebuild,
+  -files/net6-1.3.13-gnutls3.patch, +net6-1.3.14.ebuild:
+  Version bump, contains fixes for CVE-2011-4093 and CVE-2011-4091, drop old
 
   30 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> net6-1.3.13.ebuild,
   +net6-1.3.13-gnutls3.patch:
diff --git a/net-libs/net6/Manifest b/net-libs/net6/Manifest
index 32168f897461..448467e06fa5 100644
--- a/net-libs/net6/Manifest
+++ b/net-libs/net6/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX net6-1.3.13-gnutls3.patch 962 RMD160 4c1fa37b55371fb80483d17d7dc88fc913f3b54e SHA1 042438471848f029dc42ea35b90f47b5e499cf92 SHA256 2d708e7e7ac9e916bff5b1ab7446b16b8ba01935e92b151fc6d5337162d37979
 AUX net6-1.3.9-libgnutls.patch 738 RMD160 61adf918c10596cd66b3d75a950b190eeb76f71e SHA1 3b35519e3ff2cd2bddfb45fbf945bfafa35e116b SHA256 984b603d8b0e3e2ca2a5e62316dcc7a246e3f9d2346a592b9b82cb6f3e888cc5
-DIST net6-1.3.13.tar.gz 465003 RMD160 d86dae018b8443ff4af0a531f3ba78c5a41c5c46 SHA1 48b77f6d67fa17447cd5100320dc773d927fb02e SHA256 b2513810d42dbf89f0e98ed5c1702cbfb4f9c7f04c66b6c70fa7d5c3a284d80c
+DIST net6-1.3.14.tar.gz 483549 RMD160 c1445cdf2e7a34d0639d7bb410404d83ab972d27 SHA1 7523a604e6b7f723cdd7f457f8f7c8c9cf48dae1 SHA256 155dd82cbe1f8354205c79ab2bb54af4957047422250482596a34b0e0cc61e21
 DIST net6-1.3.9.tar.gz 449368 RMD160 178c0093edfc9edc3f11afed06c4743ef86052e8 SHA1 86c15f3b3bcd89bfa8da9cef68518b32349ba36f SHA256 46af4422e453836038c2b19b25ae60b27d028b8f7c645b71b20dc0069383f202
-EBUILD net6-1.3.13.ebuild 897 RMD160 0050497d8de2c5c18d4b556612cdeee93a134c11 SHA1 c6b7cd5d8474e6fa84b1e23316f44514f678b6c4 SHA256 d1a938196ee5408e75418666a09fd681f2f47bfe065dce4d465733c1d6144669
+EBUILD net6-1.3.14.ebuild 833 RMD160 4968464ce53fee1056b72b2d960d5cbb3c883600 SHA1 76a220f244831e91e7fc556ee42d37d97e2996ae SHA256 b20ef187b9e49b7e4fcda3ff61e699a130481a47f4a0644ea037fe8d3d733711
 EBUILD net6-1.3.9.ebuild 930 RMD160 119672f14ba0694dd6a659cca5415b2edb219421 SHA1 5a29cbe33ebbc2ae85b59141ca728635f252c4f6 SHA256 fd6349c0a150c5368dc9677e289eada557fe8fd4cf439ef035005d6938891c1c
-MISC ChangeLog 6067 RMD160 901d46a2461b34ec0372d46b4f5f6085230483ce SHA1 57bde15d930282044137359e7c8342b4c3fc2419 SHA256 3671cec585b57885329e908149adc28297da90939ccfa5a3904de7d5f07536c0
+MISC ChangeLog 6305 RMD160 e72a68922d6d425745dd77691672f1db1cc11aac SHA1 0ff15845eec2a55035b4a71c0e514e13cea932b6 SHA256 6fb22246cf21c26189178fb86c536b6075de017e9fe83517ff5ab117a9ae6248
 MISC metadata.xml 458 RMD160 420550d887fc3c2813427e052d48ed4cb29da559 SHA1 03b7a099986673f01eb96361dd76c16e5b971e20 SHA256 73017b840e664a764f316751b00480347fd28ffce91df371b9e5e23edcd2684e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOrRQbAAoJEF0huFKJUZL5T5AP/2MuS5u5mi3UNAwRwcpZTzFi
-vroOdYnbXQc+HKE4M7wTwnIgn7UC7vj/x7T31yQX2WZRnDnv+R3L/A3Swohho4X9
-CVi6BJMhKQwnHCAy5AnjECtxExms9rBAO2BjQ5Vs6pImv8mgC4V+nVBkR9DlYi4N
-4TniH7UObK9mE2ftOZg8+HQPecwR/S++StQzmVaVjgaAzosvp9hgpUmnclyuiM2l
-zT977qDSLr2yjbFJjC+zI3pBK4SH3fE1HvbEry8ha0JluRDYSj+dpt5RGX3uLBaY
-nQPmSCo4zXFI7yPt1PZYH2gSkZhhhVm4w4zskML3OID2FCmnFVpvbM4KDBvdjllP
-AWn14YEjCU95KIyY3vuOQ3nT1JR+uoMMy2pF5d58bDlNLdHclSb/J53/pKJOaDKP
-xTGLVIu+ve2rnjCixsDheqJ3bdoMlIhLaAvHU1kdX4WXAM6zTX6ew21AG41H/avK
-7qogUX1AmEvXSs1BttjpWbZe3KEpg1UmnKP/eXH4eCFI709KMa1MwgrM0lXDs7jA
-tpU5naNBCOeSE3FoPNGKjL1qS/cLoebPmXuDQKWhfIn1mJTnaYw2qEd0Em9hCqAU
-+Ez9za46yonlXvXIuhpH1gji646Gkusd/kE6+/bLErpsvElNxXYe83eoheaNK6dW
-1GHUkF7PyHYyi/NepH3t
-=b6lJ
+iQIcBAEBCAAGBQJOrwToAAoJEF0huFKJUZL5xTsP/iauFPQKd9s567pM5jviPxn2
+j0XUfZs2AAeN9S3TKKkY9sNSNh8HFc7C4DmJTWQZKK/x5dSwit12hOk0DtAHnjlY
+JTvuL3kijYweYN4h5hDEILM8VY1TyLbtZOIAPjsRFK9pXBrgbRhd3OTILffEEsCy
+ufkV/+ibr1gdeYNBEgBVf48oHa9Zkwi/L0a3HWxAuY+2VYZdSb6o4VUc7F/5dYBJ
+C2Dcupg4cMfh77bCI0DRR+2Dl8s3NxB/i75en4rmzu8KEhIzEwEfZ6E7eZtwZ8Cn
+k2YMZmSC49vWiSkzio/iVgcHdEGj0TN61cZx0ARSeEUrUCo55w0U5iG8t2UnRwUP
+4V9xH7m+e51zddBGaPCUFOve+XfyndKDkYfvbfOfbGm+a5YIjfWz2RwU40HGaxnF
+jS1khJkJ+O+En4W4ONxd2/sCQy/UCC0u8g5b2iJuXx/jMPF8ebbaB1r0PLSyDuWr
+DbjqfqIxyXHOy+IqlIvdJfrdxbxa0l6elA3G84H3meQHBv2hN+6BEUBDedpUv2A1
+SXZpnVYMygwaKIs5diPkbVW1WVLpsF96alylPQYORYw0jkiACxizHWGtAQ3o/18e
+aUxwfVDLJ4R/oABxxHCJaTAPpeQVZIcZtdJBYvbnpgHupRS+vHYbXHyVmivl7Wmk
+94OaHJLqXa+RBBta6vsB
+=ozsj
 -----END PGP SIGNATURE-----
diff --git a/net-libs/net6/files/net6-1.3.13-gnutls3.patch b/net-libs/net6/files/net6-1.3.13-gnutls3.patch
deleted file mode 100644
index 4e2757b339bc..000000000000
--- a/net-libs/net6/files/net6-1.3.13-gnutls3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Backporting upstream patch to fix build failure with gnutls-3
-
-https://bugs.gentoo.org/show_bug.cgi?id=388897
-
---- a/inc/encrypt.hpp
-+++ b/inc/encrypt.hpp
-@@ -34,7 +34,6 @@
- typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t;
- typedef gnutls_transport_ptr gnutls_transport_ptr_t;
- typedef gnutls_dh_params gnutls_dh_params_t;
--typedef gnutls_connection_end gnutls_connection_end_t;
- 
- class dh_params: private net6::non_copyable
- {
---- a/src/encrypt.cpp
-+++ b/src/encrypt.cpp
-@@ -25,7 +25,7 @@
- {
- 	const unsigned int DH_BITS = 1024;
- 
--	net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end)
-+	net6::gnutls_session_t create_session(gnutls_connection_end_t end)
- 	{
- 		net6::gnutls_session_t session;
- 		gnutls_init(&session, end);
-@@ -202,7 +202,9 @@
- 	);
- #endif
- 
-+#if GNUTLS_VERSION_NUMBER < 0x030003
- 	gnutls_transport_set_lowat(session, 0);
-+#endif
- }
- 
- net6::tcp_encrypted_socket_base::~tcp_encrypted_socket_base()
diff --git a/net-libs/net6/net6-1.3.13.ebuild b/net-libs/net6/net6-1.3.14.ebuild
index 2a36b2e16704..7299caceb831 100644
--- a/net-libs/net6/net6-1.3.13.ebuild
+++ b/net-libs/net6/net6-1.3.14.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/net6-1.3.13.ebuild,v 1.3 2011/10/30 09:06:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/net6-1.3.14.ebuild,v 1.1 2011/10/31 20:28:13 xarthisius Exp $
 
 EAPI=4
 
-inherit eutils multilib
+inherit multilib
 
 DESCRIPTION="Network access framework for IPv4/IPv6 written in C++"
 HOMEPAGE="http://gobby.0x539.de/"
@@ -23,10 +23,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gnutls3.patch
-}
-
 src_configure() {
 	econf $(use_enable nls) \
 		$(use_enable static-libs static)
@@ -34,5 +30,5 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/${PN}.la
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib${PN}.la
 }