Update app-antivirus/clamav-0.99.3-r1

3 files changed, 15 insertions, 2 deletions

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 637f942b..08170fb5 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -3,6 +3,7 @@ AUX clamav-0.98.4-x32.patch 1128 SHA256 243007986f747ae29dc566b3e4e11042078ccb54
 AUX clamav-0.99-zlib.patch 805 SHA256 eff89272cfd0cb224f850b3ee2fbe50cb852b0120323f3874b4bfbcd1ea34c0f SHA512 42ca7fddcf0b8dbe4cbaf0076271df0806806e5e5d4c33e65b643d063ca7744f147abc379dd7475692d15e22cd991a286769013bfbf843158072140d3f3dc310 WHIRLPOOL 3065ee973ad1c5f435aa7e1aa4e2cd2271e1bd810a94fd64fbefa995c57be0e73b8108f457761b329bd5d05d6029de407ec815b8332920e3bf30589256012cf5
 AUX clamav-0.99.2-bytecode_api.patch 1531 SHA256 b0619bca555a8069289bb7299e0708cfdc86b566197b2c2e780619bfdf26aa0d SHA512 05d5d9ce0aa64a178a1dfce0e37e2648f42a31a78b89c6d54203899a8334d0ef5a0f1484803932e9a09745bed3f11865c9ccedf175e7e09fcb4f3d621aa6f029 WHIRLPOOL 151d2a5545d923ec4bbe29347db4f9c2d6f84fdd1a89467d2d21b14b2a1e78ebb405c2b3e871406408c0b1463ea0d395393d66e3a33a0472ea0f56e5e35b5a58
 AUX clamav-0.99.2-gcc-6.patch 4476 SHA256 b2960553243392a4298f37d5ef537296e989e95f7cc084800b8e3ab6a251be6d SHA512 b30ed8b888af3697294c1a2aa96a335b3b1035f4f76e3bcf6c243dca7bdc5921a9bb182fbfd5e0e7f1bb9dce93b2312927e28f78edae466d31200a2be50f3a85 WHIRLPOOL a3a03f600edc287984aedcdf23369071691022a78f192d0ee5d9eec14243fcac26f9b7189fbd3baa8d4ab2906e8db37a427d60c8dae4fc5b835f44a308f22cc3
+AUX clamav-0.99.2-pcre2-compile-erroffset.patch 540 SHA256 17a7e7bb7e2abad63a3525a908aa8b20647fd0747838be55c73a5c2ea075531d SHA512 6f2dd207accbc409c7e7155e3c04cf50255d4b6683ada24a559c23375ec4fa333f93118a25c8275cd8d6be7f950200c3730fd8174cc4a0450fe2160f2b86b536 WHIRLPOOL 9afd68a77f4d75a0615fd61c9dcf930b34cb7d8d30c6b107abd5b64c779d52dac9db7eb8c8acc937e78f120e21537d649aca0a4e286014d616f9bed3d44fecf1
 AUX clamav-0.99.2-tinfo.patch 656 SHA256 6e68af3dcc41a693ca5f8a191a59a732e014c42ea58e902d62799f3cbc20c7e3 SHA512 33e375e8f4e74f284e9d14adaa8ef095bdb67b2f62e4b7c5e9c38a3c5f955106173e402859fabf44ada40ae08cceb3fca79322f8854f47d850816064641f4451 WHIRLPOOL d0ea141ca3495316dd462c30ee6311e9dc5d752c60e50b1f825c5b7a367d8ab8a7cb9d16574c35b7de901096811098ddbf77189595c7dda7c75b267f6a7aaeae
 AUX clamav-0.99.3-fix-fd-leaks-in-cli_scanscript.patch 3554 SHA256 6e787a302e788feea4cc072d97c4eac3394ea49e5495d55e0ab59b7e629ec82d SHA512 e0dfecff8adb1e30f4c7a20271fd8731ebbb20449a532d70977f7491d8539fc8ed74f851f6903f6265a2e660f9471341e68cc0651e5f94356179ff1f328ada0c WHIRLPOOL 1ac0009f9766e9a7972fe9741b065f651acc1789c75aeb102d71929ce96c0d9386ca3956364f5fb8517d5a54e53375a07600729e503acdfd8bf3216ffa04bfe6
 AUX clamav-milter.README.gentoo 1124 SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11 SHA512 1c6160e48eddd28f83ec5f24757f788781cef55789d1934dfccc12c7c5e5635a226d26b0983cab7344c142f5a2f1db172640b1d0e6c840a6fa83abed9be1211a WHIRLPOOL f85b17448fd93205e2f38d024b96410cc8d143d077201e0a1b8f4cda95ae2447a70eded4cb90968a593ad2637229300fa04bfe5dba96d3d68c2d09c105ee3f16
@@ -35,5 +36,5 @@ EBUILD clamav-0.98.5.ebuild 4786 SHA256 39080bf04b4df567a6309e9f7fb2eb5fa0be2eae
 EBUILD clamav-0.98.7.ebuild 4757 SHA256 3ef489a7708ad36ee306b949069611308c52d108bfc31c9769e00c772231df80 SHA512 28de254360e1015cc874966c6bb3061c60901da494805c69483e9c1e22965b370ac1227323193d4ebd3492c67f4cf50f7bc8bac0402d1a62be96ae4196ca1562 WHIRLPOOL f082fca5d6f15f2d6246c46e3abf3592cf762e176e2421826433cdde66b44e5d791254db629ba93b23397d588f246195db3099b1b988020e2b645e3d02aa43e7
 EBUILD clamav-0.98.ebuild 4501 SHA256 a9184da412054899bed4f9b7e9fe544b93fd71c04b7febc1d16f8c365f550612 SHA512 c1512232af2331867731d3eb2b8d7ff046c28ea4f6f02722ab9e93a078b12cb21ed6071ff93112edf05fe4671a7697722b4797a4650aa33628609066a3754bc2 WHIRLPOOL 918dc18a16748482aad71778d23ad04603f45f3e186ea479680b7f158fdd36de37ce7e96a6c1aa7e3e6201dc60e6cfd628ad59ba4477dc32d51948cb83058a8b
 EBUILD clamav-0.99.2-r1.ebuild 5290 SHA256 ad3842a63e6a009365a434865c3ad0af0b5a9669c9a44ac4f0b795ca22a1a366 SHA512 e76679323798b9a6d57f233452dd811c8f96e5ae5d736d4422dae39a7c59bf4e71e577c58b08f8dd843c2e8d3e33613a10d74fd99c25c163099c5b4f362f3675 WHIRLPOOL c3e4971d70ff24e618ef170d9233ecee8e92d4ab426fa39bee5b0b5de54c935adcd5c6477182d81c20224d25f2a10388277d76d80e96375e589802d44c85979e
-EBUILD clamav-0.99.3-r1.ebuild 5327 SHA256 8ebeaba28890d919e2d3821a6210f0abc3bff796c81a7e6d215108d004e15286 SHA512 74da9e570c4f04e40dbe250c370d81970e88ca7fcf6fc4cbf641e99a77747d7f4af4bc424716704f9aca7759767dab01fa3b597ad28f7e1b7f2f2e7241edc7aa WHIRLPOOL f4ca7843695c209611182784a339581531efeb17e261ed00a93688a487e800c6a9a20e23e30c7414937c4c41b84e0ce01202e88dc6d8705b1ffc380f8784aa56
+EBUILD clamav-0.99.3-r1.ebuild 5326 SHA256 4261363c34986929bbb9d264c91d86c749ea2e3d9efbd151b9cf6ab72b130806 SHA512 dc58544ac6e05e0f8502624f53c2f94a72a5d9e989c162da73f2230e58784d4a0592c1c59f54f2f9faecb0dd246aa24b61935887023681be5c9b377157afa3a4 WHIRLPOOL 439cf3fd48f195aa53b61892de1e6206ef49054a18fd1f3484b313acf99a1bf562f3e5f2bee0907da63b7a18853e0c69e75e650a10aeab3887137ec34a7ecf12
 EBUILD clamav-0.99.ebuild 5052 SHA256 30ef948c4a96dca9617c559aec5a8bac6b7da315f33c214e127a5e7565019790 SHA512 a1cfbded934b1588e650a9b8d7ebce11fde774a4f349f825467cbf331a02a81763633295df8b9d4d8863bdaa95c1f32af8a924f6e740b27e0acbebd93e072a91 WHIRLPOOL b294cb76dd0c6f0ea656d0b27f4e83c088a368b7a6e8ab3c8be8841420d42a8f30e450aab53b9da43a2082c06de97a368eb4fc9dc125a8893a108b4d732e456b
diff --git a/app-antivirus/clamav/clamav-0.99.3-r1.ebuild b/app-antivirus/clamav/clamav-0.99.3-r1.ebuild
index fc7ca858..376db80c 100644
--- a/app-antivirus/clamav/clamav-0.99.3-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs systemd uclibc"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-antivirus/clamav/files/clamav-0.99.2-pcre2-compile-erroffset.patch b/app-antivirus/clamav/files/clamav-0.99.2-pcre2-compile-erroffset.patch
new file mode 100644
index 00000000..1ee55171
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.99.2-pcre2-compile-erroffset.patch
@@ -0,0 +1,12 @@
+--- clamav-0.99.2/libclamav/regex_pcre.c~	2017-11-28 14:40:56.484208243 +0100
++++ clamav-0.99.2/libclamav/regex_pcre.c	2017-11-28 14:41:07.301207800 +0100
+@@ -112,7 +112,8 @@ int cli_pcre_addoptions(struct cli_pcre_
+ #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;
+