11 files changed, 7 insertions, 414 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 7fcff3fdc562..1d3bf0be4183 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.64 2005/05/01 02:29:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.65 2005/05/01 04:13:01 dragonheart Exp $
+
+  01 May 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/gnutls-1.0.14-extra.h.patch, -files/gnutls-1.1.23-extra.h.patch,
+  -gnutls-1.0.17.ebuild, -gnutls-1.0.23.ebuild, -gnutls-1.2.0.ebuild,
+  -gnutls-1.2.1.ebuild:
+  prune potentially vulnerable versions
 
   01 May 2005; Daniel Black <dragonheart@gentoo.org> gnutls-1.2.3.ebuild:
   Removed crypt flag due to bug #90976. Thanks to Alex Murray
diff --git a/net-libs/gnutls/files/digest-gnutls-1.0.17 b/net-libs/gnutls/files/digest-gnutls-1.0.17
deleted file mode 100644
index 9eab78f55b64..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.0.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c2bf9257cd8651e7c1abbdb0601e8c1 gnutls-1.0.17.tar.bz2 1232606
diff --git a/net-libs/gnutls/files/digest-gnutls-1.0.23 b/net-libs/gnutls/files/digest-gnutls-1.0.23
deleted file mode 100644
index b1db79b70e12..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.0.23
+++ /dev/null
@@ -1 +0,0 @@
-MD5 949a2c86fec16216213a4582ef6a5d71 gnutls-1.0.23.tar.gz 1630814
diff --git a/net-libs/gnutls/files/digest-gnutls-1.2.0 b/net-libs/gnutls/files/digest-gnutls-1.2.0
deleted file mode 100644
index 2f3395f601ec..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 05a9b0a16089db1afd37ed88b36f1e77 gnutls-1.2.0.tar.bz2 2417909
diff --git a/net-libs/gnutls/files/digest-gnutls-1.2.1 b/net-libs/gnutls/files/digest-gnutls-1.2.1
deleted file mode 100644
index 6ee9b705702f..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbc24634ea62b5f3bee45662c2a29f05 gnutls-1.2.1.tar.bz2 2436304
diff --git a/net-libs/gnutls/files/gnutls-1.0.14-extra.h.patch b/net-libs/gnutls/files/gnutls-1.0.14-extra.h.patch
deleted file mode 100644
index ea041017cde2..000000000000
--- a/net-libs/gnutls/files/gnutls-1.0.14-extra.h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- includes/gnutls/extra.h	2004-03-25 04:43:49.000000000 -0500
-+++ includes/gnutls/extra.h.new	2004-07-24 00:31:11.716460832 -0400
-@@ -27,6 +27,10 @@
- 
- #define LIBGNUTLS_EXTRA_VERSION LIBGNUTLS_VERSION
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- /* SRP */
- 
- typedef struct DSTRUCT* gnutls_srp_server_credentials;
-@@ -119,5 +123,9 @@
- int gnutls_srp_base64_decode_alloc( const gnutls_datum *b64_data, 
-    gnutls_datum* result);
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- 
- #endif
diff --git a/net-libs/gnutls/files/gnutls-1.1.23-extra.h.patch b/net-libs/gnutls/files/gnutls-1.1.23-extra.h.patch
deleted file mode 100644
index 3decb747edcc..000000000000
--- a/net-libs/gnutls/files/gnutls-1.1.23-extra.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- extra.h.orig	2005-01-24 09:02:43.587224432 +0100
-+++ extra.h	2005-01-24 09:03:11.704949888 +0100
-@@ -28,6 +28,10 @@
- 
- #define LIBGNUTLS_EXTRA_VERSION LIBGNUTLS_VERSION
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- /* Openpgp certificate stuff 
-  */
- 
-@@ -76,4 +80,8 @@
-  */
- const char* gnutls_extra_check_version( const char *req_version);
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
diff --git a/net-libs/gnutls/gnutls-1.0.17.ebuild b/net-libs/gnutls/gnutls-1.0.17.ebuild
deleted file mode 100644
index cf40b374c21a..000000000000
--- a/net-libs/gnutls/gnutls-1.0.17.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.17.ebuild,v 1.18 2005/01/14 23:56:03 dragonheart Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
-
-# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="|| ( LGPL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="zlib doc crypt"
-
-RDEPEND=">=dev-libs/libgcrypt-1.1.94
-	crypt? ( >=app-crypt/opencdk-0.5.5 )
-	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc
-	dev-libs/libgpg-error"
-
-# Need masking on ~amd64 ~sparc ~ppc ~mips ~alpha
-#	>=dev-libs/libtasn1-0.2
-#	>=dev-libs/lzo-1.0"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/gcc
-	sys-devel/libtool"
-
-
-# gnutls has its own version of these. should maybe avoid using.
-#	libtasn1
-#	opencdk
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/includes/gnutls; epatch ${FILESDIR}/${PN}-1.0.14-extra.h.patch
-}
-
-src_compile() {
-	# Needed for mips and probablly others
-	gnuconfig_update
-
-	#   I think this vvv gets ignored if not present
-	local myconf="--without-included-libtasn1 --without-included-opencdk"
-
-
-	use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
-
-	econf  \
-		`use_with zlib` \
-		--with-included-lzo \
-		--with-included-libtasn1 \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die
-
-	# make compatibility symlinks - 0.8.x
-	#dosym /usr/lib/libgnutls.so.10 /usr/lib/libgnutls.so.7
-
-	dodoc AUTHORS COPYING COPYING.LIB 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
-}
-
-pkg_postinst() {
-	ewarn "An API has changed in gnutls. This is why the library has gone from "
-	ewarn "libgnutls.so.10 to libgnutls.so.11."
-	ewarn
-	ewarn "What is required is a revdep-rebuild."
-	ewarn "To show you what is needed to rebuild"
-	ewarn "revdep-rebuild --soname libgnutls.so.10 -- -p"
-	ewarn ""
-	ewarn "Then do:"
-	ewarn "revdep-rebuild --soname libgnutls.so.10"
-	einfo ""
-	einfo "Afterward just try:"
-	einfo "revdep-rebuild -- -p"
-	einfo "to see if there are any other packages broken."
-	einfo "To rebuild these:"
-	einfo "revdep-rebuild"
-
-}
diff --git a/net-libs/gnutls/gnutls-1.0.23.ebuild b/net-libs/gnutls/gnutls-1.0.23.ebuild
deleted file mode 100644
index 7923b22973b2..000000000000
--- a/net-libs/gnutls/gnutls-1.0.23.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.23.ebuild,v 1.8 2005/04/01 15:25:45 agriffis Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.gz"
-
-IUSE="zlib doc crypt"
-LICENSE="LGPL-2.1 GPL-2"
-# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~mips ~alpha ppc64 ~hppa ia64"
-
-# Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
-# ~ia64
-
-RDEPEND=">=dev-libs/libgcrypt-1.1.94
-	crypt? ( >=app-crypt/opencdk-0.5.5 )
-	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc
-	>=dev-libs/lzo-1.0
-	>=dev-libs/libtasn1-0.2.10
-	dev-libs/libgpg-error"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/gcc
-	sys-devel/libtool"
-
-
-# gnutls has its own version of these. should maybe avoid using.
-#	libtasn1
-#	opencdk
-
-src_compile() {
-	# Needed for mips and probably others
-	gnuconfig_update
-
-	local myconf=""
-	use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
-
-	econf  \
-		`use_with zlib` \
-		--without-included-minilzo \
-		--without-included-libtasn1 \
-		--without-included-opencdk \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING COPYING.LIB 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
-}
-
-pkg_postinst() {
-	ewarn "An API has changed in gnutls. This is why the library has gone from "
-	ewarn "libgnutls.so.10 to libgnutls.so.11."
-	ewarn
-	ewarn "What is required is a revdep-rebuild."
-	ewarn "To show you what is needed to rebuild"
-	ewarn "revdep-rebuild --soname libgnutls.so.10 -- -p"
-	ewarn ""
-	ewarn "Then do:"
-	ewarn "revdep-rebuild --soname libgnutls.so.10"
-	einfo ""
-	einfo "Afterward just try:"
-	einfo "revdep-rebuild -- -p"
-	einfo "to see if there are any other packages broken."
-	einfo "To rebuild these:"
-	einfo "revdep-rebuild"
-
-}
diff --git a/net-libs/gnutls/gnutls-1.2.0.ebuild b/net-libs/gnutls/gnutls-1.2.0.ebuild
deleted file mode 100644
index d3f4cb8e6c44..000000000000
--- a/net-libs/gnutls/gnutls-1.2.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.0.ebuild,v 1.2 2005/02/06 00:25:23 dragonheart Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/devel/${P}.tar.bz2"
-
-IUSE="zlib doc crypt"
-
-LICENSE="LGPL-2.1 GPL-2"
-# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~mips ~alpha ~ppc64"
-
-# Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
-# ~ppc64  ~ia64 ~hppa
-
-RDEPEND=">=dev-libs/libgcrypt-1.2.0
-	crypt? ( >=app-crypt/opencdk-0.5.5 )
-	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc
-	>=dev-libs/lzo-1.0
-	>=dev-libs/libtasn1-0.2.10
-	dev-libs/libgpg-error"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/gcc
-	sys-devel/libtool"
-
-
-# gnutls has its own version of these. should maybe avoid using.
-#	libtasn1
-#	opencdk
-
-src_compile() {
-	cd "${S}/includes/gnutls"
-	epatch "${FILESDIR}/${PN}-1.1.23-extra.h.patch" || die "Cannot patch gnutls/extra.h"
-	cd "${OLDPWD}"
-
-	# Needed for mips and probably others
-	gnuconfig_update
-
-	local myconf=""
-	use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
-
-	econf  \
-		`use_with zlib` \
-		--without-included-minilzo \
-		--without-included-libtasn1 \
-		--without-included-opencdk \
-		${myconf} || die
-	emake || die
-
-	# gtk-doc removed - bug #80906
-	# 		`use_enable doc gtk-doc`
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING COPYING.LIB 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
-}
-
-pkg_postinst() {
-	ewarn "An API has changed in gnutls. This is why the library has gone from "
-	ewarn "libgnutls.so.11 (or 10) to libgnutls.so.12."
-	ewarn
-	ewarn "What is required is a revdep-rebuild."
-	ewarn "To show you what is needed to rebuild"
-	ewarn "revdep-rebuild --soname-regexp libgnutls.so.1[0-1] -- -p"
-	ewarn ""
-	ewarn "Then do:"
-	ewarn "revdep-rebuild --soname-regexp libgnutls.so.1[0-1]"
-	einfo ""
-	einfo "Afterward just try:"
-	einfo "revdep-rebuild -- -p"
-	einfo "to see if there are any other packages broken."
-	einfo "To rebuild these:"
-	einfo "revdep-rebuild"
-
-}
diff --git a/net-libs/gnutls/gnutls-1.2.1.ebuild b/net-libs/gnutls/gnutls-1.2.1.ebuild
deleted file mode 100644
index 1b909ed9a826..000000000000
--- a/net-libs/gnutls/gnutls-1.2.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.1.ebuild,v 1.1 2005/04/19 00:35:22 vanquirius Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
-
-IUSE="zlib doc crypt"
-
-LICENSE="LGPL-2.1 GPL-2"
-# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~mips ~alpha ~ppc64"
-
-# Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
-# ~ppc64  ~ia64 ~hppa
-
-RDEPEND=">=dev-libs/libgcrypt-1.2.0
-	crypt? ( >=app-crypt/opencdk-0.5.5 )
-	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc
-	>=dev-libs/lzo-1.0
-	>=dev-libs/libtasn1-0.2.10
-	dev-libs/libgpg-error"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/gcc
-	sys-devel/libtool"
-
-
-# gnutls has its own version of these. should maybe avoid using.
-#	libtasn1
-#	opencdk
-
-src_compile() {
-	# Needed for mips and probably others
-	gnuconfig_update
-
-	local myconf=""
-	use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
-
-	econf  \
-		`use_with zlib` \
-		--without-included-minilzo \
-		--without-included-libtasn1 \
-		--without-included-opencdk \
-		${myconf} || die
-	emake || die
-
-	# gtk-doc removed - bug #80906
-	# 		`use_enable doc gtk-doc`
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING COPYING.LIB 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
-}
-
-pkg_postinst() {
-	ewarn "An API has changed in gnutls. This is why the library has gone from "
-	ewarn "libgnutls.so.11 (or 10) to libgnutls.so.12."
-	ewarn
-	ewarn "What is required is a revdep-rebuild."
-	ewarn "To show you what is needed to rebuild"
-	ewarn "revdep-rebuild --soname-regexp libgnutls.so.1[0-1] -- -p"
-	ewarn ""
-	ewarn "Then do:"
-	ewarn "revdep-rebuild --soname-regexp libgnutls.so.1[0-1]"
-	einfo ""
-	einfo "Afterward just try:"
-	einfo "revdep-rebuild -- -p"
-	einfo "to see if there are any other packages broken."
-	einfo "To rebuild these:"
-	einfo "revdep-rebuild"
-
-}