summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2017-05-28 15:56:11 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-05-28 16:14:16 +0200
commitdb55de2b42a54ca715a7aa3ed6e388ea6f557092 (patch)
tree8aff53c9d146e2b7ce10b5be6e86f91f11309c08
parent4f9190f14e821a90cae690b1741eee4efd9b661b (diff)
downloadbuildroot-db55de2b42a54ca715a7aa3ed6e388ea6f557092.tar.gz
buildroot-db55de2b42a54ca715a7aa3ed6e388ea6f557092.zip
package/flashrom: security bump to version 0.9.9
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 <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/flashrom/0002-sys-io.h.patch27
-rw-r--r--package/flashrom/flashrom.hash2
-rw-r--r--package/flashrom/flashrom.mk2
3 files changed, 2 insertions, 29 deletions
diff --git a/package/flashrom/0002-sys-io.h.patch b/package/flashrom/0002-sys-io.h.patch
deleted file mode 100644
index 8d990c6f91..0000000000
--- 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" <yann.morin.1998@free.fr>
-
-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 <sys/io.h>
- #endif
- #endif
diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash
index a2168699f3..64b67b99cf 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 0b89bf3e67..4ecdce8f41 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
OpenPOWER on IntegriCloud