refresh previous patch. Add fix to catch D-Bus disconnect from hald_runner (possible sparc fix)

Package-Manager: portage-2.1.2.4

5 files changed, 69 insertions, 40 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index ffa9efdbe880..a4d694f24edb 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.177 2007/04/25 14:17:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.178 2007/04/25 14:35:11 cardoe Exp $
+
+  25 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
+  files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch,
+  +files/0.5.9/19_hald_runner_catch_dbus_disconnect.patch,
+  files/0.5.9/series:
+  refresh previous patch. Add fix to catch D-Bus disconnect from hald_runner
+  (possible sparc fix)
 
   25 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
   +files/0.5.9/17_autoconf_cflag_cleanup.patch,
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index ef5dc18779a7..8e4417b61aed 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -81,10 +81,14 @@ AUX 0.5.9/17_autoconf_cflag_cleanup.patch 4001 RMD160 157766a207c9afb0d659e119bd
 MD5 1db8be4fb0558c130e8fd12061ce5d0a files/0.5.9/17_autoconf_cflag_cleanup.patch 4001
 RMD160 157766a207c9afb0d659e119bd3c9334292c41bd files/0.5.9/17_autoconf_cflag_cleanup.patch 4001
 SHA256 e30480b18f30f97562781b1879d4d02e963704d5c774ee60cf204903f247ab45 files/0.5.9/17_autoconf_cflag_cleanup.patch 4001
-AUX 0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch 4755 RMD160 049686ba8a8766287587edf826cf128d3c473a0d SHA1 6e152dd055e9c370800203c5d02a6445a21ac9be SHA256 07e9740985bea0baa8b472f0731507c64ec7784547f548789c0efcf6e92862ef
-MD5 9954802d28a6d47499e0a48928b9593b files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch 4755
-RMD160 049686ba8a8766287587edf826cf128d3c473a0d files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch 4755
-SHA256 07e9740985bea0baa8b472f0731507c64ec7784547f548789c0efcf6e92862ef files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch 4755
+AUX 0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch 4966 RMD160 57f24281a7e5a542b1c98c3addfd75b3f0e79275 SHA1 49bfc1299d89bd68a3d47fd1593820969e677501 SHA256 968ef9fd4c363c15c81adeb3236b5109036a8e1c9d41f5e6473386d85d2491b3
+MD5 88dbde995840fe1240432e361eae2936 files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch 4966
+RMD160 57f24281a7e5a542b1c98c3addfd75b3f0e79275 files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch 4966
+SHA256 968ef9fd4c363c15c81adeb3236b5109036a8e1c9d41f5e6473386d85d2491b3 files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch 4966
+AUX 0.5.9/19_hald_runner_catch_dbus_disconnect.patch 527 RMD160 4b906f8f570dd5a2f427e4bf964e36827f6c2761 SHA1 43693b024e6a9c54749eed0a109f83a4c92737d3 SHA256 1cf5f237e15be74614b452f66517726744c0e3e91eefc77c179a3fb8c887d02c
+MD5 e2f5b264f79a8382ddc0c6ac802ea766 files/0.5.9/19_hald_runner_catch_dbus_disconnect.patch 527
+RMD160 4b906f8f570dd5a2f427e4bf964e36827f6c2761 files/0.5.9/19_hald_runner_catch_dbus_disconnect.patch 527
+SHA256 1cf5f237e15be74614b452f66517726744c0e3e91eefc77c179a3fb8c887d02c files/0.5.9/19_hald_runner_catch_dbus_disconnect.patch 527
 AUX 0.5.9/95_gentoo_man_page.patch 18159 RMD160 cd4bf6c16e84464b11de755323ef2d0f5c1a54f9 SHA1 f9de30d705eada8e2f631e51b715b9923f732fb4 SHA256 59d81dcb273f3cdc9c7fc9f195331529642fef2c2150b3eeb3fd98ea555b1893
 MD5 f6d115e0eb501aba476f4df965bfeb6c files/0.5.9/95_gentoo_man_page.patch 18159
 RMD160 cd4bf6c16e84464b11de755323ef2d0f5c1a54f9 files/0.5.9/95_gentoo_man_page.patch 18159
@@ -97,10 +101,10 @@ AUX 0.5.9/97_ignore_fixed_drives.patch 1529 RMD160 ca9c907351003a9924d1e7a472d8d
 MD5 148972bf6d73b10fe75f1a3fef21f346 files/0.5.9/97_ignore_fixed_drives.patch 1529
 RMD160 ca9c907351003a9924d1e7a472d8dfec21533e79 files/0.5.9/97_ignore_fixed_drives.patch 1529
 SHA256 b71fdb49a1ad0376f305caf1d11c75dfe8370b970d29adbfe8bd3320757a5259 files/0.5.9/97_ignore_fixed_drives.patch 1529
