CVS commit: pkgsrc/devel/openocd

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Tue Mar 13 03:01:15 UTC 2018

Modified Files:
        pkgsrc/devel/openocd: Makefile distinfo
Added Files:
        pkgsrc/devel/openocd/patches: patch-src_flash_nor_fm4.c

Log Message:
Patch ctype.h misuse, which for some reason only clang was objecting to.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/openocd/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/openocd/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/openocd/patches/patch-src_flash_nor_fm4.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/openocd/Makefile
diff -u pkgsrc/devel/openocd/Makefile:1.4 pkgsrc/devel/openocd/Makefile:1.5
--- pkgsrc/devel/openocd/Makefile:1.4   Sun Feb 11 00:55:58 2018
+++ pkgsrc/devel/openocd/Makefile       Tue Mar 13 03:01:15 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2018/02/11 00:55:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/13 03:01:15 dholland Exp $
 
 DISTNAME=      openocd-0.10.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=openocd/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/devel/openocd/distinfo
diff -u pkgsrc/devel/openocd/distinfo:1.6 pkgsrc/devel/openocd/distinfo:1.7
--- pkgsrc/devel/openocd/distinfo:1.6   Sun Feb 11 00:55:58 2018
+++ pkgsrc/devel/openocd/distinfo       Tue Mar 13 03:01:15 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2018/02/11 00:55:58 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2018/03/13 03:01:15 dholland Exp $
 
 SHA1 (openocd-0.10.0.tar.bz2) = 3245d43d60a1a93f8b0f6b1ce20b53e38cab7a4a
 RMD160 (openocd-0.10.0.tar.bz2) = c3ae519d50e0f4185768a7642eefbc954c56d84a
 SHA512 (openocd-0.10.0.tar.bz2) = 6c890c86c3339da49bd529e8674ca62bc7fce4a2a17798dcc5d70b4f7628b640d856651170a3f7e2e2a120989066e84d8439b56ff42ff2bd72446f9af0f28ba2
 Size (openocd-0.10.0.tar.bz2) = 4792636 bytes
+SHA1 (patch-src_flash_nor_fm4.c) = b14914ebe08a7c7d9f12c3999c5e6edeae2569e0

Added files:

Index: pkgsrc/devel/openocd/patches/patch-src_flash_nor_fm4.c
diff -u /dev/null pkgsrc/devel/openocd/patches/patch-src_flash_nor_fm4.c:1.1
--- /dev/null   Tue Mar 13 03:01:15 2018
+++ pkgsrc/devel/openocd/patches/patch-src_flash_nor_fm4.c      Tue Mar 13 03:01:15 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_flash_nor_fm4.c,v 1.1 2018/03/13 03:01:15 dholland Exp $
+
+Fix ctype.h misuse.
+
+--- src/flash/nor/fm4.c~       2016-12-25 14:12:54.000000000 +0000
++++ src/flash/nor/fm4.c
+@@ -609,7 +609,7 @@ static bool fm4_name_match(const char *s
+               if (!pattern[i])
+                       return true;
+               /* Use x as wildcard */
+-              if (pattern[i] != 'x' && tolower(s[i]) != tolower(pattern[i]))
++              if (pattern[i] != 'x' && tolower((unsigned char)s[i]) != tolower((unsigned char)pattern[i]))
+                       return false;
+               i++;
+       }