diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-02-19 17:23:00 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-02-19 17:23:00 +0000 |
commit | 8e7d0d52785ece3055b4cd3d2d44ce993fcad6ca (patch) | |
tree | fb060b510ae2527d2c50383836c8f239d11fa288 /net-misc | |
parent | Add some fixes from upstream. (diff) | |
download | gentoo-2-8e7d0d52785ece3055b4cd3d2d44ce993fcad6ca.tar.gz gentoo-2-8e7d0d52785ece3055b4cd3d2d44ce993fcad6ca.tar.bz2 gentoo-2-8e7d0d52785ece3055b4cd3d2d44ce993fcad6ca.zip |
Revision bump to fix tftpd per bug #351478. Version bump to fix bug #343681 and bug #337506.
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/curl/ChangeLog | 12 | ||||
-rw-r--r-- | net-misc/curl/curl-7.21.3-r1.ebuild (renamed from net-misc/curl/curl-7.21.3.ebuild) | 5 | ||||
-rw-r--r-- | net-misc/curl/curl-7.21.4.ebuild (renamed from net-misc/curl/curl-7.21.2.ebuild) | 69 | ||||
-rw-r--r-- | net-misc/curl/files/curl-7.21.3-buffer-overflow.patch | 30 | ||||
-rw-r--r-- | net-misc/curl/files/curl-respect-cflags.patch | 281 |
5 files changed, 358 insertions, 39 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index 7f31850bfa47..0d6ce553113b 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-misc/curl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.170 2011/01/12 18:37:32 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.171 2011/02/19 17:23:00 scarabeus Exp $ + +*curl-7.21.4 (19 Feb 2011) +*curl-7.21.3-r1 (19 Feb 2011) + + 19 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> -curl-7.21.2.ebuild, + -curl-7.21.3.ebuild, +curl-7.21.3-r1.ebuild, + +files/curl-7.21.3-buffer-overflow.patch, +curl-7.21.4.ebuild, + +files/curl-respect-cflags.patch: + Revision bump to fix tftpd per bug #351478. Version bump to fix bug #343681 + and bug #337506. *curl-7.21.3 (12 Jan 2011) diff --git a/net-misc/curl/curl-7.21.3.ebuild b/net-misc/curl/curl-7.21.3-r1.ebuild index 55edc0b3c206..07f59b17d728 100644 --- a/net-misc/curl/curl-7.21.3.ebuild +++ b/net-misc/curl/curl-7.21.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.3.ebuild,v 1.1 2011/01/12 18:37:32 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.3-r1.ebuild,v 1.1 2011/02/19 17:23:00 scarabeus Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! @@ -55,7 +55,8 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \ "${FILESDIR}"/${PN}-7.19.7-test241.patch \ - "${FILESDIR}"/${PN}-7.18.2-prefix.patch + "${FILESDIR}"/${PN}-7.18.2-prefix.patch \ + "${FILESDIR}"/${PN}-7.21.3-buffer-overflow.patch eprefixify curl-config.in # for FreeMiNT diff --git a/net-misc/curl/curl-7.21.2.ebuild b/net-misc/curl/curl-7.21.4.ebuild index 68d8f91c5291..317d2614aad7 100644 --- a/net-misc/curl/curl-7.21.2.ebuild +++ b/net-misc/curl/curl-7.21.4.ebuild @@ -1,32 +1,30 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.2.ebuild,v 1.1 2010/12/01 20:42:44 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild,v 1.1 2011/02/19 17:23:00 scarabeus Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! -EAPI=3 +EAPI=4 -inherit multilib eutils libtool prefix +inherit autotools multilib eutils libtool prefix -#MY_P=${P/_pre/-} DESCRIPTION="A Client that groks URLs" HOMEPAGE="http://curl.haxx.se/" -#SRC_URI="http://cool.haxx.se/curl-daily/${MY_P}.tar.bz2" SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl test threads" +IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads" RDEPEND="ldap? ( net-nds/openldap ) ssl? ( - gnutls? ( net-libs/gnutls app-misc/ca-certificates ) + gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) - !threads? ( ares? ( >=net-dns/c-ares-1.4.0 ) ) + ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) libssh2? ( >=net-libs/libssh2-0.16 )" @@ -41,36 +39,34 @@ DEPEND="${RDEPEND} )" # used - but can do without in self test: net-misc/stunnel -pkg_setup() { - if ! use ssl && ( use gnutls || use nss ) ; then - ewarn "USE='gnutls nss' are ignored without USE='ssl'." - ewarn "Please review the local USE flags for this package." - fi - if use ares && use threads; then - ewarn "USE flags 'ares' and 'threads' are mutually exclusive," - ewarn "disabling 'ares', please review and re-emerge if needed." - fi -} +# ares must be disabled for threads +# one can use wether gnutls or nss if ssl is enabled +REQUIRED_USE="^^ ( ares threads ) + gnutls? ( ssl ) + nss? ( ssl )" src_prepare() { epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \ "${FILESDIR}"/${PN}-7.19.7-test241.patch \ - "${FILESDIR}"/${PN}-7.18.2-prefix.patch + "${FILESDIR}"/${PN}-7.18.2-prefix.patch \ + "${FILESDIR}"/${PN}-respect-cflags.patch eprefixify curl-config.in - # for FreeMiNT - elibtoolize + eautoreconf } src_configure() { + local myconf + myconf="$(use_enable ldap) $(use_enable ldap ldaps) $(use_with idn libidn) $(use_with kerberos gssapi "${EPREFIX}"/usr) $(use_with libssh2) + $(use_enable static-libs static) $(use_enable ipv6) $(use_enable threads threaded-resolver) - $(use threads && echo --disable-ares || use_enable ares) + $(use_enable ares) --enable-http --enable-ftp --enable-gopher @@ -92,31 +88,32 @@ src_configure() { if use ssl ; then if use gnutls; then - myconf="${myconf} --without-ssl --with-gnutls --without-nss" - myconf="${myconf} --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" + myconf+=" --without-ssl --with-gnutls --without-nss" + myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" elif use nss; then - myconf="${myconf} --without-ssl --without-gnutls --with-nss" - myconf="${myconf} --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" + myconf+=" --without-ssl --without-gnutls --with-nss" + myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" else - myconf="${myconf} --without-gnutls --without-nss --with-ssl" - myconf="${myconf} --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs" + myconf+=" --without-gnutls --without-nss --with-ssl" + myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs" fi else - myconf="${myconf} --without-gnutls --without-nss --without-ssl" + myconf+=" --without-gnutls --without-nss --without-ssl" fi - econf ${myconf} || die 'configure failed' + econf ${myconf} } src_install() { - emake DESTDIR="${D}" install || die "installed failed for current version" + emake DESTDIR="${D}" install + find "${ED}" -name '*.la' -exec rm -f {} + rm -rf "${ED}"/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 || die + doins docs/libcurl/libcurl.m4 - dodoc CHANGES README || die - dodoc docs/FEATURES docs/INTERNALS || die - dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE || die + dodoc CHANGES README + dodoc docs/FEATURES docs/INTERNALS + dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE } diff --git a/net-misc/curl/files/curl-7.21.3-buffer-overflow.patch b/net-misc/curl/files/curl-7.21.3-buffer-overflow.patch new file mode 100644 index 000000000000..53541891d401 --- /dev/null +++ b/net-misc/curl/files/curl-7.21.3-buffer-overflow.patch @@ -0,0 +1,30 @@ +From 1df74d886d764115944d40fbc79bfd51ec7d714a Mon Sep 17 00:00:00 2001 +From: Paul Howarth <paul@city-fan.org> +Date: Fri, 17 Dec 2010 19:07:45 +0100 +Subject: [PATCH 01/90] tftpd: avoid buffer overflow report from glibc + +--- + tests/server/tftpd.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c +index b9a0562..701b3e9 100644 +--- a/tests/server/tftpd.c ++++ b/tests/server/tftpd.c +@@ -1291,9 +1291,11 @@ static void nak(int error) + pe->e_msg = strerror(error - 100); + tp->th_code = EUNDEF; /* set 'undef' errorcode */ + } +- strcpy(tp->th_msg, pe->e_msg); + length = (int)strlen(pe->e_msg); +- tp->th_msg[length] = '\0'; ++ ++ /* we use memcpy() instead of strcpy() in order to avoid buffer overflow ++ * report from glibc with FORTIFY_SOURCE */ ++ memcpy(tp->th_msg, pe->e_msg, length + 1); + length += 5; + if (swrite(peer, &buf.storage[0], length) != length) + logmsg("nak: fail\n"); +-- +1.7.4.rc2 + diff --git a/net-misc/curl/files/curl-respect-cflags.patch b/net-misc/curl/files/curl-respect-cflags.patch new file mode 100644 index 000000000000..c0ea64e15207 --- /dev/null +++ b/net-misc/curl/files/curl-respect-cflags.patch @@ -0,0 +1,281 @@ +diff -urN curl-7.21.4.old/m4/curl-compilers.m4 curl-7.21.4/m4/curl-compilers.m4 +--- curl-7.21.4.old/m4/curl-compilers.m4 2011-02-19 18:05:43.000000000 +0100 ++++ curl-7.21.4/m4/curl-compilers.m4 2011-02-19 18:11:04.000000000 +0100 +@@ -86,19 +86,19 @@ + clangvhi=`echo $clangver | cut -d . -f1` + clangvlo=`echo $clangver | cut -d . -f2` + compiler_num=`(expr $clangvhi "*" 100 + $clangvlo) 2>/dev/null` +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_all="$flags_dbg_all -ggdb" +- flags_dbg_all="$flags_dbg_all -gstabs" +- flags_dbg_all="$flags_dbg_all -gstabs+" +- flags_dbg_all="$flags_dbg_all -gcoff" +- flags_dbg_all="$flags_dbg_all -gxcoff" +- flags_dbg_all="$flags_dbg_all -gdwarf-2" +- flags_dbg_all="$flags_dbg_all -gvms" +- flags_dbg_yes="-g" +- flags_dbg_off="-g0" +- flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4" +- flags_opt_yes="-Os" +- flags_opt_off="-O0" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_yes="" ++ flags_dbg_off="" ++ flags_opt_all="" ++ flags_opt_yes="" ++ flags_opt_off="" + else + AC_MSG_RESULT([no]) + fi +@@ -117,12 +117,12 @@ + test "$curl_cv_have_def___DECC_VER" = "yes"; then + AC_MSG_RESULT([yes]) + compiler_id="DEC_C" +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_yes="-g2" +- flags_dbg_off="-g0" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -O4" +- flags_opt_yes="-O1" +- flags_opt_off="-O0" ++ flags_dbg_all="" ++ flags_dbg_yes="" ++ flags_dbg_off="" ++ flags_opt_all="" ++ flags_opt_yes="" ++ flags_opt_off="" + else + AC_MSG_RESULT([no]) + fi +@@ -146,19 +146,19 @@ + gccvhi=`echo $gccver | cut -d . -f1` + gccvlo=`echo $gccver | cut -d . -f2` + compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_all="$flags_dbg_all -ggdb" +- flags_dbg_all="$flags_dbg_all -gstabs" +- flags_dbg_all="$flags_dbg_all -gstabs+" +- flags_dbg_all="$flags_dbg_all -gcoff" +- flags_dbg_all="$flags_dbg_all -gxcoff" +- flags_dbg_all="$flags_dbg_all -gdwarf-2" +- flags_dbg_all="$flags_dbg_all -gvms" +- flags_dbg_yes="-g" +- flags_dbg_off="-g0" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" +- flags_opt_yes="-O2" +- flags_opt_off="-O0" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_yes="" ++ flags_dbg_off="" ++ flags_opt_all="" ++ flags_opt_yes="" ++ flags_opt_off="" + else + AC_MSG_RESULT([no]) + fi +@@ -175,12 +175,12 @@ + if test "$curl_cv_have_def___HP_cc" = "yes"; then + AC_MSG_RESULT([yes]) + compiler_id="HP_UX_C" +- flags_dbg_all="-g -s" +- flags_dbg_yes="-g" +- flags_dbg_off="-s" +- flags_opt_all="-O +O0 +O1 +O2 +O3 +O4" +- flags_opt_yes="+O2" +- flags_opt_off="+O0" ++ flags_dbg_all="" ++ flags_dbg_yes="" ++ flags_dbg_off="" ++ flags_opt_all="" ++ flags_opt_yes="" ++ flags_opt_off="" + else + AC_MSG_RESULT([no]) + fi +@@ -197,19 +197,19 @@ + if test "$curl_cv_have_def___IBMC__" = "yes"; then + AC_MSG_RESULT([yes]) + compiler_id="IBM_C" +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_yes="-g" ++ flags_dbg_all="" ++ flags_dbg_yes="" + flags_dbg_off="" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -O4 -O5" +- flags_opt_all="$flags_opt_all -qnooptimize" +- flags_opt_all="$flags_opt_all -qoptimize=0" +- flags_opt_all="$flags_opt_all -qoptimize=1" +- flags_opt_all="$flags_opt_all -qoptimize=2" +- flags_opt_all="$flags_opt_all -qoptimize=3" +- flags_opt_all="$flags_opt_all -qoptimize=4" +- flags_opt_all="$flags_opt_all -qoptimize=5" +- flags_opt_yes="-O2" +- flags_opt_off="-qnooptimize" ++ flags_opt_all="" ++ flags_opt_all="" ++ flags_opt_all="" ++ flags_opt_all="" ++ flags_opt_all="" ++ flags_opt_all="" ++ flags_opt_all="" ++ flags_opt_all="" ++ flags_opt_yes="" ++ flags_opt_off="" + else + AC_MSG_RESULT([no]) + fi +@@ -230,27 +230,27 @@ + CURL_CHECK_DEF([__unix__], [], [silent]) + if test "$curl_cv_have_def___unix__" = "yes"; then + compiler_id="INTEL_UNIX_C" +- flags_dbg_all="-g -g0" +- flags_dbg_yes="-g" +- flags_dbg_off="-g0" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" +- flags_opt_yes="-O2" +- flags_opt_off="-O0" ++ flags_dbg_all="" ++ flags_dbg_yes="" ++ flags_dbg_off="" ++ flags_opt_all="" ++ flags_opt_yes="" ++ flags_opt_off="" + else + compiler_id="INTEL_WINDOWS_C" +- flags_dbg_all="/ZI /Zi /zI /zi /ZD /Zd /zD /zd /Z7 /z7 /Oy /Oy-" +- flags_dbg_all="$flags_dbg_all /debug" +- flags_dbg_all="$flags_dbg_all /debug:none" +- flags_dbg_all="$flags_dbg_all /debug:minimal" +- flags_dbg_all="$flags_dbg_all /debug:partial" +- flags_dbg_all="$flags_dbg_all /debug:full" +- flags_dbg_all="$flags_dbg_all /debug:semantic_stepping" +- flags_dbg_all="$flags_dbg_all /debug:extended" +- flags_dbg_yes="/Zi /Oy-" +- flags_dbg_off="/debug:none /Oy-" +- flags_opt_all="/O /O0 /O1 /O2 /O3 /Od /Og /Og- /Oi /Oi-" +- flags_opt_yes="/O2" +- flags_opt_off="/Od" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_all="" ++ flags_dbg_yes="" ++ flags_dbg_off="" ++ flags_opt_all="" ++ flags_opt_yes="" ++ flags_opt_off="" + fi + else + AC_MSG_RESULT([no]) +@@ -268,8 +268,8 @@ + if test "$curl_cv_have_def___LCC__" = "yes"; then + AC_MSG_RESULT([yes]) + compiler_id="LCC" +- flags_dbg_all="-g" +- flags_dbg_yes="-g" ++ flags_dbg_all="" ++ flags_dbg_yes="" + flags_dbg_off="" + flags_opt_all="" + flags_opt_yes="" +@@ -294,12 +294,12 @@ + test "$compiler_id" = "unknown"; then + AC_MSG_RESULT([yes]) + compiler_id="SGI_MIPS_C" +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_yes="-g" +- flags_dbg_off="-g0" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast" +- flags_opt_yes="-O2" +- flags_opt_off="-O0" ++ flags_dbg_all="" ++ flags_dbg_yes="" ++ flags_dbg_off="" ++ flags_opt_all="" ++ flags_opt_yes="" ++ flags_opt_off="" + else + AC_MSG_RESULT([no]) + fi +@@ -321,12 +321,12 @@ + test "$curl_cv_have_def__COMPILER_VERSION" = "yes"); then + AC_MSG_RESULT([yes]) + compiler_id="SGI_MIPSPRO_C" +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_yes="-g" +- flags_dbg_off="-g0" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast" +- flags_opt_yes="-O2" +- flags_opt_off="-O0" ++ flags_dbg_all="" ++ flags_dbg_yes="" ++ flags_dbg_off="" ++ flags_opt_all="" ++ flags_opt_yes="" ++ flags_opt_off="" + else + AC_MSG_RESULT([no]) + fi +@@ -343,11 +343,11 @@ + if test "$curl_cv_have_def___SUNPRO_C" = "yes"; then + AC_MSG_RESULT([yes]) + compiler_id="SUNPRO_C" +- flags_dbg_all="-g -s" +- flags_dbg_yes="-g" +- flags_dbg_off="-s" +- flags_opt_all="-O -xO -xO1 -xO2 -xO3 -xO4 -xO5" +- flags_opt_yes="-xO2" ++ flags_dbg_all="" ++ flags_dbg_yes="" ++ flags_dbg_off="" ++ flags_opt_all="" ++ flags_opt_yes="" + flags_opt_off="" + else + AC_MSG_RESULT([no]) +@@ -365,8 +365,8 @@ + if test "$curl_cv_have_def___TINYC__" = "yes"; then + AC_MSG_RESULT([yes]) + compiler_id="TINY_C" +- flags_dbg_all="-g -b" +- flags_dbg_yes="-g" ++ flags_dbg_all="" ++ flags_dbg_yes="" + flags_dbg_off="" + flags_opt_all="" + flags_opt_yes="" +@@ -389,12 +389,12 @@ + CURL_CHECK_DEF([__UNIX__], [], [silent]) + if test "$curl_cv_have_def___UNIX__" = "yes"; then + compiler_id="WATCOM_UNIX_C" +- flags_dbg_all="-g1 -g1+ -g2 -g3" +- flags_dbg_yes="-g2" ++ flags_dbg_all="" ++ flags_dbg_yes="" + flags_dbg_off="" +- flags_opt_all="-O0 -O1 -O2 -O3" +- flags_opt_yes="-O2" +- flags_opt_off="-O0" ++ flags_opt_all="" ++ flags_opt_yes="" ++ flags_opt_off="" + else + compiler_id="WATCOM_WINDOWS_C" + flags_dbg_all="" |