Since KDE doesn't support ConsoleKit yet and the technicals have not been worked out 100%, leaving ConsoleKit out of this release. Re-added the utf8 for ntfs patch. Re-added the detect newer MacBookPro's patch. Re-added ignore fixed volumes patch. These were dropped by accident in 0.5.9.

(Portage version: 2.1.2.4)

4 files changed, 66 insertions, 0 deletions

diff --git a/sys-apps/hal/files/0.5.9/13_detect_newer_macbooks.patch b/sys-apps/hal/files/0.5.9/13_detect_newer_macbooks.patch
new file mode 100644
index 000000000000..e14c3d280c06
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/13_detect_newer_macbooks.patch
@@ -0,0 +1,13 @@
+Index: b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
+===================================================================
+--- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi	2007-03-07 16:52:19.000000000 -0500
++++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi	2007-04-18 10:18:41.000000000 -0400
+@@ -6,7 +6,7 @@
+   <device>
+     <match key="system.kernel.name" string="Linux">
+       <match key="system.hardware.vendor" string="Apple Computer, Inc.">
+-        <match key="system.hardware.product" string="MacBookPro1,1">
++        <match key="system.hardware.product" contains="MacBookPro">
+           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
+           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
+           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
diff --git a/sys-apps/hal/files/0.5.9/14_ntfs_allows_utf8.patch b/sys-apps/hal/files/0.5.9/14_ntfs_allows_utf8.patch
new file mode 100644
index 000000000000..92a0ef1f9df1
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/14_ntfs_allows_utf8.patch
@@ -0,0 +1,12 @@
+Index: b/fdi/policy/10osvendor/20-storage-methods.fdi
+===================================================================
+--- a/fdi/policy/10osvendor/20-storage-methods.fdi	2007-03-27 01:18:54.000000000 -0400
++++ b/fdi/policy/10osvendor/20-storage-methods.fdi	2007-04-18 10:20:54.000000000 -0400
+@@ -186,6 +186,7 @@
+ 	  <append key="volume.mount.valid_options" type="strlist">gid=</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">umask=</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">locale=</append>
++	  <append key="volume.mount.valid_options" type="strlist">utf8</append>
+ 	</match>
+ 	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">
+ 	  <append key="volume.mount.valid_options" type="strlist">-u=</append>
diff --git a/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch b/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch
new file mode 100644
index 000000000000..70f79b84e6e9
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch
@@ -0,0 +1,38 @@
+Index: b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi	2007-04-18 10:14:56.000000000 -0400
+@@ -0,0 +1,19 @@
++<?xml version="1.0" encoding="UTF8"?> <!-- -*- SGML -*- -->
++
++<deviceinfo version="0.2">
++  <device>
++    <match key="@block.storage_device:storage.hotpluggable" bool="false">
++      <match key="@block.storage_device:storage.removable" bool="false">
++        <match key="volume.is_mounted" bool="true">
++	  <merge key="volume.ignore" type="bool">true</merge>
++	  <!-- Show /media/ mounted devices -->
++	  <match key="volume.mount_point" compare_gt="/media">
++	    <match key="volume.mount_point" compare_lt="/media0">
++	      <merge key="volume.ignore" type="bool">false</merge>
++	    </match>
++	  </match>
++	</match>
++      </match>
++    </match>
++  </device>
++</deviceinfo>
+Index: b/fdi/policy/10osvendor/Makefile.am
+===================================================================
+--- a/fdi/policy/10osvendor/Makefile.am	2007-03-30 15:03:33.000000000 -0400
++++ b/fdi/policy/10osvendor/Makefile.am	2007-04-18 10:16:27.000000000 -0400
+@@ -7,7 +7,8 @@
+ 	10-rfkill-switch.fdi		\
+ 	10-laptop-panel-mgmt-policy.fdi	\
+ 	15-storage-luks.fdi		\
+-	20-storage-methods.fdi
++	20-storage-methods.fdi		\
++	95-storage-ignore-fixed-drives.fdi
+ 
+ if BUILD_MACBOOKPRO
+ dist_fdi_DATA += 10-macbookpro-utils.fdi
diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series
index 262056b976ac..6406218c700c 100644
--- a/sys-apps/hal/files/0.5.9/series
+++ b/sys-apps/hal/files/0.5.9/series
@@ -10,5 +10,8 @@
 10_freebsd_storage_reprobe_fix.patch
 11_hal_fix_segfault_probe_volume.patch
 12_hal_fix-vol_label_probe_volume.patch
+13_detect_newer_macbooks.patch
+14_ntfs_allows_utf8.patch
 95_gentoo_man_page.patch
 96_plugdev_allow_send.patch
+97_ignore_fixed_drives.patch