gentoo resync : 29.03.2018

4 files changed, 105 insertions, 24 deletions

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index b0d0d57f89ea..9a4a45516e71 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,12 +1,14 @@
 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
+AUX rspamd.logrotate 258 BLAKE2B 14a006d8768adc90b0b186e652c5516f4a983149fa10722545c8376d93f8333825a072906ac964b9f4c25c9165c001e1daf493c8a7e19cfe97ce5b8a6afcba85 SHA512 159e048552cc86b9e15b7dc826ee772a1d9be5cfe588b2025ffee7a8944e5f1af63f6512379efd9f0cca450a48f536babd6845812733060d087801ee5fd75770
 DIST rspamd-1.6.5.tar.gz 2484271 BLAKE2B 880e862eecd4a082b87bee2ba8c7b17a475efbfe90dbb0cbf34c5ad6c42c80d6ea142f11c7632763d7f9e4155a4521274f2d5a26a77dfbdab9f585bb1e3fff5f SHA512 789abc994cf96a0d88662e14f0e77f95f5c7c7bd1f808ffd64af21cf73cef643b5aee4c1f066d81d04e79d6bb7f72f12095ff08d8515a40bcca23153715fc9f1
 DIST rspamd-1.6.6.tar.gz 2487482 BLAKE2B f18640f64a8c0bcf6077267a1715f0bb096ab18484c24de56a012c42666cdc9f8671237c5336dce7cd47f44f9aba7905ce3723232d53a5b8ddfe143df682bd9b SHA512 14c7144017df69600dbd09541d16dae19d87105b09f95811fc09624b60e89ca68200654e88dea242508afd3c4963ea7cac086abddec8ca1a3d8fc73d7c27e899
 DIST rspamd-1.7.1.tar.gz 4453460 BLAKE2B 28070804a6daf7f6354203038fbd974176a1ed5135b51a5ef7f089e63ffac3b3bbdca1961154b846f5b7d054071925722b311b46a3be6d09ff3d853232cbbd5f SHA512 3de4e07fa9cc72e306936a201f6bc019b5bf6f3ade003bf9217dc8a7decf027b986d80e1c0d2f09460af6f1d59aa520fee68287ad6ccee1cec94698054bc2fbb
+DIST rspamd-1.7.2.tar.gz 4460606 BLAKE2B 2c4389fd5350d67d21745288f74c4e1276772c47bbb0c74364227d0c04e4102c2ce00cd8242a639825e8c9971e87822af7a38a0a8561ba979e3f3b396d120414 SHA512 45ab95c7488e58da9e8803daefda5a0f8920cc4d4c4508a0347ed07d201124d07b10e93010b2be5fab3ecd0ac2be962bcebbb41f434a449fdbc31ded744878cf
 EBUILD rspamd-1.6.5.ebuild 1868 BLAKE2B 3a1b3b56887ac104ad88a01e6ba591d12dc2cd26faad7015b172f86fe9980527e96f8834237d88590ea3045ff15b4d75f6eb89378a24c34257dbb5a3a689bd0a SHA512 1377875abc3cdb66f5dd78fda1e44b93fb8a1f1c39f17757d7289a2c13464071731116ed1e4450b7c371f7682407575986fe73c8e0d9e3d0352b29a7e4098511
 EBUILD rspamd-1.6.6.ebuild 1947 BLAKE2B a126b72800155611a024b3767643b1e511d70a4cee87727d35292500b6d97cbb538b3dd960efef11d78de270d5804d0e1af20629898a017d635e9fec2bbf6e10 SHA512 62e4cca1df35d0889f06667cc2cb4498d818d555fea5a71a0cd924acc25eec25bf1e292a56f448b0339dbacd39f790502da239d8bb61c9500d58ac5c2a2d4118
 EBUILD rspamd-1.7.1.ebuild 1868 BLAKE2B b96b526ad711af5be848b9fe6ae541aec4fd05ff6b49ddaa6e39a7f5c6d208b2a48f3f650371bd4bff86d88a11e8eaedded27e903677d4d7445953b8138daab2 SHA512 9169fdab9007c470f68d4e9f227a6769dbdbad9e51bb3f8c5fb3ceb220cbc97fc65bfb6df27e45276816da7f10793f6c87c9f41df1c27fe8bd2b3d3d016fb46e
