pool/clamav
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 601641 from security

Browse Source 
- Update to version 0.100.0 (bsc#1089502):
  * Add interfaces to the Prelude SIEM open source package for
    collecting ClamAV virus events.
  * Support libmspack internal code or as a shared object
    library. The internal library is the default and includes
    modifications to enable parsing of CAB files that do not
    entirely adhere to the CAB file format.
  * Link with OpenSSL 1.1.0.
  * Deprecate of the AllowSupplementaryGroups parameter
    statement in clamd, clamav-milter, and freshclam.
    Use of supplementary is now in effect by default.
  * Deprecate internal LLVM code support.
  * Compute and check PE import table hash (a.k.a. "imphash")
    signatures.
  * Support file property collection and analysis for MHTML files.
  * Raw scanning of PostScript files.
  * Fix clamsubmit to use the new virus and false positive
    submission web interface.
  * Optionally, flag files with the virus
    "Heuristic.Limits.Exceeded" when size limitations are exceeded.
  * Improved decoders for PDF files.
  * Reduced number of compile time warnings.
  * Improved support for C++11.
  * Improved detection of system installed libraries.
  * Fixes to ClamAV's Container system and the introduction of
    Intermediates for more descriptive signatures.
  * Improvements to clamd's On-Access scanning capabilities
    for Linux.
  * Obsoletes clamav-fix_newer_zlib.patch
- Update key ring and add signature file.

OBS-URL: https://build.opensuse.org/request/show/601641
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/clamav?expand=0&rev=94
This commit is contained in:
Dominique Leuenberger 2018-04-29 17:37:28 +00:00 committed by Git OBS Bridge
commit 3c1da791e3
10 changed files with 194 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clamav-0.100.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c5c5edaf75a3c53ac0f271148fd6447310bce53f448ec7e6205124a25918f65c
size 16036757

16
clamav-0.100.0.tar.gz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJay4N+AAoJEPE/nha8pb+tUiEP/isw/OZ5t183XjjPVV3wtIH1
xbPkCG5/842Ui8Dd2G14VUEW+abUDueBU1Fn4hPixGVOmXiEmltwlM2R6+qjutVO
al18jCkJXMq9sfqO0pMom8NDf3mNu9sy3oqARekrnLO1JZI0w5HKAAJg3VaCBBEZ
YD7XxtuO8R1R9BBSAwx4E1NG9skQ+WAJVlT7ckWCuqW6SafIsqnM2f9KV1lYitod
7mXl72nPQA3xkiqri1XLZrkiViZyzX5q3LRYdADlHk79MmDZuaaVIfza42SEYjQm
TYTh5vvi1yUz6qhALFfbqOdOTQLri0gZp00xlmH+5MhVcnHZVAfzA3R57VcleD+o
LpC9WUAEUL3D15KQlLhrV7Y0D82M79jJDXExRM2TozjUnA3WrQRZZqlJg5iEBHcu
VP/O7hLNslm8SFRd1SHQ7C4D7X9odW3D64QySEpx9TyUWSesQg/hSO3F9Xj6eBRy
JWYc90iu8DFedR+QrkwnMIbgbTeYxVjnPwKfI1E8vGrojYFKI3nFATQERRAcnrSz
FjaffXxkMPULKCi8JqcvomlZkj+W1LvZ9OEdtD92nz4mX/C6tHaPy6A2alByHElp
CMXYc8IIT3WWFV73O17xBdLhpyJRnmuHQ3IpJMKXh89lgX+t/ABAkWlmQsLy9PpH
SlfPF6qoRTu2fSlQmEJu
=KvcM
-----END PGP SIGNATURE-----

3
clamav-0.99.4.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d72ac3273bde8d2e5e28ec9978373ee3ab4529fd868bc3fc4d2d2671228f2461
size 16083015

73
clamav-conf.patch
View File

@ -1,7 +1,5 @@
Index: clamav-0.98.3/etc/clamav-milter.conf.sample --- etc/clamav-milter.conf.sample.orig
=================================================================== +++ 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
@@ -2,10 +2,6 @@ @@ -2,10 +2,6 @@
## Example config file for clamav-milter ## Example config file for clamav-milter
## ##
@ -13,7 +11,7 @@ Index: clamav-0.98.3/etc/clamav-milter.conf.sample
## ##
## Main options ## Main options
## ##
@@ -17,8 +13,7 @@ @@ -17,8 +13,7 @@ Example
# inet6:port@[hostname|ip-address] - to specify an ipv6 socket # inet6:port@[hostname|ip-address] - to specify an ipv6 socket
# #
# Default: no default # 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. # Define the group ownership for the (unix) milter socket.
# Default: disabled (the primary group of the user running clamd) # Default: disabled (the primary group of the user running clamd)
@@ -36,7 +31,7 @@ @@ -37,7 +32,7 @@ Example
# Run as another user (clamav-milter must be started by root for this option to work) # to work)
# #
# Default: unset (don't drop privileges) # Default: unset (don't drop privileges)
-#User clamav -#User clamav
+User vscan +User vscan
# Initialize supplementary group access (clamav-milter must be started by root). # Waiting for data from clamd will timeout after this time (seconds).
# # Value of 0 disables the timeout.
@@ -64,7 +59,7 @@ @@ -61,7 +56,7 @@ Example
# daemon (main thread). # daemon (main thread).
# #
# Default: disabled # Default: disabled
@ -41,8 +39,8 @@ Index: clamav-0.98.3/etc/clamav-milter.conf.sample
# Optional path to the global temporary directory. # Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp). # Default: system specific (usually /tmp or /var/tmp).
@@ -90,7 +85,7 @@ @@ -88,7 +83,7 @@ Example
# with the same socket: clamd servers will be selected in a round-robin fashion. # fashion.
# #
# Default: no default # Default: no default
-#ClamdSocket tcp:scanner.mydomain:7357 -#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). # Use system logger (can work together with LogFile).
# #
# Default: no # Default: no
@ -66,10 +64,8 @@ Index: clamav-0.98.3/etc/clamav-milter.conf.sample
# Enable verbose logging. # Enable verbose logging.
# #
Index: clamav-0.98.3/etc/clamd.conf.sample --- etc/clamd.conf.sample.orig
=================================================================== +++ 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
@@ -1,12 +1,8 @@ @@ -1,12 +1,8 @@
## ##
-## Example config file for the Clam AV daemon -## 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. # Uncomment this option to enable logging.
# LogFile must be writable for the user running daemon. # LogFile must be writable for the user running daemon.
# A full path is required. # A full path is required.
@@ -41,12 +37,12 @@ @@ -41,12 +37,12 @@ Example
# Use system logger (can work together with LogFile). # Use system logger (can work together with LogFile).
# Default: no # Default: no
@ -99,7 +95,7 @@ Index: clamav-0.98.3/etc/clamd.conf.sample
# Enable verbose logging. # Enable verbose logging.
# Default: no # Default: no
@@ -63,7 +59,7 @@ @@ -71,7 +67,7 @@ Example
# This option allows you to save a process identifier of the listening # This option allows you to save a process identifier of the listening
# daemon (main thread). # daemon (main thread).
# Default: disabled # Default: disabled
@ -108,7 +104,7 @@ Index: clamav-0.98.3/etc/clamd.conf.sample
# Optional path to the global temporary directory. # Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp). # 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. # Path to a local socket file the daemon will listen on.
# Default: disabled (must be specified by a user) # 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. # Sets the group ownership on the unix socket.
# Default: disabled (the primary group of the user running clamd) # Default: disabled (the primary group of the user running clamd)
@@ -98,7 +94,7 @@ @@ -106,7 +102,7 @@ Example
# TCP port address. # TCP port address.
# Default: no # Default: no
@ -126,7 +122,7 @@ Index: clamav-0.98.3/etc/clamd.conf.sample
# TCP address. # TCP address.
# By default we bind to INADDR_ANY, probably not wise. # 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 # from the outside world. This option can be specified multiple
# times if you want to listen on multiple IPs. IPv6 is now supported. # times if you want to listen on multiple IPs. IPv6 is now supported.
# Default: no # 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. # Maximum length the queue of pending connections may grow to.
# Default: 200 # 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) # Run as another user (clamd must be started by root for this option to work)
# Default: don't drop privileges # Default: don't drop privileges
-#User clamav -#User clamav
+User vscan +User vscan
# Initialize supplementary group access (clamd must be started by root). # Stop daemon when libclamav reports out of memory condition.
# Default: no #ExitOnOOM yes
@@ -525,6 +521,10 @@ @@ -598,6 +594,10 @@ Example
## ##
## On-access Scan Settings ## 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. # Enable on-access scanning. Currently, this is supported via fanotify.
# Clamuko/Dazuko support has been deprecated. # Clamuko/Dazuko support has been deprecated.
Index: clamav-0.98.3/etc/freshclam.conf.sample --- etc/freshclam.conf.sample.orig
=================================================================== +++ 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
@@ -1,12 +1,8 @@ @@ -1,12 +1,8 @@
## ##
-## Example config file for freshclam -## Example config file for freshclam
@ -173,7 +167,7 @@ Index: clamav-0.98.3/etc/freshclam.conf.sample
# Path to the database directory. # Path to the database directory.
# WARNING: It must match clamd.conf's directive! # WARNING: It must match clamd.conf's directive!
# Default: hardcoded (depends on installation options) # Default: hardcoded (depends on installation options)
@@ -35,12 +31,12 @@ @@ -35,12 +31,12 @@ Example
# Use system logger (can work together with UpdateLogFile). # Use system logger (can work together with UpdateLogFile).
# Default: no # Default: no
@ -188,7 +182,7 @@ Index: clamav-0.98.3/etc/freshclam.conf.sample
# Enable log rotation. Always enabled when LogFileMaxSize is enabled. # Enable log rotation. Always enabled when LogFileMaxSize is enabled.
# Default: no # Default: no
@@ -48,12 +44,12 @@ @@ -48,12 +44,12 @@ Example
# This option allows you to save the process identifier of the daemon # This option allows you to save the process identifier of the daemon
# Default: disabled # Default: disabled
@ -201,9 +195,9 @@ Index: clamav-0.98.3/etc/freshclam.conf.sample
-#DatabaseOwner clamav -#DatabaseOwner clamav
+DatabaseOwner vscan +DatabaseOwner vscan
# Initialize supplementary group access (freshclam must be started by root). # Use DNS to verify virus database version. Freshclam uses DNS TXT records
# Default: no # to verify database and software versions. With this directive you can change
@@ -136,7 +132,7 @@ @@ -132,7 +128,7 @@ DatabaseMirror database.clamav.net
# Send the RELOAD command to clamd. # Send the RELOAD command to clamd.
# Default: no # Default: no
@ -212,12 +206,3 @@ Index: clamav-0.98.3/etc/freshclam.conf.sample
# Run command after successful database update. # Run command after successful database update.
# Default: disabled # 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

14
clamav-disable-timestamps.patch
View File

@ -27,7 +27,7 @@
strncat(buf, "WARNING: sizeof(fp_digit) == sizeof(fp_word), this build is likely to not work properly.\n", strncat(buf, "WARNING: sizeof(fp_digit) == sizeof(fp_word), this build is likely to not work properly.\n",
--- configure.orig --- configure.orig
+++ configure +++ configure
@@ -785,6 +785,7 @@ FGREP @@ -800,6 +800,7 @@ FGREP
SED SED
LIBTOOL LIBTOOL
LIBCLAMAV_VERSION LIBCLAMAV_VERSION
@ -35,7 +35,7 @@
EGREP EGREP
GREP GREP
CPP CPP
@@ -887,6 +888,7 @@ ac_user_opts=' @@ -902,6 +903,7 @@ ac_user_opts='
enable_option_checking enable_option_checking
enable_silent_rules enable_silent_rules
enable_dependency_tracking enable_dependency_tracking
@ -43,16 +43,16 @@
enable_static enable_static
enable_shared enable_shared
with_pic with_pic
@@ -1594,6 +1596,8 @@ Optional Features: @@ -1616,6 +1618,8 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build --disable-dependency-tracking
--enable-dependency-tracking do not reject slow dependency extractors speeds up one-time build
--enable-static[=PKGS] build static libraries [default=no] --enable-static[=PKGS] build static libraries [default=no]
+ --enable-timestamps Enable embedding timestamp information in build + --enable-timestamps Enable embedding timestamp information in build
+ (default is YES) + (default is YES)
--enable-shared[=PKGS] build shared libraries [default=yes] --enable-shared[=PKGS] build shared libraries [default=yes]
--enable-fast-install[=PKGS] --enable-fast-install[=PKGS]
optimize for fast installation [default=yes] optimize for fast installation [default=yes]
@@ -4989,6 +4993,26 @@ $as_echo "$ac_cv_safe_to_define___extens @@ -5211,6 +5215,26 @@ $as_echo "$ac_cv_safe_to_define___extens
$as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
@ -78,4 +78,4 @@
+_ACEOF +_ACEOF
VERSION="0.99.4" VERSION="0.100.0"

52
clamav-fix_newer_zlib.patch
View File

@ -1,52 +0,0 @@
Description: fix compatibility with zlib 1.2.9 and newer
Author: Marc Deslauriers <marc.deslauriers@canonical.com>
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/clamav/+bug/1692073
Index: clamav-0.99.2+dfsg/libclamav/bytecode_api.c
===================================================================
--- clamav-0.99.2+dfsg.orig/libclamav/bytecode_api.c 2017-08-08 15:20:06.651685637 -0400
+++ clamav-0.99.2+dfsg/libclamav/bytecode_api.c 2017-08-15 15:45:14.645714766 -0400
@@ -811,8 +811,20 @@ int32_t cli_bcapi_inflate_init(struct cl
cli_dbgmsg("bytecode api: inflate_init: invalid buffers!\n");
return -1;
}
- memset(&stream, 0, sizeof(stream));
- ret = inflateInit2(&stream, windowBits);
+
+ b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
+ if (!b) {
+ return -1;
+ }
+ ctx->inflates = b;
+ ctx->ninflates = n;
+ b = &b[n-1];
+
+ b->from = from;
+ b->to = to;
+ b->needSync = 0;
+ memset(&b->stream, 0, sizeof(stream));
+ ret = inflateInit2(&b->stream, windowBits);
switch (ret) {
case Z_MEM_ERROR:
cli_dbgmsg("bytecode api: inflateInit2: out of memory!\n");
@@ -829,20 +841,6 @@ int32_t cli_bcapi_inflate_init(struct cl
cli_dbgmsg("bytecode api: inflateInit2: unknown error %d\n", ret);
return -1;
}
-
- b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
- if (!b) {
- inflateEnd(&stream);
- return -1;
- }
- ctx->inflates = b;
- ctx->ninflates = n;
- b = &b[n-1];
-
- b->from = from;
- b->to = to;
- b->needSync = 0;
- memcpy(&b->stream, &stream, sizeof(stream));
return n-1;
}

16
clamav-obsolete-config.patch Normal file
View File

@ -0,0 +1,16 @@
--- shared/optparser.c.orig
+++ shared/optparser.c
@@ -505,6 +505,13 @@ const struct clam_option __clam_options[
{ "ClamukoExcludeUID", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, -1, NULL, FLAG_MULTIPLE, OPT_CLAMD | OPT_DEPRECATED, "", "" },
{ "ClamukoMaxFileSize", NULL, 0, CLOPT_TYPE_SIZE, MATCH_SIZE, 5242880, NULL, 0, OPT_CLAMD | OPT_DEPRECATED, "", "" },
{ "AllowSupplementaryGroups", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER | OPT_DEPRECATED, "Initialize a supplementary group access (the process must be started by root).", "no" },
+ { "StatsHostID", "stats-host-id", 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_CLAMD | OPT_CLAMSCAN | OPT_DEPRECATED, "", "" },
+ { "StatsEnabled", "enable-stats", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_CLAMSCAN | OPT_DEPRECATED, "", "" },
+ { "StatsPEDisabled", "disable-pe-stats", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN | OPT_DEPRECATED, "", "" },
+ { "StatsTimeout", "stats-timeout", 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, -1, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN | OPT_FRESHCLAM | OPT_DEPRECATED, "", "" },
+ { "SubmitDetectionStats", NULL, 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_DEPRECATED, "", "" },
+ { "DetectionStatsCountry", NULL, 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_DEPRECATED, "", "" },
+ { "DetectionStatsHostID", NULL, 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_DEPRECATED, "", "" },
/* Milter specific options */

44
clamav.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Thu Apr 26 15:35:15 UTC 2018 - max@suse.com
- Update to version 0.100.0 (bsc#1089502):
* Add interfaces to the Prelude SIEM open source package for
collecting ClamAV virus events.
* Support libmspack internal code or as a shared object
library. The internal library is the default and includes
modifications to enable parsing of CAB files that do not
entirely adhere to the CAB file format.
* Link with OpenSSL 1.1.0.
* Deprecate of the AllowSupplementaryGroups parameter
statement in clamd, clamav-milter, and freshclam.
Use of supplementary is now in effect by default.
* Deprecate internal LLVM code support.
* Compute and check PE import table hash (a.k.a. "imphash")
signatures.
* Support file property collection and analysis for MHTML files.
* Raw scanning of PostScript files.
* Fix clamsubmit to use the new virus and false positive
submission web interface.
* Optionally, flag files with the virus
"Heuristic.Limits.Exceeded" when size limitations are exceeded.
* Improved decoders for PDF files.
* Reduced number of compile time warnings.
* Improved support for C++11.
* Improved detection of system installed libraries.
* Fixes to ClamAV's Container system and the introduction of
Intermediates for more descriptive signatures.
* Improvements to clamd's On-Access scanning capabilities
for Linux.
* Obsoletes clamav-fix_newer_zlib.patch
- Update key ring and add signature file.
- Turn off LLVM for now, because the bundled copy is deprecated,
the versions we have are too new and the performance gain over
the byte code interpreter are negligable, according to upstream.
- Move pkgconfig stuff from main to devel package.
- Re-introduce removed options as deprecated, so that clamd and
freshclam don't exit on startup with an old config file
(clamav-obsolete-config.patch).
- Put libclammspack0 into its own subpackage to follow the letter
of the shlib packaging policy, even though it really makes no
sense here.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 7 13:15:11 UTC 2018 - max@suse.com Wed Mar 7 13:15:11 UTC 2018 - max@suse.com

89
clamav.keyring
View File

@ -1,43 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK----- -----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.19 (GNU/Linux)
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
MjiCtk3kDuDp Vu75o5C/aagNghMPdAKCGf4DbYcBd8FzM7EHZspMcG5/rrE9zX9zYlcdD8KAN5Nm
=xBx3 ZZQz6+htMzD6ROdJWjkdnIpZvAb/6weSpj9ZI1hAhMr+2+kU13fUk70x2cWGMVsT
LpTjOo4ad0Qec5/s4MZ7enGz34DJLLCIzcA3K2S6AxO4cucord6onIkgikDq0LvX
RfMp18n+0vlEk6msuhSYAi04iPAS/mbYCpsuNMQefF6LJmICMpn2Vm4TOW6GMIa9
lilC0oodVYYCKvhdXWB1MRoO5axnxSrNNLm8s7pxR5NzRvLxBiBxVqAJuw4rvFxN
4BZ5M1JSZWu2Rcz+xeh/szXRmWUbLScr4hwQRBSi2efiqPYjkWmxk8MJ5pHvwNK1
DO33H3btRriWK7RZYRYq2Bjpuo8iGevgZ5pyiJkX1p72UehkC6ogGgW2ULgolIUa
LkZivq7Z2vICdouOKAhA2/QaQG0mA7O7RdOLWPX7EH720e4yqUPH9Hxv95EAeYkr
4Zg38cdiIevqjwUOwjMpxtIAj3ol+OvBFbiqJW5PICm7vi5HMIXuwQ6aIgSVDfic
Tjaszr4bkQdr3OpqhR4+ZN5/BAKY4IIzMmvF6v1X8s9DtzjFFg==
=rmWe
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----

55
clamav.spec
View File

@ -17,34 +17,28 @@
Name: clamav Name: clamav
BuildRequires: ncurses-devel
BuildRequires: sed
BuildRequires: sendmail-devel
%define llvm --disable-llvm
BuildRequires: bc
BuildRequires: pkgconfig
BuildRequires: zlib-devel
%ifarch %ix86 x86_64
%define llvm --enable-llvm
# Needed for compiling LLVM.
BuildRequires: gcc-c++
%endif
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: bc
BuildRequires: check-devel BuildRequires: check-devel
BuildRequires: libbz2-devel BuildRequires: libbz2-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: ncurses-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: pwdutils BuildRequires: pwdutils
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: sed
BuildRequires: sendmail-devel
BuildRequires: zlib-devel
%define clamav_check --enable-check %define clamav_check --enable-check
Summary: Antivirus Toolkit Summary: Antivirus Toolkit
License: GPL-2.0 License: GPL-2.0-only
Group: Productivity/Security Group: Productivity/Security
Version: 0.99.4 Version: 0.100.0
Release: 0 Release: 0
Url: http://www.clamav.net Url: http://www.clamav.net
Obsoletes: clamav-db < 0.88.3 Obsoletes: clamav-db < 0.88.3
@ -53,6 +47,7 @@ Obsoletes: clamav-nodb <= 0.98.4
Requires(pre): %_sbindir/groupadd %_sbindir/useradd %_sbindir/usermod Requires(pre): %_sbindir/groupadd %_sbindir/useradd %_sbindir/usermod
Requires(pre): /usr/bin/awk /bin/sed /bin/tar Requires(pre): /usr/bin/awk /bin/sed /bin/tar
Source0: http://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz Source0: http://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz
Source1: http://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz.sig
Source11: clamav.keyring Source11: clamav.keyring
Source4: clamav-rpmlintrc Source4: clamav-rpmlintrc
Source6: clamav-tmpfiles.conf Source6: clamav-tmpfiles.conf
@ -61,7 +56,7 @@ Source8: service.freshclam
Source9: service.clamav-milter Source9: service.clamav-milter
Patch1: clamav-conf.patch Patch1: clamav-conf.patch
Patch4: clamav-disable-timestamps.patch Patch4: clamav-disable-timestamps.patch
Patch5: clamav-fix_newer_zlib.patch Patch5: clamav-obsolete-config.patch
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
%systemd_requires %systemd_requires
@ -84,6 +79,14 @@ Group: System/Libraries
ClamAV is an antivirus engine designed for detecting trojans, ClamAV is an antivirus engine designed for detecting trojans,
viruses, malware and other malicious threats. viruses, malware and other malicious threats.
%package -n libclammspack0
Summary: ClamAV antivirus engine runtime
Group: System/Libraries
%description -n libclammspack0
ClamAV is an antivirus engine designed for detecting trojans,
viruses, malware and other malicious threats.
%package devel %package devel
Summary: Development files for libclamav, an antivirus engine Summary: Development files for libclamav, an antivirus engine
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -98,9 +101,9 @@ that want to make use of libclamav.
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1
%patch4 %patch4
%patch5 -p1 %patch5
%build %build
CFLAGS="-fstack-protector" CFLAGS="-fstack-protector"
@ -120,7 +123,6 @@ CFLAGS="$CFLAGS -DFP_64BIT"
--with-group=vscan \ --with-group=vscan \
--enable-milter \ --enable-milter \
%clamav_check \ %clamav_check \
%llvm \
--enable-clamdtop \ --enable-clamdtop \
--disable-zlib-vcheck \ --disable-zlib-vcheck \
--disable-timestamps --disable-timestamps
@ -135,8 +137,11 @@ install -m644 %{S:6} %buildroot%_tmpfilesdir/clamav.conf
mkdir -p %buildroot/var/spool/amavis mkdir -p %buildroot/var/spool/amavis
mkdir -p -m 0755 %buildroot/run/clamav mkdir -p -m 0755 %buildroot/run/clamav
rm %buildroot/%_libdir/*.la rm %buildroot/%_libdir/*.la
# Remove bogus dependencies from libclamav.pc
sed -i 's/^Libs: .*/Libs: -lclamav/' %buildroot%_libdir/pkgconfig/libclamav.pc # libclammspack is not meant to be linked against by anything but
# libclamav
rm %buildroot%_libdir/pkgconfig/libclammspack.pc
rm %buildroot%_libdir/libclammspack.so
# fix the new config file names # fix the new config file names
pushd %buildroot/etc pushd %buildroot/etc
@ -170,30 +175,30 @@ VALGRIND_GENSUP=1 make check
%postun -n libclamav7 -p /sbin/ldconfig %postun -n libclamav7 -p /sbin/ldconfig
%files %files
%defattr(-,root,root,-)
%config(noreplace) %_sysconfdir/*.conf %config(noreplace) %_sysconfdir/*.conf
#systemd... #systemd...
%{_unitdir}/clamd.service %{_unitdir}/clamd.service
%{_unitdir}/freshclam.service %{_unitdir}/freshclam.service
%{_unitdir}/clamav-milter.service %{_unitdir}/clamav-milter.service
%_tmpfilesdir %_tmpfilesdir
%doc AUTHORS BUGS ChangeLog COPYING FAQ NEWS README UPGRADE %doc COPYING*
%doc docs/*.pdf docs/html %doc docs/*.pdf docs/html
%doc %_mandir/*/* %doc %_mandir/*/*
%_bindir/* %_bindir/*
%_sbindir/* %_sbindir/*
%_libdir/pkgconfig/libclamav.pc
%defattr(-,vscan,vscan) %defattr(-,vscan,vscan)
%dir %attr(750,vscan,vscan) /var/spool/amavis %dir %attr(750,vscan,vscan) /var/spool/amavis
%dir /var/lib/clamav %dir /var/lib/clamav
%ghost %attr(755,vscan,vscan) /run/clamav %ghost %attr(755,vscan,vscan) /run/clamav
%files -n libclamav7 %files -n libclamav7
%defattr(-,root,root)
%_libdir/libclam*.so.7* %_libdir/libclam*.so.7*
%files -n libclammspack0
%_libdir/libclammspack.so.0*
%files devel %files devel
%defattr(-,root,root) %_libdir/pkgconfig/*
%_libdir/libclam*.so %_libdir/libclam*.so
%_includedir/* %_includedir/*