Bug 110008

Summary: [maintainer-update] security/klamav: Update to 0.41
Product: Ports & Packages Reporter: Anderson S. Ferreira <anderson>
Component: Individual Port(s)Assignee: Martin Wilke <miwi>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   

Description Anderson S. Ferreira 2007-03-06 20:40:11 UTC 
Klamav upgrade from 0.37 to 0.41

Fix: 

---
Aviso de confidencialidade:

- Esta mensagem da Empresa Brasileira de Pesquisa Agropecuária (Embrapa), empresa pública federal regida pelo disposto na Lei Federal nº 5.851, de 7 de dezembro de 1972, é enviada exclusivamente a seu destinatário e pode conter informações confidenciais, protegidas por sigilo profissional. Sua utilização desautorizada é ilegal e sujeita o infrator às penas da lei. Se você a recebeu indevidamente, queira, por gentileza, reenviá-la ao emitente, esclarecendo o equívoco.

Confidentiality note:

- "This message from Empresa Brasileira de Pesquisa Agropecuária (Embrapa), a government company established under Brazilian law (5.851/72), is directed exclusively to its addressee and may contain confidential data, protected under professional secrecy rules. Its unauthorized use is illegal and may subject the transgressor to the law's penalties. If you are not the addressee, please send it back, elucidating the failure".--PIm3x2G2dI9tWkAk2wKRZ6h9kPypd0rxRBWzkK5vvDvF7m1B
Content-Type: text/plain; name="klamav.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="klamav.patch"

diff -Nur klamav.bak/Makefile klamav/Makefile
--- klamav.bak/Makefile	Tue Jun  6 14:49:06 2006
+++ klamav/Makefile	Tue Mar  6 15:20:03 2007
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	klamav
-PORTVERSION=	0.37
+PORTVERSION=	0.41
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	klamav
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	anderson@cnpm.embrapa.br
 COMMENT=	A KDE 3 front-end to Clam Anti-Virus
@@ -18,17 +19,21 @@
 LIB_DEPENDS=	clamav:${PORTSDIR}/security/clamav \
 		sqlite3:${PORTSDIR}/databases/sqlite3
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}-${PORTVERSION}
+
 PREFIX=		${KDE_PREFIX}
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/klamav02
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USE_GZIP=	yes
+USE_GMAKE=      yes
 USE_GNOME=	pkgconfig
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
+
 USE_AUTOTOOLS=	libtool:15
 
-CONFIGURE_ENV=	LDFLAGS=${PTHREAD_LIBS}
+
+CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS} -lintl -L${PREFIX}/lib"
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--without-included-sqlite
 
@@ -39,5 +44,10 @@
 .if ${OSVERSION} < 500000
 IGNORE=	klamav doesn't compile on FreeBSD 4.X
 .endif
