Hello community, here is the log from the commit of package hal checked in at Fri Nov 24 19:19:27 CET 2006. -------- --- hal/hal.changes 2006-11-24 14:54:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/hal/hal.changes 2006-11-24 17:38:59.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 24 17:28:10 CET 2006 - dkukawka@suse.de + +- fixed bugs: + - b.n.c #223622: fix sanitize password for luks + (hal-fix-luks_sanitize_password.diff) + +------------------------------------------------------------------- @@ -6 +13 @@ - devtype file in sysfs is missing and set a deafult product key. + devtype file in sysfs is missing and set a default product key. New: ---- hal-fix-luks_sanitize_password.diff hal-toport-storage-policy-fixed-drives.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.IihNab/_old 2006-11-24 19:19:09.000000000 +0100 +++ /var/tmp/diff_new_pack.IihNab/_new 2006-11-24 19:19:09.000000000 +0100 @@ -19,7 +19,7 @@ License: Other uncritical OpenSource License, Other License(s), see package Group: System/Daemons Version: 0.5.8_git20061106 -Release: 15 +Release: 16 Autoreqprov: on Summary: Daemon for Collecting Hardware Information # SUSE specific patches @@ -48,6 +48,7 @@ Patch111: hal-fix_blockdev_g_assert.diff Patch112: hal-fix-merge-copy_property.diff Patch113: hal-fix-segfault_in_xenCode.diff +Patch114: hal-fix-luks_sanitize_password.diff # # patches for testing: #Patch300: @@ -166,6 +167,7 @@ %patch111 -p1 %patch112 -p1 %patch113 -p1 +%patch114 -p1 #%patch300 -p1 %build @@ -282,8 +284,12 @@ %changelog -n hal * Fri Nov 24 2006 - dkukawka@suse.de - fixed bugs: + - b.n.c #223622: fix sanitize password for luks + (hal-fix-luks_sanitize_password.diff) +* Fri Nov 24 2006 - dkukawka@suse.de +- fixed bugs: - b.n.c #223376/#223429: fixed seqfault if for a xen device the - devtype file in sysfs is missing and set a deafult product key. + devtype file in sysfs is missing and set a default product key. (hal-fix-segfault_in_xenCode.diff) - b.n.c #220768: allow uid as mount option for ntfs partitions (hal-allow_uid_for_ntfs.diff) ++++++ hal-fix-luks_sanitize_password.diff ++++++ diff --git a/tools/linux/hal-luks-setup-linux b/tools/linux/hal-luks-setup-linux index 11fa148..8124be4 100755 --- a/tools/linux/hal-luks-setup-linux +++ b/tools/linux/hal-luks-setup-linux @@ -6,7 +6,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2. -read password +read PASSWORD PASSWORD=${PASSWORD//[^[:alnum:]_=[:space:]:.+-]/@} CRYPTSETUP=/sbin/cryptsetup @@ -23,7 +23,7 @@ if [ -e /dev/mapper/luks_crypto_$HAL_PRO exit 1 fi -if ! echo $password | $CRYPTSETUP luksOpen $HAL_PROP_BLOCK_DEVICE luks_crypto_$HAL_PROP_VOLUME_UUID 2> /dev/null; then +if ! echo "$PASSWORD" | $CRYPTSETUP luksOpen $HAL_PROP_BLOCK_DEVICE luks_crypto_$HAL_PROP_VOLUME_UUID 2> /dev/null; then echo org.freedesktop.Hal.Device.Volume.Crypto.SetupPasswordError >&2 echo Error setting up $HAL_PROP_BLOCK_DEVICE - bad password? >&2 exit 1 ++++++ hal-toport-storage-policy-fixed-drives.diff ++++++ --- fdi/policy/10osvendor/99-storage-policy-fixed-drives.fdi 1970-01-01 01:00:00.000000000 +0100 +++ fdi/policy/10osvendor/99-storage-policy-fixed-drives.fdi 2006-03-07 00:02:06.000000000 +0100 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> + +<deviceinfo version="0.2"> +<device> + <match key="@block.storage_device:storage.hotpluggable" bool="false"> + <match key="@block.storage_device:storage.removable" bool="false"> + <merge key="volume.ignore" type="bool">true</merge> + </match> + </match> +</device> +</deviceinfo> --- fdi/policy/10osvendor/Makefile.am 2006-03-30 18:54:42.000000000 +0200 +++ fdi/policy/10osvendor/Makefile.am 2006-03-30 18:55:09.000000000 +0200 @@ -6,7 +6,8 @@ 10-power-mgmt-policy.fdi \ 10-laptop-panel-mgmt-policy.fdi \ 15-storage-luks.fdi \ - 20-storage-methods.fdi + 20-storage-methods.fdi \ + 99-storage-policy-fixed-drives.fdi if HAVE_SELINUX dist_fdi_DATA += 20-storage-add-selinux.fdi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org