CVS commit: [pkgsrc-2017Q1] pkgsrc/sysutils/hal

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon May  1 09:20:18 UTC 2017

Modified Files:
        pkgsrc/sysutils/hal [pkgsrc-2017Q1]: distinfo
        pkgsrc/sysutils/hal/patches [pkgsrc-2017Q1]:
            patch-hald_linux_addons_addon-storage.c

Log Message:
Pullup ticket #5373 - requested by sevan
sysutils/hal: build fix for Linux

Revisions pulled up:
- sysutils/hal/distinfo                                         1.28
- sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c  1.2

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Wed Apr 26 12:10:43 UTC 2017

   Modified Files:
           pkgsrc/sysutils/hal: distinfo
           pkgsrc/sysutils/hal/patches: patch-hald_linux_addons_addon-storage.c

   Log Message:
   hal: help RHEL7 builds along by including <stddef.h> for size_t used by
   another header, scsi/sg.h.

   Blind fix.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.2.1 pkgsrc/sysutils/hal/distinfo
cvs rdiff -u -r1.1 -r1.1.40.1 \
    pkgsrc/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.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/distinfo
diff -u pkgsrc/sysutils/hal/distinfo:1.27 pkgsrc/sysutils/hal/distinfo:1.27.2.1
--- pkgsrc/sysutils/hal/distinfo:1.27   Tue Jan 17 15:25:27 2017
+++ pkgsrc/sysutils/hal/distinfo        Mon May  1 09:20:17 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2017/01/17 15:25:27 wiz Exp $
+$NetBSD: distinfo,v 1.27.2.1 2017/05/01 09:20:17 bsiegert Exp $
 
 SHA1 (hal-0.5.14.tar.bz2) = a6ec098d78112e18e2773afa5f9ed642b00c4c59
 RMD160 (hal-0.5.14.tar.bz2) = 0314dace9512bf49a62bd1556963fc60a6c9caf9
@@ -43,7 +43,7 @@ SHA1 (patch-hald_linux_addons_addon-leds
 SHA1 (patch-hald_linux_addons_addon-macbookpro-backlight.c) = c508a7b9070c319679b8b8e715d29410957ba41a
 SHA1 (patch-hald_linux_addons_addon-omap-backlight.c) = 72ba398a1d661fb726778bf7df7460735fee988f
 SHA1 (patch-hald_linux_addons_addon-rfkill-killswitch.c) = 800fac10408b65b12cd644b93b8612c8b2970da0
-SHA1 (patch-hald_linux_addons_addon-storage.c) = 9949c8768395295f27aebc792b8b8091e988d2d9
+SHA1 (patch-hald_linux_addons_addon-storage.c) = 27c07d3a499aa9fa37938ff3f918dc01c625b5fd
 SHA1 (patch-hald_linux_addons_addon-usb-csr.c) = 34b5be5ff308f9aafcf505b303d36cbc2483d015
 SHA1 (patch-hald_netbsd_devinfo__mass.c) = be1c7bf311e21e9891199d67c0ebf87978bd735f
 SHA1 (patch-na) = 2786db8149a55dbd5ea11419d789f420bac1993c

Index: pkgsrc/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c
diff -u pkgsrc/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c:1.1 pkgsrc/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c:1.1.40.1
--- pkgsrc/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c:1.1     Mon May 14 03:12:01 2012
+++ pkgsrc/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c Mon May  1 09:20:18 2017
@@ -1,8 +1,19 @@
-$NetBSD: patch-hald_linux_addons_addon-storage.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+$NetBSD: patch-hald_linux_addons_addon-storage.c,v 1.1.40.1 2017/05/01 09:20:18 bsiegert Exp $
+
+include stddef.h for size_t used in scsi/sg.h
+glib2 now only allows glib.h to be included
 
 --- hald/linux/addons/addon-storage.c.orig     2009-08-24 12:42:30.000000000 +0000
 +++ hald/linux/addons/addon-storage.c
-@@ -39,7 +39,7 @@
+@@ -32,6 +32,7 @@
+ #include <linux/cdrom.h>
+ #include <linux/fs.h>
+ #include <mntent.h>
++#include <stddef.h>
+ #include <scsi/sg.h>
+ #include <stdint.h>
+ #include <stdio.h>
+@@ -39,7 +40,7 @@
  #include <string.h>
  #include <sys/ioctl.h>
  #include <unistd.h>