[gentoo-commits] gentoo-x86 commit in net-misc/curl: ChangeLog curl-7.17.1.ebuild curl-7.16.4.ebuild curl-7.18.1.ebuild curl-7.17.0.ebuild curl-7.17.1_pre20071013.ebuild

[Daniel Black (dragonheart)]

dragonheart    08/04/01 13:46:49

  Modified:             ChangeLog curl-7.17.1.ebuild curl-7.16.4.ebuild
  Added:                curl-7.18.1.ebuild
  Removed:              curl-7.17.0.ebuild curl-7.17.1_pre20071013.ebuild
  Log:
  added 7.18.1 which fixes bugs #210295, #204130, #209421, #206566 and part of bug #207653. 7.17.1 has fixes from bug #206566. Thanks to Daniel Stenberg, Micha Kiedrowicz, Olivier Dole, and Fabrice Bacchella. Cleaned out some old versions too
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.115                net-misc/curl/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/ChangeLog?rev=1.115&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/ChangeLog?rev=1.115&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/ChangeLog?r1=1.114&r2=1.115

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- ChangeLog	10 Feb 2008 09:12:28 -0000	1.114
+++ ChangeLog	1 Apr 2008 13:46:49 -0000	1.115
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.114 2008/02/10 09:12:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.115 2008/04/01 13:46:49 dragonheart Exp $
+
+*curl-7.18.1 (01 Apr 2008)
+
+  01 Apr 2008; Daniel Black <dragonheart@g.o> -curl-7.17.0.ebuild,
+  -curl-7.17.1_pre20071013.ebuild, curl-7.17.1.ebuild, +curl-7.18.1.ebuild:
+  added 7.18.1 which fixes bugs #210295, #204130, #209421, #206566 and part of
+  bug #207653. 7.17.1 has fixes from bug #206566. Thanks to Daniel Stenberg,
+  Micha Kiedrowicz, Olivier Dole, and Fabrice Bacchella. Cleaned out some old
+  versions too
 
   10 Feb 2008; Tobias Scherbaum <dertobi123@g.o> curl-7.17.1.ebuild:
   ppc stable, bug #202891



1.7                  net-misc/curl/curl-7.17.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/curl-7.17.1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/curl-7.17.1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/curl-7.17.1.ebuild?r1=1.6&r2=1.7

Index: curl-7.17.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.17.1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- curl-7.17.1.ebuild	10 Feb 2008 09:12:28 -0000	1.6
+++ curl-7.17.1.ebuild	1 Apr 2008 13:46:49 -0000	1.7
@@ -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-misc/curl/curl-7.17.1.ebuild,v 1.6 2008/02/10 09:12:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.17.1.ebuild,v 1.7 2008/04/01 13:46:49 dragonheart Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -51,8 +51,9 @@
 src_compile() {
 
 	myconf="$(use_enable ldap)
+		$(use_enable ldap ldaps)
 		$(use_with idn libidn)
-		$(use_enable kerberos gssapi)
+		$(use_with kerberos gssapi)
 		$(use_enable ipv6)
 		--enable-http
 		--enable-ftp
@@ -71,6 +72,10 @@
 		--without-spnego"
 #		$(use_with libssh2)
 
+	if use ldap && use kerberos; then
+		die 'ldap and kerberos (gssapi) not playing nicely try version >=7.18.1'
+	fi
+
 	if use ipv6 && use ares; then
 		elog "c-ares support disabled because it is incompatible with ipv6."
 		myconf="${myconf} --disable-ares"
@@ -92,6 +97,18 @@
 	emake || die "install failed for current version"
 }
 
