[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/

[David Seifert]

commit:     16228ae3e4e0a06675274586a61d7cc0aaafecda
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Apr 22 07:42:05 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 09:55:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16228ae3

mail-filter/rspamd: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/11772
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...-dont-send-reject-message-after-set-reply.patch | 128 ---------------------
 mail-filter/rspamd/files/rspamd.init-r5            |  48 --------
 mail-filter/rspamd/files/rspamd.logrotate          |  12 --
 3 files changed, 188 deletions(-)

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
deleted file mode 100644
index 4238c838dfa..00000000000
--- a/mail-filter/rspamd/files/1.6.6-dont-send-reject-message-after-set-reply.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 2bda2989eee893c42ff04f48a904f00a33a7d07a Mon Sep 17 00:00:00 2001
-From: Vsevolod Stakhov <vsevolod@××××××××××.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/files/rspamd.init-r5 b/mail-filter/rspamd/files/rspamd.init-r5
deleted file mode 100644
index 6d249f3f905..00000000000
--- a/mail-filter/rspamd/files/rspamd.init-r5
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-RUNDIR=/var/run/rspamd
-PIDFILE=$RUNDIR/rspamd.pid
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	/usr/bin/rspamadm configtest -c /etc/rspamd/rspamd.conf > /dev/null \
-		|| return 1
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-
-	checkpath -d $RUNDIR -m 2750 -o rspamd:rspamd
-	rm -f $RUNDIR/$SVCNAME.sock
-
-	start-stop-daemon --start --quiet --pidfile $PIDFILE -u rspamd -g rspamd \
-						--exec /usr/bin/rspamd
-	eend $?
-}
-
-stop() {
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE \
-						--exec /usr/bin/rspamd
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --quiet --pidfile $PIDFILE
-	eend $?
-}

diff --git a/mail-filter/rspamd/files/rspamd.logrotate b/mail-filter/rspamd/files/rspamd.logrotate
deleted file mode 100644
index 81400efc891..00000000000
--- a/mail-filter/rspamd/files/rspamd.logrotate
+++ /dev/null
@@ -1,12 +0,0 @@
-/var/log/rspamd/rspamd.log {
-       daily
-       rotate 4
-       delaycompress
-       compress
-       notifempty
-       missingok
-       postrotate
-	  test -r /run/rspamd/rspamd.pid && kill -USR1 $(cat /run/rspamd/rspamd.pid) &>/dev/null
-       endscript
-}
-