[Pkg-utopia-commits] r1288 - in packages/experimental/hal/debian: .
patches
Michael Biebl
biebl at alioth.debian.org
Wed Mar 21 00:59:07 CET 2007
Author: biebl
Date: 2007-03-20 23:59:06 +0000 (Tue, 20 Mar 2007)
New Revision: 1288
Removed:
packages/experimental/hal/debian/patches/03_macbookpro_configure.patch
packages/experimental/hal/debian/patches/04_cd_write.patch
packages/experimental/hal/debian/patches/05_one_formfactor_fallback.patch
packages/experimental/hal/debian/patches/06_smbios_return.patch
packages/experimental/hal/debian/patches/07_ppc_suspend.patch
packages/experimental/hal/debian/patches/08_openfirmware.patch
packages/experimental/hal/debian/patches/09_check_hashtable_initialisation.patch
packages/experimental/hal/debian/patches/10_callout_errors.patch
packages/experimental/hal/debian/patches/11_no_useless_runner_errors.patch
packages/experimental/hal/debian/patches/12_pegasus_pmu_crash_fix.patch
packages/experimental/hal/debian/patches/15_partition_probing.patch
packages/experimental/hal/debian/patches/24_dbus_connection_close.patch
packages/experimental/hal/debian/patches/25_correctly_free_lists.patch
packages/experimental/hal/debian/patches/26_fix_hald_not_running_coredump.patch
packages/experimental/hal/debian/patches/27_hal_fix_dbus_error_is_set.patch
Modified:
packages/experimental/hal/debian/changelog
Log:
Remove a lot of patches which have been applied upstream.
Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/changelog 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,6 +1,20 @@
hal (0.5.9~rc1-1) experimental; urgency=low
* New upstream release.
+ * Patches removed as they were applied upstream:
+ - debian/patches/05_one_formfactor_fallback.patch
+ - debian/patches/06_smbios_return.patch
+ - debian/patches/07_ppc_suspend.patch
+ - debian/patches/08_openfirmware.patch
+ - debian/patches/09_check_hashtable_initialisation.patch
+ - debian/patches/10_callout_errors.patch
+ - debian/patches/11_no_useless_runner_errors.patch
+ - debian/patches/12_pegasus_pmu_crash_fix.patch
+ - debian/patches/15_partition_probing.patch
+ - debian/patches/24_dbus_connection_close.patch
+ - debian/patches/25_correctly_free_lists.patch
+ - debian/patches/26_fix_hald_not_running_coredump.patch
+ - debian/patches/27_hal_fix_dbus_error_is_set.patch
-- Michael Biebl <biebl at debian.org> Tue, 20 Mar 2007 21:01:01 +0100
Deleted: packages/experimental/hal/debian/patches/03_macbookpro_configure.patch
===================================================================
--- packages/experimental/hal/debian/patches/03_macbookpro_configure.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/03_macbookpro_configure.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,14 +0,0 @@
---- hal-0.5.8.1.vanilla/configure 2006-09-19 22:24:41.000000000 +0200
-+++ hal-0.5.8.1/configure 2006-09-26 21:09:20.000000000 +0200
-@@ -22383,9 +22383,9 @@
-
- fi;
- BUILD_MACBOOKPRO=no
--if test "x$use_macbookpro" = "xyes" ; then
-+if test "x$with_macbookpro" = "xyes" ; then
- BUILD_MACBOOKPRO=yes
--elif test "x$use_macbookpro" = "x" ; then
-+elif test "x$with_macbookpro" = "x" ; then
- if test "$HAVE_LIBPCI" != "false" ; then
- case "${host}" in
- i[3456]86-*-linux*)
Deleted: packages/experimental/hal/debian/patches/04_cd_write.patch
===================================================================
--- packages/experimental/hal/debian/patches/04_cd_write.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/04_cd_write.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,26 +0,0 @@
-commit c127f54ee1a91743989ccdbe93025740fe9cec73
-Author: David Zeuthen <davidz at redhat.com>
-Date: Tue Sep 26 15:50:51 2006 -0400
-
- don't crash on cd drives without write capabilities
-
- This fix needs to be forward-ported to master. Probably we shouldn't
- be looking for write speeds unless the drive can write. This fix
- will do it for the 0.5.8 series though.
-
-diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c
-index 41c43bd..8afeb8d 100644
---- a/hald/linux/probing/probe-storage.c
-+++ b/hald/linux/probing/probe-storage.c
-@@ -254,8 +254,10 @@ main (int argc, char *argv[])
- free (write_speeds);
- }
- } else {
-+ gchar *wspeeds[1] = {NULL};
- libhal_changeset_set_property_int (cs, "storage.cdrom.write_speed", 0);
-- libhal_changeset_set_property_strlist (cs, "storage.cdrom.write_speeds", NULL);
-+ libhal_changeset_set_property_strlist (cs, "storage.cdrom.write_speeds",
-+ (const char **) wspeeds);
- }
- }
-
Deleted: packages/experimental/hal/debian/patches/05_one_formfactor_fallback.patch
===================================================================
--- packages/experimental/hal/debian/patches/05_one_formfactor_fallback.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/05_one_formfactor_fallback.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,58 +0,0 @@
-commit 80b89a74fe53fb036b5826fbea4ebec18d3378c8
-Author: Sjoerd Simons <sjoerd at luon.net>
-Date: Sun Sep 17 22:26:24 2006 +0200
-
- Set system.formfactor fallback in exactly one place instead of three and be
- carefull not to override if already set. Fixes bug on macintosh powerpc
- machines where the detected value was overriden by the fallback.
-
-diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
-index b9fb922..8aca683 100644
---- a/hald/linux/osspec.c
-+++ b/hald/linux/osspec.c
-@@ -346,6 +346,10 @@ hotplug_queue_now_empty (void)
- static void
- computer_probing_helper_done (HalDevice *d)
- {
-+ /* if not set, set a default value */
-+ if (!hal_device_has_property (d, "system.formfactor")) {
-+ hal_device_property_set_string (d, "system.formfactor", "unknown");
-+ }
- di_search_and_merge (d, DEVICE_INFO_TYPE_INFORMATION);
- di_search_and_merge (d, DEVICE_INFO_TYPE_POLICY);
-
-@@ -363,9 +367,6 @@ computer_probing_pcbios_helper_done (Hal
- const char *system_version;
-
- if (exit_type == HALD_RUN_FAILED) {
-- /* set a default value */
-- if (!hal_device_has_property (d, "system.formfactor"))
-- hal_device_property_set_string (d, "system.formfactor", "unknown");
- goto out;
- }
-
-@@ -433,10 +434,7 @@ computer_probing_pcbios_helper_done (Hal
- }
- }
-
-- } else {
-- /* set a default value */
-- hal_device_property_set_string (d, "system.formfactor", "unknown");
-- }
-+ }
- }
- out:
- computer_probing_helper_done (d);
-@@ -554,11 +552,9 @@ osspec_probe (void)
- hald_runner_run (root, "hald-probe-smbios", NULL, HAL_HELPER_TIMEOUT,
- computer_probing_pcbios_helper_done, NULL, NULL);
- } else {
-- /* set a default value, can be overridden by others */
-- hal_device_property_set_string (root, "system.formfactor", "unknown");
- /* no probing */
- computer_probing_helper_done (root);
-- }
-+ }
- }
-
- DBusHandlerResult
Deleted: packages/experimental/hal/debian/patches/06_smbios_return.patch
===================================================================
--- packages/experimental/hal/debian/patches/06_smbios_return.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/06_smbios_return.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,41 +0,0 @@
-commit 7b4b27aa607baf38d1e8d8b38d748cff2e5210e3
-Author: Sjoerd Simons <sjoerd at luon.net>
-Date: Sun Sep 17 21:57:11 2006 +0200
-
- Let probe-smbios only return successfully if it actually got something
- usefull to parse
-
-diff --git a/hald/linux/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c
-index 2beb809..bb9ace3 100644
---- a/hald/linux/probing/probe-smbios.c
-+++ b/hald/linux/probing/probe-smbios.c
-@@ -140,7 +140,7 @@ main (int argc, char *argv[])
- break;
- case -1:
- HAL_ERROR (("Cannot fork!"));
-- break;
-+ goto out;
- }
-
- /* parent continues from here */
-@@ -199,6 +199,10 @@ main (int argc, char *argv[])
- if (dmiparser_state == DMIPARSER_STATE_IGNORE)
- continue;
-
-+ /* return success only if there was something usefull to parse */
-+ ret = 0;
-+
-+
- /* removes the leading tab */
- nbuf = &buf[1];
-
-@@ -228,9 +232,6 @@ main (int argc, char *argv[])
- /* as read to EOF, close */
- fclose (f);
-
-- /* return success */
-- ret = 0;
--
- out:
- /* free ctx */
- if (ctx != NULL) {
Deleted: packages/experimental/hal/debian/patches/07_ppc_suspend.patch
===================================================================
--- packages/experimental/hal/debian/patches/07_ppc_suspend.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/07_ppc_suspend.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,24 +0,0 @@
-commit 0a14231944a194b6bc31b737ff9b0dbec91edebc
-Author: Sjoerd Simons <sjoerd at luon.net>
-Date: Sun Sep 17 20:25:25 2006 +0200
-
- Always set power_management.can_suspend to true if the power_management.type is
- pmu. Recent kernels don't report mem in /sys/power/state for ppc, but we have
- our own utility that issues ioctl's to suspend.
-
-diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
-index ed762a8..b9fb922 100644
---- a/hald/linux/osspec.c
-+++ b/hald/linux/osspec.c
-@@ -475,6 +475,11 @@ set_suspend_hibernate_keys (HalDevice *d
- can_hibernate = TRUE;
- free (poweroptions);
-
-+ if (strcmp(hal_device_property_get_string(d, "power_management.type"), "pmu") == 0) {
-+ /* We got our own helper for suspend PMU machines */
-+ can_suspend = TRUE;
-+ }
-+
- /* check for the presence of suspend2 */
- if (access ("/proc/software_suspend", F_OK) == 0)
- can_hibernate = TRUE;
Deleted: packages/experimental/hal/debian/patches/08_openfirmware.patch
===================================================================
--- packages/experimental/hal/debian/patches/08_openfirmware.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/08_openfirmware.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,109 +0,0 @@
-commit b83f4c83f60e8cf5da52a10e2546fef20053d25c
-Author: Sjoerd Simons <sjoerd at luon.net>
-Date: Tue Sep 26 22:42:50 2006 +0200
-
- Read out model and compatible property out of openfirmware if possible. And use the openfirmware module property to decide what formfactor the system has.
-
-diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
-index 8aca683..a2a1998 100644
---- a/hald/linux/osspec.c
-+++ b/hald/linux/osspec.c
-@@ -496,6 +496,70 @@ out:
- hal_device_property_set_bool (d, "power_management.can_suspend_to_disk", can_hibernate);
- }
-
-+static void
-+get_openfirmware_entry(HalDevice *d, char *property, char *entry,
-+ gboolean multivalue) {
-+ char *contents;
-+ gsize length;
-+ if (!g_file_get_contents(entry, &contents, &length, NULL)) {
-+ return;
-+ }
-+ if (multivalue) {
-+ gsize offset = 0;
-+ while (offset < length) {
-+ hal_device_property_strlist_append(d, property, contents + offset);
-+ for (; offset < length - 1 && contents[offset] != '\0'; offset++)
-+ ;
-+ offset++;
-+ }
-+ } else {
-+ hal_device_property_set_string(d, property, contents);
-+ }
-+ free(contents);
-+}
-+
-+static void
-+detect_openfirmware_formfactor(HalDevice *root) {
-+ int x;
-+ struct { gchar *model; gchar *formfactor; } model_formfactor[] =
-+ {
-+ { "RackMac" , "server" },
-+ { "AAPL,3400" , "laptop" },
-+ { "AAPL,3500" , "laptop" },
-+ { "PowerBook" , "laptop" },
-+ { "AAPL" , "desktop" },
-+ { "iMac" , "desktop" },
-+ { "PowerMac" , "desktop" },
-+ {NULL, NULL }
-+ };
-+ const gchar *model =
-+ hal_device_property_get_string(root, "openfirmware.model");
-+ if (model == NULL)
-+ return;
-+
-+ for (x = 0 ; model_formfactor[x].model ; x++) {
-+ if (strstr(model, model_formfactor[x].model)) {
-+ hal_device_property_set_string (root, "system.formfactor",
-+ model_formfactor[x].formfactor);
-+ break;
-+ }
-+ }
-+}
-+
-+static void
-+probe_openfirmware(HalDevice *root) {
-+#define DEVICE_TREE "/proc/device-tree/"
-+ if (!g_file_test(DEVICE_TREE, G_FILE_TEST_IS_DIR)) {
-+ return;
-+ }
-+ get_openfirmware_entry(root, "openfirmware.model",
-+ DEVICE_TREE "model", FALSE);
-+ get_openfirmware_entry(root, "openfirmware.compatible",
-+ DEVICE_TREE "compatible", TRUE);
-+ detect_openfirmware_formfactor(root);
-+}
-+
-+
- void
- osspec_probe (void)
- {
-@@ -547,12 +609,12 @@ osspec_probe (void)
- */
- set_suspend_hibernate_keys (root);
-
-- /* TODO: add prober for PowerMac's */
- if (should_decode_dmi) {
- hald_runner_run (root, "hald-probe-smbios", NULL, HAL_HELPER_TIMEOUT,
- computer_probing_pcbios_helper_done, NULL, NULL);
- } else {
- /* no probing */
-+ probe_openfirmware(root);
- computer_probing_helper_done (root);
- }
- }
-diff --git a/hald/linux/pmu.c b/hald/linux/pmu.c
-index d2ce912..b43d5f0 100644
---- a/hald/linux/pmu.c
-+++ b/hald/linux/pmu.c
-@@ -381,9 +381,6 @@ pmu_synthesize_hotplug_events (void)
- /* Add Laptop Panel */
- snprintf (path, sizeof (path), "%s/pmu/info", get_hal_proc_path ());
- pmu_synthesize_item (path, PMU_TYPE_LAPTOP_PANEL);
--
-- /* If the machine has got battery bays then this is a laptop. */
-- hal_device_property_set_string (computer, "system.formfactor", "laptop");
- }
-
- /* setup timer for things that we need to poll */
Deleted: packages/experimental/hal/debian/patches/09_check_hashtable_initialisation.patch
===================================================================
--- packages/experimental/hal/debian/patches/09_check_hashtable_initialisation.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/09_check_hashtable_initialisation.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,18 +0,0 @@
-diff --git a/doc/api/.gitignore b/doc/api/.gitignore
-diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
-diff --git a/doc/api/hal-docs.xml b/doc/api/hal-docs.xml
-diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
-index 7a51bfb..741a52e 100644
---- a/hald/hald_dbus.c
-+++ b/hald/hald_dbus.c
-@@ -2902,7 +2902,8 @@ device_is_executing_method (HalDevice *d
-
- ret = FALSE;
-
-- if (g_hash_table_lookup_extended (udi_to_method_queue, d->udi, &origkey, (gpointer) &queue)) {
-+ if (udi_to_method_queue != NULL &&
-+ g_hash_table_lookup_extended (udi_to_method_queue, d->udi, &origkey, (gpointer) &queue)) {
-
- if (queue != NULL) {
- MethodInvocation *mi;
-diff --git a/tools/hal-storage-shared.c b/tools/hal-storage-shared.c
Deleted: packages/experimental/hal/debian/patches/10_callout_errors.patch
===================================================================
--- packages/experimental/hal/debian/patches/10_callout_errors.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/10_callout_errors.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,131 +0,0 @@
-commit 7ca14a9265548dc74cc6b16517d8d3f23e6d4c6c
-Author: Sjoerd Simons <sjoerd at luon.net>
-Date: Mon Oct 2 18:26:18 2006 +0200
-
- use dbus_error_free instead of LIBHAL_FREE_DBUS_ERROR so errors are correctly
- reported to hald-runner
-
- Various tools use LIBHAL_FREE_DBUS_ERROR, which will print an error to stderror
- when the error is not set. Because the runner uses stderror to get the errors
- from the callout, this confuses it somewhat. Using dbus_error_free instead of
- LIBHAL_FREE_DBUS_ERROR solves this.
-
-diff --git a/tools/hal-storage-closetray.c b/tools/hal-storage-closetray.c
-index 755ccd1..2866afd 100644
---- a/tools/hal-storage-closetray.c
-+++ b/tools/hal-storage-closetray.c
-@@ -107,7 +107,7 @@ #endif
- dbus_error_init (&error);
- if ((hal_ctx = libhal_ctx_init_direct (&error)) == NULL) {
- printf ("Cannot connect to hald\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
-
-@@ -115,7 +115,7 @@ #endif
- system_bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
- if (system_bus == NULL) {
- printf ("Cannot connect to the system bus\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
- #ifdef HAVE_POLKIT
-diff --git a/tools/hal-storage-eject.c b/tools/hal-storage-eject.c
-index 65248f3..3234be4 100644
---- a/tools/hal-storage-eject.c
-+++ b/tools/hal-storage-eject.c
-@@ -109,7 +109,7 @@ #endif
- dbus_error_init (&error);
- if ((hal_ctx = libhal_ctx_init_direct (&error)) == NULL) {
- printf ("Cannot connect to hald\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
-
-@@ -117,7 +117,7 @@ #endif
- system_bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
- if (system_bus == NULL) {
- printf ("Cannot connect to the system bus\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
- #ifdef HAVE_POLKIT
-diff --git a/tools/hal-storage-mount.c b/tools/hal-storage-mount.c
-index ef8d1a9..9c1348d 100644
---- a/tools/hal-storage-mount.c
-+++ b/tools/hal-storage-mount.c
-@@ -272,7 +272,7 @@ volume_findby (LibHalContext *hal_ctx, c
- dbus_error_init (&error);
- if ((hal_udis = libhal_manager_find_device_string_match (hal_ctx, property,
- value, &num_hal_udis, &error)) == NULL) {
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- goto out;
- }
- for (i = 0; i < num_hal_udis; i++) {
-@@ -493,7 +493,7 @@ #endif
- dbus_error_init (&error);
- if (libhal_device_get_property_bool (hal_ctx, udi, "volume.ignore", &error) ||
- dbus_error_is_set (&error)) {
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- permission_denied_volume_ignore (device);
- }
-
-@@ -1011,7 +1011,7 @@ #endif
- dbus_error_init (&error);
- if ((hal_ctx = libhal_ctx_init_direct (&error)) == NULL) {
- printf ("Cannot connect to hald\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
-
-@@ -1019,7 +1019,7 @@ #endif
- system_bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
- if (system_bus == NULL) {
- printf ("Cannot connect to the system bus\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
- #ifdef HAVE_POLKIT
-diff --git a/tools/hal-storage-shared.c b/tools/hal-storage-shared.c
-index 0b95a35..f6e0bf2 100644
---- a/tools/hal-storage-shared.c
-+++ b/tools/hal-storage-shared.c
-@@ -288,7 +288,7 @@ #endif
- dbus_error_init (&error);
- if (libhal_device_get_property_bool (hal_ctx, udi, "volume.ignore", &error) ||
- dbus_error_is_set (&error)) {
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- permission_denied_volume_ignore (device);
- }
-
-diff --git a/tools/hal-storage-unmount.c b/tools/hal-storage-unmount.c
-index d1239f7..ef7cee9 100644
---- a/tools/hal-storage-unmount.c
-+++ b/tools/hal-storage-unmount.c
-@@ -112,7 +112,7 @@ #endif
- dbus_error_init (&error);
- if ((hal_ctx = libhal_ctx_init_direct (&error)) == NULL) {
- printf ("Cannot connect to hald\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
-
-@@ -120,7 +120,7 @@ #endif
- system_bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
- if (system_bus == NULL) {
- printf ("Cannot connect to the system bus\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ dbus_error_free (&error);
- usage ();
- }
- #ifdef HAVE_POLKIT
Deleted: packages/experimental/hal/debian/patches/11_no_useless_runner_errors.patch
===================================================================
--- packages/experimental/hal/debian/patches/11_no_useless_runner_errors.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/11_no_useless_runner_errors.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,25 +0,0 @@
-commit c4c0829e6164d35e651529dea81ccead2c9d999e
-Author: Sjoerd Simons <sjoerd at luon.net>
-Date: Mon Oct 2 17:34:00 2006 +0200
-
- prevent hald-runner from printing unnecessary warning messages
-
- Remove a trailing ; after an if. Caused warning message about not being able to
- write to the started program's stdin to be printed even though there were no
- errors.
-
-diff --git a/hald-runner/runner.c b/hald-runner/runner.c
-index 3fb1fb2..57a2a80 100644
---- a/hald-runner/runner.c
-+++ b/hald-runner/runner.c
-@@ -274,8 +274,8 @@ run_request_run (run_request *r, DBusCon
- g_free (program_dir);
-
- if (r->input) {
-- if (write(stdin_v, r->input, strlen(r->input)) != (ssize_t) strlen(r->input));
-- printf("Warning: Error while wite r->input (%s) to stdin_v.\n", r->input);
-+ if (write(stdin_v, r->input, strlen(r->input)) != (ssize_t) strlen(r->input))
-+ printf("Warning: Error while writing r->input (%s) to stdin_v.\n", r->input);
- close(stdin_v);
- }
-
Deleted: packages/experimental/hal/debian/patches/12_pegasus_pmu_crash_fix.patch
===================================================================
--- packages/experimental/hal/debian/patches/12_pegasus_pmu_crash_fix.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/12_pegasus_pmu_crash_fix.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,39 +0,0 @@
-commit 7c240196eae1cce8bf511dffaa7019e08383d1fb
-Author: David Woodhouse <dwmw2 at redhat.com>
-Date: Tue Oct 3 11:57:51 2006 -0400
-
- fix crash on PPC Pegasos that don't have PMU, ACPI or APM
-
- Also adds Pegasos to OF formfactor probing.
- (cherry picked from bc96ff3b760917f4431015d9782d3d70f8b337ea commit)
-
-diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
-index 1b322bb..31ef498 100644
---- a/hald/linux/osspec.c
-+++ b/hald/linux/osspec.c
-@@ -448,6 +448,7 @@ set_suspend_hibernate_keys (HalDevice *d
- ssize_t read;
- size_t len;
- char *poweroptions;
-+ char *pmtype;
- FILE *fp;
-
- can_suspend = FALSE;
-@@ -473,7 +474,8 @@ set_suspend_hibernate_keys (HalDevice *d
- can_hibernate = TRUE;
- free (poweroptions);
-
-- if (strcmp(hal_device_property_get_string(d, "power_management.type"), "pmu") == 0) {
-+ pmtype = hal_device_property_get_string(d, "power_management.type");
-+ if (pmtype != NULL && strcmp(pmtype, "pmu") == 0) {
- /* We got our own helper for suspend PMU machines */
- can_suspend = TRUE;
- }
-@@ -532,6 +534,7 @@ detect_openfirmware_formfactor(HalDevice
- { "AAPL" , "desktop" },
- { "iMac" , "desktop" },
- { "PowerMac" , "desktop" },
-+ { "Pegasos" , "desktop" },
- {NULL, NULL }
- };
- const gchar *model =
Deleted: packages/experimental/hal/debian/patches/15_partition_probing.patch
===================================================================
--- packages/experimental/hal/debian/patches/15_partition_probing.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/15_partition_probing.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,15 +0,0 @@
-diff --git a/partutil/partutil.c b/partutil/partutil.c
-index 5da36d5..3a2c87b 100644
---- a/partutil/partutil.c
-+++ b/partutil/partutil.c
-@@ -585,7 +585,9 @@ part_table_parse_msdos (int fd, guint64
-
- //HAL_INFO (("pe = %p", pe));
-
-- p->entries = g_slist_append (p->entries, pe);
-+ if (pe != NULL) {
-+ p->entries = g_slist_append (p->entries, pe);
-+ }
- }
-
- out:
Deleted: packages/experimental/hal/debian/patches/24_dbus_connection_close.patch
===================================================================
--- packages/experimental/hal/debian/patches/24_dbus_connection_close.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/24_dbus_connection_close.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,36 +0,0 @@
-From: Timo Hoenig <thoenig at suse.de>
-Date: Mon, 23 Oct 2006 15:35:17 +0000 (-0400)
-Subject: don't call dbus_connection_close() for some of our tools
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c85e02d58d6503b494bb4c8584a7c44ac6923208
-
-don't call dbus_connection_close() for some of our tools
-
-lshal and hal-device should not call dbus_connection_close() as they do
-not have a private connection to the bus.
-
-This is not critical. However, with D-Bus 0.94+ it will spawn ugly error
-messages. Note: It is safe to apply this patch for HAL when using older
-versions of D-Bus, too.
----
-
---- a/tools/hal-device.c
-+++ b/tools/hal-device.c
-@@ -161,7 +161,6 @@ int main(int argc, char **argv)
-
- libhal_ctx_shutdown(hal_ctx, &error);
- libhal_ctx_free(hal_ctx);
-- dbus_connection_close(conn);
- dbus_connection_unref(conn);
- dbus_error_free(&error);
-
---- a/tools/lshal.c
-+++ b/tools/lshal.c
-@@ -723,7 +723,6 @@ main (int argc, char *argv[])
- LIBHAL_FREE_DBUS_ERROR (&error);
- libhal_ctx_free (hal_ctx);
-
-- dbus_connection_close (conn);
- dbus_connection_unref (conn);
-
- if (show_device)
-
Deleted: packages/experimental/hal/debian/patches/25_correctly_free_lists.patch
===================================================================
--- packages/experimental/hal/debian/patches/25_correctly_free_lists.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/25_correctly_free_lists.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,24 +0,0 @@
-From: John (J5) Palmieri <johnp at redhat.com>
-Date: Mon, 6 Nov 2006 16:48:55 +0000 (-0500)
-Subject: use g_slist_remove_link instead of g_slist_remove
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=a56a15b90177734c70a8b03d961a7bcabdea2af8
-
-use g_slist_remove_link instead of g_slist_remove
-
-Data would be freed and then g_slist_remove would be called on the
-link which would leave the link in the list, any subsequent iteration
-over the list would cause us to access freed memory.
----
-
---- a/hald/hald_dbus.c
-+++ b/hald/hald_dbus.c
-@@ -3976,7 +3976,7 @@ local_server_message_handler (DBusConnec
- g_free (hih->introspection_xml);
- g_free (hih->udi);
- g_free (hih);
-- helper_interface_handlers = g_slist_remove (helper_interface_handlers, i);
-+ helper_interface_handlers = g_slist_remove_link (helper_interface_handlers, i);
- }
- }
-
-
Deleted: packages/experimental/hal/debian/patches/26_fix_hald_not_running_coredump.patch
===================================================================
--- packages/experimental/hal/debian/patches/26_fix_hald_not_running_coredump.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/26_fix_hald_not_running_coredump.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,122 +0,0 @@
-From: Artem Kachitchkine <artem.kachitchkin at sun.com>
-Date: Thu, 12 Oct 2006 17:03:08 +0000 (-0700)
-Subject: do not let tools coredump if HAL is not running
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c2053bf825cd9d81949d63ad83790a68310bb808
-
-do not let tools coredump if HAL is not running
-
-Make HAL tools actually fail with a useful message
-in case HAL not running on a system.
----
-
---- a/tools/hal-device.c
-+++ b/tools/hal-device.c
-@@ -136,12 +136,16 @@ int main(int argc, char **argv)
- return 2;
- }
-
-- // fprintf(stderr, "connected to: %s\n", dbus_bus_get_unique_name(conn));
-+ /* fprintf(stderr, "connected to: %s\n", dbus_bus_get_unique_name(conn)); */
- if (!(hal_ctx = libhal_ctx_new())) return 3;
- if (!libhal_ctx_set_dbus_connection(hal_ctx, conn)) return 4;
- if (!libhal_ctx_init(hal_ctx, &error)) {
-- fprintf(stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ if (dbus_error_is_set(&error)) {
-+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-+ LIBHAL_FREE_DBUS_ERROR (&error);
-+ }
-+ fprintf (stderr, "Could not initialise connection to hald.\n"
-+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 5;
- }
-
---- a/tools/hal_find_by_capability.c
-+++ b/tools/hal_find_by_capability.c
-@@ -147,8 +147,12 @@ main (int argc, char *argv[])
- return 1;
- }
- if (!libhal_ctx_init (hal_ctx, &error)) {
-- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ if (dbus_error_is_set(&error)) {
-+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-+ LIBHAL_FREE_DBUS_ERROR (&error);
-+ }
-+ fprintf (stderr, "Could not initialise connection to hald.\n"
-+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 1;
- }
-
---- a/tools/hal_find_by_property.c
-+++ b/tools/hal_find_by_property.c
-@@ -154,8 +154,12 @@ main (int argc, char *argv[])
- return 1;
- }
- if (!libhal_ctx_init (hal_ctx, &error)) {
-- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ if (dbus_error_is_set(&error)) {
-+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-+ LIBHAL_FREE_DBUS_ERROR (&error);
-+ }
-+ fprintf (stderr, "Could not initialise connection to hald.\n"
-+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 1;
- }
-
---- a/tools/hal_get_property.c
-+++ b/tools/hal_get_property.c
-@@ -163,8 +163,12 @@ main (int argc, char *argv[])
- return 1;
- }
- if (!libhal_ctx_init (hal_ctx, &error)) {
-- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ if (dbus_error_is_set(&error)) {
-+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-+ LIBHAL_FREE_DBUS_ERROR (&error);
-+ }
-+ fprintf (stderr, "Could not initialise connection to hald.\n"
-+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 1;
- }
-
---- a/tools/hal_set_property.c
-+++ b/tools/hal_set_property.c
-@@ -230,8 +230,12 @@ main (int argc, char *argv[])
- return 1;
- }
- if (!libhal_ctx_init (hal_ctx, &error)) {
-- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ if (dbus_error_is_set(&error)) {
-+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-+ LIBHAL_FREE_DBUS_ERROR (&error);
-+ }
-+ fprintf (stderr, "Could not initialise connection to hald.\n"
-+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 1;
- }
-
---- a/tools/lshal.c
-+++ b/tools/lshal.c
-@@ -682,11 +682,12 @@ main (int argc, char *argv[])
- return 1;
- }
- if (!libhal_ctx_init (hal_ctx, &error)) {
-- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n",
-- error.name, error.message);
-- fprintf (stderr, "Could not initialise connection to hald. \n "
-- "Normally this mean the HAL daemon (hald) is not running or not ready.\n");
-- LIBHAL_FREE_DBUS_ERROR (&error);
-+ if (dbus_error_is_set(&error)) {
-+ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-+ LIBHAL_FREE_DBUS_ERROR (&error);
-+ }
-+ fprintf (stderr, "Could not initialise connection to hald.\n"
-+ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
- return 1;
- }
-
-
Deleted: packages/experimental/hal/debian/patches/27_hal_fix_dbus_error_is_set.patch
===================================================================
--- packages/experimental/hal/debian/patches/27_hal_fix_dbus_error_is_set.patch 2007-03-20 20:35:24 UTC (rev 1287)
+++ packages/experimental/hal/debian/patches/27_hal_fix_dbus_error_is_set.patch 2007-03-20 23:59:06 UTC (rev 1288)
@@ -1,184 +0,0 @@
-diff --git a/libhal/libhal.c b/libhal/libhal.c
-index e88ca3d..49ac5c4 100644
---- a/libhal/libhal.c
-+++ b/libhal/libhal.c
-@@ -1457,7 +1457,7 @@ libhal_device_set_property_helper (LibHa
- reply = dbus_connection_send_with_reply_and_block (ctx->connection,
- message, -1,
- error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -1650,7 +1650,7 @@ libhal_device_property_strlist_append (L
- reply = dbus_connection_send_with_reply_and_block (ctx->connection,
- message, -1,
- error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -1703,7 +1703,7 @@ libhal_device_property_strlist_prepend (
- reply = dbus_connection_send_with_reply_and_block (ctx->connection,
- message, -1,
- error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -1756,7 +1756,7 @@ libhal_device_property_strlist_remove_in
- reply = dbus_connection_send_with_reply_and_block (ctx->connection,
- message, -1,
- error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -1808,7 +1808,7 @@ libhal_device_property_strlist_remove (L
- reply = dbus_connection_send_with_reply_and_block (ctx->connection,
- message, -1,
- error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -1867,7 +1867,7 @@ libhal_device_lock (LibHalContext *ctx,
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- if (strcmp (error->name,
- "org.freedesktop.Hal.DeviceAlreadyLocked") == 0) {
- if (reason_why_locked != NULL) {
-@@ -1928,7 +1928,7 @@ libhal_device_unlock (LibHalContext *ctx
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -1983,7 +1983,7 @@ libhal_new_device (LibHalContext *ctx, D
- reply = dbus_connection_send_with_reply_and_block (ctx->connection,
- message, -1,
- error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return NULL;
- }
-@@ -2066,7 +2066,7 @@ libhal_device_commit_to_gdl (LibHalConte
- reply = dbus_connection_send_with_reply_and_block (ctx->connection,
- message, -1,
- error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -2122,7 +2122,7 @@ libhal_remove_device (LibHalContext *ctx
- reply = dbus_connection_send_with_reply_and_block (ctx->connection,
- message, -1,
- error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -2314,7 +2314,7 @@ libhal_merge_properties (LibHalContext *
- reply = dbus_connection_send_with_reply_and_block (ctx->connection,
- message, -1,
- error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -2604,7 +2604,7 @@ libhal_device_add_capability (LibHalCont
- reply = dbus_connection_send_with_reply_and_block (ctx->connection,
- message, -1,
- error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -2744,7 +2744,7 @@ libhal_device_property_watch_all (LibHal
- "type='signal',"
- "interface='org.freedesktop.Hal.Device',"
- "sender='org.freedesktop.Hal'", error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- return FALSE;
- }
- return TRUE;
-@@ -2778,7 +2778,7 @@ libhal_device_add_property_watch (LibHal
- "sender='org.freedesktop.Hal'," "path=%s", udi);
-
- dbus_bus_add_match (ctx->connection, buf, error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- return FALSE;
- }
- return TRUE;
-@@ -2808,7 +2808,7 @@ libhal_device_remove_property_watch (Lib
- "sender='org.freedesktop.Hal'," "path=%s", udi);
-
- dbus_bus_remove_match (ctx->connection, buf, error);
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- return FALSE;
- }
- return TRUE;
-@@ -3223,7 +3223,7 @@ libhal_device_rescan (LibHalContext *ctx
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -3283,7 +3283,7 @@ libhal_device_reprobe (LibHalContext *ct
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -3354,7 +3354,7 @@ dbus_bool_t libhal_device_emit_condition
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -3420,7 +3420,7 @@ libhal_device_addon_is_ready (LibHalCont
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
-@@ -3491,7 +3491,7 @@ libhal_device_claim_interface (LibHalCon
- message, -1,
- error);
-
-- if (dbus_error_is_set (error)) {
-+ if (error != NULL && dbus_error_is_set (error)) {
- dbus_message_unref (message);
- return FALSE;
- }
More information about the Pkg-utopia-commits
mailing list