[Pkg-utopia-commits] r3246 - in /packages/unstable/hal/debian: changelog patches/23_support_relative_paths_in_umount_hal.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Nov  5 11:48:13 2009
New Revision: 3246

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3246
Log:
Support relative paths in umount.hal. (Closes: #552139)

Added:
    packages/unstable/hal/debian/patches/23_support_relative_paths_in_umount_hal.patch
Modified:
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/patches/series

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=3246&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Thu Nov  5 11:48:13 2009
@@ -14,6 +14,8 @@
     - debian/hal.init: Hurd's proc translator does not provide /proc/$PID/root
       so ensure we do not fail the chroot check on GNU/Hurd.
       Thanks to Pino Toscano for the patch.
+  * debian/patches/23_support_relative_paths_in_umount_hal.patch
+    - Support relative paths in umount.hal. (Closes: #552139)
 
  -- Michael Biebl <biebl at debian.org>  Wed, 04 Nov 2009 20:13:06 +0100
 

Added: packages/unstable/hal/debian/patches/23_support_relative_paths_in_umount_hal.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/23_support_relative_paths_in_umount_hal.patch?rev=3246&op=file
==============================================================================
--- packages/unstable/hal/debian/patches/23_support_relative_paths_in_umount_hal.patch (added)
+++ packages/unstable/hal/debian/patches/23_support_relative_paths_in_umount_hal.patch Thu Nov  5 11:48:13 2009
@@ -1,0 +1,41 @@
+From 54cd6991923e853748c674a1c4d90a8499fccd05 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Thu, 5 Nov 2009 03:11:30 +0100
+Subject: [PATCH 3/3] Support relative paths in umount.hal
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=552139
+---
+ tools/umount-hal.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tools/umount-hal.c b/tools/umount-hal.c
+index 719943c..81c3e08 100644
+--- a/tools/umount-hal.c
++++ b/tools/umount-hal.c
+@@ -31,12 +31,13 @@
+ #include <string.h>
+ #include <libhal.h>
+ #include <libhal-storage.h>
++#include "../hald/util.h"
+ 
+ int
+ main (int argc, char *argv[])
+ {
+ 	int ret;
+-	char *device_file_or_mount_point;
++	char device_file_or_mount_point[HAL_PATH_MAX];
+ 	DBusError error;
+ 	DBusConnection *con;
+ 	LibHalContext *hal_ctx;
+@@ -58,7 +59,7 @@ main (int argc, char *argv[])
+ 	 * first argument.  TODO XXX FIXME: we ought to honor
+ 	 * umount(8) options like -v for verbose.
+ 	 */
+-	device_file_or_mount_point = argv[1];
++	realpath(argv[1], device_file_or_mount_point);
+ 
+ 	dbus_error_init (&error);
+ 	con = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+-- 
+1.6.5.2
+

Modified: packages/unstable/hal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/series?rev=3246&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/series (original)
+++ packages/unstable/hal/debian/patches/series Thu Nov  5 11:48:13 2009
@@ -2,6 +2,7 @@
 20_cpufreq_warning_message_fix.patch
 21_fix_segfault_in_hal_util_get_last_element.patch
 22_fix_unconditional_usage_of_PATH_MAX.patch
+23_support_relative_paths_in_umount_hal.patch
 30_mount_relatime.patch
 40_readme_remove_hacking.patch
 50_kfreebsd.patch