rpms/klamav/devel klamav-0.42-clamav093.patch,1.1,1.2

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/klamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27565/devel

Modified Files:
	klamav-0.42-clamav093.patch 
Log Message:
Additional patch: remove references to internal ClamAV function cli_dbgmsg which has been replaced by a macro. (Grrr, this shows that sources should really build with -Werror-implicit-function-declaration, that would have caught this API abuse.)

klamav-0.42-clamav093.patch:

Index: klamav-0.42-clamav093.patch
===================================================================
RCS file: /cvs/pkgs/rpms/klamav/devel/klamav-0.42-clamav093.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- klamav-0.42-clamav093.patch	28 Mar 2008 05:44:16 -0000	1.1
+++ klamav-0.42-clamav093.patch	28 Mar 2008 06:12:37 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur klamav-0.42/src/klammail/cfgparser.c klamav-0.42-clamav093/src/klammail/cfgparser.c
 --- klamav-0.42/src/klammail/cfgparser.c	2008-01-06 17:00:35.000000000 +0100
-+++ klamav-0.42-clamav093/src/klammail/cfgparser.c	2008-03-28 06:40:52.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},
@@ -18,7 +18,24 @@
  	    {"DataDirectory", OPT_STR}, /* obsolete */
 diff -ur klamav-0.42/src/klammail/clamdmail.c klamav-0.42-clamav093/src/klammail/clamdmail.c
 --- klamav-0.42/src/klammail/clamdmail.c	2008-01-06 17:00:35.000000000 +0100
-+++ klamav-0.42-clamav093/src/klammail/clamdmail.c	2008-03-28 06:20:55.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));
@@ -36,9 +53,18 @@
  
                          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 klamav-0.42/src/scanviewer.cpp klamav-0.42-clamav093/src/scanviewer.cpp
 --- klamav-0.42/src/scanviewer.cpp	2008-01-06 17:00:35.000000000 +0100
-+++ klamav-0.42-clamav093/src/scanviewer.cpp	2008-03-28 06:36:43.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()) + " ";