From d24defc9c8df62e67332a7f60f9347ed4ca98b09034425bdd46e31a582c5b3fd Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Mon, 29 May 2017 18:25:35 +0000 Subject: [PATCH 1/3] Accepting request 499026 from home:AndreasStieger:branches:security - provide and obsolete clamav-nodb to trigger it's removal in Leap bsc#1040662 OBS-URL: https://build.opensuse.org/request/show/499026 OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=143 --- clamav.changes | 6 ++++++ clamav.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/clamav.changes b/clamav.changes index 07a17f5..46346be 100644 --- a/clamav.changes +++ b/clamav.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/clamav.spec b/clamav.spec index 39a7495..0d8d8fa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -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 From dcb0ebcbe3cdaaebf96498f81e10bc02c65759132e2fb1eb5f7da63447966b3f Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Tue, 1 Aug 2017 16:41:00 +0000 Subject: [PATCH 2/3] - pass --disable-zlib-vcheck to fix build in factory OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=144 --- clamav.changes | 5 +++++ clamav.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/clamav.changes b/clamav.changes index 46346be..391ba32 100644 --- a/clamav.changes +++ b/clamav.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/clamav.spec b/clamav.spec index 0d8d8fa..11c9461 100644 --- a/clamav.spec +++ b/clamav.spec @@ -98,6 +98,7 @@ CFLAGS="$CFLAGS -DFP_64BIT" %clamav_check \ %llvm \ --enable-clamdtop \ + --disable-zlib-vcheck \ --disable-timestamps make V=1 %{?_smp_mflags} From aff26ed73c73f04b3c738233f344f8dfd8da193b7eb21d9b8815380dc2363ffa Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 5 Sep 2017 14:59:05 +0000 Subject: [PATCH 3/3] Accepting request 519486 from home:favogt:branches:security - Add clamav-fix_newer_zlib.patch from ubuntu packages to fix build with zlib 1.2.11 (boo#1041201) OBS-URL: https://build.opensuse.org/request/show/519486 OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=145 --- clamav-fix_newer_zlib.patch | 52 +++++++++++++++++++++++++++++++++++++ clamav.changes | 6 +++++ clamav.spec | 2 ++ 3 files changed, 60 insertions(+) create mode 100644 clamav-fix_newer_zlib.patch diff --git a/clamav-fix_newer_zlib.patch b/clamav-fix_newer_zlib.patch new file mode 100644 index 0000000..11e9dd9 --- /dev/null +++ b/clamav-fix_newer_zlib.patch @@ -0,0 +1,52 @@ +Description: fix compatibility with zlib 1.2.9 and newer +Author: Marc Deslauriers +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; + } + diff --git a/clamav.changes b/clamav.changes index 391ba32..1a0660e 100644 --- a/clamav.changes +++ b/clamav.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/clamav.spec b/clamav.spec index 11c9461..8b50dfe 100644 --- a/clamav.spec +++ b/clamav.spec @@ -58,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 @@ -77,6 +78,7 @@ detecting threats. %patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build CFLAGS="-fstack-protector"