Hello community, here is the log from the commit of package clamav for openSUSE:Factory checked in at 2017-09-07 22:15:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clamav (Old) and /work/SRC/openSUSE:Factory/.clamav.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clamav" Thu Sep 7 22:15:04 2017 rev:87 rq:521169 version:0.99.2 Changes: -------- --- /work/SRC/openSUSE:Factory/clamav/clamav.changes 2016-11-14 20:13:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.clamav.new/clamav.changes 2017-09-07 22:15:51.964552542 +0200 @@ -1,0 +2,17 @@ +Mon Aug 21 13:41:14 UTC 2017 - [email protected] + +- 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 - [email protected] + +- pass --disable-zlib-vcheck to fix build in factory + +------------------------------------------------------------------- +Mon May 29 14:25:26 UTC 2017 - [email protected] + +- provide and obsolete clamav-nodb to trigger it's removal in Leap + bsc#1040662 + +------------------------------------------------------------------- New: ---- clamav-fix_newer_zlib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clamav.spec ++++++ --- /var/tmp/diff_new_pack.mpskeV/_old 2017-09-07 22:15:53.460341760 +0200 +++ /var/tmp/diff_new_pack.mpskeV/_new 2017-09-07 22:15:53.464341197 +0200 @@ -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 @@ 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 @@ 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 @@ %patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build CFLAGS="-fstack-protector" @@ -96,6 +100,7 @@ %clamav_check \ %llvm \ --enable-clamdtop \ + --disable-zlib-vcheck \ --disable-timestamps make V=1 %{?_smp_mflags} ++++++ clamav-fix_newer_zlib.patch ++++++ Description: fix compatibility with zlib 1.2.9 and newer Author: Marc Deslauriers <[email protected]> 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; }