-AUX 0.5.9/series 701 RMD160 3e178b4e5c04d2306e99cbdc3562b024d100330f SHA1 4778e271f52140ea3c06f015c533d34231cd8048 SHA256 73d88b5787146ce41dca4369ab019b99989fd63c2b2edfdc86d64bccdfe67455
-MD5 f5f14a8da20ef716a7d3014d145fd284 files/0.5.9/series 701
-RMD160 3e178b4e5c04d2306e99cbdc3562b024d100330f files/0.5.9/series 701
-SHA256 73d88b5787146ce41dca4369ab019b99989fd63c2b2edfdc86d64bccdfe67455 files/0.5.9/series 701
+AUX 0.5.9/series 744 RMD160 9fc18571ebf93c312a50c4f8b2c278b54f65c2d6 SHA1 08731adc9ecbbb466a18317941df47672752d1d9 SHA256 71ddb731797b27df7878dc09089b22ea9c288e0f71ac7bd1e9ff1d044623775f
+MD5 043fb96ab128eb4d06032a6c79bb229b files/0.5.9/series 744
+RMD160 9fc18571ebf93c312a50c4f8b2c278b54f65c2d6 files/0.5.9/series 744
+SHA256 71ddb731797b27df7878dc09089b22ea9c288e0f71ac7bd1e9ff1d044623775f files/0.5.9/series 744
 AUX hal-0.5.7-hald-scripts.patch 8636 RMD160 339765377e3573b382df987903f301860601668f SHA1 c2ffb779f423e07b38f12a852d942928394abc63 SHA256 d0b713f84c7bc782ba7b13f439630a995588097db2141f4a97c110036f64001a
 MD5 521a06ba0845bd3246d6ed4b589f110f files/hal-0.5.7-hald-scripts.patch 8636
 RMD160 339765377e3573b382df987903f301860601668f files/hal-0.5.7-hald-scripts.patch 8636
@@ -203,10 +207,10 @@ EBUILD hal-0.5.9.ebuild 7177 RMD160 cf9131b3eb91be3e90efe501d125a02b18398062 SHA
 MD5 5bf97425f9c1ebe14d09e69b12078a8e hal-0.5.9.ebuild 7177
 RMD160 cf9131b3eb91be3e90efe501d125a02b18398062 hal-0.5.9.ebuild 7177
 SHA256 dd9f4b2e4aba2a1dc43bb83f060cc5d13d09291ae861b412b51a75f81534b59c hal-0.5.9.ebuild 7177
-MISC ChangeLog 29324 RMD160 1a9aa73df7a8dab9405e6b08dd01a77e139ffa4f SHA1 0969925ef23053e50c9fcc371a92d94ebb193b3a SHA256 0c6d52fc6b3ac5f5e3ea9e8f0988c1f8b50b32581121435f3f271ba12b8f85fb
-MD5 e0aaf8e8b584d9fc48737861ca63e63d ChangeLog 29324
-RMD160 1a9aa73df7a8dab9405e6b08dd01a77e139ffa4f ChangeLog 29324
-SHA256 0c6d52fc6b3ac5f5e3ea9e8f0988c1f8b50b32581121435f3f271ba12b8f85fb ChangeLog 29324
+MISC ChangeLog 29622 RMD160 e7e1c8b78e7a563cb8b943f8e6b9810cc2fa64e2 SHA1 e38fb02e38257c6651a0090559850cd7ed238e7f SHA256 969bab2400e79edcbe4b6278aa784b66a1e0ca61f4c42ccec9e3979337747d75
+MD5 20c3aac98f8b66f6fb8b9d78e4bc6856 ChangeLog 29622
+RMD160 e7e1c8b78e7a563cb8b943f8e6b9810cc2fa64e2 ChangeLog 29622
+SHA256 969bab2400e79edcbe4b6278aa784b66a1e0ca61f4c42ccec9e3979337747d75 ChangeLog 29622
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -223,7 +227,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGL2LwoeSe8B0zEfwRAj9QAJ9sBsh6X67MO2P/yENrlZpUDcRI5gCfT5VB
-JAjgawKHH+aYqyIh5NytL9Y=
-=GyC+
+iD8DBQFGL2b7oeSe8B0zEfwRAkCSAJ90eIwmltzSxl0WLlRh4f3XHwEaQACfR77P
+oUE353cnMDitxKtS6xShDrA=
+=V/2t
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch b/sys-apps/hal/files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch
index 720999f2f1a5..7ad37bc83cdc 100644
--- a/sys-apps/hal/files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch
+++ b/sys-apps/hal/files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch
@@ -1,7 +1,7 @@
-diff --git a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
-index c982099..6368ad8 100644
---- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
-+++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+Index: b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+===================================================================
+--- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi	2007-03-07 16:52:19.000000000 -0500
++++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi	2007-04-25 10:31:29.000000000 -0400
 @@ -4,17 +4,20 @@
  
    <device>
@@ -15,28 +15,27 @@ index c982099..6368ad8 100644
 -      <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist">i</append>
 -      <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist">brightness_value</append>
 -      <append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-set-brightness</append>
