Accepting request 37394 from security

Copy from security/clamav based on submit request 37394 from user rmax

OBS-URL: https://build.opensuse.org/request/show/37394
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/clamav?expand=0&rev=28

clamav-conf.patch

@@ -1,4 +1,6 @@
---- etc/clamav-milter.conf
+Index: etc/clamav-milter.conf
+===================================================================
+--- etc/clamav-milter.conf.orig
 +++ etc/clamav-milter.conf
 @@ -2,10 +2,6 @@
  ## Example config file for clamav-milter
@@ -11,7 +13,7 @@
  ##
  ## Main options
  ##
-@@ -17,8 +13,7 @@
+@@ -17,8 +13,7 @@ Example
  # inet6:port@[hostname|ip-address] - to specify an ipv6 socket
  #
  # Default: no default
@@ -19,9 +21,9 @@
 -#MilterSocket inet:7357
 +MilterSocket /var/lib/clamav/clamav-milter-socket
  
- # Remove stale socket after unclean shutdown.
- #
-@@ -28,7 +23,7 @@
+ # Define the group ownership for the (unix) milter socket.
+ # Default: disabled (the primary group of the user running clamd)
+@@ -36,7 +31,7 @@ Example
  # Run as another user (clamav-milter must be started by root for this option to work)
  #
  # Default: unset (don't drop privileges)
@@ -30,7 +32,7 @@
  
  # Initialize supplementary group access (clamav-milter must be started by root).
  #
-@@ -56,7 +51,7 @@
+@@ -64,7 +59,7 @@ Example
  # daemon (main thread).
  #
  # Default: disabled
@@ -39,7 +41,7 @@
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -82,7 +77,7 @@
+@@ -90,7 +85,7 @@ Example
  # with the same socket: clamd servers will be selected in a round-robin fashion.
  #
  # Default: no default
@@ -48,7 +50,7 @@
  
  
  ##
-@@ -193,13 +188,13 @@
+@@ -222,13 +217,13 @@ Example
  # Use system logger (can work together with LogFile).
  #
  # Default: no
@@ -64,7 +66,9 @@
  
  # Enable verbose logging.
  #
---- etc/clamd.conf
+Index: etc/clamd.conf
+===================================================================
+--- etc/clamd.conf.orig
 +++ etc/clamd.conf
 @@ -1,12 +1,8 @@
  ##
@@ -80,7 +84,7 @@
  # Uncomment this option to enable logging.
  # LogFile must be writable for the user running daemon.
  # A full path is required.
-@@ -40,12 +36,12 @@
+@@ -40,12 +36,12 @@ Example
  
  # Use system logger (can work together with LogFile).
  # Default: no
@@ -95,7 +99,7 @@
  
  # Enable verbose logging.
  # Default: no
-@@ -54,7 +50,7 @@
+@@ -54,7 +50,7 @@ Example
  # This option allows you to save a process identifier of the listening
  # daemon (main thread).
  # Default: disabled
@@ -104,16 +108,16 @@
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -69,7 +65,7 @@
+@@ -73,7 +69,7 @@ Example
  
  # Path to a local socket file the daemon will listen on.
  # Default: disabled (must be specified by a user)
--LocalSocket /tmp/clamd.socket
+-#LocalSocket /tmp/clamd.socket
 +LocalSocket /var/lib/clamav/clamd-socket
  
- # Remove stale socket after unclean shutdown.
- # Default: yes
-@@ -77,14 +73,14 @@
+ # Sets the group ownership on the unix socket.
+ # Default: disabled (the primary group of the user running clamd)
+@@ -89,14 +85,14 @@ Example
  
  # TCP port address.
  # Default: no
@@ -130,7 +134,7 @@
  
  # Maximum length the queue of pending connections may grow to.
  # Default: 15
-@@ -147,7 +143,7 @@
+@@ -183,7 +179,7 @@ Example
  
  # Run as another user (clamd must be started by root for this option to work)
  # Default: don't drop privileges
@@ -139,10 +143,10 @@
  
  # Initialize supplementary group access (clamd must be started by root).
  # Default: no
-@@ -395,6 +391,10 @@
- ##
- 
- # Enable Clamuko. Dazuko (/dev/dazuko) must be configured and running.
+@@ -420,6 +416,10 @@ Example
+ # Enable Clamuko. Dazuko must be configured and running. Clamuko supports
+ # both Dazuko (/dev/dazuko) and DazukoFS (/dev/dazukofs.ctrl). DazukoFS
+ # is the preferred option. For more information please visit www.dazuko.org
 +#
 +# When enabling this, you most probably have to set "User root" above,
 +# so that clamav can access the files to be scanned.
@@ -150,7 +154,9 @@
  # Default: no
  #ClamukoScanOnAccess yes
  
---- etc/freshclam.conf
+Index: etc/freshclam.conf
+===================================================================
+--- etc/freshclam.conf.orig
 +++ etc/freshclam.conf
 @@ -1,12 +1,8 @@
  ##
@@ -166,7 +172,7 @@
  # Path to the database directory.
  # WARNING: It must match clamd.conf's directive!
  # Default: hardcoded (depends on installation options)
-@@ -34,21 +30,21 @@
+@@ -34,21 +30,21 @@ Example
  
  # Use system logger (can work together with UpdateLogFile).
  # Default: no
@@ -192,7 +198,7 @@
  
  # Initialize supplementary group access (freshclam must be started by root).
  # Default: no
-@@ -111,7 +107,7 @@
+@@ -111,7 +107,7 @@ DatabaseMirror database.clamav.net
  
  # Send the RELOAD command to clamd.
  # Default: no
@@ -201,7 +207,7 @@
  
  # Run command after successful database update.
  # Default: disabled
-@@ -148,7 +144,7 @@
+@@ -148,7 +144,7 @@ DatabaseMirror database.clamav.net
  # detected in the field and in what geographic area they are.
  # This feature requires LogTime and LogFile to be enabled in clamd.conf.
  # Default: no