[maintainger-update] Klamav upgrade from 0.22 to 0.32

	Klamav upgrade from 0.22 to 0.32

PR:		ports/90427
Submitted by:	Anderson S. Ferreira <anderson@cnpm.embrapa.br>

4 files changed, 117 insertions, 29 deletions

diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index 5ccf44a6fb62..eaf53c16a727 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	klamav
-PORTVERSION=	0.22
+PORTVERSION=	0.32
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	klamav
@@ -21,7 +21,7 @@ LIB_DEPENDS=	clamav:${PORTSDIR}/security/clamav
 USE_KDELIBS_VER=3
 PREFIX=         ${KDE_PREFIX}
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME}/${DISTNAME}
 
 USE_BZIP2=      yes
 USE_GMAKE=      yes
diff --git a/security/klamav/distinfo b/security/klamav/distinfo
index 93cf9a372098..460746ee78d2 100644
--- a/security/klamav/distinfo
+++ b/security/klamav/distinfo
@@ -1,2 +1,3 @@
-SIZE (klamav-0.22.tar.bz2) = 753320
-MD5 (klamav-0.22.tar.bz2) = 2101686edb2cddf47c2acc960c4d5e18
+SIZE (klamav-0.32.tar.bz2) = 867227
+MD5 (klamav-0.32.tar.bz2) = f0226c6b2f64f2e9d2c4099b1812fdb6
+SHA256 (klamav-0.32.tar.bz2) = dd27cba3f433c9930efee21972c40c4179c629f8cd8997638be1c2e05878c962
diff --git a/security/klamav/files/patch-klamav b/security/klamav/files/patch-klamav
new file mode 100644
index 000000000000..370f1f9d4116
--- /dev/null
+++ b/security/klamav/files/patch-klamav
@@ -0,0 +1,71 @@
+--- src/klamav.cpp	Mon Nov 21 17:21:59 2005
++++ src/klamav.cpp	Thu Dec 15 09:30:42 2005
+@@ -47,24 +47,33 @@
+ 	connect(_tray,SIGNAL(quitSelected()),SLOT(shuttingDown()));
+ 	
+ 	KPopupMenu *conf_menu = _tray->contextMenu();
++
++/* -- 
+         EnableKlamd = new KAction(i18n("&Enable Auto-Scan"), "klamav", 0,this, SLOT(contextEnable()),actionCollection(),"klamd_enable");
+         DisableKlamd = new KAction(i18n("&Disable Auto-Scan"),"klamavbw", 0,this, SLOT(contextDisable()),actionCollection(),"klamd_disable");
+-        
++*/        
++
+ 	EnableFreshklam = new KAction(i18n("&Enable Auto-Updates"), "klamavbwdl", 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);
+-	
++*/
++
+ 	QToolTip::add( _tray, "KlamAV - Virus Protection for KDE" );
+ 	_tray->show();
+ 	
+ 	DisableFreshklam->setEnabled(FALSE);
+ 	EnableFreshklam->setEnabled(TRUE);
++
++/* --
+ 	DisableKlamd->setEnabled(FALSE);
+ 	EnableKlamd->setEnabled(TRUE);
++*/
+ 
+         KConfig* config = KGlobal::config();
+         config->setGroup("Freshklam");
+@@ -81,10 +90,15 @@
+ 	tab->addTab(klamscan, i18n("&Scan"));
+ 
+ 	klamd = new Klamd(this);
++	
++	klamd->hide();
++
++/* --
+ 	tab->addTab(klamd, i18n("&Auto-Scan"));
+ 
+ 	connect(klamd->search_button,SIGNAL(clicked()),SLOT(contextEnable()));
+ 	connect(klamd->cancel_button,SIGNAL(clicked()),SLOT(contextDisable()));
++*/
+ 		
+ 	freshklam = new Freshklam(this);
+ 	tab->addTab(freshklam, i18n("&Update"));
+@@ -105,8 +119,6 @@
+ 	aboutklamav = new Aboutklamav(this);
+ 	tab->addTab(aboutklamav, i18n("Abou&t"));
+ 	
+-  
+-
+ 
+ 	top->addWidget(tab);
+ 	
+@@ -149,6 +161,7 @@
+ void  Klamav::shuttingDown(){
+ 
+ 	this->topLevelWidget()->hide();
++	this->contextDisableFK();
+ 
+ }
+ 
diff --git a/security/klamav/pkg-plist b/security/klamav/pkg-plist
index eb9e43a38f3a..2927ca6b49c4 100644
--- a/security/klamav/pkg-plist
+++ b/security/klamav/pkg-plist
@@ -1,14 +1,19 @@
-bin/klamav
+bin/ScanWithKlamAV.sh
 bin/klammail
 bin/klamd
