commit: fe10283cbc9f679fb5c2f4f7c69016a3b259926f Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sat Mar 30 15:42:50 2019 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Thu Apr 4 21:16:24 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe10283c
app-antivirus/clamav: remove unused patches Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11547 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> .../files/clamav-0.99.4-fix-newer-zlib.patch | 54 ---------------------- .../clamav-0.99.4-pcre2-compile-erroffset.patch | 11 ----- 2 files changed, 65 deletions(-) diff --git a/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch b/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch deleted file mode 100644 index 18673419a58..00000000000 --- a/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://bugs.gentoo.org/649516 - -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; - } - diff --git a/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch b/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch deleted file mode 100644 index 5585ea61453..00000000000 --- a/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.99.4/libclamav/regex_pcre.c_orig 2018-03-02 19:10:39.702899702 +0100 -+++ clamav-0.99.4/libclamav/regex_pcre.c 2018-03-02 19:09:27.600901912 +0100 -@@ -112,7 +112,8 @@ - #if USING_PCRE2 - int cli_pcre_compile(struct cli_pcre_data *pd, long long unsigned match_limit, long long unsigned match_limit_recursion, unsigned int options, int opt_override) - { -- int errornum, erroffset; -+ int errornum; -+ size_t erroffset; - pcre2_general_context *gctx; - pcre2_compile_context *cctx;
