version bump - security bug #109097
authorDaniel Black <dragonheart@gentoo.org>
Sat, 15 Oct 2005 12:10:58 +0000 (12:10 +0000)
committerDaniel Black <dragonheart@gentoo.org>
Sat, 15 Oct 2005 12:10:58 +0000 (12:10 +0000)
Package-Manager: portage-2.0.53_rc3

net-misc/curl/ChangeLog
net-misc/curl/Manifest
net-misc/curl/curl-7.15.0.ebuild [new file with mode: 0644]
net-misc/curl/files/digest-curl-7.15.0 [new file with mode: 0644]

index d70c4a4bec9397afc149314266d28242a8e5bab7..e2a6bf397df158239db9d06212a3723ddde6e0e8 100644 (file)
@@ -1,6 +1,11 @@
 # 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.42 2005/08/27 16:02:00 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.43 2005/10/15 12:10:58 dragonheart Exp $
+
+*curl-7.15.0 (15 Oct 2005)
+
+  15 Oct 2005; Daniel Black <dragonheart@gentoo.org> +curl-7.15.0.ebuild:
+  version bump - security bug #109097
 
   27 Aug 2005; Karol Wojtaszek <sekretarz@gentoo.org> curl-7.14.0.ebuild:
   Added libidn support, thanks Marcin Kryczek <aye@gentoo.pl> in bug #103745
index 779e31e5d0fe65dc7e7be2dd3f2b0c6972de75e3..893e2c76a8b282631a041ce24acb13a14ca3fd0e 100644 (file)
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4a7bf4fdcec9e4fd2881b67fa63eca38 ChangeLog 9602
+MD5 90d4320b1d2e88d808e4f105f75561b0 ChangeLog 9745
 MD5 79b7fd0dcd4776ca1851d30a45275e78 curl-7.13.1.ebuild 1140
 MD5 c6b9b093ceb98fd1efbc9ca3700888ec curl-7.13.2.ebuild 2392
-MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 MD5 8b26366ceadb9a0bbdc5036caa8cdeed curl-7.14.0.ebuild 2723
+MD5 eca6fb493a456730691afbed87c8b167 curl-7.15.0.ebuild 3066
 MD5 dc352925b526421b92ff81fc9b8315da files/7.12.0-no-fputc.patch 312
 MD5 e2795c792b9a04fd73ca556ce257f39f files/curl-7.10.5-badssl.patch 343
 MD5 05e37478314d224f2ce5840f2e1f31c9 files/curl-7.10.8-transfer-segv.patch 744
 MD5 159b437588320b2a3f726d3aa55890e5 files/digest-curl-7.13.1 65
 MD5 71c346cc704727e0bdaef7333521adeb files/digest-curl-7.13.2 130
 MD5 147739a83aa9a907c8968007c33f4157 files/digest-curl-7.14.0 130
+MD5 846f0a179fd2f00146d9568a172c7143 files/digest-curl-7.15.0 130
+MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDEKzOZ/iYVBmujdURAgKTAKCqHZ2334Hpd5NQkNasLNygek4IOgCg4fbh
-Q68gqNsHJMfKQmgjyKUOBmg=
-=yEWA
+iD8DBQFDUPHqmdTrptrqvGERAmW1AJ4lwkLWjLdXwMP1moZJleItuQP5kgCgjbna
+8JKhV7lCjElehHEUTIK3zCs=
+=kihY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.15.0.ebuild b/net-misc/curl/curl-7.15.0.ebuild
new file mode 100644 (file)
index 0000000..cb791fb
--- /dev/null
@@ -0,0 +1,121 @@
+# 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.0.ebuild,v 1.1 2005/10/15 12:10:58 dragonheart 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 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? (
+               net-misc/stunnel
+               sys-apps/diffutils
+               dev-lang/perl
+       )"
+
+_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 idn libidn)
+               $(use_with krb4)
+               $(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."
+               ewarn "To enable ares support, emerge with USE='-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
+
+       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/INTERNALS docs/LIBCURL
+       dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
+}
diff --git a/net-misc/curl/files/digest-curl-7.15.0 b/net-misc/curl/files/digest-curl-7.15.0
new file mode 100644 (file)
index 0000000..1b24477
--- /dev/null
@@ -0,0 +1,2 @@
+MD5 542fbdafd2fb051477fa544770b566de curl-7.11.2.tar.bz2 1141204
+MD5 e3b130320d3704af375c097606f49c01 curl-7.15.0.tar.bz2 1426714