diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /mail-filter | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'mail-filter')
34 files changed, 466 insertions, 309 deletions
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz Binary files differindex daedbc994a04..506e06bc16f7 100644 --- a/mail-filter/Manifest.gz +++ b/mail-filter/Manifest.gz diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest index 91c797b2b918..7e5338b9bd2f 100644 --- a/mail-filter/amavisd-new/Manifest +++ b/mail-filter/amavisd-new/Manifest @@ -4,5 +4,5 @@ AUX amavisd-snmp-subagent.initd 890 BLAKE2B ccc1c91547775737676449765e90c12b70ff AUX amavisd.initd-r2 1594 BLAKE2B b778d21239440b6b01a0860f69b1363d57cc0e241a86501131cbafb563b77a58828c5801b86b5419c1e04eeaa85eeecd087f37394bfec2dc69a466c45c8155fa SHA512 67414b2d5977d74a1b613e8a3478a9e1f2a60ba29685c219db1cc48ead6fcf94e93a2d5897768b7720d5db352028c2eca89265bb1e2520b2f10ae011db200b65 AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca07b5eebfefc90e40ceba267028c8bf51e5208f198001a05edaef326d0a8ff23159a4d705f191c48c3753 SHA512 9696d50ab845d067e1289af8525c0ee3a8d55b4617af6f4d146d4844c9667b63886955145bea33a2980ed153210da69fa3747451c337075ff4ca500abafc0c7a DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844 -EBUILD amavisd-new-2.12.0-r4.ebuild 5330 BLAKE2B 010299bc8a5f580f715fef7834d488f250817597204234554734dec0975ead2b96dca2e6b7586a8732964eb277d62320895b62cb647a6b77e3357830fc51f51a SHA512 9e1887e9fe1e18edb08a04bc8948fa2406114586d6e9862e6d0274ce0769b28bea7e98988629100e0592d75e73e880aa44ecca60a6969027d2cc3cebd2f9a793 -MISC metadata.xml 925 BLAKE2B b75aca7f3afff0d320516d293b6c88b34be4599a0233675f3bdeb3881a857a1b6316dba66cff118667d0c455650c0b23da3f471dbab9f9710cdc3dcf23b55aae SHA512 27cbf8cebfe1e2611193a954edad5fce81cf27f2a4f7d1746d975529317ee45b94b250c47c013856e18f339c3ea234b59fc3990aac5176bffec67786e67f8d1f +EBUILD amavisd-new-2.12.0-r5.ebuild 4913 BLAKE2B 89efd4ca3df89f9875e7952d58a2440e88448410ed629ec77dcaf775c2a15cd5b75ba6af7b425855970c187864a1691175476c6f6d9c16f48f2f27e5440708d6 SHA512 b20582782a78fe683e4b33e5982ed5d9d6e676b7bf3c3ec2c0f5235cefbe709aa9c51bb8a31c8c0e95fd568865b7bf87dfd41e2f5ef462a2b9b126b269d6f80d +MISC metadata.xml 868 BLAKE2B e42a68930492d173c2443d86db2fd12630096283795a682cbf25075a162a8b76110f29c0826a8190c40bc6b80c8ebaf29de654ead212ab9b54f2e5e79ab7e9dc SHA512 1d3bdaf290a814086c1ccfd91fa6ed33872e9b30fd9c4899fee6f7718b9148c48e489934e972f81f7330b8177b85768333164a023a2887726d325f78e91e33db diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r5.ebuild index 3054b84528d7..f2e542b6b7c8 100644 --- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild +++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2 LICENSE="GPL-2 BSD-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" -IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq" +IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin" MY_RSPAMD_DEPEND="dev-perl/HTTP-Message dev-perl/JSON @@ -70,8 +70,7 @@ RDEPEND="${DEPEND} dev-perl/LWP-Protocol-https dev-perl/Net-SSLeay ) snmp? ( net-analyzer/net-snmp[perl] ) - spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) - zmq? ( dev-perl/ZMQ-LibZMQ3 )" + spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )" AMAVIS_ROOT="/var/lib/amavishome" S="${WORKDIR}/amavis-v${PV}" @@ -99,11 +98,6 @@ src_prepare() { || die "missing conf file - dkim" fi - if use zmq ; then - sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \ - || die "missing conf file - zmq" - fi - if ! use spamassassin ; then sed -i -e \ "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \ @@ -122,17 +116,6 @@ src_install() { newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \ amavisd-snmp-subagent dodoc AMAVIS-MIB.txt - - if use zmq ; then - dosbin amavisd-snmp-subagent-zmq - newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \ - amavisd-snmp-subagent-zmq - fi - fi - - if use zmq ; then - dosbin amavis-services amavis-mc - newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc fi if use ldap ; then diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml index 358d0af9a716..a4f1bca475e5 100644 --- a/mail-filter/amavisd-new/metadata.xml +++ b/mail-filter/amavisd-new/metadata.xml @@ -17,6 +17,5 @@ <flag name="rspamd">Add support for mail-filter/rspamd extension (HTTP only)</flag> <flag name="rspamd-https">Add support for mail-filter/rspamd extension (both HTTP and HTTPS)</flag> <flag name="spamassassin">Add support for mail-filter/spamassassin</flag> - <flag name="zmq">Add support for zeromq sockets</flag> </use> </pkgmetadata> diff --git a/mail-filter/courier-pythonfilter/Manifest b/mail-filter/courier-pythonfilter/Manifest index 0127e84b7dbd..2b537300a3df 100644 --- a/mail-filter/courier-pythonfilter/Manifest +++ b/mail-filter/courier-pythonfilter/Manifest @@ -1,4 +1,3 @@ DIST courier-pythonfilter-3.0.2.tar.gz 59121 BLAKE2B 6223ddd62c1c1af980720451e3446cd3b2296a243c5c8d3b5e60fd8640e3391ba2e561ea251bbacbb4a1c6cdbe7eccf6f7ff8221d952cf5703d389b0267a1a2f SHA512 62985a3fefc2d324b3ba7035117e88e4e246815e63fe1b681af11a38a20ea55e649a233c1979b918b166f5c2abbcc22037f215b73be298763f777648249cd652 -EBUILD courier-pythonfilter-3.0.2-r1.ebuild 485 BLAKE2B b138d3528c6ad24c171ea68e323a3c51e73632ef4b651a2010778ee5ceccd7b3e46c710aa68fa58aa53911adf773833ec9ab98de7670d8f850461daad268d457 SHA512 77d3df1e48b6131b51a2c8720ad242fe7235a7cc9e418871275d85aacaba1a650749a59456d9bed0fa198e781f824b2c2f31c4bd2eb7747aca39ef54c425e5ee -EBUILD courier-pythonfilter-3.0.2.ebuild 481 BLAKE2B 28cca6afd5fcc5298cafa3bfb7236bd61d48ef4387e7a85d544d4d983433c0ce48d2e4f501cc42ae93009b4291ddb92ae7a6d7230daa5a9a71eb43703319583d SHA512 b588c761d3f2b79d5866e5c5604ae85c3457bfe8f5899150f2122cec88119480b84df2e89ef981951c7276d0c45334bf40e462da102c0caba46f25a9249d16ab +EBUILD courier-pythonfilter-3.0.2-r1.ebuild 450 BLAKE2B 29c2640edbff4dfaee64938d7be1ea3f1a3173691d7f20b8e9cdac867ac1989a32efa5dff5aa0abcaf93614463f920e5c4672794528fafe5cb97bf4e4aa71e78 SHA512 ff93d6ee53815bfe8ca34f2c052397b0234eac64db5bbd08fde052a369271192ae4295a3142952f7fa8a5700642aede1e76b773511b427fffb14beb5af008b39 MISC metadata.xml 299 BLAKE2B 495df9e20b847c1760adbd30a80d131f07be4a51f1bb4727835bcfaa37c804bf0cbfa9a2697e8907507445ad4785129c97902d88aa4890122d2c4100d9233db1 SHA512 3658867ae9276068ed78a26bf218dbe5125025336119678d699c77f643884c55dbb4b8b19eb304447b0efcacf4b8eda437217e9ba8cacb7dffccc0d4464bc6e6 diff --git a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2-r1.ebuild b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2-r1.ebuild index c7253148ccae..807a9a0772ed 100644 --- a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2-r1.ebuild +++ b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2-r1.ebuild @@ -3,6 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 DESCRIPTION="Python filtering architecture for the Courier MTA" @@ -11,9 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="" -RDEPEND="mail-mta/courier" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="mail-mta/courier" diff --git a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2.ebuild b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2.ebuild deleted file mode 100644 index e37b200da1bc..000000000000 --- a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 - -DESCRIPTION="Python filtering architecture for the Courier MTA" -HOMEPAGE="https://pypi.org/project/courier-pythonfilter/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="mail-mta/courier" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest index ae5439d59729..838ff4459fee 100644 --- a/mail-filter/imapfilter/Manifest +++ b/mail-filter/imapfilter/Manifest @@ -1,4 +1,5 @@ AUX imapfilter-2.6.16-libressl.patch 920 BLAKE2B 6c0bc84885354f2f95430f9e827c391063acc8bc12113a775a24b6af58679c43eea500bb57405ddf89cf09a0a97c5255e49257cb76b87f3481a3b65b62f8e884 SHA512 81ff9036b77d763c57287b4852ae6e3c746478c1b1a98ee62d5021a8580c0245231078b806eed5e6857e71ed2935788552f6fc2565506c21ae336dd89b8b70a2 DIST imapfilter-2.6.16.tar.gz 59636 BLAKE2B 9de58800ab88aa6e22ead001fd4e635b1991d23a2345d729a59438d3774148b1478b561c36848af155da7d15e84afdf900b73054ef268243f333843b71417d1e SHA512 0500931143e593eb69357ef6a6a40be971abadd22d7e807685b88927da8db9a928470f5cad460252b95ccd42efcfd39b5c4001a8796fa79cbd35018405a7be19 +EBUILD imapfilter-2.6.16-r100.ebuild 1091 BLAKE2B 996c763bd57aa8a66b7c5a87bc5829c11e31dc640d895d5a252d71da1626cd9d077a07e062c177e0a9d1b572b1f644832e8fe559fcfe26f11e49749f0a721171 SHA512 bd78df4f6ba278d13b67371b2b248dfc84b02d9e6de2af9053812eb81bbaee5d8f922c80cafce83bcc3e95fed99f9110651156bd5a7321e9bad776d23832e75c EBUILD imapfilter-2.6.16.ebuild 942 BLAKE2B 2cf741a6835c2b7bfe1754289b9f6fca4f4cfec8d08a3e6c03c1624e7a98bc44a859ee4b6d9e4502ad81a4f45aa789d4cd353afffddb26b7dbda67a59dd0a126 SHA512 5ffb60643302cee65e8c5ee39f5d0c33031b7fd96548c97add5272fdb48a13f992c298d8e5578f2944640d96b6a7a210a3912a6c9ce186e89390816b98d66cd6 MISC metadata.xml 249 BLAKE2B 8f4404564610b1fc4705b073c963909d882aa72717e386d0ddaa11f4a58ea4fedb0505711baf498cb59107d8486b890eb337d56fad641a0c656d4553fc0139fd SHA512 8fb3a6309758c23abad3fd09a007212a6f5c0beb6d03d3c7d94f5fc8b8818d5cbddd55ef8fbe25700eb11dce04486295ddcc413a3fe568b5ba620b0b5fe0b0a6 diff --git a/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild b/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild new file mode 100644 index 000000000000..8709726d2a4a --- /dev/null +++ b/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} ) + +inherit lua-single toolchain-funcs + +DESCRIPTION="An IMAP mail filtering utility" +HOMEPAGE="https://github.com/lefcha/imapfilter" +SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="libressl" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + dev-libs/libpcre + ${LUA_DEPS}" +DEPEND="${RDEPEND}" + +DOCS="AUTHORS NEWS README samples/*" + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.16-libressl.patch +) + +src_prepare() { + default + sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \ + -e "/^MANDIR/s:man:share/man:" \ + -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \ + -e "/^CFLAGS/s/-O//" \ + src/Makefile || die +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + LDFLAGS="${LDFLAGS}" \ + INCDIRS=$(lua_get_CFLAGS) \ + LIBLUA=$(lua_get_LIBS) +} + +src_install() { + default + doman doc/imapfilter.1 doc/imapfilter_config.5 +} diff --git a/mail-filter/libsieve/Manifest b/mail-filter/libsieve/Manifest index 93531518a5ae..895643472f2e 100644 --- a/mail-filter/libsieve/Manifest +++ b/mail-filter/libsieve/Manifest @@ -1,3 +1,3 @@ DIST libsieve-2.2.7.tar.gz 569646 BLAKE2B 2dbfc152110936b5a385af4169a3a2c36a95d241db63153fca94357cb7a8009de2712340185480a13714e8c3c7fc0a648de1d7ce6c1dbbb9ae116dcd3f685ca7 SHA512 e943a76009f3de41274d7100a8b995fe66a91ec92c1c22236ab765cb449add42b38402cc8e161a1b9870dcdd6abc05d9fb5d99d9230c6814896fb0647afe0796 -EBUILD libsieve-2.2.7.ebuild 425 BLAKE2B f523ea556d21215fb77c283829c08f455b412cf209ba10e8532e759afeb894024a214d82b397e31dc876f433f692b832dcf569968d72684a40c26800f1f84db2 SHA512 a4f62c1309fff3b763654d3d994709a89e70b8a7317ea63f0bce40c6c859ff7bba6db03129bb6694099f08b9baeeaf8cc533eaa39d5a04ff6aba03452ff53334 +EBUILD libsieve-2.2.7.ebuild 611 BLAKE2B 90612d57e48760d8264355f0b6c07c7bc40c09a31270067d1d8f6f2d2f1ff665a36d138c2d963250ee1b2559e00a6f87cbc10af76ce791b885364f450d076887 SHA512 6ca27ea02b6cf521f4d3a8d9325b4dd41a894e5d8b12fde3a84e201af5384c749374b3c3b9467b3b9680df1f87fa904f1476af18ef4c825b19bff817c6073cb0 MISC metadata.xml 547 BLAKE2B a8799ccc731378de59e89f68b94a61a3f1591d4247bc645830c2058d2b25b8b4c0d280ff40b84e04be49852ba4a8800abf6aec6abce6bb35109a7fee2d966adf SHA512 0a5b5c0a03fa5e616d9204c1a03da5e0bcc42d43481168604edcdd15b8125e7ca0b3983cc6eae576561a4990359bc47fcb0536a9af71a4ed3c6ccea4d45dfdd5 diff --git a/mail-filter/libsieve/libsieve-2.2.7.ebuild b/mail-filter/libsieve/libsieve-2.2.7.ebuild index 828b84ce2820..8a912109ef1e 100644 --- a/mail-filter/libsieve/libsieve-2.2.7.ebuild +++ b/mail-filter/libsieve/libsieve-2.2.7.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools + DESCRIPTION="A library for parsing, sorting and filtering your mail" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" HOMEPAGE="http://libsieve.sourceforge.net/" @@ -10,9 +12,22 @@ HOMEPAGE="http://libsieve.sourceforge.net/" SLOT="0" LICENSE="MIT LGPL-2.1" KEYWORDS="~alpha amd64 ~ppc ~sparc x86" -IUSE="" -DEPEND="" RDEPEND="!<net-mail/mailutils-2.1" S=${WORKDIR}/${P}/src + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + econf --disable-static +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest index 08816790984b..587fad315d73 100644 --- a/mail-filter/maildrop/Manifest +++ b/mail-filter/maildrop/Manifest @@ -2,5 +2,5 @@ AUX maildrop-3.0.0-testsuite.patch 1948 BLAKE2B fcfdfd488873fa4f14c7087ee54bbc2e AUX maildrop-disable-fam.patch 2291 BLAKE2B dd57e9c6d176fd7ca6cedafb9c0f497dd4454920e60d8d2799f105fd98f51b5a0faa4ecc9d8a688aa4cc9022a6b62b434389d5516bd06abd273e02bf32926b57 SHA512 547f78a9e5dce501ac61584912a2e74b43e36b2189bab27d1811af7718def5e07d3683fb2ef0937ae026bd53cffc68b735319322c089bcfff0a17a6edebed1fb AUX maildroprc 58 BLAKE2B b9ee443f0e9223690f077983541de86dd55c8b36ae2bafdea69563f74dff60ba4234c8388fe257045a36d61bc5f1db4c5a89c56678cbb8b0d4f187120e70a4cb SHA512 3077160382882db22d095dff4b27368e7482b63a9756a3cf7a61e8470ed933af0fdb04a61ebae155b14a7b1fafc598a4cdd1bb660d957f00190b95eb41e81f4e DIST maildrop-3.0.0.tar.bz2 2091018 BLAKE2B 3c8e3ae5c2c2f636b0223e2bafadcb88bf34be63c792a177febac5c41ccd50cab04755f14a26731c38a35531abea1faa70d4af5587a6e68a21735f050f2d46d8 SHA512 1f1e1682ec7c2d0c1f2e71059f186d9a9d3118194b1e558d3a6e5826721fb14a661f4d75df42ce2626430ac072b50e723b563ae00c1ebdeb4da96abfeb534eff -EBUILD maildrop-3.0.0.ebuild 3648 BLAKE2B e8356785837fd6fccd1235400e8c9016cf35f3fa9fad2bf6cb0068fd98563b72b175e0b46cb3ca171ee28fcab6faa2720de77b6daa9d7c0ff91ef60c71ec729f SHA512 4b6aaa91a270eb80733dfb241677af2d973859cca4b63a4f40067e40df72fb5481170516fdfdaa31f2904ef45d0d2cd1536bad5e44145aa559028f749523185c +EBUILD maildrop-3.0.0.ebuild 3655 BLAKE2B 295142ee3ecf1ad6696e8fad5e07151f1bda589c54803da552e8a6fbfd3e95e11c2e98fce3901786c8f30f4939953c6ac11a7de150bc280a3b5139aa46079c00 SHA512 fd1eefc0dfa21fdcf3cab2a75eb152933d4e580249e5262659b7268b38a546d6749e9d8f9346113a1ae47760d02b0610df77452a34faf3802ded7d316e463be5 MISC metadata.xml 553 BLAKE2B 259c46533fe17a5fa0cb8a8f66e0934f048debde8aa2d3e8c231461ad9cd0840854ad5cd25170c8945c8c92fb6281b751db44180be6087c198a4057306487af6 SHA512 42f25a0370d0c41dedfd0ec15e244527ed97ac6d577b170794e9c10930a0a0603e9edba090b004c8fa648ff6bf164a05d7aa2b4cbe2576bd8d9dda6dc54e6e42 diff --git a/mail-filter/maildrop/maildrop-3.0.0.ebuild b/mail-filter/maildrop/maildrop-3.0.0.ebuild index 77b882112208..ec2d6a34412a 100644 --- a/mail-filter/maildrop/maildrop-3.0.0.ebuild +++ b/mail-filter/maildrop/maildrop-3.0.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.courier-mta.org/maildrop/" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86" IUSE="berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota" CDEPEND="!mail-mta/courier diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest index 47a4e23a2b83..1a1271a5d2d7 100644 --- a/mail-filter/milter-regex/Manifest +++ b/mail-filter/milter-regex/Manifest @@ -5,5 +5,5 @@ AUX milter-regex-init-2.6 438 BLAKE2B 36f12dc620dca2f1dd2bc0d471c76355474fe0d50c DIST milter-regex-2.6.tar.gz 20517 BLAKE2B d98587146010d60a062833d8529af2788d657141e19c249e97bf5c847ffa01d6c76f42b6c8413f957fbeb9843ad38281ba8257aef10d0f1bd414726c416533da SHA512 33afa9a314ff2a2f14a301a85fa142e6e4166ffb77e8d18632b094c7873397e037ee6c5d3d1c248bfbb23037c45a15f21fb0cebcbb0f90c69b3d985aad37f169 DIST milter-regex-2.7.tar.gz 20579 BLAKE2B e48c5747537d439372d8f473d9b39e337501c24b46d52e13f727b32ee29bb58f266e45ecabad01937f5e56a4a773659daf34d12c6728b6700679b04a2cb595d0 SHA512 d698a7c35768846bcc87a31167cf9a5c41c99d8fa3f3cb5c231e100a7e149d9bca6fc689ece805bd80688787b6d3fa0d9ace49592e1d6c53a25fc2086ebf9962 EBUILD milter-regex-2.6.ebuild 1268 BLAKE2B 34c4321f989434b0e3c0eda399ab1c6d55b5283c4cc654d75d54153ccae399c19c8b07d7da083d26022fa1c1977bf388d422f20fe9ba3d9e0d5f6af14aa1d742 SHA512 adddee9bc0c7003c138a49db2dd595e83a911f536183af12f0988921022e88457f5c0ed9a82d901d741e80cd216054b4d783476da6e01840fd47b7a86a543c34 -EBUILD milter-regex-2.7.ebuild 1124 BLAKE2B 19fec947296750e8c6fce958e03a1b432b101a9e7fdd3655098a2e88b0217616847f4cc71fb956d62ba788f5e62c217f7249257b36e57bbce8dca9c5be855c11 SHA512 9388ec1f471ae6b3a1c62db2b5a20b7dfa6e64de6b2f2a8cc6953b17272b256d82901ae2810315f9d8573f3ffa01ee465fb1e93e11fd6c837869873e93213c8a +EBUILD milter-regex-2.7.ebuild 1122 BLAKE2B 7974a8b954484fabec28215b75101f07a71ba4cee8228f2ab9c0b99123ff265bba062fd8ef62be5e0e06f5931f402daff79429a77baa5e987dd935fe3256c182 SHA512 d5d0a071a6c461186c14fc0416f4bd6290e0057290fc1e027bf93fc9855b654a8acd4060aa1aa02c4820701973c3cb55f3c6982e47d11fbff5d914fa4b217177 MISC metadata.xml 696 BLAKE2B b6735f8b042cd7f064f4f7edc2b0ac8293e0c1e4641090e8890e13ea8b9642e1f3bdd892e629261006c607216b71c9a912b8b48a24c568ec1b1a1f15ff2a5de8 SHA512 df7e66be229bc3c32ab7d0b7ee8d035840d7b09df8f9070f0a2239a063e6fa7a67b4ff25926b57211b3b7b9d3da43cb96b9e1355ac2f0d693abc248eac3b96d6 diff --git a/mail-filter/milter-regex/milter-regex-2.7.ebuild b/mail-filter/milter-regex/milter-regex-2.7.ebuild index b8a5df416985..e2b98ff9e61f 100644 --- a/mail-filter/milter-regex/milter-regex-2.7.ebuild +++ b/mail-filter/milter-regex/milter-regex-2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ HOMEPAGE="https://www.benzedrine.ch/milter-regex.html" SRC_URI="https://www.benzedrine.ch/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="acct-user/milter-regex diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest index d093bc53fd68..80eaae969ba8 100644 --- a/mail-filter/opendmarc/Manifest +++ b/mail-filter/opendmarc/Manifest @@ -3,8 +3,6 @@ AUX opendmarc-1.3.3-CVE-2020-12460.patch 1302 BLAKE2B 8bd4a1f6aaf44e9931fb97553d AUX opendmarc.confd 85 BLAKE2B 52cccfd8d194febc24453ad92bebf4358f92125cc4512e664e279f09ee0c44bffc4fa2c4c6dbbdfaf653576bcce821597cccb58fafdfae51b81e5ac149e20113 SHA512 7e5faeebbccaaafe42e6edda3a812b9954f19d71b4593cb2ab895dfeb26a8073e4aaeb2f5c626b1c35877d08ea00077b0507fe833e2838b10d83d5e0acfe966c AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df523e04a71d241c0fad4a3d2e4c34c950d7b684be518368fe78538828b81627d647e3531177eabb85e SHA512 00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129 AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb -DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748 DIST opendmarc-1.3.3.tar.gz 575319 BLAKE2B 72dae5553fea9a51d860aaac6d85171a245584a74134df2249217a88f3da04c4eb518141f6342e281c6a9186345d69a34b585dc3ed18bdb53313374db505f4f5 SHA512 bb4bf8e3ad2d1732b07e55316819d4fd708e529b54a336d7d00763e13bfc62580bb1b30f132fa786dbca15e526e8dd5e146c7be454e1c42714a9f57126fc5e12 -EBUILD opendmarc-1.3.2-r3.ebuild 1610 BLAKE2B 78304b8b07399155f72cbbac51e47cecad9459e862425c5d0beb01a1ce5ec02791abaaaf87d674200c3dacb7069f1443959811a7ac6dd1a113f121b087f9dfeb SHA512 6a6e5125d8447a73c28478764f793af9a0052a4142e51773904275857f77384e8f4c4f07e04045b94e704d397ddd6d8d787fea9d1415c28d0110efb9052e6486 -EBUILD opendmarc-1.3.3.ebuild 1891 BLAKE2B ed9948f4989c523fc849586f624321c8eae1463190b9828449abbaaf6b351d98abb04b6ec71b3f1676cc74d1dc680182e89b965dc436284e9698b8c34e66e531 SHA512 321b9226ff66f6be18bf2e5e6b7e682f16ed88652a81f989f13d3ad71fae87d376d84bbc1234ee82718b15234002a4bcff4df0eabe7e574f556ae7d6e94d95a0 +EBUILD opendmarc-1.3.3.ebuild 1886 BLAKE2B 0acb875bcbb65e6f3dfd440435da8e5d8bda669ee844aa2e9260d82c8b00bf1af73360791be100a3c2ab664c32d335210d04b4b4639cb1cbd9ce3ad7e9241d70 SHA512 b7c8008538b68585f5e61311b9a4a10f9dab56ec88e52401e2ee4d59ff3cac9834cc852f201a4bc82817a10478c7966f45852c912482b14b4091326ec263db49 MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0 diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild deleted file mode 100644 index 480100bb10f5..000000000000 --- a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user multilib systemd - -DESCRIPTION="Open source DMARC implementation " -HOMEPAGE="http://www.trusteddomain.org/opendmarc/" -SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86" -IUSE="spf +reports static-libs" - -DEPEND="reports? ( dev-perl/DBI ) - || ( mail-filter/libmilter mail-mta/sendmail )" -RDEPEND="${DEPEND} - reports? ( - dev-perl/DBD-mysql - dev-perl/HTTP-Message - dev-perl/Switch - ) - spf? ( mail-filter/libspf2 )" - -PATCHES=( - "${FILESDIR}"/${P}-multiple-From.patch -) - -pkg_setup() { - enewgroup milter - enewuser milter -1 -1 /var/lib/milter milter -} - -src_prepare() { - default - if use !reports ; then - sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die - fi -} - -src_configure() { - econf \ - $(use_with spf) \ - $(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \ - $(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \ - $(use_enable static-libs static) -} - -src_install() { - default - - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la - - newinitd "${FILESDIR}"/opendmarc.initd opendmarc - newconfd "${FILESDIR}"/opendmarc.confd opendmarc - systemd_dounit "${FILESDIR}/${PN}.service" - - dodir /etc/opendmarc - - # create config file - sed \ - -e 's:^# UserID .*$:UserID milter:' \ - -e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \ - -e '/^# Socket /s:^# ::' \ - "${S}"/opendmarc/opendmarc.conf.sample \ - > "${ED}"/etc/opendmarc/opendmarc.conf \ - || die -} diff --git a/mail-filter/opendmarc/opendmarc-1.3.3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.3.ebuild index ea4968372a6c..dfd9b437f63c 100644 --- a/mail-filter/opendmarc/opendmarc-1.3.3.ebuild +++ b/mail-filter/opendmarc/opendmarc-1.3.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${PN}-${P LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86" IUSE="spf +reports static-libs" DEPEND="reports? ( dev-perl/DBI ) diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest index fa8ce404a31f..d7e9b8b34ea1 100644 --- a/mail-filter/pyzor/Manifest +++ b/mail-filter/pyzor/Manifest @@ -2,6 +2,6 @@ AUX read-stdin-as-binary-in-get_input_msg.patch 2751 BLAKE2B c348d28eeb703ff9b25 AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c25163f68738281c48638b86c8809b5dab8f6f3c0058f17b1e2232d7c704b4aa777aaaf43c63170478da95272e75492bbbaec696789 SHA512 d9f5308d1f9280db5a0556fcaf3927e261b6cd1d01ff42c05a912335c6f9343f78096eed645aab5c741c221adf5ece00137aa3ae6f950cafbeb77db1908949b9 DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a DIST pyzor-1.0.0_p20200523.tar.gz 138077 BLAKE2B 13ad30f06ce32a24a42dd5aaa21ad2a6700df1bac3dc54a86532748688b094ee0f56a8e28e34336298388c6e0b95868e95d040866c9afa561d867069496608fe SHA512 afe3b14794aea68b1a7d72840257976c7c9f755a6f6dcaaf6ebacab465c176fe2aa84f3fe176006cdbe26ef0b07ed949f75f6ef729f65c604fadf6ce8472da8f -EBUILD pyzor-1.0.0-r1.ebuild 2015 BLAKE2B bcbd30619b39d43b93ce6445cf986bff42dd1e7d4d1afd1f0c24aea1dc7a456de2840280c5455cacca55c90fdec80ca61fc36091676a800cf3a61b20fe975d88 SHA512 e2a0e1cb9be39ce9f3c1e44ee6de79ecb62d1ac66fd32e75c0b340ffaa5de842f945203fb58fb5723ebb8c12392d07567971d37fcbd744afa92d9e89dc2e8466 -EBUILD pyzor-1.0.0_p20200523.ebuild 1566 BLAKE2B 3d2e65e56e735c2c6bf1eb02cb62f16c05f64e9d58fd10fb0da3e9f925a891a4bf795d36cf3d8d93d6746195029836ec2f475127750946ee6b53b3e3ca32fb7b SHA512 541dbf949a7477299d70026427b2010f6fa3a98c93381d10bdb34297c8e244cea582841a0bb14386af90da407e80489279088ce491899e13505080c914c151fd +EBUILD pyzor-1.0.0-r1.ebuild 2016 BLAKE2B 34903bbfc8348b6d8f43f251743e41b3542eb536a0cf53cca4e3e866e1041b739f1db8f64bf46ec6ce5ff0e66ae89c71411428b116a984e9f48eab4bb0a33d19 SHA512 23e7b62bc729406edd320928983eda6b7ebde88978aa7dfedb64d2eddaa0e9a16702218d0b74bf6350360b9eebe863bc33273c2b1ccd189f2d07cfc99fd98ba8 +EBUILD pyzor-1.0.0_p20200523.ebuild 1564 BLAKE2B 1488769018ef6b43adac5d6405cbe48829104e432ac6edbd0d356172caf3f17f6c87853667af9fabdd1de74fcd4471210ad2549e82ec7e8801bf8d277f50875a SHA512 d80a983108f7cd22493b8108f5d704f19f5fbde15e7a8559fc78e5b41b3cd53475dca2673a9ed8485f0de25f27b634b994a5c2262c1a73e4cda8480d7b59ff34 MISC metadata.xml 953 BLAKE2B fe7e5e35caa89645a565b81176783dd56302b60be89423f4dd882f14ec6b437daaacdeb1c253440eb67dc7f9dbc5daa9c838bb39ccea2e38b2eb48817c28a559 SHA512 ab71adbb406760237a26728a512f32a10e3e55d17bed7c09d37e7da32abe21dcce9d4506630c7a59e681e4096ee4c436e8edcf220e22038d45a6b755e123acea diff --git a/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild b/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild index 1cf021784362..af40ded0281c 100644 --- a/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild +++ b/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/SpamExperts/pyzor/archive/release-${MY_PV}.tar.gz -> LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="doc gdbm gevent pyzord redis test" # The test suite is py2-only diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild index 67282d845663..3bf6bdff2901 100644 --- a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild +++ b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/SpamExperts/pyzor/archive/${COMMIT}.tar.gz -> ${P}.t LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="doc gdbm gevent mysql pyzord redis test" RESTRICT="!test? ( test )" diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index 4e23c0584dcd..8690b442f871 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,15 +1,17 @@ -AUX rspamd-2.5-unbundle-lua.patch 3169 BLAKE2B 77ff33b618a824008da0d4d71a79c252bacbfc48a7fa8f288cfdf901883498a6bcdb2acc21959c9c49aabf4e2b2f6445eb7f9b906a008f31e54a9deb730946d0 SHA512 02b59ade0a715c9d7875fb154129724a9e4f392f31928e1c460bd720de0ffb649883c8d29480f8ac09d8cb69281a8395547cb0f6a082a9b422de7adb81469bb0 +AUX rspamd-2.5-replxx-gcc10.patch 280 BLAKE2B 56d8ffde0ac9ba834ef65df2ccc8107f3237c215d715e099a8d3a7796a1667b2692b215ecb63f47cdd1d2beda2f1a2a4b8f8b44609d1377789e207fdbf907d87 SHA512 62969886d6c4d27cb658eee5e40d740d7e3cb8625aa5a74ef67898c1cc4d9c65d01d2bee4290d7108cd215c076cd950c6e0dbbbea0b714de442ed662e0ee68f2 +AUX rspamd-2.5-unbundle-lua.patch 1367 BLAKE2B 91b1e48a8d75cf4ff2fe796fb45c202fdd0dfae8e08a0c2d43c167dcceb81fd13629bd198e3c909eac85a6e939ac6b68127f3cdf32ed5bfb57e970527d39d449 SHA512 41d424da356e68a2c15e7e863525128cb837b78a839954addf39260971f18ab65cc076b8b55cda2f75522b503592208647ac06b0dfa490e8b2a5540cab63cd99 AUX rspamd-2.5-unbundle-snowball.patch 758 BLAKE2B 4e419c4e70d5726309c17ca759b8917feb2d52842cde06453821a8b1964ed8165a5f3536ab917a8362b44b40858d1660ae7c7887fee513e9e6fb681d24589255 SHA512 5257921bdeb5febef99feebd03d291aad009a6b8a44c325305532bae7aec35456042b4813338f175c4a59aa80cce3178118d9e1e4bc5a500f42e5364c06a4dda AUX rspamd-2.5-unbundle-zstd.patch 4191 BLAKE2B 3d053efdfbf66dfd793b20d00a534bf5d46f5a85c48f432a45d17781be960db916bb28decd92c089d5bca734edb18559f552590ad804f27c494a2342a52b8606 SHA512 afdbfb264243bdc27c8010c9a2b89a855d16054d445c82a13656f505550670f7ab978008c0900c9d04144677b043976101d882e6deb9a32215110e0d96e74179 +AUX rspamd-2.6-unbundle-lua.patch 1344 BLAKE2B 0d5e07043f5bff29ef484e7708cd3b0fda36e500c6846772c6299fd43499e46c0f453c873c89a82a48b7402e6cbb5cd2d20f4547d831d490ceac99f0aecc7926 SHA512 1c95ce0b6cca05671d3dee9b373dfaf0be1dae45702b5e1165c482141b8b87c367bd5cfbf482309c00872468b379a2a82034d6983ec219e6ef18ae50d4ce48a2 +AUX rspamd-2.6-unbundle-zstd.patch 4085 BLAKE2B aba3487956b3a92296adffc748775ef88dfbbd8595fde5c50e33e67a9d6d517e8f73dc22a288aee73b4131b8c49f84968b9e6aa5c697c7e7a0a68b7f938cac38 SHA512 9c9a2ac7bd25fdc9dd2ae6aebd18a1a88358b5de0f2b7bb63b7af5c405125e0517df0869e6007f79c87d5f650395589f543581c189b91d1cbc1e8ab76c2df0ee +AUX rspamd-9999-unbundle-zstd.patch 4040 BLAKE2B 5ea99146c979337aaeb1e9cc1bacbec07478dc65dfd3902ae54153ca64bb0035340fbea0604ad089b5ad503a76b9199028376ec90c7e179013b75b6b3f3de8f2 SHA512 6e6b5080195295c7d9e442eedcabb11bd0c9879a38c1b0dc26bf5e5b2f3665a46ef86b5e95582a68d2df922db862db3cd46a555b9c97a7fefb72a79373a02b19 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-2.3.tar.gz 4409924 BLAKE2B 825326c8c92b9937be1aed8640acc1c94762bf8de564642e4d1d429025eb9cc7ba943217b35c881c92b888cff0bec68ffae737bfc77ccb02bfc2ebd9d5948bcc SHA512 20fae1b088acafaaaa406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95 -DIST rspamd-2.4.tar.gz 4462119 BLAKE2B 073a27dc8ca76ede3928a2bbc1c3908d442e2d70e0cb51fea73f23fea55536f84e8154b7b6423af13002c0bd5cda60ae9948b3c6321a73d365c7fbd6541c3dca SHA512 47d64fdadc1c61642efebe4772add48848a45c8106bf431dacb458d85cdd9bf996ca46bcb75d60cedb15ae72518089e9b3e63a0716d22843f5b9f38d7d86be08 DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697 SHA512 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540 -EBUILD rspamd-2.3.ebuild 2219 BLAKE2B 22b8e199e27f7771ea5a4216b648da72b14f76c31845565fabb76a331e16366dbcc40eee13915db234a77fed03dabb4869cefa6aaf55387c6eeacbaa476dc6da SHA512 88f17ad1f33841d5ac80447ad935a8bf2e108fc7fc89ba70922312979721eaa38cc74bfbde09145f055885a62b7306e664325eee2e434bc1483aacb083e23230 -EBUILD rspamd-2.4.ebuild 2219 BLAKE2B 22b8e199e27f7771ea5a4216b648da72b14f76c31845565fabb76a331e16366dbcc40eee13915db234a77fed03dabb4869cefa6aaf55387c6eeacbaa476dc6da SHA512 88f17ad1f33841d5ac80447ad935a8bf2e108fc7fc89ba70922312979721eaa38cc74bfbde09145f055885a62b7306e664325eee2e434bc1483aacb083e23230 -EBUILD rspamd-2.5.ebuild 2573 BLAKE2B 634e38870b37b9d3d41d38e0101df39ec19fbab7b36d5b3b6db4dd7e321f23260aef04b9c289a1bed77536cd539d824d53820e107a327ac8e673b099f530a9fa SHA512 f2a0934d81ce4ed7ff6383c5017e48bd8b71c07d31eea5fb2e9078639ca4e36fa4526c6c7cfed2a96ccd527a9ac4ffa7e7cbc825d7b1149f21589f40435925d6 -EBUILD rspamd-9999.ebuild 2573 BLAKE2B 634e38870b37b9d3d41d38e0101df39ec19fbab7b36d5b3b6db4dd7e321f23260aef04b9c289a1bed77536cd539d824d53820e107a327ac8e673b099f530a9fa SHA512 f2a0934d81ce4ed7ff6383c5017e48bd8b71c07d31eea5fb2e9078639ca4e36fa4526c6c7cfed2a96ccd527a9ac4ffa7e7cbc825d7b1149f21589f40435925d6 -MISC metadata.xml 751 BLAKE2B 612a7de6326aba8b0319fb58cb7dd8669bc8d2d59e0e606afbe6b202c287e6953023e5a026750866dc015b9a2aa0249be3ccd46b48cf950a78b2cf497bc86147 SHA512 d958864849fa7a74e578046d1d2a7599b0a3e3d8b1d7f9d520833ce1037aff77f39dff49ad1996eb600f3293f23ba84919ab046abddc75490816799ea6865494 +DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a +EBUILD rspamd-2.5-r1.ebuild 2564 BLAKE2B bef0d75d83f85a0736000a9f5b84ffd27d62225d65318b3f3440ea6c7c695fa80922b6b40df58ecaa6daf4a69e2ac822c8becccd7d281ecb3d647d1e3a7564fb SHA512 2fc29c4d2e34f56396be899dc7b6faecf7e47a4321958d7169ed53d018a6d8a090744c1a4d1fa3a1563315e3635208df0c654da88c5a50a30835f8cf6b803251 +EBUILD rspamd-2.6-r2.ebuild 2534 BLAKE2B 4d75dcdc44c51b38be726e6be4dbf51915ae3333bc6c7662303be93531562394495cb2c516fb2c9abd18326f39abf5352c844e3b7d9d67ba94d9e9fe2a387d7f SHA512 fec9a74698ac4df235106c179e619dac1890f82d3489fdf2599db5b7b7c57b7d92926160662599b117844cbca12493a309dcddcd8c4bbfdb25eef582ef9fabfa +EBUILD rspamd-9999.ebuild 2535 BLAKE2B 8f3e3f5f4e80c667a0181379410dd890ac95d7ee81c7d47334c12f0b49161304270a05eabbf758bec084ee907e1a4e80f05c619c15dc96d91e0908d5540aa6c9 SHA512 9495d0b2474d04d5b0015efc1830da1263a5f1fc3de49605798facc987ef94171befb539bff4389c783db8e5f56e695acf0b7068669d310d30f72383f71e8899 +MISC metadata.xml 639 BLAKE2B 935ca7becc486efc41fa07b224808a67893e8a609819a1d7a299f03689d94ea6c959f0e606896f0bd899294e7a48c48279125f9e8508981aebaa42a55a8eb4a7 SHA512 22cadde54711e1b4b7324fe68dfacc95fac4477910001b99e0423b9735e83f69801580822aa5f6ea6460955eda6fe4cd4702d9c22cfe1b09721203744f556a80 diff --git a/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch b/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch new file mode 100644 index 000000000000..81d7f3de2958 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch @@ -0,0 +1,12 @@ +diff --git a/contrib/replxx/src/io.cxx b/contrib/replxx/src/io.cxx +index a09886701..8df176d1c 100644 +--- a/contrib/replxx/src/io.cxx ++++ b/contrib/replxx/src/io.cxx +@@ -3,6 +3,7 @@ + #include <cstdlib> + #include <cstring> + #include <array> ++#include <stdexcept> + + #ifdef _WIN32 + diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch index b8deb2d6903b..4a20c8f19d3f 100644 --- a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch +++ b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch @@ -1,22 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index bbc141170..8e3665c18 100644 +index bbc141170..7fbb1b485 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -112,7 +112,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/" - "${CMAKE_SOURCE_DIR}/contrib/librdns" - "${CMAKE_SOURCE_DIR}/contrib/aho-corasick" - "${CMAKE_SOURCE_DIR}/contrib/lc-btrie" -- "${CMAKE_SOURCE_DIR}/contrib/lua-lpeg" - "${CMAKE_BINARY_DIR}/src" #Stored in the binary dir - "${CMAKE_BINARY_DIR}/src/libcryptobox") - -@@ -592,16 +591,11 @@ ENDIF() - ADD_SUBDIRECTORY(contrib/libucl) - ADD_SUBDIRECTORY(contrib/librdns) - ADD_SUBDIRECTORY(contrib/aho-corasick) --ADD_SUBDIRECTORY(contrib/lua-lpeg) - ADD_SUBDIRECTORY(contrib/t1ha) - ADD_SUBDIRECTORY(contrib/libev) +@@ -598,10 +598,6 @@ ADD_SUBDIRECTORY(contrib/libev) ADD_SUBDIRECTORY(contrib/kann) ADD_SUBDIRECTORY(contrib/fastutf8) @@ -27,27 +13,11 @@ index bbc141170..8e3665c18 100644 IF (ENABLE_LUA_REPL MATCHES "ON") ADD_SUBDIRECTORY(contrib/replxx) SET(WITH_LUA_REPL 1) -@@ -700,7 +694,6 @@ INSTALL(FILES "contrib/lua-fun/fun.lua" DESTINATION ${LUALIBDIR}) - INSTALL(FILES "contrib/lua-argparse/argparse.lua" DESTINATION ${LUALIBDIR}) - INSTALL(FILES "contrib/lua-tableshape/tableshape.lua" DESTINATION ${LUALIBDIR}) - INSTALL(FILES "contrib/lua-lupa/lupa.lua" DESTINATION ${LUALIBDIR}) --INSTALL(FILES "contrib/lua-lpeg/lpegre.lua" DESTINATION ${LUALIBDIR}) - - # systemd unit - IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND WANT_SYSTEMD_UNITS MATCHES "ON") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9a34d2ac4..54b2e4083 100644 +index 9a34d2ac4..59bab5c15 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -180,7 +180,6 @@ ENDIF() - TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) --TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg) - TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) -@@ -189,10 +188,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON") +@@ -189,10 +189,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON") ADD_DEPENDENCIES(rspamd-server rspamd-clang) ENDIF() @@ -59,18 +29,10 @@ index 9a34d2ac4..54b2e4083 100644 TARGET_LINK_LIBRARIES(rspamd-server stemmer) ENDIF() diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c -index ce5fff6c5..509ceeb44 100644 +index ce5fff6c5..bea6dc389 100644 --- a/src/lua/lua_common.c +++ b/src/lua/lua_common.c -@@ -14,7 +14,6 @@ - * limitations under the License. - */ - #include "lua_common.h" --#include "lptree.h" - #include "utlist.h" - #include "unix-std.h" - #include "ottery.h" -@@ -903,10 +902,6 @@ rspamd_lua_wipe_realloc (void *ud, +@@ -903,10 +903,6 @@ rspamd_lua_wipe_realloc (void *ud, return NULL; } @@ -81,7 +43,7 @@ index ce5fff6c5..509ceeb44 100644 lua_State * rspamd_lua_init (bool wipe_mem) { -@@ -961,7 +956,6 @@ rspamd_lua_init (bool wipe_mem) +@@ -961,7 +957,6 @@ rspamd_lua_init (bool wipe_mem) luaopen_kann (L); luaopen_spf (L); #ifndef WITH_LUAJIT @@ -89,11 +51,3 @@ index ce5fff6c5..509ceeb44 100644 lua_settop (L, 0); #endif -@@ -971,7 +965,6 @@ rspamd_lua_init (bool wipe_mem) - rspamd_lua_new_class (L, "rspamd{session}", NULL); - lua_pop (L, 1); - -- rspamd_lua_add_preload (L, "lpeg", luaopen_lpeg); - luaopen_ucl (L); - rspamd_lua_add_preload (L, "ucl", luaopen_ucl); - diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch new file mode 100644 index 000000000000..9278fa8608d7 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch @@ -0,0 +1,53 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b794b9dbd..1ba5c085e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -632,10 +632,6 @@ ADD_SUBDIRECTORY(contrib/fastutf8) + ADD_SUBDIRECTORY(contrib/google-ced) + + +-IF (NOT WITH_LUAJIT) +- ADD_SUBDIRECTORY(contrib/lua-bit) +-ENDIF() +- + IF (ENABLE_LUA_REPL MATCHES "ON") + ADD_SUBDIRECTORY(contrib/replxx) + SET(WITH_LUA_REPL 1) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9a34d2ac4..59bab5c15 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -189,10 +189,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON") + ADD_DEPENDENCIES(rspamd-server rspamd-clang) + ENDIF() + +-IF (NOT WITH_LUAJIT) +- TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit) +-ENDIF() +- + IF (ENABLE_SNOWBALL MATCHES "ON") + TARGET_LINK_LIBRARIES(rspamd-server stemmer) + ENDIF() +diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c +index b7fcc2034..1d86464da 100644 +--- a/src/lua/lua_common.c ++++ b/src/lua/lua_common.c +@@ -922,10 +922,6 @@ rspamd_lua_wipe_realloc (void *ud, + return NULL; + } + +-#ifndef WITH_LUAJIT +-extern int luaopen_bit(lua_State *L); +-#endif +- + lua_State * + rspamd_lua_init (bool wipe_mem) + { +@@ -981,7 +977,6 @@ rspamd_lua_init (bool wipe_mem) + luaopen_spf (L); + luaopen_tensor (L); + #ifndef WITH_LUAJIT +- rspamd_lua_add_preload (L, "bit", luaopen_bit); + lua_settop (L, 0); + #endif + diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch new file mode 100644 index 000000000000..1a7f4453c86f --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch @@ -0,0 +1,128 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 90caf4048..e2e5d182c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -198,6 +198,8 @@ ELSE() + ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) + ENDIF() + ++ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h ++ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd) + ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite + ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite) + ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h +@@ -615,7 +617,6 @@ ADD_SUBDIRECTORY(contrib/http-parser) + ADD_SUBDIRECTORY(contrib/fpconv) + ADD_SUBDIRECTORY(contrib/lc-btrie) + ADD_SUBDIRECTORY(contrib/libottery) +-ADD_SUBDIRECTORY(contrib/zstd) + IF(ENABLE_SNOWBALL MATCHES "ON") + ADD_SUBDIRECTORY(contrib/snowball) + SET(WITH_SNOWBALL 1) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 54b2e4083..e0e2edd58 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -181,7 +181,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser) + TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv) + TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) + TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) +-TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) + TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) + + IF (ENABLE_CLANG_PLUGIN MATCHES "ON") +diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c +index bcb25672e..48ca58e94 100644 +--- a/src/client/rspamdclient.c ++++ b/src/client/rspamdclient.c +@@ -19,7 +19,7 @@ + #include "libserver/http/http_private.h" + #include "libserver/protocol_internal.h" + #include "unix-std.h" +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + + #ifdef HAVE_FETCH_H + #include <fetch.h> +diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c +index 78e3fc79f..40110c693 100644 +--- a/src/libserver/cfg_utils.c ++++ b/src/libserver/cfg_utils.c +@@ -36,8 +36,7 @@ + #include "contrib/libottery/ottery.h" + #include "contrib/fastutf8/fastutf8.h" + +-#define ZSTD_STATIC_LINKING_ONLY +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + + #ifdef HAVE_OPENSSL + #include <openssl/rand.h> +diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c +index 8b9f522b2..8cf03ffd6 100644 +--- a/src/libserver/maps/map.c ++++ b/src/libserver/maps/map.c +@@ -23,7 +23,7 @@ + #include "libserver/http/http_connection.h" + #include "libserver/http/http_private.h" + #include "rspamd.h" +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + #include "contrib/libev/ev.h" + #include "contrib/uthash/utlist.h" + +diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c +index 9d1276064..6f0a66fb8 100644 +--- a/src/libserver/protocol.c ++++ b/src/libserver/protocol.c +@@ -21,7 +21,7 @@ + #include "worker_private.h" + #include "libserver/cfg_file_private.h" + #include "libmime/scan_result_private.h" +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + #include "lua/lua_common.h" + #include "unix-std.h" + #include "protocol_internal.h" +diff --git a/src/libserver/task.c b/src/libserver/task.c +index 53da0dae6..6538abdbf 100644 +--- a/src/libserver/task.c ++++ b/src/libserver/task.c +@@ -25,7 +25,7 @@ + #include "stat_api.h" + #include "unix-std.h" + #include "utlist.h" +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + #include "libserver/mempool_vars_internal.h" + #include "libserver/cfg_file_private.h" + #include "libmime/lang_detection.h" +diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c +index 0787736d5..21474317a 100644 +--- a/src/lua/lua_util.c ++++ b/src/lua/lua_util.c +@@ -17,7 +17,7 @@ + #include "html.h" + #include "tokenizers/tokenizers.h" + #include "unix-std.h" +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + #include "contrib/uthash/utlist.h" + #include "libmime/email_addr.h" + #include "libmime/content_type.h" +diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c +index 4ed8cfab7..5f8808e40 100644 +--- a/src/rspamd_proxy.c ++++ b/src/rspamd_proxy.c +@@ -36,7 +36,7 @@ + #include "libserver/milter.h" + #include "libserver/milter_internal.h" + #include "libmime/lang_detection.h" +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + + #include <math.h> + +-- +2.26.2 + diff --git a/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch new file mode 100644 index 000000000000..c42bb8f5d6f2 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch @@ -0,0 +1,125 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3b4bd8469..75582513e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -199,6 +199,8 @@ ELSE() + ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3) + ENDIF() + ++ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h ++ ROOT ${ZSTD_ROOT_DIR} MODULES libzstd) + ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite + ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite) + ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h +@@ -616,7 +618,6 @@ ADD_SUBDIRECTORY(contrib/http-parser) + ADD_SUBDIRECTORY(contrib/fpconv) + ADD_SUBDIRECTORY(contrib/lc-btrie) + ADD_SUBDIRECTORY(contrib/libottery) +-ADD_SUBDIRECTORY(contrib/zstd) + IF(ENABLE_SNOWBALL MATCHES "ON") + ADD_SUBDIRECTORY(contrib/snowball) + SET(WITH_SNOWBALL 1) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 59bab5c15..098329991 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -182,7 +182,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv) + TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) + TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg) + TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) +-TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) + TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) + + IF (ENABLE_CLANG_PLUGIN MATCHES "ON") +diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c +index bcb25672e..48ca58e94 100644 +--- a/src/client/rspamdclient.c ++++ b/src/client/rspamdclient.c +@@ -19,7 +19,7 @@ + #include "libserver/http/http_private.h" + #include "libserver/protocol_internal.h" + #include "unix-std.h" +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + + #ifdef HAVE_FETCH_H + #include <fetch.h> +diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c +index e2f886aa6..5b214c09c 100644 +--- a/src/libserver/cfg_utils.c ++++ b/src/libserver/cfg_utils.c +@@ -36,8 +36,7 @@ + #include "contrib/libottery/ottery.h" + #include "contrib/fastutf8/fastutf8.h" + +-#define ZSTD_STATIC_LINKING_ONLY +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + + #ifdef HAVE_OPENSSL + #include <openssl/rand.h> +diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c +index 14792753a..20ca8416e 100644 +--- a/src/libserver/maps/map.c ++++ b/src/libserver/maps/map.c +@@ -23,7 +23,7 @@ + #include "libserver/http/http_connection.h" + #include "libserver/http/http_private.h" + #include "rspamd.h" +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + #include "contrib/libev/ev.h" + #include "contrib/uthash/utlist.h" + +diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c +index 31b0308cb..62ba3d833 100644 +--- a/src/libserver/protocol.c ++++ b/src/libserver/protocol.c +@@ -21,7 +21,7 @@ + #include "worker_private.h" + #include "libserver/cfg_file_private.h" + #include "libmime/scan_result_private.h" +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + #include "lua/lua_common.h" + #include "unix-std.h" + #include "protocol_internal.h" +diff --git a/src/libserver/task.c b/src/libserver/task.c +index e7a83a603..c613fffcc 100644 +--- a/src/libserver/task.c ++++ b/src/libserver/task.c +@@ -25,7 +25,7 @@ + #include "stat_api.h" + #include "unix-std.h" + #include "utlist.h" +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + #include "libserver/mempool_vars_internal.h" + #include "libserver/cfg_file_private.h" + #include "libmime/lang_detection.h" +diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c +index e879d37af..88451e222 100644 +--- a/src/lua/lua_util.c ++++ b/src/lua/lua_util.c +@@ -15,7 +15,7 @@ + */ + #include "lua_common.h" + #include "unix-std.h" +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + #include "libmime/email_addr.h" + #include "libmime/content_type.h" + #include "libmime/mime_headers.h" +diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c +index 3fa5da390..c641fb263 100644 +--- a/src/rspamd_proxy.c ++++ b/src/rspamd_proxy.c +@@ -36,7 +36,7 @@ + #include "libserver/milter.h" + #include "libserver/milter_internal.h" + #include "libmime/lang_detection.h" +-#include "contrib/zstd/zstd.h" ++#include <zstd.h> + + #include <math.h> + diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index c14373f9b6eb..f0f82f46abdb 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -6,10 +6,6 @@ <name>Christian Roessner</name> </maintainer> <maintainer type="person"> - <email>djc@gentoo.org</email> - <name>Dirkjan Ochtman</name> - </maintainer> - <maintainer type="person"> <email>arkamar@atlas.cz</email> <name>Petr Vaněk</name> </maintainer> diff --git a/mail-filter/rspamd/rspamd-2.3.ebuild b/mail-filter/rspamd/rspamd-2.3.ebuild deleted file mode 100644 index 38a8793ea037..000000000000 --- a/mail-filter/rspamd/rspamd-2.3.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake 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 libressl pcre2" - -RDEPEND=" - acct-group/rspamd - acct-user/rspamd - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/icu:= - dev-libs/libev - dev-libs/libsodium - dev-util/ragel - net-libs/libnsl - sys-apps/file - blas? ( sci-libs/openblas ) - cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) - jemalloc? ( dev-libs/jemalloc ) - jit? ( dev-lang/luajit:2 ) - !jit? ( dev-lang/lua:* ) - !libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - pcre2? ( dev-libs/libpcre2[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] )" -DEPEND="${RDEPEND}" - -src_prepare() { - cmake_src_prepare - - 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 - -DENABLE_BLAS=$(usex blas ON OFF) - -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_LUAJIT=$(usex jit ON OFF) - -DENABLE_PCRE2=$(usex pcre2 ON OFF) - ) - cmake_src_configure -} - -src_test() { - 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 jit; 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-2.5.ebuild b/mail-filter/rspamd/rspamd-2.5-r1.ebuild index b5d45580a5de..eb97eb1d040b 100644 --- a/mail-filter/rspamd/rspamd-2.5.ebuild +++ b/mail-filter/rspamd/rspamd-2.5-r1.ebuild @@ -36,11 +36,9 @@ RDEPEND=" jemalloc? ( dev-libs/jemalloc ) jit? ( dev-lang/luajit:2 - dev-lua/lpeg[luajit] ) !jit? ( dev-lang/lua:* - dev-lua/lpeg[-luajit] dev-lua/LuaBitOp ) !libressl? ( dev-libs/openssl:0=[-bindist] ) @@ -54,6 +52,7 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}/rspamd-2.5-replxx-gcc10.patch" "${FILESDIR}/rspamd-2.5-unbundle-lua.patch" "${FILESDIR}/rspamd-2.5-unbundle-zstd.patch" "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" @@ -62,7 +61,7 @@ PATCHES=( src_prepare() { cmake_src_prepare - rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die + rm -vrf contrib/{lua-bit,snowball,zstd} || die sed -i -e 's/User=_rspamd/User=rspamd/g' \ rspamd.service \ diff --git a/mail-filter/rspamd/rspamd-2.4.ebuild b/mail-filter/rspamd/rspamd-2.6-r2.ebuild index 38a8793ea037..380080e13fba 100644 --- a/mail-filter/rspamd/rspamd-2.4.ebuild +++ b/mail-filter/rspamd/rspamd-2.6-r2.ebuild @@ -14,7 +14,7 @@ else fi DESCRIPTION="Rapid spam filtering system" -HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd" +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 libressl pcre2" @@ -22,28 +22,49 @@ IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2" RDEPEND=" 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/libsodium - dev-util/ragel + dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file - blas? ( sci-libs/openblas ) + blas? ( + virtual/blas + virtual/lapack + ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) - jit? ( dev-lang/luajit:2 ) - !jit? ( dev-lang/lua:* ) + jit? ( + dev-lang/luajit:2 + ) + !jit? ( + dev-lang/lua:* + dev-lua/LuaBitOp + ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] )" DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/ragel + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" + "${FILESDIR}/rspamd-2.6-unbundle-zstd.patch" + "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" +) src_prepare() { cmake_src_prepare + rm -vrf contrib/{lua-bit,snowball,zstd} || die + sed -i -e 's/User=_rspamd/User=rspamd/g' \ rspamd.service \ || die diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild index b5d45580a5de..e51965b8983e 100644 --- a/mail-filter/rspamd/rspamd-9999.ebuild +++ b/mail-filter/rspamd/rspamd-9999.ebuild @@ -31,16 +31,17 @@ RDEPEND=" dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file - blas? ( sci-libs/openblas ) + blas? ( + virtual/blas + virtual/lapack + ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) jit? ( dev-lang/luajit:2 - dev-lua/lpeg[luajit] ) !jit? ( dev-lang/lua:* - dev-lua/lpeg[-luajit] dev-lua/LuaBitOp ) !libressl? ( dev-libs/openssl:0=[-bindist] ) @@ -54,15 +55,15 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/rspamd-2.5-unbundle-lua.patch" - "${FILESDIR}/rspamd-2.5-unbundle-zstd.patch" + "${FILESDIR}/rspamd-2.6-unbundle-lua.patch" + "${FILESDIR}/rspamd-9999-unbundle-zstd.patch" "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" ) src_prepare() { cmake_src_prepare - rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die + rm -vrf contrib/{lua-bit,snowball,zstd} || die sed -i -e 's/User=_rspamd/User=rspamd/g' \ rspamd.service \ diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index 7c6b6276da45..9749cb5560c8 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -10,6 +10,6 @@ DIST Mail-SpamAssassin-3.4.4.tar.bz2 2741290 BLAKE2B 03dec6c71a43ad7d288a96de32f EBUILD spamassassin-3.4.4-r1.ebuild 9757 BLAKE2B da5bf1a73d699e1ef3542c98b2eef0ebdee1e8e51b50e69464ddf67772b05a76a669420cbe6be829ba4fe7f2fea7401e1c3a98af26ae73cfe6478085079feb9e SHA512 18f4c03126fae90068b57a302a309a00a9cf4ca55783bfc9a890c9107bfe5a578eb8b9dff184ff98ad86434fe084609fbdaa8f44914ecef2fe9d124e9364f820 EBUILD spamassassin-3.4.4-r2.ebuild 9632 BLAKE2B 6b7816eeb6eaad6ecc1734e3b67b9b05df800ec0d8087cc3465fd451808216e06c497fdcaa66449ac4016869295dd6c8087054be9deded9e8f0bd28def29a5fe SHA512 9a3c46f95e944de3500e0adbbbff093d2f4fd20568907901c381bee0941c8f4ebc04f8609da26c7582e8c6b732710a20e09b0e081745246a9974843e042c9d27 EBUILD spamassassin-3.4.4-r3.ebuild 9512 BLAKE2B bd5116a376a3bbf87ad962453e32bc60ccd3868c767a96b71fdad39d7753eb1d27a7f3eba8ba0b62ebed31c9e3f27711d04a8135bf3a3e276023478200c69c56 SHA512 20b012f637533a50cda2c921a6345595eaf6f6354577f976b875b31b2f5832cd329b6c775e915e9f2bf3f35c6dcdeb41f51640b8276e7a23b277c0c3452a09ca -EBUILD spamassassin-3.4.4-r4.ebuild 9598 BLAKE2B 7a0a34f0201448f50b8ca83ba95b06509e96013fa2e786b923ea66aaff5ff49fd5368ff0f244fc7d8b7b72938eb7772393ef42446b315d368d212e67850c6e78 SHA512 c8e4e388d7daaa8939891910af4ceb4e255decfc3d5f107c3482769f8573b61bb64fad8c400042d5fca70f671986f76b29be802d5d545efedd0ea4704fd4766d +EBUILD spamassassin-3.4.4-r4.ebuild 9597 BLAKE2B 7e9e9cc006b85fd45ee836c95c56089a20f45944f86ce3d864deac2c29ae3ca41a451e3c5928c4ec06976555f89a973ba1315d7343c4cc96d949210ae9413718 SHA512 432f21a44956cffcfbb6752a26fd71bc8f1b478fe635b7af94325d3e09ace247c63819b852cc2053b3b3a3d6a0c699a2a1d504c5d5cf6d61dd5474fe8510d525 EBUILD spamassassin-3.4.4.ebuild 8488 BLAKE2B b6d4f0dfd63739daaf7b48352caf580130dad0aa765c5f3347d790eaae6410703d8f66dc2b1b365e056c7b18bf1df3e2110b2f8cc3b4f2c6f67095142553dbad SHA512 12d0b6ae6e886d42448329f8bee89ab015a391dbe7497888a5b35a7e41463a52d2c51ca13e567f1cd2f4f6cfd9686a8425947fc956a5523438e710e20b90ca16 MISC metadata.xml 579 BLAKE2B 98c1b526193c33a3f6d7aac34f9e93dcf81dfbd5b288da9a9a196d94e03fe7cb17d3b06de41042941a70f70215a6104a048fe67ff97b225490139bfb06fd8186 SHA512 f02b525fb0daf5a90edb2cfff536c51240bcc4c040f6ee6126b95865d0c61b1ded0d72d89b114ba58389963b033df1d8df97df6c39e49ac1ffbb69fee96acc7f diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild index 8dba40c9fdaf..510826c8aaf3 100644 --- a/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" RESTRICT="!test? ( test )" |