+src_test() {
+	if use gnutls; then
+		elog 'disabling test 405 ftps as gnutls does differing return codes'
+		elog 'that the test case does not allow for. '
+		elog 'https://bugs.gentoo.org/show_bug.cgi?id=204130 refers'
+		cd "${S}"/tests
+		./runtests.pl -a -s '!405' || die 'self test failed'
+	else
+		make check || die 'self test failed'
+	fi
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "installed failed for current version"
 	rm -rf "${D}"/etc/



1.12                 net-misc/curl/curl-7.16.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/curl-7.16.4.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/curl-7.16.4.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/curl-7.16.4.ebuild?r1=1.11&r2=1.12

Index: curl-7.16.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.16.4.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- curl-7.16.4.ebuild	25 Aug 2007 14:34:19 -0000	1.11
+++ curl-7.16.4.ebuild	1 Apr 2008 13:46:49 -0000	1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.16.4.ebuild,v 1.11 2007/08/25 14:34:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.16.4.ebuild,v 1.12 2008/04/01 13:46:49 dragonheart Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -14,7 +14,7 @@
 
 LICENSE="MIT X11"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="ssl ipv6 ldap ares gnutls nss idn kerberos test"
 
 RDEPEND="gnutls? ( net-libs/gnutls )



1.1                  net-misc/curl/curl-7.18.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/curl-7.18.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/curl-7.18.1.ebuild?rev=1.1&content-type=text/plain

Index: curl-7.18.1.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.18.1.ebuild,v 1.1 2008/04/01 13:46:49 dragonheart Exp $

# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!

inherit libtool autotools

#MY_P=${P/_pre/-}
DESCRIPTION="A Client that groks URLs"
HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com"
#SRC_URI="http://cool.haxx.se/curl-daily/${MY_P}.tar.bz2"
SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"

LICENSE="MIT X11"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
#IUSE="ssl ipv6 ldap ares gnutls nss idn kerberos test"
IUSE="ssl ipv6 ldap ares gnutls libssh2 nss idn kerberos test"

# TODO - change to openssl USE flag in the not too distant future
# https://bugs.gentoo.org/show_bug.cgi?id=207653#c3 (April 2008)

RDEPEND="gnutls? ( net-libs/gnutls app-misc/ca-certificates )
	nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
	ssl? ( !gnutls? ( !nss? ( dev-libs/openssl app-misc/ca-certificates ) ) )
	ldap? ( net-nds/openldap )
	idn? ( net-dns/libidn )
	ares? ( >=net-dns/c-ares-1.4.0 )
	kerberos? ( virtual/krb5 )
	libssh2? ( >=net-libs/libssh2-0.16 )"

# fbopenssl (not in gentoo) --with-spnego
# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html

DEPEND="${RDEPEND}
	test? (
		sys-apps/diffutils
		dev-lang/perl
	)"
# used - but can do without in self test: net-misc/stunnel
#S="${WORKDIR}"/${MY_P}

src_unpack() {
	unpack ${A}
	cd "${S}"
##	epatch "${FILESDIR}"/${P}-strip-ldflags.patch
	epatch "${FILESDIR}"/curl-7.17.0-strip-ldflags.patch
#	epatch	"${FILESDIR}"/${P}-null-handler-segfault.patch
#	elibtoolize
	elibtoolize
	eaclocal
	/usr/bin/perl -i.bak -pe 's/\bmv +([^-\s])/mv -f $1/g' aclocal.m4
	eautoheader
	cp lib/config.h.in src/config.h.in
	eautoconf
	eautomake
}

src_compile() {

	myconf="$(use_enable ldap)
		$(use_enable ldap ldaps)
		$(use_with idn libidn)
		$(use_with kerberos gssapi /usr)
		$(use_with libssh2)
		$(use_enable ipv6)
		--enable-http
		--enable-ftp
		--enable-gopher
		--enable-file
		--enable-dict
		--enable-manual
		--enable-telnet
		--enable-nonblocking
		--enable-largefile
		--enable-maintainer-mode
		--disable-sspi
		--without-krb4
		--without-spnego"

	if use ipv6 && use ares; then
		elog "c-ares support disabled because it is incompatible with ipv6."
		myconf="${myconf} --disable-ares"
	else
		myconf="${myconf} $(use_enable ares)"
	fi

	if use gnutls; then
		myconf="${myconf} --without-ssl --with-gnutls --without-nss"
		myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
	elif use nss; then
		myconf="${myconf} --without-ssl --without-gnutls --with-nss"
		myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
	elif use ssl; then
		myconf="${myconf} --without-gnutls --without-nss --with-ssl"
		myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
	else
		myconf="${myconf} --without-gnutls --without-nss --without-ssl"
	fi

	econf ${myconf} || die 'configure failed'
	emake || die "install failed for current version"
}

src_install() {
	emake DESTDIR="${D}" install || die "installed failed for current version"
	rm -rf "${D}"/etc/

	# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
	insinto /usr/share/aclocal
	doins docs/libcurl/libcurl.m4

	dodoc CHANGES README
	dodoc docs/FEATURES docs/INTERNALS
	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
}

pkg_postinst() {
	if [[ -e "${ROOT}"/usr/$(get_libdir)/libcurl.so.3 ]] ; then
		elog "You must re-compile all packages that are linked against"
		elog "curl-7.15.* by using revdep-rebuild from gentoolkit:"
		elog "# revdep-rebuild --library libcurl.so.3"
	fi
}



-- 
gentoo-commits@l.g.o mailing list