summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysutils/hal/Makefile5
-rw-r--r--sysutils/hal/distinfo6
-rw-r--r--sysutils/hal/files/patch-hald_device.c11
-rw-r--r--sysutils/hal/files/patch-hald_device_store.c12
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c89
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-util.c32
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-util.h11
7 files changed, 5 insertions, 161 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index c4b156929..6f457e891 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/hal/Makefile,v 1.38 2008/03/15 18:32:12 marcus Exp $
+# $MCom: ports/sysutils/hal/Makefile,v 1.39 2008/03/15 23:18:46 marcus Exp $
#
PORTNAME= hal
-DISTVERSION= 0.5.11rc1
-PORTREVISION= 1
+DISTVERSION= 0.5.11rc2
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index 05cc45f22..1c49bac64 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,3 +1,3 @@
-MD5 (hal-0.5.11rc1.tar.gz) = cf985c31324f2480590de01599ac7b74
-SHA256 (hal-0.5.11rc1.tar.gz) = 3f12a68ce29eefe74341cf5e66839bd210da25aabc2fd454bacfa8d55743d475
-SIZE (hal-0.5.11rc1.tar.gz) = 1667460
+MD5 (hal-0.5.11rc2.tar.gz) = ade962044a62e8f2dc4625a17f4a5c7e
+SHA256 (hal-0.5.11rc2.tar.gz) = 3937d2ab06c091d0b5d604f7615096be505455448cc13635ebdba169d29b4bdc
+SIZE (hal-0.5.11rc2.tar.gz) = 1665175
diff --git a/sysutils/hal/files/patch-hald_device.c b/sysutils/hal/files/patch-hald_device.c
deleted file mode 100644
index 8e5ed0a73..000000000
--- a/sysutils/hal/files/patch-hald_device.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- hald/device.c.orig 2008-03-15 19:13:58.000000000 -0400
-+++ hald/device.c 2008-03-15 19:14:45.000000000 -0400
-@@ -871,7 +871,7 @@ hdpfe (gpointer key,
- {
- hdpfe_ud_t *c;
- HalProperty *prop;
-- const gchar *key_string = g_quark_to_string ((GQuark) key);
-+ const gchar *key_string = g_quark_to_string ((GQuark) GPOINTER_TO_UINT(key));
-
- c = (hdpfe_ud_t *) user_data;
- prop = (HalProperty *) value;
diff --git a/sysutils/hal/files/patch-hald_device_store.c b/sysutils/hal/files/patch-hald_device_store.c
deleted file mode 100644
index 24bd1c2d3..000000000
--- a/sysutils/hal/files/patch-hald_device_store.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- hald/device_store.c.orig 2008-03-15 19:15:15.000000000 -0400
-+++ hald/device_store.c 2008-03-15 19:16:30.000000000 -0400
-@@ -292,6 +292,9 @@ hal_device_store_remove (HalDeviceStore
- (gpointer)emit_device_property_changed,
- store);
- g_signal_handlers_disconnect_by_func (device,
-+ (gpointer)device_pre_property_changed,
-+ store);
-+ g_signal_handlers_disconnect_by_func (device,
- (gpointer)emit_device_capability_added,
- store);
- g_signal_handlers_disconnect_by_func (device,
diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
deleted file mode 100644
index 2ea240df6..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
+++ /dev/null
@@ -1,89 +0,0 @@
---- hald/freebsd/addons/addon-storage.c.orig 2008-03-15 14:26:23.000000000 -0400
-+++ hald/freebsd/addons/addon-storage.c 2008-03-15 14:26:25.000000000 -0400
-@@ -150,6 +150,15 @@ hf_addon_storage_update (void)
- return has_media;
- }
-
-+static void
-+update_proc_title (const char *device, boolean polling_enabled)
-+{
-+ if (polling_enabled)
-+ setproctitle("%s", device);
-+ else
-+ setproctitle("no polling on %s because it is explicitly disabled", device);
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -157,6 +166,7 @@ main (int argc, char **argv)
- char *removable;
- char *bus;
- char *driver;
-+ boolean should_poll;
- DBusConnection *connection;
-
- if (! hfp_init(argc, argv))
-@@ -186,9 +196,6 @@ main (int argc, char **argv)
- if (! addon.parent)
- goto end;
-
-- /* give a meaningful process title for ps(1) */
-- setproctitle("%s", addon.device_file);
--
- addon.is_cdrom = ! strcmp(drive_type, "cdrom");
- addon.is_scsi_removable = (! strcmp(bus, "scsi") ||
- (! strcmp(bus, "usb") && (! strcmp(driver, "da") || ! strcmp(driver, "sa") ||
-@@ -226,23 +233,35 @@ main (int argc, char **argv)
- break;
- }
-
-- has_media = hf_addon_storage_update();
-- if (has_media != addon.had_media)
-- {
-- /*
-- * FIXME: if the media was removed, we should force-unmount
-- * all its child volumes (see linux2/addons/addon-storage.c).
-- * However, currently (FreeBSD 6.0) umount -f is broken and
-- * can cause kernel panics. When I tried to umount -f a
-- * flash card after removing it, it failed with EAGAIN. It
-- * continued to fail after I inserted the card. The system
-- * then hung while rebooting and did not unmount my other
-- * filesystems.
-- */
--
-- libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error);
-- dbus_error_free(&hfp_error);
-- addon.had_media = has_media;
-+ should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ update_proc_title(addon.device_file, should_poll);
-+
-+ if (should_poll)
-+ {
-+ has_media = hf_addon_storage_update();
-+ if (has_media != addon.had_media)
-+ {
-+ /*
-+ * FIXME: if the media was removed, we should force-unmount
-+ * all its child volumes (see linux2/addons/addon-storage.c).
-+ * However, currently (FreeBSD 6.0) umount -f is broken and
-+ * can cause kernel panics. When I tried to umount -f a
-+ * flash card after removing it, it failed with EAGAIN. It
-+ * continued to fail after I inserted the card. The system
-+ * then hung while rebooting and did not unmount my other
-+ * filesystems.
-+ */
-+
-+ libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ addon.had_media = has_media;
-+ }
-+ }
-+ else
-+ {
-+ hfp_gettimeofday(&addon.next_update);
-+ hfp_timevaladd(&addon.next_update, &addon.update_interval);
- }
- }
-
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-util.c b/sysutils/hal/files/patch-hald_freebsd_hf-util.c
deleted file mode 100644
index 0d09ad3ae..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-util.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- hald/freebsd/hf-util.c.orig 2008-03-15 14:27:25.000000000 -0400
-+++ hald/freebsd/hf-util.c 2008-03-15 14:27:29.000000000 -0400
-@@ -263,7 +263,7 @@ hf_device_set_udi (HalDevice *device, co
- udi = g_strdup_vprintf(format, args);
- va_end(args);
-
-- safe_str = hf_str_no_slashes(udi);
-+ safe_str = hf_str_escape(udi);
- g_free(udi);
-
- hf_device_set_full_udi(device, "/org/freedesktop/Hal/devices/%s", safe_str);
-@@ -675,14 +675,18 @@ hf_device_store_match (HalDeviceStore *s
- }
-
- char *
--hf_str_no_slashes (const char *str)
-+hf_str_escape (const char *str)
- {
- char *safe_str;
-
- g_return_val_if_fail(str != NULL, NULL);
-
- safe_str = g_strdup(str);
-- safe_str = g_strdelimit(safe_str, "/", '_');
-+ g_strcanon(safe_str,
-+ "_"
-+ "abcdefghijklmnopqrstuvwxyz"
-+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-+ "1234567890", '_');
-
- return safe_str;
- }
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-util.h b/sysutils/hal/files/patch-hald_freebsd_hf-util.h
deleted file mode 100644
index 1c54c262c..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-util.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- hald/freebsd/hf-util.h.orig 2008-03-15 14:27:35.000000000 -0400
-+++ hald/freebsd/hf-util.h 2008-03-15 14:27:46.000000000 -0400
-@@ -110,7 +110,7 @@ int hf_runner_run_sync (HalDevice *devic
-
- int hf_strv_find (char **strv, const char *elem);
-
--char *hf_str_no_slashes (const char *str);
-+char *hf_str_escape (const char *str);
-
- HalDevice *hf_device_store_match (HalDeviceStore *store, ...);
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 23:44:16 +0800