rpms/klamav/F-7 klamav-0.41.1-clam0.92.patch, NONE, 1.1 klamav-0.41.1-gcc43.patch, NONE, 1.1 klamav.spec, 1.6, 1.7

[Andy Shevchenko (andriy)]

Author: andriy

Update of /cvs/extras/rpms/klamav/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24906

Modified Files:
	klamav.spec 
Added Files:
	klamav-0.41.1-clam0.92.patch klamav-0.41.1-gcc43.patch 
Log Message:
rebuild for new clamav in the F-7 repo

klamav-0.41.1-clam0.92.patch:

--- NEW FILE klamav-0.41.1-clam0.92.patch ---
--- klamav-0.41.1/src/klamd/scanner.c.0.92	2007-07-24 22:51:54.000000000 +0300
+++ klamav-0.41.1/src/klamd/scanner.c	2007-12-22 20:28:31.000000000 +0200
@@ -54,6 +54,9 @@
 #include <clamav.h>
 //#include "libclamav/others.h"
 
+/* klamav uses internal function */
+extern int cli_gentempfd(const char *dir, char **name, int *fd);
+
 #include "cfgparser.h"
 #include "memory.h"
 #include "output.h"
@@ -396,7 +399,7 @@ int scanstream(int odesc, unsigned long 
 
     logg("*Accepted connection on port %d, fd %d\n", port, acceptd);
 
-    if ((tmpname = cli_gentempdesc(NULL, &tmpd)) == NULL) {
+    if (cli_gentempfd(NULL, &tmpname, &tmpd) != CL_SUCCESS) {
 	shutdown(sockfd, 2);
 	close(sockfd);
 	close(acceptd);

klamav-0.41.1-gcc43.patch:

--- NEW FILE klamav-0.41.1-gcc43.patch ---
--- klamav-0.41.1/src/ktview.cpp.gcc43	2007-07-24 22:51:54.000000000 +0300
+++ klamav-0.41.1/src/ktview.cpp	2008-01-05 11:43:59.000000000 +0200
@@ -20,6 +20,7 @@
 // #include <strstream.h>
 // #endif
 
+#include <stdlib.h>     // system
 
 #include <qfileinfo.h>
 
--- klamav-0.41.1/src/ctcron.cpp.gcc43	2007-07-24 22:51:54.000000000 +0300
+++ klamav-0.41.1/src/ctcron.cpp	2008-01-05 11:41:21.000000000 +0200
@@ -18,6 +18,7 @@
 #include "ctvariable.h"
 #include <pwd.h>         // pwd, getpwnam(), getpwuid()
 #include <assert.h>
+#include <stdlib.h>      // system
 
 #include <qfile.h>
 
--- klamav-0.41.1/src/ctunit.cpp.gcc43	2007-07-24 22:51:54.000000000 +0300
+++ klamav-0.41.1/src/ctunit.cpp	2008-01-05 11:40:15.000000000 +0200
@@ -17,6 +17,7 @@
 #include <string>
 #include <stdio.h>    // sprintf
 #include <ctype.h>    // tolower
+#include <stdlib.h>   // atoi
 
 using namespace std;
 


Index: klamav.spec
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-7/klamav.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- klamav.spec	10 Jan 2008 15:47:38 -0000	1.6
+++ klamav.spec	11 Jan 2008 18:24:44 -0000	1.7
@@ -1,13 +1,15 @@
 Summary: Clam Anti-Virus on the KDE Desktop
 Name: klamav
 Version: 0.41.1
-Release: 6%{?dist}.2
+Release: 14%{?dist}
 Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2
 Patch0: klamav-suse-clamav-path.diff
 Patch1: klamav-0.41.1-open-mode.patch
 Patch2: klamav-0.41.1-no-sqlite.patch
 Patch3: klamav-0.41.1-pwd-echo.patch
-Patch4: klamav-0.41.1-maximum.patch
+Patch4: klamav-0.41.1-clam0.92.patch
+Patch5: klamav-0.41.1-gcc43.patch
+Patch6: klamav-0.41.1-maximum.patch
 URL: http://klamav.sourceforge.net
 Group: Applications/System
 License: GPLv2+
@@ -34,6 +36,8 @@
 %patch1 -p1 -b .open-mode
 %patch2 -p1 -b .no-sqlite
 %patch3 -p1 -b .pwd-echo
+%patch4 -p1 -b .clam0.92
+%patch5 -p1 -b .gcc43
 
 %build
 %configure --disable-rpath --without-included-sqlite
@@ -41,7 +45,7 @@
 # Use this trick to patch generated files
 make -C src klamavconfig.cpp
 # Don't use patch macro here
-patch -p1 -b --suffix=.maximum < %{PATCH4}
+patch -p1 -b --suffix=.maximum < %{PATCH6}
 
 make %{?_smp_mflags}
 
@@ -95,11 +99,17 @@
 %{_datadir}/icons/*/*x*/apps/klamav.png
 
 %changelog
-* Thu Jan 10 2008 Andy Shevchenko <andy at smile.org.ua> 0.41.1-6.2
+* Thu Jan 10 2008 Andy Shevchenko <andy at smile.org.ua> 0.41.1-14
 - inherit archive limit defaults and pass their to the clamav
   even if they are equal to zero (#428066)
 
-* Sun Dec 02 2007 Andy Shevchenko <andy at smile.org.ua> 0.41.1-6.1
+* Sat Jan 05 2008 Andy Shevchenko <andy at smile.org.ua> 0.41.1-10
+- fix compilation with gcc 4.3
+
+* Sat Dec 22 2007 Andy Shevchenko <andy at smile.org.ua> 0.41.1-9
+- rebuild against new clamav
+
+* Sun Dec 02 2007 Andy Shevchenko <andy at smile.org.ua> 0.41.1-7
 - build with kdelibs3-devel
   (http://www.redhat.com/archives/fedora-devel-announce/2007-November/msg00005.html)