version bump due to sec bug #114710. old versions removed

Package-Manager: portage-2.0.53

8 files changed, 99 insertions, 153 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 15c5d091d88f..69627ebcf172 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.57 2005/11/20 00:45:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.58 2005/12/13 12:48:56 dragonheart Exp $
+
+*curl-7.15.1 (13 Dec 2005)
+
+  13 Dec 2005; Daniel Black <dragonheart@gentoo.org> -curl-7.13.1.ebuild,
+  -curl-7.13.2.ebuild, +curl-7.15.1.ebuild:
+  version bump due to sec bug #114710. old versions removed
 
   20 Nov 2005; Daniel Black <dragonheart@gentoo.org>
   +files/curl-7.15.0-versionnumber.patch, curl-7.15.0.ebuild:
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 43cf00b17a3a..acdcefca40c4 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9e6527c50d25641df7f79d5b925720a2 ChangeLog 11548
-MD5 79b7fd0dcd4776ca1851d30a45275e78 curl-7.13.1.ebuild 1140
-MD5 c6b9b093ceb98fd1efbc9ca3700888ec curl-7.13.2.ebuild 2392
+MD5 2316fec6c3a01fa8de385c58f47b1ebe ChangeLog 11755
 MD5 89d2021f8afb5ff760a8ff36d99a8c39 curl-7.15.0.ebuild 2484
+MD5 ee4870766d1035f4a1d5ab4e2b9cb8cb curl-7.15.1.ebuild 2246
 MD5 3f45a8aa13637f8147adfe79b8cd522b files/curl-7.15.0-versionnumber.patch 550
-MD5 159b437588320b2a3f726d3aa55890e5 files/digest-curl-7.13.1 65
-MD5 71c346cc704727e0bdaef7333521adeb files/digest-curl-7.13.2 130
 MD5 7bcded56c13b85b72508c00b8d3d7e73 files/digest-curl-7.15.0 65