--
--      <append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">GetBrightness</append>
--      <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist"></append>
--      <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist"></append>
--      <append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-get-brightness</append>
 +        <append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">SetBrightness</append>
 +        <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist">i</append>
 +        <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist">brightness_value</append>
 +      	<append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-set-brightness</append>
-+      
++
 +        <append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">GetBrightness</append>
 +        <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist"></append>
 +        <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist"></append>
 +	<append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-get-brightness</append>
-+      
+ 
+-      <append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">GetBrightness</append>
+-      <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist"></append>
+-      <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist"></append>
+-      <append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-get-brightness</append>
      </match>
    </device>
  
-diff --git a/fdi/policy/10osvendor/10-macbook-backlight.fdi b/fdi/policy/10osvendor/10-macbook-backlight.fdi
-index 227bbb5..a22fb20 100644
---- a/fdi/policy/10osvendor/10-macbook-backlight.fdi
-+++ b/fdi/policy/10osvendor/10-macbook-backlight.fdi
+Index: b/fdi/policy/10osvendor/10-macbook-backlight.fdi
+===================================================================
+--- a/fdi/policy/10osvendor/10-macbook-backlight.fdi	2007-03-19 19:43:31.000000000 -0400
++++ b/fdi/policy/10osvendor/10-macbook-backlight.fdi	2007-04-25 10:30:56.000000000 -0400
 @@ -13,6 +13,7 @@
    <device>
      <match key="info.udi" string="/org/freedesktop/Hal/devices/macbook_backlight">
@@ -45,11 +44,11 @@ index 227bbb5..a22fb20 100644
        <merge key="info.product" type="string">MacBook Backlight Control</merge>
        <merge key="laptop_panel.access_method" type="string">custom</merge>
        <merge key="laptop_panel.num_levels" type="int">118</merge>
-diff --git a/fdi/policy/10osvendor/10-macbookpro-utils.fdi b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
-index 8aed6c0..f02c614 100644
---- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi
-+++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
-@@ -32,6 +32,7 @@
+Index: b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
+===================================================================
+--- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi	2007-04-18 10:19:08.000000000 -0400
++++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi	2007-04-25 10:30:56.000000000 -0400
+@@ -17,6 +17,7 @@
    <device>
      <match key="info.udi" string="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel">
        <append key="info.capabilities" type="strlist">laptop_panel</append>
@@ -57,10 +56,10 @@ index 8aed6c0..f02c614 100644
        <merge key="info.product" type="string">MacBook Pro Laptop Panel</merge>
        <merge key="laptop_panel.access_method" type="string">custom</merge>
        <merge key="laptop_panel.num_levels" type="int">229</merge>
-diff --git a/fdi/policy/10osvendor/10-omap-backlight.fdi b/fdi/policy/10osvendor/10-omap-backlight.fdi
-index 5d3f1ce..2f041a1 100644
---- a/fdi/policy/10osvendor/10-omap-backlight.fdi
-+++ b/fdi/policy/10osvendor/10-omap-backlight.fdi
+Index: b/fdi/policy/10osvendor/10-omap-backlight.fdi
+===================================================================
+--- a/fdi/policy/10osvendor/10-omap-backlight.fdi	2007-03-07 16:52:19.000000000 -0500
++++ b/fdi/policy/10osvendor/10-omap-backlight.fdi	2007-04-25 10:30:56.000000000 -0400
 @@ -10,6 +10,7 @@
     <device>
      <match key="info.udi" string="/org/freedesktop/Hal/devices/omapfb_bl">
diff --git a/sys-apps/hal/files/0.5.9/19_hald_runner_catch_dbus_disconnect.patch b/sys-apps/hal/files/0.5.9/19_hald_runner_catch_dbus_disconnect.patch
new file mode 100644
index 000000000000..cc4c2c90db15
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/19_hald_runner_catch_dbus_disconnect.patch
@@ -0,0 +1,18 @@
+Index: b/hald/hald_runner.c
+===================================================================
+--- a/hald/hald_runner.c	2007-03-30 15:20:09.000000000 -0400
++++ b/hald/hald_runner.c	2007-04-25 10:32:38.000000000 -0400
+@@ -726,6 +726,13 @@
+ 					      msg, &call, INT_MAX))
+ 		DIE (("No memory"));
+ 
++	/**
++	 * The connection was disconnected as per D-Bus API
++	 * This is an error condition and should not really happen
++	 */
++	if (call == NULL)
++		goto error;
++
+ 	hd = g_new0 (HelperData, 1);
+ 	hd->d = device;
+ 	hd->cb = cb;
diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series
index 22db6ec14d15..174b39b3c0bd 100644
--- a/sys-apps/hal/files/0.5.9/series
+++ b/sys-apps/hal/files/0.5.9/series
@@ -16,6 +16,7 @@
 16_dev_root_is_mounted.patch
 17_autoconf_cflag_cleanup.patch
 18_hal_fix_info.category_for_laptop_panel_v2.patch
+19_hald_runner_catch_dbus_disconnect.patch
 95_gentoo_man_page.patch
 96_plugdev_allow_send.patch
 97_ignore_fixed_drives.patch