diff options
Diffstat (limited to 'mandriva/2010.2/applications/klamav')
6 files changed, 631 insertions, 0 deletions
diff --git a/mandriva/2010.2/applications/klamav/klamav-0.41.1-pwd-echo.patch b/mandriva/2010.2/applications/klamav/klamav-0.41.1-pwd-echo.patch new file mode 100644 index 000000000..2e31a0a03 --- /dev/null +++ b/mandriva/2010.2/applications/klamav/klamav-0.41.1-pwd-echo.patch @@ -0,0 +1,10 @@ +--- klamav-0.41.1/src/freshklam.cpp.pwd-echo 2007-07-24 22:51:54.000000000 +0300 ++++ klamav-0.41.1/src/freshklam.cpp 2007-11-07 15:53:51.000000000 +0200 +@@ -225,6 +225,7 @@ Freshklam::Freshklam(QWidget *parent, co + //proxy_pass_label->setFixedSize(proxy_pass_label->sizeHint()); + proxy_dir_layout->addWidget(proxy_pass_label,1,3); + proxyPass = new KLineEdit(proxy_hlp); ++ proxyPass->setEchoMode(KLineEdit::Password); + proxy_dir_layout->addWidget(proxyPass,1,4); + proxyPass->setText(proxyPassText); + diff --git a/mandriva/2010.2/applications/klamav/klamav-0.42-fix-window-size.patch b/mandriva/2010.2/applications/klamav/klamav-0.42-fix-window-size.patch new file mode 100644 index 000000000..8ff6a65a1 --- /dev/null +++ b/mandriva/2010.2/applications/klamav/klamav-0.42-fix-window-size.patch @@ -0,0 +1,343 @@ +--- src/specialfiletypes.ui.small 2008-03-29 03:37:21.000000000 +0100 ++++ src/specialfiletypes.ui 2008-03-29 03:37:27.000000000 +0100 +@@ -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> + +--- src/archivelimits.ui.small 2008-03-29 03:45:04.000000000 +0100 ++++ src/archivelimits.ui 2008-03-29 03:46:18.000000000 +0100 +@@ -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> + + +--- src/autoscanoptions.ui.small 2008-03-29 03:51:50.000000000 +0100 ++++ src/autoscanoptions.ui 2008-03-29 03:52:28.000000000 +0100 +@@ -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> + +--- src/archivetypes.ui.old 2008-03-29 12:37:00.000000000 +0100 ++++ src/archivetypes.ui 2008-03-29 12:37:15.000000000 +0100 +@@ -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> +--- src/logoptions.ui.old 2008-03-29 12:46:38.000000000 +0100 ++++ src/logoptions.ui 2008-03-29 12:47:18.000000000 +0100 +@@ -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 --git a/mandriva/2010.2/applications/klamav/klamav-0.46-default-db-dir.diff b/mandriva/2010.2/applications/klamav/klamav-0.46-default-db-dir.diff new file mode 100644 index 000000000..0ab8c22f7 --- /dev/null +++ b/mandriva/2010.2/applications/klamav/klamav-0.46-default-db-dir.diff @@ -0,0 +1,12 @@ +diff -p -up klamav-0.46/src/klammail/clamdmail.c~ klamav-0.46/src/klammail/clamdmail.c +--- klamav-0.46/src/klammail/clamdmail.c~ 2009-02-28 11:27:27.000000000 +0100 ++++ klamav-0.46/src/klammail/clamdmail.c 2009-03-14 17:16:32.000000000 +0100 +@@ -576,7 +576,7 @@ void startclamd(struct optstruct *opt) + break; + } + }else{ +- fprintf(tmp,"DatabaseDirectory /usr/local/share/clamav\n"); ++ fprintf(tmp,"DatabaseDirectory /var/lib/clamav\n"); + } + //fprintf(tmp,"ScanMail\n"); + if ((strstr(cl_retver(), "0.8")) || (strstr(cl_retver(), "0.7"))) diff --git a/mandriva/2010.2/applications/klamav/klamav-0.46-gcc43.patch b/mandriva/2010.2/applications/klamav/klamav-0.46-gcc43.patch new file mode 100644 index 000000000..c81edd2eb --- /dev/null +++ b/mandriva/2010.2/applications/klamav/klamav-0.46-gcc43.patch @@ -0,0 +1,33 @@ +diff -p -up klamav-0.46/src/ctcron.cpp.gcc43 klamav-0.46/src/ctcron.cpp +--- klamav-0.46/src/ctcron.cpp.gcc43 2009-02-28 11:27:27.000000000 +0100 ++++ klamav-0.46/src/ctcron.cpp 2009-03-14 16:57:40.000000000 +0100 +@@ -18,6 +18,7 @@ + #include "ctvariable.h" + #include <pwd.h> // pwd, getpwnam(), getpwuid() + #include <assert.h> ++#include <stdlib.h> // system + + #include <qfile.h> + +diff -p -up klamav-0.46/src/ctunit.cpp.gcc43 klamav-0.46/src/ctunit.cpp +--- klamav-0.46/src/ctunit.cpp.gcc43 2009-02-28 11:27:27.000000000 +0100 ++++ klamav-0.46/src/ctunit.cpp 2009-03-14 16:57:40.000000000 +0100 +@@ -18,6 +18,7 @@ + #include <stdlib.h> // sprintf + #include <stdio.h> // sprintf + #include <ctype.h> // tolower ++#include <stdlib.h> // atoi + + using namespace std; + +diff -p -up klamav-0.46/src/ktview.cpp.gcc43 klamav-0.46/src/ktview.cpp +--- klamav-0.46/src/ktview.cpp.gcc43 2009-02-28 11:27:27.000000000 +0100 ++++ klamav-0.46/src/ktview.cpp 2009-03-14 16:57:40.000000000 +0100 +@@ -20,6 +20,7 @@ + // #include <strstream.h> + // #endif + ++#include <stdlib.h> // system + + #include <qfileinfo.h> + diff --git a/mandriva/2010.2/applications/klamav/klamav.sh b/mandriva/2010.2/applications/klamav/klamav.sh new file mode 100755 index 000000000..4f091eedb --- /dev/null +++ b/mandriva/2010.2/applications/klamav/klamav.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +KLAMAV_DIR=${HOME}/.klamav + +if [ ! -d ${KLAMAV_DIR}/database -o ! -d ${KLAMAV_DIR}/quarantine ]; then + mkdir -p ${KLAMAV_DIR}/{database,quarantine} +fi + +if [ ! -f ${KLAMAV_DIR}/database/main.cvd -o ! -f ${KLAMAV_DIR}/database/daily.cvd ]; then + cp -f /var/lib/clamav/* ${KLAMAV_DIR}/database +fi + +klamav-real diff --git a/mandriva/2010.2/applications/klamav/klamav.spec b/mandriva/2010.2/applications/klamav/klamav.spec new file mode 100644 index 000000000..d2be3c790 --- /dev/null +++ b/mandriva/2010.2/applications/klamav/klamav.spec @@ -0,0 +1,220 @@ +Summary: KDE frontend for the Clam AntiVirus virus scanner +Name: klamav +Version: 0.46 +Release: %mkrel 4 +License: GPLv2+ +Group: File tools +URL: http://sourceforge.net/projects/klamav/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.tar.gz +Source1: klamav.sh +Patch0: klamav-0.46-default-db-dir.diff +Patch1: klamav-0.42-fix-window-size.patch +Patch2: klamav-0.41.1-pwd-echo.patch +Patch3: klamav-0.46-gcc43.patch +BuildRequires: kdelibs-devel +BuildRequires: clamav-devel >= 0.93 +BuildRequires: desktop-file-utils +Requires: clamav >= 0.93 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot + +%description +KlamAV provides ClamAV protection for the KDE desktop. It includes +'on access' scanning, manual scanning, quarantine management, +downloading of updates, mail scanning, and automated installation. + +%prep + +%setup -qn %{name}-%{version}-source/%{name}-%{version} +#patch0 -p1 -b .default_db_directory +%patch1 -p0 -b .fix_window_size +%patch2 -p1 -b .pwd-echo +%patch3 -p1 -b .gcc43 + +%build +%configure_kde3 +%make + +%install +rm -Rf %{buildroot} + +%makeinstall_std + +mkdir -p %{buildroot}/{%{_menudir},%{_miconsdir},%{_liconsdir}} + +mkdir -p %{buildroot}%{_kde3_datadir}/applications/kde +desktop-file-install --vendor='' --delete-original \ + --dir=%{buildroot}%{_kde3_datadir}/applications/kde \ + --remove-category="Application" \ + --add-category="Security" \ + %{buildroot}%{_kde3_datadir}/applnk/Utilities/klamav.desktop + + +# Copy translated virus browser +# Next release this shoul be made standard +mv %{buildroot}%{_kde3_bindir}/klamav %{buildroot}%{_kde3_bindir}/klamav-real +cp %SOURCE1 %{buildroot}%{_kde3_bindir}/klamav + +%find_lang %{name} --with-html --all-name + +%if %mdkversion < 200900 +%post +%update_menus +%endif + +%if %mdkversion < 200900 +%postun +%clean_menus +%endif + +%clean +rm -Rf %{buildroot} + +%files -f %{name}.lang +%defattr(-,root,root) +%attr (755,root,root) %{_kde3_bindir}/* +%{_kde3_datadir}/apps/%{name} +%{_kde3_iconsdir}/*/*/*/%{name}.png +%{_kde3_datadir}/applications/kde/*.desktop +%{_kde3_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop +%{_kde3_datadir}/config.kcfg/*.kcfg + + +%changelog +* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 0.46-4mdv2010.2 ++ Rebuild for Trinity + +* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 0.46-3mdv2010.1 ++ Rebuild for MDV 2010.1 + +* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 0.46-2mdv2010.0 ++ Rebuild for MDV 2010.0 + +* Sat Mar 14 2009 Buchan Milne <bgmilne@mandriva.org> 0.46-1mdv2009.1 ++ Revision: 355062 +- New version 0.46 +- drop vlamav 0.nf patch, fixed upstream +- rediff patches + +* Thu Sep 04 2008 Oden Eriksson <oeriksson@mandriva.com> 0.44-2mdv2009.0 ++ Revision: 280731 +- fix build against clamav-0.94 libs +- rebuild against new clamav libs + +* Sun Jul 06 2008 Funda Wang <fundawang@mandriva.org> 0.44-1mdv2009.0 ++ Revision: 232258 +- New version 0.44 +- switch to /opt +- drop patch4 not needed + + + Pixel <pixel@mandriva.com> + - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas + +* Wed May 21 2008 Oden Eriksson <oeriksson@mandriva.com> 0.42-4mdv2009.0 ++ Revision: 209718 +- bump release +- sync with fedora +- rebuild + + + Nicolas Lécureuil <neoclust@mandriva.org> + - Fix some UI issues + +* Sun Jan 20 2008 Funda Wang <fundawang@mandriva.org> 0.42-1mdv2008.1 ++ Revision: 155212 +- New version 0.42 + + + Thierry Vignaud <tvignaud@mandriva.com> + - rebuild + - kill re-definition of %%buildroot on Pixel's request + + + Olivier Blin <oblin@mandriva.com> + - restore BuildRoot + +* Thu Aug 09 2007 Funda Wang <fundawang@mandriva.org> 0.41.1-2mdv2008.0 ++ Revision: 60769 +- drop old menu +- New version 0.41.1 + + +* Sun Mar 04 2007 Emmanuel Andry <eandry@mandriva.org> 0.41-2mdv2007.0 ++ Revision: 131925 +- rebuild for new libclamav + +* Sat Feb 24 2007 Tomasz Pawel Gajc <tpg@mandriva.org> 0.41-1mdv2007.1 ++ Revision: 125377 +- new version +- use --disable-rpath +- pass some other options into the %%configure +- drop sources 2,4,5 +- use %%find_lang +- some cleans in spec file + +* Thu Dec 14 2006 Emmanuel Andry <eandry@mandriva.org> 0.39-2mdv2007.1 ++ Revision: 96844 +- remove support for version older than MDV10.1 + +* Thu Dec 14 2006 Emmanuel Andry <eandry@mandriva.org> 0.39-1mdv2007.1 ++ Revision: 96583 +- New version 0.39 + drop patches 1 2 3 4 5 + + + Andreas Hasenack <andreas@mandriva.com> + - renamed mdv to packages because mdv is too generic and it's hosting only packages anyway + + + Helio Chissini de Castro <helio@mandriva.com> + - Fix for proxy cnofigurations. Not everyone use proxy with user and pwd. + - Fixed media:/ or devices:/ patch + - Added patch for translate html files. Still not the optimal solution, but + works for current requirements + - Added translation for .html about files + - Fixded pt_BR translation. Patch will be submitted upstream + - Added better ui handling by Gustavo Boiko <boiko@mandriva.com>, using media:/ + on KDE 3.5 + - No nrpoc compilation + - Upload packages with OEM fixes + - Created package structure for klamav. + +* Tue Nov 22 2005 Laurent MONTEL <lmontel@mandriva.com> 0.32-1 +- 0.32 + +* Fri Nov 18 2005 Oden Eriksson <oeriksson@mandriva.com> 0.22.1-2mdk +- rebuilt against openssl-0.9.8a + +* Fri Aug 26 2005 Buchan Milne <bgmilne@linux-mandrake.com> 0.22.1-1mdk +- New release 0.22.1 + +* Tue Jul 26 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.22-1mdk +- New release 0.22 + +* Wed Jul 13 2005 Buchan Milne <bgmilne@linux-mandrake.com> 0.20.1-1mdk +- New release 0.20.1 + +* Fri May 27 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.20-1mdk +- 0.20 + +* Tue May 24 2005 Eskild Hustvedt <eskild@mandriva.org> 0.17.2-3mdk +- Rebuild + +* Fri Apr 29 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.17.2-2mdk +- Fix BuildRequires + +* Fri Apr 29 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.17.2-1mdk +- 0.17.2 + +* Wed Apr 13 2005 Oden Eriksson <oeriksson@mandrakesoft.com> 0.17-1mdk +- 0.17 +- rediff P0 +- nuke rpath + +* Sat Apr 09 2005 Oden Eriksson <oeriksson@mandrakesoft.com> 0.12.1-1mdk +- 0.12.1 +- use the %%mkrel macro +- fix description +- fix P0, in another place + +* Sat Oct 16 2004 Lenny Cartier <lenny@mandrakesoft.com> 0.06-1mdk +- 0.06 + +* Wed Sep 29 2004 Buchan Milne <bgmilne@linux-mandrake.com> 0.05-1mdk +- first Mandrake package +- p0 to use our clamav-db path + |