From 76ef832ce5348d12a871223d4c034c7daeaddb82 Mon Sep 17 00:00:00 2001 From: Tim Williams Date: Mon, 17 Oct 2011 18:47:27 +0100 Subject: Adding the remaining Mandriva patches and spec files --- .../klamav/klamav-0.41.1-pwd-echo.patch | 10 + .../klamav/klamav-0.42-fix-window-size.patch | 343 +++++++++++++++++++++ .../klamav/klamav-0.46-default-db-dir.diff | 12 + .../applications/klamav/klamav-0.46-gcc43.patch | 33 ++ mandriva/2010.2/applications/klamav/klamav.sh | 13 + mandriva/2010.2/applications/klamav/klamav.spec | 220 +++++++++++++ 6 files changed, 631 insertions(+) create mode 100644 mandriva/2010.2/applications/klamav/klamav-0.41.1-pwd-echo.patch create mode 100644 mandriva/2010.2/applications/klamav/klamav-0.42-fix-window-size.patch create mode 100644 mandriva/2010.2/applications/klamav/klamav-0.46-default-db-dir.diff create mode 100644 mandriva/2010.2/applications/klamav/klamav-0.46-gcc43.patch create mode 100755 mandriva/2010.2/applications/klamav/klamav.sh create mode 100644 mandriva/2010.2/applications/klamav/klamav.spec (limited to 'mandriva/2010.2/applications/klamav') 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 @@ + + 0 + 0 +- 399 ++ 540 + 385 + + +@@ -34,7 +34,7 @@ + + 20 + 30 +- 330 ++ 480 + 210 + + + +--- 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 @@ + + 0 + 0 +- 388 ++ 474 + 377 + + +@@ -46,9 +46,9 @@ + + + +- 11 +- 11 +- 366 ++ 10 ++ 10 ++ 430 + 230 + + +@@ -63,7 +63,7 @@ + + 11 + 34 +- 350 ++ 400 + 160 + + + + +--- 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 @@ + + 0 + 0 +- 391 ++ 529 + 386 + + +@@ -48,7 +48,7 @@ + + 10 + 10 +- 370 ++ 460 + 180 + + +@@ -113,7 +113,7 @@ + + 10 + 25 +- 340 ++ 440 + 130 + + + +--- 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 @@ + 20 + 30 + 330 +- 284 ++ 320 + + + +@@ -44,7 +44,7 @@ + + + +- kcfg_ScanDeb ++ kcfg_ScanDeb + + + Scan Deb files using +@@ -55,7 +55,7 @@ + + + +- kcfg_ScanJar ++ kcfg_ScanJar + + + Scan Jar files using +@@ -66,7 +66,7 @@ + + + +- kcfg_ScanTar ++ kcfg_ScanTar + + + Scan Tar files using +@@ -77,7 +77,7 @@ + + + +- kcfg_ScanLzh ++ kcfg_ScanLzh + + + Scan Lzh files using +@@ -88,12 +88,12 @@ + + + +- kcfg_TarUsing ++ kcfg_TarUsing + + + + +- kcfg_ScanZoo ++ kcfg_ScanZoo + + + Scan Zoo files using +@@ -104,22 +104,22 @@ + + + +- kcfg_ZooUsing ++ kcfg_ZooUsing + + + + +- kcfg_LzhUsing ++ kcfg_LzhUsing + + + + +- kcfg_ZipUsing ++ kcfg_ZipUsing + + + + +- kcfg_ScanRar ++ kcfg_ScanRar + + + Scan Rar files using +@@ -130,7 +130,7 @@ + + + +- kcfg_ScanZip ++ kcfg_ScanZip + + + Scan &Zip files using +@@ -141,27 +141,27 @@ + + + +- kcfg_JarUsing ++ kcfg_JarUsing + + + + +- kcfg_RarUsing ++ kcfg_RarUsing + + + + +- kcfg_DebUsing ++ kcfg_DebUsing + + + + +- kcfg_TgzUsing ++ kcfg_TgzUsing + + + + +- kcfg_ScanTgz ++ kcfg_ScanTgz + + + Scan Tgz files using +@@ -172,12 +172,12 @@ + + + +- kcfg_ArjUsing ++ kcfg_ArjUsing + + + + +- kcfg_ScanArj ++ kcfg_ScanArj + + + Scan Arj files using +--- 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 @@ + + 12 + 69 +- 161 ++ 330 + 21 + + +@@ -48,13 +48,52 @@ + + + ++ layout5 ++ ++ ++ ++ 12 ++ 17 ++ 350 ++ 40 ++ ++ ++ ++ ++ unnamed ++ ++ ++ ++ kcfg_ExpireDays ++ ++ ++ ++ ++ MaxMBsEx ++ ++ ++ Expire events after ++ ++ ++ ++ ++ MaxMBsEx_2 ++ ++ ++ day(s) ++ ++ ++ ++ ++ ++ + layout4 + + + + 11 + 91 +- 300 ++ 350 + 210 + + +@@ -141,45 +180,6 @@ + + + +- +- +- layout5 +- +- +- +- 12 +- 17 +- 300 +- 40 +- +- +- +- +- unnamed +- +- +- +- kcfg_ExpireDays +- +- +- +- +- MaxMBsEx +- +- +- Expire events after +- +- +- +- +- MaxMBsEx_2 +- +- +- day(s) +- +- +- +- + + + 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, getpwnam(), getpwuid() + #include ++#include // system + + #include + +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 // sprintf + #include // sprintf + #include // tolower ++#include // 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 + // #endif + ++#include // system + + #include + 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 0.46-4mdv2010.2 ++ Rebuild for Trinity + +* Wed Jul 21 2010 Tim Williams 0.46-3mdv2010.1 ++ Rebuild for MDV 2010.1 + +* Tue Nov 17 2009 Tim Williams 0.46-2mdv2010.0 ++ Rebuild for MDV 2010.0 + +* Sat Mar 14 2009 Buchan Milne 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 0.44-2mdv2009.0 ++ Revision: 280731 +- fix build against clamav-0.94 libs +- rebuild against new clamav libs + +* Sun Jul 06 2008 Funda Wang 0.44-1mdv2009.0 ++ Revision: 232258 +- New version 0.44 +- switch to /opt +- drop patch4 not needed + + + Pixel + - 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 0.42-4mdv2009.0 ++ Revision: 209718 +- bump release +- sync with fedora +- rebuild + + + Nicolas Lécureuil + - Fix some UI issues + +* Sun Jan 20 2008 Funda Wang 0.42-1mdv2008.1 ++ Revision: 155212 +- New version 0.42 + + + Thierry Vignaud + - rebuild + - kill re-definition of %%buildroot on Pixel's request + + + Olivier Blin + - restore BuildRoot + +* Thu Aug 09 2007 Funda Wang 0.41.1-2mdv2008.0 ++ Revision: 60769 +- drop old menu +- New version 0.41.1 + + +* Sun Mar 04 2007 Emmanuel Andry 0.41-2mdv2007.0 ++ Revision: 131925 +- rebuild for new libclamav + +* Sat Feb 24 2007 Tomasz Pawel Gajc 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 0.39-2mdv2007.1 ++ Revision: 96844 +- remove support for version older than MDV10.1 + +* Thu Dec 14 2006 Emmanuel Andry 0.39-1mdv2007.1 ++ Revision: 96583 +- New version 0.39 + drop patches 1 2 3 4 5 + + + Andreas Hasenack + - renamed mdv to packages because mdv is too generic and it's hosting only packages anyway + + + Helio Chissini de Castro + - 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 , 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 0.32-1 +- 0.32 + +* Fri Nov 18 2005 Oden Eriksson 0.22.1-2mdk +- rebuilt against openssl-0.9.8a + +* Fri Aug 26 2005 Buchan Milne 0.22.1-1mdk +- New release 0.22.1 + +* Tue Jul 26 2005 Nicolas Lécureuil 0.22-1mdk +- New release 0.22 + +* Wed Jul 13 2005 Buchan Milne 0.20.1-1mdk +- New release 0.20.1 + +* Fri May 27 2005 Nicolas Lécureuil 0.20-1mdk +- 0.20 + +* Tue May 24 2005 Eskild Hustvedt 0.17.2-3mdk +- Rebuild + +* Fri Apr 29 2005 Nicolas Lécureuil 0.17.2-2mdk +- Fix BuildRequires + +* Fri Apr 29 2005 Nicolas Lécureuil 0.17.2-1mdk +- 0.17.2 + +* Wed Apr 13 2005 Oden Eriksson 0.17-1mdk +- 0.17 +- rediff P0 +- nuke rpath + +* Sat Apr 09 2005 Oden Eriksson 0.12.1-1mdk +- 0.12.1 +- use the %%mkrel macro +- fix description +- fix P0, in another place + +* Sat Oct 16 2004 Lenny Cartier 0.06-1mdk +- 0.06 + +* Wed Sep 29 2004 Buchan Milne 0.05-1mdk +- first Mandrake package +- p0 to use our clamav-db path + -- cgit v1.2.3