+EBUILD rspamd-1.7.2.ebuild 1975 BLAKE2B 8ed2fa843435751c54b1e3bcc1701e3915b39d2967403fd74374cce8b20c26e4334239dda05041967d8fc266f1e7e76270d4cca28dc3cfa7f45f7bb990cd2e3d SHA512 da8518a050e62b815c7c2742ccfdfedd431299d6906bc840cc6cecb0fd05e51620475da63929eca5208ffd3d87eb3e36afd6d315619703059ef50f3f19170207
 EBUILD rspamd-9999.ebuild 1745 BLAKE2B e433d8893ada66ed50bdf80d31183b3388866b253882f8b69906f54e353de9ffa2b2002e3f66ddbdda6dd7c6a3d48b681f10ff3c1df6fc9bade60ffdb1e12de1 SHA512 73fa228a4f998effbb7f2505e34f4b35d766dccb5335e5d8e76f6f01c6123e68f17fad5767e8d17336328939b1cdb2d9f4f11f76be006d5d0c444b2d082d8e3d
-MISC metadata.xml 784 BLAKE2B b77158a9fb5441a146ee2ec0f1e668b8c4f95be8564f682da7142ded0d0eb5586ed0bba876924b640d551a693112d7616a70943ad08ec3b3ecf93589e507d7b9 SHA512 4aac214308201e0dda086c3871dba3eafefe2f110e5fd19f0dba8af2ff5e58d93e771c74981ed880f9057573679cf00f8d1276aa215d2ef3c9282bdedc409991
+MISC metadata.xml 902 BLAKE2B d9ce7297512dc46ff90feff6f88f7ceca5baff636a82e1ee054d6ebc439da695efbbe17c67c8460dcf3f520c6223a47a58c163c1a14dd5a44ab7d9a867b1e663 SHA512 b2ed143212785088f9c2bf39c1110699e9f8fc7f77908a73f1616645315f94574515a8c616467398178ac87f5bbac96b766cec7c15f341e5b7a1ba6c8b9cf8c3
diff --git a/mail-filter/rspamd/files/rspamd.logrotate b/mail-filter/rspamd/files/rspamd.logrotate
index dca9cfadf662..81400efc8914 100644
--- a/mail-filter/rspamd/files/rspamd.logrotate
+++ b/mail-filter/rspamd/files/rspamd.logrotate
@@ -1,4 +1,4 @@
-/var/log/rspamd/rspamd.log{
+/var/log/rspamd/rspamd.log {
        daily
        rotate 4
        delaycompress
@@ -6,7 +6,7 @@
        notifempty
        missingok
        postrotate
-          service rspamd reopenlog >/dev/null 2>&1 || true
+	  test -r /run/rspamd/rspamd.pid && kill -USR1 $(cat /run/rspamd/rspamd.pid) &>/dev/null
        endscript
 }
 
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index 458ce07c1fe4..2f0df70fd3a4 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>c@roessner.co</email>
-		<name>Christian Roessner</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>djc@gentoo.org</email>
-		<name>Dirkjan Ochtman</name>
-	</maintainer>
-	<upstream>
-		<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="jemalloc">Use dev-libs/jemalloc for allocations</flag>
-		<flag name="pcre2">Use dev-libs/libpcre2</flag>
-	</use>
+  <maintainer type="person">
+    <email>cr@sys4.de</email>
+    <name>Christian Roessner</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>djc@gentoo.org</email>
+    <name>Dirkjan Ochtman</name>
+  </maintainer>
+  <upstream>
+    <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="jemalloc">Use dev-libs/jemalloc for allocations</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.7.2.ebuild b/mail-filter/rspamd/rspamd-1.7.2.ebuild
new file mode 100644
index 000000000000..8c2de174e29c
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.7.2.ebuild
@@ -0,0 +1,78 @@
+# 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 +torch"
+REQUIRED_USE="torch? ( jit )"
+
+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/.*"
+
+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_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
+	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
+}