diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-13 16:55:35 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-13 16:55:35 +0000 |
commit | 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (patch) | |
tree | c99a472cce74148d499f42ada873454b0e32a42d /mail-filter | |
parent | da6a52f691ef980bab92d003d5df8f463c623af8 (diff) |
gentoo resync : 13.03.2018
Diffstat (limited to 'mail-filter')
-rw-r--r-- | mail-filter/Manifest.gz | bin | 11382 -> 11387 bytes | |||
-rw-r--r-- | mail-filter/rspamd/Manifest | 3 | ||||
-rw-r--r-- | mail-filter/rspamd/files/1.6.6-dont-send-reject-message-after-set-reply.patch | 128 | ||||
-rw-r--r-- | mail-filter/rspamd/rspamd-1.6.6.ebuild | 76 | ||||
-rw-r--r-- | mail-filter/spamassassin/Manifest | 2 | ||||
-rw-r--r-- | mail-filter/spamassassin/spamassassin-3.4.1-r20.ebuild | 2 |
6 files changed, 209 insertions, 2 deletions
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz Binary files differindex 5407569744f7..5e7013122a4d 100644 --- a/mail-filter/Manifest.gz +++ b/mail-filter/Manifest.gz diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index 92eb8908b87e..a3ab50f957df 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,7 +1,10 @@ +AUX 1.6.6-dont-send-reject-message-after-set-reply.patch 3437 BLAKE2B ff628f61ed78de3cada4aa0e5b85d33eedda3c40e932aa6dd07970949f92e3dede78ec8592e57658dbb99b28422c4eaf60d4c4443470f721664fc0fbbb156e1c SHA512 4a66760909633601bb1ec91881cb6a3cde9fc66ffbaa31692d6847d088d661053f3294e3597c2a44bddb8b0a2f38175dba03ab1510ff420f3395087114a28486 AUX rspamd.init-r2 1030 BLAKE2B 5383f805b73aec7501c1d9d152d336a2f55de87968929b736b787847f4251734fb35d59c4c77861e5f0235d99a97595a4fba694780ceb2a897eef2cb1eb7212c SHA512 6419e21253ee98aa0a5ee44e750f9473b8688d79e460866b23a153a76949e20fee114f1b58dbce90b46dc758636af8591e2bae6abe0c513c889025564582351f AUX rspamd.init-r5 993 BLAKE2B bce51947c56f4f61aeb24365b37fcbf89b3cf919fa355c6055691684420458bce4e7ab1c30012b849e0be50785be54785b5984fe46104c3312cf6421cbc46659 SHA512 a51e13e344a67436ba377ed5b5f5516895f7b0a87571dd1d8391fbc4db5794e98e609672f103f997d6c13aded81595ac4e0c4f315e7c23a79408d0dc680930a5 AUX rspamd.logrotate 226 BLAKE2B dee73a45d03ca04ad1396ca1137d3a0bf873da37dcc9e878107692cd73d3666c3a99147f90602e64313540d6c02ba46ed1b9f95aa617455ea18b822a19fb5728 SHA512 9593e269fdac064050eb9e3e3bb25db73bb41163ff6764845bf4cc05512a4dfbb1cedce781f1ffa390d1d8df579fa66cb34d1629649133ba8f36a30d8050c323 DIST rspamd-1.6.5.tar.gz 2484271 BLAKE2B 880e862eecd4a082b87bee2ba8c7b17a475efbfe90dbb0cbf34c5ad6c42c80d6ea142f11c7632763d7f9e4155a4521274f2d5a26a77dfbdab9f585bb1e3fff5f SHA512 789abc994cf96a0d88662e14f0e77f95f5c7c7bd1f808ffd64af21cf73cef643b5aee4c1f066d81d04e79d6bb7f72f12095ff08d8515a40bcca23153715fc9f1 +DIST rspamd-1.6.6.tar.gz 2487482 BLAKE2B f18640f64a8c0bcf6077267a1715f0bb096ab18484c24de56a012c42666cdc9f8671237c5336dce7cd47f44f9aba7905ce3723232d53a5b8ddfe143df682bd9b SHA512 14c7144017df69600dbd09541d16dae19d87105b09f95811fc09624b60e89ca68200654e88dea242508afd3c4963ea7cac086abddec8ca1a3d8fc73d7c27e899 EBUILD rspamd-1.6.5.ebuild 1868 BLAKE2B 3a1b3b56887ac104ad88a01e6ba591d12dc2cd26faad7015b172f86fe9980527e96f8834237d88590ea3045ff15b4d75f6eb89378a24c34257dbb5a3a689bd0a SHA512 1377875abc3cdb66f5dd78fda1e44b93fb8a1f1c39f17757d7289a2c13464071731116ed1e4450b7c371f7682407575986fe73c8e0d9e3d0352b29a7e4098511 +EBUILD rspamd-1.6.6.ebuild 1947 BLAKE2B a126b72800155611a024b3767643b1e511d70a4cee87727d35292500b6d97cbb538b3dd960efef11d78de270d5804d0e1af20629898a017d635e9fec2bbf6e10 SHA512 62e4cca1df35d0889f06667cc2cb4498d818d555fea5a71a0cd924acc25eec25bf1e292a56f448b0339dbacd39f790502da239d8bb61c9500d58ac5c2a2d4118 EBUILD rspamd-9999.ebuild 1745 BLAKE2B e433d8893ada66ed50bdf80d31183b3388866b253882f8b69906f54e353de9ffa2b2002e3f66ddbdda6dd7c6a3d48b681f10ff3c1df6fc9bade60ffdb1e12de1 SHA512 73fa228a4f998effbb7f2505e34f4b35d766dccb5335e5d8e76f6f01c6123e68f17fad5767e8d17336328939b1cdb2d9f4f11f76be006d5d0c444b2d082d8e3d MISC metadata.xml 784 BLAKE2B b77158a9fb5441a146ee2ec0f1e668b8c4f95be8564f682da7142ded0d0eb5586ed0bba876924b640d551a693112d7616a70943ad08ec3b3ecf93589e507d7b9 SHA512 4aac214308201e0dda086c3871dba3eafefe2f110e5fd19f0dba8af2ff5e58d93e771c74981ed880f9057573679cf00f8d1276aa215d2ef3c9282bdedc409991 diff --git a/mail-filter/rspamd/files/1.6.6-dont-send-reject-message-after-set-reply.patch b/mail-filter/rspamd/files/1.6.6-dont-send-reject-message-after-set-reply.patch new file mode 100644 index 000000000000..4238c838dfa9 --- /dev/null +++ b/mail-filter/rspamd/files/1.6.6-dont-send-reject-message-after-set-reply.patch @@ -0,0 +1,128 @@ +From 2bda2989eee893c42ff04f48a904f00a33a7d07a Mon Sep 17 00:00:00 2001 +From: Vsevolod Stakhov <vsevolod@highsecure.ru> +Date: Tue, 27 Feb 2018 16:37:44 +0000 +Subject: [PATCH] [CritFix] Do not send reject messages after set reply + +Libmilter seems to be totally brain damaged: +https://github.com/freebsd/freebsd/blob/386ddae58459341ec567604707805814a2128a57/contrib/sendmail/libmilter/engine.c#L66 + +--- + src/libserver/milter.c | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + + Back-ported for rspamd 1.5.6 + +diff -ur rspamd-1.6.6/src/libserver/milter.c rspamd-1.6.6-badmilter/src/libserver/milter.c +--- rspamd-1.6.6/src/libserver/milter.c 2018-02-16 13:47:47.000000000 +0000 ++++ rspamd-1.6.6-badmilter/src/libserver/milter.c 2018-03-07 16:07:58.591483869 +0000 +@@ -99,6 +99,8 @@ + guint i; + + if (how & RSPAMD_MILTER_RESET_IO) { ++ msg_debug_milter ("cleanup IO on abort"); ++ + DL_FOREACH_SAFE (priv->out_chain, obuf, obuf_tmp) { + rspamd_milter_obuf_free (obuf); + } +@@ -111,8 +113,11 @@ + } + + if (how & RSPAMD_MILTER_RESET_COMMON) { ++ msg_debug_milter ("cleanup common data on abort"); ++ + if (session->message) { + session->message->len = 0; ++ msg_debug_milter ("cleanup message on abort"); + } + + if (session->rcpts) { +@@ -120,30 +125,38 @@ + rspamd_email_address_unref (cur); + } + ++ msg_debug_milter ("cleanup %d recipients on abort", ++ (gint)session->rcpts->len); ++ + g_ptr_array_free (session->rcpts, TRUE); + session->rcpts = NULL; + } + + if (session->from) { ++ msg_debug_milter ("cleanup from"); + rspamd_email_address_unref (session->from); + session->from = NULL; + } + + if (session->helo) { ++ msg_debug_milter ("cleanup helo"); + session->helo->len = 0; + } + + if (session->hostname) { ++ msg_debug_milter ("cleanup hostname"); + session->hostname->len = 0; + } + + if (priv->headers) { ++ msg_debug_milter ("cleanup headers"); + g_hash_table_remove_all (priv->headers); + } + } + + if (how & RSPAMD_MILTER_RESET_ADDR) { + if (session->addr) { ++ msg_debug_milter ("cleanup addr"); + rspamd_inet_address_free (session->addr); + session->addr = NULL; + } +@@ -151,6 +164,7 @@ + + if (how & RSPAMD_MILTER_RESET_MACRO) { + if (session->macros) { ++ msg_debug_milter ("cleanup macros"); + g_hash_table_unref (session->macros); + session->macros = NULL; + } +@@ -1612,7 +1626,7 @@ + msg_err_milter ("cannot find scan results, tempfail"); + rspamd_milter_send_action (session, RSPAMD_MILTER_TEMPFAIL); + +- return; ++ goto cleanup; + } + + elt = ucl_object_lookup (results, "action"); +@@ -1621,7 +1635,7 @@ + msg_err_milter ("cannot find action in results, tempfail"); + rspamd_milter_send_action (session, RSPAMD_MILTER_TEMPFAIL); + +- return; ++ goto cleanup; + } + + rspamd_action_from_str (ucl_object_tostring (elt), &action); +@@ -1681,7 +1695,6 @@ + } + + rspamd_milter_set_reply (session, rcode, xcode, reply); +- rspamd_milter_send_action (session, RSPAMD_MILTER_REJECT); + } + break; + case METRIC_ACTION_SOFT_REJECT: +@@ -1696,7 +1709,6 @@ + } + + rspamd_milter_set_reply (session, rcode, xcode, reply); +- rspamd_milter_send_action (session, RSPAMD_MILTER_REJECT); + break; + + case METRIC_ACTION_REWRITE_SUBJECT: +@@ -1741,6 +1753,8 @@ + rspamd_fstring_free (rcode); + rspamd_fstring_free (xcode); + rspamd_fstring_free (reply); ++ ++ rspamd_milter_session_reset (session, RSPAMD_MILTER_RESET_ABORT); + } + + void diff --git a/mail-filter/rspamd/rspamd-1.6.6.ebuild b/mail-filter/rspamd/rspamd-1.6.6.ebuild new file mode 100644 index 000000000000..8ded37e068e3 --- /dev/null +++ b/mail-filter/rspamd/rspamd-1.6.6.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils pax-utils user systemd + +DESCRIPTION="Rapid spam filtering system" +SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/vstakhov/rspamd" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2" + +RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) + fann? ( sci-mathematics/fann ) + pcre2? ( dev-libs/libpcre2[jit=] ) + !pcre2? ( dev-libs/libpcre[jit=] ) + jit? ( dev-lang/luajit:2 ) + jemalloc? ( dev-libs/jemalloc ) + dev-libs/libevent + dev-db/sqlite:3 + dev-libs/glib:2 + <dev-util/ragel-7.0 + sys-apps/file + gd? ( media-libs/gd[jpeg] ) + dev-libs/icu + cpu_flags_x86_ssse3? ( dev-libs/hyperscan )" +DEPEND="dev-util/ragel + ${RDEPEND}" + +QA_MULTILIB_PATHS="usr/lib/rspamd/.*" +PATCHES=( "${FILESDIR}/${PV}-dont-send-reject-message-after-set-reply.patch" ) + +pkg_setup() { + enewgroup rspamd + enewuser rspamd -1 -1 /var/lib/rspamd rspamd +} + +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_PCRE2=$(usex pcre2 ON OFF) + -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) + -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + newinitd "${FILESDIR}/rspamd.init-r5" rspamd + + # Remove mprotect for JIT support + if use jit; then + pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die + fi + + dodir /var/lib/rspamd + dodir /var/log/rspamd + + fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd + + insinto /etc/logrotate.d + newins "${FILESDIR}/rspamd.logrotate" rspamd + + systemd_newunit rspamd.service rspamd.service +} diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index 98e8ea4f89bd..a2ff995c1f8e 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -20,6 +20,6 @@ AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365a AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5 DIST Mail-SpamAssassin-3.4.1.tar.bz2 2710985 BLAKE2B f85b0ed2bae783bc6dfa39df36589a6cb90e6c657efcff1fa094f952847e4bcb24aa232b6689804bb1170204ae1d33216ed9bde207d7a7a6863410d8f847c391 SHA512 91d50e2ce6520e3e1c7bc66da133a0815be34ced15e26b6e6c17af5a03d5c62f41d8086f25f65084d6634497148cf5439977d7d4a44d7c3e307535beac6629af EBUILD spamassassin-3.4.1-r19.ebuild 7827 BLAKE2B 8b7d0a7a1c0c8c27bc75324d1d4241ab2cdbbc8b50f1382750feb78621ac174aead3bbb8535fb4210909ac6840a08cbbd0435ea1c81966e8a63c0f2c78f2411b SHA512 7d1aca7c07984a5de780542cb96d6a10617a3395acd46c0c1ed6fe3925c30de5bbd9a130294d2088ed9b17c2fdc2062fbd0107076d4a2d8b7cc40e1f0d8ad9c3 -EBUILD spamassassin-3.4.1-r20.ebuild 7820 BLAKE2B 34355182fac1b2e716e3becbce9081f43d28cbeaeee8388192216eb6309cfb78ad1857ba639bec282d99abe8b99f90df0e19302752c9d79cccdcdbd7a30d8694 SHA512 b697f1a624fd3c74d778c080da4958251a662225ae50560c1013e78e78ede5c13b8898153d2006dec50152b7839802147c4d65fb7182dd187ed0bf19a94e183f +EBUILD spamassassin-3.4.1-r20.ebuild 7819 BLAKE2B 569ec1ab88c831a7acdb049e4c29d50dd5d02227f80563b66eaf19ff81b672cd88dcf1346a664498682c0e90bf553619f5ef613189c64f5a89a9c4361fc3d24b SHA512 59a47637224f2d618689394a5468590a765c4ed7d61d2bc06bd67dd4928dfbbd94f7c595eb8b8103141d7b2b918ceb9191a56a363c7fa0eda82e8d82b7516450 EBUILD spamassassin-3.4.1-r8.ebuild 7014 BLAKE2B 232ef27c8c1da3b3252f84d5fb845f9d50a688e27ffb7f1a49ad2d079b76362efbc40072869aecf123b463be013ece8713e23a300ce8e0d9ba8aabf0a3ba979f SHA512 0e71a3d5c7381fdc78c591050367d27f8281ed42789b5f0954af0dec2440b8e6183eb0303ff9056f9a0cf16bdc21ee866ef7889cabbcdc7401b6c49b81d72e6e MISC metadata.xml 1116 BLAKE2B c9879a85394a1dacac44bc073ec568ba50ac62f44eab9948cecbf19b49c12bb6a074279316d5cae97b396b59d9e9fca0243197073e08b0d6afafe4e22b7d6a71 SHA512 f0ec3654c51ab783c40e072fd87e5347931b3678537ad37491df3eee183be2060901effc93a343c20beff80f3175a41aeb417b5f0fdee19416df329435d221ef diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r20.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r20.ebuild index 16109c5a2f09..408d0456c737 100644 --- a/mail-filter/spamassassin/spamassassin-3.4.1-r20.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.4.1-r20.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 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" # The Makefile.PL script checks for dependencies, but only fails if a |