From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- mail-filter/rspamd/Manifest | 10 +++++----- mail-filter/rspamd/metadata.xml | 3 ++- mail-filter/rspamd/rspamd-2.7-r103.ebuild | 3 +-- mail-filter/rspamd/rspamd-3.0-r3.ebuild | 1 - mail-filter/rspamd/rspamd-3.1.ebuild | 3 ++- mail-filter/rspamd/rspamd-9999.ebuild | 3 ++- 6 files changed, 12 insertions(+), 11 deletions(-) (limited to 'mail-filter/rspamd') diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index 23b018effb37..c0713a9918b5 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -13,8 +13,8 @@ AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4ab DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7 DIST rspamd-3.0.tar.gz 5535659 BLAKE2B 605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa SHA512 1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4 DIST rspamd-3.1.tar.gz 5566920 BLAKE2B dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc SHA512 3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178 -EBUILD rspamd-2.7-r103.ebuild 2680 BLAKE2B 75275dd49ac5b6b2f33a53e54934025f0341df190efe6c66034e54377ece549a6fb0c93accac6ca54b543b78b3b600a3ad1a8e75ac1d3677a4688344ecd733d8 SHA512 1be59df83281b02c14cf24a4b13fc841e9dbc0a7e2218807ee3394dfaccc9b73001208dfe22dc88abf2073c6c6b3acf61937627b765a82e71eaad8d8c6054eab -EBUILD rspamd-3.0-r3.ebuild 2971 BLAKE2B e610fb708f188a34b774743e41ad0bd921d78a143a2142b4743828ad2edd493baee0a819fd3df9328836d371c5c2da64269c0e3ec6c3d7b659396af6473b0e38 SHA512 d2cdd8c91c98c58a7bb73a1493f0d76684817678d01ad5a856c77863b429db4578c32739a49009d4815182940d40d9a2fcfbe3ec98a9edb56769578506d79d45 -EBUILD rspamd-3.1.ebuild 2851 BLAKE2B 98c4585f0676de1b818c4d2297c0f677fa7f99bec09296c8c6061928939ccca730ff080c9a7be84ac693f383f48339faf04c2566cdca6098cf2bed51d8e4f44c SHA512 ece9fa974ac682edaa3bedc42218cb43e4b1ab1348a9b8a31c0c47677d02c5d3a230676310d4406526c2a830e5fb9482297c1db6dd05bf6e8dd20d551b166d08 -EBUILD rspamd-9999.ebuild 2851 BLAKE2B 98c4585f0676de1b818c4d2297c0f677fa7f99bec09296c8c6061928939ccca730ff080c9a7be84ac693f383f48339faf04c2566cdca6098cf2bed51d8e4f44c SHA512 ece9fa974ac682edaa3bedc42218cb43e4b1ab1348a9b8a31c0c47677d02c5d3a230676310d4406526c2a830e5fb9482297c1db6dd05bf6e8dd20d551b166d08 -MISC metadata.xml 684 BLAKE2B d8307b970c2c3b029911bfca2d5949742acab13dc35b49c4bb3f8f13bb9e39edd00aad743dcdbbb1b07db3929dba1c32d04ccfcfd20613878dab81f84afc48da SHA512 a7efd262772d7323ae07d94738b3871ff3fd2ca89711a0950d1e4f1c80b228d6ea42df64bace80a6fd2e9786ae5fe4c760560556e9dc2a5deb6b4e36dd48024c +EBUILD rspamd-2.7-r103.ebuild 2645 BLAKE2B e2116351088e43ee3c62f9defdf8fa46aa2cbde1889219325130d029dcd73dc476d9015b7c3d01b33240e6f650872da61fef47fe7365029a3b9907ba0bab1e56 SHA512 b82708290ae84d57c3903d965df5c108b4a595d4278569f453f3866d5cc119ed07e41e12e1f4ad54d136d296924671670cf9fe0623c4cfccffc464b0a583f245 +EBUILD rspamd-3.0-r3.ebuild 2936 BLAKE2B f34324cbc30d49cea77200a3761a4b3947a4b645d86c82e601dd4a1d14b20fd546a3c04195aa79d70294ba8bcc6f88b34b3247b649603e40ba6d9ae7f3e2493d SHA512 7d6cb01d02542f8275e40e2ff21e390d95da89942d5b8c58cbee27d5ff825507d3c154881ba126411260933600194eba8739f67dd647d692e2ac0fec730bde4e +EBUILD rspamd-3.1.ebuild 2855 BLAKE2B e97810948f4790f44dedc59fa856823ef0cdfc20d0ae4adc2358d6f2644903fd311fd8dd16e0766e4600d0390c4eab33e5432627b08ec0d906c8da1f4c5caf8f SHA512 8d57c5a91580a969aff87c7c6c09c4d3fb5924226588e861e1bb97f2bb2c289382a857009b130410b32241f06d695c214f7ebaddc519a8db2f7710e521910c94 +EBUILD rspamd-9999.ebuild 2855 BLAKE2B e97810948f4790f44dedc59fa856823ef0cdfc20d0ae4adc2358d6f2644903fd311fd8dd16e0766e4600d0390c4eab33e5432627b08ec0d906c8da1f4c5caf8f SHA512 8d57c5a91580a969aff87c7c6c09c4d3fb5924226588e861e1bb97f2bb2c289382a857009b130410b32241f06d695c214f7ebaddc519a8db2f7710e521910c94 +MISC metadata.xml 747 BLAKE2B 8205e9a0000d40183806cabbd38dd80f8c6cb83d0d375f38e23c884f30e0472591f58eeb2770aab6d976eb084c80f2b15cc348bbc4dafaa356ecbc23f5387762 SHA512 03fbb7317bc3a30c76dbabaf747e8edf028d21e2f5e1e77d3eb419bcbea15ed6f83bb3beddc416730c3da1158ada91441695801fbe4c4332072a2eac9a61dae1 diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index a183078256ab..b1f97d1434d0 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -17,6 +17,7 @@ vstakhov/rspamd - Use dev-libs/libpcre2 + Use dev-libs/libpcre2 + Enable PCRE JIT support diff --git a/mail-filter/rspamd/rspamd-2.7-r103.ebuild b/mail-filter/rspamd/rspamd-2.7-r103.ebuild index 8a361f82f03e..e3e4d0e59f1e 100644 --- a/mail-filter/rspamd/rspamd-2.7-r103.ebuild +++ b/mail-filter/rspamd/rspamd-2.7-r103.ebuild @@ -21,8 +21,7 @@ LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain u SLOT="0" IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2" -REQUIRED_USE="${LUA_REQUIRED_USE} - jit? ( lua_single_target_luajit )" +REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND="${LUA_DEPS} $(lua_gen_cond_dep ' diff --git a/mail-filter/rspamd/rspamd-3.0-r3.ebuild b/mail-filter/rspamd/rspamd-3.0-r3.ebuild index 1ff4af0796ec..54434e12ad55 100644 --- a/mail-filter/rspamd/rspamd-3.0-r3.ebuild +++ b/mail-filter/rspamd/rspamd-3.0-r3.ebuild @@ -24,7 +24,6 @@ RESTRICT="!test? ( test )" # A part of tests use ffi luajit extension REQUIRED_USE="${LUA_REQUIRED_USE} - jit? ( lua_single_target_luajit ) test? ( lua_single_target_luajit )" RDEPEND="${LUA_DEPS} diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild b/mail-filter/rspamd/rspamd-3.1.ebuild index df5d75abfd0e..b4d4c6d23bae 100644 --- a/mail-filter/rspamd/rspamd-3.1.ebuild +++ b/mail-filter/rspamd/rspamd-3.1.ebuild @@ -24,7 +24,6 @@ RESTRICT="!test? ( test )" # A part of tests use ffi luajit extension REQUIRED_USE="${LUA_REQUIRED_USE} - jit? ( lua_single_target_luajit ) test? ( lua_single_target_luajit )" RDEPEND="${LUA_DEPS} @@ -69,6 +68,8 @@ src_prepare() { rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die + > cmake/Toolset.cmake || die #827550 + sed -i -e 's/User=_rspamd/User=rspamd/g' \ rspamd.service \ || die diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild index df5d75abfd0e..b4d4c6d23bae 100644 --- a/mail-filter/rspamd/rspamd-9999.ebuild +++ b/mail-filter/rspamd/rspamd-9999.ebuild @@ -24,7 +24,6 @@ RESTRICT="!test? ( test )" # A part of tests use ffi luajit extension REQUIRED_USE="${LUA_REQUIRED_USE} - jit? ( lua_single_target_luajit ) test? ( lua_single_target_luajit )" RDEPEND="${LUA_DEPS} @@ -69,6 +68,8 @@ src_prepare() { rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die + > cmake/Toolset.cmake || die #827550 + sed -i -e 's/User=_rspamd/User=rspamd/g' \ rspamd.service \ || die -- cgit v1.2.3