From 4551b41523452c0d743a71cca34e4dca2ca7538c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 4 Jan 2023 12:06:28 +0000 Subject: gentoo auto-resync : 04:01:2023 - 12:06:28 --- mail-filter/Manifest.gz | Bin 8372 -> 8367 bytes mail-filter/rspamd/Manifest | 2 +- mail-filter/rspamd/rspamd-3.4-r1.ebuild | 149 ------------------------------- mail-filter/rspamd/rspamd-3.4-r2.ebuild | 150 ++++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+), 150 deletions(-) delete mode 100644 mail-filter/rspamd/rspamd-3.4-r1.ebuild create mode 100644 mail-filter/rspamd/rspamd-3.4-r2.ebuild (limited to 'mail-filter') diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz index a84e284454fd..59b0e0ef5412 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 b0e471c943fd..2eaa73137ce3 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -10,6 +10,6 @@ AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4ab DIST rspamd-3.3.tar.gz 5680874 BLAKE2B 2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9 SHA512 02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c DIST rspamd-3.4.tar.gz 5689732 BLAKE2B 8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104 SHA512 fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf EBUILD rspamd-3.3.ebuild 3009 BLAKE2B 21d6b71e76aef770ad6220ae6dc149d7e8bed968d4d76d4a0ebbde8dfaa2de09a758dfe97272a0ec03b28aaaeebb8472609696f1fa308d788d210a664d5929ed SHA512 af382fa55eaa3078d4fedd7ed5cbc655d914591bdceb49362bce90462448b0c2528d496f813e23ce65631e3af1e84c9f9fc5510ee71edc31608d28d142e9e9b0 -EBUILD rspamd-3.4-r1.ebuild 3584 BLAKE2B 1ccb37da419ca55a1f5ba7937ad15467a5465620e96d8a68e6f84e43735dfc98fc1c2cb8705f14f9952003dc33902bb60d9b47b244b9cc7b7fabc2e8db374228 SHA512 e7d24ab648d04fda1e051c8d08bbb499f1902e418e9a746dc2317fd1b39ddbb5637a19a468878bfa636507a0cbc9e813fba10eac105bc8990f5e77aa059082ad +EBUILD rspamd-3.4-r2.ebuild 3623 BLAKE2B b14f391b00694b4a8aaad46feb291a26a5fb8e92fbfe3383339320334280c1777be6e52d3526217efebbd7ceada3398175da12b4f0e2a15ecd7eb5d36e3e5d0d SHA512 538e25723e17016fe1089dede86420fa2ff2ed7257864aff15dc53299e1c822874760024d0c1a858701ffb89834b876f522b5ce6f8f570eed64eb2f0e9ce0509 EBUILD rspamd-9999.ebuild 2962 BLAKE2B 1ce9fae978e5ddafa8f887f5499585fba244774af96391639ce46b039bfbcc0cc409d8bc29acf1757d3a11b34d07d67e8498b6b8d5b540ca215142fb2549bdbe SHA512 d8c65eeb8f5be736249b2f7fbd573f669ad1a66ae95a5324de7d952086d3d17d9fb1b9c68630c37e28b8fd4cb508dfc12a0e24f2461904614c3fff46083bd37f MISC metadata.xml 554 BLAKE2B 65f4d0c5cd49f3caad6aeb0ab37bbba43505faf800491ebfa9af8366511bb46243a1ec873d7944cbe77dbb554beef8318a76f98dd4be69407b7befa3272a69b0 SHA512 d9a82aed6a7c63dad8727be080458c165e5c5f4a3ae87330c82447bc21d87c6c10730d0622fecbc5d255ca97312992c4f45c219ad8edcf2a9f4a386a79265d22 diff --git a/mail-filter/rspamd/rspamd-3.4-r1.ebuild b/mail-filter/rspamd/rspamd-3.4-r1.ebuild deleted file mode 100644 index fc1664f05a6d..000000000000 --- a/mail-filter/rspamd/rspamd-3.4-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2022 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 ~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 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/libev - dev-libs/libfmt:= - dev-libs/libpcre2:=[jit=] - dev-libs/libsodium:= - dev-libs/openssl:0=[-bindist(-)] - dev-libs/snowball-stemmer:= - >=dev-libs/xxhash-0.8.0 - sys-apps/file - sys-libs/zlib - blas? ( - virtual/blas - virtual/lapack - ) - cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) - jemalloc? ( dev-libs/jemalloc:= ) - selinux? ( sec-policy/selinux-spamassassin ) -" -DEPEND="${RDEPEND} - dev-cpp/doctest -" -BDEPEND=" - dev-util/ragel - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-3.0-cmake-lua-version.patch" - "${FILESDIR}/${PN}-3.2-unbundle-lua.patch" - "${FILESDIR}/${PN}-2.5-unbundle-snowball.patch" - "${FILESDIR}/${PN}-3.3-remove-test-case.patch" - "${FILESDIR}/${PN}-3.4-hyperscan-page-alignment.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 - - -DSYSTEM_DOCTEST=ON - -DSYSTEM_FMT=ON - -DSYSTEM_XXHASH=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=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 is patched in this" - elog "ebuild revision rspamd-3.4-r1. 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-3.4-r2.ebuild b/mail-filter/rspamd/rspamd-3.4-r2.ebuild new file mode 100644 index 000000000000..5f557fe50711 --- /dev/null +++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild @@ -0,0 +1,150 @@ +# 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 ~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 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/libev + dev-libs/libfmt:= + dev-libs/libpcre2:=[jit=] + dev-libs/libsodium:= + dev-libs/openssl:0=[-bindist(-)] + dev-libs/snowball-stemmer:= + >=dev-libs/xxhash-0.8.0 + sys-apps/file + sys-libs/zlib + blas? ( + virtual/blas + virtual/lapack + ) + cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) + jemalloc? ( dev-libs/jemalloc:= ) + selinux? ( sec-policy/selinux-spamassassin ) +" +DEPEND="${RDEPEND} + dev-cpp/doctest +" +BDEPEND=" + dev-util/ragel + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-3.0-cmake-lua-version.patch" + "${FILESDIR}/${PN}-3.2-unbundle-lua.patch" + "${FILESDIR}/${PN}-2.5-unbundle-snowball.patch" + "${FILESDIR}/${PN}-3.3-remove-test-case.patch" + "${FILESDIR}/${PN}-3.4-hyperscan-page-alignment.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 + + -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=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 is patched in this" + elog "ebuild revision rspamd-3.4-r1. 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 +} -- cgit v1.2.3