more bumps for CVE. Remove old versions

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.25-gentoo-r7 x86_64

6 files changed, 36 insertions, 108 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 41265a123b31..595cf04698f1 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.168 2008/11/10 15:00:56 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.169 2008/11/10 19:55:29 dragonheart Exp $
+
+*gnutls-2.6.1 (10 Nov 2008)
+*gnutls-2.6.0-r1 (10 Nov 2008)
+
+  10 Nov 2008; Daniel Black <dragonheart@gentoo.org> -gnutls-2.4.1.ebuild,
+  gnutls-2.4.1-r1.ebuild, -gnutls-2.5.4.ebuild, -gnutls-2.6.0.ebuild,
+  +gnutls-2.6.0-r1.ebuild, +gnutls-2.6.1.ebuild:
+  more bumps for CVE. Remove old versions
 
 *gnutls-2.4.1-r1 (10 Nov 2008)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 07393234a2fc..2997d0c616ef 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,24 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnutls-2.2.5-CVE-2008-4989.patch 1241 RMD160 aa9afc5fc882fb2c348424a311bf7d72ac8280b3 SHA1 e4cd6fd26f320aa0a8fbe6ca2e57b819091e7c14 SHA256 f92e5fd0c98174ef1c485c1f2070fe8a103a211d1abbb12d625430651db43001
 AUX gnutls-2.3.11+gcc-4.3.patch 349 RMD160 192c663f741c6a2b6681b3873c199c64996d0000 SHA1 657ed9b73f7cfcbf348b94cff9f1ab9c2f8c7b59 SHA256 30dc6126ffa85a4765ca4724355759932990545c962ef2239fdb692af631e018
 AUX gnutls-2.6.0-cxx-configure.in.patch 451 RMD160 d449a7f5de65a6e8768b93dd30c0891dde66884c SHA1 628bc60599692f9d2753cc93ba4e6998552db3bc SHA256 8cfa6fa3ee545b4cd5845f4fa3b9017cddd22568c00222431136486a1b64f1bb
 DIST gnutls-2.2.5.tar.bz2 4920322 RMD160 dd48a780849fc81c0a688116984eab8f41ea8ebf SHA1 7620d092c790f0a5ac5486c3563786ca8777083d SHA256 cf2689bd5b5f095e27f7a1aa2246212ef9322c0707aeb104238e9eb0f925ae57
 DIST gnutls-2.4.1.tar.bz2 4940118 RMD160 4e21a82047add916b8ccce8aa82c36b2c9bcff90 SHA1 7a439542e6344d5ccf11a29431a0600e7fe1c735 SHA256 d91401a6828d7300dc2b1106ff99610479aa35af05d39746cacdab8cdc7be5fd
-DIST gnutls-2.5.4.tar.bz2 5035669 RMD160 ca8a46f2ead196fbf8b0bb85ba26a039bb189e10 SHA1 f73374eed8ff703834979558af1e0cf2d61919b2 SHA256 5309671f0eef1fcb5599d975c544f91b7d8ab19330838e1da0bcd08b152d9ff4
 DIST gnutls-2.6.0.tar.bz2 5112845 RMD160 1d92662edd64e93e658fc527f1dfbfc99ab3a1da SHA1 bbd9e5f3a77bfcbef5a769c67d1576e7a6e4bda5 SHA256 9270a3eab9a9371839af79be92d50b8b21e7fbe157ebe915edae8e352f4e9fb5
+DIST gnutls-2.6.1.tar.bz2 5113327 RMD160 c39539bd5d4e07dc09f5827a8c22d876272b4bbc SHA1 a445e84176bf772794db9d8c71d5515dedb14bcc SHA256 33e7042308f897adcc36e33ed7ac60734486e037b3fb22465c54ef60a285d0a7
 EBUILD gnutls-2.2.5.ebuild 2025 RMD160 af9f9b2cec5ebd1b50a48eb9acae55014d01a464 SHA1 5450b5833019cb6bc809d1ab38dbc40651e8d9b4 SHA256 57732a9022e09682530e3e271b836852f0b9de06aa42fc2b0101df72a862091e
