public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Orlitzky" <mjo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/
Date: Sun, 17 Feb 2019 17:50:30 +0000 (UTC)	[thread overview]
Message-ID: <1550425778.1a6eade3eb6f87702d2673cc2751c56a1c5f0f90.mjo@gentoo> (raw)

commit:     1a6eade3eb6f87702d2673cc2751c56a1c5f0f90
Author:     Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift <DOT> com>
AuthorDate: Wed Nov 21 19:30:15 2018 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 17:49:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a6eade3

mail-filter/spamassassin: Add BSD-Resource as a dependency

dev-perl/BSD-Resource is needed by the ResourceLimits plugin.

Closes: https://bugs.gentoo.org/670988
Closes: https://github.com/gentoo/gentoo/pull/10460
Signed-off-by: Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../spamassassin/spamassassin-3.4.2-r4.ebuild      | 284 +++++++++++++++++++++
 1 file changed, 284 insertions(+)

diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r4.ebuild
new file mode 100644
index 00000000000..46de7f1fb3f
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r4.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-functions systemd toolchain-funcs user eapi7-ver
+
+MY_P="Mail-SpamAssassin-${PV//_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="An extensible mail filter which can identify and tag spam"
+HOMEPAGE="https://spamassassin.apache.org/"
+SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
+
+# The Makefile.PL script checks for dependencies, but only fails if a
+# required (i.e. not optional) dependency is missing. We therefore
+# require most of the optional modules only at runtime.
+REQDEPEND="dev-lang/perl:=
+	dev-perl/HTML-Parser
+	dev-perl/Net-DNS
+	dev-perl/NetAddr-IP
+	virtual/perl-Archive-Tar
+	virtual/perl-Digest-SHA
+	virtual/perl-IO-Zlib
+	virtual/perl-Time-HiRes
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)"
+
+# SpamAssassin doesn't use libwww-perl except as a fallback for when
+# curl/wget are missing, so we depend on one of those instead. Some
+# mirrors use https, so we need those utilities to support SSL.
+#
+# re2c is needed to compile the rules (sa-compile).
+#
+# We still need the old Digest-SHA1 because razor2 has not been ported
+# to Digest-SHA.
+OPTDEPEND="app-crypt/gnupg
+	dev-perl/BSD-Resource
+	dev-perl/Digest-SHA1
+	dev-perl/Encode-Detect
+	dev-perl/Geo-IP
+	dev-perl/HTTP-Date
+	dev-perl/Mail-DKIM
+	dev-perl/Mail-SPF
+	dev-perl/Net-Patricia
+	dev-perl/Net-CIDR-Lite
+	dev-util/re2c
+	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
+	virtual/perl-MIME-Base64
+	virtual/perl-Pod-Parser
+	berkdb? ( virtual/perl-DB_File )
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	ldap? ( dev-perl/perl-ldap )
+	mysql? (
+		dev-perl/DBI
+		dev-perl/DBD-mysql
+	)
+	postgres? (
+		dev-perl/DBI
+		dev-perl/DBD-Pg
+	)
+	sqlite? (
+		dev-perl/DBI
+		dev-perl/DBD-SQLite
+	)
+	ssl? ( dev-perl/IO-Socket-SSL )"
+
+DEPEND="${REQDEPEND}
+	test? (
+		${OPTDEPEND}
+		virtual/perl-Test-Harness
+	)"
+RDEPEND="${REQDEPEND} ${OPTDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/spamassassin-3.4.2-bug_7631.patch"
+	"${FILESDIR}/spamassassin-3.4.2-bug_7632.patch"
+)
+
+src_prepare() {
+	default
+
+	# The sa_compile test does some weird stuff like hopping around in
+	# the directory tree and calling "make" to create a dist tarball
+	# from ${S}. It fails, and is more trouble than it's worth...
+	perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
+
+	# The spamc tests (which need the networked spamd daemon) fail for
+	# irrelevant reasons. It's too hard to disable them (unlike the
+	# spamd tests themselves -- see src_test), so use a crude
+	# workaround.
+	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
+
+	# Upstream bug 7622: this thing needs network access but doesn't
+	# respect the 'run_net_tests' setting.
+	perl_rm_files t/urilocalbl_geoip.t \
+		|| die 'failed to remove urilocalbl_geoip tests'
+}
+
+src_configure() {
+	# This is how and where the perl-module eclass disables the
+	# MakeMaker interactive prompt.
+	export PERL_MM_USE_DEFAULT=1
+
+	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
+	# (just to be sure, nobody knows how it could happen in the first place).
+	#
+	# We also set the path to the perl executable explictly. This will be
+	# used to create the initial shebang line in the scripts (bug 62276).
+	perl Makefile.PL \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRS=vendor \
+		SYSCONFDIR="${EPREFIX}/etc" \
+		DATADIR="${EPREFIX}/usr/share/spamassassin" \
+		PERL_BIN="${EPREFIX}/usr/bin/perl" \
+		ENABLE_SSL="$(usex ssl)" \
+		DESTDIR="${D}" \
+		|| die 'failed to create a Makefile using Makefile.PL'
+
+	# Now configure spamc.
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
+}
+
+src_compile() {
+	emake
+	use qmail && emake spamc/qmail-spamc
+}
+
+src_install () {
+	emake install
+	einstalldocs
+
+	# Create the stub dir used by sa-update and friends
+	keepdir /var/lib/spamassassin
+
+	# Move spamd to sbin where it belongs.
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
+
+	if use qmail; then
+		dobin spamc/qmail-spamc
+	fi
+
+	dosym mail/spamassassin /etc/spamassassin
+
+	# Disable plugin by default
+	sed -i -e 's/^loadplugin/\#loadplugin/g' \
+		"${ED}/etc/mail/spamassassin/init.pre" \
+		|| die "failed to disable plugins by default"
+
+	# Add the init and config scripts.
+	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
+	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
+							 "${PN}.service"
+
+	use postgres && dodoc sql/*_pg.sql
+	use mysql && dodoc sql/*_mysql.sql
+
+	dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
+		sql/README.awl procmailrc.example sample-nonspam.txt \
+		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
+		spamd-apache2/README.apache
+
+	# Rename some files so that they don't clash with others.
+	newdoc spamd/README README.spamd
+	newdoc sql/README README.sql
+	newdoc ldap/README README.ldap
+
+	if use qmail; then
+		dodoc spamc/README.qmail
+	fi
+
+	insinto /etc/mail/spamassassin/
+	insopts -m0400
+	newins "${FILESDIR}"/secrets.cf secrets.cf.example
+
+	# Create the directory where sa-update stores its GPG key (if you
+	# choose to import one). If this directory does not exist, the
+	# import will fail. This is bug 396307. We expect that the import
+	# will be performed as root, and making the directory accessible
+	# only to root prevents a warning on the command-line.
+	diropts -m0700
+	dodir /etc/mail/spamassassin/sa-update-keys
+
+	if use cron; then
+		# Install the cron job if they want it.
+		exeinto /etc/cron.daily
+		newexe "${FILESDIR}/update-spamassassin-rules.cron" \
+			   update-spamassassin-rules
+	fi
+
+	# Remove perllocal.pod to avoid file collisions (bug #603338).
+	perl_delete_localpod || die "failed to remove perllocal.pod"
+
+	# The perl-module eclass calls three other functions to clean
+	# up in src_install. The first fixes references to ${D} in the
+	# packlist, and is useful to us, too. The other two functions,
+	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
+	# to be needed: there are no empty directories, *.bs files, or
+	# ${D} paths remaining in our installed image.
+	perl_fix_packlist || die "failed to fix paths in packlist"
+}
+
+src_test() {
+	# Trick the test suite into skipping the spamd tests. Setting
+	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
+	# set in SATest.pm.
+	export SPAMD_HOST=disabled
+	default
+}
+
+pkg_preinst() {
+	# The spamd daemon runs as this user. Use a real home directory so
+	# that it can hold SA configuration.
+	enewuser spamd -1 -1 /home/spamd
+
+	if use mysql || use postgres ; then
+		local _awlwarn=0
+		local _v
+		for _v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${_v}" -gt "3.4.2-r3"; then
+				_awlwarn=1
+			fi
+		done
+		if [[ ${_awlwarn} == 1 ]] ; then
+			ewarn 'If you used AWL before 3.4.2, the SQL schema has changed.'
+			ewarn 'You will need to manually ALTER your tables for them to'
+			ewarn 'continue working.  See the UPGRADE documentation for'
+			ewarn 'details.'
+			ewarn
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog 'No rules are installed by default. You will need to run sa-update'
+	elog 'at least once, and most likely configure SpamAssassin before it'
+	elog 'will work.'
+
+	if ! use cron; then
+		elog
+		elog 'You should consider a cron job for sa-update. One is provided'
+		elog 'for daily updates if you enable the "cron" USE flag.'
+	fi
+	elog
+	elog 'Configuration and update help can be found on the wiki:'
+	elog
+	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
+	elog
+
+	if use mysql || use postgres ; then
+		local _v
+		for _v in ${REPLACING_VERSIONS}; do
+			if ver_test "${_v}" -lt "3.4.2-r3"; then
+				ewarn
+				ewarn 'If you used AWL before 3.4.2, the SQL schema has changed.'
+				ewarn 'You will need to manually ALTER your tables for them to'
+				ewarn 'continue working.  See the UPGRADE documentation for'
+				ewarn 'details.'
+				ewarn
+
+				# show this only once
+				break
+			fi
+		done
+	fi
+
+	ewarn 'If this version of SpamAssassin causes permissions issues'
+	ewarn 'with your user configurations or bayes databases, then you'
+	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
+	ewarn 'configuration file, or remove the --username and --groupname'
+	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
+	ewarn 'configuration file.'
+}


             reply	other threads:[~2019-02-17 17:50 UTC|newest]

Thread overview: 183+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-17 17:50 Michael Orlitzky [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-09 11:39 [gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/ Sam James
2024-08-09  8:50 Jakov Smolić
2024-07-26 14:12 Arthur Zamarin
2024-07-26 14:12 Arthur Zamarin
2024-07-26 14:12 Arthur Zamarin
2024-07-26  7:42 Joonas Niilola
2024-07-26  7:42 Joonas Niilola
2024-07-26  7:42 Joonas Niilola
2024-07-26  7:42 Joonas Niilola
2024-06-11  6:01 Joonas Niilola
2024-05-25  5:05 Arthur Zamarin
2023-08-17  4:50 Sam James
2023-08-03  6:02 Arthur Zamarin
2023-07-27 10:22 WANG Xuerui
2023-07-22 18:36 Sam James
2023-07-22  0:48 Sam James
2023-07-22  0:48 Sam James
2023-07-22  0:48 Sam James
2023-07-22  0:48 Sam James
2023-07-16 18:46 Sam James
2023-07-15  6:08 Sam James
2023-07-11 14:02 Jakov Smolić
2023-06-26 14:42 Sam James
2023-06-25 19:41 Arthur Zamarin
2023-06-25 19:07 Arthur Zamarin
2023-06-25 17:46 Arthur Zamarin
2023-06-25 15:39 Arthur Zamarin
2023-06-25 15:39 Arthur Zamarin
2023-06-15 21:45 Sam James
2023-06-15 10:21 Arthur Zamarin
2023-06-14 16:23 Arthur Zamarin
2023-06-14 16:01 Arthur Zamarin
2023-06-14 15:33 Arthur Zamarin
2023-06-14 15:33 Arthur Zamarin
2023-06-14 15:26 Sam James
2023-06-14 15:11 Sam James
2023-04-03 19:10 Arthur Zamarin
2023-04-03 19:10 Arthur Zamarin
2023-04-03 19:10 Arthur Zamarin
2023-04-01 18:14 Arthur Zamarin
2023-03-20  6:56 Joonas Niilola
2023-03-20  6:56 Joonas Niilola
2023-03-19  3:22 Sam James
2023-03-17 20:44 Arthur Zamarin
2023-02-26 18:21 Arthur Zamarin
2023-02-24 20:02 Arthur Zamarin
2023-02-15 18:38 Matt Turner
2023-01-13 17:01 Arthur Zamarin
2022-12-31 15:53 Arthur Zamarin
2022-12-31 15:53 Arthur Zamarin
2022-12-31 15:51 Arthur Zamarin
2022-12-28 14:58 Jakov Smolić
2022-12-27 10:23 Sam James
2022-12-25 17:29 Arthur Zamarin
2022-12-24  7:03 Sam James
2022-11-19  1:35 Sam James
2022-08-01  8:35 Florian Schmaus
2021-12-31  3:42 Yixun Lan
2021-12-14  9:19 Agostino Sarubbo
2021-12-14  9:19 Agostino Sarubbo
2021-12-13 18:52 Arthur Zamarin
2021-12-13 16:13 Arthur Zamarin
2021-12-13  5:42 Sam James
2021-12-12 17:42 Jakov Smolić
2021-12-12 15:04 Jakov Smolić
2021-07-17 19:37 Andreas K. Hüttel
2021-05-02 18:26 Mikle Kolyada
2021-04-21  0:08 John Helmert III
2021-04-15 18:28 Sergei Trofimovich
2021-04-14 22:07 Sam James
2021-04-14 16:26 Sam James
2021-04-13 16:05 Sam James
2021-04-13 16:05 Sam James
2021-04-13 16:03 Sam James
2021-04-13 15:59 Sam James
2021-04-13 15:59 Sam James
2021-03-24 22:00 Sam James
2021-01-26 17:53 Joonas Niilola
2021-01-26 15:07 Joonas Niilola
2020-12-13 23:23 Sam James
2020-10-04 16:59 Sam James
2020-09-04 10:31 Sergei Trofimovich
2020-09-04  0:23 Sam James
2020-09-04  0:23 Sam James
2020-09-03 14:29 Thomas Deutschmann
2020-08-30  8:18 Joonas Niilola
2020-07-21 20:00 Kent Fredric
2020-06-10 14:25 Joonas Niilola
2020-05-17 11:29 Joonas Niilola
2020-05-11 14:23 Joonas Niilola
2020-03-27 12:01 Lars Wendler
2020-03-14 21:08 Mart Raudsepp
2020-02-27  7:28 Sergei Trofimovich
2020-02-24 14:20 Agostino Sarubbo
2020-02-24 14:19 Agostino Sarubbo
2020-02-24 13:24 Agostino Sarubbo
2020-02-24 12:54 Agostino Sarubbo
2020-02-24 10:51 Agostino Sarubbo
2020-02-24 10:07 Agostino Sarubbo
2020-02-24  9:56 Agostino Sarubbo
2020-02-23 12:18 Mikle Kolyada
2020-02-03  6:38 Joonas Niilola
2020-01-30 13:11 Michael Orlitzky
2020-01-27 12:15 Mikle Kolyada
2020-01-26 11:32 Sergei Trofimovich
2020-01-23 12:18 Agostino Sarubbo
2020-01-23 10:56 Agostino Sarubbo
2020-01-23 10:52 Agostino Sarubbo
2020-01-23 10:40 Agostino Sarubbo
2020-01-23 10:36 Agostino Sarubbo
2020-01-23  9:43 Agostino Sarubbo
2019-12-20 11:47 Michael Orlitzky
2019-04-01 19:33 Andreas Sturmlechner
2019-03-31 18:50 Michael Orlitzky
2019-03-02  5:01 Michael Orlitzky
2018-12-11 10:19 Mikle Kolyada
2018-10-31 17:17 Markus Meier
2018-10-26 20:19 Sergei Trofimovich
2018-10-23 20:36 Sergei Trofimovich
2018-10-20 11:43 Sergei Trofimovich
2018-10-20 11:35 Sergei Trofimovich
2018-10-18 11:45 Tobias Klausmann
2018-10-18 11:31 Thomas Deutschmann
2018-10-18  7:36 Agostino Sarubbo
2018-09-18 18:39 Michael Orlitzky
2018-09-18  2:47 Michael Orlitzky
2018-09-13 19:23 Tobias Klausmann
2018-08-30  4:44 Markus Meier
2018-08-20  3:33 Mikle Kolyada
2018-08-16  0:39 Thomas Deutschmann
2018-08-12 10:01 Sergei Trofimovich
2018-08-11 18:55 Sergei Trofimovich
2018-08-10 19:28 Mikle Kolyada
2018-08-09  0:24 Michael Orlitzky
2018-06-22  9:27 Mikle Kolyada
2018-06-09 19:56 Mikle Kolyada
2018-04-24 16:21 Mikle Kolyada
2018-04-15 20:33 Sergei Trofimovich
2018-04-01 10:00 Tobias Klausmann
2018-03-16 21:52 Lars Wendler
2018-03-13 19:22 Mikle Kolyada
2018-03-11  2:16 Thomas Deutschmann
2018-03-08 23:03 Sergei Trofimovich
2017-12-05 18:48 Michael Orlitzky
2017-11-10  2:18 Michael Orlitzky
2017-11-09 22:21 Sergei Trofimovich
2017-11-08 20:03 Sergei Trofimovich
2017-11-08 12:51 Tobias Klausmann
2017-11-06 11:37 Manuel Rüger
2017-11-05 21:29 Thomas Deutschmann
2017-11-04 20:39 Sergei Trofimovich
2017-11-04 19:20 Sergei Trofimovich
2017-10-29 17:08 Sergei Trofimovich
2017-10-26 17:38 Thomas Deutschmann
2017-10-25 23:40 Manuel Rüger
2017-10-24 21:54 Sergei Trofimovich
2017-10-24 21:45 Sergei Trofimovich
2017-10-24 21:45 Sergei Trofimovich
2017-08-24 18:45 Michael Orlitzky
2017-08-23 12:20 Michael Orlitzky
2017-08-04 20:57 Michael Orlitzky
2017-05-09 14:52 Michael Orlitzky
2017-01-31  3:28 Michael Orlitzky
2017-01-01 14:44 Michael Orlitzky
2017-01-01 12:43 Agostino Sarubbo
2016-12-30 11:12 Agostino Sarubbo
2016-12-30  9:39 Agostino Sarubbo
2016-12-23 20:16 Michael Orlitzky
2016-12-23 20:16 Michael Orlitzky
2016-12-23 20:16 Michael Orlitzky
2016-12-20 20:09 Thomas Deutschmann
2016-12-20 17:31 Tobias Klausmann
2016-10-05 19:00 Markus Meier
2016-10-01 11:50 Jeroen Roovers
2016-09-29  9:09 Tobias Klausmann
2016-09-05 18:10 Michael Orlitzky
2016-09-02 16:02 Michael Orlitzky
2016-06-05 22:37 Michael Orlitzky
2016-06-05 22:37 Michael Orlitzky
2016-06-03 21:38 Michael Orlitzky
2016-04-26 22:27 Austin English
2015-10-03 16:55 Julian Ospald

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1550425778.1a6eade3eb6f87702d2673cc2751c56a1c5f0f90.mjo@gentoo \
    --to=mjo@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox