Date: Thu, 15 Dec 2005 10:06:26 -0200 (BRST) From: "Anderson S. Ferreira" <anderson@cnpm.embrapa.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/90427: [maintainger-update] Klamav upgrade from 0.22 to 0.32 Message-ID: <20051215120626.31F4F84559@ipe.cnpm.embrapa.br> Resent-Message-ID: <200512151210.jBFCA30m055009@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 90427
>Category: ports
>Synopsis: [maintainger-update] Klamav upgrade from 0.22 to 0.32
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 15 12:10:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Anderson S. Ferreira
>Release: FreeBSD 6.0-STABLE i386
>Organization:
Embrapa Monitoramento por Satélite
>Environment:
System: FreeBSD ipe.cnpm.embrapa.br 6.0-STABLE FreeBSD 6.0-STABLE #3: Tue Dec 13 07:49:08 BRST 2005 root@ipe.cnpm.embrapa.br:/usr/src/sys/i386/compile/IPE i386
>Description:
Klamav upgrade from 0.22 to 0.32
>How-To-Repeat:
>Fix:
--- klamav.patch begins here ---
diff -urN klamav.bak/Makefile klamav/Makefile
--- klamav.bak/Makefile Thu Nov 24 19:03:40 2005
+++ klamav/Makefile Mon Nov 28 13:50:17 2005
@@ -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 @@
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
-WRKSRC= ${WRKDIR}/${DISTNAME}
+WRKSRC= ${WRKDIR}/${DISTNAME}/${DISTNAME}
USE_BZIP2= yes
USE_GMAKE= yes
diff -urN klamav.bak/distinfo klamav/distinfo
--- klamav.bak/distinfo Thu Nov 24 19:03:40 2005
+++ klamav/distinfo Mon Nov 28 13:51:57 2005
@@ -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 -urN klamav.bak/files/patch-klamav klamav/files/patch-klamav
--- klamav.bak/files/patch-klamav Wed Dec 31 21:00:00 1969
+++ klamav/files/patch-klamav Thu Dec 15 09:33:16 2005
@@ -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 -urN klamav.bak/pkg-plist klamav/pkg-plist
--- klamav.bak/pkg-plist Thu Nov 24 19:03:40 2005
+++ klamav/pkg-plist Mon Nov 28 15:44:28 2005
@@ -1,14 +1,18 @@
-bin/klamav
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 +45,33 @@
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
--- klamav.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051215120626.31F4F84559>