From patchwork Sun May 28 13:56:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 767890 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wbLy00pWhz9s7M for ; Sun, 28 May 2017 23:56:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B812E8657F; Sun, 28 May 2017 13:56:21 +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 P0FcKe-itxhl; Sun, 28 May 2017 13:56:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2672386574; Sun, 28 May 2017 13:56:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 4170A1C009D for ; Sun, 28 May 2017 13:56:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 12BD624049 for ; Sun, 28 May 2017 13:56:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c1FNaVVHKyRD for ; Sun, 28 May 2017 13:56:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by silver.osuosl.org (Postfix) with ESMTPS id 9460B23E96 for ; Sun, 28 May 2017 13:56:17 +0000 (UTC) Received: from fwd34.aul.t-online.de (fwd34.aul.t-online.de [172.20.26.145]) by mailout09.t-online.de (Postfix) with SMTP id EDF73425A88B; Sun, 28 May 2017 15:56:15 +0200 (CEST) Received: from fli4l.lan.fli4l (Gt5hhrZfYh-Y1U20cFxn1ns5hhiqp1dOJPZym7XRDtSIP6fawh25aVW87+Yux+zZZi@[79.228.25.228]) by fwd34.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1dEyg0-1bSTkO0; Sun, 28 May 2017 15:56:12 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:33172 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.89) (envelope-from ) id 1dEyfz-0003fS-9k; Sun, 28 May 2017 15:56:11 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 28 May 2017 15:56:11 +0200 Message-Id: <20170528135611.10218-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.11.0 X-ID: Gt5hhrZfYh-Y1U20cFxn1ns5hhiqp1dOJPZym7XRDtSIP6fawh25aVW87+Yux+zZZi X-TOI-MSGID: 205b2c33-90a9-4c29-90a8-f0dc13a59a75 Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH 1/1] package/flashrom: security bump to version 0.9.9 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Fixes buffer overflow: https://mail.coreboot.org/pipermail/flashrom/2016-March/014523.html Removed patch 0002-sys-io.h.patch, not needed anymore, hwaccess.h now contains a similar fix: elif defined(__linux__) || defined(__GLIBC__) Signed-off-by: Bernd Kuhls --- package/flashrom/0002-sys-io.h.patch | 27 --------------------------- package/flashrom/flashrom.hash | 2 +- package/flashrom/flashrom.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/flashrom/0002-sys-io.h.patch diff --git a/package/flashrom/0002-sys-io.h.patch b/package/flashrom/0002-sys-io.h.patch deleted file mode 100644 index 8d990c6f9..000000000 --- a/package/flashrom/0002-sys-io.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -hwaccess: sys/io.h is not specific to glibc - -Under Linux, sys/io.h provides inb and outb, so we really need it. -However, its inclusion is conditional to the _GLIBC_ define. This is -usually OK under Linux, since both glibc and uClibc define it (uclibc -fakes being glibc). - -But the musl C library does not impersonate glibc, so we're missing -including sys/io.h in this case. - -Change the include from checking _GLIBC_ to checking whether this is -Linux, looking for the __linux__ define. - -Signed-off-by: "Yann E. MORIN" - -diff -durN flashrom-0.9.8.orig/hwaccess.h flashrom-0.9.8/hwaccess.h ---- flashrom-0.9.8.orig/hwaccess.h 2015-02-10 09:03:10.000000000 +0100 -+++ flashrom-0.9.8/hwaccess.h 2015-10-28 20:01:54.259202484 +0100 -@@ -27,7 +27,7 @@ - #include "platform.h" - - #if IS_X86 --#if defined(__GLIBC__) -+#if defined(__linux__) - #include - #endif - #endif diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash index a2168699f..64b67b99c 100644 --- a/package/flashrom/flashrom.hash +++ b/package/flashrom/flashrom.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 13dc7c895e583111ecca370363a3527d237d178a134a94b20db7df177c05f934 flashrom-0.9.8.tar.bz2 +sha256 cb3156b0f63eb192024b76c0814135930297aac41f80761a5d293de769783c45 flashrom-0.9.9.tar.bz2 diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 0b89bf3e6..4ecdce8f4 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLASHROM_VERSION = 0.9.8 +FLASHROM_VERSION = 0.9.9 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = http://download.flashrom.org/releases FLASHROM_DEPENDENCIES = pciutils libusb libusb-compat libftdi host-pkgconf