rpms
/
clamav
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed old, unneeded patches

This commit is contained in:
Robert Scheck 2008-02-14 15:42:36 +00:00
parent 128b1e458f
commit 869e18548a
4 changed files with 0 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
clamav-0.70-user.patch
View File

@ -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

26
clamav-0.88.1-strncpy.patch
View File

@ -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 */
{

22
clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
View File

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

29
clamav-0.88.4-visibility.patch
View File

@ -1,29 +0,0 @@
--- clamav-0.88.4/libclamav/md5.c.visibility 2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.4/libclamav/md5.c 2006-08-11 08:19:02.000000000 +0200
@@ -176,7 +176,7 @@ static void *body(MD5_CTX *ctx, void *da
return ptr;
}
-void MD5_Init(MD5_CTX *ctx)
+void __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx)
{
ctx->a = 0x67452301;
ctx->b = 0xefcdab89;
@@ -187,7 +187,7 @@ void MD5_Init(MD5_CTX *ctx)
ctx->hi = 0;
}
-void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
+void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
{
MD5_u32plus saved_lo;
unsigned long used, free;
@@ -221,7 +221,7 @@ void MD5_Update(MD5_CTX *ctx, void *data
memcpy(ctx->buffer, data, size);
}
-void MD5_Final(unsigned char *result, MD5_CTX *ctx)
+void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx)
{
unsigned long used, free;