- Update to 0.42

PR:		120345
Submitted by:	Anderson S. Ferreira <anderson@cnpm.embrapa.br> (maintainer)

6 files changed, 28 insertions, 47 deletions

diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index 992116ac48c7..d0015d2333a5 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	klamav
-PORTVERSION=	0.41.1
+PORTVERSION=	0.42
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	klamav
diff --git a/security/klamav/distinfo b/security/klamav/distinfo
index 59eb55cfbed1..216ae7c0a6fa 100644
--- a/security/klamav/distinfo
+++ b/security/klamav/distinfo
@@ -1,3 +1,3 @@
-MD5 (klamav-0.41.1-source.tar.gz) = 073c3f223d89016c14bab957230ac3b7
-SHA256 (klamav-0.41.1-source.tar.gz) = a57609a7948526bcd0f5b104acb77aa41b86263ebb7d9f93cd46443e2c244344
-SIZE (klamav-0.41.1-source.tar.gz) = 1784785
+SIZE (klamav-0.42-source.tar.gz) = 1920149
+MD5 (klamav-0.42-source.tar.gz) = 4cf95f5e9d8a215f2cd2c312612811f6
+SHA256 (klamav-0.42-source.tar.gz) = 3dd03c802a24d0fe033bdd7f27ec77b2fd5c9aedf18ebec30cee801e36966ca7
diff --git a/security/klamav/files/patch-po b/security/klamav/files/patch-po
index 59c792eae1c7..e6f2a04f6ad1 100644
--- a/security/klamav/files/patch-po
+++ b/security/klamav/files/patch-po
@@ -1,5 +1,5 @@
---- po/cs.po.orig	Tue Mar  6 11:34:52 2007
-+++ po/cs.po	Tue Mar  6 11:36:11 2007
+--- po/cs.po.orig	2008-02-07 09:48:19.000000000 -0200
++++ po/cs.po	2008-02-07 09:49:13.000000000 -0200
 @@ -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 "
@@ -15,8 +15,8 @@
  
  #: klamd.cpp:734 klamd.cpp:735
  msgid "Load Module"
---- po/de.po.orig	Tue Mar  6 11:34:52 2007
-+++ po/de.po	Tue Mar  6 11:36:32 2007
+--- po/de.po.orig	2008-02-07 09:48:19.000000000 -0200
++++ po/de.po	2008-02-07 09:49:19.000000000 -0200
 @@ -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 "
@@ -26,8 +26,8 @@
  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.orig	Tue Mar  6 11:34:52 2007
-+++ po/es.po	Tue Mar  6 11:36:53 2007
+--- po/es.po.orig	2008-02-07 09:48:19.000000000 -0200
++++ po/es.po	2008-02-07 09:49:59.000000000 -0200
 @@ -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 "
@@ -43,8 +43,8 @@
  
  #: klamd.cpp:734 klamd.cpp:735
  msgid "Load Module"
---- po/fr.po.orig	Tue Mar  6 11:34:52 2007
-+++ po/fr.po	Tue Mar  6 11:38:07 2007
+--- po/fr.po.orig	2008-02-07 09:48:19.000000000 -0200
++++ po/fr.po	2008-02-07 09:50:08.000000000 -0200
 @@ -1018,8 +1018,8 @@
  msgstr "Il y a eu un problème au moment de détecter l'état de 'dazuko'."
  
@@ -56,8 +56,8 @@
  
  #: klamd.cpp:734
  #: klamd.cpp:735
---- po/hu.po.orig	Tue Mar  6 11:34:52 2007
-+++ po/hu.po	Tue Mar  6 11:39:07 2007
+--- po/hu.po.orig	2008-02-07 09:48:19.000000000 -0200
++++ po/hu.po	2008-02-07 09:50:14.000000000 -0200
 @@ -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 "
@@ -73,19 +73,21 @@
  "jelszót meg kell adni."
  
  #: klamd.cpp:734 klamd.cpp:735
---- 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 @@
+--- po/it.po.orig	2008-02-07 09:48:19.000000000 -0200
++++ po/it.po	2008-02-07 09:50:19.000000000 -0200
+@@ -962,8 +962,8 @@
  "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."
+-msgstr "Necessiti dapprima di caricare un modulo chiamato 'dazuko'. Questo modulo permetterà a KlamAv di avere funzionalità 'real time' per l'accesso ai file. Se vuoi che questo messaggio non appaia più in futuro, importa il seguente comando nello script di inizializzazione: 'modprobe dazuko.o'. Per compiere questa azione ti verrà chiesta la password di amministratore."
 +"'kldload dazuko.ko'. You will next be asked for the root password."
