summaryrefslogtreecommitdiff
path: root/mail-filter
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /mail-filter
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/Manifest.gzbin9218 -> 9219 bytes
-rw-r--r--mail-filter/courier-pythonfilter/Manifest2
-rw-r--r--mail-filter/courier-pythonfilter/metadata.xml3
-rw-r--r--mail-filter/couriersrs/Manifest4
-rw-r--r--mail-filter/couriersrs/couriersrs-0.1.2.ebuild6
-rw-r--r--mail-filter/couriersrs/metadata.xml7
-rw-r--r--mail-filter/libsrs_alt/Manifest4
-rw-r--r--mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild2
-rw-r--r--mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild45
-rw-r--r--mail-filter/opendkim/Manifest4
-rw-r--r--mail-filter/opendkim/opendkim-2.10.3-r16.ebuild1
-rw-r--r--mail-filter/opendkim/opendkim-2.10.3-r17.ebuild2
-rw-r--r--mail-filter/rspamd/Manifest15
-rw-r--r--mail-filter/rspamd/files/rspamd-r6.init55
-rw-r--r--mail-filter/rspamd/metadata.xml2
-rw-r--r--mail-filter/rspamd/rspamd-1.8.3.ebuild98
-rw-r--r--mail-filter/rspamd/rspamd-1.9.4.ebuild89
-rw-r--r--mail-filter/rspamd/rspamd-2.1.ebuild15
-rw-r--r--mail-filter/rspamd/rspamd-2.2.ebuild (renamed from mail-filter/rspamd/rspamd-1.9.0.ebuild)38
-rw-r--r--mail-filter/rspamd/rspamd-9999.ebuild26
-rw-r--r--mail-filter/spamassassin/Manifest4
-rw-r--r--mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild1
-rw-r--r--mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild1
-rw-r--r--mail-filter/spamdyke/Manifest2
-rw-r--r--mail-filter/spamdyke/spamdyke-4.3.0.ebuild14
25 files changed, 78 insertions, 362 deletions
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 7d2ce6de537e..630f5e97171a 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
Binary files differ
diff --git a/mail-filter/courier-pythonfilter/Manifest b/mail-filter/courier-pythonfilter/Manifest
index b5f0b919defe..fcc3c65d4b11 100644
--- a/mail-filter/courier-pythonfilter/Manifest
+++ b/mail-filter/courier-pythonfilter/Manifest
@@ -1,3 +1,3 @@
DIST courier-pythonfilter-3.0.2.tar.gz 59121 BLAKE2B 6223ddd62c1c1af980720451e3446cd3b2296a243c5c8d3b5e60fd8640e3391ba2e561ea251bbacbb4a1c6cdbe7eccf6f7ff8221d952cf5703d389b0267a1a2f SHA512 62985a3fefc2d324b3ba7035117e88e4e246815e63fe1b681af11a38a20ea55e649a233c1979b918b166f5c2abbcc22037f215b73be298763f777648249cd652
EBUILD courier-pythonfilter-3.0.2.ebuild 506 BLAKE2B 18d62d19d3795a14bbd833905046da4e1c399d1e88ec94a838e2b78754c17307959c943860ec62467538dde5c89ce955bc2a970092524c08e2f56b709be305d3 SHA512 48f84d8a7591cd7d9e30a37c6e8e75726bdee8f0e513efc872301c67f654020e8adb8ec098174c7c070cdfe216dd90be839fb440ba46efd2553841c5890591d9
-MISC metadata.xml 216 BLAKE2B ff21e786382ce75611e7386f0689145fa9b64a7ef8c3c23ff92ef9c0f2bae866fec67838df7ce6608d4f1954f107b8d424103789c62384a04af120eea19053a8 SHA512 6309007f7bf488d882e2769f332c0c76bcc5972bbb60e90f86fc1895b9421494be9b1d962ce7b8a68b484f5bef6e0d6bb67247496b1d5e00e0a6ba55403e1df0
+MISC metadata.xml 299 BLAKE2B 495df9e20b847c1760adbd30a80d131f07be4a51f1bb4727835bcfaa37c804bf0cbfa9a2697e8907507445ad4785129c97902d88aa4890122d2c4100d9233db1 SHA512 3658867ae9276068ed78a26bf218dbe5125025336119678d699c77f643884c55dbb4b8b19eb304447b0efcacf4b8eda437217e9ba8cacb7dffccc0d4464bc6e6
diff --git a/mail-filter/courier-pythonfilter/metadata.xml b/mail-filter/courier-pythonfilter/metadata.xml
index 1d07f2a1081a..bb57beb5edb6 100644
--- a/mail-filter/courier-pythonfilter/metadata.xml
+++ b/mail-filter/courier-pythonfilter/metadata.xml
@@ -4,4 +4,7 @@
<maintainer type="person">
<email>hanno@gentoo.org</email>
</maintainer>
+ <upstream>
+ <remote-id type="pypi">courier-pythonfilter</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/mail-filter/couriersrs/Manifest b/mail-filter/couriersrs/Manifest
index 574d2f72c834..687d9f7cde73 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 554 BLAKE2B 3dedc1733d949ee62ef4a17c9a7a23f8d809a58e80b15a82ab07692f2a4a02c1687e90a52679d7aea7411d9f9a03685a1c6c16ce8a96f74f90bf7c39a4d8011d SHA512 485714da5b06d24415d4d7760f5c02d941a38337d8adfde58b61a6a1d252a68b4eb677c47d9d4e2117f11068e91ca7e7504a40b405c079709f1ba642c2f31197
-MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
+EBUILD couriersrs-0.1.2.ebuild 597 BLAKE2B 944ae02382ac167d0b6faa1e632f919430b0a2af3a56ba1888210ada5c173017572cad8e3e41066b33e56c90f54155228f6d987e31832d63dc6847945979fa58 SHA512 33e794c0acf8d10af39558b8baf7acb44e77da4b3af7b22539612c0b325eff701622c87437c29b4161246331ec378fe1291a05b711f0ed41f82c3f3f7536d7a3
+MISC metadata.xml 298 BLAKE2B b9e78fafa3bb9f1d72cffd056bc26fcd162f2a2bc4152155583bf9f0e9370b6a2de6f1ae96187e345c911b0262bb676ebce2dfbe8cdeda48cc1ae6fb202358e4 SHA512 076d62eff102103aad3f725ce52c1c315e13c479c792301c91ca2b6326e469af8f302d14072bf22a934a5a7a332ec34801f80da9732f6c35407e18e8513e4402
diff --git a/mail-filter/couriersrs/couriersrs-0.1.2.ebuild b/mail-filter/couriersrs/couriersrs-0.1.2.ebuild
index a23e682a6f28..8cdb47abe403 100644
--- a/mail-filter/couriersrs/couriersrs-0.1.2.ebuild
+++ b/mail-filter/couriersrs/couriersrs-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
inherit autotools
DESCRIPTION="SRS (Sender Rewriting Scheme) wrapper for the courier MTA"
-HOMEPAGE="http://couriersrs.com/"
-SRC_URI="http://couriersrs.com/download/${P}.tar.gz"
+HOMEPAGE="https://couriersrs.com/"
+SRC_URI="https://github.com/mawis/courier-srs/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/mail-filter/couriersrs/metadata.xml b/mail-filter/couriersrs/metadata.xml
index 28ef3c7b080f..270badf0104d 100644
--- a/mail-filter/couriersrs/metadata.xml
+++ b/mail-filter/couriersrs/metadata.xml
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person"><email>hanno@gentoo.org</email></maintainer>
+ <maintainer type="person">
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mawis/courier-srs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/mail-filter/libsrs_alt/Manifest b/mail-filter/libsrs_alt/Manifest
index 917dbb754658..2b08da46baeb 100644
--- a/mail-filter/libsrs_alt/Manifest
+++ b/mail-filter/libsrs_alt/Manifest
@@ -1,6 +1,4 @@
AUX libsrs_alt-1.0-ftime.patch 313 BLAKE2B f634abd1e527a199374fc55bf84927c5e38730f79d1b13f7cb0199ce338f825902df662248fa99bb3baf4c4c07117031b52e3e986a7ad0b2816ca28cfe7601b2 SHA512 2566c9b7e9187a243f5eb6b4b67d649bc081538350f647f1afa69812892a8ff8ef889068ccb73f019cf287e9e6ae3999bc62b2003d197963606a4c30ebecd214
DIST libsrs_alt-1.0.tar.bz2 237984 BLAKE2B e55b01f28fdf240ccf2fea8b43e930bc02a78bfb82a2b9fe573c1c09e0839f89a0bdb51844dae237ed66e4bda925b5b3b93842462987e7f300f6f5d763adf382 SHA512 1e15f8b12c2174c8ee085fc5adae4cb267f69dd5656066d33af106ad4940769552e04cfc67af4ad9650eece2519c03ef383290f36a22df7d9e03fa2186262404
-DIST libsrs_alt-1.0.tar.gz 337225 BLAKE2B 1fb10130eb44c8edfc3757b9ba6d8a77659d1ba53fa620da2f7c5fe6cb01fe3f9c1ac0aac5a49db7d9f1b8308ac4c07778e03e4aa6ad9c0204a0871dff40047f SHA512 c202b2cbd28ce0b1296a8000b9f2ae19f4fff259a2d9ea43674cab11b947d0f85a0fdbb13e5fef2a52b1ae675a8fa35b492b233f97f5e365a9c076a337010629
-EBUILD libsrs_alt-1.0-r1.ebuild 1154 BLAKE2B 36a9d319c8a71a386d4245d4149cd43fa638a9ceffc8dc4cd41d5b3d4a4137f2d77fb6a58f28f0adcacd1e3124e9946438f3e76250c7dfb8481967a4ab79a8ac SHA512 cc9bd721a6ab035da21cd54d2d543afcd1df880af4e6f3a5b756f1b50f7c315d54e23a6d8866f72824da7a514e0ed3e856dca17aaf278c5af57e19be198ca85d
-EBUILD libsrs_alt-1.0.ebuild 1037 BLAKE2B 7696b03d8cedcf177dc30e74fc2e679e79cc38b46538f5abb75e9682e9a8afed22098a582fab47350a2268efbf27469ec8f3def1bb0f2364a6fb250b9c5dcd82 SHA512 b28e0a756a5de946899196ed737523a27b6daf49bcdec185b2854b0e0d418c03a3d9c2e29a15f8df39dfcafb48251261abda1556fd87f687ae77a63f103b49da
+EBUILD libsrs_alt-1.0-r1.ebuild 1151 BLAKE2B 28c0ec00d1db87f8970baaa548fb2f771719944a194682e1bec933c788b34db6ad7de43a914eb7ae363177a42bb6b48f00d1aadea83afbb285814ebd561f26e8 SHA512 92c94c2d9e4fb1f7f4b0bfe8d8b3d5487738de762cf2f158d308166a0394b4ef8f4eb2d2b6ad316b27796fe7f80d66c55408477340e9c6a5cde73c078a5a1f9c
MISC metadata.xml 506 BLAKE2B 85745c6fffc19e1064f5d2bde90dbe56f5bdd674d4189630ccbe3d012e505dec487878097ed83d031e79e46478e7f0281f5edda1a94057671bcc051ca202025a SHA512 6a6096ee6f1895de958b8167e1a9632dc6901b16908d94af86932aead64fbc1690ffd300d8cc97792d46201e64cb20d6696e232e9d796e33fe4484e808e111ee
diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
index e29ce97b19ae..2d20c933b205 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://opsec.eu/src/srs/libsrs_alt-${MY_PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
IUSE="static-libs"
RDEPEND="!dev-perl/Mail-SRS"
diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
deleted file mode 100644
index 110faf04c054..000000000000
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-MY_PV=${PV}
-MY_RC=${PV}
-S=${WORKDIR}/${PN}-${MY_PV}
-
-DESCRIPTION="Sender Rewriting Scheme library"
-HOMEPAGE="http://opsec.eu/src/srs/"
-SRC_URI="http://srs.mirtol.com/libsrs_alt-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="!dev-perl/Mail-SRS"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-ftime.patch
- eautoreconf
-}
-
-src_compile() {
- # add missing header
- sed -i -e '/timeb.h>/ a #include <stdlib.h>' test.c
-
- # Since the primary intended consumers of this library are MTAs,
- # use non-standard separator characters (--with-base64compat).
- # This breaks "SRS Compliancy", which is a rough standard at
- # best.
- econf --with-base64compat || die "econf failed"
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die "make install failed"
- dodoc "${S}"/MTAs/README.EXIM
-}
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 3946231bff4f..f32dbf5a2e90 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,6 +1,6 @@
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
DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
-EBUILD opendkim-2.10.3-r16.ebuild 7437 BLAKE2B 7c66326a577d9dd2a883346fdd5f8258b5f80b2c1bd2d288c38dc3b18f3be7013bf0e7ba20719680ba009eb2581371dcb34f4d05a00e4ed66f27ac58fd0cf9d6 SHA512 575e04109efd12e8c90d8f410bcfa041a0f748b1001d21829fd45fcb42e75f814baa95faa606eb5259defe3d95a7802c3efde77e3bd99df9e1bdd0f6e663eda3
-EBUILD opendkim-2.10.3-r17.ebuild 7372 BLAKE2B 158317c73d7714a034b772eeda3c1e63e2583400f9887001f39c0bb9561a10f7e019713d0a857a7b7dc7fd0e17aa14a0a59849fbc5c373db56f9a2f27ba7d133 SHA512 4d6221b6e46c07b5626c7af614da38708a8c825f929f43252f459a87089dce484c10507a529fb805aec3f85430c5fc95a059a80dc24ee9f200a6a98d2893ef9f
+EBUILD opendkim-2.10.3-r16.ebuild 7464 BLAKE2B d73201ccdc7b3d98bca25dbf5f757deb4980b34d4f87dbe9ed5a848aa6e15427c87f24d97bd72e9635065d4f960dbf9e4a3df021e3c6343fb3e14108e42e0d0c SHA512 89aaae218cd06d9cafe36bd87ee4b2cbe11f2754b896d8935a3ce61bc14277a4ed29c9dca536aa04b67af51ba97bca357d89a0a97e960d82c0de0887c84a7695
+EBUILD opendkim-2.10.3-r17.ebuild 7370 BLAKE2B 5d651b5389f07920d307d9c9895d1bfb320edff2d4ce6cb339b9f2f75e9b2073ffeb528b3bfa409d5eab87d7c04b99c48f61793598c7d0b88cea84c8281f1c3c SHA512 cbc2f5869b49a0981ba874b26ff386adcaddcbc15d227d56ad3baf7b6b6b31c33691bfe5552daa8354cef1db3ded88f9576647347bc047835170bd5c31f9dff9
MISC metadata.xml 2316 BLAKE2B 5bda2db8ef7a54711366213e84b3edb8a93e5327737a433a445d28a482e92e4c5e29e9dc22d318ba4c294d273f048a63f1e10999e132df9cdcbbc05c12c29d4b SHA512 4720d75af10968bfdcf4a53c2571724ad164ea081dd30b39568467b5eee25f6df25c8caf8b4551ddb2f2e97889b8ddff1fb10a7e24e1eaaf340c8d7bab542837
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
index 1b353d988f6d..74145d2b43e5 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD GPL-2 Sendmail-Open-Source"
SLOT="0"
KEYWORDS="amd64 ~arm x86"
IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats query_cache test unbound"
+RESTRICT="!test? ( test )"
COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
dev-libs/libbsd
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
index d9b8c07b0c5e..49ff115b99b3 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/opendkim/${P}.tar.gz"
# The GPL-2 is for the init script, bug 425960.
LICENSE="BSD GPL-2 Sendmail-Open-Source"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
BDEPEND="acct-user/opendkim
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 76b22905dd44..2005637caf4b 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,15 +1,10 @@
AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
-AUX rspamd-r6.init 1370 BLAKE2B 333683396f499c3d1cfc92d67434fc9d1fdab695b1ddf9798d0bed42b227111cb9c779fd33e04bb095affd09326edf6f80100d58248061795bf3540e2e9e0771 SHA512 40016348ed413414c9a06182f8da896bcb5b0f48bf7ec51db1cd7e4f9adea59e30c6c5ddc79135141b795e829af2660c047ed8f93fed1e181f9f2f01a419d690
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-1.8.3.tar.gz 4319623 BLAKE2B b7fdd6791df5899710bb1d696a9b94d1840335b6a34d6cdeebc2b5eebe9f4e5b6da3e90ed9ab5e3945aab7ef33f54f048024b51c3de37db1a083ad89c656b456 SHA512 5e20255466fe2cd4842196fb2138732b59911de655e73d9cc13009b5179b84e5a2060083961b35fe40b9f550f8e18067056415a1d803fac54fac000070024c01
-DIST rspamd-1.9.0.tar.gz 4402395 BLAKE2B 11f90fc232496b493296ef0fb9ff4118ac11863528cd6a52bcae6adbdc09ce86453bb39df35714702fcd5c6a535007ec402a580bd735abbddeeb154ff8807219 SHA512 fee2a60c10fbab087b12d9188974a0c47417a9894308f66980eb6311496b16661194d858d1e522d2d524b3e359f2f3ad88535421d1dc05be26414b5a346afec6
-DIST rspamd-1.9.4.tar.gz 4476230 BLAKE2B e4866fb8fd97210e77b75d948ae97f038eccc33ec9f6214693579e5d84210c87ff9258204f466ffe6bea780159d24d819aaf393a06dbf2785659a784e4f4e8b6 SHA512 3acecec6adb91580ac2ad96419fdc9588b120ec5a3b4a44135fc5a3e7c15f2dbc99963a8337f9effb9423846489545a55d89d1849c5ba62d8cd91dc67c32d8dc
DIST rspamd-2.1.tar.gz 4232297 BLAKE2B 4685fa404e5a66d2295da57ece8ce1830507b3464c5136952dbb85847a5002c9c45c4f5430d0d60bc199f3aeafde7abf3ac218451f1609b81a5edfd4d0394588 SHA512 7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f
-EBUILD rspamd-1.8.3.ebuild 2315 BLAKE2B ab1addaef1d8b0df9d8e4a91ca13f189101a447906f97e97913224b5fe3b4fd2b8447a9348450793d6e2a654807b7a722f1852ba1252b845baae5fde45e3b939 SHA512 b0dd11c1b5576ad96ac73241cc08433707a2167ff3ee3095d4b752e1b68f2dde1d7584aa4750ac94332ddcde7a0eeb60ce597709dc995f2643cf3e7a91f432ce
-EBUILD rspamd-1.9.0.ebuild 2242 BLAKE2B f294fc165ccf83af918e37b5f4659bbca79e1fae2b378d4c7218074dcac318c3faea6ef10eb59bff59fc4ca3ea5115182d53948debdc6314ee457d70598a4df8 SHA512 c6f28512d0dee9213dcd48d7df0c3672c2f86d520090ed392efaa0c27ac0e27653ce487e5570953d34b50d6bfbc2c74d282f3ecd8d67acf1b5874f55c7f59797
-EBUILD rspamd-1.9.4.ebuild 2243 BLAKE2B 761b7957ef0863740a9c23a398a8a8de7721a6d34dbafc27f10ede69bac81e8a43b163d5528a1355390aba63909d338b72e39bbe9fb76484e8dffa017804dc97 SHA512 99bc3601ea709a6b7acd2f791db39c994d498995f91362b7d092980cad49df5b36849af9086af26ca3acbe49ecc18e82a09f196101e59bb36aac0490bea198b2
-EBUILD rspamd-2.1.ebuild 2152 BLAKE2B ab16f6795a05f64b157073b2919d2140f77ceedb8b6fc23ed266d9e6892833e23e991964af599dac1dec996b4defee096dba9def8b33efb4db20e654a78b6200 SHA512 2645c7bf6488cba8c2ff4d61738e0ec78923365c0e5d071ba0b50b000892b911436f6151d58c2414a0175500eda2141788ea3e491e88dfc56d63be775e2f936a
-EBUILD rspamd-9999.ebuild 2152 BLAKE2B ab16f6795a05f64b157073b2919d2140f77ceedb8b6fc23ed266d9e6892833e23e991964af599dac1dec996b4defee096dba9def8b33efb4db20e654a78b6200 SHA512 2645c7bf6488cba8c2ff4d61738e0ec78923365c0e5d071ba0b50b000892b911436f6151d58c2414a0175500eda2141788ea3e491e88dfc56d63be775e2f936a
-MISC metadata.xml 834 BLAKE2B 48979c23212a496c955667b99cfb618da9f682e2269bb42c9b4e4932b94304197422bc2480e7177d73ff6cb246e53a964bd43f5819827e4b6342786c282277db SHA512 c9a2106f419b90885905947aebacfdd15e7d1a66cb9cc6267cb79f487c9069f8ed2cc65c3d6d0ec05b011ade53ed2177df8f11ee49ee1e720dcf6ac365bc28d1
+DIST rspamd-2.2.tar.gz 4257574 BLAKE2B 3717736ecefea49cfc9e8bf312bdeafa8650dfe1b0a4410d98693add30c77cb054c7620ecc421edd69a2d8bfc1bcb02183951069b15774a588359da8bfb26ac9 SHA512 e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe
+EBUILD rspamd-2.1.ebuild 2246 BLAKE2B 17bed4c0f2e236e9759b3b7fb179d1206f855a78609066876b3fbe011bdce111bc65179d8ee7839869f82cb1128d93a8e496c7fa095f9b7178847b92b3f0cc45 SHA512 2ecd0cd86a822dba3308dfc4c3cb3bdf6519d94da2c39e03cf7cd45dc33de959f11990a7cbe87d0d7ec265662782378a1136916177dec121dcd1f10ceb4134d7
+EBUILD rspamd-2.2.ebuild 2278 BLAKE2B b09b117e7e5bcf7ae711f5820a9035ca6098734220ff1f6f09ff1bb5474f49e2a9bbbbf7d383dd7c31105619ae5c294532b882f64d02532eb4ce0d8af47af56b SHA512 5cd4ef7aff752455b640d9540420083873516ba7a9b2770253e7651a48b8b6c57534cf89018bd1bef60e6c1b915f7244579b1f7789d892ffcea3940f5a22b24c
+EBUILD rspamd-9999.ebuild 2163 BLAKE2B 84b665cd343506b4e7c7099ec1add168b4dd1a909c83f1dc157632d3817b92389b91107cea66c63b3b258dd15ad3ac17ee85526dad48c08bf8feb180f67938f8 SHA512 9158c06bd434799f6e1bc22844af2c514b8f4d9658645c64cd794e5d82c40dd65b101cd9266dbe9e8aed1860d8738d413aa0d32575335dd6d97c4e3347d9cf42
+MISC metadata.xml 641 BLAKE2B cf34ec72d9a23ca2a1b7325e9cf35f0f7f5ddd2a7f7ed257614b8d74dac32ba22067ab008513b80a4edb8ac4f4be574967f1d4659f92f269cfeb647b4ad0abfe SHA512 0615158d243771302c5dbe70e80ddbba668286286a45a8c098b944baf75adbf87ff143ee7b07193c5b557fa44ef615b46fa5f7a5e4aa0d3b95118996b2e95328
diff --git a/mail-filter/rspamd/files/rspamd-r6.init b/mail-filter/rspamd/files/rspamd-r6.init
deleted file mode 100644
index 8c31fd7d0278..000000000000
--- a/mail-filter/rspamd/files/rspamd-r6.init
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-RSPAMD_CONFIGFILE=${RSPAMD_CONFIGFILE:-"/etc/rspamd/rspamd.conf"}
-RSPAMD_GROUP=${RSPAMD_GROUP:-rspamd}
-RSPAMD_OPTS=${RSPAMD_OPTS:-""}
-RSPAMD_PIDFILE=${RSPAMD_PIDFILE:-"/run/rspamd.pid"}
-RSPAMD_USER=${RSPAMD_USER:-rspamd}
-
-command="/usr/bin/rspamd"
-command_args="${RSPAMD_OPTS} -c \"${RSPAMD_CONFIGFILE}\" -u ${RSPAMD_USER} -g ${RSPAMD_GROUP} --pid \"${RSPAMD_PIDFILE}\""
-start_stop_daemon_args=${RSPAMD_SSDARGS:-"--wait 1000"}
-pidfile="${RSPAMD_PIDFILE}"
-retry=${RSPAMD_TERMTIMEOUT:-"TERM/60/KILL/5"}
-
-required_files="${RSPAMD_CONFIGFILE}"
-
-description="Rapid spam filtering system"
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-description_checkconfig="Validate rspamd's configuration"
-description_reload="Sends rspamd a signal to reload its configuration"
-
-depend() {
- before mta
- use dns redis
-}
-
-checkconfig() {
- ${command} -c "${RSPAMD_CONFIGFILE}" -u ${RSPAMD_USER} -g ${RSPAMD_GROUP} -t 1>/dev/null \
- || return 1
-}
-
-reload() {
- checkconfig || return 1
-
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP --pidfile "${pidfile}"
- eend $?
-}
-
-start_pre() {
- if [ "${RC_CMD}" != "restart" ]; then
- checkconfig || return 1
- fi
-}
-
-stop_pre() {
- if [ "${RC_CMD}" = "restart" ]; then
- checkconfig || return 1
- fi
-}
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index 2b4ad4e2b87e..140755872e01 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -17,8 +17,6 @@
<remote-id type="github">vstakhov/rspamd</remote-id>
</upstream>
<use>
- <flag name="fann">Enable neural network plugin (requires <pkg>sci-mathematics/fann</pkg>).</flag>
<flag name="pcre2">Use dev-libs/libpcre2</flag>
- <flag name="torch">Enable torch support. This is required for the neural module</flag>
</use>
</pkgmetadata>
diff --git a/mail-filter/rspamd/rspamd-1.8.3.ebuild b/mail-filter/rspamd/rspamd-1.8.3.ebuild
deleted file mode 100644
index 64cb537424f3..000000000000
--- a/mail-filter/rspamd/rspamd-1.8.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils pax-utils systemd tmpfiles user
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch"
-REQUIRED_USE="torch? ( jit )"
-
-RDEPEND="dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/icu:=
- dev-libs/libevent:=
- net-libs/libnsl
- sys-apps/file
- dev-util/ragel
- cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
- fann? ( sci-mathematics/fann )
- gd? ( media-libs/gd[jpeg] )
- jemalloc? ( dev-libs/jemalloc )
- jit? ( dev-lang/luajit:2 )
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- pcre2? ( dev-libs/libpcre2[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- enewgroup rspamd
- enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
-src_prepare() {
- cmake-utils_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_LUAJIT=$(usex jit ON OFF)
- -DENABLE_FANN=$(usex fann ON OFF)
- -DENABLE_GD=$(usex gd ON OFF)
- -DENABLE_PCRE2=$(usex pcre2 ON OFF)
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
- -DENABLE_TORCH=$(usex torch ON OFF)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- newconfd "${FILESDIR}"/rspamd.conf rspamd
- newinitd "${FILESDIR}/rspamd-r6.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-1.9.4.ebuild b/mail-filter/rspamd/rspamd-1.9.4.ebuild
deleted file mode 100644
index 47cfb7f44f9e..000000000000
--- a/mail-filter/rspamd/rspamd-1.9.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils pax-utils systemd tmpfiles user
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cpu_flags_x86_ssse3 gd jemalloc +jit libressl pcre2 +torch"
-REQUIRED_USE="torch? ( jit )"
-
-RDEPEND="dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/icu:=
- dev-libs/libevent:=
- net-libs/libnsl
- sys-apps/file
- dev-util/ragel
- cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
- gd? ( media-libs/gd[jpeg] )
- jemalloc? ( dev-libs/jemalloc )
- jit? ( dev-lang/luajit:2 )
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- pcre2? ( dev-libs/libpcre2[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- enewgroup rspamd
- enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
-src_prepare() {
- cmake-utils_src_prepare
- sed -i -e 's/User=_rspamd/User=rspamd/g' rspamd.service || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCONFDIR="${EPREFIX}/etc/rspamd"
- -DRUNDIR="${EPREFIX}/var/run/rspamd"
- -DDBDIR="${EPREFIX}/var/lib/rspamd"
- -DLOGDIR="${EPREFIX}/var/log/rspamd"
- -DENABLE_LUAJIT=$(usex jit ON OFF)
- -DENABLE_GD=$(usex gd ON OFF)
- -DENABLE_PCRE2=$(usex pcre2 ON OFF)
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
- -DENABLE_TORCH=$(usex torch ON OFF)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- newconfd "${FILESDIR}"/rspamd.conf rspamd
- newinitd "${FILESDIR}/rspamd-r6.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.1.ebuild b/mail-filter/rspamd/rspamd-2.1.ebuild
index a44b355c466a..bdfa150670b4 100644
--- a/mail-filter/rspamd/rspamd-2.1.ebuild
+++ b/mail-filter/rspamd/rspamd-2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-utils pax-utils systemd tmpfiles user
+inherit cmake-utils pax-utils systemd tmpfiles
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
@@ -19,7 +19,10 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
-RDEPEND="dev-db/sqlite:3
+RDEPEND="
+ acct-group/rspamd
+ acct-user/rspamd
+ dev-db/sqlite:3
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
@@ -31,20 +34,18 @@ RDEPEND="dev-db/sqlite:3
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}"
-pkg_setup() {
- enewgroup rspamd
- enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
src_prepare() {
cmake-utils_src_prepare
+ sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/' CMakeLists.txt \
+ || die "sed CMakeLists.txt failed"
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
|| die
diff --git a/mail-filter/rspamd/rspamd-1.9.0.ebuild b/mail-filter/rspamd/rspamd-2.2.ebuild
index 2000be8f5492..c428effd2fe4 100644
--- a/mail-filter/rspamd/rspamd-1.9.0.ebuild
+++ b/mail-filter/rspamd/rspamd-2.2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils pax-utils systemd tmpfiles user
+inherit cmake-utils pax-utils systemd tmpfiles
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
@@ -17,34 +17,35 @@ DESCRIPTION="Rapid spam filtering system"
HOMEPAGE="https://github.com/vstakhov/rspamd"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="cpu_flags_x86_ssse3 gd jemalloc +jit libressl pcre2 +torch"
-REQUIRED_USE="torch? ( jit )"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
-RDEPEND="dev-db/sqlite:3
+RDEPEND="
+ acct-group/rspamd
+ acct-user/rspamd
+ dev-db/sqlite:3
dev-libs/glib:2
dev-libs/icu:=
- dev-libs/libevent:=
+ dev-libs/libev
+ dev-libs/libsodium
+ dev-util/ragel
net-libs/libnsl
sys-apps/file
- dev-util/ragel
+ blas? ( sci-libs/openblas )
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
- gd? ( media-libs/gd[jpeg] )
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}"
-pkg_setup() {
- enewgroup rspamd
- enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
src_prepare() {
cmake-utils_src_prepare
+ sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/' CMakeLists.txt \
+ || die "sed CMakeLists.txt failed"
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
|| die
@@ -56,12 +57,11 @@ src_configure() {
-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_GD=$(usex gd ON OFF)
-DENABLE_PCRE2=$(usex pcre2 ON OFF)
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
- -DENABLE_TORCH=$(usex torch ON OFF)
)
cmake-utils_src_configure
}
@@ -74,14 +74,14 @@ src_install() {
cmake-utils_src_install
newconfd "${FILESDIR}"/rspamd.conf rspamd
- newinitd "${FILESDIR}/rspamd-r6.init" 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-*
+ pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
fi
insinto /etc/logrotate.d
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index a44b355c466a..3a11c07504fe 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils pax-utils systemd tmpfiles user
+inherit cmake-utils pax-utils systemd tmpfiles
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
@@ -19,29 +19,28 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
-RDEPEND="dev-db/sqlite:3
+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
- dev-util/ragel
- dev-libs/libsodium
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}"
-pkg_setup() {
- enewgroup rspamd
- enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
src_prepare() {
cmake-utils_src_prepare
@@ -56,10 +55,11 @@ src_configure() {
-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)
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
)
cmake-utils_src_configure
}
@@ -79,7 +79,7 @@ src_install() {
# Remove mprotect for JIT support
if use jit; then
- pax-mark m "${ED%/}"/usr/bin/rspamd-* "${ED%/}"/usr/bin/rspamadm-*
+ pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
fi
insinto /etc/logrotate.d
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index b912ad78aca3..f35086d468b0 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -10,6 +10,6 @@ AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365a
AUX update-spamassassin-rules-r1.cron 1557 BLAKE2B f159c1dd8f00771c5232cfb653403621aad010100535cc1b3ef4b2e18592cad94762bb2e689a904befa319fe40ac2cbed8ab7592ca506134b71f5d5d9d43ed30 SHA512 cb2902fcdd37465b789abd4a45196787a90b90e90678b20a264799587134d992f7daa1a5bdd06261bf40dacb2c164a1fbc3a10986b6265f04e57ee42a3896bfe
AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5
DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b2224191917dc45bcefff071f674c572fc905f1d6324827bcc21c338546bdea11140fc20474a16314218e2fd4fa685965b0e0078df8 SHA512 fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885
-EBUILD spamassassin-3.4.2-r2.ebuild 7603 BLAKE2B 906e4a749fa313cf6cb12ad916294ddef33089a718deb7c22c30dda2dda6ca0df374a01e2be2bb18a328bbef7b92483fb15eeaa4b8c57407714a4bc969245cb0 SHA512 d1459251e1157046effdd7b97a63bd43f210f9967bcd09f9bf03d867438789057dd8313b823faebd2d1463c5910a887252fb0a5845b4ec40ba5389b175f923a8
-EBUILD spamassassin-3.4.2-r6.ebuild 8686 BLAKE2B 94a8e2f0d0f23a94e5755847fb228adf10d23d982286d69b156a164b3a1e4ef8b94597fceba04c78bf6060ee07a9c8cb1e29c1b9ce53d03476546b10196a142e SHA512 b901cdfd36912b8272083b0052297eed951f153cbfd17cb514a2ca7521738c3a5694540fdb6d888913a8ebbd5fcb7c96bec132bf19232dfd121ce26f616c02cf
+EBUILD spamassassin-3.4.2-r2.ebuild 7630 BLAKE2B cf03c3a415a636ff6370cb17ebe7c23dba199ccc086e5f6135c68511ce0989f1015db8d9b9eb6da174eec56d65f8c0f8c3b21a230f6cc017e47b1def33e2fed9 SHA512 1ff9b5f891546d54ed65042b20cef3fab77812a7df6da4a94a9346b0565f8a043648265d9a0b4a0fb5231ab2fc85a57266490bc1f4b6198a113e34f00988686c
+EBUILD spamassassin-3.4.2-r6.ebuild 8713 BLAKE2B e13be6c1028c5dbd95d642582ab3f08a5b61c9139cbd2aa82d948787ae36c8081fd39ec9d15844af44d0970857178c17adea45d0cab2cd509d241765212896dd SHA512 2f45421391ced81ddb47a973e059d62939c5be9e7e286449d93bc313949238c20f540fe112cfb97836e4e79d9f0438d2fc61324ac70202ca7baeabaccf948967
MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
index 71ac354ea39a..85c97d9c4235 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
+RESTRICT="!test? ( test )"
# The Makefile.PL script checks for dependencies, but only fails if a
# required (i.e. not optional) dependency is missing. We therefore
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild
index 3baf1b738bc0..4fef01f91cee 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
+RESTRICT="!test? ( test )"
# The Makefile.PL script checks for dependencies, but only fails if a
# required (i.e. not optional) dependency is missing. We therefore
diff --git a/mail-filter/spamdyke/Manifest b/mail-filter/spamdyke/Manifest
index 859d73694afa..16d39005d421 100644
--- a/mail-filter/spamdyke/Manifest
+++ b/mail-filter/spamdyke/Manifest
@@ -1,6 +1,6 @@
AUX spamdyke-4.3.0-gcc46.patch 237 BLAKE2B c60cfe8f6680b246268fd769c30eb81acf2d87a04ef08c73b70b7e9cdb1b052d1e9b5eac6c6160855a2d2b03852ed0726ab9251ec7306813141fedcef8560ac2 SHA512 3714399437215680057a2266added2c158f015da518f4e00021f7a1492c287fdf8db4875b0c5f7e242782cc40f676dca9f610931047a7d23f8bdd5876e629846
DIST spamdyke-4.3.0.tgz 525399 BLAKE2B 46e3fd1508ea91d925675186ec2555e63a9d22d2fe07d9417fb5a151af76bae22676410dd6c648696621fe80d34c6e87f845b581a0db09b7b19f45e46d656f09 SHA512 6ba4b440e6d20e677c39439c78037ae3e2ff291bde7f48500a4e2eac8a3f17eeb7230b8ded7feee60c66f01b6aec2d259eb2d9a5794535860345957b1102d118
DIST spamdyke-5.0.1.tgz 383720 BLAKE2B 5128ef128af1b136e9a78df6e38f727d06e51bae82cb604513f80458265eee03d5966655ae70544d6ba24f0719c35dcc9a153e245a8c2c7ef1f7dab3ee90e561 SHA512 a022c8a8d4a8d74f5249f8e2d901d3de423ee853bbaffaf7e86cece1d19880d9039135892ef6ccb8a2a0fb11532c487402dc97a8dd6d89c9de431752c55f6eb9
-EBUILD spamdyke-4.3.0.ebuild 2148 BLAKE2B 2bd0569c7dae493461da8b4b136b5524f88686ef14fd22b02f908cf56ac3de51288706d3f3cf634a6430feb8b06de41ccdb497e7cf37aabb1db9e0e79862cb63 SHA512 107d9bc05b9cb2edbc559463e2458538700e4f4428afe9c76c654677fc125e1d98b6c0f7421793dc627fa25f7a215ccbbc73554144682cb69929575080da1168
+EBUILD spamdyke-4.3.0.ebuild 1906 BLAKE2B 094b24acbc0eeef667b0eff45b6a5dc4a992923454a4b773cbaee8cc7208a6d69a6ce60dff3d44a2d70342909bb92b12a37201dc9b23f41740ec1782d945ecc6 SHA512 a36559a14a9bc48ce8de21270c98e788233e9fff817a0e92cbb1b9518c7dac67685a3f50a8c371b936b20dee91e20ca912827a480b4cae09ef654c37f582e657
EBUILD spamdyke-5.0.1.ebuild 1994 BLAKE2B 01fecf83c74b474f52c9fff6903c9f2f1124182b7c9c3629cd1fac9f8048115299cdf15fed0104135a352f00599d465238c32afc1de5ddb897793b2040ae2cb4 SHA512 21210746356b7cb995ad4e650b75b9ae9bbda1ee1f4a3bc8c09b94d983724002b530e730ccdd56a055478a4888383ebac7c0bb82c17caa2cbfb094b875b0aff0
MISC metadata.xml 699 BLAKE2B 1de53fdcbf9aaab78f797ea694ac050237d2b76de346684781caf994756abd8f6411c090737eb4da8aee3da6570545fa91811a77f3beae0592bb4fc61232a22e SHA512 2a154b87869e0b058be083c0930843ca3d8d524847dfede27f5499517867261756d056c114b864eaa545d3a5fac4e42180f2e4eb2242e825bbddf8effd11ff81
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
index 24eabfe02920..14aae8f1ea05 100644
--- a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
+++ b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
@@ -41,25 +41,25 @@ src_prepare() {
src_configure() {
econf \
- $(use_enable ssl tls) || die "econf failed"
+ $(use_enable ssl tls)
cd ../utils
- econf || die "econf failed in utils"
+ econf
}
src_compile() {
- emake CFLAGS="${CFLAGS}" || die "emake failed"
+ emake CFLAGS="${CFLAGS}"
cd ../utils
- emake CFLAGS="${CFLAGS}" || die "emake in utils died"
+ emake CFLAGS="${CFLAGS}"
}
src_install() {
- dobin ${PN} || die "Installing ${PN} binary failed"
+ dobin ${PN}
insinto /etc/${PN}
- doins ${PN}.conf || die "Installing ${PN} configuration file failed"
+ doins ${PN}.conf
dodir /var/tmp/${PN}/graylist
fowners -R qmaild /var/tmp/${PN}/graylist
cd ../utils
- dobin domain2path || die "Installing domain2path binary failed"
+ dobin domain2path
cd ../documentation
dodoc {Changelog,INSTALL,UPGRADING}.txt
dohtml FAQ.html \