- updated to 0.98

diff --git a/ac2.68.patch b/ac2.68.patch
index f7a2362a84dc740b0007ee38541daa7bf3ead567..ba4ae541acc08fa737405d663651bc1a21d23c00 100644 (file)
--- a/ac2.68.patch
+++ b/ac2.68.patch
@@ -1,18 +1,6 @@
-diff -ur clamav-0.97.5/clamav-milter/Makefile.am clamav-0.97.5-am/clamav-milter/Makefile.am
---- clamav-0.97.5/clamav-milter/Makefile.am    2012-06-12 15:36:05.000000000 +0200
-+++ clamav-0.97.5-am/clamav-milter/Makefile.am 2012-06-28 11:10:21.205378306 +0200
-@@ -45,7 +45,7 @@
- endif
- 
- DEFS = @DEFS@ -DCL_NOLIBCLAMAV
--CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Wwrite-strings//' -e 's/-Werror /-Werror -Wno-error=format-nonliteral /'`
-+AM_CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Wwrite-strings//' -e 's/-Werror /-Werror -Wno-error=format-nonliteral /'`
- LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
- AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
- CLEANFILES=*.gcda *.gcno
-diff -ur clamav-0.97.5/configure.in clamav-0.97.5-am/configure.in
---- clamav-0.97.5/configure.in 2012-06-28 11:10:46.795377403 +0200
-+++ clamav-0.97.5-am/configure.in      2012-06-28 11:01:44.658245193 +0200
+diff -ur clamav-0.98.orig/configure.ac clamav-0.98/configure.ac
+--- clamav-0.98.orig/configure.ac      2013-09-21 10:56:27.087891623 +0000
++++ clamav-0.98/configure.ac   2013-09-21 11:01:02.996891571 +0000
 @@ -54,6 +54,8 @@
  AC_PROG_INSTALL
  AC_PROG_LN_S
@@ -31,7 +19,7 @@ diff -ur clamav-0.97.5/configure.in clamav-0.97.5-am/configure.in
                        [CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK"],
                        [])
  fi
-@@ -1549,8 +1551,8 @@
+@@ -1548,8 +1550,8 @@
  if test "$enable_clamdtop" != "no"; then
  
  AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
@@ -42,7 +30,7 @@ diff -ur clamav-0.97.5/configure.in clamav-0.97.5-am/configure.in
            [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
             CURSES_INCLUDE="<ncurses/ncurses.h>"],
            [])
-@@ -1558,8 +1560,8 @@
+@@ -1557,8 +1559,8 @@
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
      HAVE_LIBNCURSES=
      AC_LIB_FIND([ncurses], [ncurses.h],
@@ -53,7 +41,7 @@ diff -ur clamav-0.97.5/configure.in clamav-0.97.5-am/configure.in
            [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
             CURSES_INCLUDE="<ncurses.h>"],
            [])
