From e7b6f003e8384cdfc8c0e7603329e969d8806c24 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Nov 2023 22:58:59 +0000 Subject: gentoo auto-resync : 29:11:2023 - 22:58:59 --- mail-filter/Manifest.gz | Bin 8375 -> 8377 bytes mail-filter/rspamd/Manifest | 5 +- mail-filter/rspamd/metadata.xml | 9 +- mail-filter/rspamd/rspamd-3.7.4-r1.ebuild | 155 ++++++++++++++++++++++++++++++ mail-filter/rspamd/rspamd-9999.ebuild | 9 +- 5 files changed, 167 insertions(+), 11 deletions(-) create mode 100644 mail-filter/rspamd/rspamd-3.7.4-r1.ebuild (limited to 'mail-filter') diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz index c0b20a42f5fb..62cfadc5b3bf 100644 Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index db4af9f50fe0..f1c691384ede 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -10,6 +10,7 @@ AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4ab DIST rspamd-3.6.tar.gz 5843907 BLAKE2B 2ccb3e65a14624d48540bd3e2d034fec0dd89cd75032ade3ca74ded09cee6ed67f670c31035b18583b850cc4efeb21b44f97ec2c35d518a49b0c4e6f0eb8c90f SHA512 d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b DIST rspamd-3.7.4.tar.gz 5903754 BLAKE2B d13b3451b4a6a7c5e8644ba57196190065edda2fc48e7245ef7e0094cb90838760cc124a2cf8d0b4b7519c7583284f6883fbcd4bf3a6489496b5e52234a36c21 SHA512 a82696957417f7197b59e614012176626b4fdf1464ed38ce57552c8a02fe2e426504e0b0780ab4f36d208a11ae4d1921bacee52341c8a906b4ab19c1719fd116 EBUILD rspamd-3.6-r1.ebuild 3664 BLAKE2B f38c683a2727f207d6d22c746f059d8d3d34033fb03b16ae473a42fc18f0de1e2785305ebb59cb1ac6fea282b0b23b88832950a6d152d472f24c90a447e549df SHA512 d09d7775afa19372cdf743c2f810658af624ee428acf98130a0bd74e209b15bfe79a82f32ada966d4dad065bfe070730444a4a34ca9621cc43e019792e6f603c +EBUILD rspamd-3.7.4-r1.ebuild 3773 BLAKE2B 55835dccc1e923bceff0df464b683e4ff9dce16e22166435055ffd142b6beabcbb992f47bac439a4ea775a3c1fa52e6c12e554cc9ca594c691b6413bfd23da35 SHA512 c188bb2effea81372b4e767e52a2f0762ccb9d9401ec42dbb451bbc1cd52db499be85c61434dd1c1bbe128c0c6c489c01f33845cac906b0bb049e7a676ad6358 EBUILD rspamd-3.7.4.ebuild 3804 BLAKE2B d7d9aea10d91a9f32bf104e9286e29e641b3c0d0899db87c38a6c4f95f2862bf1fbcf4e2f79ed80ded98480e7dfff5124ae181048a0efee28f6419c18de812af SHA512 a6025be23a5f378437feea8f02253fc10df950834eef6477d256a81ee3a817b99122dc1ef90fb206bf98554d03cf5bf634d04dbc324e433c996ff4c4726b95b7 -EBUILD rspamd-9999.ebuild 3080 BLAKE2B 056afb9f2ca183f1eb789ea0419f13ac443d14f3b8b8479970f76cf0c0242c3151229a4e95bdbe27e7f4baa9d04b8762bc4c7ce8c54211c35cb29bfe2f9df117 SHA512 832e8f1387817ede72781b4158687153bf5436d096eb95225cdfff5d26f9771b2c4cf3ecf76897f5ffd18ea96168aa64fe59e5ec270d877f68257611a69da0a4 -MISC metadata.xml 554 BLAKE2B 65f4d0c5cd49f3caad6aeb0ab37bbba43505faf800491ebfa9af8366511bb46243a1ec873d7944cbe77dbb554beef8318a76f98dd4be69407b7befa3272a69b0 SHA512 d9a82aed6a7c63dad8727be080458c165e5c5f4a3ae87330c82447bc21d87c6c10730d0622fecbc5d255ca97312992c4f45c219ad8edcf2a9f4a386a79265d22 +EBUILD rspamd-9999.ebuild 3261 BLAKE2B b98d31b7705fbb803101dc27b9d546f629aaa3817fc09277287437c084b4148a6c064bdc4edf13613a964e02a060bf0cbee74b75062265b5a264a78a2cfadcf1 SHA512 a978d765efa61421a27c8b603a70b3b83508e6135f8662a3bc661cd2544ef86ecef7f3ae785ee256c94bbefaf1f26719fb0f978f309f91bac64d3e239b6a6b83 +MISC metadata.xml 481 BLAKE2B e0eca393f0dfb4a53e1ea8c68c4daab3d2ac874f674de4468870ae826909f05e6576ca6a3fab0d87482ca21a53c85b51c346bee297e9ce9181acdce5f94b9e29 SHA512 d084bbf11c5ab839f6b6072cb574fa12966e7075ee7dbcd9829acfc458f81b09b34b38bc90baedc2c3b48b2f8c9531005d2f688994714c864a992a2b30ff7619 diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index 09b8498d3eb3..6044b0bb7bec 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -1,18 +1,15 @@ - - arkamar@atlas.cz + + arkamar@gentoo.org Petr Vaněk - - proxy-maint@gentoo.org - Proxy Maintainers - rspamd/rspamd + Enable hyperscan for fast regexp processing Enable PCRE JIT support diff --git a/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild new file mode 100644 index 000000000000..476878d10a51 --- /dev/null +++ b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} 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" +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 +hyperscan jemalloc +jit selinux test" +RESTRICT="!test? ( test )" + +# A part of tests use ffi luajit extension +REQUIRED_USE="${LUA_REQUIRED_USE} + test? ( lua_single_target_luajit )" + +RDEPEND=" + ${LUA_DEPS} + $(lua_gen_cond_dep ' + dev-lua/LuaBitOp[${LUA_USEDEP}] + dev-lua/lua-argparse[${LUA_USEDEP}] + ') + acct-group/rspamd + acct-user/rspamd + app-arch/zstd:= + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/icu:= + dev-libs/libpcre2:=[jit=] + dev-libs/libsodium:= + dev-libs/openssl:0=[-bindist(-)] + dev-libs/snowball-stemmer:= + sys-libs/zlib + blas? ( + virtual/blas + virtual/lapack + ) + hyperscan? ( dev-libs/vectorscan:= ) + jemalloc? ( dev-libs/jemalloc:= ) + selinux? ( sec-policy/selinux-spamassassin ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/doctest + dev-libs/libfmt:= + >=dev-libs/xxhash-0.8.0 +" +BDEPEND=" + dev-lang/perl + dev-util/ragel + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch" + "${FILESDIR}/rspamd-3.6-unbundle-lua.patch" + "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch" +) + +src_prepare() { + cmake_src_prepare + + rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd} || die + + > cmake/Toolset.cmake || die #827550 + + 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 + -DLIBDIR="/usr/$(get_libdir)/rspamd" + + -DSYSTEM_DOCTEST=ON + -DSYSTEM_FMT=ON + -DSYSTEM_XXHASH=ON + -DSYSTEM_ZSTD=ON + + # For bundled https://github.com/bombela/backward-cpp + # Bundled backward library uses execinfo.h in current setting, which is + # available in glibc, but not in musl. Let's enable it for glibc only. + -DENABLE_BACKWARD=$(usex elibc_glibc ON OFF) # bug 917643 + -DSTACK_DETAILS_AUTO_DETECT=OFF + + -DENABLE_BLAS=$(usex blas ON OFF) + -DENABLE_HYPERSCAN=$(usex hyperscan ON OFF) + -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) + -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF) + -DENABLE_PCRE2=ON + ) + 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" + + for ver in ${REPLACING_VERSIONS}; do + if ver_test "${ver}" -eq "3.4"; then + elog "rspamd-3.4 is known to segfault when it is updated from older version due" + elog "to a page-alignment of hyperscan .unser files. The issue was patched in" + elog "rspamd-3.4-r1 ebuild revision. All possibly broken .unser files will be" + elog "automaticaly removed. See https://github.com/rspamd/rspamd/issues/4329 for" + elog "more information." + + find "${EROOT}/var/lib/rspamd" -type f -name '*.unser' -delete + fi + done +} diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild index 8a3804be1663..d8e37a79ac0c 100644 --- a/mail-filter/rspamd/rspamd-9999.ebuild +++ b/mail-filter/rspamd/rspamd-9999.ebuild @@ -23,7 +23,7 @@ HOMEPAGE=" 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 selinux test" +IUSE="blas +hyperscan jemalloc +jit selinux test" RESTRICT="!test? ( test )" # A part of tests use ffi luajit extension @@ -51,7 +51,7 @@ RDEPEND=" virtual/blas virtual/lapack ) - cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) + hyperscan? ( dev-libs/vectorscan:= ) jemalloc? ( dev-libs/jemalloc:= ) selinux? ( sec-policy/selinux-spamassassin ) " @@ -99,10 +99,13 @@ src_configure() { -DSYSTEM_ZSTD=ON # For bundled https://github.com/bombela/backward-cpp + # Bundled backward library uses execinfo.h in current setting, which is + # available in glibc, but not in musl. Let's enable it for glibc only. + -DENABLE_BACKWARD=$(usex elibc_glibc ON OFF) # bug 917643 -DSTACK_DETAILS_AUTO_DETECT=OFF -DENABLE_BLAS=$(usex blas ON OFF) - -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) + -DENABLE_HYPERSCAN=$(usex hyperscan ON OFF) -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF) -DENABLE_PCRE2=ON -- cgit v1.2.3