upgrading package: clamav 0.97.8 -> 0.98.1

clamav/clamav.patch

@@ -1,6 +1,6 @@
 Index: clamav-milter/clamav-milter.c
---- clamav-milter/clamav-milter.c.orig	2009-10-28 16:34:13 +0100
-+++ clamav-milter/clamav-milter.c	2009-11-08 10:27:04 +0100
+--- clamav-milter/clamav-milter.c.orig	2014-01-13 18:02:18.000000000 +0100
++++ clamav-milter/clamav-milter.c	2014-03-01 10:52:14.203972188 +0100
 @@ -32,7 +32,7 @@
  #include <syslog.h>
  #endif
@@ -11,11 +11,11 @@ Index: clamav-milter/clamav-milter.c
  #include "clamav.h"
  
 Index: clamav-milter/clamfi.c
---- clamav-milter/clamfi.c.orig	2009-10-28 16:34:13 +0100
-+++ clamav-milter/clamfi.c	2009-11-08 10:27:04 +0100
-@@ -29,7 +29,7 @@
- #include <unistd.h>
+--- clamav-milter/clamfi.c.orig	2014-01-13 18:02:18.000000000 +0100
++++ clamav-milter/clamfi.c	2014-03-01 10:52:14.203972188 +0100
+@@ -31,7 +31,7 @@
  #include <ctype.h>
+ #include <errno.h>
  
 -#include <libmilter/mfapi.h>
 +#include "milter/mfapi.h"
@@ -23,8 +23,8 @@ Index: clamav-milter/clamfi.c
  #include "shared/optparser.h"
  #include "shared/output.h"
 Index: clamav-milter/clamfi.h
---- clamav-milter/clamfi.h.orig	2009-07-06 15:21:58 +0200
-+++ clamav-milter/clamfi.h	2009-11-08 10:27:04 +0100
+--- clamav-milter/clamfi.h.orig	2014-01-13 18:02:18.000000000 +0100
++++ clamav-milter/clamfi.h	2014-03-01 10:52:14.203972188 +0100
 @@ -22,7 +22,7 @@
  #define _CLAMFI_H
  
@@ -35,9 +35,9 @@ Index: clamav-milter/clamfi.h
  extern uint64_t maxfilesize;
  extern int addxvirus;
 Index: configure
---- configure.orig	2009-10-28 16:34:13 +0100
-+++ configure	2009-11-08 10:27:32 +0100
-@@ -16692,9 +16692,6 @@
+--- configure.orig	2014-01-13 18:02:34.000000000 +0100
++++ configure	2014-03-01 10:52:14.213983861 +0100
+@@ -18061,9 +18061,6 @@
  
          save_LIBS="$LIBS"
      CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
@@ -47,7 +47,7 @@ Index: configure
      LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5
  $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
-@@ -16842,7 +16839,7 @@
+@@ -18211,7 +18208,7 @@
  fi
  
      LIBS="$save_LIBS"
@@ -55,11 +55,11 @@ Index: configure
 +    for ac_header in milter/mfapi.h
  do :
    ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
- if test "x$ac_cv_header_libmilter_mfapi_h" = x""yes; then :
+ if test "x$ac_cv_header_libmilter_mfapi_h" = xyes; then :
 Index: libclamav/others.c
---- libclamav/others.c.orig	2009-10-28 16:34:13 +0100
-+++ libclamav/others.c	2009-11-08 10:27:04 +0100
-@@ -177,8 +177,10 @@
+--- libclamav/others.c.orig	2014-01-13 18:02:34.000000000 +0100
++++ libclamav/others.c	2014-03-01 10:52:14.213983861 +0100
+@@ -167,8 +167,10 @@
      if(is_rar_initd) return;
      is_rar_initd = 1;
  
@@ -70,15 +70,3 @@ Index: libclamav/others.c
  	return;
  
      if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) ||
-Index: shared/output.c
---- shared/output.c.orig	2009-10-28 16:34:13 +0100
-+++ shared/output.c	2009-11-08 10:27:04 +0100
-@@ -67,7 +67,7 @@
- pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif
- 
--#ifdef  C_LINUX
-+#if 0
- #include <libintl.h>
- #include <locale.h>
- 

clamav/clamav.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        AntiVirus
 License:      GPL
-Version:      0.97.8
-Release:      20130423
+Version:      0.98.1
+Release:      20140301
 
 #   package options
 %option       with_milter  no
@@ -111,8 +111,7 @@ PreReq:       milter
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
 
     #   install default configuration
-    %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/clamav
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/clamav/*
     %{l_shtool} install -c -m 644 \
         -e 's;^\(Example\);#\1;' \
         -e 's;^#\(LogFile\) /.*;\1 %{l_prefix}/var/clamav/clamd.log;' \
@@ -122,15 +121,15 @@ PreReq:       milter
         -e 's;^#\(FixStaleSocket.*\);\1;' \
         -e 's;^#\(DatabaseDirectory\).*;\1 %{l_prefix}/share/clamav;' \
         -e 's;^#\(User\).*;\1 %{l_rusr};' \
-        etc/clamd.conf \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/clamav/
+        etc/clamd.conf.sample \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/clamav/clamd.conf
     %{l_shtool} install -c -m 644 \
         -e 's;^\(Example\);#\1;' \
         -e 's;^#\(DatabaseDirectory\).*;\1 %{l_prefix}/share/clamav;' \
         -e 's;^#\(UpdateLogFile\).*;\1 %{l_prefix}/var/clamav/freshclam.log;' \
         -e 's;^#\(NotifyClamd\).*;\1 %{l_prefix}/etc/clamav/clamd.conf;' \
-        etc/freshclam.conf \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/clamav/
+        etc/freshclam.conf.sample \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/clamav/freshclam.conf
 
     #   install run-command script
     %{l_shtool} mkdir -f -p -m 755 \