version bump and older version cleanout as per security bug #230263 thanks rbu

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.22-vs2.2.0.7-gentoo x86_64

5 files changed, 13 insertions, 95 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 59e3c08989a8..d9911cd29b9d 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.158 2008/06/19 09:26:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.159 2008/07/01 12:38:39 dragonheart Exp $
+
+*gnutls-2.4.1 (01 Jul 2008)
+
+  01 Jul 2008; Daniel Black <dragonheart@gentoo.org>
+  -files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch,
+  -gnutls-2.3.11.ebuild, -gnutls-2.4.0.ebuild, +gnutls-2.4.1.ebuild:
+  version bump and older version cleanout as per security bug #230263 thanks rbu
 
 *gnutls-2.4.0 (19 Jun 2008)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 096e718bcb1f..de38e95159b7 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,12 +1,9 @@
 AUX gnutls-2.3.11+gcc-4.3.patch 349 RMD160 192c663f741c6a2b6681b3873c199c64996d0000 SHA1 657ed9b73f7cfcbf348b94cff9f1ab9c2f8c7b59 SHA256 30dc6126ffa85a4765ca4724355759932990545c962ef2239fdb692af631e018
-AUX gnutls-2.3.15-qa_gnutls_session_is_psk.patch 394 RMD160 99e4e2077b09bb85f5af8084ab1423161fa7a89b SHA1 2529eca0a983af63ac588e8371094f70fbbc258f SHA256 cbd9ce3568ad99afc3e5293e05b277acefee6e977ea9f6676e3d3692a43266bd
 DIST gnutls-2.0.4.tar.bz2 4911330 RMD160 e7fa86f5f9a78da73575507025cde8be6cdc0be6 SHA1 52e17e749a0ad35c54ef204d43ceecda9e5b70d7 SHA256 af07625c701f4d3b2e44b6cb1f9fcf55f8b45942abdf88cfa61a95ca30d6f91f
 DIST gnutls-2.2.5.tar.bz2 4920322 RMD160 dd48a780849fc81c0a688116984eab8f41ea8ebf SHA1 7620d092c790f0a5ac5486c3563786ca8777083d SHA256 cf2689bd5b5f095e27f7a1aa2246212ef9322c0707aeb104238e9eb0f925ae57
-DIST gnutls-2.3.11.tar.bz2 4958034 RMD160 010d7d770abb3327b5d83e6639193197472f06e8 SHA1 f3ddf4ba9df7709f60acfde98ef0ec6842a481b8 SHA256 b874af4ba925e0544709d6712a32d70d4a63f7be3bb1158800591e36d2e85853
-DIST gnutls-2.4.0.tar.bz2 4942092 RMD160 9bbf7420f1dff7d1658b027e5103c6835e08d80d SHA1 9bb3be9f2ad67037d3a571bec4fac65e0ffbadbb SHA256 c682bca6f1ccc28bdc15751168893e0b28107217b275168b456d519292e44d87
+DIST gnutls-2.4.1.tar.bz2 4940118 RMD160 4e21a82047add916b8ccce8aa82c36b2c9bcff90 SHA1 7a439542e6344d5ccf11a29431a0600e7fe1c735 SHA256 d91401a6828d7300dc2b1106ff99610479aa35af05d39746cacdab8cdc7be5fd
 EBUILD gnutls-2.0.4.ebuild 1436 RMD160 d42ecdcf9259e92457a89b237ed581c19a741494 SHA1 35e2e1c2344ae807987a34a844d54aff29747944 SHA256 cf562ea795bbed27aa91f8c5cf9c6ef65a9b3beb7ceff91005ae49e63e30c70f
 EBUILD gnutls-2.2.5.ebuild 2043 RMD160 2c4f68d97694f8781c45a324db6371c99d2d36a4 SHA1 c23daf33e445aa16ba74e09df0427ad5b98b5eb8 SHA256 0c83127f5c5ff30148c8f0ac86195459cbceae8b068b1e68fd5af93940450f9c