-bin/ScanWithKlamAV.sh
+bin/klamarkollon
 share/doc/HTML/en/klamav02/index.docbook
 share/doc/HTML/en/klamav02/index.cache.bz2
 share/doc/HTML/en/klamav02/common
-share/locale/de/LC_MESSAGES/klamav02.mo
-share/locale/it/LC_MESSAGES/klamav02.mo
-share/locale/ru/LC_MESSAGES/klamav02.mo
-share/locale/pt_BR/LC_MESSAGES/klamav02.mo
+share/locale/de/LC_MESSAGES/klamav.mo
+share/locale/cs/LC_MESSAGES/klamav.mo
+share/locale/es/LC_MESSAGES/klamav.mo
+share/locale/it/LC_MESSAGES/klamav.mo
+share/locale/pl/LC_MESSAGES/klamav.mo
+share/locale/ru/LC_MESSAGES/klamav.mo
+share/locale/pt_BR/LC_MESSAGES/klamav.mo
+bin/klamav
+share/apps/klamav/eventsrc
 share/applnk/Utilities/klamav.desktop
 share/apps/konqueror/servicemenus/klamav-dropdown.desktop
 share/apps/klamav/klamavui.rc
@@ -41,22 +46,33 @@ share/apps/klamav/about/main.html
 share/apps/klamav/about/wait.html
 share/apps/klamav/about/aboutklamav.html
 share/apps/klamav/about/klam.png
-@dirrm share/doc/HTML/en/klamav02
-@dirrm share/apps/klamav/about
-@dirrm share/apps/klamav/icons/locolor/32x32/apps
-@dirrm share/apps/klamav/icons/hicolor/32x32/actions
-@dirrm share/apps/klamav/icons/hicolor/32x32/apps
-@dirrm share/apps/klamav/icons/hicolor/22x22/actions
-@dirrm share/apps/klamav/icons/locolor/32x32/actions
-@dirrm share/apps/klamav/icons/locolor/16x16/apps
-@dirrm share/apps/klamav/icons/hicolor/48x48/apps
-@dirrm share/apps/klamav/icons/locolor/16x16/actions
-@dirrm share/apps/klamav/icons/locolor/32x32
-@dirrm share/apps/klamav/icons/locolor/16x16
-@dirrm share/apps/klamav/icons/locolor
-@dirrm share/apps/klamav/icons/hicolor/32x32
-@dirrm share/apps/klamav/icons/hicolor/22x22
-@dirrm share/apps/klamav/icons/hicolor/48x48
-@dirrm share/apps/klamav/icons/hicolor
-@dirrm share/apps/klamav/icons
-@dirrm share/apps/klamav
+share/apps/klamav/about/tshirt.png
+@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML/en/klamav02 2>/dev/null || true
+@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/32x32/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/16x16/actions 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/locolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/hicolor/32x32/actions 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/hicolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/hicolor/22x22/actions 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/locolor/32x32/actions 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/locolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/hicolor/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/locolor/16x16/actions 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/locolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/locolor/16x16 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/locolor 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/hicolor/22x22 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/hicolor/48x48 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons/hicolor 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/icons 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav/about 2>/dev/null || true
+@unexec rmdir %D/share/apps/klamav 2>/dev/null || true