Cleanup

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64)

5 files changed, 0 insertions, 181 deletions

diff --git a/app-antivirus/clamav/files/clamav-0.90-compat.patch b/app-antivirus/clamav/files/clamav-0.90-compat.patch
deleted file mode 100644
index 601e2df9a169..000000000000
--- a/app-antivirus/clamav/files/clamav-0.90-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -bur clamav-0.90.orig/libclamav/clamav.h clamav-0.90/libclamav/clamav.h
---- clamav-0.90.orig/libclamav/clamav.h	2007-02-25 11:56:29.000000000 +0100
-+++ clamav-0.90/libclamav/clamav.h	2007-02-25 11:57:42.000000000 +0100
-@@ -234,6 +234,7 @@
- /* database handling */
- extern int cl_load(const char *path, struct cl_engine **engine, unsigned int *signo, unsigned int options);
- extern const char *cl_retdbdir(void);
-+extern int cl_loaddbdir(const char *dirname, struct cl_engine **engine, unsigned int *signo);
- 
- /* engine handling */
- extern int cl_build(struct cl_engine *engine);
diff --git a/app-antivirus/clamav/files/clamav-0.90-nls.patch b/app-antivirus/clamav/files/clamav-0.90-nls.patch
deleted file mode 100644
index 7349f32ea20b..000000000000
--- a/app-antivirus/clamav/files/clamav-0.90-nls.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -bur clamav-0.90.2/clamav-milter/clamav-milter.c clamav-0.90.2-nls/clamav-milter/clamav-milter.c
---- clamav-0.90.2/clamav-milter/clamav-milter.c	2007-04-12 18:35:17.000000000 +0200
-+++ clamav-0.90.2-nls/clamav-milter/clamav-milter.c	2007-04-16 15:33:40.000000000 +0200
-@@ -110,6 +110,7 @@
- 
- #ifdef	C_LINUX
- #include <sys/sendfile.h>	/* FIXME: use sendfile on BSD not Linux */
-+#ifdef	ENABLE_NLS
- #include <libintl.h>
- #include <locale.h>
- 
-@@ -122,7 +123,8 @@
- #define	_(s)	s
- #define	N_(s)	s
- 
--#endif
-+#endif /* ENABLE_NLS */
-+#endif /* C_LINUX */
- 
- #ifdef	USE_SYSLOG
- #include <syslog.h>
-@@ -664,7 +666,7 @@
- 	else
- 		progname = "clamav-milter";
- 
--#ifdef	C_LINUX
-+#ifdef	ENABLE_NLS
- 	setlocale(LC_ALL, "");
- 	bindtextdomain(progname, DATADIR"/clamav-milter/locale");
- 	textdomain(progname);
-diff -bur clamav-0.90.2/configure.in clamav-0.90.2-nls/configure.in
---- clamav-0.90.2/configure.in	2007-04-13 01:10:37.000000000 +0200
-+++ clamav-0.90.2-nls/configure.in	2007-04-16 15:33:40.000000000 +0200
-@@ -160,6 +160,15 @@
-     AC_CHECK_HEADER(dlfcn.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -ldl" ; AC_DEFINE(HAVE_NCORE,1,Support for NodalCore acceleration)], AC_MSG_WARN([****** NodalCore support disabled (no support for dlopen)]))
- fi
- 
-+AC_ARG_ENABLE(nls,
-+    AC_HELP_STRING([--disable-nls], [disable nls support]),
-+    [want_nls=$enableval], [want_nls=yes]
-+)
-+
-+if test $want_nls = yes; then
-+   CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
-+fi
-+
- AC_ARG_ENABLE(dns,
-     AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]),
-     [want_dns=$enableval], [want_dns=yes]
-diff -bur clamav-0.90.2/shared/getopt.c clamav-0.90.2-nls/shared/getopt.c
---- clamav-0.90.2/shared/getopt.c	2007-02-28 02:08:59.000000000 +0100
-+++ clamav-0.90.2-nls/shared/getopt.c	2007-04-16 15:33:40.000000000 +0200
-@@ -82,7 +82,7 @@
- 
- #ifndef _
- /* This is for other GNU distributions with internationalized messages.  */
--# if defined HAVE_LIBINTL_H || defined _LIBC
-+# if (defined(HAVE_LIBINTL_H) || defined(_LIBC)) && defined(ENABLE_NLS)
- #  include <libintl.h>
- #  ifndef _
- #   define _(msgid)	gettext (msgid)
-diff -bur clamav-0.90.2/shared/output.c clamav-0.90.2-nls/shared/output.c
---- clamav-0.90.2/shared/output.c	2007-03-02 01:43:18.000000000 +0100
-+++ clamav-0.90.2-nls/shared/output.c	2007-04-16 15:33:40.000000000 +0200
-@@ -61,7 +61,7 @@
- pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif
- 
--#ifdef  C_LINUX
-+#if defined(C_LINUX) && defined(ENABLE_NLS)
- #include <libintl.h>
- #include <locale.h>
- 
diff --git a/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-5759.patch b/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-5759.patch
deleted file mode 100644
index d879eb7f65be..000000000000
--- a/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-5759.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Thu Dec  6 15:22:27 CET 2007 (tk)
----------------------------------
-  * libclamav/pe.c: fix possible integer overflow in MEW related code
-                    Reported by iDefense [IDEF2842]
-
-    Backported by <sgran@debian.org>
-
-    SVN r3376
-
-Index: clamav-0.91.2/libclamav/pe.c
-===================================================================
---- clamav-0.91.2.orig/libclamav/pe.c
-+++ clamav-0.91.2/libclamav/pe.c
-@@ -80,6 +80,18 @@
- #define PEALIGN(o,a) (((a))?(((o)/(a))*(a)):(o))
- #define PESALIGN(o,a) (((a))?(((o)/(a)+((o)%(a)!=0))*(a)):(o))
- 
-+#define CLI_UNPSIZELIMITS(NAME,CHK) \
-+if(ctx->limits && ctx->limits->maxfilesize && (CHK) > ctx->limits->maxfilesize) { \
-+    cli_dbgmsg(NAME": Sizes exceeded (%lu > %lu)\n", (CHK), ctx->limits->maxfilesize); \
-+    free(exe_sections); \
-+    if(BLOCKMAX) { \
-+        *ctx->virname = "PE."NAME".ExceededFileSize"; \
-+        return CL_VIRUS; \
-+    } else { \
-+        return CL_CLEAN; \
-+    } \
-+}
-+
- extern short cli_leavetemps_flag;
- 
- struct offset_list {
-@@ -1153,16 +1165,9 @@ int cli_scanpe(int desc, cli_ctx *ctx)
- 		dsize = exe_sections[i].vsz;
- 
- 		cli_dbgmsg("MEW: ssize %08x dsize %08x offdiff: %08x\n", ssize, dsize, offdiff);
--		if(ctx->limits && ctx->limits->maxfilesize && (ssize + dsize > ctx->limits->maxfilesize || exe_sections[i + 1].rsz > ctx->limits->maxfilesize)) {
--		    cli_dbgmsg("MEW: Sizes exceeded (ssize: %u, dsize: %u, max: %lu)\n", ssize, dsize , ctx->limits->maxfilesize);
--		    free(exe_sections);
--		    if(BLOCKMAX) {
--			*ctx->virname = "PE.MEW.ExceededFileSize";
--			return CL_VIRUS;
--		    } else {
--			return CL_CLEAN;
--		    }
--		}
-+
-+		CLI_UNPSIZELIMITS("MEW", MAX(ssize, dsize));
-+		CLI_UNPSIZELIMITS("MEW", MAX(ssize + dsize, exe_sections[i + 1].rsz));
- 
- 		/* allocate needed buffer */
- 		if (!(src = cli_calloc (ssize + dsize, sizeof(char)))) {
diff --git a/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-6336.patch b/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-6336.patch
deleted file mode 100644
index 41cc474888c2..000000000000
--- a/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-6336.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Thu Dec  6 15:15:45 CET 2007 (tk)
----------------------------------
-  * libclamav/mspack.c: fix off-by-one error in LZX_READ_HUFFSYM() (bb#663)
-
-     https://wwws.clamav.net/bugzilla/show_bug.cgi?id=663
-
-     SVN r3374
-
-Index: clamav-0.91.2/libclamav/mspack.c
-===================================================================
---- clamav-0.91.2.orig/libclamav/mspack.c
-+++ clamav-0.91.2/libclamav/mspack.c
-@@ -734,7 +734,7 @@ void mszip_free(struct mszip_stream *zip
- 
- #define LZX_ENSURE_BITS(nbits)                                              \
-   while (bits_left < (nbits)) {                                         \
--    if (i_ptr >= i_end) {                                               \
-+    if (i_ptr + 1 >= i_end) {                                               \
-       if (lzx_read_input(lzx)) return lzx->error;                      \
-       i_ptr = lzx->i_ptr;                                               \
-       i_end = lzx->i_end;                                               \
diff --git a/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-6337.patch b/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-6337.patch
deleted file mode 100644
index 71edc47c61c3..000000000000
--- a/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-6337.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Mon Dec 10 15:54:20 CET 2007 (tk)
----------------------------------
-  * libclamav/nsis/bzlib_private.h: fix bzlib bug (aCaB)
-
-    SVN r3387
-
-Index: clamav-0.91.2/libclamav/nsis/bzlib_private.h
-===================================================================
---- clamav-0.91.2.orig/libclamav/nsis/bzlib_private.h
-+++ clamav-0.91.2/libclamav/nsis/bzlib_private.h
-@@ -422,11 +422,13 @@ typedef
- /*-- Macros for decompression. --*/
- 
- #define BZ_GET_FAST(cccc)                     \
-+    if (s->tPos >= s->blockSize100k * 100000) return True; \
-     s->tPos = s->tt[s->tPos];                 \
-     cccc = (UChar)(s->tPos & 0xff);           \
-     s->tPos >>= 8;
- 
- #define BZ_GET_FAST_C(cccc)                   \
-+    if (c_tPos >= s->blockSize100k * 100000) return True; \
-     c_tPos = c_tt[c_tPos];                    \
-     cccc = (UChar)(c_tPos & 0xff);            \
-     c_tPos >>= 8;