View | Details | Raw Unified | Return to bug 123560
Collapse All | Expand All

(-)klamav/Makefile (-2 / +1 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	klamav
8
PORTNAME=	klamav
9
PORTVERSION=	0.42
9
PORTVERSION=	0.43
10
PORTREVISION=	3
11
CATEGORIES=	security
10
CATEGORIES=	security
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	klamav
12
MASTER_SITE_SUBDIR=	klamav
(-)klamav/distinfo (-3 / +4 lines)
Lines 1-3 Link Here
1
SIZE (klamav-0.42-source.tar.gz) = 1920149
1
SIZE (klamav-0.43-source.tar.gz) = 2029200
2
MD5 (klamav-0.42-source.tar.gz) = 4cf95f5e9d8a215f2cd2c312612811f6
2
MD5 (klamav-0.43-source.tar.gz) = 1422e0649626f4ea20b46fc0b0bcf1d7
3
SHA256 (klamav-0.42-source.tar.gz) = 3dd03c802a24d0fe033bdd7f27ec77b2fd5c9aedf18ebec30cee801e36966ca7
3
SHA256 (klamav-0.43-source.tar.gz) = de92736c18b47da69ffef17747f16c105d8772b2369026f82c2cec000c00a13e
4
(-)klamav/files/patch-clamav-0.93 (-91 lines)
Lines 1-91 Link Here
1
diff -ur src/klammail/cfgparser.c klamav-0.42-clamav093/src/klammail/cfgparser.c
2
--- src/klammail/cfgparser.c	2008-01-06 17:00:35.000000000 +0100
3
+++ klamav-0.42-clamav093/src/klammail/cfgparser.c	2008-03-28 07:00:26.000000000 +0100
4
@@ -63,10 +63,10 @@
5
 	    {"ScanOLE2", OPT_NOARG},
6
 	    {"ScanArchive", OPT_NOARG},
7
 	    {"ScanRAR", OPT_NOARG},
8
-	    {"ArchiveMaxFileSize", OPT_COMPSIZE},
9
-	    {"ArchiveMaxRecursion", OPT_NUM},
10
-	    {"ArchiveMaxFiles", OPT_NUM},
11
-	    {"ArchiveMaxCompressionRatio", OPT_NUM},
12
+	    {"MaxScanSize", OPT_COMPSIZE},
13
+	    {"MaxFileSize", OPT_COMPSIZE},
14
+	    {"MaxRecursion", OPT_NUM},
15
+	    {"MaxFiles", OPT_NUM},
16
 	    {"ArchiveLimitMemoryUsage", OPT_NOARG},
17
 	    {"ArchiveBlockEncrypted", OPT_NOARG},
18
 	    {"DataDirectory", OPT_STR}, /* obsolete */
19
diff -ur src/klammail/clamdmail.c klamav-0.42-clamav093/src/klammail/clamdmail.c
20
--- src/klammail/clamdmail.c	2008-01-06 17:00:35.000000000 +0100
21
+++ klamav-0.42-clamav093/src/klammail/clamdmail.c	2008-03-28 07:10:31.000000000 +0100
22
@@ -151,14 +151,14 @@
23
                 while((bytes = read(0, buff, BUFFSIZE)) > 0) {
24
 
25
                         if(write(fd, buff, bytes) != bytes) {
26
-                                cli_dbgmsg("clamdmail -> Can't write() file.\n");
27
+                                printf("clamdmail -> Can't write() file.\n");
28
                                 close(fd);
29
                                 return CL_EMEM;
30
                         }
31
                 }
32
 
33
                 if(fsync(fd) == -1) {
34
-                        cli_dbgmsg("fsync() failed for descriptor %d\n", fd);
35
+                        printf("fsync() failed for descriptor %d\n", fd);
36
                         close(fd);
37
                         return CL_EFSYNC;
38
                 }
39
@@ -202,13 +202,12 @@
40
                         /* set up archive limits */
41
                         memset(&limits, 0, sizeof(struct cl_limits));
42
                         limits.maxfiles = 1000; /* max files */
43
-                        limits.maxfilesize = 10 * 1048576; /* maximum size of archived/compressed
44
+                        limits.maxfilesize = 10 * 1048576; /* maximum size of
45
                                                             * file (files exceeding this limit
46
                                                             * will be ignored)
47
                                                             */
48
-                        limits.maxreclevel = 5; /* maximum recursion level for archives */
49
-                        limits.maxmailrec = 64; /* maximum recursion level for mail files */
50
-                        limits.maxratio = 200; /* maximum compression ratio */
51
+                        limits.maxreclevel = 5; /* maximum recursion level for archives and mail files */
52
+                        limits.maxscansize = 200 * limits.maxfilesize; /* maximum compression ratio */
53
 
54
                         ret = cl_scandesc(fd, &virname, &size, engine, &limits, CL_SCAN_STDOPT | CL_ARCHIVE | CL_MAIL | CL_OLE2 | CL_SCAN_HTML);
55
 
56
@@ -368,7 +367,7 @@
57
                                 while((bytes = read(fd, buff, BUFFSIZE)) > 0) {
58
         
59
                                         if(write(1, buff, bytes) != bytes) {
60
-                                        cli_dbgmsg("clamdmail -> Can't write() file.\n");
61
+                                        printf("clamdmail -> Can't write() file.\n");
62
                                                 close(fd);
63
                                                 return CL_EMEM;
64
                                         }
65
diff -ur src/scanviewer.cpp klamav-0.42-clamav093/src/scanviewer.cpp
66
--- src/scanviewer.cpp	2008-01-06 17:00:35.000000000 +0100
67
+++ klamav-0.42-clamav093/src/scanviewer.cpp	2008-03-28 07:00:26.000000000 +0100
68
@@ -393,18 +393,18 @@
69
         options += "--max-files=" + QString("%1").arg(KlamavConfig::noFilesToExtract()) + " ";
70
 
71
     if (KlamavConfig::mBsToExtract() > 0)
72
-        options += "--max-space=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";
73
+        options += "--max-filesize=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";
74
         
75
-    if (KlamavConfig::compressionRatio() > 0)
76
-        options += "--max-ratio=" + QString("%1").arg(KlamavConfig::compressionRatio()) + " ";
77
+    if (KlamavConfig::mBsToExtract() > 0 && KlamavConfig::compressionRatio() > 0)
78
+        options += "--max-scansize=" + QString("%1").arg(KlamavConfig::mBsToExtract() * KlamavConfig::compressionRatio()) + " ";
79
 
80
     if (KlamavConfig::recursionLevel() > 0)
81
         options += "--max-recursion=" + QString("%1").arg(KlamavConfig::recursionLevel()) + " ";
82
 
83
 
84
     //config->setGroup("Klamscan");
85
-    if (KlamavConfig::virusLimitsExceeded())
86
-        options += "--block-max ";
87
+//    if (KlamavConfig::virusLimitsExceeded())
88
+//        options += "--block-max ";
89
 
90
     if (KlamavConfig::virusEncrypted())
91
         options += "--block-encrypted ";
(-)klamav/files/patch-po (-12 / +23 lines)
Lines 5-17 Link Here
5
 "to gain real-time access to files. If you don't want this message to appear "
5
 "to gain real-time access to files. If you don't want this message to appear "
6
 "in future, put the following command in your initialization scripts: "
6
 "in future, put the following command in your initialization scripts: "
7
-"'modprobe dazuko.o'. You will next be asked for the root password."
7
-"'modprobe dazuko.o'. You will next be asked for the root password."
8
+"'kldload dazuko.ko'. You will next be asked for the root password."
8
+"'modprobe dazuko.ko'. You will next be asked for the root password."
9
 msgstr ""
9
 msgstr ""
10
 "KlamAV potřebuje nejprve zavést modul 'dazuko'. Tento modul KlamAVu umožní "
10
 "KlamAV potřebuje nejprve zavést modul 'dazuko'. Tento modul KlamAVu umožní "
11
 "přístup k souborům v reálném čase. Pokud nechcete, aby se tato zpráva v "
11
 "přístup k souborům v reálném čase. Pokud nechcete, aby se tato zpráva v "
12
 "budoucnu zobrazovala, přidejte následující řádek do vašeho init skriptu: "
12
 "budoucnu zobrazovala, přidejte následující řádek do vašeho init skriptu: "
13
-"'modprobe dazuko.o'. Nyní budete požádáni o heslo roota."
13
-"'modprobe dazuko.o'. Nyní budete požádáni o heslo roota."
14
+"'kldload dazuko.ko'. Nyní budete požádáni o heslo roota."
14
+"'kldload dazuko.o'. Nyní budete požádáni o heslo roota."
15
 
15
 
16
 #: klamd.cpp:734 klamd.cpp:735
16
 #: klamd.cpp:734 klamd.cpp:735
17
 msgid "Load Module"
17
 msgid "Load Module"
Lines 22-28 Link Here
22
 "to gain real-time access to files. If you don't want this message to appear "
22
 "to gain real-time access to files. If you don't want this message to appear "
23
 "in future, put the following command in your initialization scripts: "
23
 "in future, put the following command in your initialization scripts: "
24
-"'modprobe dazuko.o'. You will next be asked for the root password."
24
-"'modprobe dazuko.o'. You will next be asked for the root password."
25
+"'kldload dazuko.ko'. You will next be asked for the root password."
25
+"'modprobe dazuko.o'. You will next be asked for the root password."
26
 msgstr ""
26
 msgstr ""
27
 "Es muß das Modul mit dem Namen \"dazuko\" geladen werden. Dies ermöglicht "
27
 "Es muß das Modul mit dem Namen \"dazuko\" geladen werden. Dies ermöglicht "
28
 "einen verbesserten Zugriffn auf die Datein. Wenn sie nicht möchten, dass "
28
 "einen verbesserten Zugriffn auf die Datein. Wenn sie nicht möchten, dass "
Lines 33-45 Link Here
33
 "to gain real-time access to files. If you don't want this message to appear "
33
 "to gain real-time access to files. If you don't want this message to appear "
34
 "in future, put the following command in your initialization scripts: "
34
 "in future, put the following command in your initialization scripts: "
35
-"'modprobe dazuko.o'. You will next be asked for the root password."
35
-"'modprobe dazuko.o'. You will next be asked for the root password."
36
+"'kldload dazuko.ko'. You will next be asked for the root password."
36
+"'kldload dazuko.o'. You will next be asked for the root password."
37
 msgstr ""
37
 msgstr ""
38
 "Se necesita cargar un módulo llamado 'dazuko' primero. Este módulo le "
38
 "Se necesita cargar un módulo llamado 'dazuko' primero. Este módulo le "
39
 "permite a KlamAV acceso en tiempo real a los ficheros. Si no quiere que este "
39
 "permite a KlamAV acceso en tiempo real a los ficheros. Si no quiere que este "
40
 "mensaje aparezca en el futuro, ponga lo siguiente en los scripts de "
40
 "mensaje aparezca en el futuro, ponga lo siguiente en los scripts de "
41
-"inicialización: 'modprobe dazuko.o'. Necesita la clave de administrador."
41
-"inicialización: 'modprobe dazuko.o'. Necesita la clave de administrador."
42
+"inicialización: 'kldload dazuko.ko'. Necesita la clave de administrador."
42
+"inicialización: 'modprobe dazuko.ko'. Necesita la clave de administrador."
43
 
43
 
44
 #: klamd.cpp:734 klamd.cpp:735
44
 #: klamd.cpp:734 klamd.cpp:735
45
 msgid "Load Module"
45
 msgid "Load Module"
Lines 51-57 Link Here
51
 #: klamd.cpp:733
51
 #: klamd.cpp:733
52
-msgid "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."
52
-msgid "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."
53
-msgstr "Auparavant, KlamAV a besoin de charger un module appelé 'dazuko'. Ce module permettra un accès temps réel aux fichiers. Si vous ne voulez pas que ce message apparaisse dans le futur, mettez la commande suivante dans vos scripts d'initialisation: 'modprobe dazuko.o'. Il vous sera demander le mot de passe administrateur."
53
-msgstr "Auparavant, KlamAV a besoin de charger un module appelé 'dazuko'. Ce module permettra un accès temps réel aux fichiers. Si vous ne voulez pas que ce message apparaisse dans le futur, mettez la commande suivante dans vos scripts d'initialisation: 'modprobe dazuko.o'. Il vous sera demander le mot de passe administrateur."
54
+msgid "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."
54
+msgid "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."
55
+msgstr "Auparavant, KlamAV a besoin de charger un module appelé 'dazuko'. Ce module permettra un accès temps réel aux fichiers. Si vous ne voulez pas que ce message apparaisse dans le futur, mettez la commande suivante dans vos scripts d'initialisation: 'kldload dazuko.ko'. Il vous sera demander le mot de passe administrateur."
55
+msgstr "Auparavant, KlamAV a besoin de charger un module appelé 'dazuko'. Ce module permettra un accès temps réel aux fichiers. Si vous ne voulez pas que ce message apparaisse dans le futur, mettez la commande suivante dans vos scripts d'initialisation: 'kldload dazuko.ko'. Il vous sera demander le mot de passe administrateur."
56
 
56
 
57
 #: klamd.cpp:734
57
 #: klamd.cpp:734
Lines 63-69 Link Here
63
 "to gain real-time access to files. If you don't want this message to appear "
63
 "to gain real-time access to files. If you don't want this message to appear "
64
 "in future, put the following command in your initialization scripts: "
64
 "in future, put the following command in your initialization scripts: "
65
-"'modprobe dazuko.o'. You will next be asked for the root password."
65
-"'modprobe dazuko.o'. You will next be asked for the root password."
66
+"'kldload dazuko.ko'. You will next be asked for the root password."
66
+"'modprobe dazuko.o'. You will next be asked for the root password."
67
 msgstr ""
67
 msgstr ""
68
 "Először be kell tölteni a 'dazuko' nevű modult. Ez a modul teszi lehetővé a "
68
 "Először be kell tölteni a 'dazuko' nevű modult. Ez a modul teszi lehetővé a "
69
 "KlamAV számára a fájlok valós idejű elérését. Ha azt szeretné, hogy ez az "
69
 "KlamAV számára a fájlok valós idejű elérését. Ha azt szeretné, hogy ez az "
Lines 81-87 Link Here
81
 "in future, put the following command in your initialization scripts: "
81
 "in future, put the following command in your initialization scripts: "
82
-"'modprobe dazuko.o'. You will next be asked for the root password."
82
-"'modprobe dazuko.o'. You will next be asked for the root password."
83
-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."
83
-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."
84
+"'kldload dazuko.ko'. You will next be asked for the root password."
84
+"'modprobe dazuko.o'. You will next be asked for the root password."
85
+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."
85
+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."
86
 
86
 
87
 #: klamd.cpp:734 klamd.cpp:735
87
 #: klamd.cpp:734 klamd.cpp:735
Lines 93-99 Link Here
93
 "to gain real-time access to files. If you don't want this message to appear "
93
 "to gain real-time access to files. If you don't want this message to appear "
94
 "in future, put the following command in your initialization scripts: "
94
 "in future, put the following command in your initialization scripts: "
95
-"'modprobe dazuko.o'. You will next be asked for the root password."
95
-"'modprobe dazuko.o'. You will next be asked for the root password."
96
+"'kldload dazuko.ko'. You will next be asked for the root password."
96
+"'modprobe dazuko.o'. You will next be asked for the root password."
97
 msgstr ""
97
 msgstr ""
98
 "Konieczne jest załadowanie najpier modułu Dazuko. Moduł ten pozwoli "
98
 "Konieczne jest załadowanie najpier modułu Dazuko. Moduł ten pozwoli "
99
 "programowi KlamAV uzyskać dostęp do skanowania plików w czasie rzeczywistym. "
99
 "programowi KlamAV uzyskać dostęp do skanowania plików w czasie rzeczywistym. "
Lines 110-116 Link Here
110
 "to gain real-time access to files. If you don't want this message to appear "
110
 "to gain real-time access to files. If you don't want this message to appear "
111
 "in future, put the following command in your initialization scripts: "
111
 "in future, put the following command in your initialization scripts: "
112
-"'modprobe dazuko.o'. You will next be asked for the root password."
112
-"'modprobe dazuko.o'. You will next be asked for the root password."
113
+"'kldload dazuko.ko'. You will next be asked for the root password."
113
+"'modprobe dazuko.o'. You will next be asked for the root password."
114
 msgstr ""
114
 msgstr ""
115
 "Preciso carregar um módulo chamado 'dazuko' antes. Este módulo permitirá ao "
115
 "Preciso carregar um módulo chamado 'dazuko' antes. Este módulo permitirá ao "
116
 "KlamAV obter acesso em tempo real a arquivos. Se não desejar que esta "
116
 "KlamAV obter acesso em tempo real a arquivos. Se não desejar que esta "
Lines 127-133 Link Here
127
 "to gain real-time access to files. If you don't want this message to appear "
127
 "to gain real-time access to files. If you don't want this message to appear "
128
 "in future, put the following command in your initialization scripts: "
128
 "in future, put the following command in your initialization scripts: "
129
-"'modprobe dazuko.o'. You will next be asked for the root password."
129
-"'modprobe dazuko.o'. You will next be asked for the root password."
130
+"'kldload dazuko.ko'. You will next be asked for the root password."
130
+"'modprobe dazuko.o'. You will next be asked for the root password."
131
 msgstr ""
131
 msgstr ""
132
 "Необходимо запустить модуль, называемый dazuko. Этот модуль разрешит KlamAV "
132
 "Необходимо запустить модуль, называемый dazuko. Этот модуль разрешит KlamAV "
133
 "получать доступ в реальном времени к файлам. Далее Вас попросят ввести "
133
 "получать доступ в реальном времени к файлам. Далее Вас попросят ввести "
Lines 138-144 Link Here
138
 "to gain real-time access to files. If you don't want this message to appear "
138
 "to gain real-time access to files. If you don't want this message to appear "
139
 "in future, put the following command in your initialization scripts: "
139
 "in future, put the following command in your initialization scripts: "
140
-"'modprobe dazuko.o'. You will next be asked for the root password."
140
-"'modprobe dazuko.o'. You will next be asked for the root password."
141
+"'kldload dazuko.ko'. You will next be asked for the root password."
141
+"'modprobe dazuko.o'. You will next be asked for the root password."
142
 msgstr ""
142
 msgstr ""
143
 
143
 
144
 #: klamd.cpp:734 klamd.cpp:735
144
 #: klamd.cpp:734 klamd.cpp:735
145
--- po/tr.po	2008-05-09 15:45:18.000000000 -0300
146
+++ po/tr.po	2008-05-09 15:48:44.000000000 -0300
147
@@ -996,7 +996,7 @@
148
 msgstr ""
149
 "İlk önce 'dazuko' adlı bir modülü yüklemem gerekiyor. Bu modül KlamAV'ın "
150
 "dosyalara gerçek-zamanlı erşimini sağlar.Bu mesajın gelecekte görünmesini "
151
-"istemiyorsanız, şu komutu başlangıç betiklerinize ekleyin: 'modprobe dazuko."
152
+"istemiyorsanız, şu komutu başlangıç betiklerinize ekleyin: 'kldload dazuko.k"
153
 "o'. Daha sonra yetkili kullanıcı şifresi sorulacak."
154
 
155
 #: klamd.cpp:734 klamd.cpp:735
(-)klamav/pkg-plist (+1 lines)
Lines 13-18 Link Here
13
share/locale/ru/LC_MESSAGES/klamav.mo
13
share/locale/ru/LC_MESSAGES/klamav.mo
14
share/locale/pt_BR/LC_MESSAGES/klamav.mo
14
share/locale/pt_BR/LC_MESSAGES/klamav.mo
15
share/locale/fr/LC_MESSAGES/klamav.mo
15
share/locale/fr/LC_MESSAGES/klamav.mo
16
share/locale/tr/LC_MESSAGES/klamav.mo
16
share/locale/zh_CN/LC_MESSAGES/klamav.mo
17
share/locale/zh_CN/LC_MESSAGES/klamav.mo
17
bin/klamav
18
bin/klamav
18
share/apps/klamav/eventsrc
19
share/apps/klamav/eventsrc

Return to bug 123560