From 6bacbf20bce09a850fa98751ff92d339be57b517 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 5 Sep 2023 11:38:04 +0200 Subject: [PATCH] Up to 1.2.0 --- clamav-pld_config.patch | 75 +++++++++++++++++++++-------------------- clamav.spec | 4 +-- 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/clamav-pld_config.patch b/clamav-pld_config.patch index 025a69b..e8d1576 100644 --- a/clamav-pld_config.patch +++ b/clamav-pld_config.patch @@ -1,6 +1,6 @@ -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 +diff -ur clamav-1.2.0.org/etc/clamav-milter.conf.sample clamav-1.2.0/etc/clamav-milter.conf.sample +--- clamav-1.2.0.org/etc/clamav-milter.conf.sample 2023-08-27 00:00:24.000000000 +0200 ++++ clamav-1.2.0/etc/clamav-milter.conf.sample 2023-09-05 10:47:53.869998771 +0200 @@ -3,7 +3,7 @@ ## @@ -10,13 +10,11 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/etc/clamav-milter.conf.sample clamav-0 ## -@@ -17,12 +17,12 @@ Example - # inet6:port@[hostname|ip-address] - to specify an ipv6 socket - # - # Default: no default --#MilterSocket /tmp/clamav-milter.socket -+MilterSocket /var/lib/clamav/clamav-milter.socket +@@ -20,10 +20,11 @@ + #MilterSocket /run/clamav/clamav-milter.sock + #MilterSocket /tmp/clamav-milter.sock #MilterSocket inet:7357 ++MilterSocket /var/lib/clamav/clamav-milter.socket # Define the group ownership for the (unix) milter socket. # Default: disabled (the primary group of the user running clamd) @@ -25,25 +23,24 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/etc/clamav-milter.conf.sample clamav-0 # Sets the permissions on the (unix) milter socket to the specified mode. # Default: disabled (obey umask) -@@ -64,7 +64,7 @@ Example - # also owned by root to keep other users from tampering with it. +@@ -66,6 +67,7 @@ # # Default: disabled --#PidFile /var/run/clamav-milter.pid + #PidFile /run/clamav/clamav-milter.pid +PidFile /var/run/clamav/clamav-milter.pid # Optional path to the global temporary directory. # Default: system specific (usually /tmp or /var/tmp). -@@ -91,7 +91,7 @@ Example - # fashion. - # +@@ -94,7 +96,7 @@ # Default: no default --#ClamdSocket tcp:scanner.mydomain:7357 + #ClamdSocket tcp:scanner.mydomain:7357 + #ClamdSocket unix:/run/clamav/clamd.sock +- +ClamdSocket unix:/var/lib/clamav/clamd.socket - ## -@@ -241,13 +241,13 @@ Example + ## Exclusions +@@ -243,13 +245,13 @@ # Use system logger (can work together with LogFile). # # Default: no @@ -59,9 +56,12 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/etc/clamav-milter.conf.sample clamav-0 # Enable verbose logging. # -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 +Only in clamav-1.2.0/etc: clamav-milter.conf.sample~ +Only in clamav-1.2.0/etc: clamav-milter.conf.sample.orig +Only in clamav-1.2.0/etc: clamav-milter.conf.sample.rej +diff -ur clamav-1.2.0.org/etc/clamd.conf.sample clamav-1.2.0/etc/clamd.conf.sample +--- clamav-1.2.0.org/etc/clamd.conf.sample 2023-08-27 00:00:24.000000000 +0200 ++++ clamav-1.2.0/etc/clamd.conf.sample 2023-09-05 10:48:39.263332082 +0200 @@ -5,13 +5,13 @@ @@ -78,7 +78,7 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/etc/clamd.conf.sample clamav-0.103.0/e # By default the log file is locked for writing - the lock protects against # running clamd multiple times (if want to run another clamd, please -@@ -41,12 +41,12 @@ Example +@@ -41,12 +41,12 @@ # Use system logger (can work together with LogFile). # Default: no @@ -93,20 +93,18 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/etc/clamd.conf.sample clamav-0.103.0/e # Enable verbose logging. # Default: no -@@ -74,7 +74,7 @@ Example - # It is recommended that the directory where this file is stored is +@@ -75,6 +75,7 @@ # also owned by root to keep other users from tampering with it. # Default: disabled --#PidFile /var/run/clamd.pid + #PidFile /run/clamav/clamd.pid +PidFile /var/run/clamav/clamd.pid # Optional path to the global temporary directory. # Default: system specific (usually /tmp or /var/tmp). -@@ -93,11 +93,11 @@ Example - - # Path to a local socket file the daemon will listen on. +@@ -100,10 +101,11 @@ # Default: disabled (must be specified by a user) --#LocalSocket /tmp/clamd.socket + #LocalSocket /run/clamav/clamd.sock + #LocalSocket /tmp/clamd.sock +LocalSocket /var/lib/clamav/clamd.socket # Sets the group ownership on the unix socket. @@ -116,7 +114,7 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/etc/clamd.conf.sample clamav-0.103.0/e # Sets the permissions on the unix socket to the specified mode. # Default: disabled (socket is world accessible) -@@ -216,7 +216,7 @@ Example +@@ -224,7 +226,7 @@ # Run as another user (clamd must be started by root for this option to work) # Default: don't drop privileges @@ -125,9 +123,11 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/etc/clamd.conf.sample clamav-0.103.0/e # Stop daemon when libclamav reports out of memory condition. #ExitOnOOM yes -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 +Only in clamav-1.2.0/etc: clamd.conf.sample.orig +Only in clamav-1.2.0/etc: clamd.conf.sample.rej +diff -ur clamav-1.2.0.org/etc/freshclam.conf.sample clamav-1.2.0/etc/freshclam.conf.sample +--- clamav-1.2.0.org/etc/freshclam.conf.sample 2023-08-27 00:00:24.000000000 +0200 ++++ clamav-1.2.0/etc/freshclam.conf.sample 2023-09-05 10:47:06.513332122 +0200 @@ -3,9 +3,14 @@ ## Please read the freshclam.conf(5) manual before editing this file. ## @@ -144,7 +144,7 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/etc/freshclam.conf.sample clamav-0.103 # Path to the database directory. # WARNING: It must match clamd.conf's directive! -@@ -35,7 +40,7 @@ Example +@@ -35,7 +40,7 @@ # Use system logger (can work together with UpdateLogFile). # Default: no @@ -153,7 +153,7 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/etc/freshclam.conf.sample clamav-0.103 # Specify the type of syslog messages - please refer to 'man syslog' # for facility names. -@@ -61,7 +61,7 @@ LogSyslog yes +@@ -57,7 +62,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) @@ -162,7 +162,7 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/etc/freshclam.conf.sample clamav-0.103 # 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 +@@ -116,7 +121,7 @@ # Number of database checks per day. # Default: 12 (every two hours) @@ -171,7 +171,7 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/etc/freshclam.conf.sample clamav-0.103 # Proxy settings # The HTTPProxyServer may be prefixed with [scheme]:// to specify which kind -@@ -150,7 +150,7 @@ Checks 2 +@@ -148,7 +153,7 @@ # Send the RELOAD command to clamd. # Default: no @@ -180,3 +180,4 @@ diff -urNp -x '*.orig' clamav-0.103.0.org/etc/freshclam.conf.sample clamav-0.103 # Run command after successful database update. # Use EXIT_1 to return 1 after successful database update. +Only in clamav-1.2.0/etc: freshclam.conf.sample.orig diff --git a/clamav.spec b/clamav.spec index fb8ac53..8ef5e5a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -23,13 +23,13 @@ Summary: An anti-virus utility for Unix Summary(pl.UTF-8): Narzędzie antywirusowe dla Uniksów Name: clamav -Version: 1.1.0 +Version: 1.2.0 Release: 1 License: GPL v2+ Group: Daemons #Source0Download: http://www.clamav.net/download Source0: http://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz -# Source0-md5: a04158b89b2142b9f5527500988a79bd +# Source0-md5: b918d981b4798efc60fd14eff9cea32d Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}-milter.init -- 2.44.0