Hello community, here is the log from the commit of package kdebase3 checked in at Fri Sep 14 16:14:48 CEST 2007. -------- --- KDE/kdebase3/kdebase3.changes 2007-09-11 17:46:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2007-09-14 15:03:23.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 14 15:01:18 CEST 2007 - tpatzig@suse.de + +- let mediamamanger check if crypto_LUKS vol is already mounted + before running kryptomedia-dialog (#308196) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.h14294/_old 2007-09-14 16:14:03.000000000 +0200 +++ /var/tmp/diff_new_pack.h14294/_new 2007-09-14 16:14:03.000000000 +0200 @@ -39,7 +39,7 @@ %if %suse_version > 1000 Recommends: kdelibs3_doc Recommends: gdb -Prereq: fileshareset +PreReq: fileshareset %define fileshare_prefix %{_prefix} %else %define fileshare_prefix /opt/kde3 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.7 -Release: 73 +Release: 74 %define kde_version 3.5.7 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -299,6 +299,7 @@ %package nsplugin64 Conflicts: kdebase3-nsplugin %else + %package nsplugin Conflicts: kdebase3-nsplugin64 %endif @@ -319,7 +320,6 @@ The KDE Team <kde@kde.org> %else - %description nsplugin This package contains support for Netscape plug-ins in konqueror. You have to enable JavaScript for this. @@ -393,7 +393,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 358 +Release: 359 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -808,7 +808,6 @@ cp %SOURCE19 $RPM_BUILD_ROOT/%_mandir/man8 kde_post_install %if %suse_version > 1000 - %fdupes $RPM_BUILD_ROOT/opt/kde3/share %endif # move konqueror.desktop back to old position (#281572) @@ -869,7 +868,6 @@ %post ksysguardd %{fillup_and_insserv -sn kdebase3-ksysguardd ksysguardd RUN_KSYSGUARDD} - %verifyscript %verify_permissions -e /opt/kde3/bin/kcheckpass %verify_permissions -e /opt/kde3/bin/kdesud @@ -1598,6 +1596,9 @@ %endif %changelog +* Fri Sep 14 2007 - tpatzig@suse.de +- let mediamamanger check if crypto_LUKS vol is already mounted + before running kryptomedia-dialog (#308196) * Tue Sep 11 2007 - stbinner@suse.de - show folder_man icon in system:/ slave for Documents (#304656) * Tue Sep 11 2007 - dmueller@suse.de ++++++ media-cryptosupport.diff ++++++ --- /var/tmp/diff_new_pack.h14294/_old 2007-09-14 16:14:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h14294/_new 2007-09-14 16:14:09.000000000 +0200 @@ -1,6 +1,6 @@ ---- kioslave/media/mediamanager/halbackend.cpp.orig 2007-01-17 13:51:44.000000000 +0100 -+++ kioslave/media/mediamanager/halbackend.cpp 2007-01-17 13:53:43.000000000 +0100 -@@ -212,10 +212,20 @@ void HALBackend::AddDevice(const char *u +--- kioslave/media/mediamanager/halbackend.cpp.orig 2007-09-14 10:42:13.000000000 +0200 ++++ kioslave/media/mediamanager/halbackend.cpp 2007-09-14 12:28:26.000000000 +0200 +@@ -211,10 +211,30 @@ { /* We only list volume that have a filesystem or volume that have an audio track*/ if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && @@ -9,15 +9,25 @@ !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) return; -+ if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fstype") == "crypto_LUKS" ) { -+ // TODO: Check for kryptomedia binary. -+ KProcess proc; -+ proc << "kryptomedia" << udi; -+ proc.start(KProcess::DontCare); ++ /* For crypto_LUKS devices check its dm-device, if it is already mounted*/ ++ if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fstype") == "crypto_LUKS" ) { ++ int num; ++ char **dm_uuid = libhal_manager_find_device_string_match(m_halContext, "volume.crypto_luks.clear.backing_volume",udi,&num,NULL); ++ kdDebug(1219) << "**CRYPTOCHECK-DM-Count: " << num << endl; ++ if (num == 1) { ++ kdDebug(1219) << "dm-device: " << dm_uuid[0] << endl; ++ kdDebug(1219) << "is_mounted: " << libhal_device_get_property_bool(m_halContext, dm_uuid[0], "volume.is_mounted",NULL) << endl; ++ if (!libhal_device_get_property_bool(m_halContext, dm_uuid[0], "volume.is_mounted",NULL)) { ++ // TODO: Check for kryptomedia binary. ++ KProcess proc; ++ proc << "kryptomedia" << udi; ++ proc.start(KProcess::DontCare); + -+ return; -+ } ++ return; ++ } ++ } ++ } + /* Query drive udi */ QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); - /* We don't list floppy volumes because we list floppy drives */ + if ( driveUdi.isNull() ) // no storage - no fun ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org