- msgstr ""
++msgstr "Necessiti dapprima di caricare un modulo chiamato 'dazuko'. Questo modulo permetterà a KlamAv di avere funzionalità 'real time' per l'accesso ai file. Se vuoi che questo messaggio non appaia più in futuro, importa il seguente comando nello script di inizializzazione: 'kldload dazuko.ko'. Per compiere questa azione ti verrà chiesta la password di amministratore."
  
  #: klamd.cpp:734 klamd.cpp:735
---- po/pl.po.orig	Tue Mar  6 11:34:52 2007
-+++ po/pl.po	Tue Mar  6 11:40:20 2007
+ msgid "Load Module"
+--- po/pl.po.orig	2008-02-07 09:48:19.000000000 -0200
++++ po/pl.po	2008-02-07 09:50:37.000000000 -0200
 @@ -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 "
@@ -101,8 +103,8 @@
  "chwilę pojawi się pytanie o hasło administratora."
  
  #: klamd.cpp:734 klamd.cpp:735
---- po/pt_BR.po.orig	Tue Mar  6 11:34:52 2007
-+++ po/pt_BR.po	Tue Mar  6 11:40:44 2007
+--- po/pt_BR.po.orig	2008-02-07 09:48:19.000000000 -0200
++++ po/pt_BR.po	2008-02-07 09:50:44.000000000 -0200
 @@ -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 "
@@ -118,8 +120,8 @@
  "função."
  
  #: klamd.cpp:734 klamd.cpp:735
---- po/ru.po.orig	Tue Mar  6 11:34:52 2007
-+++ po/ru.po	Tue Mar  6 11:41:18 2007
+--- po/ru.po.orig	2008-02-07 09:48:19.000000000 -0200
++++ po/ru.po	2008-02-07 09:50:49.000000000 -0200
 @@ -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 "
@@ -129,8 +131,8 @@
  msgstr ""
  "Необходимо запустить модуль, называемый dazuko. Этот модуль разрешит KlamAV "
  "получать доступ в реальном времени к файлам. Далее Вас попросят ввести "
---- po/zh_CN.po.orig	Tue Mar  6 11:34:52 2007
-+++ po/zh_CN.po	Tue Mar  6 11:41:44 2007
+--- po/zh_CN.po.orig	2008-02-07 09:48:19.000000000 -0200
++++ po/zh_CN.po	2008-02-07 09:51:14.000000000 -0200
 @@ -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 "
diff --git a/security/klamav/files/patch-src__klamd__scanner.c b/security/klamav/files/patch-src__klamd__scanner.c
deleted file mode 100644
index 24c1360951cb..000000000000
--- a/security/klamav/files/patch-src__klamd__scanner.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/klamd/scanner.c.orig	2007-12-19 08:33:50.000000000 -0200
-+++ src/klamd/scanner.c	2007-12-19 08:36:04.000000000 -0200
-@@ -396,7 +396,7 @@
- 
-     logg("*Accepted connection on port %d, fd %d\n", port, acceptd);
- 
--    if ((tmpname = cli_gentempdesc(NULL, &tmpd)) == NULL) {
-+    if (cli_gentempfd(NULL, &tmpname, &tmpd) ) {
- 	shutdown(sockfd, 2);
- 	close(sockfd);
- 	close(acceptd);
diff --git a/security/klamav/files/patch-src__klamd__scanner.h b/security/klamav/files/patch-src__klamd__scanner.h
deleted file mode 100644
index 18572cd1d383..000000000000
--- a/security/klamav/files/patch-src__klamd__scanner.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/klamd/scanner.h.orig	2007-12-19 08:34:32.000000000 -0200
-+++ src/klamd/scanner.h	2007-12-19 08:34:52.000000000 -0200
-@@ -33,4 +33,6 @@
- 
- int checksymlink(const char *path);
- 
-+extern int cli_gentempfd(const char *dir, char **name, int *fd);
-+
- #endif
diff --git a/security/klamav/pkg-plist b/security/klamav/pkg-plist
index 2c7fb897ab52..5b2573513c39 100644
--- a/security/klamav/pkg-plist
+++ b/security/klamav/pkg-plist
@@ -1,5 +1,4 @@
 bin/klammail
-bin/klamd
 bin/klamarkollon
 bin/ScanWithKlamAV
 %%DOCSDIR%%/index.docbook