+MD5 27ebd18a112cd03c0e1e3e3bf1e13ff5 files/digest-curl-7.15.1 65
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDf8cpmdTrptrqvGERAmW1AJ9irLMjfTOolCyZxDHv0tjJHRRwVACfW7vV
-sEeNfU23z7n6cklK6Mj/okc=
-=VpYF
+iD8DBQFDnsNFmdTrptrqvGERApQ4AJ4lQSENIOlydAPY9rt8YGCx5VMtRgCfXAqj
+nOdKMAYesdwbe/RUAH/r5aM=
+=bFr3
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.13.1.ebuild b/net-misc/curl/curl-7.13.1.ebuild
deleted file mode 100644
index 4184d3a7a379..000000000000
--- a/net-misc/curl/curl-7.13.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.13.1.ebuild,v 1.14 2005/06/25 15:04:04 liquidx Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-inherit eutils
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT X11"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 s390 sparc x86"
-IUSE="ssl ipv6 ldap"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6a )
-	ldap? ( net-nds/openldap )"
-
-src_compile() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable ldap) \
-		$(use_with ssl) \
-		--enable-http \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-file \
-		--enable-dict \
-		--enable-manual \
-		--enable-telnet \
-		--enable-nonblocking \
-		--enable-largefile \
-		|| die
-	emake || die
-}
-src_test() {
-	return
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc CHANGES README
-	dodoc docs/FEATURES docs/INSTALL docs/INTERNALS docs/LIBCURL
-	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
-}
diff --git a/net-misc/curl/curl-7.13.2.ebuild b/net-misc/curl/curl-7.13.2.ebuild
deleted file mode 100644
index c9b9ec004a46..000000000000
--- a/net-misc/curl/curl-7.13.2.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-misc/curl/curl-7.13.2.ebuild,v 1.10 2005/08/17 00:49:35 malc Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-inherit eutils
-
-# NOTE: To prevent breakages when upgrading, we compile all the prev
-#       versions we know. We can't slot them because only the libraries
-#       have versioning, all the binaries, manpages don't have versions. 
-
-OLD_PV=7.11.2
-OLD_PV_LIB=libcurl.so.2
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${PN}-${OLD_PV}.tar.bz2
-http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT X11"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 s390 sparc x86"
-IUSE="ssl ipv6 ldap ares"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6a )
-	ldap? ( net-nds/openldap )
-	x86? ( ares? ( net-dns/c-ares ) )"
-
-_curl_has_old_ver() {
-	if test -s ${ROOT}/usr/$(get_libdir)/${OLD_PV_LIB}; then
-		return 0 # /bin/true
-	else
-		return 1
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	epunt_cxx
-}
-
-src_compile() {
-
-	myconf="$(use_enable ldap)
-		$(use_with ssl)
-		--enable-http
-		--enable-ftp
-		--enable-gopher
-		--enable-file
-		--enable-dict
-		--enable-manual
-		--enable-telnet
-		--enable-nonblocking
-		--enable-largefile"
-
-	if use ipv6 && use ares; then
-		ewarn "c-ares support disabled because it is incompatible with ipv6."
-		ewarn "To enable ares support, emerge with USE='-ipv6'."
-		myconf="${myconf} $(use_enable ipv6)"
-	else
-		if use x86; then
-			myconf="${myconf} $(use_enable ipv6) $(use_enable ares)"
-		fi
-	fi
-
-	if _curl_has_old_ver; then
-		einfo "Detected old version of curl - installing compat libs"
-		cd ${WORKDIR}/${PN}-${OLD_PV}
-		econf ${myconf}
-		emake || die "make for old version failed"
-	fi
-
-	cd ${S}
-	econf ${myconf}
-	emake || die "install failed for current version"
-}
-
-src_install() {
-	if _curl_has_old_ver; then
-		cd ${WORKDIR}/${PN}-${OLD_PV}/lib
-		make DESTDIR=${D} install-libLTLIBRARIES || die "install failed for old version"
-	fi
-
-	cd ${S}
-	make DESTDIR="${D}" install || die "installed failed for current version"
-
-	insinto /usr/share/aclocal
-	doins docs/libcurl/libcurl.m4
-
-	dodoc CHANGES README
-	dodoc docs/FEATURES docs/INSTALL docs/INTERNALS docs/LIBCURL
-	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
-}
diff --git a/net-misc/curl/curl-7.15.1.ebuild b/net-misc/curl/curl-7.15.1.ebuild
new file mode 100644
index 000000000000..b6103a1e8575
--- /dev/null
+++ b/net-misc/curl/curl-7.15.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.1.ebuild,v 1.1 2005/12/13 12:48:57 dragonheart Exp $
+
+# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/"
+SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT X11"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ssl ipv6 ldap ares gnutls idn kerberos krb4 test"
+
+RDEPEND="gnutls? ( net-libs/gnutls )
+	ssl? ( !gnutls? ( dev-libs/openssl ) )
+	ldap? ( net-nds/openldap )
+	idn? ( net-dns/libidn )
+	ares? ( net-dns/c-ares )
+	kerberos? ( app-crypt/mit-krb5 )
+	krb4? ( app-crypt/kth-krb )"
+
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+# used - but can do without in self test: net-misc/stunnel
+
+src_compile() {
+
+	myconf="$(use_enable ldap)
+		$(use_with idn libidn)
+		$(use_enable kerberos gssapi)
+		$(use_enable ipv6)
+		--enable-http
+		--enable-ftp
+		--enable-gopher
+		--enable-file
+		--enable-dict
+		--enable-manual
+		--enable-telnet
+		--enable-nonblocking
+		--enable-largefile"
+
+	if use ipv6 && use ares; then
+		ewarn "c-ares support disabled because it is incompatible with ipv6."
+		myconf="${myconf} --disable-ares"
+	else
+		myconf="${myconf} $(use_enable ares)"
+	fi
+
+	if use ipv6 && use krb4; then
+		ewarn "kerberos-4 support disabled because it is incompatible with ipv6."
+		myconf="${myconf} --disable-krb4"
+	else
+		myconf="${myconf} $(use_enable krb4)"
+	fi
+
+	if use gnutls; then
+		myconf="${myconf} --without-ssl --with-gnutls=/usr"
+	elif use ssl; then
+		myconf="${myconf} --without-gnutls --with-ssl=/usr"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl"
+	fi
+
+	econf ${myconf} || die 'configure failed'
+	emake || die "install failed for current version"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "installed failed for current version"
+
+	insinto /usr/share/aclocal
+	doins docs/libcurl/libcurl.m4
+
+	#insinto /usr/lib/pkgconfig
+	#doins libcurl.pc
+
+	dodoc CHANGES README
+	dodoc docs/FEATURES docs/INTERNALS docs/LIBCURL
+	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
+}
diff --git a/net-misc/curl/files/digest-curl-7.13.1 b/net-misc/curl/files/digest-curl-7.13.1
deleted file mode 100644
index 1ac48c652545..000000000000
--- a/net-misc/curl/files/digest-curl-7.13.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d673f68dbab2553acdbfb5435bd1cd48 curl-7.13.1.tar.bz2 1860688
diff --git a/net-misc/curl/files/digest-curl-7.13.2 b/net-misc/curl/files/digest-curl-7.13.2
deleted file mode 100644
index 833fa116dd4b..000000000000
--- a/net-misc/curl/files/digest-curl-7.13.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 542fbdafd2fb051477fa544770b566de curl-7.11.2.tar.bz2 1141204
-MD5 5916bb359223800afa234a1cf5145b78 curl-7.13.2.tar.bz2 1891406
diff --git a/net-misc/curl/files/digest-curl-7.15.1 b/net-misc/curl/files/digest-curl-7.15.1
new file mode 100644
index 000000000000..24c9c79cf082
--- /dev/null
+++ b/net-misc/curl/files/digest-curl-7.15.1
@@ -0,0 +1 @@
+MD5 d330d48580bfade58c82d4f295f171f0 curl-7.15.1.tar.bz2 1437950