[Pkg-utopia-commits] r1455 - in /packages/experimental/hal/debian:
changelog
patches/12_powerscripts_quirks.patch patches/55_nonpolkit-mount-policy.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed May 2 08:31:36 UTC 2007
Author: biebl
Date: Wed May 2 08:31:34 2007
New Revision: 1455
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1455
Log:
* debian/patches/12_powerscripts_quirks.patch
Pass the correct quirks to pm-supend and pm-hibernate.
* Put back 55_nonpolkit-mount-policy.patck from 0.5.8.1.
* Make the changelog more complete.
Add Closes: #399507, #418570, #410868
Added:
packages/experimental/hal/debian/patches/12_powerscripts_quirks.patch
packages/experimental/hal/debian/patches/55_nonpolkit-mount-policy.patch
Modified:
packages/experimental/hal/debian/changelog
Modified: packages/experimental/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/changelog?rev=1455&op=diff
==============================================================================
--- packages/experimental/hal/debian/changelog (original)
+++ packages/experimental/hal/debian/changelog Wed May 2 08:31:34 2007
@@ -1,6 +1,9 @@
hal (0.5.9-1) experimental; urgency=low
* New upstream release.
+ - Fixes detection of wireless devices with dscape stack. (Closes: #399507)
+ - Adds support for fuse mounts. (Closes: #418570)
+ - Adds support for new sysfs layout of kernels > 2.6.20. (Closes: #410868)
* Patches removed as they were applied or fixed upstream:
- debian/patches/03_macbookpro_configure.patch
- debian/patches/04_cd_write.patch
@@ -22,19 +25,30 @@
- debian/patches/30_cdrom_bogus_tocinfo.patch
* Revised patches:
- debian/patches/02_powerscripts.patch
+ - debian/patches/55_nonpolkit-mount-policy.patch
+ - debian/patches/14_power_suspend_linux_pmu_fix.patch
* debian/patches/19_sonypi_support.patch
- Removed. Instead of relying on the external spicctrl tool, /dev/sonypi
is used directly now by the hal-system-sonypic addon.
- * debian/patches/55_nonpolkit-mount-policy.patch
- - Removed. We depend on PolicyKit now to check if a user is authorized to
- mount local partitions.
+ * Patches taken from upstream:
+ - debian/patches/10_repeated_property_changed_signals.patch
+ + Do not trigger the "device_property_changed" signal twice.
+ - debian/patches/11_fix_luks_mounting.patch
+ + Fix the lock checking for LUKS setup/teardown.
+ - debian/patches/12_powerscripts_quirks.patch
+ + Pass the correct quirks to pm-supend and pm-hibernate.
* debian/control
- Add Depends: hal-info (>= 20070402) to hal package.
+ - Change the Build-Depends: docbook-utils to xmlto which is now used for
+ building the API documentation.
* debian/libhal(-storage)-dev.install
- Do not install libtool *.la files anymore.
* debian/rules
- Remove cdbs tarball.mk rules file.
- Cleanup obsolete rm commands from common-install-impl.
+ * debian/hal.install
+ - Install the binaries hal-disable-polling, hal-is-caller-locked-out and
+ hal-lock.
* debian/hal.dirs
- Create the directories /var/cache/hald (fdi files cache) and
/var/lib/hal (dev acl management list).
Added: packages/experimental/hal/debian/patches/12_powerscripts_quirks.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/patches/12_powerscripts_quirks.patch?rev=1455&op=file
==============================================================================
--- packages/experimental/hal/debian/patches/12_powerscripts_quirks.patch (added)
+++ packages/experimental/hal/debian/patches/12_powerscripts_quirks.patch Wed May 2 08:31:34 2007
@@ -1,0 +1,60 @@
+From a0997ff7f0ced238e702f2b0e201038687ede468 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz at redhat.com>
+Date: Wed, 25 Apr 2007 15:25:27 -0400
+Subject: [PATCH] also pass correct options for pm-hibernate
+
+---
+ tools/linux/hal-system-power-hibernate-linux | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/linux/hal-system-power-hibernate-linux b/tools/linux/hal-system-power-hibernate-linux
+index 250e191..d38c509 100755
+--- a/tools/linux/hal-system-power-hibernate-linux
++++ b/tools/linux/hal-system-power-hibernate-linux
+@@ -18,10 +18,10 @@ QUIRKS=""
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_S3_MODE" = "true" ] && QUIRKS="$QUIRKS --quirk-s3-mode"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_SUSPEND" = "true" ] && QUIRKS="$QUIRKS --quirk-dpms-suspend"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_ON" = "true" ] && QUIRKS="$QUIRKS --quirk-dpms-on"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbestate"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbestate-restore"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode-restore"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3" = "true" ] && QUIRKS="$QUIRKS --quirk-vga-mode3"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbepost"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbe-post"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RADEON_OFF" = "true" ] && QUIRKS="$QUIRKS --quirk-radeon-off"
+
+ #ALTLinux only supports powersave
+--
+1.5.1.2
+
+From d695eb749f5f1ace2d90be0605a100b1cc714266 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz at redhat.com>
+Date: Wed, 25 Apr 2007 15:24:23 -0400
+Subject: [PATCH] pass correct options to pm-suspend
+
+---
+ tools/linux/hal-system-power-suspend-linux | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
+index 3e472f7..58a5915 100755
+--- a/tools/linux/hal-system-power-suspend-linux
++++ b/tools/linux/hal-system-power-suspend-linux
+@@ -26,10 +26,10 @@ QUIRKS=""
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_S3_MODE" = "true" ] && QUIRKS="$QUIRKS --quirk-s3-mode"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_SUSPEND" = "true" ] && QUIRKS="$QUIRKS --quirk-dpms-suspend"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_ON" = "true" ] && QUIRKS="$QUIRKS --quirk-dpms-on"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbestate"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbestate-restore"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode-restore"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3" = "true" ] && QUIRKS="$QUIRKS --quirk-vga-mode3"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbepost"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbe-post"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RADEON_OFF" = "true" ] && QUIRKS="$QUIRKS --quirk-radeon-off"
+
+ # PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl
+--
+1.5.1.2
+
Added: packages/experimental/hal/debian/patches/55_nonpolkit-mount-policy.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/patches/55_nonpolkit-mount-policy.patch?rev=1455&op=file
==============================================================================
--- packages/experimental/hal/debian/patches/55_nonpolkit-mount-policy.patch (added)
+++ packages/experimental/hal/debian/patches/55_nonpolkit-mount-policy.patch Wed May 2 08:31:34 2007
@@ -1,0 +1,32 @@
+diff -Nur hal-0.5.9/tools/hal-storage-mount.c hal-0.5.9.new/tools/hal-storage-mount.c
+--- hal-0.5.9/tools/hal-storage-mount.c 2007-04-17 20:36:35.000000000 +0200
++++ hal-0.5.9.new/tools/hal-storage-mount.c 2007-04-17 20:38:34.000000000 +0200
+@@ -143,7 +143,6 @@
+ exit (1);
+ }
+
+-#ifdef HAVE_POLKIT
+ static void
+ permission_denied_privilege (const char *privilege, const char *uid)
+ {
+@@ -151,7 +150,6 @@
+ fprintf (stderr, "%s refused uid %s\n", privilege, uid);
+ exit (1);
+ }
+-#endif
+
+ /* borrowed from gtk/gtkfilesystemunix.c in GTK+ on 02/23/2006 */
+ static void
+@@ -776,6 +774,12 @@
+ permission_denied_privilege (privilege, invoked_by_uid);
+ }
+ }
++#else
++ /* root can do everything; only allow handling removable devices
++ * without uid change to non-root users */
++ if (!invoked_by_uid || strcmp(invoked_by_uid, "0"))
++ if (!privilege || strcmp (privilege, "hal-storage-removable-mount"))
++ permission_denied_privilege (privilege, invoked_by_uid);
+ #endif
+
+ #ifdef DEBUG
More information about the Pkg-utopia-commits
mailing list