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

Accepting request 521169 from security

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/521169
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/clamav?expand=0&rev=87
This commit is contained in:
Dominique Leuenberger 2017-09-07 20:15:04 +00:00 committed by Git OBS Bridge
commit a3e10d76a6
3 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
clamav-fix_newer_zlib.patch Normal file
View File

@ -0,0 +1,52 @@
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;
}

17
clamav.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Aug 21 13:41:14 UTC 2017 - fvogt@suse.com
- Add clamav-fix_newer_zlib.patch from ubuntu packages to fix build with
zlib 1.2.11 (boo#1041201)
-------------------------------------------------------------------
Tue Aug 1 18:40:35 CEST 2017 - ro@suse.de
- pass --disable-zlib-vcheck to fix build in factory
-------------------------------------------------------------------
Mon May 29 14:25:26 UTC 2017 - astieger@suse.com
- provide and obsolete clamav-nodb to trigger it's removal in Leap
bsc#1040662
-------------------------------------------------------------------
Thu Oct 13 07:56:56 UTC 2016 - fweiss@suse.com

7
clamav.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package clamav
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -44,6 +44,8 @@ Version: 0.99.2
Release: 0
Url: http://www.clamav.net
Obsoletes: clamav-db < 0.88.3
Provides: clamav-nodb = %{version}
Obsoletes: clamav-nodb <= 0.98.4
Requires(pre): %_sbindir/groupadd %_sbindir/useradd %_sbindir/usermod
Requires(pre): /usr/bin/awk /bin/sed /bin/tar
Source0: http://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz
@ -56,6 +58,7 @@ Source9: service.clamav-milter
Patch1: clamav-conf.patch
Patch3: clamav-gcc47.patch
Patch4: clamav-disable-timestamps.patch
Patch5: clamav-fix_newer_zlib.patch
BuildRequires: systemd
BuildRequires: systemd-rpm-macros
%systemd_requires
@ -75,6 +78,7 @@ detecting threats.
%patch1 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
CFLAGS="-fstack-protector"
@ -96,6 +100,7 @@ CFLAGS="$CFLAGS -DFP_64BIT"
%clamav_check \
%llvm \
--enable-clamdtop \
--disable-zlib-vcheck \
--disable-timestamps
make V=1 %{?_smp_mflags}