[packages/clamav] - rediff patches

arekm arekm at pld-linux.org
Tue Apr 6 16:41:24 CEST 2021 

commit 4cb842b3202e45efcb54656d1a9046c7a9088993
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Apr 6 16:41:11 2021 +0200

    - rediff patches

 ac2.68.patch                                     | 50 +++++++++--------
 clamav-add-support-for-system-tomsfastmath.patch | 46 +++++++--------
 clamav-headers.patch                             | 71 +++++++++++++-----------
 clamav-nolibs.patch                              | 10 ++--
 clamav-pld_config.patch                          | 56 +++++++++----------
 5 files changed, 118 insertions(+), 115 deletions(-)
---
diff --git a/ac2.68.patch b/ac2.68.patch
index a2dd5a9..a855631 100644
--- a/ac2.68.patch
+++ b/ac2.68.patch
@@ -1,15 +1,15 @@
-diff -uNr clamav-0.98.3/configure.ac clamav-0.98.3-ac2.68/configure.ac
---- clamav-0.98.3/configure.ac	2014-05-06 20:42:41.000000000 +0200
-+++ clamav-0.98.3-ac2.68/configure.ac	2014-05-09 10:51:30.508280355 +0200
-@@ -53,6 +53,7 @@
- AC_USE_SYSTEM_EXTENSIONS
+diff -urNp -x '*.orig' clamav-0.103.0.org/configure.ac clamav-0.103.0/configure.ac
+--- clamav-0.103.0.org/configure.ac	2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/configure.ac	2021-04-06 16:39:49.284297541 +0200
+@@ -50,6 +50,7 @@ dnl the date in the version
+ AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
  
  m4_include([m4/reorganization/version.m4])
 +m4_include([m4/reorganization/build_tools.m4])
  
  LT_CONFIG_LTDL_DIR([libltdl])
  LT_INIT([dlopen disable-static])
-@@ -61,7 +62,6 @@
+@@ -58,7 +59,6 @@ PKG_PROG_PKG_CONFIG(0.16)
  
  m4_include([m4/reorganization/libclamav-only.m4])
  
@@ -17,7 +17,7 @@ diff -uNr clamav-0.98.3/configure.ac clamav-0.98.3-ac2.68/configure.ac
  m4_include([m4/reorganization/headers.m4])
  
  AC_CONFIG_FILES([libltdl/Makefile])
-@@ -396,7 +396,7 @@
+@@ -394,7 +394,7 @@ if test "X$have_json" = "Xyes" && test "
      ])
  fi
  
