pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/hal * Add NetBSD support to storage methods fdi
details: https://anonhg.NetBSD.org/pkgsrc/rev/e106c082abbf
branches: trunk
changeset: 550546:e106c082abbf
user: jmcneill <jmcneill%pkgsrc.org@localhost>
date: Mon Nov 24 01:23:12 2008 +0000
description:
* Add NetBSD support to storage methods fdi
* Patch CK tracker for updated signatures in version 0.3.0
* Bump PKGREVISION
diffstat:
sysutils/hal/Makefile | 4 +-
sysutils/hal/patches/patch-ah | 98 +++++++++++++++++++++++++++++++++++++++++++
sysutils/hal/patches/patch-ai | 49 +++++++++++++++++++++
3 files changed, 149 insertions(+), 2 deletions(-)
diffs (169 lines):
diff -r 3a528dddf86a -r e106c082abbf sysutils/hal/Makefile
--- a/sysutils/hal/Makefile Mon Nov 24 01:18:14 2008 +0000
+++ b/sysutils/hal/Makefile Mon Nov 24 01:23:12 2008 +0000
@@ -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 -r 3a528dddf86a -r e106c082abbf sysutils/hal/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/hal/patches/patch-ah Mon Nov 24 01:23:12 2008 +0000
@@ -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 -r 3a528dddf86a -r e106c082abbf sysutils/hal/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/hal/patches/patch-ai Mon Nov 24 01:23:12 2008 +0000
@@ -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;
Home |
Main Index |
Thread Index |
Old Index