OpenPKG Specs: clamav/clamav.patch@3b08e6396b45

Massively update from 5.1 to 5.5 release, completely changing from
autotools to cmake build configuration along with the corresponding
corrections. Correct some less important problems like typical german
english mistakes, as well as use parallel make for faster builds with
SMP and multicore architectures. Warning, the 5.5 releases of MySQL
seem to be equally bug ridden as the 5.1 are, for example building
the NDBCluster storage engine fails.

     1 Index: clamav-milter/clamav-milter.c

     2 --- clamav-milter/clamav-milter.c.orig	2009-10-28 16:34:13 +0100

     3 +++ clamav-milter/clamav-milter.c	2009-11-08 10:27:04 +0100

     4 @@ -32,7 +32,7 @@

     5  #include <syslog.h>

     6  #endif

     7  #include <time.h>

     8 -#include <libmilter/mfapi.h>

     9 +#include "milter/mfapi.h"

    11  #include "clamav.h"

    13 Index: clamav-milter/clamfi.c

    14 --- clamav-milter/clamfi.c.orig	2009-10-28 16:34:13 +0100

    15 +++ clamav-milter/clamfi.c	2009-11-08 10:27:04 +0100

    16 @@ -29,7 +29,7 @@

    17  #include <unistd.h>

    18  #include <ctype.h>

    20 -#include <libmilter/mfapi.h>

    21 +#include "milter/mfapi.h"

    23  #include "shared/optparser.h"

    24  #include "shared/output.h"

    25 Index: clamav-milter/clamfi.h

    26 --- clamav-milter/clamfi.h.orig	2009-07-06 15:21:58 +0200

    27 +++ clamav-milter/clamfi.h	2009-11-08 10:27:04 +0100

    28 @@ -22,7 +22,7 @@

    29  #define _CLAMFI_H

    31  #include "shared/optparser.h"

    32 -#include <libmilter/mfapi.h>

    33 +#include "milter/mfapi.h"

    35  extern uint64_t maxfilesize;

    36  extern int addxvirus;

    37 Index: configure

    38 --- configure.orig	2009-10-28 16:34:13 +0100

    39 +++ configure	2009-11-08 10:27:32 +0100

    40 @@ -16692,9 +16692,6 @@

    42          save_LIBS="$LIBS"

    43      CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"

    44 -    if test -d /usr/lib/libmilter ; then

    45 -	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"

    46 -    fi

    47      LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"

    48      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5

    49  $as_echo_n "checking for mi_stop in -lmilter... " >&6; }

    50 @@ -16842,7 +16839,7 @@

    51  fi

    53      LIBS="$save_LIBS"

    54 -    for ac_header in libmilter/mfapi.h

    55 +    for ac_header in milter/mfapi.h

    56  do :

    57    ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"

    58  if test "x$ac_cv_header_libmilter_mfapi_h" = x""yes; then :

    59 Index: libclamav/others.c

    60 --- libclamav/others.c.orig	2009-10-28 16:34:13 +0100

    61 +++ libclamav/others.c	2009-11-08 10:27:04 +0100

    62 @@ -177,8 +177,10 @@

    63      if(is_rar_initd) return;

    64      is_rar_initd = 1;

    66 +#if 0

    67      rhandle = lt_dlfind("libclamunrar_iface", "unrar");

    68      if (!rhandle)

    69 +#endif

    70  	return;

    72      if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) ||

    73 Index: shared/output.c

    74 --- shared/output.c.orig	2009-10-28 16:34:13 +0100

    75 +++ shared/output.c	2009-11-08 10:27:04 +0100

    76 @@ -67,7 +67,7 @@

    77  pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;

    78  #endif

    80 -#ifdef  C_LINUX

    81 +#if 0

    82  #include <libintl.h>

    83  #include <locale.h>

OpenPKG Specs / file revision

clamav/clamav.patch@3b08e6396b45

clamav/clamav.patch