summaryrefslogtreecommitdiff
path: root/mail-filter
diff options
context:
space:
mode:
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/Manifest.gzbin8536 -> 8538 bytes
-rw-r--r--mail-filter/couriersrs/Manifest2
-rw-r--r--mail-filter/couriersrs/couriersrs-0.1.2-r1.ebuild (renamed from mail-filter/couriersrs/couriersrs-0.1.2.ebuild)5
-rw-r--r--mail-filter/maildrop/Manifest4
-rw-r--r--mail-filter/maildrop/files/maildrop-3.1.7-testsuite.patch68
-rw-r--r--mail-filter/maildrop/files/maildrop-3.1.7-valgrind.patch31
-rw-r--r--mail-filter/maildrop/maildrop-3.1.7.ebuild151
-rw-r--r--mail-filter/opendkim/Manifest3
-rw-r--r--mail-filter/opendkim/files/opendkim-2.10.3-vsnprintf-include.patch26
-rw-r--r--mail-filter/opendkim/opendkim-2.10.3-r32.ebuild (renamed from mail-filter/opendkim/opendkim-2.10.3-r31.ebuild)3
-rw-r--r--mail-filter/rspamd/Manifest5
-rw-r--r--mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch184
-rw-r--r--mail-filter/rspamd/rspamd-3.9.0.ebuild155
-rw-r--r--mail-filter/rspamd/rspamd-3.9.1.ebuild155
-rw-r--r--mail-filter/spamassassin/Manifest4
-rw-r--r--mail-filter/spamassassin/spamassassin-3.4.6-r3.ebuild2
-rw-r--r--mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild2
17 files changed, 790 insertions, 10 deletions
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 81276d39863b..6e9fa1ac8f6f 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
Binary files differ
diff --git a/mail-filter/couriersrs/Manifest b/mail-filter/couriersrs/Manifest
index cf0e6c5a33f9..9b0fc0574af0 100644
--- a/mail-filter/couriersrs/Manifest
+++ b/mail-filter/couriersrs/Manifest
@@ -1,4 +1,4 @@
AUX couriersrs-0.1.2-automake-fixes.diff 1100 BLAKE2B eda1f19b025efb70ba4106c1440e1ec4dcf4ca883df56d8e25dcacf2303425c5fed6830d8d7705c7a806dad0ff83d702e7702da1c56ba1673136308d85a62c43 SHA512 dff1847f5ba4898f6f5be8792c80beab75241b26feb63ed130af1788a5ad44d10c6fe7a22de4140baa2523b1f374aac158bda1409ccd41b15d6ed60a221d96c5
DIST couriersrs-0.1.2.tar.gz 521868 BLAKE2B 5895bd6711b6090b43d8b3b6c3b268012ab9ce4619bb30cc6f9b4c35ac63533ee107d6cf068aa2937225ef0372ce8a3cbd8a1a9fc599c33ed2c9884edb85d816 SHA512 e2749bac3374935753ae7cc3d7ef2920b63445dece1206c4c7877005837360f0a6ec6753bfd4b1d736a4eb948a54bf5a7799bc85fc27dd987abd901180545df4
-EBUILD couriersrs-0.1.2.ebuild 582 BLAKE2B 0bddf7fb5da0a46215c06719fb58d83e340974ba84cb230efac16aa67f9e7acbab15f13f263bef47965599a825a58b41dab1ba4086f5bfd2900a4fa7bd6e13ec SHA512 42d96fc664dab429cf60c8d607f990c070bbe52b987cd2a9c476de5f32a752722ca93292266164cab38646114fefa1e0deb0d35e7a90bbf2cd66f66a02b86260
+EBUILD couriersrs-0.1.2-r1.ebuild 574 BLAKE2B e7b40224371bd78864308c69461190717dec65080212e3df9844ae352a08796a7c63a69cf51ffe0bca87a3d9b9de85c51ce78f5e0969b94008837d6c50bfd3a7 SHA512 5d2df009f8804b9a6d7fc84bda2f9a3e90569bb8f6cd3edf6f1ebb2576b474ce99a35e6097487d0704f7d03b6e75744c6a5035ae0caba30784b156889cad3f45
MISC metadata.xml 299 BLAKE2B 49840ff878ed90bdc5c145a6ecb787e084920681561c5d3714fa7bf6eae40efb166b02ee5164bd3962329386d9639d356ad30e749dd631920ee373938b7957fe SHA512 656782d6000ebfbcfcd42bea5460bea4fa3e21edfc8b79bf0e0562b4f33b0758d56a5e1d53e9015dff870a0bea1757cf0fe845aeec20135a7f53692037f174f1
diff --git a/mail-filter/couriersrs/couriersrs-0.1.2.ebuild b/mail-filter/couriersrs/couriersrs-0.1.2-r1.ebuild
index c8eff55bfa9d..704f22591f33 100644
--- a/mail-filter/couriersrs/couriersrs-0.1.2.ebuild
+++ b/mail-filter/couriersrs/couriersrs-0.1.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit autotools
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/mawis/courier-srs/releases/download/${PV}/${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~x86"
-IUSE=""
DEPEND="dev-libs/popt
mail-filter/libsrs2"
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 2cf3825aef7b..a84736df47db 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -4,15 +4,19 @@ AUX maildrop-3.1.1-testsuite.patch 2133 BLAKE2B fa01a9c8c9b9a419970b6aa7bd947e6c
AUX maildrop-3.1.5-common.patch 3927 BLAKE2B 120ab95a1693daf204ced6f542a9e69598648b569e47d8a9083f40c549e6cb42388822702cecd6c405c65f7b86f22d111cc08c93692cf923696caa1a177cd353 SHA512 121f48555d72a997841310c2562192d1c06e8beb7e6d8801e77e58c9d9417ac7a1d23aae30138e0cbba7fc6d6e23c7551eca6ed80663bfe64ce934bb44886ddb
AUX maildrop-3.1.6-test.patch 1525 BLAKE2B 05a9462b527eaf1c3bbdf093a0e7f17862a88a79663181906f75c80f95356f55048d09cb874b4bc7ec1f2b627e3731e451d6e76a44a12ec943edd3e239f5312b SHA512 6955334717ea900176f4a4d53e013797f64846c5a6061a439526f7f9f467fbddfa44ef9adf2416cf0d304e61176e1ca6a93bcf6e08f967ac32672b5e13c6ad2e
AUX maildrop-3.1.6-valgrind.patch 2024 BLAKE2B f41470cdc597e7bc42f887d1428fa51eca15f146931a521301a09cdff6054996dd4b5b0f4232ec293bad9aa95086c46267a94074d65aa5b4eaa0f4e62188983b SHA512 691000cd35c1fe82666830b718949db86aa2d060f69b983a57722c063cf760dc4aa38bfa52ab9e2731907a89c77cb48a94a42187860e0fcc36b3a8a8b17d715a
+AUX maildrop-3.1.7-testsuite.patch 2193 BLAKE2B f2903ab8bf9fcf7823f6fc5de4f0a0caee463e7aa187c8c85d8fe09b503268a205119e1da6fd939f0af196db10ad9185a7ce91cf7cb3c284b4fb9fe068567a9d SHA512 d845724622f6d51e96aee9ec22b3d79465d9ad3a87fdb3cd175f1ab56c68b4b6938ac20b7e9477fa0474b6922284acf87072ed7065b549898339338761a6df29
+AUX maildrop-3.1.7-valgrind.patch 1934 BLAKE2B 1f3fee89ab1f6640db27cbd93021ad13b926380c84a6cf851319db60273f05a44a8014eac25051daf8c97b2871c57b2a1dea8001c5d3b039ebcc37738c40f432 SHA512 4bbf4f64a4e8f7f2b4f641897635bb8d73551c448d649866b5aaad6a13b54c3f91a2d56e67be7f59494c031b3b5f0c5ebbe7af72018ec4e6eb70c010ca15fb51
AUX maildrop-disable-fam.patch 2291 BLAKE2B dd57e9c6d176fd7ca6cedafb9c0f497dd4454920e60d8d2799f105fd98f51b5a0faa4ecc9d8a688aa4cc9022a6b62b434389d5516bd06abd273e02bf32926b57 SHA512 547f78a9e5dce501ac61584912a2e74b43e36b2189bab27d1811af7718def5e07d3683fb2ef0937ae026bd53cffc68b735319322c089bcfff0a17a6edebed1fb
AUX maildroprc 58 BLAKE2B b9ee443f0e9223690f077983541de86dd55c8b36ae2bafdea69563f74dff60ba4234c8388fe257045a36d61bc5f1db4c5a89c56678cbb8b0d4f187120e70a4cb SHA512 3077160382882db22d095dff4b27368e7482b63a9756a3cf7a61e8470ed933af0fdb04a61ebae155b14a7b1fafc598a4cdd1bb660d957f00190b95eb41e81f4e
DIST maildrop-3.0.2.tar.bz2 2129406 BLAKE2B 10572c9c0fcb7a31f10fdfb005562afd425d157fe515f31d7fc6721247b0a5d5d381b51da39f0161de0c8722af89da225273728928510fd9d79c18c18b5759e5 SHA512 a2e6ad9c6982e468b4f778fe6956312aa1da54c93269311922f247a89ede49349a6cbce869b08ced22354d18259ebc043e4f4adf1e0b364d8e110797b24efbc8
DIST maildrop-3.1.4.tar.bz2 2156148 BLAKE2B e7de4e30ee23d8d2f88de7b0398a41c84af6d34207e9f26fd7b22e7ac1b5171c309c6304b312a75e621bc860e5a2d3f59613e47ff5a73ae6412761179f787f53 SHA512 b8f373e142c61ba9cdf32fd939aa7fc5c24ec873f734be048e94561e35977b6fb663ff4a1c35fc22dc7dc2075e04e4c4a09e37c0e7c7c0dd96555fcda9c7fd26
DIST maildrop-3.1.5.tar.bz2 2156334 BLAKE2B 374c0436a0e5954171bf942d824123d610057269739f5f76f4353b75065a964fe92d95a80209a07187d3ebcfe59a6d92d54c71fa52325fc4968e10c1b8eeaada SHA512 f722cbdf9aeb628ff68dcd280de5d7d37a3fae3692b7de5483cf0563631ff9b2eba9ef9baf3b3e3f6108d40e19b55dabddacaa3a064e6b71210b18f200bc67b7
DIST maildrop-3.1.6.tar.bz2 2156136 BLAKE2B fddb718e81d66a393f3bce720edb73c3638c255504d90f7613c05910a3a96ca2ad9ab350167096a2677d51770d26799f8bd89f287dda464163f82c5da8d8b28a SHA512 93364747c603d1d566f756e7ba8b10fd38d10749b269f1bf64596a56fe2b06f529f4b59b6256a5be0c44169f2c8cc9dcd7de91b3cc03288719ffee5db330b1d5
+DIST maildrop-3.1.7.tar.bz2 2156082 BLAKE2B 734380f8b76882a7b9c04203e971c72544eba6fc0b0a74ed4f48f5c3c1b5c2f2817fa8eff7268c934b840471a554ffe9ce159fc9c232a3c9b717f956c8862474 SHA512 972f3891d6f1daca97971d6cc3e09e4f78ce7bf8bb4520ed2836b8d7d9394546d403a0dd709e6b2e34706f67aae2563523bbc0953a9971cc2107fc0838fa095e
EBUILD maildrop-3.0.2-r1.ebuild 3797 BLAKE2B 39b323a617c386d19a7f44f2fd9af6a646cbd058f5909d2ca85eb61309a568cdb128d93d887b0e3e6a654a177d714bcf1eb911919f5e66695003a888af2e57a6 SHA512 ab3a6ed36e7aec1e263a760a9e721e6f33a22a3ce236a5bfbfdca7fffb21ff8ad20fb05df6590c13ecd2f8828ae20ef95b78b7911e40a91fd4d216273ddd952c
EBUILD maildrop-3.0.2.ebuild 3658 BLAKE2B 3a804c84b99d190eb516ece9b62455dee7e547e75b75f88a77613c1b3806cd93f59cf298be82eb0bcba336b03fe59ce911ad43690751687455a7ebbc595cdc75 SHA512 28d333a13811aebbfeb9258faa9a6828e0808610eb55d3f28977631bfeb9d2e49c26caf64f4ea60f19c68a6e92ae735045f178be1f84582f39fced604db8b1b2
EBUILD maildrop-3.1.4.ebuild 3677 BLAKE2B fee7bc1a2b3128b3b5a4fc73494b9af45a79873dd2bb67176ff6012c01e773d462d7d50d727cac65a2ed47fae78c9b7b4e4c4428ebe697c2721c0f517ac31f8c SHA512 cd90febd2f21e95aede1ff13ce11d59300dc816cf16726c9318d2a7b5373b6ebf9f246d93044dbb531e32c5df7cbf66ce55e52058b77e425550da6dc58038ffe
EBUILD maildrop-3.1.5.ebuild 3694 BLAKE2B 7996d794fa96c3a352cd64f1cefe1df265ee2a8655389f2a744929c63791b23a5d395a1fdbeaba26bcf0fd85933761f24649ccee51870cbb2d979f6695409e01 SHA512 eef35f809b673f43bc886066d47a14af573a9c201457b21e5f253e4cd98942155799052049da6f33649a1054a519d71cf80573cf287f5c8f9c60fd80f213d957
EBUILD maildrop-3.1.6-r2.ebuild 4049 BLAKE2B e8e6eca21742dc280f93275e16b1327b19709b84d5e60ca64fcaeff005ceca6039148a7752ac47e7de41edf07693406a6202ae1f5ee4a223b49e72a276e7113a SHA512 54514a8434fc3a18cd3016d0bea376408b928936804a4cabf13d4616f8c3e07677f6176c49545023e037c14ab864711b4064b0e458af63a2924bbde2c3d4e5cd
+EBUILD maildrop-3.1.7.ebuild 4054 BLAKE2B e7dac6e14161b1e01c8b14cc20e09c442d4aefb222ca6b127b11def94226b39ed9b6220818f0c5ca9084209f9166610b95d74b96d005aab55a23d3a73b1b7bc9 SHA512 8886e3bec9bf51db60e98f4b76f52d46c077931ce00ec4d7ebf82b6da86e62f097e22352ac9b958ce7d2c91bff8d736e8a57acc8b3b09c834b259a8962765f9f
MISC metadata.xml 639 BLAKE2B 7b97d1b0ecf5622dcb89729dcfb27480f05c764df98d7d22e0477fbc1498911cdecf47ea5544cdca325e85126fa07d139cc019774ec8e988b4eff5dd4ace29f8 SHA512 077c7066f2ac3e44ccecf1e45a76e293d20c1ff858455e32599fb0b7348d4b5ef8da6c3f55f44b3e2368f9c9c6d3d2b538e12fd3bc82fab983181e2a694a4d49
diff --git a/mail-filter/maildrop/files/maildrop-3.1.7-testsuite.patch b/mail-filter/maildrop/files/maildrop-3.1.7-testsuite.patch
new file mode 100644
index 000000000000..5f6b6605ecd5
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-3.1.7-testsuite.patch
@@ -0,0 +1,68 @@
+Force en_US locale for certain tests.
+
+--- maildrop-3.0.0/libs/maildrop/Makefile.am
++++ maildrop-3.0.0/libs/maildrop/Makefile.am
+@@ -71,12 +71,14 @@
+ maildrop.lsm testsuite.txt.idn testsuite2
+
+ check-am: testsuite
++if HAS_EN_US
+ VALGRIND="`which valgrind 2>/dev/null`"; export VALGRIND; \
+ @SHELL@ ./testsuite >testsuite.diff || exit 1; \
+ sed '/^Message envelope sender/d' <testsuite.diff | \
+ diff -U 3 - $(srcdir)/testsuite.txt.idn || exit 1; \
+ rm -f testsuite.diff
+ VALGRIND="`which valgrind 2>/dev/null`"; export VALGRIND; @SHELL@ $(srcdir)/testsuite2
++endif
+
+ noinst_DATA=maildrop.html maildrop.1 maildropfilter.html maildropfilter.7 \
+ maildropgdbm.html maildropgdbm.7
+--- maildrop-3.0.0/libs/maildrop/configure.ac
++++ maildrop-3.0.0/libs/maildrop/configure.ac
+@@ -201,6 +201,15 @@
+ AC_DEFINE_UNQUOTED(MAXLONGSIZE, $MAXLONGSIZE,
+ [ Maximum character size of a long ])
+
++dnl check for en_US locale
++check_en_US() {
++ locale -a | grep en_US.utf8 > /dev/null
++ return $?
++}
++AC_MSG_CHECKING([for en_US.utf8])
++AM_CONDITIONAL([HAS_EN_US], [check_en_US])
++AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])])
++
+ dnl Checks for library functions.
+
+ AC_FUNC_CLOSEDIR_VOID
+--- maildrop-3.0.0/libs/rfc2045/Makefile.am
++++ maildrop-3.0.0/libs/rfc2045/Makefile.am
+@@ -84,7 +84,10 @@
+ endif
+
+ check-am:
++if HAS_EN_US
+ @SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
+ @SHELL@ $(srcdir)/testsuitemm | cmp -s - $(srcdir)/testsuitemm.txt
+ @SHELL@ $(srcdir)/testrfc3676parsersuite | diff -U 3 $(srcdir)/testrfc3676parsersuite.txt -
+ ./testrfc6533parser
++endif
++
+--- maildrop-3.0.0/libs/rfc2045/configure.ac
++++ maildrop-3.0.0/libs/rfc2045/configure.ac
+@@ -62,6 +62,15 @@
+ AC_CHECK_FUNC(strncasecmp,,CFLAGS="$CFLAGS -Dstrncasecmp=strnicmp")
+ AC_CHECK_FUNC(strcasecmp,,CFLAGS="$CFLAGS -Dstrcasecmp=stricmp")
+
++dnl check for en_US locale
++check_en_US() {
++ locale -a | grep en_US.utf8 > /dev/null
++ return $?
++}
++AC_MSG_CHECKING([for en_US.utf8])
++AM_CONDITIONAL([HAS_EN_US], [check_en_US])
++AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])])
++
+ AC_ARG_WITH(package, [], package="$withval",
+ [
+ package="$PACKAGE"
diff --git a/mail-filter/maildrop/files/maildrop-3.1.7-valgrind.patch b/mail-filter/maildrop/files/maildrop-3.1.7-valgrind.patch
new file mode 100644
index 000000000000..d0056625576c
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-3.1.7-valgrind.patch
@@ -0,0 +1,31 @@
+--- a/libs/maildrop/Makefile.am 2024-02-18 06:43:15.291095955 +0100
++++ b/libs/maildrop/Makefile.am 2024-02-18 06:43:37.317830695 +0100
+@@ -77,7 +77,7 @@
+ sed '/^Message envelope sender/d' <testsuite.diff | \
+ diff -U 3 - $(srcdir)/testsuite.txt.idn || exit 1; \
+ rm -f testsuite.diff
+- VALGRIND="`which valgrind 2>/dev/null`"; export VALGRIND; @SHELL@ $(srcdir)/testsuite2
++ VALGRIND=""; export VALGRIND; @SHELL@ $(srcdir)/testsuite2
+ endif
+
+ noinst_DATA=maildrop.html maildrop.1 maildropfilter.html maildropfilter.7 \
+--- a/libs/maildir/Makefile.am 2024-02-18 06:48:31.305134721 +0100
++++ b/libs/maildir/Makefile.am 2024-02-18 06:49:56.223057434 +0100
+@@ -152,17 +152,11 @@
+ test "@PCRE_LDFLAGS@" != "" || exit 0 ; @SHELL@ $(srcdir)/testsuite2 2>&1 | cmp - $(srcdir)/testsuite2.txt
+ LC_ALL=C; export LC_ALL; ./maildirkwtest | cmp -s - $(srcdir)/maildirkwtest.txt
+ LC_ALL=C; export LC_ALL; ./maildiraclttest
+- VALGRIND="`which valgrind 2>/dev/null`"; test "$$VALGRIND" != "" || exit 0; \
+- LC_ALL=C; export LC_ALL; valgrind --tool=memcheck --leak-check=yes --error-exitcode=1 ./maildiraclttest
+- VALGRIND="`which valgrind 2>/dev/null`"; test "$$VALGRIND" != "" || exit 0; \
+- LC_ALL=C; export LC_ALL; valgrind --tool=memcheck --leak-check=yes --error-exitcode=1 ./maildirkwtest
+ ./testmaildirsearch iso-8859-1 needle haystack; test $$? = 2 && exit 0; exit 1
+ ./testmaildirsearch iso-8859-1 nEEdle needlE
+ ./testmaildirsearch iso-8859-1 "abra cadAbra" "abra cadabra"
+ ./testmaildirsearch iso-8859-1 " abra cadAbra " " abra cadabra"
+ ./testmaildirsearch iso-8859-1 " abra cadAbra " " abra cadabra "
+- VALGRIND="`which valgrind 2>/dev/null`"; test "$$VALGRIND" != "" || exit 0; \
+- LC_ALL=C; export LC_ALL; export VALGRIND="@SHELL@ $(srcdir)/testsuitevalgrind"; rm -f confmdtesterror; @SHELL@ $(srcdir)/testsuite 2>&1 | tee testsuite.out; test ! -f confmdtesterror
+ rm -rf testsuite.out
+
+ if HAVE_SGML
diff --git a/mail-filter/maildrop/maildrop-3.1.7.ebuild b/mail-filter/maildrop/maildrop-3.1.7.ebuild
new file mode 100644
index 000000000000..644f2d25aaf5
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-3.1.7.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic autotools
+
+DESCRIPTION="Mail delivery agent/filter"
+[[ -z ${PV/?.?/} ]] && SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2"
+[[ -z ${PV/?.?.?/} ]] && SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2"
+[[ -z ${SRC_URI} ]] && SRC_URI="https://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
+HOMEPAGE="https://www.courier-mta.org/maildrop/"
+
+S=${WORKDIR}/${P%%_pre}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug dovecot gdbm ldap mysql postgres static-libs authlib +tools trashquota"
+
+CDEPEND="!mail-mta/courier
+ net-mail/mailbase
+ dev-libs/libpcre2
+ net-dns/libidn2:=
+ net-libs/courier-unicode:=
+ gdbm? ( sys-libs/gdbm:= )
+ mysql? ( net-libs/courier-authlib )
+ postgres? ( net-libs/courier-authlib )
+ ldap? ( net-libs/courier-authlib )
+ authlib? ( net-libs/courier-authlib )
+ !gdbm? (
+ berkdb? ( sys-libs/db:= )
+ )
+ gdbm? ( net-mail/courier-imap[gdbm?,berkdb?] )
+ berkdb? ( net-mail/courier-imap[gdbm?,berkdb?] )
+ tools? (
+ !mail-mta/netqmail
+ !<net-mail/courier-imap-5.2.6
+ net-mail/courier-common
+ )"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+ dev-lang/perl
+ dovecot? ( net-mail/dovecot )"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+ mysql? ( authlib )
+ postgres? ( authlib )
+ ldap? ( authlib )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-testsuite.patch
+ "${FILESDIR}"/${P}-valgrind.patch
+ "${FILESDIR}"/${PN}-3.1.6-test.patch
+)
+
+src_prepare() {
+ # Prefer gdbm over berkdb
+ if use gdbm ; then
+ use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
+ fi
+
+ # no need to error out if no default - it will be given to econf anyway
+ sed -i -e \
+ 's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \
+ "${S}"/libs/maildrop/configure.ac || die "sed failed"
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --with-devel
+ --disable-tempdir
+ --enable-syslog=1
+ --enable-use-flock=1
+ --enable-use-dotlock=1
+ --enable-restrict-trusted=1
+ --enable-maildrop-uid=root
+ --enable-maildrop-gid=mail
+ --enable-sendmail=/usr/sbin/sendmail
+ --cache-file="${S}"/configuring.cache
+ $(use_enable static-libs static)
+ $(use_enable dovecot dovecotauth)
+ $(use_with trashquota)
+ )
+
+ local mytrustedusers="apache dspam root mail fetchmail"
+ mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias"
+ myeconfargs+=( --enable-trusted-users="${mytrustedusers}" )
+
+ # These flags make maildrop cry
+ replace-flags -Os -O2
+ filter-flags -fomit-frame-pointer
+
+ if use gdbm ; then
+ myeconfargs+=( --with-db=gdbm )
+ elif use berkdb ; then
+ myeconfargs+=( --with-db=db )
+ else
+ myeconfargs+=( --without-db )
+ fi
+
+ if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
+ myeconfargs+=( --disable-authlib )
+ fi
+
+ # default mailbox is $HOME/.maildir for Gentoo
+ maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use authlib ; then
+ fperms 4755 /usr/bin/maildrop
+ fi
+
+ # Moved to courier-common
+ rm "${D}"/usr/bin/deliverquota || die
+ rm "${D}"/usr/bin/maildirkw || die
+ if use gdbm; then
+ rm "${D}"/usr/bin/makedat || die
+ rm "${D}"/usr/bin/makedatprog || die
+ fi
+ rm "${D}"/usr/share/man/man1/maildirkw.1 || die
+ rm "${D}"/usr/share/man/man1/makedat.1 || die
+ rm "${D}"/usr/share/man/man8/deliverquota.8 || die
+
+ dodoc AUTHORS ChangeLog INSTALL NEWS README \
+ README.postfix README.dovecotauth UPGRADE \
+ maildroptips.txt
+ docinto maildir
+ dodoc libs/maildir/AUTHORS libs/maildir/INSTALL \
+ libs/maildir/README*.txt libs/maildir/*.html
+
+ # bugs 61116, 639124
+ if ! use tools ; then
+ for tool in "maildirmake" "maildirwatch"; do
+ rm "${D}/usr/bin/${tool}" || die
+ rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9] || die
+ done
+ rm "${D}/usr/share/man/man5/maildir.5" || die
+ fi
+
+ insinto /etc
+ doins "${FILESDIR}"/maildroprc
+
+ use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
+}
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 5bd423282304..3e4fa866cc1c 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -8,7 +8,8 @@ AUX opendkim-2.10.3-lua-pkgconfig.patch 5688 BLAKE2B 57fd8b57d12af4d1351e8bfa2ad
AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e825ae1258c82607eb6d10d5acc3246908868fd3d5703ba0044f93bdf51e5a95dbc39a1e3060855073d14c31da5cb3985afe81c526f592f56463bf698ce4c317 SHA512 34499044cb768d54c0c1653a62fb34c9815990d815c98ccfba22afc1ad9c837c6689ff17a3d1da1221d698c91ce9d77a1964d99055527dfd797f8d428e1db615
AUX opendkim-2.10.3-openssl-1.1.1.patch.r2 5966 BLAKE2B c0dcb757f1195e8a3fc055f5162b805bf5bb2fe7a6a7c24317cfc1f0ed05491803f2fefbc22e96409a339f9741cac5344044a1efadec1f3e3c87084b2c221ed6 SHA512 e532d0411bc6cf1f55bf2de1bad54dc29d19558b2c4ea27aa72f17738688d48f111c3662e88064169a78347144eae289b362bfa4849ab4d3b06ff97d439cce47
AUX opendkim-2.10.3-snprintf-include.patch 691 BLAKE2B eb2f0700f767e7b80ff7938634823e192299ec5941ad4e24003a62245fec7eff973b247fc99b0100d2f5a7454a36a096803bd1d82ba64c9bdb28ef56307b797f SHA512 24f67b9240bd360205f9af0510c8ddc62a3d34af7cb17ec98361c738b0a0e61829615eaeade7848b8042cf91ef2a2452d2d4610b9fd5c7ceb355a485470d666e
+AUX opendkim-2.10.3-vsnprintf-include.patch 742 BLAKE2B 651de5d410abfe24b77cf64dc091e8b06b262289334caa13801ecd66408914e166e28956fe3779b4798790e362ec6b7e84eeac3b839dad3c4fa2a4dd184fa55e SHA512 f3b35426ae615e5a6eabd0bbba16d1f82d98dd9c863b6f5c356d260bb4ae2dd70431d7b75275b1264b41cb77255486d121fe398d44533f5621fee2465ac1747a
DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
EBUILD opendkim-2.10.3-r30.ebuild 8151 BLAKE2B 2b5eb7b5cdf5d14e77068c525921a5b3b26916623b5debacd1f8b745407a06eb3fc6dabcfed03fde03b3286aa577eb64ef16fb81cc830f19bf0d39a0f1605272 SHA512 4458f69024e9cae2bcedda38706100a12ba94fb9b15cf818d08ea3afaa2091cb7d08e0a079ff92b330a2fef764a0c503c0780afc1800becc8feb33cfd0c30e7d
-EBUILD opendkim-2.10.3-r31.ebuild 8206 BLAKE2B 25746fe66292eac1f3a4bae74fe6a44647da334bb42cf791471ed23e6b98c8f2cf61c76ef699031788f6f57d1d26f2ad39f9912f3244fff7323af99b87184e5f SHA512 c669a48ac045a2d6ab816aa376d363cb6333a14c12ab27fad09be9dd86af8f6a6a4b752c8bed12fad217c381259be6fb1fdb050bf7edec9947b80d5ddcbe7737
+EBUILD opendkim-2.10.3-r32.ebuild 8250 BLAKE2B 2ef80f2cd47da454ed30c75dcb9c62f92fc90629600cb9205ddd16b68e954af280edb6ff92f2e42ee4e64777c8cf26b71678d893702dd45e3b40b4d9d33aa546 SHA512 d0f16bf74c4c4b8c83a0333559014978a72bb5eed4a8c30c8b94ec682a6fa446c4bfa247919064b7ff1e420989558837ac2f3e9fec4d00c5c5a5a8d1e5b2d8b4
MISC metadata.xml 1882 BLAKE2B 9017d8cc6f84eef113a5059689487c680592d7c983480190c3a02937bc9980f254db93267c74c43ea249acd169fa8f21b967679168def6844c95116bb3d70d0b SHA512 3a192a0e4b918fd56bb98cededf5b48726e5c97a38b1b8b54bb6022a3619e355a187ebe0a831402e84bf09cbb3cc25bcf6ad986d8feeade5aa0d5b42134a555f
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-vsnprintf-include.patch b/mail-filter/opendkim/files/opendkim-2.10.3-vsnprintf-include.patch
new file mode 100644
index 000000000000..7316e21e7184
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.10.3-vsnprintf-include.patch
@@ -0,0 +1,26 @@
+From e4d091c594d1b5791f52c9249abd80fd6706e5ee Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 28 Jul 2024 08:00:38 -0400
+Subject: [PATCH] libvbr/vbr.c: include <stdio.h> for vsnprintf()
+
+This fixes an implicit declaration error with newer compilers and on
+musl where stdio.h does not incidentally get included by some other
+header.
+
+Bug: https://bugs.gentoo.org/936591
+---
+ libvbr/vbr.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libvbr/vbr.c b/libvbr/vbr.c
+index cb9124d7..aadfbd03 100644
+--- a/libvbr/vbr.c
++++ b/libvbr/vbr.c
+@@ -18,6 +18,7 @@
+ #include <arpa/inet.h>
+ #include <arpa/nameser.h>
+ #include <netdb.h>
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r31.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild
index ce9242be5dfb..b61911d89247 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r31.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r32.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-1 lua5-2 )
@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}/${P}-c-std.patch"
"${FILESDIR}/${P}-fix-ldap-sasl-pc.patch"
"${FILESDIR}/${P}-incompatible-pointer-types.patch"
+ "${FILESDIR}/${P}-vsnprintf-include.patch"
)
pkg_setup() {
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 107b35693aac..7c16db7ecded 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,11 +1,16 @@
AUX rspamd-3.6-cmake-lua-version.patch 2030 BLAKE2B 0c40d69e90acd031446c93965fbb8074aca7c383c92f2b14048d3ca3c6dcb8dbde8a662fa5a5a2bc5364e129588baac7657f6f8e5e3263f368d5c9f47d36c7b2 SHA512 5de0ae00fdc7ba556f6d3a2ccb6889776b608d850021612fc1f34955d96d9056ff067408acf47e0b4b7d42877606ab6b13b23e9be2c2cdf1304ca20b4965c733
AUX rspamd-3.6-unbundle-lua.patch 1767 BLAKE2B 0a4a8aeb251618f103f87d66d5d0613c7a3eaa86acaaacfd7023fe8bd8ba8c43abb6b9ad2b20a87166cf7cd855555ec8d9fac0907cce9462d06cf0706ffa6eff SHA512 6413dbc6864046cd6951f8e5720d46f7e158636f9c9b5fc76636f2c55e6df7982aef46ae144e031677230159faf54cf501c12bef147b11fd339f29cd0bc437d4
AUX rspamd-3.6-unbundle-snowball.patch 741 BLAKE2B 9ff27c5434eb15808ae81775bcef8591010872737badf91aba28ecdd784158780f4b74774bb1f2c1581758be733040893a59926b8f5e3135fd7d166fd05ea63b SHA512 924599202e9b7cfddf17bc983053c01e771af791a7ae2f3d9248809d97779d5bfc15ac6f212892b5eedbc98132779ae5d6519279ee2231cef99be97a2c9d8a3b
+AUX rspamd-3.9.0-older-libfmt.patch 6201 BLAKE2B bd71550f2adbe81428cc151a65f62a0ca14f23422d8ce94cc14c22f8b5e513e1ce423c98837d30c9c6fe1a18b9465c778f4815982095c7c1d29fc33686732a10 SHA512 d5733a1b5db2895db4c277c1069e9e0538a62e2cf114fa6d8b285f6d7e2188f6c55fbaac5db7a03ba4269d0bda096c5e14565d6acfccd81edd26e2b951ce30cc
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.8.4.tar.gz 5915680 BLAKE2B a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3 SHA512 dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51
+DIST rspamd-3.9.0.tar.gz 5955138 BLAKE2B 52eea9b11c3780bdd54d24a4ae49d7f1c598fa2748cf1d1b4e4cd19fff50fcfcfafe5140038efa437104ba71e6e968a39613e86b642df7be84553c96123a90fa SHA512 7e75df264de5c778e92aac72be5d701724896ef60dc7f7e41f91a89193b812896dff56f6434233eaa91b5cdf8e6aa863f39129a154520a08b52bcb04c61b965e
+DIST rspamd-3.9.1.tar.gz 5980094 BLAKE2B bb02cecdd686c85ef8340f122255f36c2cd5f6823da05370abce1e059466d053f543998945172be43c631f9d1fce0837a62fc047ca8aa76f3ea87680ee3e2a17 SHA512 b8d60448b8174a05f9dcfb17181e0e2908828923491fadb0f07b8debf97923f6967f3e5dfd27ca3c1a24671abd65c144139b02d1698a8a8a2e5b0672f9012d1f
EBUILD rspamd-3.8.4.ebuild 4118 BLAKE2B 69512cd95a6bf87e7a1a0cc1f6d71e5cc0a1c5dc8265129a7f4b93c4c38e5525141af35a337c827c700bade21f73de8177191e9e8e18bf20564be2fc044211f6 SHA512 7b9ace750932db60bc5cb4d7cb77cf822e89bcb4602b77da3cbdd639e2e5b7c842ede9b21abaf3db086ec4e8f71f16b6416177526bf37344e8e2cd9c0bc0a342
+EBUILD rspamd-3.9.0.ebuild 3717 BLAKE2B 15571a0c820e9eef8c418ba04cfb2047c053f938b5147c19f373b56d14297855fc9efd1917a1f5408730cc7422d8090e9cd8cf303cb2430a22cfbd7f574c803c SHA512 3f616909852c455f0d20d2c41381b29f7a3f39ec0149b1e8309747f9e37398cc52024716f4bf2f97b28482ba412f9d00285877202a3c305039a29f5d28bc47af
+EBUILD rspamd-3.9.1.ebuild 3721 BLAKE2B 644e08f3876bd1f47e1efbddd8bd56cfbf19f68a41b787a8cd15e74cea487d43ada46b4188739953ed4a1f82ea6b08fa5d6e774c78c54a845866d49b6c767416 SHA512 8d5a9ebabe375c27c0cf72a2cd767893dae62eb3a687c103d95c51a31b7dfeaf16eef3e14139de53251e8cbdceae20dcb5481ddbff2ff3aacca7d5ec542c1ac1
EBUILD rspamd-9999.ebuild 3626 BLAKE2B eb9e97c83ea0c79e37dedd5e471d8bc02c7b0f1544e6745a5fc57ca9ac4198cac81ad3eecb4664353d6fac459caa4d2bfb20f69c8f0f65e442dec697735d6f06 SHA512 5109d67a5f1dfd60c8fd5b97d0856ff3245feb6900f675abd0e125371f8236798bc6f79387d8d122de201f94689eb7847435a8c05e4443797afc8c987db20a84
MISC metadata.xml 481 BLAKE2B e0eca393f0dfb4a53e1ea8c68c4daab3d2ac874f674de4468870ae826909f05e6576ca6a3fab0d87482ca21a53c85b51c346bee297e9ce9181acdce5f94b9e29 SHA512 d084bbf11c5ab839f6b6072cb574fa12966e7075ee7dbcd9829acfc458f81b09b34b38bc90baedc2c3b48b2f8c9531005d2f688994714c864a992a2b30ff7619
diff --git a/mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch b/mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch
new file mode 100644
index 000000000000..0b6de27f5689
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch
@@ -0,0 +1,184 @@
+From 0826efdadc36a7f1f4251f0450101fb5cbb1c94f Mon Sep 17 00:00:00 2001
+From: Petr Vaněk <arkamar@gentoo.org>
+Date: Sat, 13 Jul 2024 15:53:28 +0200
+Subject: [PATCH] backward compatibility with <dev-libs/libfmt-11
+
+Upstream updated bundled libfmt to version 11 [1], where fmt/core.h was
+renamed to fmt/base.h [2]. Rspamd switched to a new header file but
+libfmt reintroduced fmt/core.h later for compatibility reasons. This
+patch switches fmt/base.h back to fmt/core.h in order to be able to work
+with <dev-libs/libfmt-11.
+
+[1] https://github.com/rspamd/rspamd/commit/19299911dc7b951fa9649b918a661026a5d0e450
+[2] https://github.com/fmtlib/fmt/commit/79f1506fe3a7fae7c22c55d3cd7cdc33bc536dae
+[3] https://github.com/fmtlib/fmt/commit/58a6bd48a8dc7ea74bb9fd900c60fd333a85725f
+
+diff --git a/src/libmime/lang_detection_fasttext.cxx b/src/libmime/lang_detection_fasttext.cxx
+index 89916151f..5c3549c8e 100644
+--- a/src/libmime/lang_detection_fasttext.cxx
++++ b/src/libmime/lang_detection_fasttext.cxx
+@@ -20,7 +20,7 @@
+ #include "fasttext/fasttext.h"
+ #include "libserver/cfg_file.h"
+ #include "libserver/logger.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "stat_api.h"
+ #include <exception>
+ #include <string_view>
+diff --git a/src/libserver/backtrace.cxx b/src/libserver/backtrace.cxx
+index c24e61936..330c829b0 100644
+--- a/src/libserver/backtrace.cxx
++++ b/src/libserver/backtrace.cxx
+@@ -19,7 +19,7 @@
+ #ifdef BACKWARD_ENABLE
+
+ #include "contrib/backward-cpp/backward.hpp"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "logger.h"
+
+ namespace rspamd {
+diff --git a/src/libserver/cfg_rcl.cxx b/src/libserver/cfg_rcl.cxx
+index ce3df4010..f0c9db64d 100644
+--- a/src/libserver/cfg_rcl.cxx
++++ b/src/libserver/cfg_rcl.cxx
+@@ -34,7 +34,7 @@
+ #include <algorithm>// for std::transform
+ #include <memory>
+ #include "contrib/ankerl/unordered_dense.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "libutil/cxx/util.hxx"
+ #include "libutil/cxx/file_util.hxx"
+ #include "frozen/unordered_set.h"
+diff --git a/src/libserver/cfg_utils.cxx b/src/libserver/cfg_utils.cxx
+index 1344bc4f9..adc23f590 100644
+--- a/src/libserver/cfg_utils.cxx
++++ b/src/libserver/cfg_utils.cxx
+@@ -65,7 +65,7 @@
+ #include <string>
+ #include <string_view>
+ #include <vector>
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "cxx/util.hxx"
+ #include "frozen/unordered_map.h"
+ #include "frozen/string.h"
+diff --git a/src/libserver/css/css_parser.cxx b/src/libserver/css/css_parser.cxx
+index 11fa830f0..c016b9d9d 100644
+--- a/src/libserver/css/css_parser.cxx
++++ b/src/libserver/css/css_parser.cxx
+@@ -20,7 +20,7 @@
+ #include "css_rule.hxx"
+ #include "css_util.hxx"
+ #include "css.hxx"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+
+ #include <vector>
+ #include <unicode/utf8.h>
+diff --git a/src/libserver/css/css_selector.cxx b/src/libserver/css/css_selector.cxx
+index d2ae093cb..61bd8750f 100644
+--- a/src/libserver/css/css_selector.cxx
++++ b/src/libserver/css/css_selector.cxx
+@@ -17,7 +17,7 @@
+ #include "css_selector.hxx"
+ #include "css.hxx"
+ #include "libserver/html/html.hxx"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
+ #include "doctest/doctest.h"
+
+diff --git a/src/libserver/css/css_value.cxx b/src/libserver/css/css_value.cxx
+index f2ff55363..64ebc536f 100644
+--- a/src/libserver/css/css_value.cxx
++++ b/src/libserver/css/css_value.cxx
+@@ -20,7 +20,7 @@
+ #include "frozen/string.h"
+ #include "libutil/util.h"
+ #include "contrib/ankerl/unordered_dense.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+
+ #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
+ #include "doctest/doctest.h"
+diff --git a/src/libserver/hyperscan_tools.cxx b/src/libserver/hyperscan_tools.cxx
+index 5035bee2c..6f8450e6a 100644
+--- a/src/libserver/hyperscan_tools.cxx
++++ b/src/libserver/hyperscan_tools.cxx
+@@ -21,7 +21,7 @@
+ #include <filesystem>
+ #include "contrib/ankerl/unordered_dense.h"
+ #include "contrib/ankerl/svector.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "libutil/cxx/file_util.hxx"
+ #include "libutil/cxx/error.hxx"
+ #include "hs.h"
+diff --git a/src/libserver/symcache/symcache_impl.cxx b/src/libserver/symcache/symcache_impl.cxx
+index 7159555d2..4ea087024 100644
+--- a/src/libserver/symcache/symcache_impl.cxx
++++ b/src/libserver/symcache/symcache_impl.cxx
+@@ -21,7 +21,7 @@
+ #include "unix-std.h"
+ #include "libutil/cxx/file_util.hxx"
+ #include "libutil/cxx/util.hxx"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "contrib/t1ha/t1ha.h"
+
+ #ifdef __has_include
+diff --git a/src/libserver/symcache/symcache_item.cxx b/src/libserver/symcache/symcache_item.cxx
+index 4a9581fe7..490a87880 100644
+--- a/src/libserver/symcache/symcache_item.cxx
++++ b/src/libserver/symcache/symcache_item.cxx
+@@ -17,7 +17,7 @@
+ #include "lua/lua_common.h"
+ #include "symcache_internal.hxx"
+ #include "symcache_item.hxx"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "libserver/task.h"
+ #include "libutil/cxx/util.hxx"
+ #include <numeric>
+diff --git a/src/libstat/backends/cdb_backend.cxx b/src/libstat/backends/cdb_backend.cxx
+index bd05e8ef8..1d2b54d4c 100644
+--- a/src/libstat/backends/cdb_backend.cxx
++++ b/src/libstat/backends/cdb_backend.cxx
+@@ -28,7 +28,7 @@
+ #include <optional>
+ #include "contrib/expected/expected.hpp"
+ #include "contrib/ankerl/unordered_dense.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+
+ namespace rspamd::stat::cdb {
+
+diff --git a/src/libstat/backends/redis_backend.cxx b/src/libstat/backends/redis_backend.cxx
+index 06842b078..6abcfa122 100644
+--- a/src/libstat/backends/redis_backend.cxx
++++ b/src/libstat/backends/redis_backend.cxx
+@@ -19,7 +19,7 @@
+ #include "stat_internal.h"
+ #include "upstream.h"
+ #include "libserver/mempool_vars_internal.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+
+ #include "libutil/cxx/error.hxx"
+
+diff --git a/test/rspamd_cxx_unit_dkim.hxx b/test/rspamd_cxx_unit_dkim.hxx
+index d445c3800..6d3b4207e 100644
+--- a/test/rspamd_cxx_unit_dkim.hxx
++++ b/test/rspamd_cxx_unit_dkim.hxx
+@@ -21,7 +21,7 @@
+
+ #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
+ #include "doctest/doctest.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "libserver/dkim.h"
+
+ #include <vector>
diff --git a/mail-filter/rspamd/rspamd-3.9.0.ebuild b/mail-filter/rspamd/rspamd-3.9.0.ebuild
new file mode 100644
index 000000000000..40c66dca1317
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.9.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 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 +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/libarchive:=
+ 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"
+
+ # backward compatibility with <dev-libs/libfmt-11
+ "${FILESDIR}/${P}-older-libfmt.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
+
+ -DBUILD_TESTING=$(usex test ON OFF)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ # These variables ensure tests use Lua scripts from this package rather
+ # than the installed version. However, rspamd always first attempts to load
+ # from /etc/rspamd/lua, with no method to override this behavior.
+ LUA_PATH="${S}/contrib/lua-?/?.lua" \
+ LUALIBDIR="${S}/lualib" \
+ RULESDIR="${S}/lualib" \
+ 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-3.9.1.ebuild b/mail-filter/rspamd/rspamd-3.9.1.ebuild
new file mode 100644
index 000000000000..45df6738554b
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.9.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 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 +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/libarchive:=
+ 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}/${PN}-3.6-cmake-lua-version.patch"
+ "${FILESDIR}/${PN}-3.6-unbundle-lua.patch"
+ "${FILESDIR}/${PN}-3.6-unbundle-snowball.patch"
+
+ # backward compatibility with <dev-libs/libfmt-11
+ "${FILESDIR}/${PN}-3.9.0-older-libfmt.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
+
+ -DBUILD_TESTING=$(usex test ON OFF)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ # These variables ensure tests use Lua scripts from this package rather
+ # than the installed version. However, rspamd always first attempts to load
+ # from /etc/rspamd/lua, with no method to override this behavior.
+ LUA_PATH="${S}/contrib/lua-?/?.lua" \
+ LUALIBDIR="${S}/lualib" \
+ RULESDIR="${S}/lualib" \
+ 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/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index a3bb684873fd..2db17c938f8d 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -20,9 +20,9 @@ DIST Mail-SpamAssassin-4.0.0.tar.bz2.asc 833 BLAKE2B 44170d411d9eb656d67bf408080
DIST Mail-SpamAssassin-4.0.1.tar.bz2 6379932 BLAKE2B 303c54d8731cf0ccb622e3e78efbc6be983fc87c7a71107ea700daa54e7ffb85dbb59696188d8ac666067499b1bc7477e31edb36f6e99c9749288a8f921a36b1 SHA512 66183e356b07d1049cf5598fc1e563e4aab580dfca04bf8ec37781dfb57ef568d33c6f6455076f54f940947f5a5dfefa7a08d233833deea5fe5ea18b669cd790
DIST Mail-SpamAssassin-4.0.1.tar.bz2.asc 833 BLAKE2B 9a7dd3a3a59b6a85139fe6db461da9a4a23ed9d1b3110aba70df60145252c3307c526bb5b5c129e2c4ee74427b2b59e421b80bc8d6ca71b89a0c6f608ca02ab9 SHA512 b180080c1692684014680a6873f42ed07d1640c40a6e3e330cfb43235bb3e3008f5e21018fbc0e9cba67ab6d9ba5b87cc2d98c3bed15c9503164dacdfdaef9df
EBUILD spamassassin-3.4.6-r2.ebuild 9832 BLAKE2B aeae24c04e90169b1e87605b53c23e57d3a14a825c023c39dae7a316860fd4f2a9393c68a5963838e4b39bb231db9cf94f417bc0baf9ab0f6752f842424cb523 SHA512 7fb3fdcf03bb93b8e8534dab572408a895c519e6dfcf4fc9016471d539f5ec00220cd5a4246c738d288a553273db78769b2c3feba4ce91548777293604cc44d1
-EBUILD spamassassin-3.4.6-r3.ebuild 9820 BLAKE2B b0e393cc7862b2aa21bf3f803c04cfaa1e2c133c66298d8d9029cf61cc35bd7d314f0ef3267417ef649e3c3252c561ee428c661fca0992d8a5149ce27a347f56 SHA512 4e9499acc23047bdb56871ad00e20b5a26cd13a1afa58703d8f681a846a70f87faed3a69a443eb9769a4729a4131b3795aa245147b972ea7960339887cc86ad0
+EBUILD spamassassin-3.4.6-r3.ebuild 9818 BLAKE2B 6b55ed26802581f384b4ea861e818792a09464ea584778645c72594d264022669c9d0a69c972d4cf8fd6cc935e684efac52dc71c947071cb2d5e4cc334e687d7 SHA512 772896a6203e2c891b51623cb3c82ec840f6c3ef3cc82dc86574c868833271ee41cb0a9a28984f72edcf22280257d32a173ef337fec0877e9becec5a54ad2032
EBUILD spamassassin-4.0.0-r4.ebuild 10604 BLAKE2B a2047e73941026c6944f4b4211bde32a91cce4e13fb3722e8a63d40973a20422f7471333cda3e43b38eebf1f4756485b265641e51782063470a9171650f9e43b SHA512 c30b44b87e417dcb2124bde59cbf57b0838b56b2445c2a18adc6616383070b1bce6d923fc87d71fb946120f19e9fe7937d21574428808a4ce0c7ac5958d785e0
-EBUILD spamassassin-4.0.0-r5.ebuild 10592 BLAKE2B 2893034abf000e761416476037c172349efb012c48418ff292a1a4b1159d25fca4b0b64d588019296626baedf8a00370ca541b0d5af769c3d082b7e39351fbd0 SHA512 ab81d8116ed5486feab89c6261d11772345f2fe756d80dcb81ca97da4887035ef46f1568cdf56444322af3ec11e18a4bb5735656e1c80f56cf5c0e005194d92d
+EBUILD spamassassin-4.0.0-r5.ebuild 10585 BLAKE2B e3e82c0ac325e63b5c2cc7c0f916d5b0db999c13818fd0a10f6a5d69d34e753e76b6547bbab0716e86197565737d9bf7f2cb2c153dfcb5444a64cac20e4156e9 SHA512 a2bf49657abc82c993b7af9d76fb8076dee6645f5ecac44c73f7e47ffb1b93ddba5e8028d02c06eb464e632b85ba38353da70d8d7729b4201e11cb2ade3662aa
EBUILD spamassassin-4.0.1-r1.ebuild 10447 BLAKE2B 185e912cecd23489ef7c2861ac780f20f9bfd8d90087797d0b34deaa5bb4eef653da57883bc1e1c24dcbbae555d96e766969035afd903914a1761327e5e164e1 SHA512 e622cd461f0d2ccaaf31a48c8dbdf63949d0d424160443d294ef2f7a7d9310ea1f052345dc4d873a09e99395a47ac7547fea7f64f8dad992cbb0e637fd1ddc26
EBUILD spamassassin-4.0.1.ebuild 10466 BLAKE2B 63ac515aad49617626a2c9e13459497c3fa36a0e30cec445969c62557163e22e54841f09e13d3d7d951b15ab7ce32656e4323a4ce77979e7768cf38a0c8e72fe SHA512 89840670ce1f8e2c1f059f99bf293c6614772d512d7e1869c6944c6ecd687c7636ecebaa129c3bde0499f0bb590c6b33071a1030d7d7b5fdef9302323907ab4d
MISC metadata.xml 698 BLAKE2B 09a986c93fde495aceb1370ed7440e2d141d83a3b631e050d09571441637029d5beda9fed264d6d65fe094c99fc27c91a6ba350f55d6aa6136c484b2acbd874b SHA512 1bd90e2b4339e685ebc4af7ddd6f371cebd566610fe8cc256c5bf3d120ae9bb527da633c38fff9a9e1dbd7b4949ccd78dab6cb1016311ee23e143426ed61e515
diff --git a/mail-filter/spamassassin/spamassassin-3.4.6-r3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.6-r3.ebuild
index 776c9cacec94..9db46b6e694d 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.6-r3.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.6-r3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
RESTRICT="!test? ( test )"
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild
index e902918357ae..8f97cac46c36 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
RESTRICT="!test? ( test )"
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-05 12:22:59 +0000