From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-921967-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 EF88C139086
for <garchives@archives.gentoo.org>; Sun, 8 Jan 2017 08:37:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 00CC6E0CA5;
Sun, 8 Jan 2017 08:37:15 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C0A57E0CA5
for <gentoo-commits@lists.gentoo.org>; Sun, 8 Jan 2017 08:37:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5BF1D341134
for <gentoo-commits@lists.gentoo.org>; Sun, 8 Jan 2017 08:37:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C459E261C
for <gentoo-commits@lists.gentoo.org>; Sun, 8 Jan 2017 08:37:11 +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: <1483864551.46c0780bef4f21a9683afce5cfba8ac7f66fdde1.djc@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: mail-filter/rspamd/metadata.xml mail-filter/rspamd/rspamd-1.4.2.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: 46c0780bef4f21a9683afce5cfba8ac7f66fdde1
X-VCS-Branch: master
Date: Sun, 8 Jan 2017 08:37:11 +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: f0b60542-fdd1-4f42-8c5a-281c3d8a96f1
X-Archives-Hash: e653063376ef07494be09495791d62b8
commit: 46c0780bef4f21a9683afce5cfba8ac7f66fdde1
Author: Christian Roessner <c <AT> roessner-network-solutions <DOT> com>
AuthorDate: Thu Jan 5 17:54:33 2017 +0000
Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 08:35:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46c0780b
mail-filter/rspamd: Adding and removing use flags and deps
Bump to 1.4.1-r2. Merging new USE flags from live ebuild and adding PAX
Live-ebuild. Adding pcre2 and jemalloc USE flags. Dropping gmime support
mail-filter/rspamd/metadata.xml | 2 +
.../{rspamd-9999.ebuild => rspamd-1.4.2.ebuild} | 57 ++++++++++++----------
mail-filter/rspamd/rspamd-9999.ebuild | 26 ++++++----
3 files changed, 51 insertions(+), 34 deletions(-)
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index aee0fd2..b628e7d 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -10,5 +10,7 @@
</upstream>
<use>
<flag name="fann">Enable neural network plugin (requires <pkg>sci-mathematics/fann</pkg>).</flag>
+ <flag name="pcre2">Use dev-libs/libpcre2</flag>
+ <flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
</use>
</pkgmetadata>
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-1.4.2.ebuild
similarity index 55%
copy from mail-filter/rspamd/rspamd-9999.ebuild
copy to mail-filter/rspamd/rspamd-1.4.2.ebuild
index 2721f10..9d67152 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-1.4.2.ebuild
@@ -4,38 +4,39 @@
EAPI=5
-inherit cmake-utils user systemd git-r3
+inherit cmake-utils pax-utils user systemd
DESCRIPTION="Rapid spam filtering system"
+SRC_URI="https://rspamd.com/downloads/${P}.tar.xz"
HOMEPAGE="https://github.com/vstakhov/rspamd"
-EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS=""
-IUSE="fann +gd +jit libressl"
+KEYWORDS="~amd64 ~x86"
+IUSE="fann jemalloc +jit libressl pcre2"
-RDEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
- libressl? ( dev-libs/libressl:0 )
- fann? ( sci-mathematics/fann )
- jit? (
- dev-libs/libpcre[jit]
- dev-lang/luajit:2
- )
- !jit? (
- dev-libs/libpcre[-jit]
- >=dev-lang/lua-5.1:0
- )
- dev-libs/libevent
- dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/gmime
- dev-util/ragel
- sys-apps/file
- virtual/libiconv
- gd? ( media-libs/gd[jpeg] )"
+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-libs/gmime
+ dev-util/ragel
+ sys-apps/file
+ virtual/libiconv"
DEPEND="dev-util/ragel
- ${RDEPEND}"
+ ${RDEPEND}"
QA_MULTILIB_PATHS="usr/lib/rspamd/.*"
@@ -52,7 +53,8 @@ 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)
)
cmake-utils_src_configure
}
@@ -61,6 +63,11 @@ src_install() {
cmake-utils_src_install
newinitd "${FILESDIR}/rspamd.init-r2" 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
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 2721f10..379939d 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit cmake-utils user systemd git-r3
+inherit cmake-utils user systemd git-r3 pax-utils
DESCRIPTION="Rapid spam filtering system"
HOMEPAGE="https://github.com/vstakhov/rspamd"
@@ -13,23 +13,24 @@ EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS=""
-IUSE="fann +gd +jit libressl"
+IUSE="fann +gd pcre2 +jit jemalloc libressl"
RDEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
libressl? ( dev-libs/libressl:0 )
fann? ( sci-mathematics/fann )
- jit? (
- dev-libs/libpcre[jit]
- dev-lang/luajit:2
+ pcre2? (
+ dev-libs/libpcre2[jit=]
)
- !jit? (
- dev-libs/libpcre[-jit]
- >=dev-lang/lua-5.1:0
+ !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-libs/gmime
dev-util/ragel
sys-apps/file
virtual/libiconv
@@ -53,6 +54,8 @@ src_configure() {
-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)
)
cmake-utils_src_configure
}
@@ -61,6 +64,11 @@ src_install() {
cmake-utils_src_install
newinitd "${FILESDIR}/rspamd.init-r2" 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