From patchwork Mon Apr 2 21:31:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 150257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id B5890B6F9A for ; Tue, 3 Apr 2012 07:34:09 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A6EBC10148E; Mon, 2 Apr 2012 21:34:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vFiWuXLd2VvT; Mon, 2 Apr 2012 21:33:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 49A2F101625; Mon, 2 Apr 2012 21:33:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A15F28F78E for ; Mon, 2 Apr 2012 21:33:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9A3E2A0266 for ; Mon, 2 Apr 2012 21:33:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 74NDWKeyq1nI for ; Mon, 2 Apr 2012 21:33:57 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by hemlock.osuosl.org (Postfix) with ESMTP id 1143AA01F0 for ; Mon, 2 Apr 2012 21:33:57 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id 0D2C3969E4; Mon, 2 Apr 2012 21:33:57 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Mon, 2 Apr 2012 23:31:04 +0200 X-Git-Refname: refs/heads/master X-Git-Oldrev: 71cec7c82ce01706ec85155cb18850e025af8156 X-Git-Newrev: 52201e2d1151f3a6fb61f73c7bf54814cf26b672 X-Patchwork-Hint: ignore Message-Id: <20120402213357.0D2C3969E4@busybox.osuosl.org> Subject: [Buildroot] [git commit] expat: security bump to version 2.1.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 commit: http://git.buildroot.net/buildroot/commit/?id=52201e2d1151f3a6fb61f73c7bf54814cf26b672 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes for CVE-2012-1147, CVE-2009-3720, CVE-2009-3560, CVE-2012-1148 and CVE-2012-0876. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/expat/expat-2.0.1-CVE-2009-3560.patch | 14 -------------- package/expat/expat.mk | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/package/expat/expat-2.0.1-CVE-2009-3560.patch b/package/expat/expat-2.0.1-CVE-2009-3560.patch deleted file mode 100644 index 7cadc47..0000000 --- a/package/expat/expat-2.0.1-CVE-2009-3560.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560 - ---- a/lib/xmlparse.c -+++ b/lib/xmlparse.c -@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser, - return XML_ERROR_UNCLOSED_TOKEN; - case XML_TOK_PARTIAL_CHAR: - return XML_ERROR_PARTIAL_CHAR; -+ case -XML_TOK_PROLOG_S: -+ tok = -tok; -+ break; - case XML_TOK_NONE: - #ifdef XML_DTD - /* for internal PE NOT referenced between declarations */ diff --git a/package/expat/expat.mk b/package/expat/expat.mk index b179383..ea008db 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,8 +4,8 @@ # ############################################################# -EXPAT_VERSION = 2.0.1 -EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat +EXPAT_VERSION = 2.1.0 +EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_INSTALL_STAGING = YES EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib