commit: 83296c79ee741ed5b5814c4947f99ba98789c4a4 Author: Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift <DOT> com> AuthorDate: Sat May 11 18:21:35 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Tue Jun 11 06:01:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83296c79
mail-filter/spamassassin: Address VariableScope warnings - Removed 4.0.0-r3 because it's moot now that -r4 is stable - Bumped revs instead of fixing in place because all existing ebuilds have the VariableScope warning. If I fixed them in place, users would have no easy way to fallback if an issue is found. - Plan is to remove the pre-existing revs once these new revs have been stabilized. - I also re-ordered some ebuild variables in 3.4.6-r3 to avoid ordering warnings. - Note: git's wrong about the -r3 -> -r5 rename. Bug: https://bugs.gentoo.org/836067 Closes: https://github.com/gentoo/gentoo/pull/36644 Signed-off-by: Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> ....0.0-r3.ebuild => spamassassin-3.4.6-r3.ebuild} | 43 ++++++---------------- ....0.0-r3.ebuild => spamassassin-4.0.0-r5.ebuild} | 4 +- ....0.0-r3.ebuild => spamassassin-4.0.1-r1.ebuild} | 7 +--- 3 files changed, 16 insertions(+), 38 deletions(-) diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.6-r3.ebuild similarity index 88% copy from mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild copy to mail-filter/spamassassin/spamassassin-3.4.6-r3.ebuild index 089338322055..776c9cacec94 100644 --- a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.4.6-r3.ebuild @@ -1,23 +1,19 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI=7 -inherit perl-functions systemd toolchain-funcs verify-sig autotools +inherit perl-functions systemd toolchain-funcs MY_P="Mail-SpamAssassin-${PV//_/-}" 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 - verify-sig? ( - https://downloads.apache.org/spamassassin/source/${MY_P}.tar.bz2.asc - ) -" +SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test" RESTRICT="!test? ( test )" @@ -30,7 +26,10 @@ REQDEPEND="acct-user/spamd 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? ( dev-libs/openssl:0= )" @@ -44,18 +43,15 @@ REQDEPEND="acct-user/spamd # We still need the old Digest-SHA1 because razor2 has not been ported # to Digest-SHA. OPTDEPEND="app-crypt/gnupg - dev-perl/Archive-Zip dev-perl/BSD-Resource dev-perl/Digest-SHA1 - dev-perl/Email-Address-XS dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) - dev-perl/IO-String + dev-perl/HTTP-Date dev-perl/Mail-DKIM - dev-perl/Mail-DMARC dev-perl/Mail-SPF dev-perl/Net-Patricia - dev-perl/Net-LibIDN2 + dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 @@ -83,20 +79,13 @@ DEPEND="${REQDEPEND} virtual/perl-Test-Harness )" RDEPEND="${REQDEPEND} ${OPTDEPEND}" -BDEPEND="${RDEPEND} - verify-sig? ( sec-keys/openpgp-keys-spamassassin )" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/spamassassin.apache.org.asc PATCHES=( "${FILESDIR}/mention-geoip.cf-in-init.pre.patch" - "${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch" - "${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch" - "${FILESDIR}/4.0.0-tests-strip2.t.patch" - "${FILESDIR}/4.0.0-DnsResolver-udpsize.patch" + "${FILESDIR}/3.4.6-configure-clang16.patch" ) -# There are a few renames and use-dependent ones in src_install as well. +# There are a few renames and use-dependent ones in src_istall as well. DOCS=( NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt @@ -148,17 +137,9 @@ src_configure() { 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. - - # Run autoreconf to avoid some issues caused by a standard test in the - # current autoconf. Expected to be fixed in next autoconf release, so - # these next 3 lines might not be needed for long. See bug #899782. - pushd spamc >/dev/null - eautoreconf - popd >/dev/null emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile } @@ -201,7 +182,7 @@ src_install () { newdoc ldap/README README.ldap insinto /etc/mail/spamassassin/ - newins "${FILESDIR}"/geoip-4.0.0.cf geoip.cf + doins "${FILESDIR}"/geoip.cf insopts -m0400 newins "${FILESDIR}"/secrets.cf secrets.cf.example diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild similarity index 98% copy from mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild copy to mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild index 089338322055..e902918357ae 100644 --- a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild +++ b/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test" RESTRICT="!test? ( test )" @@ -94,6 +94,7 @@ PATCHES=( "${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch" "${FILESDIR}/4.0.0-tests-strip2.t.patch" "${FILESDIR}/4.0.0-DnsResolver-udpsize.patch" + "${FILESDIR}/4.0.0-sa-update-rdatastr.patch" ) # There are a few renames and use-dependent ones in src_install as well. @@ -148,7 +149,6 @@ src_configure() { 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. diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild b/mail-filter/spamassassin/spamassassin-4.0.1-r1.ebuild similarity index 97% rename from mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild rename to mail-filter/spamassassin/spamassassin-4.0.1-r1.ebuild index 089338322055..e17a65394b9e 100644 --- a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild +++ b/mail-filter/spamassassin/spamassassin-4.0.1-r1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test" RESTRICT="!test? ( test )" @@ -91,9 +91,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/spamassassin.apache.org.asc PATCHES=( "${FILESDIR}/mention-geoip.cf-in-init.pre.patch" "${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch" - "${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch" - "${FILESDIR}/4.0.0-tests-strip2.t.patch" - "${FILESDIR}/4.0.0-DnsResolver-udpsize.patch" + "${FILESDIR}/4.0.1-tests-sa_txrep.t-no-dbm.patch" ) # There are a few renames and use-dependent ones in src_install as well. @@ -148,7 +146,6 @@ src_configure() { 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.
