From patchwork Wed Sep 10 15:21:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 387874 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 3E07214012C for ; Thu, 11 Sep 2014 01:21:57 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5815291796; Wed, 10 Sep 2014 15:21:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fiv3Vb0l+KsI; Wed, 10 Sep 2014 15:21:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6779E9181D; Wed, 10 Sep 2014 15:21:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BB4131C20EC for ; Wed, 10 Sep 2014 15:21:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B734991812 for ; Wed, 10 Sep 2014 15:21:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QZ96J57B1rnj for ; Wed, 10 Sep 2014 15:21:48 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 96DAC91796 for ; Wed, 10 Sep 2014 15:21:44 +0000 (UTC) Received: from asgard (cpe-186-18-128-65.telecentro-reversos.com.ar [186.18.128.65] (may be forged)) (authenticated bits=0) by loknar.toptech.com.ar (8.14.9/8.14.9) with ESMTP id s8AFLaGt026114 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 10 Sep 2014 15:21:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1410362501; bh=qO6lJsPBfGMkIAc2Lo1ZI5Jpmgrxmv39lP8G3gLQgAQ=; h=From:To:Cc:Subject:Date; b=CiZ3YGVqme88ZSQRn4eQscCeGn8M4fB+qEMJk0ohYww/D50tJn6/J/7F9qUy2PcCa T66h8Plnl9Z1EpPURqaaE2flL+HTmUP3neWo98KRorK1zqx3MJWw7AhyBcPHl2oRCu lhea6YnxzL1PwBfnOZ9bx4CWUZ2tOonqubjuM9Lo= Received: by asgard (sSMTP sendmail emulation); Wed, 10 Sep 2014 12:21:31 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Wed, 10 Sep 2014 12:21:31 -0300 Message-Id: <1410362491-29991-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.5.5 X-Virus-Scanned: clamav-milter 0.98.1 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] libcurl: security bump to version 7.38.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Fixes: CVE-2014-3613 cookie leak with IP address as domain CVE-2014-3620 cookie leak for TLDs Signed-off-by: Gustavo Zacarias --- ...nk-curl-to-NSS-libraries-when-NSS-support.patch | 41 ---------------------- package/libcurl/libcurl.mk | 2 +- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 package/libcurl/libcurl-0001-build-link-curl-to-NSS-libraries-when-NSS-support.patch diff --git a/package/libcurl/libcurl-0001-build-link-curl-to-NSS-libraries-when-NSS-support.patch b/package/libcurl/libcurl-0001-build-link-curl-to-NSS-libraries-when-NSS-support.patch deleted file mode 100644 index a3d579b..0000000 --- a/package/libcurl/libcurl-0001-build-link-curl-to-NSS-libraries-when-NSS-support.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c6e7cbb94e669b85d3eb8e015ec51d0072112133 Mon Sep 17 00:00:00 2001 -From: Alessandro Ghedini -Date: Thu, 17 Jul 2014 14:37:28 +0200 -Subject: [PATCH] build: link curl to NSS libraries when NSS support is enabled - -This fixes a build failure on Debian caused by commit -24c3cdce88f39731506c287cb276e8bf4a1ce393. - -Bug: http://curl.haxx.se/mail/lib-2014-07/0209.html ---- -diff --git a/configure.ac b/configure.ac -index c3cccfb..b78f56d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2078,6 +2078,10 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then - if test "x$USE_NSS" = "xyes"; then - AC_MSG_NOTICE([detected NSS version $version]) - -+ dnl needed when linking the curl tool without USE_EXPLICIT_LIB_DEPS -+ NSS_LIBS=$addlib -+ AC_SUBST([NSS_LIBS]) -+ - dnl when shared libs were found in a path that the run-time - dnl linker doesn't search through, we need to add it to - dnl LD_LIBRARY_PATH to prevent further configure tests to fail -diff --git a/src/Makefile.am b/src/Makefile.am -index d8c0c7d..f96618e 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -62,7 +62,7 @@ LIBS = $(BLANK_AT_MAKETIME) - if USE_EXPLICIT_LIB_DEPS - curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@ - else --curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ -+curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ - endif - - curl_LDFLAGS = @LIBMETALINK_LDFLAGS@ --- -1.8.5.5 - diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index e4ab910..610efc1 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.37.1 +LIBCURL_VERSION = 7.38.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = http://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \