From 8b53b5cb0646225d00a188a23c741585a72c9449 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Jul 14 2008 10:33:58 +0000
Subject: - Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch:

- CVE-2008-2713 Out-of-bounds read on petite files
- Put pid instead of pgrp into pid file of clamav-milter (#452359)

---

diff --git a/.cvsignore b/.cvsignore
index 48c3a65..a51ec3e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-clamav-0.93.1-norar.tar.bz2
+clamav-0.93.3-norar.tar.bz2
diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch
deleted file mode 100644
index db4e000..0000000
--- a/clamav-0.80-initoff.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff	2004-02-10 23:44:49.000000000 +0100
-+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter	2004-02-10 23:45:28.000000000 +0100
-@@ -2,7 +2,7 @@
- #
- # clamav-milter This script starts and stops the clamav-milter daemon
- #
--# chkconfig: 2345 79 40
-+# chkconfig: - 79 40
- #
- # description: clamav-milter is a daemon which hooks into sendmail and routes
- #              email messages to clamav
diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch
new file mode 100644
index 0000000..899d32b
--- /dev/null
+++ b/clamav-0.93.3-initoff.patch
@@ -0,0 +1,11 @@
+--- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff
++++ clamav-0.93.3/contrib/init/RedHat/clamav-milter
+@@ -2,7 +2,7 @@
+ #
+ # clamav-milter This script starts and stops the clamav-milter daemon
+ #
+-# chkconfig: 2345 79 40
++# chkconfig: - 79 40
+ #
+ # description: clamav-milter is a daemon which hooks into sendmail and routes \
+ #              email messages for virus scanning with ClamAV
diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch
new file mode 100644
index 0000000..de29887
--- /dev/null
+++ b/clamav-0.93.3-pid.patch
@@ -0,0 +1,17 @@
+Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora
+initscripts do not support killing of whole processgroups. Hence, disable
+feature which posts negative pgrp into pidfile and use plain pid instead
+of.
+
+diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c
+--- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~	2008-07-07 20:02:10.000000000 +0200
++++ clamav-0.93.3/clamav-milter/clamav-milter.c	2008-07-13 20:15:12.000000000 +0200
+@@ -1985,7 +1985,7 @@ main(int argc, char **argv)
+ 			logg(_("!Can't save PID in file %s\n"), pidfile);
+ 			return EX_CONFIG;
+ 		}
+-#ifdef	C_LINUX
++#if defined(C_LINUX) && 0
+ 		/* Ensure that all threads are kill()ed */
+ 		fprintf(fd, "-%d\n", (int)getpgrp());
+ #else
diff --git a/clamav.spec b/clamav.spec
index 63c2e94..b8e0390 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -1,5 +1,3 @@
-## $Id: clamav.spec,v 1.35 2008/04/14 20:31:25 robert Exp $
-
 ## Fedora Extras specific customization below...
 # %bcond_without       fedora
 ##
@@ -15,7 +13,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.93.1
+Version:	0.93.3
 Release:	1%{?dist}
 
 License:	GPLv2
@@ -37,9 +35,10 @@ Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
 Patch21:	clamav-0.93.1-path.patch
-Patch22:	clamav-0.80-initoff.patch
+Patch22:	clamav-0.93.3-initoff.patch
 Patch24:	clamav-0.90rc3-private.patch
 Patch25:	clamav-0.92-open.patch
+Patch26:	clamav-0.93.3-pid.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	clamav-lib = %version-%release
 Requires:	data(clamav)
@@ -230,6 +229,7 @@ The SysV initscripts for clamav-milter.
 %patch22 -p1 -b .initoff
 %patch24 -p1 -b .private
 %patch25 -p1 -b .open
+%patch26 -p1 -b .pid
 
 mkdir -p libclamunrar{,_iface}
 touch libclamunrar/{Makefile.in,all,install}
@@ -501,8 +501,13 @@ test "$1"  = 0 || %_initrddir/clamav-milter condrestart >/dev/null || :
 
 
 %changelog
+* Mon Jul 14 2008 Robert Scheck <robert@fedoraproject.org> - 0.93.3-1
+- Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch:
+- CVE-2008-2713 Out-of-bounds read on petite files
+- Put pid instead of pgrp into pid file of clamav-milter (#452359)
+
 * Wed Jun 18 2008 Robert Scheck <robert@fedoraproject.org> - 0.93.1-1
-- Upgrade to 0.93.1, rediffed -path patch
+- Upgrade to 0.93.1 (SECURITY), rediffed -path patch:
 - CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability
 
 * Mon Apr 14 2008 Robert Scheck <robert@fedoraproject.org> - 0.93-1
diff --git a/sources b/sources
index 3875ac9..7ccec62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9eca40bd39cc049b3b2b424879fa06e  clamav-0.93.1-norar.tar.bz2
+53d288ddafd9cc198eeb69ffe8c83d02  clamav-0.93.3-norar.tar.bz2