From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1025717-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 684B3138330
for <garchives@archives.gentoo.org>; Thu, 24 May 2018 10:22:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 79F49E07B2;
Thu, 24 May 2018 10:22:40 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 43225E07B2
for <gentoo-commits@lists.gentoo.org>; Thu, 24 May 2018 10:22:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 265EE335C73
for <gentoo-commits@lists.gentoo.org>; Thu, 24 May 2018 10:22:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E690C29B
for <gentoo-commits@lists.gentoo.org>; Thu, 24 May 2018 10:22:36 +0000 (UTC)
From: "Dirkjan Ochtman" <djc@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Dirkjan Ochtman" <djc@gentoo.org>
Message-ID: <1527157333.0d38aebe1e331c59d548f43983b1d28a48d83929.djc@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: mail-filter/rspamd/Manifest mail-filter/rspamd/rspamd-1.7.5.ebuild mail-filter/rspamd/rspamd-9999.ebuild
X-VCS-Directories: mail-filter/rspamd/
X-VCS-Committer: djc
X-VCS-Committer-Name: Dirkjan Ochtman
X-VCS-Revision: 0d38aebe1e331c59d548f43983b1d28a48d83929
X-VCS-Branch: master
Date: Thu, 24 May 2018 10:22:36 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 79743c08-f1f7-493b-a330-52a355e95baf
X-Archives-Hash: 9cdd793bcad64ac4e72642fd50657017
commit: 0d38aebe1e331c59d548f43983b1d28a48d83929
Author: Christian Roessner <c <AT> roessner-network-solutions <DOT> com>
AuthorDate: Thu May 24 09:13:28 2018 +0000
Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Thu May 24 10:22:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d38aebe
mail-filter/rspamd: version bump to 1.7.5
Modified ebuild to handle life ebuild and stable release
mail-filter/rspamd/Manifest | 1 +
.../{rspamd-9999.ebuild => rspamd-1.7.5.ebuild} | 39 +++++++++++++++-------
mail-filter/rspamd/rspamd-9999.ebuild | 39 +++++++++++++++-------
3 files changed, 55 insertions(+), 24 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 8b5ef369325..382f8c5fe76 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,3 +2,4 @@ DIST rspamd-1.6.5.tar.gz 2484271 BLAKE2B 880e862eecd4a082b87bee2ba8c7b17a475efbf
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
+DIST rspamd-1.7.5.tar.gz 4494681 BLAKE2B 709b589157cb61568ebe78af64bb2363cb7342736e29971f30de1e1a1e9e667402006cb3a34e1d240a32560608ab9ab86838a288707b5043c89c3d9127880f60 SHA512 3e77c99abd47b1d22ccae33c0312b4338253af0ff10825dc2796fc42864142c91324d349677098bcd0c156a9229c04d3ce8a08808b6eb702624c918722e3acc4
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-1.7.5.ebuild
similarity index 65%
copy from mail-filter/rspamd/rspamd-9999.ebuild
copy to mail-filter/rspamd/rspamd-1.7.5.ebuild
index 6c3a653743e..1a20cc22321 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-1.7.5.ebuild
@@ -1,18 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit cmake-utils user systemd git-r3 pax-utils
+if [[ ${PV} == *9999 ]] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+fi
+
+inherit cmake-utils user systemd pax-utils ${SCM}
DESCRIPTION="Rapid spam filtering system"
HOMEPAGE="https://github.com/vstakhov/rspamd"
-EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+
+if [[ ${PV} == *9999 ]] ; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS=""
-IUSE="fann +gd jemalloc +jit libressl pcre2"
+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= )
@@ -24,10 +36,11 @@ RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
dev-libs/libevent
dev-db/sqlite:3
dev-libs/glib:2
- dev-util/ragel
+ <dev-util/ragel-7.0
sys-apps/file
gd? ( media-libs/gd[jpeg] )
- dev-libs/icu"
+ dev-libs/icu
+ cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
DEPEND="dev-util/ragel
${RDEPEND}"
@@ -46,24 +59,26 @@ src_configure() {
-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_GD=$(usex gd 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-r2" rspamd
+ 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
+ keepdir /var/lib/rspamd
+ keepdir /var/log/rspamd
fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 6c3a653743e..1a20cc22321 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -1,18 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit cmake-utils user systemd git-r3 pax-utils
+if [[ ${PV} == *9999 ]] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+fi
+
+inherit cmake-utils user systemd pax-utils ${SCM}
DESCRIPTION="Rapid spam filtering system"
HOMEPAGE="https://github.com/vstakhov/rspamd"
-EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+
+if [[ ${PV} == *9999 ]] ; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS=""
-IUSE="fann +gd jemalloc +jit libressl pcre2"
+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= )
@@ -24,10 +36,11 @@ RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
dev-libs/libevent
dev-db/sqlite:3
dev-libs/glib:2
- dev-util/ragel
+ <dev-util/ragel-7.0
sys-apps/file
gd? ( media-libs/gd[jpeg] )
- dev-libs/icu"
+ dev-libs/icu
+ cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
DEPEND="dev-util/ragel
${RDEPEND}"
@@ -46,24 +59,26 @@ src_configure() {
-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_GD=$(usex gd 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-r2" rspamd
+ 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
+ keepdir /var/lib/rspamd
+ keepdir /var/log/rspamd
fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd