Hello community, here is the log from the commit of package hal checked in at Sat Jun 3 00:56:38 CEST 2006. -------- --- hal/hal.changes 2006-05-22 17:12:39.000000000 +0200 +++ hal/hal.changes 2006-06-02 15:06:12.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 2 14:48:59 CEST 2006 - dkukawka@suse.de + +- added patch: + - hal-fix-mount-umount_172870.diff: fixed bug #172870 to allow + user umount floppy if in fstab + +------------------------------------------------------------------- New: ---- hal-fix-mount-umount_172870.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.5BAae2/_old 2006-06-03 00:56:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5BAae2/_new 2006-06-03 00:56:24.000000000 +0200 @@ -19,7 +19,7 @@ License: Other License(s), see package, Other uncritical OpenSource License Group: System/Daemons Version: 0.5.6 -Release: 34 +Release: 35 Autoreqprov: on Summary: Daemon for Collecting Hardware Information # SUSE specific patches @@ -33,38 +33,39 @@ Patch7: %{name}-performance-properties2.diff Patch8: %{name}-fix-mount_on_dev_wo_media_check_support.diff Patch9: %{name}-fix-mount_device_fstab_with_user_option_172870.diff +Patch10: %{name}-fix-mount-umount_172870.diff # submitted upstream patches -Patch10: hal-update-copyright_header.diff -Patch11: hal-fix-mount_script_v4.diff -Patch12: hal-change-scriptpath.diff -Patch13: hal-fix-addon_acpi_dbus_error.diff -Patch14: hal-fix-lshal_dbus_error.diff -Patch15: hal-fix-mount_cleanup_mountpoints_v3.diff -Patch16: hal-fix-mount_umount_only_by_hal_mounted_v2.diff -Patch17: hal-fix-mount_options_noexec.diff -Patch18: hal-fix-mount_script_fstab_check.diff -Patch19: hal-fix-map_chassitype_to_formfactor_v2.diff -Patch20: hal-fix-get_prober_serial.diff -Patch21: hal-add-usb-music_players_to_fdi_v2.diff -Patch22: hal-fix-apm_remaining_time.diff -Patch23: hal-fix-nfs_stall_block_hald.diff -Patch24: hal-fix-CD_DVD-capability.diff -Patch25: hal-fix-apm-poll_battery_reduce_events.diff -Patch26: hal-add-debug_to_syslog_probing_v2.diff -Patch27: hal-fix-probe_smbios_parse_bug172204.diff -Patch28: hal-fix_workaround_libhal-strage_get_volume_size.diff +Patch100: hal-update-copyright_header.diff +Patch101: hal-fix-mount_script_v4.diff +Patch102: hal-change-scriptpath.diff +Patch103: hal-fix-addon_acpi_dbus_error.diff +Patch104: hal-fix-lshal_dbus_error.diff +Patch105: hal-fix-mount_cleanup_mountpoints_v3.diff +Patch106: hal-fix-mount_umount_only_by_hal_mounted_v2.diff +Patch107: hal-fix-mount_options_noexec.diff +Patch108: hal-fix-mount_script_fstab_check.diff +Patch109: hal-fix-map_chassitype_to_formfactor_v2.diff +Patch110: hal-fix-get_prober_serial.diff +Patch111: hal-add-usb-music_players_to_fdi_v2.diff +Patch112: hal-fix-apm_remaining_time.diff +Patch113: hal-fix-nfs_stall_block_hald.diff +Patch114: hal-fix-CD_DVD-capability.diff +Patch115: hal-fix-apm-poll_battery_reduce_events.diff +Patch116: hal-add-debug_to_syslog_probing_v2.diff +Patch117: hal-fix-probe_smbios_parse_bug172204.diff +Patch118: hal-fix_workaround_libhal-strage_get_volume_size.diff # external patches from HAL List and backports -Patch100: hal-add-scsi-type.diff -Patch101: hal-fix-SG_IO_bug145147.diff -Patch102: hal-add-pseudo_devices.diff -Patch103: hal-fix-udev-clean_buffer.diff -Patch104: hal-fix-storage-policy-fixed-drives.diff -Patch105: hal-fix-pcmcia_storage.diff -Patch106: hal-vio-bus.patch -Patch107: hal-fix-int-size-for-alignment-error-01.patch -Patch108: hal-fix-memoryleak_libhal-storage_backported_177427.diff +Patch200: hal-add-scsi-type.diff +Patch201: hal-fix-SG_IO_bug145147.diff +Patch202: hal-add-pseudo_devices.diff +Patch203: hal-fix-udev-clean_buffer.diff +Patch204: hal-fix-storage-policy-fixed-drives.diff +Patch205: hal-fix-pcmcia_storage.diff +Patch206: hal-vio-bus.patch +Patch207: hal-fix-int-size-for-alignment-error-01.patch +Patch208: hal-fix-memoryleak_libhal-storage_backported_177427.diff # patches for testing: -Patch200: hal-change_to_hashtables.patch +Patch300: hal-change_to_hashtables.patch # Sources: Source0: %{name}-%{version}.tar.bz2 Source1: rc.hal @@ -155,24 +156,6 @@ %patch3 %patch4 %patch7 -%patch10 -%patch11 -%patch12 -%patch13 -%patch14 -%patch15 -%patch16 -%patch17 -%patch18 -%patch5 -%patch6 -%patch19 -%patch20 -%patch21 -%patch22 -%patch23 -%patch24 -%patch25 %patch100 %patch101 %patch102 @@ -181,13 +164,32 @@ %patch105 %patch106 %patch107 +%patch108 +%patch5 +%patch6 +%patch109 +%patch110 +%patch111 +%patch112 +%patch113 +%patch114 +%patch115 +%patch200 +%patch201 +%patch202 +%patch203 +%patch204 +%patch205 +%patch206 +%patch207 %patch8 -%patch26 -%patch27 -%patch28 +%patch116 +%patch117 +%patch118 %patch9 -%patch108 -#%patch200 +%patch208 +%patch10 +#%patch300 #rm -rf py-compile 4> /dev/null || : #ln -s /usr/share/automake-1.9/py-compile py-compile 2> /dev/null || : @@ -302,6 +304,10 @@ %{_bindir}/hal-device-manager %changelog -n hal +* Fri Jun 02 2006 - dkukawka@suse.de +- added patch: +- hal-fix-mount-umount_172870.diff: fixed bug #172870 to allow + user umount floppy if in fstab * Mon May 22 2006 - dkukawka@suse.de - added patch: - hal-fix-memoryleak_libhal-storage_backported_177427.diff: fix ++++++ hal-fix-mount-umount_172870.diff ++++++ --- tools/hal-system-storage-unmount 2006-05-24 14:51:51.000000000 +0200 +++ tools/hal-system-storage-unmount 2006-05-24 15:06:51.000000000 +0200 @@ -68,7 +68,7 @@ done fi -RESULT=$(umount $UNMOUNTOPTIONS "$HAL_PROP_VOLUME_MOUNT_POINT" 2>&1) +RESULT=$(umount $UNMOUNTOPTIONS "$MOUNT_POINT" 2>&1) if [ $? -ne 0 ]; then case "$RESULT" in *busy*) @@ -87,9 +87,9 @@ fi # remove directory only if HAL has created it -if [ -e $HAL_PROP_VOLUME_MOUNT_POINT/.created-by-hal ]; then - rm -f $HAL_PROP_VOLUME_MOUNT_POINT/.created-by-hal - rmdir --ignore-fail-on-non-empty "$HAL_PROP_VOLUME_MOUNT_POINT" +if [ -e $MOUNT_POINT/.created-by-hal ]; then + rm -f $MOUNT_POINT/.created-by-hal + rmdir --ignore-fail-on-non-empty "$MOUNT_POINT" fi # cleanup no longer used mount points ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org