From 3b235f601b32b34a5b41b7b0897d2b37fe4faeb3 Mon Sep 17 00:00:00 2001
From: ensc <ensc@fedoraproject.org>
Date: Feb 03 2007 15:15:39 +0000
Subject: updated to 0.90rc3; these patches don't apply anymore


---

diff --git a/clamav-0.70-user.patch b/clamav-0.70-user.patch
deleted file mode 100644
index f7f42b1..0000000
--- a/clamav-0.70-user.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.user	2000-02-19 07:04:00.000000000 +0100
-+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter	2003-06-26 14:35:01.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # clamav-milter This script starts and stops the clamav-milter daemon
- #
-@@ -16,6 +16,7 @@
- 
- # Local clamav-milter config
- CLAMAV_FLAGS=
-+CLAMAV_USER=
- test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter
- 
- # Check that networking is up.
-@@ -28,7 +29,7 @@
- 
- start() {
-         echo -n "Starting clamav-milter: "
--        daemon clamav-milter ${CLAMAV_FLAGS}
-+        daemon ${CLAMAV_USER:+--user $CLAMAV_USER} setsid /usr/sbin/clamav-milter ${CLAMAV_FLAGS} </dev/null
-         RETVAL=$?
-         echo
- 	test $RETVAL -eq 0 && touch /var/lock/subsys/clamav-milter
diff --git a/clamav-0.88.1-strncpy.patch b/clamav-0.88.1-strncpy.patch
deleted file mode 100644
index ceceb7d..0000000
--- a/clamav-0.88.1-strncpy.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-2006-04-24  Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
-
-	* libclamav/unrarlib.c/stricomp(): terminate the string copied
-	  with strncpy() explicitly with '\0'. Does not seem to be
-	  exploitable at the moment due to deeply buried constraints
-	  (function will be called for buffers with a static size of
-	  260 only).
-
-	  But it is better to fix it now than to run into problems
-	  when function is used for other purposes.
-
---- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
-+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
-@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
-   char S1[512],S2[512];
-   char *chptr;
- 
--  strncpy(S1,Str1,sizeof(S1));
--  strncpy(S2,Str2,sizeof(S2));
-+  strncpy(S1,Str1,sizeof(S1));
-+  strncpy(S2,Str2,sizeof(S2));
-+  S1[sizeof(S1)-1] = '\0';
-+  S2[sizeof(S2)-1] = '\0';
- 
-   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
-   {
diff --git a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
deleted file mode 100644
index 38f9d9d..0000000
--- a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- clamav-0.88.2/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch	2006-04-29 19:46:09.000000000 +0200
-+++ clamav-0.88.2/libclamav/pe.c	2006-04-30 11:25:53.000000000 +0200
-@@ -1555,7 +1555,7 @@ int cli_peheader(int desc, struct cli_pe
- {
- 	uint16_t e_magic; /* DOS signature ("MZ") */
- 	uint32_t e_lfanew; /* address of new exe header */
--	uint32_t min, max;
-+	uint32_t min=0, max=0;
- 	struct pe_image_file_hdr file_hdr;
- 	struct pe_image_optional_hdr optional_hdr;
- 	struct pe_image_section_hdr *section_hdr;
---- clamav-0.88.2/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch	2006-03-22 19:03:35.000000000 +0100
-+++ clamav-0.88.2/libclamav/htmlnorm.c	2006-04-30 11:25:53.000000000 +0200
-@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_
- {
- 	int fd_tmp, tag_length, tag_arg_length, binary;
- 	int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE;
--	FILE *stream_in;
-+	FILE *stream_in = 0;
- 	html_state state=HTML_NORM, next_state=HTML_BAD_STATE;
- 	char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1];
- 	char tag_val[HTML_STR_LENGTH+1], *tmp_file;