Hello community, here is the log from the commit of package ivman checked in at Mon Nov 3 12:11:20 CET 2008. -------- --- ivman/ivman.changes 2008-03-27 10:30:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/ivman/ivman.changes 2008-10-29 18:03:22.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Oct 28 18:06:41 CET 2008 - mkoenig@suse.de + +- check for halmount as default +- remove redundant build requires +- require $remote_fs in init script +- don't use assert to avoid exit of the daemon in racy conditions + [bnc#438968] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ivman-0.6.14-halmount.patch ivman-0.6.14-no_assert.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ivman.spec ++++++ --- /var/tmp/diff_new_pack.oQ7107/_old 2008-11-03 12:11:01.000000000 +0100 +++ /var/tmp/diff_new_pack.oQ7107/_new 2008-11-03 12:11:01.000000000 +0100 @@ -2,9 +2,16 @@ # spec file for package ivman (Version 0.6.14) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,16 +24,18 @@ Group: System/Daemons Url: http://ivman.sourceforge.net/ Version: 0.6.14 -Release: 134 +Release: 200 Source0: http://puzzle.dl.sourceforge.net/sourceforge/ivman/%name-%version.tar.bz2 Source1: halmount.py Source2: ivman.init Source3: halmount.1 Patch0: %{name}-config.patch Patch1: ivman-0.6.14-daemonize_early.patch +Patch2: ivman-0.6.14-halmount.patch +Patch3: ivman-0.6.14-no_assert.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReq: on -BuildRequires: dbus-1-devel glib2-devel hal-devel libxml2-devel pkgconfig +BuildRequires: glib2-devel hal-devel libxml2-devel pkgconfig Requires: dbus-1-python %description @@ -47,6 +56,8 @@ %setup -q %patch0 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build autoreconf -fi @@ -84,7 +95,8 @@ %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog README TODO -%_sysconfdir/%name +%dir %_sysconfdir/%name +%config %{_sysconfdir}/%{name}/* %config /etc/init.d/%{name} %_bindir/* %_mandir/man1/* @@ -93,6 +105,12 @@ /usr/sbin/rcivman %changelog +* Tue Oct 28 2008 mkoenig@suse.de +- check for halmount as default +- remove redundant build requires +- require $remote_fs in init script +- don't use assert to avoid exit of the daemon in racy conditions + [bnc#438968] * Wed Mar 26 2008 mkoenig@suse.de - daemonize earlier to avoid hang if dbus is not running [bnc#373704] * Fri Feb 23 2007 lnussel@suse.de ++++++ ivman-0.6.14-halmount.patch ++++++ Index: ivman-0.6.14/src/manager.c =================================================================== --- ivman-0.6.14.orig/src/manager.c 2007-01-29 12:52:31.000000000 +0100 +++ ivman-0.6.14/src/manager.c 2008-10-28 17:18:30.000000000 +0100 @@ -260,29 +260,23 @@ void set_mount_command() // OK, now try to find a mount program. // mount programs in order of preference: - // - pmount-hal (for user-mode Ivman only) + // - halmount (for user-mode Ivman only) // - pmount // - mount - // Test if pmount-hal exists + // Test if halmount exists if ( usermode ) { - if ( !command_exists( "pmount-hal > /dev/null 2>&1" ) ) { - DEBUG(_("pmount-hal was not found on your system.\n")); + if ( !command_exists( "halmount > /dev/null 2>&1" ) ) { + DEBUG(_("halmount was not found on your system.\n")); } else { - if ( !command_exists( "pumount > /dev/null 2>&1" ) ) { - DEBUG(_("pmount-hal was found on your system, but pumount " - "wasn't!\n")); - } - else { - DEBUG(_ - ("pmount-hal was found on your system. It will be " - "used for mounting.\n")); - known_mount_command = "pmount-hal '$hal.info.udi$'"; - unknown_mount_command = known_mount_command; - umount_command = "pumount '$hal.block.device$'"; - return; - } + DEBUG(_ + ("halmount was found on your system. It will be " + "used for mounting.\n")); + known_mount_command = "halmount '$hal.block.device$'"; + unknown_mount_command = known_mount_command; + umount_command = "halmount -u '$hal.block.device$'"; + return; } // Test if gnome-mount exists if ( !command_exists( "gnome-mount > /dev/null 2>&1" ) ) { @@ -300,8 +294,8 @@ void set_mount_command() } else { DEBUG(_ - ("pmount-hal/gnome-mount detection skipped, as we are a root instance " - "of Ivman. pmount-hal/gnome-mount is only used for user instances.\n")); + ("halmount/gnome-mount detection skipped, as we are a root instance " + "of Ivman. halmount/gnome-mount is only used for user instances.\n")); } ++++++ ivman-0.6.14-no_assert.patch ++++++ Index: ivman-0.6.14/src/IvmConfig/IvmConfigCommon.c =================================================================== --- ivman-0.6.14.orig/src/IvmConfig/IvmConfigCommon.c 2006-12-02 01:30:16.000000000 +0100 +++ ivman-0.6.14/src/IvmConfig/IvmConfigCommon.c 2008-10-29 17:57:39.000000000 +0100 @@ -162,7 +162,10 @@ gboolean ivm_device_is_mountable(char co char *device = (char *) libhal_device_get_property_string(hal_ctx, udi, "block.device", &dbus_error); - assert(device); + if (!device) { + ivm_check_dbus_error(&dbus_error); + return FALSE; + } DEBUG(_("UDI %s is device %s"), udi, device, &dbus_error); // if we get here, condition one is satisfied ivm_check_dbus_error(&dbus_error); @@ -210,7 +213,10 @@ is specified"), device); udi, "block.storage_device", &dbus_error); - assert(new_udi); + if (!new_udi) { + ivm_check_dbus_error(&dbus_error); + return FALSE; + } if (!libhal_device_property_exists (hal_ctx, new_udi, "storage.policy.should_mount", &dbus_error)) { @@ -290,7 +296,11 @@ Device %s can't be mounted because it is "block.storage_device", NULL ); - assert(new_udi); + if (!new_udi) { + ivm_check_dbus_error(&dbus_error); + libhal_free_string(device); + return FALSE; + } if ( libhal_device_property_exists( hal_ctx, new_udi, ++++++ ivman.init ++++++ --- /var/tmp/diff_new_pack.oQ7107/_old 2008-11-03 12:11:01.000000000 +0100 +++ /var/tmp/diff_new_pack.oQ7107/_new 2008-11-03 12:11:01.000000000 +0100 @@ -7,9 +7,9 @@ # ### BEGIN INIT INFO # Provides: ivman -# Required-Start: $local_fs $syslog dbus haldaemon +# Required-Start: $local_fs $remote_fs $syslog dbus haldaemon # Should-Start: -# Required-Stop: $local_fs $syslog dbus haldaemon +# Required-Stop: $local_fs $remote_fs $syslog dbus haldaemon # Should-Stop: # Default-Start: 3 5 # Default-Stop: 0 1 2 6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org