- Update to version 0.100.0 (bsc#1089502):

* FIXME: Add upstream changes here before submitting to Factory.
  * Obsoletes clamav-fix_newer_zlib.patch
- Update key ring and add signature file.
- Remove the logic around building the embedded llvm as the
  system-wide llvm is now auto-detected and used.
- Move pc files from the main to the devel package.

OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=161
This commit is contained in:
2018-04-13 15:16:49 +00:00
committed by Git OBS Bridge
parent 1c2fe924d1
commit 506c87a397
9 changed files with 129 additions and 169 deletions

View File

@@ -1,7 +1,5 @@
Index: clamav-0.98.3/etc/clamav-milter.conf.sample
===================================================================
--- clamav-0.98.3.orig/etc/clamav-milter.conf.sample 2014-05-06 20:39:56.000000000 +0200
+++ clamav-0.98.3/etc/clamav-milter.conf.sample 2014-05-08 16:42:14.865949467 +0200
--- etc/clamav-milter.conf.sample.orig
+++ etc/clamav-milter.conf.sample
@@ -2,10 +2,6 @@
## Example config file for clamav-milter
##
@@ -13,7 +11,7 @@ Index: clamav-0.98.3/etc/clamav-milter.conf.sample
##
## Main options
##
@@ -17,8 +13,7 @@
@@ -17,8 +13,7 @@ Example
# inet6:port@[hostname|ip-address] - to specify an ipv6 socket
#
# Default: no default
@@ -23,16 +21,16 @@ Index: clamav-0.98.3/etc/clamav-milter.conf.sample
# Define the group ownership for the (unix) milter socket.
# Default: disabled (the primary group of the user running clamd)
@@ -36,7 +31,7 @@
# Run as another user (clamav-milter must be started by root for this option to work)
@@ -37,7 +32,7 @@ Example
# to work)
#
# Default: unset (don't drop privileges)
-#User clamav
+User vscan
# Initialize supplementary group access (clamav-milter must be started by root).
#
@@ -64,7 +59,7 @@
# Waiting for data from clamd will timeout after this time (seconds).
# Value of 0 disables the timeout.
@@ -61,7 +56,7 @@ Example
# daemon (main thread).
#
# Default: disabled
@@ -41,8 +39,8 @@ Index: clamav-0.98.3/etc/clamav-milter.conf.sample
# Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp).
@@ -90,7 +85,7 @@
# with the same socket: clamd servers will be selected in a round-robin fashion.
@@ -88,7 +83,7 @@ Example
# fashion.
#
# Default: no default
-#ClamdSocket tcp:scanner.mydomain:7357
@@ -50,7 +48,7 @@ Index: clamav-0.98.3/etc/clamav-milter.conf.sample
##
@@ -239,13 +234,13 @@
@@ -238,13 +233,13 @@ Example
# Use system logger (can work together with LogFile).
#
# Default: no
@@ -66,10 +64,8 @@ Index: clamav-0.98.3/etc/clamav-milter.conf.sample
# Enable verbose logging.
#
Index: clamav-0.98.3/etc/clamd.conf.sample
===================================================================
--- clamav-0.98.3.orig/etc/clamd.conf.sample 2014-05-08 16:42:07.318862339 +0200
+++ clamav-0.98.3/etc/clamd.conf.sample 2014-05-08 16:45:03.177891683 +0200
--- etc/clamd.conf.sample.orig
+++ etc/clamd.conf.sample
@@ -1,12 +1,8 @@
##
-## Example config file for the Clam AV daemon
@@ -84,7 +80,7 @@ Index: clamav-0.98.3/etc/clamd.conf.sample
# Uncomment this option to enable logging.
# LogFile must be writable for the user running daemon.
# A full path is required.
@@ -41,12 +37,12 @@
@@ -41,12 +37,12 @@ Example
# Use system logger (can work together with LogFile).
# Default: no
@@ -99,7 +95,7 @@ Index: clamav-0.98.3/etc/clamd.conf.sample
# Enable verbose logging.
# Default: no
@@ -63,7 +59,7 @@
@@ -71,7 +67,7 @@ Example
# This option allows you to save a process identifier of the listening
# daemon (main thread).
# Default: disabled
@@ -108,7 +104,7 @@ Index: clamav-0.98.3/etc/clamd.conf.sample
# Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp).
@@ -82,7 +78,7 @@
@@ -90,7 +86,7 @@ Example
# Path to a local socket file the daemon will listen on.
# Default: disabled (must be specified by a user)
@@ -117,7 +113,7 @@ Index: clamav-0.98.3/etc/clamd.conf.sample
# Sets the group ownership on the unix socket.
# Default: disabled (the primary group of the user running clamd)
@@ -98,7 +94,7 @@
@@ -106,7 +102,7 @@ Example
# TCP port address.
# Default: no
@@ -126,7 +122,7 @@ Index: clamav-0.98.3/etc/clamd.conf.sample
# TCP address.
# By default we bind to INADDR_ANY, probably not wise.
@@ -106,7 +102,7 @@
@@ -114,7 +110,7 @@ Example
# from the outside world. This option can be specified multiple
# times if you want to listen on multiple IPs. IPv6 is now supported.
# Default: no
@@ -135,16 +131,16 @@ Index: clamav-0.98.3/etc/clamd.conf.sample
# Maximum length the queue of pending connections may grow to.
# Default: 200
@@ -192,7 +188,7 @@
@@ -204,7 +200,7 @@ Example
# Run as another user (clamd must be started by root for this option to work)
# Default: don't drop privileges
-#User clamav
+User vscan
# Initialize supplementary group access (clamd must be started by root).
# Default: no
@@ -525,6 +521,10 @@
# Stop daemon when libclamav reports out of memory condition.
#ExitOnOOM yes
@@ -598,6 +594,10 @@ Example
##
## On-access Scan Settings
##
@@ -155,10 +151,8 @@ Index: clamav-0.98.3/etc/clamd.conf.sample
# Enable on-access scanning. Currently, this is supported via fanotify.
# Clamuko/Dazuko support has been deprecated.
Index: clamav-0.98.3/etc/freshclam.conf.sample
===================================================================
--- clamav-0.98.3.orig/etc/freshclam.conf.sample 2014-05-08 16:42:07.349862696 +0200
+++ clamav-0.98.3/etc/freshclam.conf.sample 2014-05-08 16:42:14.866949479 +0200
--- etc/freshclam.conf.sample.orig
+++ etc/freshclam.conf.sample
@@ -1,12 +1,8 @@
##
-## Example config file for freshclam
@@ -173,7 +167,7 @@ Index: clamav-0.98.3/etc/freshclam.conf.sample
# Path to the database directory.
# WARNING: It must match clamd.conf's directive!
# Default: hardcoded (depends on installation options)
@@ -35,12 +31,12 @@
@@ -35,12 +31,12 @@ Example
# Use system logger (can work together with UpdateLogFile).
# Default: no
@@ -188,7 +182,7 @@ Index: clamav-0.98.3/etc/freshclam.conf.sample
# Enable log rotation. Always enabled when LogFileMaxSize is enabled.
# Default: no
@@ -48,12 +44,12 @@
@@ -48,12 +44,12 @@ Example
# This option allows you to save the process identifier of the daemon
# Default: disabled
@@ -201,9 +195,9 @@ Index: clamav-0.98.3/etc/freshclam.conf.sample
-#DatabaseOwner clamav
+DatabaseOwner vscan
# Initialize supplementary group access (freshclam must be started by root).
# Default: no
@@ -136,7 +132,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
@@ -132,7 +128,7 @@ DatabaseMirror database.clamav.net
# Send the RELOAD command to clamd.
# Default: no
@@ -212,12 +206,3 @@ Index: clamav-0.98.3/etc/freshclam.conf.sample
# Run command after successful database update.
# Default: disabled
@@ -179,7 +175,7 @@
# detected in the field and in what geographic area they are.
# Freshclam will connect to clamd in order to get recent statistics.
# Default: no
-#SubmitDetectionStats /path/to/clamd.conf
+#SubmitDetectionStats /etc/clamd.conf
# Country of origin of malware/detection statistics (for statistical
# purposes only). The statistics collector at ClamAV.net will look up