Hello community, here is the log from the commit of package klamav checked in at Tue Nov 4 17:46:07 CET 2008. -------- --- KDE/klamav/klamav.changes 2008-07-10 12:10:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/klamav/klamav.changes 2008-11-04 14:39:21.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 4 14:38:59 CET 2008 - llunak@suse.cz + +- fix paths for scheduled path (bnc#354018) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fix-path.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klamav.spec ++++++ --- /var/tmp/diff_new_pack.i12005/_old 2008-11-04 17:45:16.000000000 +0100 +++ /var/tmp/diff_new_pack.i12005/_new 2008-11-04 17:45:16.000000000 +0100 @@ -2,9 +2,16 @@ # spec file for package klamav (Version 0.44) # # 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/ # @@ -22,12 +29,13 @@ Summary: Frontend for clamav BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 0.44 -Release: 1 +Release: 41 Source0: klamav-%{version}-source.tar.bz2 Patch4: external-sqlite.diff Patch7: build-c.diff Patch8: klamav-gcc43.diff Patch9: disable-klammail.diff +Patch10: fix-path.diff %description A KDE front-end for the Clam AntiVirus antivirus toolkit. @@ -44,6 +52,7 @@ %patch7 %patch8 -p1 %patch9 +%patch10 . /etc/opt/kde3/common_options rm -rf src/klamd src/sqlite update_admin @@ -85,6 +94,8 @@ %doc %lang(en) /opt/kde3/share/doc/HTML/en/klamav02 %changelog +* Tue Nov 04 2008 llunak@suse.cz +- fix paths for scheduled path (bnc#354018) * Thu Jul 10 2008 stbinner@suse.de - update to 0.44: updates to be compatible with ClamAV 0.93 * Tue Apr 22 2008 dmueller@suse.de ++++++ fix-path.diff ++++++ Subject: Fix incorrect path From: Marc Benstein Signed-Off-By: Lubos Lunak Feature: bnc#354018 Patch-upstream: no --- src/schedule.cpp 2008-06-02 15:59:33.000000000 -0600 +++ src/schedule.cpp 2008-06-02 16:03:16.000000000 -0600 @@ -365,7 +365,7 @@ ts << "export HOSTNAME" << "\n"; ts << QString("PATH=%1").arg(QString(getenv("PATH"))) << "\n"; ts << "export PATH" << "\n"; - ts << "DCOPSERVER=`cat /home/$USER/.DCOPserver_$HOSTNAME_:0 | grep local`" << "\n"; + ts << "DCOPSERVER=`cat /home/${USER}/.DCOPserver_${HOSTNAME}_:0 | grep local`" << "\n"; ts << "export DCOPSERVER" << "\n"; ts << "DISPLAY=:0" << "\n"; ts << "export DISPLAY" << "\n"; @@ -384,9 +384,9 @@ ts << " fi" << "\n"; ts << " shift" << "\n"; ts << "done" << "\n"; - ts << "DCOPEXEC=`type dcop`" << "\n"; - ts << "KLAMAVEXEC=`type klamav`" << "\n"; - ts << "if $DCOPEXEC `$DCOPEXEC|grep klamav|head -1` DCOPKlamscan scanURLs \"$URL\"; then" << "\n"; + ts << "DCOPEXEC=`which dcop`" << "\n"; + ts << "KLAMAVEXEC=`which klamav`" << "\n"; + ts << "if $DCOPEXEC `$DCOPEXEC|grep klamav|head -1` DCOPKlamscan scanURLs \"${URL}\"; then" << "\n"; ts << " exit 0" << "\n"; ts << "else" << "\n"; ts << " $KLAMAVEXEC --scanthis $SCANTHIS" << "\n"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org