+
+pre-configure:
+	@${RM} -f ${WRKSRC}/admin/ltmain.sh
+	@${RM} -f ${WRKSRC}/libtool
+	@${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
 
 .include <bsd.port.post.mk>
diff -Nur klamav.bak/distinfo klamav/distinfo
--- klamav.bak/distinfo	Tue Jun  6 14:49:06 2006
+++ klamav/distinfo	Tue Mar  6 09:28:13 2007
@@ -1,3 +1,4 @@
-SHA256 (klamav-0.37.tar.bz2) = 8953f106fe9a192cfc5079dc4c2571a35c706744671d7e24955fde2b9cc46fd0
-MD5 (klamav-0.37.tar.bz2) = 555a06b78d98a1950ca8c660fd7990a3
-SIZE (klamav-0.37.tar.bz2) = 1134003
+MD5 (klamav-0.41-source.tar.gz) = 4878b88f6b069dcef0f5825f9bca624a
+SHA256 (klamav-0.41-source.tar.gz) = 7419db65041097129929064f065ae623e8e04a67a550ef24dff3d20223802340
+SIZE (klamav-0.41-source.tar.gz) = 1783244
+
diff -Nur klamav.bak/files/patch-configure klamav/files/patch-configure
--- klamav.bak/files/patch-configure	Mon Jun  5 07:29:13 2006
+++ klamav/files/patch-configure	Wed Dec 31 21:00:00 1969
@@ -1,11 +0,0 @@
---- configure	Thu Mar  9 08:15:40 2006
-+++ configure	Thu Mar  9 08:16:11 2006
-@@ -9,6 +9,8 @@
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
-+PKGCONFIGFOUND=yes
-+
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
diff -Nur klamav.bak/files/patch-freshklam.cpp klamav/files/patch-freshklam.cpp
--- klamav.bak/files/patch-freshklam.cpp	Wed Dec 31 21:00:00 1969
+++ klamav/files/patch-freshklam.cpp	Tue Mar  6 11:14:23 2007
@@ -0,0 +1,11 @@
+--- src/freshklam.cpp.orig	Tue Mar  6 11:05:52 2007
++++ src/freshklam.cpp	Tue Mar  6 11:06:44 2007
+@@ -122,6 +122,8 @@
+     software_layout->setColStretch(0, 1);
+     software_layout->setColStretch(1, 1);
+ 
++    software_group->hide();
++
+ 
+     //Dazuko
+     QWidget *dazuko_hlp = new QWidget( software_group );
diff -Nur klamav.bak/files/patch-klamd klamav/files/patch-klamd
--- klamav.bak/files/patch-klamd	Mon Jun  5 07:29:13 2006
+++ klamav/files/patch-klamd	Wed Dec 31 21:00:00 1969
@@ -1,29 +0,0 @@
---- src/klamd.cpp	Wed Mar  8 15:47:12 2006
-+++ src/klamd.cpp	Wed Mar  8 15:49:18 2006
-@@ -699,7 +699,7 @@
- 
- 	
- 	dazukoLoaded = FALSE;
--	QString lsmodCommand="lsmod";
-+	QString lsmodCommand="kldstat";
- 	lsmodproc = new KProcIO();
- 	QString curpath = (QString) getenv("PATH");
- 	lsmodproc->setEnvironment("PATH",curpath + ":/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin");
-@@ -730,7 +730,7 @@
- {
- 	if (!(dazukoLoaded)){
- 		int result;
--		result = KMessageBox::warningContinueCancel(this, i18n( "I need to load a module called 'dazuko' first. This module will allow KlamAV to gain real-time access to files. If you don't want this message to appear in future, put the following command in your initialization scripts: 'modprobe dazuko.o'. You will next be asked for the root password."),
-+		result = KMessageBox::warningContinueCancel(this, i18n( "I need to load a module called 'dazuko' first. This module will allow KlamAV to gain real-time access to files. If you don't want this message to appear in future, put the following command in your initialization scripts: 'kldload dazuko.ko'. You will next be asked for the root password."),
- 		i18n( "Load Module" ),
- 		i18n( "Load Module" ),
- 		i18n( "Delete2" ));
-@@ -803,7 +803,7 @@
- // 	
- // 	//kdDebug() << release << endl;
- // 	QString insmodCommand="insmod /lib/modules/" + release + "/dazuko.o";
--	QString insmodCommand="modprobe dazuko";
-+	QString insmodCommand="kldload  /usr/local/modules/dazuko.ko";
- 	//QString insmodCommand="insmod /opt/kde/bin/dazuko.o";
- 	KProcIO *insmodproc = new KProcIO();
- 	
diff -Nur klamav.bak/files/patch-klamd.cpp klamav/files/patch-klamd.cpp
--- klamav.bak/files/patch-klamd.cpp	Wed Dec 31 21:00:00 1969
+++ klamav/files/patch-klamd.cpp	Tue Mar  6 13:14:51 2007
@@ -0,0 +1,20 @@
+--- src/klamd.cpp.orig	Tue Mar  6 13:12:00 2007
++++ src/klamd.cpp	Tue Mar  6 13:13:55 2007
+@@ -742,7 +742,7 @@
+ {
+ 	if (!(dazukoLoaded)){
+ 		int result;
+-		result = KMessageBox::warningContinueCancel(this, i18n( "I need to load a module called 'dazuko' first. This module will allow KlamAV to gain real-time access to files. If you don't want this message to appear in future, put the following command in your initialization scripts: 'modprobe dazuko.o'. You will next be asked for the root password."),
++		result = KMessageBox::warningContinueCancel(this, i18n( "I need to load a module called 'dazuko' first. This module will allow KlamAV to gain real-time access to files. If you don't want this message to appear in future, put the following command in your initialization scripts: 'kldload dazuko.ko'. You will next be asked for the root password."),
+ 		i18n( "Load Module" ),
+ 		i18n( "Load Module" ),
+ 		i18n( "Delete2" ));
+@@ -815,7 +815,7 @@
+ // 	
+ // 	//kdDebug() << release << endl;
+ // 	QString insmodCommand="insmod /lib/modules/" + release + "/dazuko.o";
+-	QString insmodCommand="modprobe dazuko";
++	QString insmodCommand="kldload dazuko.ko";
+ 	//QString insmodCommand="insmod /opt/kde/bin/dazuko.o";
+ 	KProcIO *insmodproc = new KProcIO();
+ 	
diff -Nur klamav.bak/files/patch-po klamav/files/patch-po
--- klamav.bak/files/patch-po	Tue Jun  6 14:49:06 2006
+++ klamav/files/patch-po	Tue Mar  6 11:47:52 2007
@@ -1,6 +1,6 @@
---- po/cs.po	Tue Jun  6 11:34:08 2006
-+++ po/cs.po	Tue Jun  6 11:35:12 2006
-@@ -1089,12 +1089,12 @@
+--- po/cs.po.orig	Tue Mar  6 11:34:52 2007
++++ po/cs.po	Tue Mar  6 11:36:11 2007
+@@ -987,12 +987,12 @@
  "I need to load a module called 'dazuko' first. This module will allow KlamAV "
  "to gain real-time access to files. If you don't want this message to appear "
  "in future, put the following command in your initialization scripts: "
@@ -15,9 +15,9 @@
  
  #: klamd.cpp:734 klamd.cpp:735
  msgid "Load Module"
---- po/de.po	Tue Jun  6 11:34:08 2006
-+++ po/de.po	Tue Jun  6 11:35:33 2006
-@@ -1080,7 +1080,7 @@
+--- po/de.po.orig	Tue Mar  6 11:34:52 2007
++++ po/de.po	Tue Mar  6 11:36:32 2007
+@@ -985,7 +985,7 @@
  "I need to load a module called 'dazuko' first. This module will allow KlamAV "
  "to gain real-time access to files. If you don't want this message to appear "
  "in future, put the following command in your initialization scripts: "
@@ -26,9 +26,9 @@
  msgstr ""
  "Es muà das Modul mit dem Namen \"dazuko\" geladen werden. Dies ermöglicht "
  "einen verbesserten Zugriffn auf die Datein. Wenn sie nicht möchten, dass "
---- po/es.po	Tue Jun  6 11:34:08 2006
-+++ po/es.po	Tue Jun  6 11:36:05 2006
-@@ -747,12 +747,12 @@
+--- po/es.po.orig	Tue Mar  6 11:34:52 2007
++++ po/es.po	Tue Mar  6 11:36:53 2007
+@@ -991,12 +991,12 @@
  "I need to load a module called 'dazuko' first. This module will allow KlamAV "
  "to gain real-time access to files. If you don't want this message to appear "
  "in future, put the following command in your initialization scripts: "
@@ -41,10 +41,10 @@
 -"inicialización: 'modprobe dazuko.o'. Necesita la clave de administrador."
 +"inicialización: 'kldload dazuko.ko'. Necesita la clave de administrador."
  
- #: klamd.cpp:718 klamd.cpp:719
+ #: klamd.cpp:734 klamd.cpp:735
  msgid "Load Module"
---- po/fr.po	Tue Jun  6 11:34:08 2006
-+++ po/fr.po	Tue Jun  6 11:37:06 2006
+--- po/fr.po.orig	Tue Mar  6 11:34:52 2007
++++ po/fr.po	Tue Mar  6 11:38:07 2007
 @@ -1018,8 +1018,8 @@
  msgstr "Il y a eu un problème au moment de détecter l'état de 'dazuko'."
  
@@ -56,9 +56,9 @@
  
  #: klamd.cpp:734
  #: klamd.cpp:735
---- po/hu.po	Tue Jun  6 11:34:08 2006
-+++ po/hu.po	Tue Jun  6 11:37:27 2006
-@@ -1086,12 +1086,12 @@
+--- po/hu.po.orig	Tue Mar  6 11:34:52 2007
++++ po/hu.po	Tue Mar  6 11:39:07 2007
+@@ -983,12 +983,12 @@
  "I need to load a module called 'dazuko' first. This module will allow KlamAV "
  "to gain real-time access to files. If you don't want this message to appear "
  "in future, put the following command in your initialization scripts: "
@@ -73,9 +73,9 @@
  "jelszót meg kell adni."
  
  #: klamd.cpp:734 klamd.cpp:735
---- po/it.po	Tue Jun  6 11:34:08 2006
-+++ po/it.po	Tue Jun  6 11:37:39 2006
-@@ -1067,7 +1067,7 @@
+--- po/it.po.orig	Tue Mar  6 11:34:52 2007
++++ po/it.po	Tue Mar  6 11:39:49 2007
+@@ -972,7 +972,7 @@
  "I need to load a module called 'dazuko' first. This module will allow KlamAV "
  "to gain real-time access to files. If you don't want this message to appear "
  "in future, put the following command in your initialization scripts: "
@@ -84,9 +84,9 @@
  msgstr ""
  
  #: klamd.cpp:734 klamd.cpp:735
---- po/pl.po	Tue Jun  6 11:34:08 2006
-+++ po/pl.po	Tue Jun  6 11:38:36 2006
-@@ -1083,12 +1083,12 @@
+--- po/pl.po.orig	Tue Mar  6 11:34:52 2007
++++ po/pl.po	Tue Mar  6 11:40:20 2007
+@@ -988,12 +988,12 @@
  "I need to load a module called 'dazuko' first. This module will allow KlamAV "
  "to gain real-time access to files. If you don't want this message to appear "
  "in future, put the following command in your initialization scripts: "
@@ -101,9 +101,9 @@
  "chwilÄ pojawi siÄ pytanie o hasÅo administratora."
  
  #: klamd.cpp:734 klamd.cpp:735
---- po/pt_BR.po	Tue Jun  6 11:34:08 2006
-+++ po/pt_BR.po	Tue Jun  6 11:39:23 2006
-@@ -1151,12 +1151,12 @@
+--- po/pt_BR.po.orig	Tue Mar  6 11:34:52 2007
++++ po/pt_BR.po	Tue Mar  6 11:40:44 2007
+@@ -1046,12 +1046,12 @@
  "I need to load a module called 'dazuko' first. This module will allow KlamAV "
  "to gain real-time access to files. If you don't want this message to appear "
  "in future, put the following command in your initialization scripts: "
@@ -118,9 +118,9 @@
  "função."
  
  #: klamd.cpp:734 klamd.cpp:735
---- po/ru.po	Tue Jun  6 11:34:08 2006
-+++ po/ru.po	Tue Jun  6 11:41:25 2006
-@@ -1081,7 +1081,7 @@
+--- po/ru.po.orig	Tue Mar  6 11:34:52 2007
++++ po/ru.po	Tue Mar  6 11:41:18 2007
+@@ -986,7 +986,7 @@
  "I need to load a module called 'dazuko' first. This module will allow KlamAV "
  "to gain real-time access to files. If you don't want this message to appear "
  "in future, put the following command in your initialization scripts: "
@@ -129,9 +129,9 @@
  msgstr ""
  "ÐеобÑодимо запÑÑÑиÑÑ Ð¼Ð¾Ð´ÑлÑ, назÑваемÑй dazuko. ЭÑÐ¾Ñ Ð¼Ð¾Ð´ÑÐ»Ñ ÑазÑеÑÐ¸Ñ KlamAV "
  "полÑÑаÑÑ Ð´Ð¾ÑÑÑп в ÑеалÑном вÑемени к Ñайлам. Ðалее ÐÐ°Ñ Ð¿Ð¾Ð¿ÑоÑÑÑ Ð²Ð²ÐµÑÑи "
---- po/zh_CN.po	Tue Jun  6 11:34:08 2006
-+++ po/zh_CN.po	Tue Jun  6 11:42:02 2006
-@@ -581,7 +581,7 @@
+--- po/zh_CN.po.orig	Tue Mar  6 11:34:52 2007
++++ po/zh_CN.po	Tue Mar  6 11:41:44 2007
+@@ -960,7 +960,7 @@
  "I need to load a module called 'dazuko' first. This module will allow KlamAV "
  "to gain real-time access to files. If you don't want this message to appear "
  "in future, put the following command in your initialization scripts: "
@@ -139,4 +139,4 @@
 +"'kldload dazuko.ko'. You will next be asked for the root password."
  msgstr ""
  
- #: klamd.cpp:718 klamd.cpp:719
+ #: klamd.cpp:734 klamd.cpp:735
diff -Nur klamav.bak/files/patch-src klamav/files/patch-src
--- klamav.bak/files/patch-src	Mon Jun  5 07:29:13 2006
+++ klamav/files/patch-src	Wed Dec 31 21:00:00 1969
@@ -1,11 +0,0 @@
---- src/freshklam.cpp	Fri Mar 10 11:03:46 2006
-+++ src/freshklam.cpp	Fri Mar 10 11:04:15 2006
-@@ -165,7 +165,7 @@
- 
- 
- 
--
-+    software_group->hide();
- 
- 
-     //Virus Database Directory
Comment 1 Martin Wilke freebsd_committer freebsd_triage 2007-03-06 20:45:19 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->miwi

I'll take it.
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2007-03-06 21:30:13 UTC 
State Changed
From-To: open->feedback

Ask for maintainer fix.
Comment 3 dfilter service freebsd_committer freebsd_triage 2007-03-07 22:47:14 UTC 
miwi        2007-03-07 22:47:09 UTC

  FreeBSD ports repository

  Modified files:
    security/klamav      Makefile distinfo 
    security/klamav/files patch-po 
  Added files:
    security/klamav/files ltmain.sh patch-freshklam.cpp 
                          patch-klamd.cpp 
  Removed files:
    security/klamav/files patch-configure patch-klamd patch-src 
  Log:
  - Update to 0.41
  
  PR:             110008
  Submitted by:   Anderson S. Ferreira <anderson@cnpm.embrapa.br> (maintainer)
  
  Revision  Changes    Path
  1.6       +12 -4     ports/security/klamav/Makefile
  1.5       +3 -3      ports/security/klamav/distinfo
  1.1       +3 -0      ports/security/klamav/files/ltmain.sh (new)
  1.2       +0 -11     ports/security/klamav/files/patch-configure (dead)
  1.1       +11 -0     ports/security/klamav/files/patch-freshklam.cpp (new)
  1.2       +0 -29     ports/security/klamav/files/patch-klamd (dead)
  1.1       +20 -0     ports/security/klamav/files/patch-klamd.cpp (new)
  1.3       +31 -31    ports/security/klamav/files/patch-po
  1.2       +0 -11     ports/security/klamav/files/patch-src (dead)
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 4 Martin Wilke freebsd_committer freebsd_triage 2007-03-07 22:47:28 UTC 
State Changed
From-To: feedback->closed

Committed. Thanks!