summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorjoerg <joerg>2014-03-06 15:46:39 +0000
committerjoerg <joerg>2014-03-06 15:46:39 +0000
commit1585cdd1f614a60533436e132cd9ecad3dfbd0cc (patch)
treeb2f143ec48a0092bd2ae211d7a85da633fa634ee /sysutils
parent32a7402dc98544e3d9024cf0f1ddc7151f1ec4d7 (diff)
downloadpkgsrc-1585cdd1f614a60533436e132cd9ecad3dfbd0cc.tar.gz
Remove impossible check.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/flashrom/distinfo3
-rw-r--r--sysutils/flashrom/patches/patch-flashrom.c22
2 files changed, 24 insertions, 1 deletions
diff --git a/sysutils/flashrom/distinfo b/sysutils/flashrom/distinfo
index 0a6831fd788..d3ef44711a6 100644
--- a/sysutils/flashrom/distinfo
+++ b/sysutils/flashrom/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2013/12/09 18:54:24 jakllsch Exp $
+$NetBSD: distinfo,v 1.8 2014/03/06 15:46:39 joerg Exp $
SHA1 (flashrom-0.9.7.tar.bz2) = d08b4073ea3ebf63f03c3e502f4291f50ef348ee
RMD160 (flashrom-0.9.7.tar.bz2) = e160e0ac1e0e138702f3f467707175df96b7e6b1
Size (flashrom-0.9.7.tar.bz2) = 408883 bytes
+SHA1 (patch-flashrom.c) = 9867fa7ff7d0a55bff5fc0e6c8c6c901af6211f8
diff --git a/sysutils/flashrom/patches/patch-flashrom.c b/sysutils/flashrom/patches/patch-flashrom.c
new file mode 100644
index 00000000000..d4d10b3bcf9
--- /dev/null
+++ b/sysutils/flashrom/patches/patch-flashrom.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-flashrom.c,v 1.1 2014/03/06 15:46:39 joerg Exp $
+
+--- flashrom.c.orig 2014-03-02 13:42:29.000000000 +0000
++++ flashrom.c
+@@ -1738,7 +1738,7 @@ int selfcheck(void)
+ * For 'flashchips' we check the first element to be non-null. In the
+ * other cases there exist use cases where the first element can be
+ * null. */
+- if (flashchips == NULL || flashchips[0].vendor == NULL) {
++ if (flashchips[0].vendor == NULL) {
+ msg_gerr("Flashchips table miscompilation!\n");
+ ret = 1;
+ }
+@@ -1746,7 +1746,7 @@ int selfcheck(void)
+ if (selfcheck_eraseblocks(chip))
+ ret = 1;
+
+-#if CONFIG_INTERNAL == 1
++#if 0 && CONFIG_INTERNAL == 1
+ if (chipset_enables == NULL) {
+ msg_gerr("Chipset enables table does not exist!\n");
+ ret = 1;