-EBUILD gnutls-2.3.11.ebuild 2045 RMD160 15b14da7e36a2317981760c3556ce0727fdd0b8f SHA1 96deed931e361f673625a790512fd935e3521913 SHA256 45ccb0545cd7190f45ca98ffd633695dcba45cc503508afc949556f49040f0b6
-EBUILD gnutls-2.4.0.ebuild 2118 RMD160 e5b3fd883d927f5cec395326a2bb73225e1cb457 SHA1 9adb7de23228ac246178eeec06195943e807edfb SHA256 144ba3483f6e0576f8cc61bc704cc506b6803a4bb4bee79935a59b3b7f94a500
-MISC ChangeLog 23161 RMD160 9f283d2cc479c6e062e7946ae1fbb83a3e0a8af1 SHA1 515ef593ee121a6ca2e2793dd62e8a653844e865 SHA256 b6f1458d2496f8d2b3ded1dbe5e9ed0b4407ba5800129b07b6dea8a6fb142014
+EBUILD gnutls-2.4.1.ebuild 2052 RMD160 8a74679b229058e4aa3ecbf454ce8ba07837059b SHA1 52070fac95a39f9a2ca3e893ee835e692b246978 SHA256 bcc3827be9cbcae747fc754a7864b319e938c1d7f6a4b89ee255b5de2111e6a5
+MISC ChangeLog 23449 RMD160 da6bb1b1d819ccb99653b47cbb0705b9e5095487 SHA1 778a647f85dfd869d972f7b157be974785acc660 SHA256 dcf00ad0aabaab75b571e7ae7aba4e809eb54f8a3eef155bed168fa7b68867ea
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/net-libs/gnutls/files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch b/net-libs/gnutls/files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch
deleted file mode 100644
index c8977c6f3bd5..000000000000
--- a/net-libs/gnutls/files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./lib/gnutls_state.h.orig	2008-06-19 18:54:50.000000000 +1000
-+++ ./lib/gnutls_state.h	2008-06-19 18:55:57.000000000 +1000
-@@ -58,6 +58,7 @@
- 
- int _gnutls_session_is_resumable (gnutls_session_t session);
- int _gnutls_session_is_export (gnutls_session_t session);
-+int _gnutls_session_is_psk (gnutls_session_t session);
- 
- int _gnutls_openpgp_send_fingerprint (gnutls_session_t session);
- 
diff --git a/net-libs/gnutls/gnutls-2.4.0.ebuild b/net-libs/gnutls/gnutls-2.4.0.ebuild
deleted file mode 100644
index ddb909b0f64e..000000000000
--- a/net-libs/gnutls/gnutls-2.4.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.4.0.ebuild,v 1.1 2008/06/19 09:26:25 dragonheart Exp $
-
-inherit libtool autotools eutils
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="http://www.gnu.org/software/gnutls/releases/${P}.tar.bz2"
-#SRC_URI="mirror://gnu/gnutls/${P}.tar.bz2"
-
-# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="zlib lzo doc nls guile bindist"
-
-RDEPEND="dev-libs/libgpg-error
-	>=dev-libs/libgcrypt-1.2.4
-	>=dev-libs/libtasn1-0.3.4
-	nls? ( virtual/libintl )
-	guile? ( dev-scheme/guile )
-	zlib? ( >=sys-libs/zlib-1.1 )
-	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use guile && ! built_with_use dev-scheme/guile networking; then
-		eerror "You are trying to compile ${PN} package with USE=\"guile\""
-		eerror "while dev-scheme/guile does not have USE=\"networking\""
-		die
-	fi
-	if use lzo && use bindist; then
-		ewarn "lzo support was disabled for binary distribution of gnutls"
-		ewarn "due to licensing issues. See Bug 202381 for details."
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-2.3.11+gcc-4.3.patch
-	epatch "${FILESDIR}"/${PN}-2.3.15-qa_gnutls_session_is_psk.patch
-
-	elibtoolize # for sane .so versioning on FreeBSD
-}
-
-src_compile() {
-	local myconf
-	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-	econf  \
-		$(use_with zlib) \
-		$(use_enable nls) \
-		$(use_enable guile) \
-		$(use_enable doc gtk-doc) \
-		${myconf}
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS \
-		README THANKS doc/TODO
-
-	if use doc ; then
-		dodoc doc/README.autoconf doc/tex/gnutls.ps
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-2.3.11.ebuild b/net-libs/gnutls/gnutls-2.4.1.ebuild
index 9101260b1878..4a65048ee4f4 100644
--- a/net-libs/gnutls/gnutls-2.3.11.ebuild
+++ b/net-libs/gnutls/gnutls-2.4.1.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-libs/gnutls/gnutls-2.3.11.ebuild,v 1.3 2008/06/19 09:11:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.4.1.ebuild,v 1.1 2008/07/01 12:38:39 dragonheart Exp $
 
 inherit libtool autotools eutils
 
@@ -44,7 +44,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
+	epatch "${FILESDIR}"/${PN}-2.3.11+gcc-4.3.patch
 
 	elibtoolize # for sane .so versioning on FreeBSD
 }