From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- mail-filter/rspamd/Manifest | 8 +- .../files/rspamd-2.6-cmake-lua-version.patch | 44 ++++++++ mail-filter/rspamd/rspamd-2.5-r1.ebuild | 2 +- mail-filter/rspamd/rspamd-2.6-r100.ebuild | 117 +++++++++++++++++++++ mail-filter/rspamd/rspamd-2.6-r2.ebuild | 2 +- mail-filter/rspamd/rspamd-9999.ebuild | 24 +++-- 6 files changed, 181 insertions(+), 16 deletions(-) create mode 100644 mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch create mode 100644 mail-filter/rspamd/rspamd-2.6-r100.ebuild (limited to 'mail-filter/rspamd') diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index 8690b442f871..0d9ed0dfc0ae 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -2,6 +2,7 @@ AUX rspamd-2.5-replxx-gcc10.patch 280 BLAKE2B 56d8ffde0ac9ba834ef65df2ccc8107f32 AUX rspamd-2.5-unbundle-lua.patch 1367 BLAKE2B 91b1e48a8d75cf4ff2fe796fb45c202fdd0dfae8e08a0c2d43c167dcceb81fd13629bd198e3c909eac85a6e939ac6b68127f3cdf32ed5bfb57e970527d39d449 SHA512 41d424da356e68a2c15e7e863525128cb837b78a839954addf39260971f18ab65cc076b8b55cda2f75522b503592208647ac06b0dfa490e8b2a5540cab63cd99 AUX rspamd-2.5-unbundle-snowball.patch 758 BLAKE2B 4e419c4e70d5726309c17ca759b8917feb2d52842cde06453821a8b1964ed8165a5f3536ab917a8362b44b40858d1660ae7c7887fee513e9e6fb681d24589255 SHA512 5257921bdeb5febef99feebd03d291aad009a6b8a44c325305532bae7aec35456042b4813338f175c4a59aa80cce3178118d9e1e4bc5a500f42e5364c06a4dda AUX rspamd-2.5-unbundle-zstd.patch 4191 BLAKE2B 3d053efdfbf66dfd793b20d00a534bf5d46f5a85c48f432a45d17781be960db916bb28decd92c089d5bca734edb18559f552590ad804f27c494a2342a52b8606 SHA512 afdbfb264243bdc27c8010c9a2b89a855d16054d445c82a13656f505550670f7ab978008c0900c9d04144677b043976101d882e6deb9a32215110e0d96e74179 +AUX rspamd-2.6-cmake-lua-version.patch 954 BLAKE2B f0d815908763af100ceb9c79d394ff9616eeceabcc2363609d6fcbc29fea407cfa33640a0ded204047e848cbc93abd1c25372145bb567515ee92ebc227b87422 SHA512 9e8df1f2815e58463d06b16fe8a1a39b344ba30c18392e6f8827d65adf0bbe923da56febbea591efbabc2c5f733a63ace06a4baacf218229dd8dc345315e1511 AUX rspamd-2.6-unbundle-lua.patch 1344 BLAKE2B 0d5e07043f5bff29ef484e7708cd3b0fda36e500c6846772c6299fd43499e46c0f453c873c89a82a48b7402e6cbb5cd2d20f4547d831d490ceac99f0aecc7926 SHA512 1c95ce0b6cca05671d3dee9b373dfaf0be1dae45702b5e1165c482141b8b87c367bd5cfbf482309c00872468b379a2a82034d6983ec219e6ef18ae50d4ce48a2 AUX rspamd-2.6-unbundle-zstd.patch 4085 BLAKE2B aba3487956b3a92296adffc748775ef88dfbbd8595fde5c50e33e67a9d6d517e8f73dc22a288aee73b4131b8c49f84968b9e6aa5c697c7e7a0a68b7f938cac38 SHA512 9c9a2ac7bd25fdc9dd2ae6aebd18a1a88358b5de0f2b7bb63b7af5c405125e0517df0869e6007f79c87d5f650395589f543581c189b91d1cbc1e8ab76c2df0ee AUX rspamd-9999-unbundle-zstd.patch 4040 BLAKE2B 5ea99146c979337aaeb1e9cc1bacbec07478dc65dfd3902ae54153ca64bb0035340fbea0604ad089b5ad503a76b9199028376ec90c7e179013b75b6b3f3de8f2 SHA512 6e6b5080195295c7d9e442eedcabb11bd0c9879a38c1b0dc26bf5e5b2f3665a46ef86b5e95582a68d2df922db862db3cd46a555b9c97a7fefb72a79373a02b19 @@ -11,7 +12,8 @@ AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb269 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8 DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697 SHA512 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540 DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a -EBUILD rspamd-2.5-r1.ebuild 2564 BLAKE2B bef0d75d83f85a0736000a9f5b84ffd27d62225d65318b3f3440ea6c7c695fa80922b6b40df58ecaa6daf4a69e2ac822c8becccd7d281ecb3d647d1e3a7564fb SHA512 2fc29c4d2e34f56396be899dc7b6faecf7e47a4321958d7169ed53d018a6d8a090744c1a4d1fa3a1563315e3635208df0c654da88c5a50a30835f8cf6b803251 -EBUILD rspamd-2.6-r2.ebuild 2534 BLAKE2B 4d75dcdc44c51b38be726e6be4dbf51915ae3333bc6c7662303be93531562394495cb2c516fb2c9abd18326f39abf5352c844e3b7d9d67ba94d9e9fe2a387d7f SHA512 fec9a74698ac4df235106c179e619dac1890f82d3489fdf2599db5b7b7c57b7d92926160662599b117844cbca12493a309dcddcd8c4bbfdb25eef582ef9fabfa -EBUILD rspamd-9999.ebuild 2535 BLAKE2B 8f3e3f5f4e80c667a0181379410dd890ac95d7ee81c7d47334c12f0b49161304270a05eabbf758bec084ee907e1a4e80f05c619c15dc96d91e0908d5540aa6c9 SHA512 9495d0b2474d04d5b0015efc1830da1263a5f1fc3de49605798facc987ef94171befb539bff4389c783db8e5f56e695acf0b7068669d310d30f72383f71e8899 +EBUILD rspamd-2.5-r1.ebuild 2565 BLAKE2B b8e44e7c74887186c9a228e0fa706f8070b95238a2d63e1ecb0e26d89b930442f8e72c5371d50236e34e67c1f6991c1a36e74fc06bb66fe965fd2565c238a9d3 SHA512 c34e5d2ec35dd9dfb2586a4690221c7aab98459c69694f1c82795c264e41723fc791c830c940df97bcbfd611ff1461fb0ddd142bf0e6c8c6dce25e6110db08b0 +EBUILD rspamd-2.6-r100.ebuild 2746 BLAKE2B cb91e2db0ade31521975900a4d3ccd3bb68119aca71eec4139843d204477ee556b59ff5082e3eba1b0afbf49af1e4ed182bf9b165e58bd7b9c3608676fbcdf71 SHA512 668e8baeea10cd5e213f9d2d259447c678726ab5dc11bf1b95ffe716e321c5900a85ef98c4d459722e163be5730511b6eede0151700b5b323ddb3a6897916538 +EBUILD rspamd-2.6-r2.ebuild 2535 BLAKE2B 5968455ea16f256449cef924f026fc1f30186e1805902bf4e34de0c4c0d6b6dd16ddb39e80be352b0ea113203e164c2aa28c8b2bca9e0d34c5c09fad82827cf0 SHA512 d6a5710aaf4db8f40f959e92811875f01b1fd2c1a248a0875bc65373bc453ec488314c267e83c98884bb7a52a328d5c10efbe381b0383856178dc6767bb3ae51 +EBUILD rspamd-9999.ebuild 2747 BLAKE2B e3f88f2d25c948628dcd8619137ee9aeff91bedde69e7e328a1113858867ef53116cdcf06b21fc6c86b8f0e51d81d2657913243d34b645d099abb858d66044e7 SHA512 95f70ab731b647f74fa433c86f6ec3692f6b746c8064da41ecde3b79e705467bac28f03069b623c7c1fff1837d06e5ee9d9ba1f5915a5b77bceb6f5361e0f9b2 MISC metadata.xml 639 BLAKE2B 935ca7becc486efc41fa07b224808a67893e8a609819a1d7a299f03689d94ea6c959f0e606896f0bd899294e7a48c48279125f9e8508981aebaa42a55a8eb4a7 SHA512 22cadde54711e1b4b7324fe68dfacc95fac4477910001b99e0423b9735e83f69801580822aa5f6ea6460955eda6fe4cd4702d9c22cfe1b09721203744f556a80 diff --git a/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch b/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch new file mode 100644 index 000000000000..141b13dfa8af --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-2.6-cmake-lua-version.patch @@ -0,0 +1,44 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -139,40 +139,8 @@ + ELSE(ENABLE_LUAJIT MATCHES "ON") + + ProcessPackage(LIBLUA LIBRARY "lua" +- "lua-5.3" +- INCLUDE lua.h INCLUDE_SUFFIXES +- "include/lua-5.3" +- "include/lua5.3" +- "include/lua53" +- "include/lua" + ROOT ${LUA_ROOT} +- MODULES lua53 +- OPTIONAL) +- +- IF (NOT WITH_LIBLUA) +- ProcessPackage(LIBLUA LIBRARY "lua" +- "lua-5.2" +- INCLUDE lua.h INCLUDE_SUFFIXES +- "include/lua-5.2" +- "include/lua5.2" +- "include/lua52" +- "include/lua" +- ROOT ${LUA_ROOT} +- MODULES lua52 +- OPTIONAL) +- +- IF (NOT WITH_LIBLUA) +- ProcessPackage(LIBLUA LIBRARY "lua" +- "lua-5.1" +- INCLUDE lua.h INCLUDE_SUFFIXES +- "include/lua-5.1" +- "include/lua5.1" +- "include/lua51" +- "include/lua" +- ROOT ${LUA_ROOT} +- MODULES lua51) +- ENDIF() +- ENDIF() ++ MODULES lua) + ENDIF(ENABLE_LUAJIT MATCHES "ON") + + IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE) diff --git a/mail-filter/rspamd/rspamd-2.5-r1.ebuild b/mail-filter/rspamd/rspamd-2.5-r1.ebuild index eb97eb1d040b..c1020d552c74 100644 --- a/mail-filter/rspamd/rspamd-2.5-r1.ebuild +++ b/mail-filter/rspamd/rspamd-2.5-r1.ebuild @@ -38,7 +38,7 @@ RDEPEND=" dev-lang/luajit:2 ) !jit? ( - dev-lang/lua:* + dev-lang/lua:0= dev-lua/LuaBitOp ) !libressl? ( dev-libs/openssl:0=[-bindist] ) diff --git a/mail-filter/rspamd/rspamd-2.6-r100.ebuild b/mail-filter/rspamd/rspamd-2.6-r100.ebuild new file mode 100644 index 000000000000..e8100951ee1d --- /dev/null +++ b/mail-filter/rspamd/rspamd-2.6-r100.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} luajit ) + +inherit cmake lua-single pax-utils systemd tmpfiles + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/rspamd/rspamd.git" + inherit git-r3 +else + SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Rapid spam filtering system" +HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd" +LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB" +SLOT="0" +IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2" + +REQUIRED_USE="${LUA_REQUIRED_USE} + jit? ( lua_single_target_luajit )" + +RDEPEND="${LUA_DEPS} + $(lua_gen_cond_dep ' + dev-lua/LuaBitOp[${LUA_USEDEP}] + ' lua5-{1,2}) + acct-group/rspamd + acct-user/rspamd + app-arch/zstd + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/icu:= + dev-libs/libev + dev-libs/libsodium + dev-libs/snowball-stemmer + net-libs/libnsl + sys-apps/file + blas? ( + virtual/blas + virtual/lapack + ) + cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) + jemalloc? ( dev-libs/jemalloc ) + !libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) + pcre2? ( dev-libs/libpcre2[jit=] ) + !pcre2? ( dev-libs/libpcre[jit=] )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/ragel + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/rspamd-2.6-cmake-lua-version.patch" + "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" + "${FILESDIR}/rspamd-2.6-unbundle-zstd.patch" + "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" +) + +src_prepare() { + cmake_src_prepare + + rm -vrf contrib/{lua-bit,snowball,zstd} || die + + sed -i -e 's/User=_rspamd/User=rspamd/g' \ + rspamd.service \ + || die +} + +src_configure() { + local mycmakeargs=( + -DCONFDIR=/etc/rspamd + -DRUNDIR=/var/run/rspamd + -DDBDIR=/var/lib/rspamd + -DLOGDIR=/var/log/rspamd + -DENABLE_BLAS=$(usex blas ON OFF) + -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) + -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) + -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF) + -DENABLE_PCRE2=$(usex pcre2 ON OFF) + ) + cmake_src_configure +} + +src_test() { + cmake_src_test +} + +src_install() { + cmake_src_install + + newconfd "${FILESDIR}"/rspamd.conf rspamd + newinitd "${FILESDIR}/rspamd-r7.init" rspamd + systemd_newunit rspamd.service rspamd.service + + newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf + + # Remove mprotect for JIT support + if use lua_single_target_luajit; then + pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}"/rspamd-r1.logrotate rspamd + + diropts -o rspamd -g rspamd + keepdir /var/{lib,log}/rspamd +} + +pkg_postinst() { + tmpfiles_process "${PN}.conf" +} diff --git a/mail-filter/rspamd/rspamd-2.6-r2.ebuild b/mail-filter/rspamd/rspamd-2.6-r2.ebuild index 380080e13fba..a31a0897fc9a 100644 --- a/mail-filter/rspamd/rspamd-2.6-r2.ebuild +++ b/mail-filter/rspamd/rspamd-2.6-r2.ebuild @@ -41,7 +41,7 @@ RDEPEND=" dev-lang/luajit:2 ) !jit? ( - dev-lang/lua:* + dev-lang/lua:0= dev-lua/LuaBitOp ) !libressl? ( dev-libs/openssl:0=[-bindist] ) diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild index e51965b8983e..8f97da55c2b1 100644 --- a/mail-filter/rspamd/rspamd-9999.ebuild +++ b/mail-filter/rspamd/rspamd-9999.ebuild @@ -3,7 +3,9 @@ EAPI=7 -inherit cmake pax-utils systemd tmpfiles +LUA_COMPAT=( lua5-{1..3} luajit ) + +inherit cmake lua-single pax-utils systemd tmpfiles if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/rspamd/rspamd.git" @@ -19,7 +21,13 @@ 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 libressl pcre2" -RDEPEND=" +REQUIRED_USE="${LUA_REQUIRED_USE} + jit? ( lua_single_target_luajit )" + +RDEPEND="${LUA_DEPS} + $(lua_gen_cond_dep ' + dev-lua/LuaBitOp[${LUA_USEDEP}] + ' lua5-{1,2}) acct-group/rspamd acct-user/rspamd app-arch/zstd @@ -37,13 +45,6 @@ RDEPEND=" ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) - jit? ( - dev-lang/luajit:2 - ) - !jit? ( - dev-lang/lua:* - dev-lua/LuaBitOp - ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) pcre2? ( dev-libs/libpcre2[jit=] ) @@ -55,6 +56,7 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}/rspamd-2.6-cmake-lua-version.patch" "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" "${FILESDIR}/rspamd-9999-unbundle-zstd.patch" "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" @@ -79,7 +81,7 @@ src_configure() { -DENABLE_BLAS=$(usex blas ON OFF) -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_LUAJIT=$(usex jit ON OFF) + -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF) -DENABLE_PCRE2=$(usex pcre2 ON OFF) ) cmake_src_configure @@ -99,7 +101,7 @@ src_install() { newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf # Remove mprotect for JIT support - if use jit; then + if use lua_single_target_luajit; then pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* fi -- cgit v1.2.3