From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 59861138335 for ; Sat, 14 Dec 2019 08:42:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88F30E089A; Sat, 14 Dec 2019 08:42:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1D2C5E089B for ; Sat, 14 Dec 2019 08:42:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 2077C34D894 for ; Sat, 14 Dec 2019 08:42:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF8D1903 for ; Sat, 14 Dec 2019 08:41:58 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1576312897.3082d47d25fdb359e720effd81a1ba6c408d9920.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/rspamd/Manifest mail-filter/rspamd/files/rspamd-r6.init mail-filter/rspamd/metadata.xml mail-filter/rspamd/rspamd-1.8.3.ebuild mail-filter/rspamd/rspamd-1.9.0.ebuild mail-filter/rspamd/rspamd-1.9.4.ebuild X-VCS-Directories: mail-filter/rspamd/files/ mail-filter/rspamd/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 3082d47d25fdb359e720effd81a1ba6c408d9920 X-VCS-Branch: master Date: Sat, 14 Dec 2019 08:41:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c6c66318-00e1-4b86-bc89-e184b70150df X-Archives-Hash: 2c38487d365f71647a9e5f924dc4368c commit: 3082d47d25fdb359e720effd81a1ba6c408d9920 Author: Petr Vaněk atlas cz> AuthorDate: Fri Dec 6 15:04:38 2019 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sat Dec 14 08:41:37 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3082d47d mail-filter/rspamd: clean old versions Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> mail-filter/rspamd/Manifest | 3 - mail-filter/rspamd/files/rspamd-r6.init | 55 ------------------ mail-filter/rspamd/metadata.xml | 2 - mail-filter/rspamd/rspamd-1.8.3.ebuild | 98 --------------------------------- mail-filter/rspamd/rspamd-1.9.0.ebuild | 96 -------------------------------- mail-filter/rspamd/rspamd-1.9.4.ebuild | 89 ------------------------------ 6 files changed, 343 deletions(-) diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index e822eb9baa8..879828213cd 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,5 +1,2 @@ -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 DIST rspamd-2.1.tar.gz 4232297 BLAKE2B 4685fa404e5a66d2295da57ece8ce1830507b3464c5136952dbb85847a5002c9c45c4f5430d0d60bc199f3aeafde7abf3ac218451f1609b81a5edfd4d0394588 SHA512 7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f DIST rspamd-2.2.tar.gz 4257574 BLAKE2B 3717736ecefea49cfc9e8bf312bdeafa8650dfe1b0a4410d98693add30c77cb054c7620ecc421edd69a2d8bfc1bcb02183951069b15774a588359da8bfb26ac9 SHA512 e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe diff --git a/mail-filter/rspamd/files/rspamd-r6.init b/mail-filter/rspamd/files/rspamd-r6.init deleted file mode 100644 index 8c31fd7d027..00000000000 --- a/mail-filter/rspamd/files/rspamd-r6.init +++ /dev/null @@ -1,55 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2015-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -RSPAMD_CONFIGFILE=${RSPAMD_CONFIGFILE:-"/etc/rspamd/rspamd.conf"} -RSPAMD_GROUP=${RSPAMD_GROUP:-rspamd} -RSPAMD_OPTS=${RSPAMD_OPTS:-""} -RSPAMD_PIDFILE=${RSPAMD_PIDFILE:-"/run/rspamd.pid"} -RSPAMD_USER=${RSPAMD_USER:-rspamd} - -command="/usr/bin/rspamd" -command_args="${RSPAMD_OPTS} -c \"${RSPAMD_CONFIGFILE}\" -u ${RSPAMD_USER} -g ${RSPAMD_GROUP} --pid \"${RSPAMD_PIDFILE}\"" -start_stop_daemon_args=${RSPAMD_SSDARGS:-"--wait 1000"} -pidfile="${RSPAMD_PIDFILE}" -retry=${RSPAMD_TERMTIMEOUT:-"TERM/60/KILL/5"} - -required_files="${RSPAMD_CONFIGFILE}" - -description="Rapid spam filtering system" - -extra_commands="checkconfig" -extra_started_commands="reload" - -description_checkconfig="Validate rspamd's configuration" -description_reload="Sends rspamd a signal to reload its configuration" - -depend() { - before mta - use dns redis -} - -checkconfig() { - ${command} -c "${RSPAMD_CONFIGFILE}" -u ${RSPAMD_USER} -g ${RSPAMD_GROUP} -t 1>/dev/null \ - || return 1 -} - -reload() { - checkconfig || return 1 - - ebegin "Reloading ${SVCNAME}" - start-stop-daemon --signal HUP --pidfile "${pidfile}" - eend $? -} - -start_pre() { - if [ "${RC_CMD}" != "restart" ]; then - checkconfig || return 1 - fi -} - -stop_pre() { - if [ "${RC_CMD}" = "restart" ]; then - checkconfig || return 1 - fi -} diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index 2b4ad4e2b87..140755872e0 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -17,8 +17,6 @@ vstakhov/rspamd - Enable neural network plugin (requires sci-mathematics/fann). Use dev-libs/libpcre2 - Enable torch support. This is required for the neural module diff --git a/mail-filter/rspamd/rspamd-1.8.3.ebuild b/mail-filter/rspamd/rspamd-1.8.3.ebuild deleted file mode 100644 index 64cb537424f..00000000000 --- a/mail-filter/rspamd/rspamd-1.8.3.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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 fann 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 ) - fann? ( sci-mathematics/fann ) - 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=/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_test() { - cmake-utils_src_test -} - -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" -} diff --git a/mail-filter/rspamd/rspamd-1.9.0.ebuild b/mail-filter/rspamd/rspamd-1.9.0.ebuild deleted file mode 100644 index 2000be8f549..00000000000 --- a/mail-filter/rspamd/rspamd-1.9.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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=/etc/rspamd - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/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_test() { - cmake-utils_src_test -} - -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" -} diff --git a/mail-filter/rspamd/rspamd-1.9.4.ebuild b/mail-filter/rspamd/rspamd-1.9.4.ebuild deleted file mode 100644 index 47cfb7f44f9..00000000000 --- a/mail-filter/rspamd/rspamd-1.9.4.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# 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" -}