commit kde3-klamav for openSUSE:Factory

Hello community, here is the log from the commit of package kde3-klamav for openSUSE:Factory checked in at Mon Sep 19 17:25:13 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kde3-klamav/kde3-klamav.changes 2011-09-16 00:49:22.000000000 +0200 @@ -0,0 +1,118 @@ +------------------------------------------------------------------- +Thu Sep 15 22:48:17 UTC 2011 - anixx@opensuse.org + +- rename to kde3-klamav + +------------------------------------------------------------------- +Wed Aug 3 09:38:43 UTC 2011 - anixx@opensuse.org + +- require unsermake + +------------------------------------------------------------------- +Mon Nov 15 15:06:24 UTC 2010 - wstephenson@novell.com + +- Add patches from Debian to disable functions not working under + KDE 4 and disable auto-update (bnc#426963) + +------------------------------------------------------------------- +Fri Nov 20 21:05:29 UTC 2009 - binner@kde.org + +- update patch to apply without fuzz + +------------------------------------------------------------------- +Wed Jun 3 18:31:09 CEST 2009 - dmueller@suse.de + +- reenable klammail support (bnc#415178) + +------------------------------------------------------------------- +Tue Mar 31 00:40:25 CEST 2009 - dmueller@suse.de + +- update to 0.46 (bnc#488336): + * Compatibility changes for the upcoming ClamAV 0.95. + * Add new iconset from Maarten van Gent. + * Ukrainian Translation from Yuri Chornoivan + * Fix compilation against ClamAV 0.94 + * Fix bug #258424 in ubuntu bug tracker. + * Install Konqueror Action 'Scan with KlamAV' so that it works on all systems. + * Fix bug 213690 in ubuntu bugtracker. Whitespace fixes. + * Fix paths when creating crontask. Patch from Marc Benstein + +------------------------------------------------------------------- +Tue Nov 4 14:38:59 CET 2008 - llunak@suse.cz + +- fix paths for scheduled path (bnc#354018) + +------------------------------------------------------------------- +Thu Jul 10 12:10:06 CEST 2008 - stbinner@suse.de + +- update to 0.44: updates to be compatible with ClamAV 0.93 + +------------------------------------------------------------------- +Tue Apr 22 14:51:06 CEST 2008 - dmueller@suse.de + +- disable klammail as it does no longer build against clamav + +------------------------------------------------------------------- +Sun Jan 27 09:32:04 CET 2008 - stbinner@suse.de + +- update to 0.42: + * upstreaming of patches + * Patch to handle hebrew filenames properly. + o Patch to scheduled scan script + +------------------------------------------------------------------- +Tue Oct 23 09:39:33 CEST 2007 - stbinner@suse.de + +- fix build with gcc 4.3 + +------------------------------------------------------------------- +Wed Aug 22 14:07:00 CEST 2007 - dmueller@suse.de + +- fix GUI for default archiving options (#302279) +- build with system sqlite +- remove clamav deep copy (#302070) +- switch to not quarantine archives by default (#302279) + +------------------------------------------------------------------- +Fri Jul 27 12:08:37 CEST 2007 - stbinner@suse.de + +- update to 0.41.1: + * Fix pop-up menu position on OSD + * Compatibility changes for 0.90 series + +------------------------------------------------------------------- +Fri Jun 1 11:46:13 CEST 2007 - coolo@suse.de + +- fix build / use kde_post_install + +------------------------------------------------------------------- +Mon Feb 26 16:41:05 CET 2007 - dmueller@suse.de + +- add patch for crash during update checking + +------------------------------------------------------------------- +Mon Feb 26 09:54:18 CET 2007 - dmueller@suse.de + +- update to 0.41: + * no upstream changelog available + * build against clamav 0.9x + +------------------------------------------------------------------- +Mon Nov 20 15:15:00 CET 2006 - stbinner@suse.de + +- remove wrong comment and make ScanWithKlamAV executable (#220151) + +------------------------------------------------------------------- +Tue Aug 1 13:46:33 CEST 2006 - stbinner@suse.de + +- Update to version 0.38: + * Don't follow directory symlinks when counting prior to scan + * Change viruspool URL + * Do not calculate scan time from scheduled/service menu scans. + * Fix KlamAV update process. + +------------------------------------------------------------------- +Mon May 22 10:04:47 CEST 2006 - stbinner@suse.de + +- Initial package of version 0.37 + calling whatdependson for head-i586 New: ---- 01_kdepot.patch 03_no_update_software_config_section.patch 04_fix_french_translation.patch 08-use-default-database-path.patch 09-disable-autoscan.patch 10-fix-window-size.patch 11_desktop_directory.diff 12_no_mediaslave.diff 13_ltmail.sh_fix.diff build-c.diff external-sqlite.diff kde3-klamav.changes kde3-klamav.spec klamav-0.46-source.tar.bz2 klamav-gcc43.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde3-klamav.spec ++++++ # # spec file for package klamav # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # 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/ # # norootforbuild Name: kde3-klamav Provides: klamav = %{version} Obsoletes: klamav <= %{version} BuildRequires: clamav curl-devel gmp-devel kdelibs3-devel sqlite-devel unsermake %if %suse_version > 1020 BuildRequires: fdupes %endif Url: http://klamav.sourceforge.net/ License: GPLv2+ Group: Productivity/Security Summary: Frontend for clamav BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 0.46 Release: 15 Source0: klamav-%{version}-source.tar.bz2 Patch4: external-sqlite.diff Patch7: build-c.diff Patch8: klamav-gcc43.diff Patch9: 01_kdepot.patch Patch10: 03_no_update_software_config_section.patch Patch11: 04_fix_french_translation.patch Patch12: 08-use-default-database-path.patch Patch13: 09-disable-autoscan.patch Patch14: 10-fix-window-size.patch Patch15: 11_desktop_directory.diff Patch16: 12_no_mediaslave.diff Patch17: 13_ltmail.sh_fix.diff %description A KDE front-end for the Clam AntiVirus antivirus toolkit. Authors: -------- Robert Hogan %prep %setup -q -n klamav-%version-source/klamav-%version %patch4 %patch7 %patch8 -p1 %patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 . /etc/opt/kde3/common_options rm -rf src/klamd src/sqlite update_admin %build . /etc/opt/kde3/common_options ./configure $configkde \ %ifarch amd64 x86_64 ia32e ppc64 s390x --enable-libsuffix=64 \ %endif --disable-final \ --without-included-sqlite make %install . /etc/opt/kde3/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %suse_update_desktop_file klamav Utility Security kde_post_install %find_lang klamav chmod a+x $RPM_BUILD_ROOT/opt/kde3/bin/ScanWithKlamAV %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT/opt/kde3/share/ %endif %files -f klamav.lang %defattr(-,root,root) %doc README AUTHORS ChangeLog COPYING NEWS TODO /opt/kde3/bin/ScanWithKlamAV /opt/kde3/bin/klamarkollon /opt/kde3/bin/klamav /opt/kde3/bin/klammail /opt/kde3/share/applications/kde/klamav.desktop /opt/kde3/share/apps/klamav %dir /opt/kde3/share/apps/konqueror %dir /opt/kde3/share/apps/konqueror/servicemenus /opt/kde3/share/apps/konqueror/servicemenus/klamav-dropdown.desktop /opt/kde3/share/config.kcfg/klamavconfig.kcfg /opt/kde3/share/icons/*/*/* %doc %lang(en) /opt/kde3/share/doc/HTML/en/klamav02 %changelog ++++++ 01_kdepot.patch ++++++ diff -Nur -x '*.orig' -x '*~' klamav-0.44/admin/cvs.sh klamav-0.44.new/admin/cvs.sh --- klamav-0.44/admin/cvs.sh 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/admin/cvs.sh 2008-07-07 12:57:21.000000000 -0400 @@ -537,6 +537,8 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS +kdepotpath=/usr/include/kde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" (cd $subdir @@ -554,7 +556,6 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot fi ++++++ 03_no_update_software_config_section.patch ++++++ diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/freshklam.cpp klamav-0.44.new/src/freshklam.cpp --- klamav-0.44/src/freshklam.cpp 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/freshklam.cpp 2008-07-07 13:03:56.000000000 -0400 @@ -113,51 +113,51 @@ KDialog::spacingHint(), "vbox"); //Proxy Widget - QGroupBox *software_group = new QGroupBox(i18n("Software Updates"), this); - vbox->addWidget(software_group); +// QGroupBox *software_group = new QGroupBox(i18n("Software Updates"), this); +// vbox->addWidget(software_group); - QGridLayout *software_layout = new QGridLayout( software_group, 5, 2, KDialog::spacingHint(), - KDialog::spacingHint(), "software_layout"); - software_layout->addRowSpacing(0, software_group->fontMetrics().height()); - software_layout->setColStretch(0, 1); - software_layout->setColStretch(1, 1); +// QGridLayout *software_layout = new QGridLayout( software_group, 5, 2, KDialog::spacingHint(), +// KDialog::spacingHint(), "software_layout"); +// software_layout->addRowSpacing(0, software_group->fontMetrics().height()); +// software_layout->setColStretch(0, 1); +// software_layout->setColStretch(1, 1); //Dazuko - QWidget *dazuko_hlp = new QWidget( software_group ); - software_layout->addMultiCellWidget(dazuko_hlp, 1,2, 0,2); - QGridLayout *dazuko_dir_layout = new QGridLayout(dazuko_hlp,2,2, KDialog::spacingHint() ); - - - clamav_box = new QCheckBox(i18n("Update ClamAV Automatically"), dazuko_hlp); - clamav_box->setMinimumWidth(clamav_box->sizeHint().width()); - dazuko_dir_layout->addWidget(clamav_box,0,0); - - klamav_box = new QCheckBox(i18n("Update KlamAV Automatically"), dazuko_hlp); - klamav_box->setMinimumWidth(klamav_box->sizeHint().width()); - dazuko_dir_layout->addWidget(klamav_box,0,1); +// QWidget *dazuko_hlp = new QWidget( software_group ); +// software_layout->addMultiCellWidget(dazuko_hlp, 1,2, 0,2); +// QGridLayout *dazuko_dir_layout = new QGridLayout(dazuko_hlp,2,2, KDialog::spacingHint() ); + + +// clamav_box = new QCheckBox(i18n("Update ClamAV Automatically"), dazuko_hlp); +// clamav_box->setMinimumWidth(clamav_box->sizeHint().width()); +// dazuko_dir_layout->addWidget(clamav_box,0,0); + +// klamav_box = new QCheckBox(i18n("Update KlamAV Automatically"), dazuko_hlp); +// klamav_box->setMinimumWidth(klamav_box->sizeHint().width()); +// dazuko_dir_layout->addWidget(klamav_box,0,1); - clamav_options = new QPushButton (i18n( "Upgrade ClamAV Now" ), dazuko_hlp); - dazuko_dir_layout->addWidget(clamav_options,1,0); - clamav_options->setFixedSize(clamav_options->sizeHint()); - connect( clamav_options, SIGNAL( clicked() ), this, - SLOT( checkForNewClamAVNow() ) ); - - klamav_options = new QPushButton (i18n( "Upgrade KlamAV Now" ), dazuko_hlp); - dazuko_dir_layout->addWidget(klamav_options,1,1); - klamav_options->setFixedSize(klamav_options->sizeHint()); - connect( klamav_options, SIGNAL( clicked() ), this, - SLOT( checkForNewKlamAVNow() ) ); - -#ifdef DISABLE_UPDATES - clamav_box->setEnabled(false); - klamav_box->setEnabled(false); - clamav_options->setEnabled(false); - klamav_options->setEnabled(false); -#endif +// clamav_options = new QPushButton (i18n( "Upgrade ClamAV Now" ), dazuko_hlp); +// dazuko_dir_layout->addWidget(clamav_options,1,0); +// clamav_options->setFixedSize(clamav_options->sizeHint()); +// connect( clamav_options, SIGNAL( clicked() ), this, +// SLOT( checkForNewClamAVNow() ) ); + +// klamav_options = new QPushButton (i18n( "Upgrade KlamAV Now" ), dazuko_hlp); +// dazuko_dir_layout->addWidget(klamav_options,1,1); +// klamav_options->setFixedSize(klamav_options->sizeHint()); +// connect( klamav_options, SIGNAL( clicked() ), this, +// SLOT( checkForNewKlamAVNow() ) ); + +//#ifdef DISABLE_UPDATES +// clamav_box->setEnabled(false); +// klamav_box->setEnabled(false); +// clamav_options->setEnabled(false); +// klamav_options->setEnabled(false); +//#endif //Virus Database Directory QGroupBox *group = new QGroupBox(i18n("Virus Database Directory"), this); vbox->addWidget(group); @@ -361,18 +361,18 @@ pos2 = item2.find('\n',pos); QString version = item2.mid((pos+20),pos2 - (pos+20)).stripWhiteSpace(); - if ((clamav_box->isChecked())){ +// if ((clamav_box->isChecked())){ - int result = KMessageBox::warningContinueCancel(this, i18n( "It looks like your version of the ClamAV engine is out of date! ClamAV-%1 is the most recent version of ClamAV available. Would you like to KlamAV to download and compile it for you?").arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version)); + //int result = KMessageBox::warningContinueCancel(this, i18n( "It looks like your version of the ClamAV engine is out of date! ClamAV-%1 is the most recent version of ClamAV available. Would you like to KlamAV to download and compile it for you?").arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version)); - switch (result) { - case 2 : - break; - case 5 : - updater->downloadComponent("clamav",version,"tar.gz"); - } - }else if (!(clamav_box->isChecked())) - KNotifyClient::event(kmain->_tray->winId(),"ClamAVOutDated", QString("Your copy of ClamAV is out of date! Please Upgrade to ClamAV %1!").arg(version)); +// switch (result) { +// case 2 : +// break; +// case 5 : +// updater->downloadComponent("clamav",version,"tar.gz"); +// } +// }else if (!(clamav_box->isChecked())) +// KNotifyClient::event(kmain->_tray->winId(),"ClamAVOutDated", QString("Your copy of ClamAV is out of date! Please Upgrade to ClamAV %1!").arg(version)); } @@ -722,20 +722,20 @@ check_combo->setEnabled(false); } - if ((config->readEntry("AutoUpdateClamAV")) == "Yes"){ - clamav_box->setChecked(true); - }else{ - clamav_box->setChecked(false); - } +// if ((config->readEntry("AutoUpdateClamAV")) == "Yes"){ +// clamav_box->setChecked(true); +// }else{ +// clamav_box->setChecked(false); +// } + +// if ((config->readEntry("AutoUpdateKlamAV")) == "Yes"){ +// klamav_box->setChecked(true); +// }else{ +// klamav_box->setChecked(false); +// } - if ((config->readEntry("AutoUpdateKlamAV")) == "Yes"){ - klamav_box->setChecked(true); - }else{ - klamav_box->setChecked(false); - } - - connect( clamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) ); - connect( klamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) ); +// connect( clamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) ); +// connect( klamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) ); connect( daemon_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) ); connect( check_combo, SIGNAL(activated(int)), SLOT(handleChecks()) ); @@ -758,17 +758,17 @@ } config->writeEntry("NoOfUpdates", check_combo->currentText()); - if (clamav_box->isChecked()){ - config->writeEntry("AutoUpdateClamAV","Yes"); - }else{ - config->writeEntry("AutoUpdateClamAV","No"); - } - - if (klamav_box->isChecked()){ - config->writeEntry("AutoUpdateKlamAV","Yes"); - }else{ - config->writeEntry("AutoUpdateKlamAV","No"); - } +// if (clamav_box->isChecked()){ +// config->writeEntry("AutoUpdateClamAV","Yes"); +// }else{ +// config->writeEntry("AutoUpdateClamAV","No"); +// } + +// if (klamav_box->isChecked()){ +// config->writeEntry("AutoUpdateKlamAV","Yes"); +// }else{ +// config->writeEntry("AutoUpdateKlamAV","No"); +// } config->sync(); } @@ -923,17 +923,17 @@ } -void Freshklam::checkForNewClamAVNow() -{ - - updater->checkForNewClamAVDirectly(); -} - -void Freshklam::checkForNewKlamAVNow() -{ - - updater->checkForNewKlamAVDirectly(); -} +//void Freshklam::checkForNewClamAVNow() +//{ +// +// updater->checkForNewClamAVDirectly(); +//} + +//void Freshklam::checkForNewKlamAVNow() +//{ +// +// updater->checkForNewKlamAVDirectly(); +//} void Freshklam::checkInternet() //SLOT @@ -963,11 +963,11 @@ Freshklam::resolved( KResolverResults result) // SLOT { - if ((!( result.error() != KResolver::NoError || result.isEmpty() )) - && klamav_box->isChecked()){ - updater->checkForNewKlamAV(); - }else - kdDebug() << "network error or not set to check for new klamav" << endl; +// if ((!( result.error() != KResolver::NoError || result.isEmpty() )) +// && klamav_box->isChecked()){ +// updater->checkForNewKlamAV(); +// }else +// kdDebug() << "network error or not set to check for new klamav" << endl; } @@ -1025,8 +1025,8 @@ void Freshklam::toggleUpgradeButtons(bool state) { - klamav_options->setEnabled(state); - clamav_options->setEnabled(state); +// klamav_options->setEnabled(state); +// clamav_options->setEnabled(state); } diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/freshklam.h klamav-0.44.new/src/freshklam.h --- klamav-0.44/src/freshklam.h 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/freshklam.h 2008-07-07 13:03:56.000000000 -0400 @@ -112,7 +112,7 @@ public slots: void slotSearch(); void slotCancel(); - void checkForNewClamAVNow(); + //void checkForNewClamAVNow(); void getCurrentVersionOfClamAV( ); void toggleUpgradeButtons(bool); private slots: @@ -128,7 +128,7 @@ void clamavInstallationExited(KProcess *arkollonproc);*/ //void newItems( const KFileItemList& ); void resolved(KResolverResults result); - void checkForNewKlamAVNow(); + //void checkForNewKlamAVNow(); void readVersionLine(KProcIO *); /* void parseSFPage(); void parseSFPageHack();*/ diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/klamav.cpp klamav-0.44.new/src/klamav.cpp --- klamav-0.44/src/klamav.cpp 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/klamav.cpp 2008-07-07 13:03:56.000000000 -0400 @@ -151,7 +151,7 @@ freshklam->slotSearch(); } if (downloadClamAVForWizard) - freshklam->checkForNewClamAVNow(); +// freshklam->checkForNewClamAVNow(); //klamdb->shouldIShow(); CollectionDB::instance()->insertEvent("Launch","KlamAV Launched"); ++++++ 04_fix_french_translation.patch ++++++ diff -Nur -x '*.orig' -x '*~' klamav-0.44/po/fr.po klamav-0.44.new/po/fr.po --- klamav-0.44/po/fr.po 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/po/fr.po 2008-07-07 13:04:30.000000000 -0400 @@ -554,7 +554,7 @@ "<p>This wizard will help you setup KlamAV in one simple step. Click <i>Next</i> to begin, or if you do not like wizards, click <i>Skip</i>.</p>\n" "\n" msgstr "" -"<h1>Bienvenu à KlamAV!</h1>\n" +"<h1>Bienvenue dans KlamAV!</h1>\n" "<p>KlamAV vise à être facile et intuitif à utiliser. Cependant, avant que vous ne démarriez, vous avez besoin de spécifier à KlamAV où vous voulez sauvegarder deux choses.</p>\n" "

<i>\"KlamAV est un programme en cours de développement!\"</i> - L'auteur</p>\n" "<h2>Qu'est ce que ClamAV?</h2>\n" @@ -1687,7 +1687,7 @@ #: sigtool.cpp:84 msgid "This will help you configure your email client to scan incoming and outgoing mail with KlamAV. Not all mail clients are fully supported yet. Infected mail is clearly marked as such and is wrapped in another email from KlamAV telling you the name of the virus and other relevant details." -msgstr "Ceci vous aidera à configurer votre client email à scanner les emails entrants et sortants avec KlamAV. Tous les clients email ne sont pas encore totalement supportés. Un email infecté est clairement marqué comme tel et est incorporé dans un autre email provenant de KlamAV qui vous donne le nom du virus et d'autres détails pertinents." +msgstr "Vous pourrez ici configurer votre client email pour scanner les emails entrants et sortants avec KlamAV. Le support de tous les clients mail n'est pas encore total. Un email contenant un virus sera sera inclus dans un autre email provenant de KlamAV qui vous donne le nom du virus et d'autres informations pertinentes." #: sigtool.cpp:86 msgid "Notes" ++++++ 08-use-default-database-path.patch ++++++ # Patch from Atomo64. # Thanks to him. diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/firstrunwizard.ui klamav-0.44.new/src/firstrunwizard.ui --- klamav-0.44/src/firstrunwizard.ui 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/firstrunwizard.ui 2008-07-07 13:13:06.000000000 -0400 @@ -152,50 +152,6 @@ </rect> </property> </spacer> - <widget class="QCheckBox"> - <property name="name"> - <cstring>CheckForDatabaseUpdates</cstring> - </property> - <property name="geometry"> - <rect> - <x>16</x> - <y>300</y> - <width>430</width> - <height>30</height> - </rect> - </property> - <property name="text"> - <string>Check for &updates to the signature database now.</string> - </property> - <property name="accel"> - <string>Alt+U</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>CheckForClamAVUpdates</cstring> - </property> - <property name="geometry"> - <rect> - <x>466</x> - <y>300</y> - <width>340</width> - <height>30</height> - </rect> - </property> - <property name="text"> - <string>Check for updates &to ClamAV now.</string> - </property> - <property name="accel"> - <string>Alt+T</string> - </property> - <property name="checked"> - <bool>false</bool> - </property> - </widget> <widget class="QGroupBox"> <property name="name"> <cstring>groupBox1</cstring> @@ -357,10 +313,55 @@ <enum>AtWordBoundary</enum> </property> </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>CheckForDatabaseUpdates</cstring> + </property> + <property name="geometry"> + <rect> + <x>16</x> + <y>300</y> + <width>430</width> + <height>30</height> + </rect> + </property> + <property name="text"> + <string>Check for &updates to the signature database now.</string> + </property> + <property name="accel"> + <string>Alt+U</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>CheckForClamAVUpdates</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="geometry"> + <rect> + <x>466</x> + <y>300</y> + <width>340</width> + <height>30</height> + </rect> + </property> + <property name="text"> + <string>Check for updates &to ClamAV now.</string> + </property> + <property name="accel"> + <string>Alt+T</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> </widget> </widget> -<customwidgets> -</customwidgets> <includes> <include location="local" impldecl="in implementation">firstrunwizard.ui.h</include> </includes> diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/firstrunwizard.ui.h klamav-0.44.new/src/firstrunwizard.ui.h --- klamav-0.44/src/firstrunwizard.ui.h 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/firstrunwizard.ui.h 2008-07-07 13:13:06.000000000 -0400 @@ -33,7 +33,7 @@ helpButton()->hide(); QString homepath = getenv("HOME"); - databasepath = homepath + "/.klamav/database"; + databasepath = "/var/lib/clamav"; DatabaseLocation->setURL(databasepath); quarantinepath = homepath + "/.klamav/quarantine"; diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/freshklam.cpp klamav-0.44.new/src/freshklam.cpp --- klamav-0.44/src/freshklam.cpp 2008-07-07 13:13:05.000000000 -0400 +++ klamav-0.44.new/src/freshklam.cpp 2008-07-07 13:13:06.000000000 -0400 @@ -261,6 +261,11 @@ if (!(config->readEntry("NoOfUpdates").isEmpty())) check_combo->setCurrentText(config->readEntry("NoOfUpdates")); check_combo->adjustSize(); + // Debian patch + // If /var/lib/clamav is the signatures directory, disable the update options + // because it is more likely the user doesn't have write access to those files + if (strcmp(lastDownloadPaths[0].ascii(),"/var/lib/clamav")==0||strcmp(lastDownloadPaths[0].ascii(),"/var/lib/clamav/")==0) + check_combo->setEnabled(false); //check_combo->setFixedSize(check_combo->size()); daemon_check_layout->addWidget(check_combo); @@ -276,7 +281,14 @@ vbox->addWidget(actionbox, 2, 0); actionbox->addStretch(); search_button = actionbox->addButton(i18n("&Update Now")); - search_button->setDefault(true); + + // Debian patch + // If /var/lib/clamav is the signatures directory, disable the update options + // because it is more likely the user doesn't have write access to those files + if (strcmp(lastDownloadPaths[0].ascii(),"/var/lib/clamav")==0||strcmp(lastDownloadPaths[0].ascii(),"/var/lib/clamav/")==0) { + search_button->setDefault(false); + search_button->setEnabled(false); + } else search_button->setDefault(true); cancel_button = actionbox->addButton(i18n("Cancel")); cancel_button->setEnabled(false); actionbox->addStretch(); ++++++ 09-disable-autoscan.patch ++++++ diff -Nur -x '*.orig' -x '*~' klamav-0.45/src/configdialog.cpp klamav-0.45.new/src/configdialog.cpp --- klamav-0.45/src/configdialog.cpp 2009-02-17 15:51:40.000000000 -0500 +++ klamav-0.45.new/src/configdialog.cpp 2009-02-18 15:11:45.000000000 -0500 @@ -61,7 +61,7 @@ addPage( m_archivelimits, i18n( "Archive Limits" ), "ark", i18n( "Configure Archive Limits" ) ); addPage( m_archivetypes, i18n( "Archive Types" ), "tgz", i18n( "Configure Archive Types" ) ); addPage( m_specialfiletypes, i18n( "File Types" ), "folder", i18n( "Configure File Types" ) ); - addPage( m_autoscanoptions, i18n( "Auto-Scan" ), "filefind", i18n( "Configure Auto-Scan" ) ); + //addPage( m_autoscanoptions, i18n( "Auto-Scan" ), "filefind", i18n( "Configure Auto-Scan" ) ); addPage( m_logoptions, i18n( "Event Logging" ), "kate", i18n( "Configure Events to Log" ) ); QObjectList *list = queryList( "QLabel", "infoPixmap" ); diff -Nur -x '*.orig' -x '*~' klamav-0.45/src/klamav.cpp klamav-0.45.new/src/klamav.cpp --- klamav-0.45/src/klamav.cpp 2009-02-18 15:11:44.000000000 -0500 +++ klamav-0.45.new/src/klamav.cpp 2009-02-18 15:18:36.000000000 -0500 @@ -52,24 +52,24 @@ connect(_tray,SIGNAL(quitSelected()),SLOT(shuttingDown())); KPopupMenu *conf_menu = _tray->contextMenu(); - EnableKlamd = new KAction(i18n("&Enable Auto-Scan"), "klamav_on_acc_enabled", 0,this, SLOT(contextEnable()),actionCollection(),"klamd_enable"); - DisableKlamd = new KAction(i18n("&Disable Auto-Scan"),"klamav_on_acc_disabled", 0,this, SLOT(contextDisable()),actionCollection(),"klamd_disable"); + //EnableKlamd = new KAction(i18n("&Enable Auto-Scan"), "klamav_on_acc_enabled", 0,this, SLOT(contextEnable()),actionCollection(),"klamd_enable"); + //DisableKlamd = new KAction(i18n("&Disable Auto-Scan"),"klamav_on_acc_disabled", 0,this, SLOT(contextDisable()),actionCollection(),"klamd_disable"); EnableFreshklam = new KAction(i18n("&Enable Auto-Updates"), "klamav", 0,this, SLOT(contextEnableFK()),actionCollection(),"fk_enable"); DisableFreshklam = new KAction(i18n("&Disable Auto-Updates"),"klamavbw", 0,this, SLOT(contextDisableFK()),actionCollection(),"fk_disable"); EnableFreshklam->plug(conf_menu); DisableFreshklam->plug(conf_menu); - EnableKlamd->plug(conf_menu); - DisableKlamd->plug(conf_menu); + //EnableKlamd->plug(conf_menu); + //DisableKlamd->plug(conf_menu); QToolTip::add( _tray, i18n( "KlamAV - Virus Protection for KDE" ) ); _tray->show(); DisableFreshklam->setEnabled(FALSE); EnableFreshklam->setEnabled(TRUE); - DisableKlamd->setEnabled(FALSE); - EnableKlamd->setEnabled(TRUE); + //DisableKlamd->setEnabled(FALSE); + //EnableKlamd->setEnabled(TRUE); KConfig* config = KGlobal::config(); config->setGroup("Freshklam"); @@ -88,11 +88,11 @@ klamscan = new Klamscan(this); tab->addTab(klamscan, i18n("&Scan")); - klamd = new Klamd(this); - tab->addTab(klamd, i18n("&Auto-Scan")); + //klamd = new Klamd(this); + //tab->addTab(klamd, i18n("&Auto-Scan")); - connect(klamd->search_button,SIGNAL(clicked()),SLOT(contextEnable())); - connect(klamd->cancel_button,SIGNAL(clicked()),SLOT(contextDisable())); + //connect(klamd->search_button,SIGNAL(clicked()),SLOT(contextEnable())); + //connect(klamd->cancel_button,SIGNAL(clicked()),SLOT(contextDisable())); freshklam = new Freshklam(this); @@ -172,14 +172,15 @@ } bool Klamav::queryClose() { - if ((klamd->isKlamdAlive()) || (freshklam->isFreshklamAlive())){ +/* if (freshklam->isFreshklamAlive()){ KMessageBox::information (this,i18n("<p>KlamAV will stay open in the system tray. <br><br>" - " <b>Remember</b> - you can't close KlamAV while <br> auto-scanning " - " and/or auto-updating are still running!</p>"),"KlamAV","dontshow"); + " <b>Remember</b> - you can't close KlamAV while <br> " + " auto-updating is still running!</p>"),"KlamAV","dontshow"); hide(); return false; } +*/ return true; } @@ -213,8 +214,8 @@ _tray->setPixmap(KSystemTray::loadIcon("klamavbwdl")); else*/ _tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled")); - DisableKlamd->setEnabled(FALSE); - EnableKlamd->setEnabled(TRUE); + //DisableKlamd->setEnabled(FALSE); + //EnableKlamd->setEnabled(TRUE); } diff -Nur -x '*.orig' -x '*~' klamav-0.45/src/klamd.cpp klamav-0.45.new/src/klamd.cpp --- klamav-0.45/src/klamd.cpp 2009-02-17 15:51:40.000000000 -0500 +++ klamav-0.45.new/src/klamd.cpp 2009-02-18 15:11:45.000000000 -0500 @@ -912,8 +912,8 @@ } bool Klamd::isKlamdAlive(){ - if (klamdAlive) - return true; + //if (klamdAlive) + // return true; return false; } ++++++ 10-fix-window-size.patch ++++++ diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/archivelimits.ui klamav-0.44.new/src/archivelimits.ui --- klamav-0.44/src/archivelimits.ui 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/archivelimits.ui 2008-07-07 13:14:05.000000000 -0400 @@ -8,7 +8,7 @@ <rect> <x>0</x> <y>0</y> - <width>388</width> + <width>474</width> <height>377</height> </rect> </property> @@ -46,9 +46,9 @@ </property> <property name="geometry"> <rect> - <x>11</x> - <y>11</y> - <width>366</width> + <x>10</x> + <y>10</y> + <width>430</width> <height>230</height> </rect> </property> @@ -63,7 +63,7 @@ <rect> <x>11</x> <y>34</y> - <width>350</width> + <width>400</width> <height>160</height> </rect> </property> diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/archivetypes.ui klamav-0.44.new/src/archivetypes.ui --- klamav-0.44/src/archivetypes.ui 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/archivetypes.ui 2008-07-07 13:14:05.000000000 -0400 @@ -35,7 +35,7 @@ <x>20</x> <y>30</y> <width>330</width> - <height>284</height> + <height>320</height> </rect> </property> <grid> @@ -44,7 +44,7 @@ </property> <widget class="QCheckBox" row="6" column="0"> <property name="name"> - <cstring>kcfg_ScanDeb</cstring> + <cstring>kcfg_ScanDeb</cstring> </property> <property name="text"> <string>Scan Deb files using</string> @@ -55,7 +55,7 @@ </widget> <widget class="QCheckBox" row="5" column="0"> <property name="name"> - <cstring>kcfg_ScanJar</cstring> + <cstring>kcfg_ScanJar</cstring> </property> <property name="text"> <string>Scan Jar files using</string> @@ -66,7 +66,7 @@ </widget> <widget class="QCheckBox" row="7" column="0"> <property name="name"> - <cstring>kcfg_ScanTar</cstring> + <cstring>kcfg_ScanTar</cstring> </property> <property name="text"> <string>Scan Tar files using</string> @@ -77,7 +77,7 @@ </widget> <widget class="QCheckBox" row="4" column="0"> <property name="name"> - <cstring>kcfg_ScanLzh</cstring> + <cstring>kcfg_ScanLzh</cstring> </property> <property name="text"> <string>Scan Lzh files using</string> @@ -88,12 +88,12 @@ </widget> <widget class="KURLComboRequester" row="7" column="1"> <property name="name"> - <cstring>kcfg_TarUsing</cstring> + <cstring>kcfg_TarUsing</cstring> </property> </widget> <widget class="QCheckBox" row="3" column="0"> <property name="name"> - <cstring>kcfg_ScanZoo</cstring> + <cstring>kcfg_ScanZoo</cstring> </property> <property name="text"> <string>Scan Zoo files using</string> @@ -104,22 +104,22 @@ </widget> <widget class="KURLComboRequester" row="3" column="1"> <property name="name"> - <cstring>kcfg_ZooUsing</cstring> + <cstring>kcfg_ZooUsing</cstring> </property> </widget> <widget class="KURLComboRequester" row="4" column="1"> <property name="name"> - <cstring>kcfg_LzhUsing</cstring> + <cstring>kcfg_LzhUsing</cstring> </property> </widget> <widget class="KURLComboRequester" row="0" column="1"> <property name="name"> - <cstring>kcfg_ZipUsing</cstring> + <cstring>kcfg_ZipUsing</cstring> </property> </widget> <widget class="QCheckBox" row="1" column="0"> <property name="name"> - <cstring>kcfg_ScanRar</cstring> + <cstring>kcfg_ScanRar</cstring> </property> <property name="text"> <string>Scan Rar files using</string> @@ -130,7 +130,7 @@ </widget> <widget class="QCheckBox" row="0" column="0"> <property name="name"> - <cstring>kcfg_ScanZip</cstring> + <cstring>kcfg_ScanZip</cstring> </property> <property name="text"> <string>Scan &Zip files using</string> @@ -141,27 +141,27 @@ </widget> <widget class="KURLComboRequester" row="5" column="1"> <property name="name"> - <cstring>kcfg_JarUsing</cstring> + <cstring>kcfg_JarUsing</cstring> </property> </widget> <widget class="KURLComboRequester" row="1" column="1"> <property name="name"> - <cstring>kcfg_RarUsing</cstring> + <cstring>kcfg_RarUsing</cstring> </property> </widget> <widget class="KURLComboRequester" row="6" column="1"> <property name="name"> - <cstring>kcfg_DebUsing</cstring> + <cstring>kcfg_DebUsing</cstring> </property> </widget> <widget class="KURLComboRequester" row="8" column="1"> <property name="name"> - <cstring>kcfg_TgzUsing</cstring> + <cstring>kcfg_TgzUsing</cstring> </property> </widget> <widget class="QCheckBox" row="8" column="0"> <property name="name"> - <cstring>kcfg_ScanTgz</cstring> + <cstring>kcfg_ScanTgz</cstring> </property> <property name="text"> <string>Scan Tgz files using</string> @@ -172,12 +172,12 @@ </widget> <widget class="KURLComboRequester" row="2" column="1"> <property name="name"> - <cstring>kcfg_ArjUsing</cstring> + <cstring>kcfg_ArjUsing</cstring> </property> </widget> <widget class="QCheckBox" row="2" column="0"> <property name="name"> - <cstring>kcfg_ScanArj</cstring> + <cstring>kcfg_ScanArj</cstring> </property> <property name="text"> <string>Scan Arj files using</string> diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/autoscanoptions.ui klamav-0.44.new/src/autoscanoptions.ui --- klamav-0.44/src/autoscanoptions.ui 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/autoscanoptions.ui 2008-07-07 13:14:05.000000000 -0400 @@ -8,7 +8,7 @@ <rect> <x>0</x> <y>0</y> - <width>391</width> + <width>529</width> <height>386</height> </rect> </property> @@ -48,7 +48,7 @@ <rect> <x>10</x> <y>10</y> - <width>370</width> + <width>460</width> <height>180</height> </rect> </property> @@ -113,7 +113,7 @@ <rect> <x>10</x> <y>25</y> - <width>340</width> + <width>440</width> <height>130</height> </rect> </property> diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/logoptions.ui klamav-0.44.new/src/logoptions.ui --- klamav-0.44/src/logoptions.ui 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/logoptions.ui 2008-07-07 13:14:05.000000000 -0400 @@ -38,7 +38,7 @@ <rect> <x>12</x> <y>69</y> - <width>161</width> + <width>330</width> <height>21</height> </rect> </property> @@ -48,13 +48,52 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> + <cstring>layout5</cstring> + </property> + <property name="geometry"> + <rect> + <x>12</x> + <y>17</y> + <width>350</width> + <height>40</height> + </rect> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QSpinBox" row="0" column="1"> + <property name="name"> + <cstring>kcfg_ExpireDays</cstring> + </property> + </widget> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>MaxMBsEx</cstring> + </property> + <property name="text"> + <string>Expire events after</string> + </property> + </widget> + <widget class="QLabel" row="0" column="2"> + <property name="name"> + <cstring>MaxMBsEx_2</cstring> + </property> + <property name="text"> + <string>day(s)</string> + </property> + </widget> + </grid> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> <cstring>layout4</cstring> </property> <property name="geometry"> <rect> <x>11</x> <y>91</y> - <width>300</width> + <width>350</width> <height>210</height> </rect> </property> @@ -141,45 +180,6 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>layout5</cstring> - </property> - <property name="geometry"> - <rect> - <x>12</x> - <y>17</y> - <width>300</width> - <height>40</height> - </rect> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QSpinBox" row="0" column="1"> - <property name="name"> - <cstring>kcfg_ExpireDays</cstring> - </property> - </widget> - <widget class="QLabel" row="0" column="0"> - <property name="name"> - <cstring>MaxMBsEx</cstring> - </property> - <property name="text"> - <string>Expire events after</string> - </property> - </widget> - <widget class="QLabel" row="0" column="2"> - <property name="name"> - <cstring>MaxMBsEx_2</cstring> - </property> - <property name="text"> - <string>day(s)</string> - </property> - </widget> - </grid> - </widget> </widget> </widget> <layoutdefaults spacing="6" margin="11"/> diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/specialfiletypes.ui klamav-0.44.new/src/specialfiletypes.ui --- klamav-0.44/src/specialfiletypes.ui 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/specialfiletypes.ui 2008-07-07 13:14:05.000000000 -0400 @@ -8,7 +8,7 @@ <rect> <x>0</x> <y>0</y> - <width>399</width> + <width>540</width> <height>385</height> </rect> </property> @@ -34,7 +34,7 @@ <rect> <x>20</x> <y>30</y> - <width>330</width> + <width>480</width> <height>210</height> </rect> </property> ++++++ 11_desktop_directory.diff ++++++ --- klamav/src/Makefile.am 2008-07-06 13:05:42.000000000 +0100 +++ klamav/src/Makefile.am 2008-10-15 16:23:57.000000000 +0100 @@ -45,8 +45,7 @@ KDE_ICON = klamav # this is where the kdelnk file will go -kdelnkdir = $(kde_appsdir)/Utilities -kdelnk_DATA = klamav.desktop +xdg_apps_DATA = klamav.desktop # this is where the servicemenu file will go konqservice_DATA = klamav-dropdown.desktop ++++++ 12_no_mediaslave.diff ++++++ diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/directorylist.cpp klamav-0.44.new/src/directorylist.cpp --- klamav-0.44/src/directorylist.cpp 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/directorylist.cpp 2008-10-16 09:51:48.000000000 -0400 @@ -68,7 +68,7 @@ reinterpret_cast(m_view->header())->hide(); new Item( m_view, i18n( "System Folder" ), "/", "folder_red" ); new Item( m_view, i18n( "Home Folder" ), QDir::homeDirPath(), "folder_home" ); - new DeviceItem( m_view ); +// new DeviceItem( m_view ); // setSpacing( 6 ); } ++++++ 13_ltmail.sh_fix.diff ++++++ diff -Nur -x '*.orig' -x '*~' klamav-0.46/admin/ltmain.sh klamav-0.46.new/admin/ltmain.sh --- klamav-0.46/admin/ltmain.sh 2009-02-28 05:27:28.000000000 -0500 +++ klamav-0.46.new/admin/ltmain.sh 2009-10-26 16:01:42.000000000 -0400 @@ -4134,7 +4134,7 @@ rpath= hardcode_libdirs= for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then + if test -n ""; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" ++++++ build-c.diff ++++++ --- src/klammail/Makefile.am +++ src/klammail/Makefile.am @@ -2,7 +2,7 @@ klammail_SOURCES = clamdmail.c options.c output.c memory.c cfgparser.c client.c # set the include path found by configure -INCLUDES= $(all_includes) +CFLAGS= $(all_includes) -std=gnu89 $(RPM_OPT_FLAGS) # the library search path. klammail_LDADD = $(LIB_CLAM) -#AM_CFLAGS=-O0 -g3 \ No newline at end of file +#AM_CFLAGS=-O0 -g3 ++++++ external-sqlite.diff ++++++ --- src/collectiondb.cpp +++ src/collectiondb.cpp @@ -12,7 +12,7 @@ #include "activityviewer.h" -#include "sqlite/sqlite3.h" +#include #include ++++++ klamav-gcc43.diff ++++++ --- klamav-0.41.1/src/ctunit.cpp 2007/10/23 07:26:02 1.1 +++ klamav-0.41.1/src/ctunit.cpp 2007/10/23 07:26:11 @@ -13,6 +13,7 @@ // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "cti18n.h" +#include #include <vector> #include <string> #include // sprintf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org