Attachment 87018 Details for Bug 123560 – klamav.patch

[patch] klamav.patch

klamav.patch (text/plain), 14.90 KB, created by Anderson S. Ferreira on 2008-05-09 20:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anderson S. Ferreira

Created: 2008-05-09 20:10:01 UTC

Size: 14.90 KB

patch

obsolete

>diff -Nru klamav/Makefile klamav/Makefile
>--- klamav/Makefile	2008-04-18 07:53:58.000000000 -0300
>+++ klamav/Makefile	2008-05-09 15:15:17.000000000 -0300
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	klamav
>-PORTVERSION=	0.42
>-PORTREVISION=	3
>+PORTVERSION=	0.43
> CATEGORIES=	security
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	klamav
>diff -Nru klamav/distinfo klamav/distinfo
>--- klamav/distinfo	2008-03-14 13:54:43.000000000 -0300
>+++ klamav/distinfo	2008-05-09 15:27:50.000000000 -0300
>@@ -1,3 +1,4 @@
>-SIZE (klamav-0.42-source.tar.gz) = 1920149
>-MD5 (klamav-0.42-source.tar.gz) = 4cf95f5e9d8a215f2cd2c312612811f6
>-SHA256 (klamav-0.42-source.tar.gz) = 3dd03c802a24d0fe033bdd7f27ec77b2fd5c9aedf18ebec30cee801e36966ca7
>+SIZE (klamav-0.43-source.tar.gz) = 2029200
>+MD5 (klamav-0.43-source.tar.gz) = 1422e0649626f4ea20b46fc0b0bcf1d7
>+SHA256 (klamav-0.43-source.tar.gz) = de92736c18b47da69ffef17747f16c105d8772b2369026f82c2cec000c00a13e
>+
>diff -Nru klamav/files/patch-clamav-0.93 klamav/files/patch-clamav-0.93
>--- klamav/files/patch-clamav-0.93	2008-04-16 19:54:15.000000000 -0300
>+++ klamav/files/patch-clamav-0.93	1969-12-31 21:00:00.000000000 -0300
>@@ -1,91 +0,0 @@
>-diff -ur src/klammail/cfgparser.c klamav-0.42-clamav093/src/klammail/cfgparser.c
>---- src/klammail/cfgparser.c	2008-01-06 17:00:35.000000000 +0100
>-+++ klamav-0.42-clamav093/src/klammail/cfgparser.c	2008-03-28 07:00:26.000000000 +0100
>-@@ -63,10 +63,10 @@
>- 	    {"ScanOLE2", OPT_NOARG},
>- 	    {"ScanArchive", OPT_NOARG},
>- 	    {"ScanRAR", OPT_NOARG},
>--	    {"ArchiveMaxFileSize", OPT_COMPSIZE},
>--	    {"ArchiveMaxRecursion", OPT_NUM},
>--	    {"ArchiveMaxFiles", OPT_NUM},
>--	    {"ArchiveMaxCompressionRatio", OPT_NUM},
>-+	    {"MaxScanSize", OPT_COMPSIZE},
>-+	    {"MaxFileSize", OPT_COMPSIZE},
>-+	    {"MaxRecursion", OPT_NUM},
>-+	    {"MaxFiles", OPT_NUM},
>- 	    {"ArchiveLimitMemoryUsage", OPT_NOARG},
>- 	    {"ArchiveBlockEncrypted", OPT_NOARG},
>- 	    {"DataDirectory", OPT_STR}, /* obsolete */
>-diff -ur src/klammail/clamdmail.c klamav-0.42-clamav093/src/klammail/clamdmail.c
>---- src/klammail/clamdmail.c	2008-01-06 17:00:35.000000000 +0100
>-+++ klamav-0.42-clamav093/src/klammail/clamdmail.c	2008-03-28 07:10:31.000000000 +0100
>-@@ -151,14 +151,14 @@
>-                 while((bytes = read(0, buff, BUFFSIZE)) > 0) {
>- 
>-                         if(write(fd, buff, bytes) != bytes) {
>--                                cli_dbgmsg("clamdmail -> Can't write() file.\n");
>-+                                printf("clamdmail -> Can't write() file.\n");
>-                                 close(fd);
>-                                 return CL_EMEM;
>-                         }
>-                 }
>- 
>-                 if(fsync(fd) == -1) {
>--                        cli_dbgmsg("fsync() failed for descriptor %d\n", fd);
>-+                        printf("fsync() failed for descriptor %d\n", fd);
>-                         close(fd);
>-                         return CL_EFSYNC;
>-                 }
>-@@ -202,13 +202,12 @@
>-                         /* set up archive limits */
>-                         memset(&limits, 0, sizeof(struct cl_limits));
>-                         limits.maxfiles = 1000; /* max files */
>--                        limits.maxfilesize = 10 * 1048576; /* maximum size of archived/compressed
>-+                        limits.maxfilesize = 10 * 1048576; /* maximum size of
>-                                                             * file (files exceeding this limit
>-                                                             * will be ignored)
>-                                                             */
>--                        limits.maxreclevel = 5; /* maximum recursion level for archives */
>--                        limits.maxmailrec = 64; /* maximum recursion level for mail files */
>--                        limits.maxratio = 200; /* maximum compression ratio */
>-+                        limits.maxreclevel = 5; /* maximum recursion level for archives and mail files */
>-+                        limits.maxscansize = 200 * limits.maxfilesize; /* maximum compression ratio */
>- 
>-                         ret = cl_scandesc(fd, &virname, &size, engine, &limits, CL_SCAN_STDOPT | CL_ARCHIVE | CL_MAIL | CL_OLE2 | CL_SCAN_HTML);
>- 
>-@@ -368,7 +367,7 @@
>-                                 while((bytes = read(fd, buff, BUFFSIZE)) > 0) {
>-         
>-                                         if(write(1, buff, bytes) != bytes) {
>--                                        cli_dbgmsg("clamdmail -> Can't write() file.\n");
>-+                                        printf("clamdmail -> Can't write() file.\n");
>-                                                 close(fd);
>-                                                 return CL_EMEM;
>-                                         }
>-diff -ur src/scanviewer.cpp klamav-0.42-clamav093/src/scanviewer.cpp
>---- src/scanviewer.cpp	2008-01-06 17:00:35.000000000 +0100
>-+++ klamav-0.42-clamav093/src/scanviewer.cpp	2008-03-28 07:00:26.000000000 +0100
>-@@ -393,18 +393,18 @@
>-         options += "--max-files=" + QString("%1").arg(KlamavConfig::noFilesToExtract()) + " ";
>- 
>-     if (KlamavConfig::mBsToExtract() > 0)
>--        options += "--max-space=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";
>-+        options += "--max-filesize=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";
>-         
>--    if (KlamavConfig::compressionRatio() > 0)
>--        options += "--max-ratio=" + QString("%1").arg(KlamavConfig::compressionRatio()) + " ";
>-+    if (KlamavConfig::mBsToExtract() > 0 && KlamavConfig::compressionRatio() > 0)
>-+        options += "--max-scansize=" + QString("%1").arg(KlamavConfig::mBsToExtract() * KlamavConfig::compressionRatio()) + " ";
>- 
>-     if (KlamavConfig::recursionLevel() > 0)
>-         options += "--max-recursion=" + QString("%1").arg(KlamavConfig::recursionLevel()) + " ";
>- 
>- 
>-     //config->setGroup("Klamscan");
>--    if (KlamavConfig::virusLimitsExceeded())
>--        options += "--block-max ";
>-+//    if (KlamavConfig::virusLimitsExceeded())
>-+//        options += "--block-max ";
>- 
>-     if (KlamavConfig::virusEncrypted())
>-         options += "--block-encrypted ";
>diff -Nru klamav/files/patch-po klamav/files/patch-po
>--- klamav/files/patch-po	2008-03-14 13:54:43.000000000 -0300
>+++ klamav/files/patch-po	2008-05-09 15:55:24.000000000 -0300
>@@ -5,13 +5,13 @@
>  "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."
>-+"'kldload dazuko.ko'. You will next be asked for the root password."
>++"'modprobe dazuko.ko'. You will next be asked for the root password."
>  msgstr ""
>  "KlamAV potÅebuje nejprve zavÃ©st modul 'dazuko'. Tento modul KlamAVu umoÅ¾nÃ "
>  "pÅÃstup k souborÅ¯m v reÃ¡lnÃ©m Äase. Pokud nechcete, aby se tato zprÃ¡va v "
>  "budoucnu zobrazovala, pÅidejte nÃ¡sledujÃcÃ ÅÃ¡dek do vaÅ¡eho init skriptu: "
> -"'modprobe dazuko.o'. NynÃ budete poÅ¾Ã¡dÃ¡ni o heslo roota."
>-+"'kldload dazuko.ko'. NynÃ budete poÅ¾Ã¡dÃ¡ni o heslo roota."
>++"'kldload dazuko.o'. NynÃ budete poÅ¾Ã¡dÃ¡ni o heslo roota."
>  
>  #: klamd.cpp:734 klamd.cpp:735
>  msgid "Load Module"
>@@ -22,7 +22,7 @@
>  "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."
>-+"'kldload dazuko.ko'. You will next be asked for the root password."
>++"'modprobe dazuko.o'. You will next be asked for the root password."
>  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 "
>@@ -33,13 +33,13 @@
>  "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."
>-+"'kldload dazuko.ko'. You will next be asked for the root password."
>++"'kldload dazuko.o'. You will next be asked for the root password."
>  msgstr ""
>  "Se necesita cargar un mÃ³dulo llamado 'dazuko' primero. Este mÃ³dulo le "
>  "permite a KlamAV acceso en tiempo real a los ficheros. Si no quiere que este "
>  "mensaje aparezca en el futuro, ponga lo siguiente en los scripts de "
> -"inicializaciÃ³n: 'modprobe dazuko.o'. Necesita la clave de administrador."
>-+"inicializaciÃ³n: 'kldload dazuko.ko'. Necesita la clave de administrador."
>++"inicializaciÃ³n: 'modprobe dazuko.ko'. Necesita la clave de administrador."
>  
>  #: klamd.cpp:734 klamd.cpp:735
>  msgid "Load Module"
>@@ -51,7 +51,7 @@
>  #: klamd.cpp:733
> -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."
> -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."
>-+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."
>++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."
> +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."
>  
>  #: klamd.cpp:734
>@@ -63,7 +63,7 @@
>  "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."
>-+"'kldload dazuko.ko'. You will next be asked for the root password."
>++"'modprobe dazuko.o'. You will next be asked for the root password."
>  msgstr ""
>  "ElÅszÃ¶r be kell tÃ¶lteni a 'dazuko' nevÅ± modult. Ez a modul teszi lehetÅvÃ© a "
>  "KlamAV szÃ¡mÃ¡ra a fÃ¡jlok valÃ³s idejÅ± elÃ©rÃ©sÃ©t. Ha azt szeretnÃ©, hogy ez az "
>@@ -81,7 +81,7 @@
>  "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."
>++"'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: 'kldload dazuko.ko'. Per compiere questa azione ti verrÃ  chiesta la password di amministratore."
>  
>  #: klamd.cpp:734 klamd.cpp:735
>@@ -93,7 +93,7 @@
>  "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."
>-+"'kldload dazuko.ko'. You will next be asked for the root password."
>++"'modprobe dazuko.o'. You will next be asked for the root password."
>  msgstr ""
>  "Konieczne jest zaÅadowanie najpier moduÅu Dazuko. ModuÅ ten pozwoli "
>  "programowi KlamAV uzyskaÄ dostÄp do skanowania plikÃ³w w czasie rzeczywistym. "
>@@ -110,7 +110,7 @@
>  "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."
>-+"'kldload dazuko.ko'. You will next be asked for the root password."
>++"'modprobe dazuko.o'. You will next be asked for the root password."
>  msgstr ""
>  "Preciso carregar um mÃ³dulo chamado 'dazuko' antes. Este mÃ³dulo permitirÃ¡ ao "
>  "KlamAV obter acesso em tempo real a arquivos. Se nÃ£o desejar que esta "
>@@ -127,7 +127,7 @@
>  "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."
>-+"'kldload dazuko.ko'. You will next be asked for the root password."
>++"'modprobe dazuko.o'. You will next be asked for the root password."
>  msgstr ""
>  "ÐÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ð¼Ð¾Ð´ÑÐ»Ñ, Ð½Ð°Ð·ÑÐ²Ð°ÐµÐ¼ÑÐ¹ dazuko. ÐÑÐ¾Ñ Ð¼Ð¾Ð´ÑÐ»Ñ ÑÐ°Ð·ÑÐµÑÐ¸Ñ KlamAV "
>  "Ð¿Ð¾Ð»ÑÑÐ°ÑÑ Ð´Ð¾ÑÑÑÐ¿ Ð² ÑÐµÐ°Ð»ÑÐ½Ð¾Ð¼ Ð²ÑÐµÐ¼ÐµÐ½Ð¸ Ðº ÑÐ°Ð¹Ð»Ð°Ð¼. ÐÐ°Ð»ÐµÐµ ÐÐ°Ñ Ð¿Ð¾Ð¿ÑÐ¾ÑÑÑ Ð²Ð²ÐµÑÑÐ¸ "
>@@ -138,7 +138,18 @@
>  "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."
>-+"'kldload dazuko.ko'. You will next be asked for the root password."
>++"'modprobe dazuko.o'. You will next be asked for the root password."
>  msgstr ""
>  
>  #: klamd.cpp:734 klamd.cpp:735
>+--- po/tr.po	2008-05-09 15:45:18.000000000 -0300
>++++ po/tr.po	2008-05-09 15:48:44.000000000 -0300
>+@@ -996,7 +996,7 @@
>+ msgstr ""
>+ "Ä°lk Ã¶nce 'dazuko' adlÄ± bir modÃ¼lÃ¼ yÃ¼klemem gerekiyor. Bu modÃ¼l KlamAV'Ä±n "
>+ "dosyalara gerÃ§ek-zamanlÄ± erÅimini saÄlar.Bu mesajÄ±n gelecekte gÃ¶rÃ¼nmesini "
>+-"istemiyorsanÄ±z, Åu komutu baÅlangÄ±Ã§ betiklerinize ekleyin: 'modprobe dazuko."
>++"istemiyorsanÄ±z, Åu komutu baÅlangÄ±Ã§ betiklerinize ekleyin: 'kldload dazuko.k"
>+ "o'. Daha sonra yetkili kullanÄ±cÄ± Åifresi sorulacak."
>+ 
>+ #: klamd.cpp:734 klamd.cpp:735
>diff -Nru klamav/pkg-plist klamav/pkg-plist
>--- klamav/pkg-plist	2008-03-14 13:54:43.000000000 -0300
>+++ klamav/pkg-plist	2008-05-09 15:58:01.000000000 -0300
>@@ -13,6 +13,7 @@
> share/locale/ru/LC_MESSAGES/klamav.mo
> share/locale/pt_BR/LC_MESSAGES/klamav.mo
> share/locale/fr/LC_MESSAGES/klamav.mo
>+share/locale/tr/LC_MESSAGES/klamav.mo
> share/locale/zh_CN/LC_MESSAGES/klamav.mo
> bin/klamav
> share/apps/klamav/eventsrc

Actions: View | Diff

Attachments on bug 123560: 87018