diff options
author | jmcneill <jmcneill@pkgsrc.org> | 2008-11-24 01:23:12 +0000 |
---|---|---|
committer | jmcneill <jmcneill@pkgsrc.org> | 2008-11-24 01:23:12 +0000 |
commit | 6d4e58c6bb777ccd50b98383bc9b6a732323c93e (patch) | |
tree | f29720d3a89ff0cc73d26e719f08ad6fb55228af /sysutils/hal | |
parent | 6fe26c98aeb233d462e6836cf8e9c84753b5faa0 (diff) | |
download | pkgsrc-6d4e58c6bb777ccd50b98383bc9b6a732323c93e.tar.gz |
* Add NetBSD support to storage methods fdi
* Patch CK tracker for updated signatures in version 0.3.0
* Bump PKGREVISION
Diffstat (limited to 'sysutils/hal')
-rw-r--r-- | sysutils/hal/Makefile | 4 | ||||
-rw-r--r-- | sysutils/hal/patches/patch-ah | 98 | ||||
-rw-r--r-- | sysutils/hal/patches/patch-ai | 49 |
3 files changed, 149 insertions, 2 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 77dbbdd6bfd..113bbb0f992 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2008/11/23 21:50:51 hasso Exp $ +# $NetBSD: Makefile,v 1.3 2008/11/24 01:23:12 jmcneill Exp $ # DISTNAME= hal-0.5.11 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ EXTRACT_SUFX= .tar.bz2 diff --git a/sysutils/hal/patches/patch-ah b/sysutils/hal/patches/patch-ah new file mode 100644 index 00000000000..18d939e8303 --- /dev/null +++ b/sysutils/hal/patches/patch-ah @@ -0,0 +1,98 @@ +$NetBSD: patch-ah,v 1.1 2008/11/24 01:23:12 jmcneill Exp $ + +--- fdi/policy/10osvendor/20-storage-methods.fdi.orig 2008-11-23 18:24:46.000000000 -0500 ++++ fdi/policy/10osvendor/20-storage-methods.fdi 2008-11-23 18:30:14.000000000 -0500 +@@ -73,6 +73,11 @@ + <append key="volume.mount.valid_options" type="strlist">noexec</append> + <append key="volume.mount.valid_options" type="strlist">noatime</append> + </match> ++ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD"> ++ <append key="volume.mount.valid_options" type="strlist">ro</append> ++ <append key="volume.mount.valid_options" type="strlist">noexec</append> ++ <append key="volume.mount.valid_options" type="strlist">noatime</append> ++ </match> + </match> + </match> + +@@ -182,6 +187,13 @@ + <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-eject</append> + </match> + ++ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD"> ++ <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Eject</append> ++ <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">as</append> ++ <append key="org.freedesktop.Hal.Device.Volume.method_argnames" type="strlist">extra_options</append> ++ <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-eject</append> ++ </match> ++ + <!-- allow these mount options for all file systems --> + <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux"> + <append key="volume.mount.valid_options" type="strlist">ro</append> +@@ -199,6 +211,11 @@ + <append key="volume.mount.valid_options" type="strlist">noexec</append> + <append key="volume.mount.valid_options" type="strlist">noatime</append> + </match> ++ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD"> ++ <append key="volume.mount.valid_options" type="strlist">ro</append> ++ <append key="volume.mount.valid_options" type="strlist">noexec</append> ++ <append key="volume.mount.valid_options" type="strlist">noatime</append> ++ </match> + + <!-- allow these mount options for vfat --> + <match key="volume.fstype" string="vfat"> +@@ -225,6 +242,15 @@ + <append key="volume.mount.valid_options" type="strlist">-D=</append> + <append key="volume.mount.valid_options" type="strlist">large</append> + </match> ++ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD"> ++ <append key="volume.mount.valid_options" type="strlist">-u=</append> ++ <append key="volume.mount.valid_options" type="strlist">-g=</append> ++ <append key="volume.mount.valid_options" type="strlist">-m=</append> ++ <append key="volume.mount.valid_options" type="strlist">-M=</append> ++ <append key="volume.mount.valid_options" type="strlist">-9</append> ++ <append key="volume.mount.valid_options" type="strlist">-l</append> ++ <append key="volume.mount.valid_options" type="strlist">-s</append> ++ </match> + </match> + + +@@ -258,6 +284,13 @@ + <append key="volume.mount.valid_options" type="strlist">-C=</append> + <append key="volume.mount.valid_options" type="strlist">-W=</append> + </match> ++ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD"> ++ <append key="volume.mount.valid_options" type="strlist">-u=</append> ++ <append key="volume.mount.valid_options" type="strlist">-g=</append> ++ <append key="volume.mount.valid_options" type="strlist">-m=</append> ++ <append key="volume.mount.valid_options" type="strlist">-a</append> ++ <append key="volume.mount.valid_options" type="strlist">-i</append> ++ </match> + </match> + + <!-- allow these mount options for ext3 --> +@@ -290,6 +323,10 @@ + <append key="volume.mount.valid_options" type="strlist">-C=</append> + <append key="volume.mount.valid_options" type="strlist">-v</append> + </match> ++ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD"> ++ <append key="volume.mount.valid_options" type="strlist">-u=</append> ++ <append key="volume.mount.valid_options" type="strlist">-g=</append> ++ </match> + </match> + + <!-- iso9660 --> +@@ -310,6 +347,14 @@ + <append key="volume.mount.valid_options" type="strlist">-C=</append> + <append key="volume.mount.valid_options" type="strlist">-v</append> + </match> ++ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="NetBSD"> ++ <append key="volume.mount.valid_options" type="strlist">extatt</append> ++ <append key="volume.mount.valid_options" type="strlist">gens</append> ++ <append key="volume.mount.valid_options" type="strlist">nojoliet</append> ++ <append key="volume.mount.valid_options" type="strlist">norrip</append> ++ <append key="volume.mount.valid_options" type="strlist">nomaplcase</append> ++ <append key="volume.mount.valid_options" type="strlist">rcaseins</append> ++ </match> + </match> + + <!-- allow these unmount options --> diff --git a/sysutils/hal/patches/patch-ai b/sysutils/hal/patches/patch-ai new file mode 100644 index 00000000000..08b6c5cd23e --- /dev/null +++ b/sysutils/hal/patches/patch-ai @@ -0,0 +1,49 @@ +$NetBSD: patch-ai,v 1.1 2008/11/24 01:23:12 jmcneill Exp $ + +--- hald/ck-tracker.c.orig 2008-11-23 19:28:23.000000000 -0500 ++++ hald/ck-tracker.c 2008-11-23 19:30:05.000000000 -0500 +@@ -256,7 +256,7 @@ ck_session_get_info (CKTracker *tracker, + goto error; + } + if (!dbus_message_get_args (reply, NULL, +- DBUS_TYPE_INT32, &(session->user), ++ DBUS_TYPE_UINT32, &(session->user), + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid GetUnixUser reply from CK")); + goto error; +@@ -531,7 +531,7 @@ ck_tracker_process_system_bus_message (C + seat_objpath = dbus_message_get_path (message); + + if (!dbus_message_get_args (message, NULL, +- DBUS_TYPE_STRING, &seat_objpath, ++ DBUS_TYPE_OBJECT_PATH, &seat_objpath, + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid SeatAdded signal from CK")); + goto out; +@@ -558,7 +558,7 @@ ck_tracker_process_system_bus_message (C + seat_objpath = dbus_message_get_path (message); + + if (!dbus_message_get_args (message, NULL, +- DBUS_TYPE_STRING, &seat_objpath, ++ DBUS_TYPE_OBJECT_PATH, &seat_objpath, + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid SeatRemoved signal from CK")); + goto out; +@@ -588,7 +588,7 @@ ck_tracker_process_system_bus_message (C + seat_objpath = dbus_message_get_path (message); + + if (!dbus_message_get_args (message, NULL, +- DBUS_TYPE_STRING, &session_objpath, ++ DBUS_TYPE_OBJECT_PATH, &session_objpath, + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid SessionAdded signal from CK")); + goto out; +@@ -624,7 +624,7 @@ ck_tracker_process_system_bus_message (C + seat_objpath = dbus_message_get_path (message); + + if (!dbus_message_get_args (message, NULL, +- DBUS_TYPE_STRING, &session_objpath, ++ DBUS_TYPE_OBJECT_PATH, &session_objpath, + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid SessionRemoved signal from CK")); + goto out; |