gentoo resync : 19.07.2019

12 files changed, 460 insertions, 2 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 95268f5f9ec1..2f5822bc60d2 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/mimedefang/Manifest b/mail-filter/mimedefang/Manifest
new file mode 100644
index 000000000000..0ce1b3504a66
--- /dev/null
+++ b/mail-filter/mimedefang/Manifest
@@ -0,0 +1,7 @@
+AUX mimedefang-2.72-ldflags.patch 2458 BLAKE2B 3d78cfee8b7bfe87c57390045919511ee11548bc0279316b54c63a428e04d4d168b1d5cd430600e17fa63c5ca2770756bfdf8f681025dff08a600629af3eb9d6 SHA512 a84ff0cefc9dc56b348b8fe6715e9669af43a25d20867b63c63a3006565edd6fb40d2f27b8ddcfd8dd5bb9a4f023e23ae4d258da70df53e3309d680fac4b0aef
+AUX mimedefang-tests.patch 327 BLAKE2B 1bf56e641b0094c9ff32c8e61d8ce751383e7aa084469f32a5ccd72fab970524723882e979394913c24d0d8211344d0ac5cb6df32996826facba4d09d4847b41 SHA512 d04f81edafb569adbe98ee6cd20793c657b098d3d29aec84af9be3bf61cbba592cdd4adda314ad28e2e559ca00979b24ec7783849d11bc4e213f54ab305b69f7
+AUX mimedefang.conf 4760 BLAKE2B 14457894f4f42557ee06aca1454a85978fee1d0dd21dca7cfcf17a2526473212e7813079af4ea949cef398ee3caecc2ce505c254c66209899a64fc7728ef0ff1 SHA512 7f0c8700a48fcbf8e9539a5e34e9b59288ecabe53a1651f6e4b6e01a6bd71475dd5e6417ef966868b6d8b16e36946cde04e31f1ef634abd7b40f3f2f2f55d594
+AUX mimedefang.init 1740 BLAKE2B bf00f5797e2dd72a29dc5b955a18a7faff1e9fd2b82d011f0628222ebc2b4117e1a9262d096706b83729c4e3851a09a65a0d1c0ee57d68c155c9136c63b569a2 SHA512 f45b3ce8a085b3559c80e4bf361ecf3cc16c360322986ac5381a1707e217a282fec4a9bec7856dd153107557911bd6eb9a9ec66b160c0b6bfec3e783aaef321a
+DIST mimedefang-2.84.tar.gz 371596 BLAKE2B b9b871d6a438792afbcebfcd99a77a1f9bb2c0dc7826abea74db913c6dc154403753a3016dc0647e9873256fe354649dea096c0e50d54f8db16ff8d2b91f54f4 SHA512 ffe039654d2e3f649219efc559380e39b21ce910becc36e262356d59d50129f8683ee2e59dd9680aff46478ccebd6b3d9c4567f85ade9a8464077350f4e52f48
+EBUILD mimedefang-2.84.ebuild 1804 BLAKE2B 77fc78dfa93e63c3b9d3bc754d8e2e0dcb03ec718d547649e52df8708ed5d9dd24e50449a4f61ee2d7f29395355ad49c33f0699d8049fc13563f4662f7002fc6 SHA512 f1625c0fdcbb8f17b26ea644aa7b478f197172862142287e7e8d55563c73f0b00053e066a38ed64c88e3a7b2994f9d6f4055dc24d68e5c2d157a7fc170ca8719
+MISC metadata.xml 620 BLAKE2B 2df23d7643738fd2ed38e36a7f8bd97fd95a6d302436066e3ede1457e845a1967bb6717ec113133f16c99fc024a21fb68d8d72534a75024299b7f9b95003a030 SHA512 bb1300cf05b4a91a89453448a5ce5f375edd643195b8469e77295ba00ad9ec3a55130aa53ebfda24c74e138b7ffa9d9874f07ba0b25f428f200bb380b3ab04f4
diff --git a/mail-filter/mimedefang/files/mimedefang-2.72-ldflags.patch b/mail-filter/mimedefang/files/mimedefang-2.72-ldflags.patch
new file mode 100644
index 000000000000..998b3183e661
--- /dev/null
+++ b/mail-filter/mimedefang/files/mimedefang-2.72-ldflags.patch
@@ -0,0 +1,38 @@
+--- mimedefang-2.72/Makefile.in.orig
++++ mimedefang-2.72/Makefile.in
+@@ -52,7 +52,7 @@
+ all: mimedefang mimedefang-multiplexor md-mx-ctrl pod2man
+ 
+ mimedefang-multiplexor: mimedefang-multiplexor.o event.o event_tcp.o drop_privs_nothread.o notifier.o syslog-fac.o utils.o $(EMBPERLOBJS)
+-	$(CC) $(CFLAGS) -o mimedefang-multiplexor mimedefang-multiplexor.o event.o event_tcp.o drop_privs_nothread.o syslog-fac.o notifier.o utils.o $(EMBPERLOBJS) $(LIBS_WITHOUT_PTHREAD) $(EMBPERLLDFLAGS) $(EMBPERLLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mimedefang-multiplexor mimedefang-multiplexor.o event.o event_tcp.o drop_privs_nothread.o syslog-fac.o notifier.o utils.o $(EMBPERLOBJS) $(LIBS_WITHOUT_PTHREAD) $(EMBPERLLDFLAGS) $(EMBPERLLIBS)
+ 
+ embperl.o: embperl.c
+ 	$(CC) $(CFLAGS) $(EMBPERLCFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o embperl.o $(srcdir)/embperl.c
+@@ -67,7 +67,7 @@
+ 	$(CC) $(CFLAGS) $(EMBPERLCFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o test-embed-perl.o $(srcdir)/test-embed-perl.c
+ 
+ te: test-embed-perl.o
+-	$(CC) $(CFLAGS) -o te test-embed-perl.o $(LIBS_WITHOUT_PTHREAD) $(EMBPERLLDFLAGS) $(EMBPERLLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o te test-embed-perl.o $(LIBS_WITHOUT_PTHREAD) $(EMBPERLLDFLAGS) $(EMBPERLLIBS)
+ rm_r.o: rm_r.c
+ 	$(CC) $(CFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o rm_r.o $(srcdir)/rm_r.c
+ 
+@@ -75,7 +75,7 @@
+ 	$(CC) $(CFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o syslog-fac.o $(srcdir)/syslog-fac.c
+ 
+ md-mx-ctrl: md-mx-ctrl.o
+-	$(CC) $(CFLAGS) -o md-mx-ctrl md-mx-ctrl.o $(LIBS_WITHOUT_PTHREAD)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o md-mx-ctrl md-mx-ctrl.o $(LIBS_WITHOUT_PTHREAD)
+ 
+ md-mx-ctrl.o: md-mx-ctrl.c
+ 	$(CC) $(CFLAGS) $(DEFS) $(MINCLUDE) -c -o md-mx-ctrl.o $(srcdir)/md-mx-ctrl.c
+@@ -99,7 +99,7 @@
+ 	$(CC) $(CFLAGS) $(DEFS) $(MINCLUDE) -c -o mimedefang-multiplexor.o $(srcdir)/mimedefang-multiplexor.c
+ 
+ mimedefang: mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o milter_cap.o gen_id.o
+-	$(CC) $(CFLAGS) $(PTHREAD_FLAG) -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o milter_cap.o gen_id.o $(LDFLAGS) -lmilter $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(PTHREAD_FLAG) -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o milter_cap.o gen_id.o $(LDFLAGS) -lmilter $(LIBS)
+ 
+ mimedefang.o: mimedefang.c mimedefang.h
+ 	$(CC) $(CFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o mimedefang.o $(srcdir)/mimedefang.c
diff --git a/mail-filter/mimedefang/files/mimedefang-tests.patch b/mail-filter/mimedefang/files/mimedefang-tests.patch
new file mode 100644
index 000000000000..82f8b9b56160
--- /dev/null
+++ b/mail-filter/mimedefang/files/mimedefang-tests.patch
@@ -0,0 +1,11 @@
+--- a/t/lib/MIMEDefang/Unit.pm.ori	2010-05-13 23:12:23.000000000 +0200
++++ b/t/lib/MIMEDefang/Unit.pm	2019-07-10 15:08:35.190824853 +0200
+@@ -12,7 +12,7 @@
+ 	no warnings 'redefine';
+ 	local *CORE::GLOBAL::exit = sub { };
+ 	local @ARGV = ();
+-	do 'mimedefang.pl.in';
++	do './mimedefang.pl.in';
+ 	use warnings 'redefine';
+ }
+ 1;
diff --git a/mail-filter/mimedefang/files/mimedefang.conf b/mail-filter/mimedefang/files/mimedefang.conf
new file mode 100644
index 000000000000..5deb1401d5ef
--- /dev/null
+++ b/mail-filter/mimedefang/files/mimedefang.conf
@@ -0,0 +1,157 @@
+####################################
+# Mandatory options for MIMEDefang #
+####################################
+
+# spool directory
+SPOOLDIR='/var/spool/MIMEDefang'
+
+# The socket used by mimedefang to communicate with the sendmail binary.
+# You can leave this commented out.
+# SOCKET="${SPOOLDIR}/mimedefang.sock"
+
+# The socket used by the multiplexor.
+# You can leave this commented out.
+# MX_SOCKET="${SPOOLDIR}/mimedefang-multiplexor.sock"
+
+########################################
+# Additional options for MIMEDefang    #
+# For a list of all of them:           #
+# man mimedefang (MD_OPTS)             #
+# man mimedefang-multiplexor (MX_OPTS) #
+########################################
+
+#############
+# MD_MX_OPTS: common options to both processes.
+#############
+
+# Run the multiplexor and filters as this user, not root (RECOMMENDED).
+MD_MX_OPTS+=' -U defang'
+
+# Syslog facility
+# MD_MX_OPTS+=' -S mail'
+
+##########
+# MD_OPTS: mimdefang options.
+##########
+
+# Number of workers reserved for connections from loopback.  Use -1
+# for default behaviour, 0 to allow loopback connections to queue,
+# or >0 to reserve workers for loopback connections
+MD_OPTS+=' -R -1'
+
+# If you want to keep spool directories around if the filter fails,
+# add the -k option.
+# MD_OPTS+=' -k'
+
+# Turns on the multiplexor relay checking function
+# MD_OPTS+=' -r'
+
+# Turns on the multiplexor HELO checking function
+# MD_OPTS+=' -H'
+
+# Turns on the multiplexor sender checking function
+# MD_OPTS+=' -s'
+
+# Turns on the multiplexor recipient checking function
+# MD_OPTS+=' -t'
+
+# Extra sendmail macros to pass.
+# MD_OPTS+=' -a auth_author'
+
+# Do not reveal info via X-Scanned-By header (recommended).
+MD_OPTS+=' -X'
+
+##########
+# MX_OPTS: mimdefang-multiplexor options.
+##########
+
+# multiplexor logs events to syslog
+MX_OPTS+=' -l'
+
+# Use an embedded Perl interpreter
+# MX_OPTS+=' -E'
+
+# Set to full path of socket for Sendmail's SOCKETMAP map, if you
+# want to use it with MIMEDefang
+# MX_OPTS+=("-N ${SPOOLDIR}/map.sock")
+
+# The multiplexor does not start all workers at the same time. Instead,
+# it starts one worker every X seconds when the system is idle.
+# If the system is busy, the multiplexor starts workers as incoming mail
+# requires attention.
+# MX_OPTS+=' -w 3'
+
+# The next setting is an absolute limit on worker activation.  The multiplexor
+# will NEVER activate a worker within X seconds of another.
+# The default of zero means that the multiplexor will activate workers as
+# quickly as necessary to keep up with incoming mail.
+# MX_OPTS+=' -W 0'
+
+# The multiplexor can log stats to a file (eg. /var/log/mimedefang/stats).
+# The log directory must exist and be writable by the user you're running
+# MIMEDefang as.
+# MX_OPTS+=' -t /var/log/mimedefang/stats'
+
+# The stats file can be flushed after each entry.
+# MX_OPTS+=' -u'
+
+# The multiplexor can log stats to syslog.
+# MX_OPTS+=' -T'
+
+# Maximum # of requests a process handles.
+# MX_OPTS+=' -r 200'
+
+# Minimum number of processes to keep.  The default of 0 is probably
+# too low; we suggest 2 instead.
+MX_OPTS+=' -m 2'
+
+# Maximum number of processes to run (mail received while this many
+# processes are running is rejected with a temporary failure, so be
+# wary of how many emails you receive at a time).  This applies only
+# if you DO use the multiplexor.  The default value of 2 is probably
+# too low; we suggest 10 instead.
+MX_OPTS+=' -x 10'
+
+# Uncomment to log worker status; it will be logged every X seconds.
+# MX_OPTS+=' -L 30'
+
+# Uncomment next line to have busy workers send status updates to the
+# multiplexor.  NOTE: Consumes one extra file descriptor per worker, plus
+# a bit of CPU time.
+# MX_OPTS+=' -Z'
+
+# Limit worker processes' resident-set size to this many kilobytes.  Default
+# is unlimited.
+# MX_OPTS+=' -R 10000'
+
+# Limit total size of worker processes' memory space to this many kilobytes.
+# Default is unlimited.
+# MX_OPTS+=' -M 30000'
+
+# If you want to use the "notification" facility, set the appropriate port.
+# See the mimedefang-notify man page for details.
+# MX_OPTS+=' -O inet:4567'
+
+# Number of seconds a process should be idle before checking for
+# minimum number and killed.
+# MX_OPTS+=' -i 300'
+
+# Number of seconds a process is allowed to scan an email before it is
+# considered dead.  The default is 30 seconds; we suggest 600.
+MX_OPTS+=' -b 600'
+
+# Multiplexor queue size -- default is 0 (no queueing)
+# MX_OPTS+=' -q 10'
+
+# Multiplexor queue timeout -- default is 30 seconds
+# MX_OPTS+=' -Q 30'
+
+# SUBFILTER -F option specifies which filter rules file to use
+# MX_OPTS+=' -F /etc/mail/mimedefang-filter'
+
+###########################
+# Upstream recommendation #
+###########################
+# Locale should be set to "C" for generating valid date headers
+LC_ALL=C
+export LC_ALL
diff --git a/mail-filter/mimedefang/files/mimedefang.init b/mail-filter/mimedefang/files/mimedefang.init
new file mode 100644
index 000000000000..931f47bf5919
--- /dev/null
+++ b/mail-filter/mimedefang/files/mimedefang.init
@@ -0,0 +1,60 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+SPOOLDIR="${SPOOLDIR:-/var/spool/MIMEDefang}"
+PID="${SPOOLDIR}/mimedefang.pid"
+MXPID="${SPOOLDIR}/mimedefang-multiplexor.pid"
+LOCK="${SPOOLDIR}/mimedefang.lock"
+MXLOCK="${SPOOLDIR}/mimedefang-multiplexor.lock"
+
+# Make sure required vars are set
+SOCKET="${SOCKET:-${SPOOLDIR}/mimedefang.sock}"
+MX_SOCKET="${MX_SOCKET:-${SPOOLDIR}/mimedefang-multiplexor.sock}"
+
+description="MIMEDefang mail filter"
+extra_commands="checkconfig"
+description_checkconfig="Check config for ${RC_SVCNAME}"
+
+depend() {
+	use antivirus
+}
+
+checkconfig() {
+	checkpath -d "${SPOOLDIR}"
+	einfo "multiplexor socket: ${MX_SOCKET}"
+	einfo "sendmail socket: ${SOCKET}"
+}
+
+start() {
+	checkconfig || return 1
+
+	# First start mimedefang multiplexor
+	rm -f "${MX_SOCKET}" > /dev/null 2>&1
+	ebegin "Starting mimedefang-multiplexor"
+	start-stop-daemon --start --quiet \
+		--exec /usr/bin/mimedefang-multiplexor -- -p "${MXPID}" -o "${MXLOCK}" -z "${SPOOLDIR}" \
+		${MD_MX_OPTS} ${MX_OPTS} \
+		-s "${MX_SOCKET}"
+	eend $? "Failed to start mimedefang-multiplexor"
+
+	# And now start mimedefang
+	rm -f "${SOCKET}" > /dev/null 2>&1
+	ebegin "Starting mimedefang"
+	start-stop-daemon --start --quiet \
+		--exec /usr/bin/mimedefang -- -P "${PID}" -o "${LOCK}" -z "${SPOOLDIR}" \
+		${MD_MX_OPTS} ${MD_OPTS} \
+		-m "${MX_SOCKET}" \
+		-p "${SOCKET}"
+	eend $? "Failed to start mimedefang"
+}
+
+stop() {
+	ebegin "Stopping mimedefang"
+	start-stop-daemon --stop --quiet --pidfile "${PID}"
+	eend $? "Failed to stop mimedefang"
+
+	ebegin "Stopping mimedefang-multiplexor"
+	start-stop-daemon --stop --quiet --pidfile "${MXPID}"
+	eend $? "Failed to stop mimedefang-multiplexor"
+}
diff --git a/mail-filter/mimedefang/metadata.xml b/mail-filter/mimedefang/metadata.xml
new file mode 100644
index 000000000000..be8b6de0ae7a
--- /dev/null
+++ b/mail-filter/mimedefang/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rentorbuy@yahoo.com</email>
+		<name>Vieri Di Paola</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		A program for Milter supported mail servers that implements antispam,
+		antivirus and other customizable filtering on email messages.
+	</longdescription>
+	<use>
+		<flag name="poll">Use poll instead of select</flag>
+	</use>
+</pkgmetadata>
diff --git a/mail-filter/mimedefang/mimedefang-2.84.ebuild b/mail-filter/mimedefang/mimedefang-2.84.ebuild
new file mode 100644
index 000000000000..f927bb3e5b4e
--- /dev/null
+++ b/mail-filter/mimedefang/mimedefang-2.84.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+DESCRIPTION="Antispam, antivirus and other customizable filters for MTAs with Milter support"
+HOMEPAGE="http://www.mimedefang.org/"
+SRC_URI="http://www.mimedefang.org/static/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clamav +poll test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-perl/MIME-tools-5.412
+	dev-perl/IO-stringy
+	virtual/perl-MIME-Base64
+	dev-perl/Digest-SHA1
+	dev-perl/MailTools
+	dev-perl/Unix-Syslog
+	clamav? ( app-antivirus/clamav )
+	|| ( mail-filter/libmilter mail-mta/sendmail )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/Test-Class
+		dev-perl/Test-Most
+	)"
+
+pkg_setup() {
+	enewgroup defang
+	enewuser defang -1 -1 -1 defang
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.72-ldflags.patch"
+	eapply "${FILESDIR}/${PN}-tests.patch"
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--with-user=defang \
+		$(use_enable poll) \
+		$(use_enable clamav) \
+		$(use_enable clamav clamd)
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_STRIP_FLAG="" install
+
+	fowners defang:defang /etc/mail/mimedefang-filter
+	fperms 644 /etc/mail/mimedefang-filter
+	insinto /etc/mail/
+	newins "${S}"/SpamAssassin/spamassassin.cf sa-mimedefang.cf
+
+	keepdir /var/spool/{MD-Quarantine,MIMEDefang}
+	fowners defang:defang /var/spool/{MD-Quarantine,MIMEDefang}
+	fperms 700 /var/spool/{MD-Quarantine,MIMEDefang}
+
+	keepdir /var/log/mimedefang
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	dodoc -r examples contrib
+}
+
+pkg_postinst() {
+	elog "You can install Mail::SpamAssassin (mail-filter/spamassassin) and"
+	elog "HTML::Parser (dev-perl/HTML-Parser) even after installing if you require"
+	elog "them as they are loaded at run-time."
+}
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index b668f7c54ed2..dad671f27036 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -9,6 +9,6 @@ AUX opendkim.service 439 BLAKE2B 203f8d5a55f9f08069eec0bac8b9af743e3c0414a927c47
 AUX opendkim.service.conf 60 BLAKE2B 797a3947c9c984378955701252cc9d956c8398f1bba7696e7d5c052dd8103355dbf147ac05ae5b7f372867f2b330aaaf160e83709e440a9fc942e9069dbe7c2e SHA512 635e474464f81abe8444030b3cdc6e747298fc463bd02e4292e914ad622761f354b92921cd380387c8e9272435e1660de1a1cf8dbe34ded870e728ecc9e00246
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
 EBUILD opendkim-2.10.3-r15.ebuild 7370 BLAKE2B 4dece98e2599700b5a3add3cf3ec0ea6430c6b07be798f051cd45b2ab9f8b9b74cb1c7a643d55e54982097ed9c78260e945587f07b881fdbb2320678bff00a5a SHA512 e7caccb36dc6bc5a7b046d9c8fb56cf4606657026c5ffc91dbfb7ce043631bf87168fd8f8278141296573d3e7e3ecebe91ce871d504dc4b49ca170737d194f76
-EBUILD opendkim-2.10.3-r16.ebuild 7439 BLAKE2B 0d84107e8fa725827c315b8599b9c06333f9d1720f7f7c04d664f2c3afc16a0a7cdac60ed5b5c6201a6ffdaa0d4736f5c120b10d0a4a59a2a6c6e92ab74eb7b9 SHA512 4751a54b4182e5cbb61229b26ed5bc1baa05a8ec71d7812dc2b003e42f9c4e7e8f96e12fc93cfe5a0c55aaff5af81ad27164b048d9ffd394cf01d95b4ee38f76
+EBUILD opendkim-2.10.3-r16.ebuild 7438 BLAKE2B fc12c36b31304cae661eda0dd0be4ed85c8a23a836030a99e70bd5604f871bb095ed3987eeae409af00939963f5c62fb1a99d18f6e986ba5110f6d77ab563188 SHA512 8fb550ce6c73e6b6f04c3da3a11fe6f51f451df3051c9b046fa0959767d85de86fe289269a12c21b80f2abf9ebf66d1a6f60d69b24a44b87d067439b661ff32f
 EBUILD opendkim-2.10.3-r8.ebuild 7233 BLAKE2B 81c780d136560365a2a4eebf31901448cadec91616388ab9851c0bbd24dfff965c517cec5af73fd3adc4507708aba1c24d13d8905f7e5499c09ef4e6751171ee SHA512 385e2da6c53900a98f35a9839007f5dd7caa65fb9138599e1ced1639759fbb674223ecd2ccf8bddd4341334934440476112b07f280efabf345af8e0b77098815
 MISC metadata.xml 2186 BLAKE2B 849f52c2a72b9891732476203f9368204e0323a21306ef11a5b114ab66d9946b5028ad6b424f659dfa5cecf88b90e1a2fe3a55b8868f02a3f999151b19f85f82 SHA512 57caed2ca4c63ddb76ef643c1dcc76662efc767c37d2c0c084abfea0af864e8fbdf6d7b041114aad2478f4b0ebbace4dde0a427a4464e5d785ec9eac78f4fda3
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
index dd5ca50e9a3b..8f413fcb486c 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/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 query_cache test unbound"
 
 COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index aaf7869d5085..11bdb71845ef 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -4,7 +4,9 @@ AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb269
 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
 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-9999.ebuild 2242 BLAKE2B f294fc165ccf83af918e37b5f4659bbca79e1fae2b378d4c7218074dcac318c3faea6ef10eb59bff59fc4ca3ea5115182d53948debdc6314ee457d70598a4df8 SHA512 c6f28512d0dee9213dcd48d7df0c3672c2f86d520090ed392efaa0c27ac0e27653ce487e5570953d34b50d6bfbc2c74d282f3ecd8d67acf1b5874f55c7f59797
 MISC metadata.xml 834 BLAKE2B 48979c23212a496c955667b99cfb618da9f682e2269bb42c9b4e4932b94304197422bc2480e7177d73ff6cb246e53a964bd43f5819827e4b6342786c282277db SHA512 c9a2106f419b90885905947aebacfdd15e7d1a66cb9cc6267cb79f487c9069f8ed2cc65c3d6d0ec05b011ade53ed2177df8f11ee49ee1e720dcf6ac365bc28d1
diff --git a/mail-filter/rspamd/rspamd-1.9.4.ebuild b/mail-filter/rspamd/rspamd-1.9.4.ebuild
new file mode 100644
index 000000000000..47cfb7f44f9e
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.9.4.ebuild
@@ -0,0 +1,89 @@
+# 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"
+}