diff --git a/clamav-0.100.1-defaults_locations.patch b/clamav-0.100.1-defaults_locations.patch new file mode 100644 index 0000000..5bcfa2d --- /dev/null +++ b/clamav-0.100.1-defaults_locations.patch @@ -0,0 +1,81 @@ +--- ./clamconf/clamconf.c.orig 2018-07-30 05:28:40.199759145 +0100 ++++ ./clamconf/clamconf.c 2018-07-30 05:30:12.083760295 +0100 +@@ -58,9 +58,9 @@ static struct _cfgfile { + const char *name; + int tool; + } cfgfile[] = { +- { "clamd.conf", OPT_CLAMD }, ++ { "clamd.d/scan.conf", OPT_CLAMD }, + { "freshclam.conf", OPT_FRESHCLAM }, +- { "clamav-milter.conf", OPT_MILTER }, ++ { "mail/clamav-milter.conf", OPT_MILTER }, + { NULL, 0 } + }; + +--- ./platform.h.in.orig 2018-07-30 06:27:54.437257754 +0100 ++++ ./platform.h.in 2018-07-30 06:29:18.920124404 +0100 +@@ -34,9 +34,9 @@ typedef unsigned int in_addr_t; + #define PATHSEP "/" + #endif + +-#define CONFDIR_CLAMD CONFDIR PATHSEP "clamd.conf" ++#define CONFDIR_CLAMD CONFDIR PATHSEP "clamd.d/scan.conf" + #define CONFDIR_FRESHCLAM CONFDIR PATHSEP "freshclam.conf" +-#define CONFDIR_MILTER CONFDIR PATHSEP "clamav-milter.conf" ++#define CONFDIR_MILTER CONFDIR PATHSEP "mail/clamav-milter.conf" + + #define cli_to_utf8_maybe_alloc(x) (x) + #define cli_strdup_to_utf8(x) strdup(x) +--- ./docs/man/clamav-milter.conf.5.in.orig 2018-07-31 02:47:52.768212114 +0100 ++++ ./docs/man/clamav-milter.conf.5.in 2018-07-31 02:48:57.295032444 +0100 +@@ -239,7 +239,7 @@ Default: no + All options expressing a size are limited to max 4GB. Values in excess will be reset to the maximum. + .SH "FILES" + .LP +-@CFGDIR@/clamav-milter.conf ++@CFGDIR@/mail/clamav-milter.conf + .SH "AUTHOR" + .LP + aCaB +--- ./docs/man/clamav-milter.8.in.orig 2018-07-31 02:47:45.154130364 +0100 ++++ ./docs/man/clamav-milter.8.in 2018-07-31 02:48:39.484792893 +0100 +@@ -27,7 +27,7 @@ Print the version number and exit. + Read configuration from FILE. + .SH "FILES" + .LP +-@CFGDIR@/clamav-milter.conf ++@CFGDIR@/mail/clamav-milter.conf + .SH "AUTHOR" + .LP + aCaB +--- ./docs/man/clamd.conf.5.in.orig 2018-07-31 02:52:12.607659460 +0100 ++++ ./docs/man/clamd.conf.5.in 2018-07-31 02:52:37.396992885 +0100 +@@ -703,7 +703,7 @@ Default: no + All options expressing a size are limited to max 4GB. Values in excess will be reset to the maximum. + .SH "FILES" + .LP +-@CFGDIR@/clamd.conf ++@CFGDIR@/clamd.d/scan.conf + .SH "AUTHORS" + .LP + Tomasz Kojm , Kevin Lin +--- ./docs/man/clamd.8.in.orig 2018-07-31 02:51:22.897990849 +0100 ++++ ./docs/man/clamd.8.in 2018-07-31 02:53:22.170595103 +0100 +@@ -7,7 +7,7 @@ clamd \- an anti\-virus daemon + clamd [options] + .SH "DESCRIPTION" + .LP +-The daemon listens for incoming connections on Unix and/or TCP socket and scans files or directories on demand. It reads the configuration from @CFGDIR@/clamd.conf ++The daemon listens for incoming connections on Unix and/or TCP socket and scans files or directories on demand. It reads the configuration from @CFGDIR@/clamd.d/scan.conf + .SH "COMMANDS" + .LP + It's recommended to prefix clamd commands with the letter \fBz\fR (eg. zSCAN) to indicate that the command will be delimited by a NULL character and that clamd should continue reading command data until a NULL character is read. The null delimiter assures that the complete command and its entire argument will be processed as a single command. Alternatively commands may be prefixed with the letter \fBn\fR (e.g. nSCAN) to use a newline character as the delimiter. Clamd replies will honour the requested terminator in turn. +@@ -119,7 +119,7 @@ Reload the signature databases. + Perform a clean exit. + .SH "FILES" + .LP +-@CFGDIR@/clamd.conf ++@CFGDIR@/clamd.d/scan.conf + .SH "CREDITS" + Please check the full documentation for credits. + .SH "AUTHOR" diff --git a/clamav.spec b/clamav.spec index e2e06d1..283fc97 100644 --- a/clamav.spec +++ b/clamav.spec @@ -55,7 +55,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.100.1 -Release: 3%{?dist} +Release: 4%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: https://www.clamav.net/ @@ -106,6 +106,7 @@ Source520: clamd-wrapper Source530: clamd@.service Patch0: clamav-0.100.0-stats-deprecation.patch +Patch1: clamav-0.100.1-defaults_locations.patch Patch24: clamav-0.99-private.patch Patch27: clamav-0.100.0-umask.patch # https://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp?r1=128086&r2=137567 @@ -344,6 +345,7 @@ Empty package just to allow migration of service without stop it and disable it %setup -q -n %{name}-%{version}%{?prerelease} %patch0 -p0 -b .stats-deprecation +%patch1 -p1 -b .default_confs %patch24 -p1 -b .private %patch27 -p1 -b .umask %patch30 -p1 @@ -797,6 +799,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Jul 30 2018 Sérgio Basto - 0.100.1-4 +- Change the default location of configuration files in clamconf, binaries and + man pages, replacing with our default packaging (#859339). + * Sun Jul 29 2018 Sérgio Basto - 0.100.1-3 - Modify group of /var/run/clamd.scan to virusgroup - Add some SELinux notes from (#787434)