Hello community, here is the log from the commit of package hal checked in at Wed Apr 5 17:26:05 CEST 2006. -------- --- hal/hal.changes 2006-03-28 00:27:52.000000000 +0200 +++ hal/hal.changes 2006-04-05 16:35:38.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Apr 5 15:06:26 CEST 2006 - dkukawka@suse.de + +- moved addons and prober to %_libexecdir/hal +- fixed patch: + - hal-fix-storage-policy-fixed-drives.diff: added to Makefile.am + see bug #155682 +- added patches: + - hal-fix-mount-sanitze-mountpoint.diff: fix from lnussel for + bug #157626 + +------------------------------------------------------------------- New: ---- hal-fix-mount-sanitze-mountpoint.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.hdcmpa/_old 2006-04-05 17:25:25.000000000 +0200 +++ /var/tmp/diff_new_pack.hdcmpa/_new 2006-04-05 17:25:25.000000000 +0200 @@ -19,7 +19,7 @@ License: Other License(s), see package, Other uncritical OpenSource License Group: System/Daemons Version: 0.5.6 -Release: 21 +Release: 22 Autoreqprov: on Summary: Daemon for Collecting Hardware Information # SUSE specific patches @@ -29,6 +29,7 @@ Patch3: %{name}-performance-properties.diff Patch4: %{name}-add-wacom_tabletPC_setserial.diff Patch5: %{name}-fix-mount_159475.diff +Patch6: %{name}-fix-mount-sanitze-mountpoint.diff # submitted upstream patches Patch10: hal-update-copyright_header.diff Patch11: hal-fix-mount_script_v4.diff @@ -152,6 +153,7 @@ %patch17 %patch18 %patch5 +%patch6 %patch19 %patch20 %patch21 @@ -177,7 +179,7 @@ --sysconfdir=%{_sysconfdir} \ --localstatedir=%{_localstatedir} \ --libdir=%{_libdir} \ - --libexecdir=%{_sbindir} \ + --libexecdir=%{_libexecdir}/hal \ --mandir=%{_mandir} \ --with-init-scripts=suse \ --with-hwdata=/usr/share \ @@ -251,6 +253,7 @@ %{_bindir}/hal-find-by-capability %{_datadir}/hal/fdi/* %{_libdir}/hal/scripts/* +%{_libexecdir}/hal/* %{_datadir}/locale/*/LC_MESSAGES/hal.mo %{_datadir}/doc/packages/hal/conf/* %{_datadir}/doc/packages/hal/spec/* @@ -277,6 +280,14 @@ %{_bindir}/hal-device-manager %changelog -n hal +* Wed Apr 05 2006 - dkukawka@suse.de +- moved addons and prober to %%_libexecdir/hal +- fixed patch: +- hal-fix-storage-policy-fixed-drives.diff: added to Makefile.am + see bug #155682 +- added patches: +- hal-fix-mount-sanitze-mountpoint.diff: fix from lnussel for + bug #157626 * Mon Mar 27 2006 - dkukawka@suse.de - added patches: - hal-fix-mount_159475.diff: see bug #159475 ++++++ hal-fix-mount-sanitze-mountpoint.diff ++++++ Index: hal-0.5.6/tools/hal-system-storage-mount =================================================================== --- tools/hal-system-storage-mount +++ tools/hal-system-storage-mount @@ -73,39 +73,25 @@ check_fstab "$HAL_PROP_BLOCK_DEVICE" || # pass e.g. umask=0600,suid,dev or umask=`/bin/evil` read GIVEN_MOUNTPOINT -GIVEN_MOUNTPOINT=${GIVEN_MOUNTPOINT//[^a-zA-Z0-9_+-]/@} read GIVEN_MOUNTTYPE GIVEN_MOUNTTYPE=${GIVEN_MOUNTTYPE//[^a-zA-Z0-9_=]/_} read GIVEN_MOUNTOPTIONS GIVEN_MOUNTOPTIONS=${GIVEN_MOUNTOPTIONS//[^a-zA-Z0-9_=[:space:]]/_} -# if no mountpoint, get mountpoint from label -if [ "$GIVEN_MOUNTPOINT" == "" ]; then - case "$HAL_PROP_VOLUME_LABEL" in - *[!A-Za-z0-9_\-\+:]*) - ;; - *) - GIVEN_MOUNTPOINT="$HAL_PROP_VOLUME_LABEL" - esac -fi - -# if no mountpoint is given, use default name -if [ "$GIVEN_MOUNTPOINT" == "" ]; then - if [ "$HAL_PROP_STORAGE_MEDIA_CHECK_ENABLED" == "false" ]; then - GIVEN_MOUNTPOINT="$HAL_PROP_STORAGE_DRIVE_TYPE" +if [ -z "$GIVEN_MOUNTPOINT" ]; then + if [ -n "$HAL_PROP_VOLUME_LABEL" ]; then + GIVEN_MOUNTPOINT="$HAL_PROP_VOLUME_LABEL" + elif [ -n "$HAL_PROP_STORAGE_DRIVE_TYPE" ]; then + GIVEN_MOUNTPOINT="$HAL_PROP_STORAGE_DRIVE_TYPE" else GIVEN_MOUNTPOINT="disk" fi fi -# we've replaced invalid characters in requested mountpoint with '@' -case "$GIVEN_MOUNTPOINT" in - *@*) - echo "org.freedesktop.Hal.Device.Volume.InvalidMountpoint" >&2 - echo "The mountpoint is invalid." >&2 - exit 1 - ;; -esac +# sanitize +GIVEN_MOUNTPOINT=${GIVEN_MOUNTPOINT//[^a-zA-Z0-9_+-]/_} +GIVEN_MOUNTPOINT=${GIVEN_MOUNTPOINT/./_} + MOUNTPOINT="$GIVEN_MOUNTPOINT" # pass only whitelisted types ++++++ hal-fix-storage-policy-fixed-drives.diff ++++++ --- /var/tmp/diff_new_pack.hdcmpa/_old 2006-04-05 17:25:25.000000000 +0200 +++ /var/tmp/diff_new_pack.hdcmpa/_new 2006-04-05 17:25:25.000000000 +0200 @@ -12,3 +12,15 @@ + </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...
participants (1)
-
root@suse.de