From 677b7ba5c317778df2ad7e70df94b9b7eec4adbc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Sep 2021 04:21:55 +0100 Subject: gentoo resync : 10.09.2021 --- mail-filter/rspamd/Manifest | 6 +- .../files/rspamd-3.0-fix-null-dereference.patch | 46 ++++++++ .../rspamd/files/rspamd-3.0-system-doctest.patch | 72 ++++++++++++ mail-filter/rspamd/rspamd-3.0-r2.ebuild | 123 -------------------- mail-filter/rspamd/rspamd-3.0-r3.ebuild | 127 +++++++++++++++++++++ mail-filter/rspamd/rspamd-9999.ebuild | 4 +- 6 files changed, 252 insertions(+), 126 deletions(-) create mode 100644 mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch create mode 100644 mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch delete mode 100644 mail-filter/rspamd/rspamd-3.0-r2.ebuild create mode 100644 mail-filter/rspamd/rspamd-3.0-r3.ebuild (limited to 'mail-filter/rspamd') diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index c4c9b94752e5..b06295de846a 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -3,6 +3,8 @@ AUX rspamd-2.6-unbundle-lua.patch 1344 BLAKE2B 0d5e07043f5bff29ef484e7708cd3b0fd AUX rspamd-2.7-cmake-lua-version.patch 1121 BLAKE2B 7fa15211805ebd90655eb696cb39d59215315fa55e2e286555f05c505af629119fa0e851dc2a7dd00779e06610d20e590cd57e08aca8557c752c3ab1bfc49bd3 SHA512 2977a94e4e2878a4148e292bc36f605df850145e011e8ef4c35d590ff203327c457c3856a8033d527428bf23673f54807acb912fb171c0550195b3cbf605cb6f AUX rspamd-2.7-unbundle-zstd.patch 4047 BLAKE2B 2a93a17980915a5dc12e20f89922d2e58a73df555ba41c7e8e39a65ccb507673d900fee4b25f1539a7cf516fcf92e1ecacfc5eb1f0c154830700e2ca95acef8b SHA512 ae589dcecfb15980ec94924d1a5c4e27d8a297fa11ae8c9c40ca4b8fb523039df1f8ee193c936b30b4c6e1fc31b301ce07fb08645778defefe3351ea6df43dd9 AUX rspamd-3.0-cmake-lua-version.patch 1444 BLAKE2B b44ada90d1d4d59f000ab75a5d28545902235c85ccab3408eefb8f034bec0c86f6a62678cc5632c7db61b19e7cc1afff2b92a8f1493c64fbe831b3eca3836322 SHA512 f382af60698dd23e69469d6dfaf3c18cef0f413b22918725aec5dd09ee3f8c339d3a6ce92f46ebca89690ce57cab3295ab3093b502af7bce4ce5576c7fd3de9a +AUX rspamd-3.0-fix-null-dereference.patch 1151 BLAKE2B ac2de9943a6581eb700d5c81b61afb79129fd485f004a4d65ba2ef8a5cf9c7f7e9bcc4e1b19f898fc6e781586c977aa65ac957eeff34766994e5159efe7a30c9 SHA512 acf836d043c38f741287d9d2f7a936f75e9b6ecb0609c58a4f315a10ecb089592feea968a71be2409c31aacd5c56340b6bbe59624cb40982656b50a3b0659e0f +AUX rspamd-3.0-system-doctest.patch 3087 BLAKE2B 5d61f548bb2feba2fcb5de0eac5af3fd185e00d9c6a13e931f8f61e95a3465f93155a6335d6fb182da626baaf5e378db946219dba4c10994867a48fde3ebe9e7 SHA512 57f6e82319bf1e29d65953072e3c3a1d526c34fb01742080990d4764df35862c88aa4c44c06577a8265f52a401c48ecffd88e109f3abe69255b77ea9284a3cc5 AUX rspamd-3.0-system-libfmt.patch 1860 BLAKE2B 50754cbcc3bf687fb0274af69d5985b3da2278444819c43d7b51ee11b97776eb49e303f0d606538dd67295efb1e66d0265cc44ad8882a482c01b7733cfc46228 SHA512 6d64681d4ba6f6e93dc2f021041e0cb72309e369daaeb93f42ff9ee34ce6a9ea05db4a7ff21948788717d18d89287d2c0a9454a60b3f9bb9f72dab5be60ce7b2 AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7 AUX rspamd-r7.init 1357 BLAKE2B 90227e0980397a256e6136cac4a4a4d143130d82a211bfd4894d5f8deb85113e0b219e6453257d548ec3d80de24241e6ecfc2b0a4178cb344c8c6549d96e549b SHA512 89a079d32b7d8c5a037c7bb2ab6825624ce89ea4b25893bcf6f49befc0c7b924b51d48b30bf61c4b3ea5bc3ccbaba16664c7df52236debda0bdb58f1adf8867a @@ -11,6 +13,6 @@ 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 EBUILD rspamd-2.7-r103.ebuild 2680 BLAKE2B 75275dd49ac5b6b2f33a53e54934025f0341df190efe6c66034e54377ece549a6fb0c93accac6ca54b543b78b3b600a3ad1a8e75ac1d3677a4688344ecd733d8 SHA512 1be59df83281b02c14cf24a4b13fc841e9dbc0a7e2218807ee3394dfaccc9b73001208dfe22dc88abf2073c6c6b3acf61937627b765a82e71eaad8d8c6054eab -EBUILD rspamd-3.0-r2.ebuild 2836 BLAKE2B 60e8b70afe764c3260da4058cea28dce5a1ca1676a2333559ea2e8789fd36f0ff803d4e34cb70e9dee2ceb6da4d8cb901b2eddec0485fce0571832b87f13d24a SHA512 522f43a7601f818917c7f5c22eae638214e15469c467113800577022ea7c27cb0f98c9aec18e6551b3e73301441189a84c7634baf4a718d5b531a9909b4cb41d -EBUILD rspamd-9999.ebuild 2804 BLAKE2B d758f9448ac993be7227a44733798d7dc0b0ff22c16616255acfeee23cca9e9c71a6341f2a0e9322b136f823a98b2871e1f3b9fa8f6e97813eb930c06b4b2bd6 SHA512 4e62781920704264a167340afc3456775cc585d39a9ab77bd62742f90c32641f52d785251a03e697e0eff2d6d633d9101d55cf70cc8a98e672c7bcc42768e853 +EBUILD rspamd-3.0-r3.ebuild 2971 BLAKE2B e610fb708f188a34b774743e41ad0bd921d78a143a2142b4743828ad2edd493baee0a819fd3df9328836d371c5c2da64269c0e3ec6c3d7b659396af6473b0e38 SHA512 d2cdd8c91c98c58a7bb73a1493f0d76684817678d01ad5a856c77863b429db4578c32739a49009d4815182940d40d9a2fcfbe3ec98a9edb56769578506d79d45 +EBUILD rspamd-9999.ebuild 2851 BLAKE2B 98c4585f0676de1b818c4d2297c0f677fa7f99bec09296c8c6061928939ccca730ff080c9a7be84ac693f383f48339faf04c2566cdca6098cf2bed51d8e4f44c SHA512 ece9fa974ac682edaa3bedc42218cb43e4b1ab1348a9b8a31c0c47677d02c5d3a230676310d4406526c2a830e5fb9482297c1db6dd05bf6e8dd20d551b166d08 MISC metadata.xml 683 BLAKE2B 88aae3128d411106650ed6fc0558c5b36419fffc01a6c09a0b23e85bdc6f4a02fa8f086f794dec814a78e40956f0ca3256de5700574ff4547309b868869fbb16 SHA512 a0367a901b8294cab8e725dce17ce5e9c9195aa9a62a1b5925b213875e5706509973d9d7bd2ee3057ee9892a05132f868f81cf2a0193f9fdc5eb9235c09093aa diff --git a/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch b/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch new file mode 100644 index 000000000000..d355f701a273 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch @@ -0,0 +1,46 @@ +From abea3ac21f764658a966dad475fc99e4b79530d7 Mon Sep 17 00:00:00 2001 +From: Jan Smutny +Date: Tue, 31 Aug 2021 14:25:23 +0200 +Subject: [PATCH] [Fix] src/lua/lua_mimepart.c: fix null dereference + +--- + +This patch is taken from upstream. It fixes possible runtime segfaults. + +PR: https://github.com/rspamd/rspamd/pull/3873 + +diff --git a/src/lua/lua_mimepart.c b/src/lua/lua_mimepart.c +index 66b588e3a..21a46d496 100644 +--- a/src/lua/lua_mimepart.c ++++ b/src/lua/lua_mimepart.c +@@ -1240,7 +1240,16 @@ lua_textpart_get_fuzzy_hashes (lua_State * L) + rspamd_stat_token_t *word; + struct lua_shingle_filter_cbdata cbd; + +- if (part && pool) { ++ ++ if (part == NULL || pool == NULL) { ++ return luaL_error (L, "invalid arguments"); ++ } ++ ++ if (IS_TEXT_PART_EMPTY (part) || part->utf_words == NULL) { ++ lua_pushnil (L); ++ lua_pushnil (L); ++ } ++ else { + /* TODO: add keys and algorithms support */ + rspamd_cryptobox_hash (key, "rspamd", strlen ("rspamd"), NULL, 0); + +@@ -1294,9 +1303,6 @@ lua_textpart_get_fuzzy_hashes (lua_State * L) + } + } + } +- else { +- return luaL_error (L, "invalid arguments"); +- } + + return 2; + } +-- +2.31.1 + diff --git a/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch b/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch new file mode 100644 index 000000000000..bb315ee7a459 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch @@ -0,0 +1,72 @@ +From d37a3764e9889e6de0a7341ba3195ee8a314de23 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Van=C4=9Bk?= +Date: Wed, 1 Sep 2021 13:30:56 +0200 +Subject: [PATCH] Add SYSTEM_DOCTEST cmake option + +This gives packagers option to use system version of doctest rather than +bundled one. It is disabled by default. Additionally, there is no need +to link rspamd-test-cxx with doctest as it is is single header library. + +Main reason for this change is that currently bundled version of +doctest-2.4.5 can't compile with glibc-2.34 [1]. However, this issue was +already fixed in upstream doctest-2.4.6 [2] in commit [3]. With this, +packagers can just bump doctest to fixed version. + +[1] https://github.com/onqtam/doctest/issues/473 +[2] https://github.com/onqtam/doctest/blob/master/CHANGELOG.md#246-2021-03-22 +[3] https://github.com/onqtam/doctest/commit/099d5414e97244ec44cf46b14cd176b3a3dc52e3 +--- + +Merged-to-upstream: https://github.com/rspamd/rspamd/pull/3875 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc4175677..ced49730d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,6 +59,7 @@ OPTION(ENABLE_LUA_TRACE "Trace all Lua C API invocations [default: OFF]" OFF) + OPTION(ENABLE_LUA_REPL "Enables Lua repl (requires C++11 compiler) [default: ON]" ON) + OPTION(SYSTEM_ZSTD "Use system zstd instead of bundled one [default: OFF]" OFF) + OPTION(SYSTEM_FMT "Use system fmt instead of bundled one [defalut: OFF]" OFF) ++OPTION(SYSTEM_DOCTEST "Use system doctest instead of bundled one [default: OFF]" OFF) + + ############################# INCLUDE SECTION ############################################# + +@@ -118,7 +119,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/" + "${CMAKE_SOURCE_DIR}/contrib/lc-btrie" + "${CMAKE_SOURCE_DIR}/contrib/lua-lpeg" + "${CMAKE_SOURCE_DIR}/contrib/frozen/include" +- "${CMAKE_SOURCE_DIR}/contrib/doctest" + "${CMAKE_SOURCE_DIR}/contrib/fu2/include" + "${CMAKE_BINARY_DIR}/src" #Stored in the binary dir + "${CMAKE_BINARY_DIR}/src/libcryptobox") +@@ -656,7 +656,12 @@ IF(SYSTEM_FMT MATCHES "OFF") + ELSE() + find_package(fmt) + ENDIF() +-ADD_SUBDIRECTORY(contrib/doctest) ++IF(SYSTEM_DOCTEST MATCHES "OFF") ++ ADD_SUBDIRECTORY(contrib/doctest) ++ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/doctest") ++ELSE() ++ find_package(doctest) ++ENDIF() + + IF (NOT WITH_LUAJIT) + ADD_SUBDIRECTORY(contrib/lua-bit) +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 9e56cbad7..08e9556f3 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -24,9 +24,7 @@ SET(CXXTESTSSRC rspamd_cxx_unit.cxx) + ADD_EXECUTABLE(rspamd-test-cxx EXCLUDE_FROM_ALL ${CXXTESTSSRC}) + SET_TARGET_PROPERTIES(rspamd-test-cxx PROPERTIES LINKER_LANGUAGE CXX) + ADD_DEPENDENCIES(rspamd-test-cxx rspamd-server) +-ADD_DEPENDENCIES(rspamd-test-cxx doctest) + TARGET_LINK_LIBRARIES(rspamd-test-cxx PRIVATE rspamd-server) +-TARGET_LINK_LIBRARIES(rspamd-test-cxx PRIVATE doctest) + SET_TARGET_PROPERTIES(rspamd-test-cxx PROPERTIES LINKER_LANGUAGE CXX) + + IF(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") +-- +2.31.1 + diff --git a/mail-filter/rspamd/rspamd-3.0-r2.ebuild b/mail-filter/rspamd/rspamd-3.0-r2.ebuild deleted file mode 100644 index efe18dc57b00..000000000000 --- a/mail-filter/rspamd/rspamd-3.0-r2.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2021 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 pcre2 test" -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} - $(lua_gen_cond_dep ' - dev-lua/LuaBitOp[${LUA_USEDEP}] - ') - 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/libfmt:= - dev-libs/libsodium:= - dev-libs/snowball-stemmer:= - sys-apps/file - blas? ( - virtual/blas - virtual/lapack - ) - cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) - jemalloc? ( dev-libs/jemalloc:= ) - dev-libs/openssl:0=[-bindist(-)] - pcre2? ( dev-libs/libpcre2:=[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] )" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/ragel - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${P}-cmake-lua-version.patch" - "${FILESDIR}/${P}-system-libfmt.patch" - "${FILESDIR}/${PN}-2.6-unbundle-lua.patch" - "${FILESDIR}/${PN}-2.5-unbundle-snowball.patch" -) - -src_prepare() { - cmake_src_prepare - - rm -vrf contrib/{fmt,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 - - -DSYSTEM_FMT=ON - -DSYSTEM_ZSTD=ON - - -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_build run-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-3.0-r3.ebuild b/mail-filter/rspamd/rspamd-3.0-r3.ebuild new file mode 100644 index 000000000000..1ff4af0796ec --- /dev/null +++ b/mail-filter/rspamd/rspamd-3.0-r3.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2021 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 pcre2 test" +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} + $(lua_gen_cond_dep ' + dev-lua/LuaBitOp[${LUA_USEDEP}] + ') + acct-group/rspamd + acct-user/rspamd + app-arch/zstd:= + dev-db/sqlite:3 + dev-cpp/doctest + dev-libs/glib:2 + dev-libs/icu:= + dev-libs/libev + dev-libs/libfmt:= + dev-libs/libsodium:= + dev-libs/snowball-stemmer:= + sys-apps/file + blas? ( + virtual/blas + virtual/lapack + ) + cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) + jemalloc? ( dev-libs/jemalloc:= ) + dev-libs/openssl:0=[-bindist(-)] + pcre2? ( dev-libs/libpcre2:=[jit=] ) + !pcre2? ( dev-libs/libpcre[jit=] )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/ragel + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${P}-cmake-lua-version.patch" + "${FILESDIR}/${P}-system-libfmt.patch" + "${FILESDIR}/${P}-system-doctest.patch" + "${FILESDIR}/${P}-fix-null-dereference.patch" + "${FILESDIR}/${PN}-2.6-unbundle-lua.patch" + "${FILESDIR}/${PN}-2.5-unbundle-snowball.patch" +) + +src_prepare() { + cmake_src_prepare + + rm -vrf contrib/{doctest,fmt,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 + + -DSYSTEM_DOCTEST=ON + -DSYSTEM_FMT=ON + -DSYSTEM_ZSTD=ON + + -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_build run-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-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild index 7bcf4740c473..df5d75abfd0e 100644 --- a/mail-filter/rspamd/rspamd-9999.ebuild +++ b/mail-filter/rspamd/rspamd-9999.ebuild @@ -35,6 +35,7 @@ RDEPEND="${LUA_DEPS} acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 + dev-cpp/doctest dev-libs/glib:2 dev-libs/icu:= dev-libs/libev @@ -66,7 +67,7 @@ PATCHES=( src_prepare() { cmake_src_prepare - rm -vrf contrib/{fmt,lua-bit,snowball,zstd} || die + rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die sed -i -e 's/User=_rspamd/User=rspamd/g' \ rspamd.service \ @@ -80,6 +81,7 @@ src_configure() { -DDBDIR=/var/lib/rspamd -DLOGDIR=/var/log/rspamd + -DSYSTEM_DOCTEST=ON -DSYSTEM_FMT=ON -DSYSTEM_ZSTD=ON -- cgit v1.2.3