gentoo auto-resync : 29:05:2023 - 15:17:30

6 files changed, 0 insertions, 236 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 9523220b9142..baec2c47941a 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 5bd31526eb84..b569bee46445 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,16 +1,11 @@
 AUX rspamd-2.5-unbundle-snowball.patch 758 BLAKE2B 4e419c4e70d5726309c17ca759b8917feb2d52842cde06453821a8b1964ed8165a5f3536ab917a8362b44b40858d1660ae7c7887fee513e9e6fb681d24589255 SHA512 5257921bdeb5febef99feebd03d291aad009a6b8a44c325305532bae7aec35456042b4813338f175c4a59aa80cce3178118d9e1e4bc5a500f42e5364c06a4dda
 AUX rspamd-3.0-cmake-lua-version.patch 1444 BLAKE2B b44ada90d1d4d59f000ab75a5d28545902235c85ccab3408eefb8f034bec0c86f6a62678cc5632c7db61b19e7cc1afff2b92a8f1493c64fbe831b3eca3836322 SHA512 f382af60698dd23e69469d6dfaf3c18cef0f413b22918725aec5dd09ee3f8c339d3a6ce92f46ebca89690ce57cab3295ab3093b502af7bce4ce5576c7fd3de9a
 AUX rspamd-3.2-unbundle-lua.patch 1749 BLAKE2B 5cab7403c2a2db85e224fddb5ce13196e10eb0a1abb4bed85a7112b8864f9635e04ba763783811a337d6d9bd87ce68250c9201c0339bb596f95f322efaa6e733 SHA512 649a02af6682e1e76f4be677d61a93d5c78997bda6fd13982791744747c185f53d7a4261b24222bc0dd626319da0632828a590806ec7b305595297164e89407a
-AUX rspamd-3.3-remove-test-case.patch 1090 BLAKE2B 5bdd567f1a4edbea2a610ce0998ab1cae6647af4a3af36bdd1c90b6275407b8cf782089c9661ba8957d43dd31a9880cfd8b205fccac67d2121401ea9c7b2db1f SHA512 ad947b1f33b5de4d83d0ee1fbbbd51139d759e5758f9354dc45a604575764ecc0e08b362586b4bfa8ec35555cf5f622d7898e5be780f7b4efdbc3f38ced3a669
-AUX rspamd-3.4-gcc-13.patch 889 BLAKE2B e98392d26d4f2bbbb01778d12b1a9e22a3180cecc2e0967ff65ada1953fa1eafbc6768236d9f3f0de6c265a4681df7c3e33f22efb8104a48e0303c0b18dbbdaf SHA512 b1c25dd6231d80e74f4ee1b2b8f9027552362c42a7bcf58a6a3fbc5236fed8af3ca8a4c60efedf626c573eb08a8dabd0329d6c8f3f7d98951e45a7a18a746e69
-AUX rspamd-3.4-hyperscan-page-alignment.patch 1016 BLAKE2B af100fe97df89624606d4f6cdb0d48bab922056c61a150f1b41ec955dea2f38e18a877cd0958f0e4db3ed51055d86ed18f197f0c471376cf0418bb67b18864c8 SHA512 d77f8513ff65c694ea729931eacc770faf65495e8eab9a4e326ae9ddb0a9fa3556145d2d280007d58408a44bc47ca3629627be6d5dd1ba45f27cda74deeda454
 AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
 AUX rspamd-r7.init 1357 BLAKE2B 90227e0980397a256e6136cac4a4a4d143130d82a211bfd4894d5f8deb85113e0b219e6453257d548ec3d80de24241e6ecfc2b0a4178cb344c8c6549d96e549b SHA512 89a079d32b7d8c5a037c7bb2ab6825624ce89ea4b25893bcf6f49befc0c7b924b51d48b30bf61c4b3ea5bc3ccbaba16664c7df52236debda0bdb58f1adf8867a
 AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
-DIST rspamd-3.4.tar.gz 5689732 BLAKE2B 8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104 SHA512 fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
 DIST rspamd-3.5.tar.gz 5806722 BLAKE2B 547cd9bb26942dc584d1f4b164e61bdb15505a56399fa19b358b7d7525ee983acc8d5ae1fdb3de340e3461a03aedbb48266fd81404c1f4a2e8fc5bd6735d9a62 SHA512 39c87d5dfd9ae1fc7709e19967eac5e7c7dc83fa070dfebbb7ab5411d7d50d6e6f10248ada717cf1cb3f6ff6c5bfb4d31fd87e1a7e1b2e5f876f6be7b5705623
-EBUILD rspamd-3.4-r3.ebuild 3744 BLAKE2B 0bdab4b5f0eddfdd5767956cba7b01f3c4cf3aeb0b89fc900608d62158777d9011164e9e0edf0f966cdf52f5d8b62583d0105da2cffd3d6acc8376d76d584832 SHA512 60fd10585409980000ac5705118a1b8ec1c1023b1ec4015578b87fc4f26ced790479fb6a7fbf54d7a8e3330d263f921d32726ec1d94daf1d3903647a4e490ae1
 EBUILD rspamd-3.5-r1.ebuild 3794 BLAKE2B 715366013f8ec70da9eb03d1adec32772ad20272915765fe57909e9b39c065d1dc80bf5d86764db394cae9963e3a4b40aae6b180ab2ee72576d6d92601a872cc SHA512 6e01e65d9a9873a6c966017092c975437f010cbf1010bab7330b7ce7faf5c53db730c849d118b7b292ce1761812bca76877271554326b346bd9b00f7c0430412
 EBUILD rspamd-9999.ebuild 3016 BLAKE2B 04fd0a9836987227fedde2fd2c70e35560bef8d772e274d807a52eba6357e09ac8e6cd7965ce8b1aa2b5eee3a332773a9e8a5d3444bbe1d6b777e9737ded6f6e SHA512 e3bbd88184df37490dcd2292af7ff5e88ef0e6760792135de32d66034c7b79c515df02119f3e0ccb4ca5cbc6aa42e852abd95d794b4ed57cd5127d17ee9be868
 MISC metadata.xml 554 BLAKE2B 65f4d0c5cd49f3caad6aeb0ab37bbba43505faf800491ebfa9af8366511bb46243a1ec873d7944cbe77dbb554beef8318a76f98dd4be69407b7befa3272a69b0 SHA512 d9a82aed6a7c63dad8727be080458c165e5c5f4a3ae87330c82447bc21d87c6c10730d0622fecbc5d255ca97312992c4f45c219ad8edcf2a9f4a386a79265d22
