- Included in 0.66.

Changed files:
    clamav-oversize_zip.patch -> 1.2
    clamav-remote_dos_exploit.patch -> 1.3

diff --git a/clamav-oversize_zip.patch b/clamav-oversize_zip.patch
deleted file mode 100644 (file)
index 15f420c..0000000
--- a/clamav-oversize_zip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- clamav-0.65.orig/libclamav/scanners.c      2003-11-09 20:14:42.000000000 +0100
-+++ clamav-0.65/libclamav/scanners.c   2004-01-07 13:25:40.261486088 +0100
-@@ -61,7 +61,7 @@
- #define DELIVERED_MAGIC_STR "Delivered-To: "
- #define BZIP_MAGIC_STR "BZh"
- 
--#define ZIPOSDET 20 /* FIXME: Make it user definable */
-+#define ZIPOSDET 200 /* FIXME: Make it user definable */
- 
- int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev);
- 

diff --git a/clamav-remote_dos_exploit.patch b/clamav-remote_dos_exploit.patch
deleted file mode 100644 (file)
index 1627ca2..0000000
--- a/clamav-remote_dos_exploit.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- libclamav/message.c.orig   2003-11-05 11:59:53.000000000 +0100
-+++ libclamav/message.c        2004-02-10 19:11:14.728993368 +0100
-@@ -74,7 +74,7 @@
- 
- typedef enum { FALSE = 0, TRUE = 1 } bool;
- 
--static        unsigned char   *decodeLine(const message *m, const char *line, unsigned char *ptr);
-+static        unsigned char   *decodeLine(const message *m, const char *line, unsigned char *buf, size_t buflen);
- static unsigned char *decode(const char *in, unsigned char *out, unsigned char (*decoder)(char), bool isFast);
- static        unsigned        char    hex(char c);
- static        unsigned        char    base64(char c);
-@@ -273,7 +273,7 @@
- 
-       if(offset == m->numberOfArguments) {
-               m->numberOfArguments++;
--              m->mimeArguments = (char **)realloc(m->mimeArguments, m->numberOfArguments * sizeof(char *));
-+              m->mimeArguments = (char **)cli_realloc(m->mimeArguments, m->numberOfArguments * sizeof(char *));
-       }
- 
-       m->mimeArguments[offset] = strdup(arg);
-@@ -658,7 +658,7 @@
-                               if(strcasecmp(line, "end") == 0)
-                                       break;
- 
--                      uptr = decodeLine(m, line, data);
-+                      uptr = decodeLine(m, line, data, sizeof(data));
- 
-                       if(uptr == NULL)
-                               break;
-@@ -737,7 +737,7 @@
-                               if(strcasecmp(line, "end") == 0)
-                                       break;
- 
--                      uptr = decodeLine(m, line, data);
-+                      uptr = decodeLine(m, line, data, sizeof(data));
- 
-                       if(uptr == NULL)
-                               break;
-@@ -798,24 +798,24 @@
-  * to help appending callers. There is no new line at the end of "line"
-  */
- static unsigned char *
--decodeLine(const message *m, const char *line, unsigned char *ptr)
-+decodeLine(const message *m, const char *line, unsigned char *buf, size_t buflen)
- {
--      int len;
-+      size_t len;
-       bool softbreak;
-       char *p2;
-       char *copy;
- 
-       assert(m != NULL);
-       assert(line != NULL);
--      assert(ptr != NULL);
-+      assert(buf != NULL);
- 
-       switch(messageGetEncoding(m)) {
-               case NOENCODING:
-               case EIGHTBIT:
-               default:        /* unknown encoding type - try our best */
--                      ptr = (unsigned char *)strrcpy((char *)ptr, line);
-+                      buf = (unsigned char *)strrcpy((char *)buf, line);
-                       /* Put the new line back in */
--                      return (unsigned char *)strrcpy((char *)ptr, "\n");
-+                      return (unsigned char *)strrcpy((char *)buf, "\n");
- 
-               case QUOTEDPRINTABLE:
-                       softbreak = FALSE;
-@@ -836,20 +836,20 @@
-                                                * broken e-mail, not
-                                                * adhering to RFC1522
-                                                */
--                                              *ptr++ = byte;
-+                                              *buf++ = byte;
-                                               break;
-                                       }
- 
-                                       byte <<= 4;
-                                       byte += hex(*line);
--                                      *ptr++ = byte;
-+                                      *buf++ = byte;
-                               } else
--                                      *ptr++ = *line;
-+                                      *buf++ = *line;
-                               line++;
-                       }
-                       if(!softbreak)
-                               /* Put the new line back in */
--                              *ptr++ = '\n';
-+                              *buf++ = '\n';
-                       break;
- 
-               case BASE64:
-@@ -864,8 +864,8 @@
-                       /*
-                        * Klez doesn't always put "=" on the last line
-                        */
--                      /*ptr = decode(line, ptr, base64, p2 == NULL);*/
--                      ptr = decode(copy, ptr, base64, 0);
-+                      /*buf = decode(line, buf, base64, p2 == NULL);*/
-+                      buf = decode(copy, buf, base64, 0);
- 
-                       free(copy);
-                       break;
-@@ -878,15 +878,20 @@
-                       if(strcasecmp(line, "end") == 0)
-                               break;
- 
--                      assert(strlen(line) <= 62);
-                       if((line[0] & 0x3F) == ' ')
-                               break;
- 
-                       len = *line++ - ' ';
- 
--                      assert((len >= 0) && (len <= 63));
--
--                      ptr = decode(line, ptr, uudecode, (len & 3) == 0);
-+                      if(len > buflen)
-+                              /*
-+                              * In practice this should never occur since
-+                              * the maximum length of a uuencoded line is
-+                              * 62 characters
-+                              */
-+                              cli_warnmsg("uudecode: buffer overflow stopped, attempting to ignore but decoding may fail");
-+                      else
-+                              buf = decode(line, buf, uudecode, (len & 3) == 0);
-                       break;
- 
-               case BINARY:
-@@ -896,8 +901,8 @@
-                       break;
-       }
- 
--      *ptr = '\0';
--      return ptr;
-+      *buf = '\0';
-+      return buf;
- }
- 
- static unsigned char *