-@@ -1567,8 +1569,8 @@
+@@ -1566,8 +1568,8 @@
  
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
      AC_LIB_FIND([pdcurses],[curses.h],
@@ -64,41 +52,3 @@ diff -ur clamav-0.97.5/configure.in clamav-0.97.5-am/configure.in
                            [CURSES_CPPFLAGS="$INCPDCURSES";
                             CURSES_LIBS="$LTLIBPDCURSES";
                             CURSES_INCLUDE="<curses.h>"],
-diff -ur clamav-0.97.5/m4/resolv.m4 clamav-0.97.5-am/m4/resolv.m4
---- clamav-0.97.5/m4/resolv.m4 2012-06-12 15:36:05.000000000 +0200
-+++ clamav-0.97.5-am/m4/resolv.m4      2012-06-28 11:09:01.312047789 +0200
-@@ -18,7 +18,7 @@
-       [
-           AC_CACHE_CHECK([for dn_expand in std libs], [ac_cv_have_lresolv_std], [
-               ac_cv_have_lresolv_std='no'
--              AC_LINK_IFELSE([
-+              AC_LINK_IFELSE([AC_LANG_SOURCE([
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-@@ -28,14 +28,14 @@
-               [
-                   ac_cv_have_lresolv_std='yes'
-                   ac_cv_have_lresolv=''
--              ])
-+              ])])
-           ])
-           if test "x$ac_cv_have_lresolv" = "xno"; then
-           bklibs=$LIBS
-           LIBS=-lresolv
-           AC_CACHE_CHECK([for dn_expand in -lresolv], [ac_cv_have_lresolv_lresolv], [
-               ac_cv_have_lresolv_lresolv='yes'
--              AC_LINK_IFELSE([
-+              AC_LINK_IFELSE([AC_LANG_SOURCE([
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-@@ -45,7 +45,7 @@
-               [
-                   ac_cv_have_lresolv_lresolv='yes'
-                   ac_cv_have_lresolv=' -lresolv'
--              ])
-+              ])])
-           ])
-           LIBS=$bklibs;
-           fi

diff --git a/am-nosilentrules.patch b/am-nosilentrules.patch
index 9625e0fa480b9aaef6bd82f102962981adbf073d..6fb67626d2d347c7015ee46fcc61915ff38a4aa9 100644 (file)
--- a/am-nosilentrules.patch
+++ b/am-nosilentrules.patch
@@ -1,5 +1,6 @@
---- clamav-0.96/configure.in~  2010-04-15 13:38:54.000000000 +0300
-+++ clamav-0.96/configure.in   2010-04-15 13:38:55.799688151 +0300
+diff -ur clamav-0.98.orig/configure.ac clamav-0.98/configure.ac
+--- clamav-0.98.orig/configure.ac      2013-09-21 10:55:23.897891162 +0000
++++ clamav-0.98/configure.ac   2013-09-21 10:55:51.287891575 +0000
 @@ -34,8 +34,7 @@
  
  dnl -Wall and -Werror here are NOT CFLAGS, they refer to automake warnings
@@ -10,9 +11,10 @@
  
  dnl we told automake to not define these, since we want to include
  dnl the date in the version
---- clamav-0.96/m4/acinclude.m4~       2010-04-15 14:58:22.000000000 +0300
-+++ clamav-0.96/m4/acinclude.m4        2010-04-15 14:59:20.072733581 +0300
-@@ -789,9 +789,9 @@
+diff -ur clamav-0.98.orig/m4/acinclude.m4 clamav-0.98/m4/acinclude.m4
+--- clamav-0.98.orig/m4/acinclude.m4   2013-09-16 19:28:14.000000000 +0000
++++ clamav-0.98/m4/acinclude.m4        2013-09-21 10:55:51.287891575 +0000
+@@ -880,9 +880,9 @@
  AC_DEFUN([CL_MSG_STATUS],
  [
     m4_if($#,3,,[m4_fatal([$0: invalid number of arguments: $#])])

diff --git a/clamav-config.patch b/clamav-config.patch
index 4cb395886e37bef1683eb7e9723d2f2889d91431..e0596348a3a76772c77d85554dc887a360f09a08 100644 (file)
--- a/clamav-config.patch
+++ b/clamav-config.patch
@@ -1,6 +1,6 @@
-diff -ur clamav-0.97.1/etc//clamav-milter.conf clamav-0.97.1.new/etc//clamav-milter.conf
---- clamav-0.97.1/etc//clamav-milter.conf      2011-01-10 18:48:28.000000000 +0100
-+++ clamav-0.97.1.new/etc//clamav-milter.conf  2011-07-14 18:24:02.801795736 +0200
+diff -ur clamav-0.98.orig/etc/clamav-milter.conf.sample clamav-0.98/etc/clamav-milter.conf.sample
+--- clamav-0.98.orig/etc/clamav-milter.conf.sample     2013-09-16 19:28:14.000000000 +0000
++++ clamav-0.98/etc/clamav-milter.conf.sample  2013-09-21 11:55:39.030891567 +0000
 @@ -3,7 +3,7 @@
  ##
  
@@ -52,7 +52,7 @@ diff -ur clamav-0.97.1/etc//clamav-milter.conf clamav-0.97.1.new/etc//clamav-mil
  
  
  ##
-@@ -238,13 +238,13 @@
+@@ -239,13 +239,13 @@
  # Use system logger (can work together with LogFile).
  #
  # Default: no
@@ -68,9 +68,9 @@ diff -ur clamav-0.97.1/etc//clamav-milter.conf clamav-0.97.1.new/etc//clamav-mil
  
  # Enable verbose logging.
  #
-diff -ur clamav-0.97.1/etc//clamd.conf clamav-0.97.1.new/etc//clamd.conf
---- clamav-0.97.1/etc//clamd.conf      2011-05-13 13:25:31.000000000 +0200
-+++ clamav-0.97.1.new/etc//clamd.conf  2011-07-14 18:19:05.824861957 +0200
+diff -ur clamav-0.98.orig/etc/clamd.conf.sample clamav-0.98/etc/clamd.conf.sample
+--- clamav-0.98.orig/etc/clamd.conf.sample     2013-09-16 19:28:14.000000000 +0000
++++ clamav-0.98/etc/clamd.conf.sample  2013-09-21 11:55:39.031891555 +0000
 @@ -5,13 +5,13 @@
  
  
@@ -87,7 +87,7 @@ diff -ur clamav-0.97.1/etc//clamd.conf clamav-0.97.1.new/etc//clamd.conf
  
  # By default the log file is locked for writing - the lock protects against
  # running clamd multiple times (if want to run another clamd, please
-@@ -40,12 +40,12 @@
+@@ -41,12 +41,12 @@
  
  # Use system logger (can work together with LogFile).
  # Default: no
@@ -102,7 +102,7 @@ diff -ur clamav-0.97.1/etc//clamd.conf clamav-0.97.1.new/etc//clamd.conf
  
  # Enable verbose logging.
  # Default: no
-@@ -58,7 +58,7 @@
+@@ -63,7 +63,7 @@
  # This option allows you to save a process identifier of the listening
  # daemon (main thread).
  # Default: disabled
@@ -111,7 +111,7 @@ diff -ur clamav-0.97.1/etc//clamd.conf clamav-0.97.1.new/etc//clamd.conf
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -77,11 +77,11 @@
+@@ -82,11 +82,11 @@
  
  # Path to a local socket file the daemon will listen on.
  # Default: disabled (must be specified by a user)
@@ -125,7 +125,7 @@ diff -ur clamav-0.97.1/etc//clamd.conf clamav-0.97.1.new/etc//clamd.conf
  
  # Sets the permissions on the unix socket to the specified mode.
  # Default: disabled (socket is world accessible)
-@@ -186,11 +186,11 @@
+@@ -191,11 +191,11 @@
  
  # Run as another user (clamd must be started by root for this option to work)
  # Default: don't drop privileges
@@ -139,7 +139,7 @@ diff -ur clamav-0.97.1/etc//clamd.conf clamav-0.97.1.new/etc//clamd.conf
  
  # Stop daemon when libclamav reports out of memory condition.
  #ExitOnOOM yes
-@@ -443,15 +443,15 @@
+@@ -517,15 +517,15 @@
  
  # Set access mask for Clamuko (Dazuko only).
  # Default: no
@@ -159,18 +159,15 @@ diff -ur clamav-0.97.1/etc//clamd.conf clamav-0.97.1.new/etc//clamd.conf
  #ClamukoIncludePath /students
  
  # Set the exclude paths. All subdirectories are also excluded. (Dazuko only)
-diff -ur clamav-0.97.1/etc//freshclam.conf clamav-0.97.1.new/etc//freshclam.conf
---- clamav-0.97.1/etc//freshclam.conf  2011-01-10 18:48:28.000000000 +0100
-+++ clamav-0.97.1.new/etc//freshclam.conf      2011-07-14 18:14:32.705707450 +0200
-@@ -3,9 +3,14 @@
+diff -ur clamav-0.98.orig/etc/freshclam.conf.sample clamav-0.98/etc/freshclam.conf.sample
+--- clamav-0.98.orig/etc/freshclam.conf.sample 2013-09-16 19:28:14.000000000 +0000
++++ clamav-0.98/etc/freshclam.conf.sample      2013-09-21 11:57:49.466891498 +0000
+@@ -3,9 +3,11 @@
  ## Please read the freshclam.conf(5) manual before editing this file.
  ##
  
-+## PLD NOTE: Note that freshclam is called periodically via cron
-+## Check /etc/sysconfig/clamd for details
-+## Seems better to run task once per period than keep daemon running
-+## only for that.
-+## But if you have arguments please tell us.
++## TLD NOTE: freshclam is called periodically via cron, check
++## /etc/sysconfig/clamd for details.
  
  # Comment or remove the line below.
 -Example
@@ -178,7 +175,7 @@ diff -ur clamav-0.97.1/etc//freshclam.conf clamav-0.97.1.new/etc//freshclam.conf
  
  # Path to the database directory.
  # WARNING: It must match clamd.conf's directive!
-@@ -30,11 +35,11 @@
+@@ -31,11 +33,11 @@
  
  # Enable verbose logging.
  # Default: no
@@ -192,7 +189,7 @@ diff -ur clamav-0.97.1/etc//freshclam.conf clamav-0.97.1.new/etc//freshclam.conf
  
  # Specify the type of syslog messages - please refer to 'man syslog'
  # for facility names.
-@@ -48,7 +53,7 @@
+@@ -53,7 +55,7 @@
  # By default when started freshclam drops privileges and switches to the
  # "clamav" user. This directive allows you to change the database owner.
  # Default: clamav (may depend on installation options)
@@ -201,7 +198,7 @@ diff -ur clamav-0.97.1/etc//freshclam.conf clamav-0.97.1.new/etc//freshclam.conf
  
  # Initialize supplementary group access (freshclam must be started by root).
  # Default: no
-@@ -96,7 +101,7 @@
+@@ -114,7 +116,7 @@
  
  # Number of database checks per day.
  # Default: 12 (every two hours)
@@ -210,7 +207,7 @@ diff -ur clamav-0.97.1/etc//freshclam.conf clamav-0.97.1.new/etc//freshclam.conf
  
  # Proxy settings
  # Default: disabled
-@@ -118,7 +123,7 @@
+@@ -136,7 +138,7 @@
  
  # Send the RELOAD command to clamd.
  # Default: no

diff --git a/clamav-nolibs.patch b/clamav-nolibs.patch
index da49769c1d3cb787737507f8b843df2c2363d75a..8b915c0f6514a484735e2e0edf86e6339f5a07ae 100644 (file)
--- a/clamav-nolibs.patch
+++ b/clamav-nolibs.patch
@@ -1,5 +1,6 @@
---- clamav-0.96.1/configure.in~        2010-05-19 14:23:09.000000000 +0200
-+++ clamav-0.96.1/configure.in 2010-05-20 09:28:22.297294559 +0200
+diff -ur clamav-0.98.orig/configure.ac clamav-0.98/configure.ac
+--- clamav-0.98.orig/configure.ac      2013-09-16 19:28:14.000000000 +0000
++++ clamav-0.98/configure.ac   2013-09-21 10:54:26.398891553 +0000
 @@ -430,8 +430,12 @@
  AC_SUBST([BUILD_CONFIGURE_FLAGS], [$build_configure_args])