diff --git a/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch b/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
deleted file mode 100644
index 0cad11382b21..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove test case which does not work with luajit-2.1 anymore as it
-depends on internal behavior of lujait-2.0.
-
-Upstream-PR: https://github.com/rspamd/rspamd/pull/4323
-
-diff --git a/test/lua/unit/lua_util.extract_specific_urls.lua b/test/lua/unit/lua_util.extract_specific_urls.lua
-index 05ffeb7b0..a7e2f9f48 100644
---- a/test/lua/unit/lua_util.extract_specific_urls.lua
-+++ b/test/lua/unit/lua_util.extract_specific_urls.lua
-@@ -108,7 +108,6 @@ context("Lua util - extract_specific_urls plain", function()
-   local cases = {
-     {expect = url_list, filter = nil, limit = 9999, need_emails = true, prefix = 'p'},
-     {expect = {}, filter = (function() return false end), limit = 9999, need_emails = true, prefix = 'p'},
--    {expect = {"domain4.co.net", "test.com"}, filter = nil, limit = 2, need_emails = true, prefix = 'p'},
-     {expect = {"domain4.co.net", "test.com", "domain3.org"}, filter = nil, limit = 3, need_emails = true, prefix = 'p'},
-     {
-       expect = {"gov.co.net", "tesco.co.net", "domain1.co.net", "domain2.co.net", "domain3.co.net", "domain4.co.net"},
--- 
-2.37.4
-
diff --git a/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch b/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
deleted file mode 100644
index f660b353fec7..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://github.com/rspamd/rspamd/commit/0a916c632e18e6686e1a2256d5ef2fe1a1cc239f
-
-From 0a916c632e18e6686e1a2256d5ef2fe1a1cc239f Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Wed, 18 Jan 2023 23:54:24 +0100
-Subject: [PATCH] Fix build with gcc 13 by including <cstdint>
-
-Like other versions before, gcc 13 moved some includes around and as a
-result <cstdint> is no longer transitively included. Explicitly include
-it for uint8_t.
---- a/src/libserver/css/css_tokeniser.hxx
-+++ b/src/libserver/css/css_tokeniser.hxx
-@@ -24,6 +24,7 @@
- #include <variant>
- #include <list>
- #include <functional>
-+#include <cstdint>
- #include "mem_pool.h"
- 
- namespace rspamd::css {
---- a/src/libserver/html/html_tag.hxx
-+++ b/src/libserver/html/html_tag.hxx
-@@ -23,6 +23,7 @@
- #include <variant>
- #include <vector>
- #include <optional>
-+#include <cstdint>
- 
- #include "html_tags.h"
- 
diff --git a/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch b/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
deleted file mode 100644
index 913f1f7ecd4d..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix for hyperscan page alignment issues.
-
-Upstream-Issue: https://github.com/rspamd/rspamd/issues/4329
-
-diff --git a/src/libserver/hyperscan_tools.cxx b/src/libserver/hyperscan_tools.cxx
-index 6187208a9..96366067d 100644
---- a/src/libserver/hyperscan_tools.cxx
-+++ b/src/libserver/hyperscan_tools.cxx
-@@ -306,7 +306,15 @@ auto load_cached_hs_file(const char *fname, std::int64_t offset = 0) -> tl::expe
- 						msg_debug_hyperscan_lambda("multipattern: create new database in %s; %Hz size",
- 							tmpfile_pattern.data(), unserialized_size);
- 						void *buf;
--						posix_memalign(&buf, 16, unserialized_size);
-+#ifdef HAVE_GETPAGESIZE
-+						auto page_size = getpagesize();
-+#else
-+						auto page_size = sysconf(_SC_PAGESIZE);
-+#endif
-+						if (page_size == -1) {
-+							page_size = 4096;
-+						}
-+						posix_memalign(&buf, page_size, unserialized_size);
- 						if (buf == nullptr) {
- 							return tl::make_unexpected(error {"Cannot allocate memory", errno, error_category::CRITICAL });
- 						}
--- 
-2.37.4
-
diff --git a/mail-filter/rspamd/rspamd-3.4-r3.ebuild b/mail-filter/rspamd/rspamd-3.4-r3.ebuild
deleted file mode 100644
index a58ca9510131..000000000000
--- a/mail-filter/rspamd/rspamd-3.4-r3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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 )"
-
-# for <dev-libs/libfmt-10 see https://github.com/rspamd/rspamd/issues/4482
-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-10:=
-	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-lang/perl
-	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"
-	"${FILESDIR}/${P}-gcc-13.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 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
-}