rpms/klamav/F-8 klamav-0.41.1-clam0.92.patch, NONE, 1.1 klamav.spec, 1.9, 1.10

[Andy Shevchenko (andriy)]

Author: andriy

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

Modified Files:
	klamav.spec 
Added Files:
	klamav-0.41.1-clam0.92.patch 
Log Message:
REbuild with new clamav

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);


Index: klamav.spec
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-8/klamav.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- klamav.spec	7 Nov 2007 15:13:14 -0000	1.9
+++ klamav.spec	25 Dec 2007 21:42:29 -0000	1.10
@@ -1,19 +1,24 @@
 Summary: Clam Anti-Virus on the KDE Desktop
 Name: klamav
 Version: 0.41.1
-Release: 6%{?dist}
+Release: 9%{?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-clam0.92.patch
 URL: http://klamav.sourceforge.net
 Group: Applications/System
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: clamav >= 0.90
 Requires: clamav-update >= 0.90
+%if 0%{?fedora} >= 7
+BuildRequires: kdelibs3-devel >= 3.5.2
+%else
 BuildRequires: kdelibs-devel >= 3.5.2
+%endif
 BuildRequires: clamav-devel >= 0.90
 BuildRequires: curl-devel
 BuildRequires: gmp-devel
@@ -29,6 +34,7 @@
 %patch1 -p1 -b .open-mode
 %patch2 -p1 -b .no-sqlite
 %patch3 -p1 -b .pwd-echo
+%patch4 -p1 -b .clam0.92
 
 %build
 %configure --disable-rpath --without-included-sqlite
@@ -84,6 +90,13 @@
 %{_datadir}/icons/*/*x*/apps/klamav.png
 
 %changelog
+* 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)
+
 * Wed Nov 07 2007 Andy Shevchenko <andy at smile.org.ua> 0.41.1-6
 - do not build internal sqlite
 - set special echo mode for password field (#362061)