@@ -26,18 +26,19 @@ diff -uNr clamav-0.98.3/configure.ac clamav-0.98.3-ac2.68/configure.ac
      AC_MSG_WARN([m4_normalize([
  ****** your libcurl (e.g. libcurl-devel) is older than the recommended version. Installing ClamAV with clamonacc requires libcurl 7.40 or higher to use fdpassing.
  ****** fdpassing with clamonacc will be disabled on your system.
-diff -uNr clamav-0.98.3/m4/reorganization/build_tools.m4 clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4
---- clamav-0.98.3/m4/reorganization/build_tools.m4	2014-05-06 20:39:56.000000000 +0200
-+++ clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4	2014-05-09 10:53:30.800262620 +0200
+diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/build_tools.m4 clamav-0.103.0/m4/reorganization/build_tools.m4
+--- clamav-0.103.0.org/m4/reorganization/build_tools.m4	2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/m4/reorganization/build_tools.m4	2021-04-06 16:39:49.284297541 +0200
 @@ -1,3 +1,5 @@
 +AM_PROG_AR
 +AM_PROG_CC_C_O
  AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_LN_S
---- clamav-0.103.0/m4/reorganization/clamdtop.m4.orig	2020-09-13 02:27:10.000000000 +0200
-+++ clamav-0.103.0/m4/reorganization/clamdtop.m4	2020-11-23 06:28:37.380116770 +0100
-@@ -13,8 +13,8 @@
+ AM_PROG_LEX
+ AC_PROG_YACC
+diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/clamdtop.m4 clamav-0.103.0/m4/reorganization/clamdtop.m4
+--- clamav-0.103.0.org/m4/reorganization/clamdtop.m4	2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/m4/reorganization/clamdtop.m4	2021-04-06 16:39:49.284297541 +0200
+@@ -13,8 +13,8 @@ PKG_CHECK_MODULES(NCURSES, [ncurses], [
  
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
      AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
@@ -48,7 +49,7 @@ diff -uNr clamav-0.98.3/m4/reorganization/build_tools.m4 clamav-0.98.3-ac2.68/m4
  	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
  	     CURSES_INCLUDE="<ncurses/ncurses.h>"],
  	    [])
-@@ -23,8 +23,8 @@
+@@ -23,8 +23,8 @@ fi
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
      HAVE_LIBNCURSES=
      AC_LIB_FIND([ncurses], [ncurses.h],
@@ -59,7 +60,7 @@ diff -uNr clamav-0.98.3/m4/reorganization/build_tools.m4 clamav-0.98.3-ac2.68/m4
  	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
  	     CURSES_INCLUDE="<ncurses.h>"],
  	    [])
-@@ -32,8 +32,8 @@
+@@ -32,8 +32,8 @@ fi
  
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
      AC_LIB_FIND([pdcurses],[curses.h],
@@ -70,10 +71,10 @@ diff -uNr clamav-0.98.3/m4/reorganization/build_tools.m4 clamav-0.98.3-ac2.68/m4
  			    [CURSES_CPPFLAGS="$INCPDCURSES";
  			     CURSES_LIBS="$LTLIBPDCURSES";
  			     CURSES_INCLUDE="<curses.h>"],
-diff -uNr clamav-0.98.3/m4/reorganization/code_checks/unit_tests.m4 clamav-0.98.3-ac2.68/m4/reorganization/code_checks/unit_tests.m4
---- clamav-0.98.3/m4/reorganization/code_checks/unit_tests.m4	2014-05-06 20:39:56.000000000 +0200
-+++ clamav-0.98.3-ac2.68/m4/reorganization/code_checks/unit_tests.m4	2014-05-09 10:51:06.963907781 +0200
-@@ -12,7 +12,7 @@
+diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/code_checks/unit_tests.m4 clamav-0.103.0/m4/reorganization/code_checks/unit_tests.m4
+--- clamav-0.103.0.org/m4/reorganization/code_checks/unit_tests.m4	2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/m4/reorganization/code_checks/unit_tests.m4	2021-04-06 16:39:49.284297541 +0200
+@@ -19,7 +19,7 @@ case "$host_os" in
  esac
  
  	AC_LIB_FIND([check],[check.h],
@@ -82,9 +83,10 @@ diff -uNr clamav-0.98.3/m4/reorganization/code_checks/unit_tests.m4 clamav-0.98.
  			[CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK $LDFLAGS"],
  			[])
  
---- clamav-0.103.0/m4/reorganization/libs/curl.m4.orig	2020-09-13 02:27:10.000000000 +0200
-+++ clamav-0.103.0/m4/reorganization/libs/curl.m4	2020-11-23 20:23:04.812211547 +0100
-@@ -64,12 +64,12 @@
+diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/libs/curl.m4 clamav-0.103.0/m4/reorganization/libs/curl.m4
+--- clamav-0.103.0.org/m4/reorganization/libs/curl.m4	2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/m4/reorganization/libs/curl.m4	2021-04-06 16:39:49.284297541 +0200
+@@ -64,12 +64,12 @@ if test "X$have_curl" = "Xyes"; then
      dnl end of section
  
      AM_COND_IF([BUILD_CLAMONACC],
diff --git a/clamav-add-support-for-system-tomsfastmath.patch b/clamav-add-support-for-system-tomsfastmath.patch
index 8dca9c1..0adce82 100644
--- a/clamav-add-support-for-system-tomsfastmath.patch
+++ b/clamav-add-support-for-system-tomsfastmath.patch
@@ -13,11 +13,10 @@ Patch-Name: add-support-for-system-tomsfastmath.patch
  5 files changed, 28 insertions(+), 4 deletions(-)
  create mode 100644 m4/reorganization/libs/tomsfastmath.m4
 
-diff --git a/configure.ac b/configure.ac
-index 9ef4105..a286b44 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -82,6 +82,7 @@ m4_include([m4/reorganization/libs/xml.m4])
+diff -urNp -x '*.orig' clamav-0.103.0.org/configure.ac clamav-0.103.0/configure.ac
+--- clamav-0.103.0.org/configure.ac	2021-04-06 16:40:12.175486852 +0200
++++ clamav-0.103.0/configure.ac	2021-04-06 16:40:12.575507635 +0200
+@@ -94,6 +94,7 @@ m4_include([m4/reorganization/libs/opens
  m4_include([m4/reorganization/libs/json.m4])
  m4_include([m4/reorganization/libs/pcre.m4])
  m4_include([m4/reorganization/libs/libmspack.m4])
@@ -25,7 +24,7 @@ index 9ef4105..a286b44 100644
  
  if test "x$use_internal_mspack" = "xno"; then
      mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS"
-@@ -286,6 +287,7 @@ fi
+@@ -362,6 +363,7 @@ fi
  CL_MSG_STATUS([yara        ],[$enable_yara],[$enable_yara])
  CL_MSG_STATUS([fts         ],[yes],[$lfs_fts_msg])
  
@@ -33,9 +32,10 @@ index 9ef4105..a286b44 100644
  
  # Yep, downgrading the compiler avoids the bug too:
  # 4.0.x, and 4.1.0 are the known buggy versions
---- clamav-0.103.0/libclamav/Makefile.am.orig	2020-09-13 02:27:09.000000000 +0200
-+++ clamav-0.103.0/libclamav/Makefile.am	2020-11-23 06:32:13.715611447 +0100
-@@ -588,7 +588,10 @@
+diff -urNp -x '*.orig' clamav-0.103.0.org/libclamav/Makefile.am clamav-0.103.0/libclamav/Makefile.am
+--- clamav-0.103.0.org/libclamav/Makefile.am	2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/libclamav/Makefile.am	2021-04-06 16:40:12.575507635 +0200
+@@ -588,7 +588,10 @@ libclamav_la_SOURCES += yara_arena.c \
  	yara_clam.h
  endif
  
@@ -47,7 +47,7 @@ index 9ef4105..a286b44 100644
  	bignum_fast.h\
  	tomsfastmath/addsub/fp_add.c\
  	tomsfastmath/addsub/fp_add_d.c\
-@@ -671,6 +674,10 @@
+@@ -671,6 +674,10 @@ libclamav_la_SOURCES += bignum.h\
  	tomsfastmath/sqr/fp_sqr_comba_generic.c\
  	tomsfastmath/sqr/fp_sqr_comba_small_set.c\
  	tomsfastmath/sqr/fp_sqrmod.c
@@ -58,10 +58,9 @@ index 9ef4105..a286b44 100644
  
  .PHONY2: version.h.tmp
  version.c: version.h
-diff --git a/libclamav/bignum.h b/libclamav/bignum.h
-index 9acb17b..56967b1 100644
---- a/libclamav/bignum.h
-+++ b/libclamav/bignum.h
+diff -urNp -x '*.orig' clamav-0.103.0.org/libclamav/bignum.h clamav-0.103.0/libclamav/bignum.h
+--- clamav-0.103.0.org/libclamav/bignum.h	2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/libclamav/bignum.h	2021-04-06 16:40:12.578841141 +0200
 @@ -1,9 +1,13 @@
  #ifndef BIGNUM_H_
  #define BIGNUM_H_
@@ -76,12 +75,11 @@ index 9acb17b..56967b1 100644
 +
  typedef fp_int mp_int;
  #define mp_cmp fp_cmp
- #define mp_toradix_n(a,b,c,d) fp_toradix_n(a,b,c,d)
-diff --git a/libclamav/xdp.c b/libclamav/xdp.c
-index 00edfa8..674dc7c 100644
---- a/libclamav/xdp.c
-+++ b/libclamav/xdp.c
-@@ -57,7 +57,7 @@
+ #define mp_toradix_n(a, b, c, d) fp_toradix_n(a, b, c, d)
+diff -urNp -x '*.orig' clamav-0.103.0.org/libclamav/xdp.c clamav-0.103.0/libclamav/xdp.c
+--- clamav-0.103.0.org/libclamav/xdp.c	2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/libclamav/xdp.c	2021-04-06 16:40:12.578841141 +0200
+@@ -52,7 +52,7 @@
  #include "scanners.h"
  #include "conv.h"
  #include "xdp.h"
@@ -90,11 +88,9 @@ index 00edfa8..674dc7c 100644
  #include "filetypes.h"
  
  static char *dump_xdp(cli_ctx *ctx, const char *start, size_t sz);
-diff --git a/m4/reorganization/libs/tomsfastmath.m4 b/m4/reorganization/libs/tomsfastmath.m4
-new file mode 100644
-index 0000000..2a821a1
---- /dev/null
-+++ b/m4/reorganization/libs/tomsfastmath.m4
+diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/libs/tomsfastmath.m4 clamav-0.103.0/m4/reorganization/libs/tomsfastmath.m4
+--- clamav-0.103.0.org/m4/reorganization/libs/tomsfastmath.m4	1970-01-01 01:00:00.000000000 +0100
++++ clamav-0.103.0/m4/reorganization/libs/tomsfastmath.m4	2021-04-06 16:40:12.578841141 +0200
 @@ -0,0 +1,12 @@
 +dnl Check for system tomsfastmath
 +PKG_CHECK_MODULES([TOMSFASTMATH], [tomsfastmath], [have_system_tomsfastmath=yes], [have_system_tomsfastmath=no])
diff --git a/clamav-headers.patch b/clamav-headers.patch
index 8b0f354..e2d03b5 100644
--- a/clamav-headers.patch
+++ b/clamav-headers.patch
@@ -1,6 +1,7 @@
---- clamav-0.101.0/Makefile.am~	2018-11-29 14:52:31.000000000 +0100
-+++ clamav-0.101.0/Makefile.am	2018-12-07 09:00:16.238721757 +0100
-@@ -34,7 +34,7 @@
+diff -urNp -x '*.orig' clamav-0.103.0.org/Makefile.am clamav-0.103.0/Makefile.am
+--- clamav-0.103.0.org/Makefile.am	2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/Makefile.am	2021-04-06 16:40:36.893437739 +0200
+@@ -46,7 +46,7 @@ endif
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libclamav.pc
  
@@ -9,30 +10,9 @@
  
  # don't complain that configuration files and databases are not removed, this is intended
  distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print
---- clamav-0.101.0/libclamav/Makefile.am~	2018-11-29 14:52:31.000000000 +0100
-+++ clamav-0.101.0/libclamav/Makefile.am	2018-12-07 09:00:16.312058931 +0100
-@@ -269,7 +269,7 @@
- libclamav_la_LDFLAGS += -Wl, at VERSIONSCRIPTFLAG@, at top_srcdir@/libclamav/libclamav.map
- endif
- 
--include_HEADERS = clamav.h
-+pkginclude_HEADERS = clamav.h
- 
- libclamav_la_SOURCES = \
-         matcher-ac.c \
---- clamav-0.101.0/libclamav.pc.in~	2018-11-29 14:52:31.000000000 +0100
-+++ clamav-0.101.0/libclamav.pc.in	2018-12-10 11:11:47.748327272 +0100
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/clamav
- 
- Name: libclamav
- Description: A GPL virus scanner
---- clamav-0.101.0/clamav-config.in.orig	2018-11-29 14:52:31.000000000 +0100
-+++ clamav-0.101.0/clamav-config.in	2018-12-10 19:32:41.185456107 +0100
+diff -urNp -x '*.orig' clamav-0.103.0.org/clamav-config.in clamav-0.103.0/clamav-config.in
+--- clamav-0.103.0.org/clamav-config.in	2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/clamav-config.in	2021-04-06 16:40:36.893437739 +0200
 @@ -3,7 +3,7 @@
  
  prefix=@prefix@
@@ -42,7 +22,7 @@
  libdir=@libdir@
  
  usage()
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ while test $# -gt 0; do
  	;;
  
      --cflags)
@@ -51,14 +31,39 @@
         	;;
  
      --libs)
---- clamav-0.102.0/libfreshclam/Makefile.am~	2019-10-01 19:24:09.000000000 +0200
-+++ clamav-0.102.0/libfreshclam/Makefile.am	2019-10-04 09:08:07.702507579 +0200
-@@ -32,7 +32,7 @@
+diff -urNp -x '*.orig' clamav-0.103.0.org/libclamav/Makefile.am clamav-0.103.0/libclamav/Makefile.am
+--- clamav-0.103.0.org/libclamav/Makefile.am	2021-04-06 16:40:36.403412280 +0200
++++ clamav-0.103.0/libclamav/Makefile.am	2021-04-06 16:40:36.893437739 +0200
+@@ -251,7 +251,7 @@ if VERSIONSCRIPT
+ libclamav_la_LDFLAGS += -Wl, at VERSIONSCRIPTFLAG@, at top_srcdir@/libclamav/libclamav.map
+ endif
+ 
+-include_HEADERS = clamav.h
++pkginclude_HEADERS = clamav.h
+ 
+ libclamav_la_SOURCES = \
+ 	matcher-ac.c \
+diff -urNp -x '*.orig' clamav-0.103.0.org/libclamav.pc.in clamav-0.103.0/libclamav.pc.in
+--- clamav-0.103.0.org/libclamav.pc.in	2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/libclamav.pc.in	2021-04-06 16:40:36.893437739 +0200
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@includedir@/clamav
+ 
+ Name: libclamav
+ Description: A GPL virus scanner
+diff -urNp -x '*.orig' clamav-0.103.0.org/libfreshclam/Makefile.am clamav-0.103.0/libfreshclam/Makefile.am
+--- clamav-0.103.0.org/libfreshclam/Makefile.am	2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/libfreshclam/Makefile.am	2021-04-06 16:40:36.893437739 +0200
+@@ -32,7 +32,7 @@ AM_LIBTOOLFLAGS = --tag CXX
  
- EXTRA_DIST = libfreshclam.map
+ EXTRA_DIST = libfreshclam.map libfreshclam_main.c
  
 -include_HEADERS = libfreshclam.h
 +pkginclude_HEADERS = libfreshclam.h
  
  libfreshclam_la_SOURCES = \
-     $(top_srcdir)/shared/output.c \
+     libfreshclam.c \
diff --git a/clamav-nolibs.patch b/clamav-nolibs.patch
index 6196a05..1d68a6c 100644
--- a/clamav-nolibs.patch
+++ b/clamav-nolibs.patch
@@ -1,6 +1,6 @@
-diff -uNr clamav-0.98.3/m4/reorganization/code_checks/functions.m4 clamav-0.98.3.nolibs/m4/reorganization/code_checks/functions.m4
---- clamav-0.98.3/m4/reorganization/code_checks/functions.m4	2014-05-06 20:39:56.000000000 +0200
-+++ clamav-0.98.3.nolibs/m4/reorganization/code_checks/functions.m4	2014-05-09 10:38:20.376934561 +0200
+diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/code_checks/functions.m4 clamav-0.103.0/m4/reorganization/code_checks/functions.m4
+--- clamav-0.103.0.org/m4/reorganization/code_checks/functions.m4	2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/m4/reorganization/code_checks/functions.m4	2021-04-06 16:39:26.769794467 +0200
 @@ -1,6 +1,10 @@
  AX_CHECK_UNAME_SYSCALL
 +AC_CHECK_FUNC(socket,, [
@@ -10,5 +10,5 @@ diff -uNr clamav-0.98.3/m4/reorganization/code_checks/functions.m4 clamav-0.98.3
  AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])
 +])
  
- AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise])
- AC_FUNC_FSEEKO
+ AC_CHECK_FUNCS_ONCE([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise getnameinfo])
+ AC_CHECK_FUNCS([strndup])
diff --git a/clamav-pld_config.patch b/clamav-pld_config.patch
index 922396a..01b8f80 100644
--- a/clamav-pld_config.patch
+++ b/clamav-pld_config.patch
@@ -1,6 +1,6 @@
-diff -ur clamav-0.97.1/etc//clamav-milter.conf.sample clamav-0.97.1.new/etc//clamav-milter.conf.sample
---- clamav-0.97.1/etc//clamav-milter.conf.sample	2011-01-10 18:48:28.000000000 +0100
-+++ clamav-0.97.1.new/etc//clamav-milter.conf.sample	2011-07-14 18:24:02.801795736 +0200
+diff -urNp -x '*.orig' clamav-0.103.0.org/etc/clamav-milter.conf.sample clamav-0.103.0/etc/clamav-milter.conf.sample
+--- clamav-0.103.0.org/etc/clamav-milter.conf.sample	2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/etc/clamav-milter.conf.sample	2021-04-06 16:38:59.095023292 +0200
 @@ -3,7 +3,7 @@
  ##
  
@@ -10,7 +10,7 @@ diff -ur clamav-0.97.1/etc//clamav-milter.conf.sample clamav-0.97.1.new/etc//cla
  
  
  ##
-@@ -17,12 +17,12 @@
+@@ -17,12 +17,12 @@ Example
  # inet6:port@[hostname|ip-address] - to specify an ipv6 socket
  #
  # Default: no default
@@ -25,8 +25,8 @@ diff -ur clamav-0.97.1/etc//clamav-milter.conf.sample clamav-0.97.1.new/etc//cla
  
  # Sets the permissions on the (unix) milter socket to the specified mode.
  # Default: disabled (obey umask)
-@@ -64,7 +64,7 @@
- # daemon (main thread).
+@@ -64,7 +64,7 @@ Example
+ # also owned by root to keep other users from tampering with it.
  #
  # Default: disabled
 -#PidFile /var/run/clamav-milter.pid
@@ -34,8 +34,8 @@ diff -ur clamav-0.97.1/etc//clamav-milter.conf.sample clamav-0.97.1.new/etc//cla
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -90,7 +90,7 @@
- # with the same socket: clamd servers will be selected in a round-robin fashion.
+@@ -91,7 +91,7 @@ Example
+ # fashion.
  #
  # Default: no default
 -#ClamdSocket tcp:scanner.mydomain:7357
@@ -43,7 +43,7 @@ diff -ur clamav-0.97.1/etc//clamav-milter.conf.sample clamav-0.97.1.new/etc//cla
  
  
  ##
-@@ -238,13 +238,13 @@
+@@ -241,13 +241,13 @@ Example
  # Use system logger (can work together with LogFile).
  #
  # Default: no
@@ -59,9 +59,9 @@ diff -ur clamav-0.97.1/etc//clamav-milter.conf.sample clamav-0.97.1.new/etc//cla
  
  # Enable verbose logging.
  #
-diff -ur clamav-0.97.1/etc//clamd.conf.sample clamav-0.97.1.new/etc//clamd.conf.sample
---- clamav-0.97.1/etc//clamd.conf.sample	2011-05-13 13:25:31.000000000 +0200
-+++ clamav-0.97.1.new/etc//clamd.conf.sample	2011-07-14 18:19:05.824861957 +0200
+diff -urNp -x '*.orig' clamav-0.103.0.org/etc/clamd.conf.sample clamav-0.103.0/etc/clamd.conf.sample
+--- clamav-0.103.0.org/etc/clamd.conf.sample	2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/etc/clamd.conf.sample	2021-04-06 16:38:59.095023292 +0200
 @@ -5,13 +5,13 @@
  
  
@@ -78,7 +78,7 @@ diff -ur clamav-0.97.1/etc//clamd.conf.sample 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 @@ Example
  
  # Use system logger (can work together with LogFile).
  # Default: no
@@ -93,16 +93,16 @@ diff -ur clamav-0.97.1/etc//clamd.conf.sample clamav-0.97.1.new/etc//clamd.conf.
  
  # Enable verbose logging.
  # Default: no
-@@ -58,7 +58,7 @@
- # This option allows you to save a process identifier of the listening
- # daemon (main thread).
+@@ -74,7 +74,7 @@ Example
+ # It is recommended that the directory where this file is stored is
+ # also owned by root to keep other users from tampering with it.
  # Default: disabled
 -#PidFile /var/run/clamd.pid
 +PidFile /var/run/clamav/clamd.pid
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -77,11 +77,11 @@
+@@ -93,11 +93,11 @@ Example
  
  # Path to a local socket file the daemon will listen on.
  # Default: disabled (must be specified by a user)
@@ -116,7 +116,7 @@ diff -ur clamav-0.97.1/etc//clamd.conf.sample 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)
-@@ -204,7 +204,7 @@ LocalSocket /var/lib/clamav/clamd.socket
+@@ -216,7 +216,7 @@ Example
  
  # Run as another user (clamd must be started by root for this option to work)
  # Default: don't drop privileges
@@ -125,9 +125,9 @@ diff -ur clamav-0.97.1/etc//clamd.conf.sample clamav-0.97.1.new/etc//clamd.conf.
  
  # Stop daemon when libclamav reports out of memory condition.
  #ExitOnOOM yes
-diff -ur clamav-0.97.1/etc//freshclam.conf.sample clamav-0.97.1.new/etc//freshclam.conf.sample
---- clamav-0.97.1/etc//freshclam.conf.sample	2011-01-10 18:48:28.000000000 +0100
-+++ clamav-0.97.1.new/etc//freshclam.conf.sample	2011-07-14 18:14:32.705707450 +0200
+diff -urNp -x '*.orig' clamav-0.103.0.org/etc/freshclam.conf.sample clamav-0.103.0/etc/freshclam.conf.sample
+--- clamav-0.103.0.org/etc/freshclam.conf.sample	2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/etc/freshclam.conf.sample	2021-04-06 16:38:59.095023292 +0200
 @@ -3,9 +3,14 @@
  ## Please read the freshclam.conf(5) manual before editing this file.
  ##
@@ -144,7 +144,7 @@ diff -ur clamav-0.97.1/etc//freshclam.conf.sample clamav-0.97.1.new/etc//freshcl
  
  # Path to the database directory.
  # WARNING: It must match clamd.conf's directive!
-@@ -30,7 +35,7 @@
+@@ -35,7 +40,7 @@ Example
  
  # Use system logger (can work together with UpdateLogFile).
  # Default: no
@@ -153,16 +153,16 @@ diff -ur clamav-0.97.1/etc//freshclam.conf.sample clamav-0.97.1.new/etc//freshcl
  
  # Specify the type of syslog messages - please refer to 'man syslog'
  # for facility names.
-@@ -48,7 +53,7 @@
+@@ -56,7 +61,7 @@ Example
  # 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)
 -#DatabaseOwner clamav
 +DatabaseOwner clamav
  
- # Initialize supplementary group access (freshclam must be started by root).
- # Default: no
-@@ -96,7 +101,7 @@
+ # Use DNS to verify virus database version. Freshclam uses DNS TXT records
+ # to verify database and software versions. With this directive you can change
+@@ -115,7 +120,7 @@ DatabaseMirror database.clamav.net
  
  # Number of database checks per day.
  # Default: 12 (every two hours)
@@ -170,8 +170,8 @@ diff -ur clamav-0.97.1/etc//freshclam.conf.sample clamav-0.97.1.new/etc//freshcl
 +Checks 2
  
  # Proxy settings
- # Default: disabled
-@@ -118,7 +123,7 @@
+ # The HTTPProxyServer may be prefixed with [scheme]:// to specify which kind
+@@ -145,7 +150,7 @@ DatabaseMirror database.clamav.net
  
  # Send the RELOAD command to clamd.
  # Default: no
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/clamav.git/commitdiff/4cb842b3202e45efcb54656d1a9046c7a9088993

More information about the pld-cvs-commit mailing list