-EBUILD gnutls-2.4.1-r1.ebuild 2094 RMD160 a60a59f76a73b9cfee69f338099a64dd578b8d9e SHA1 b1c0492c2f600717c66a9336361607e2a590c2e1 SHA256 1872d4c6cbbe888f1438424caf2149dcaa7a62b231fe5efbb126e9fb35fb9e15
-EBUILD gnutls-2.4.1.ebuild 2042 RMD160 37348a20c0a3985f40494fb4db04b110470635a7 SHA1 3274aca625492b0fc34c8ff8d6314d68da74469d SHA256 5748c71e75cd46b8a7a3cd3f9a42453abed4d4c2684d3373388eadda2d4c11b6
-EBUILD gnutls-2.5.4.ebuild 2076 RMD160 eab3659e87dcab4aaf919ed4d53842e938911125 SHA1 32969e57d5b3603465d372f2a49e14e9fd50cbf2 SHA256 198f071b5928267e9421343fdc60ba1b08b2565d74aee542564e574971b446dc
-EBUILD gnutls-2.6.0.ebuild 2355 RMD160 d74daf324001c81895b6fbee134ab8401b05f1ea SHA1 74782652c764905062d59519400d708c3b4d5f37 SHA256 c9cff64b80654593aef81229dc6d2f52f87fb66fa1a8ab99101b6daba58e99e6
-MISC ChangeLog 25043 RMD160 e0ddc59e2167bbb6abb7bf1671002e6b3032c6d3 SHA1 9bf6bf49b02169fce368fca54fae4cf5d5df4376 SHA256 4580e7ebe7bd8869611c7101ac250ba285f2160fc70d0ea68bdbf051e8860d60
+EBUILD gnutls-2.4.1-r1.ebuild 2094 RMD160 0bd9d24579332f456fc12002843fa7242f3176d1 SHA1 c70f286956e251efffe3eada5ed26f53b5cc691d SHA256 e69a7f009d2dbfa9a9d3cd550043736fe5b565676a3801d78037ae0a76b8562f
+EBUILD gnutls-2.6.0-r1.ebuild 2412 RMD160 66fba5d3b2a82659d9e9f07ea15335bc93fc0956 SHA1 3aa01fb61653fa014d6531a95b5f8c0069ca7fa8 SHA256 1793bc046f381f6f221b26438cca9f707a647a62c335b067a1ddd41897f67956
+EBUILD gnutls-2.6.1.ebuild 2362 RMD160 88b5d905170b658912da503369d047d2f1bd3652 SHA1 d8366d1d959774a28d1538cfbb829428627ac349 SHA256 02b321b7fe30f9e2070b880561ef136738257a83fa9ce9c928ab49ed4c2b6243
+MISC ChangeLog 25345 RMD160 ea0ddf011743e6b4cdb38efc3a045798720c7c73 SHA1 1e4131faf5e79a6eeb026475c4e906c54e131fc4 SHA256 be2ddbe0224daff8f150b6f79f29f6294ac82b5af823fae8cc07cf8a6596b82e
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkYTLAACgkQSamB34AN3N6jPwCdElGbciwshvMNQECafxGg7RhG
-x5gAn1N5hu5BlNzXAahhgMnUTHLbO95l
-=hXem
------END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-2.4.1-r1.ebuild b/net-libs/gnutls/gnutls-2.4.1-r1.ebuild
index 23286a635b70..ca60990614f0 100644
--- a/net-libs/gnutls/gnutls-2.4.1-r1.ebuild
+++ b/net-libs/gnutls/gnutls-2.4.1-r1.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.4.1-r1.ebuild,v 1.1 2008/11/10 15:00:56 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.4.1-r1.ebuild,v 1.2 2008/11/10 19:55:29 dragonheart Exp $
 
 inherit libtool eutils
 
@@ -45,7 +45,6 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-2.3.11+gcc-4.3.patch
-	pwd
 	epatch "${FILESDIR}"/gnutls-2.2.5-CVE-2008-4989.patch
 
 	elibtoolize # for sane .so versioning on FreeBSD
diff --git a/net-libs/gnutls/gnutls-2.4.1.ebuild b/net-libs/gnutls/gnutls-2.4.1.ebuild
deleted file mode 100644
index 7312d4f2571b..000000000000
--- a/net-libs/gnutls/gnutls-2.4.1.ebuild
+++ /dev/null
@@ -1,75 +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.1.ebuild,v 1.2 2008/08/17 07:06:46 dragonheart Exp $
-
-inherit libtool 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
-
-	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.6.0.ebuild b/net-libs/gnutls/gnutls-2.6.0-r1.ebuild
index 637fdbbc4e3b..681e4bbfad18 100644
--- a/net-libs/gnutls/gnutls-2.6.0.ebuild
+++ b/net-libs/gnutls/gnutls-2.6.0-r1.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.6.0.ebuild,v 1.3 2008/11/05 10:39:09 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.0-r1.ebuild,v 1.1 2008/11/10 19:55:29 dragonheart Exp $
 
 inherit eutils libtool autotools
 
@@ -55,7 +55,7 @@ src_unpack() {
 	rm m4/lt* m4/libtool.m4 build-aux/ltmain.sh
 	epatch "${FILESDIR}"/${P}-cxx-configure.in.patch
 	eautoreconf
-
+	epatch "${FILESDIR}"/gnutls-2.2.5-CVE-2008-4989.patch
 	elibtoolize # for sane .so versioning on FreeBSD
 }
 
diff --git a/net-libs/gnutls/gnutls-2.5.4.ebuild b/net-libs/gnutls/gnutls-2.6.1.ebuild
index 1979c6510284..a1ab3a4908c8 100644
--- a/net-libs/gnutls/gnutls-2.5.4.ebuild
+++ b/net-libs/gnutls/gnutls-2.6.1.ebuild
@@ -1,20 +1,28 @@
 # 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.5.4.ebuild,v 1.3 2008/11/04 12:53:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.1.ebuild,v 1.1 2008/11/10 19:55:29 dragonheart Exp $
 
-inherit libtool eutils
+inherit eutils libtool autotools
 
 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"
+
+MINOR_VERSION="${PV#*.}"
+MINOR_VERSION="${MINOR_VERSION%.*}"
+if [[ $((MINOR_VERSION % 2)) == 0 ]] ; then
+	#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+else
+	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
+fi
+unset MINOR_VERSION
 
 # 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"
 EAPI=1
-IUSE="zlib lzo doc nls guile bindist +cxx"
+IUSE="bindist +cxx doc guile lzo nls zlib"
 
 RDEPEND="dev-libs/libgpg-error
 	>=dev-libs/libgcrypt-1.4.0
@@ -44,9 +52,9 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-2.3.11+gcc-4.3.patch
-
+	rm m4/lt* m4/libtool.m4 build-aux/ltmain.sh
+	epatch "${FILESDIR}"/gnutls-2.6.0-cxx-configure.in.patch
+	eautoreconf
 	elibtoolize # for sane .so versioning on FreeBSD
 }
 
@@ -60,14 +68,13 @@ src_compile() {
 		$(use_enable cxx) \
 		$(use_enable doc gtk-doc) \
 		${myconf}
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 
-	dodoc AUTHORS ChangeLog NEWS \
-		README THANKS doc/TODO
+	dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO
 
 	if use doc ; then
 		dodoc doc/README.autoconf doc/tex/gnutls.ps