CVS commit: pkgsrc/sysutils/hal

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Sat May 19 13:41:51 UTC 2018

Modified Files:
        pkgsrc/sysutils/hal: Makefile
        pkgsrc/sysutils/hal/files/hald-netbsd: devinfo_misc.c

Log Message:
hald-netbsd: cpu device name must match cpu[0-9]*. Bump pkg revision.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/sysutils/hal/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/hal/files/hald-netbsd/devinfo_misc.c

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

Modified files:

Index: pkgsrc/sysutils/hal/Makefile
diff -u pkgsrc/sysutils/hal/Makefile:1.80 pkgsrc/sysutils/hal/Makefile:1.81
--- pkgsrc/sysutils/hal/Makefile:1.80   Sat May 19 13:25:36 2018
+++ pkgsrc/sysutils/hal/Makefile        Sat May 19 13:41:51 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2018/05/19 13:25:36 jmcneill Exp $
+# $NetBSD: Makefile,v 1.81 2018/05/19 13:41:51 jmcneill Exp $
 
 DISTNAME=              hal-0.5.14
-PKGREVISION=           19
+PKGREVISION=           20
 CATEGORIES=            sysutils
 MASTER_SITES=          http://hal.freedesktop.org/releases/
 EXTRACT_SUFX=          .tar.bz2

Index: pkgsrc/sysutils/hal/files/hald-netbsd/devinfo_misc.c
diff -u pkgsrc/sysutils/hal/files/hald-netbsd/devinfo_misc.c:1.7 pkgsrc/sysutils/hal/files/hald-netbsd/devinfo_misc.c:1.8
--- pkgsrc/sysutils/hal/files/hald-netbsd/devinfo_misc.c:1.7    Sat May 19 13:25:36 2018
+++ pkgsrc/sysutils/hal/files/hald-netbsd/devinfo_misc.c        Sat May 19 13:41:51 2018
@@ -117,6 +117,9 @@ devinfo_cpu_add(HalDevice *parent, const
        if (strncmp(devnode, "cpu", 3) != 0) {
                return (NULL);
        }
+       if (devnode[3] < '0' || devnode[3] > '9') {
+               return (NULL);
+       }
 
        HAL_INFO (("devinfo_cpu_add: parent=%p devnode=%s devfs_path=%s device_type=%s",
            parent, devnode, devfs_path, device_type));