Commit Graph

54 Commits

Author SHA1 Message Date
Niclas Zeising f6ddce8f45 mail/spamassassin: Update to 3.4.4
Update mail/spamassassin to 3.4.4.  This fixes several security
vulnderabilities.

Changelog:
- Improvements to OLEVBMacro
- Fix for CRLF handling with SpamAssMilter & DKIM
- Small fix for a regexp to provide Perl 5.8.x compatability again
- Increased fns_extrachars default value to 50
- Fixed nosubject and maxhits tflags when sa-compile is used
- Limited the Bayes parsed token count
- Improvements to whitespace trimming

PR:		243744
Submitted by:	cy
MFH:		2020Q1
Security:	c86bfee3-4441-11ea-8be3-54e1ad3d6335
2020-01-31 16:06:56 +00:00
Cy Schubert 06a396ef70 Update 3.4.2 --> 3.4.3
2019-12-11: Apache SpamAssassin 3.4.3 has been released! Apache
SpamAssassin 3.4.3 contains numerous tweaks and bug fixes as we prepare
to move to version 4.0.0 with better, native UTF-8 handling. There are a
number of functional patches, improvements as well as security reasons to
upgrade to 3.4.3. In this release, there is also one new plugin and there
are bug fixes for two CVEs:

    CVE-2019-12420 for Multipart Denial of Service Vulnerability
    CVE-2018-11805 for nefarious CF files can be configured to run system
                   commands without any output or errors.

PR:		242618
Submitted by:	cy
Reported by:	cy
Approved by:	zeising (maintainer)
MFH:		2019Q4
Security:	CVE-2019-12420, CVE-2018-11805
2019-12-13 20:03:33 +00:00
Cy Schubert 0c97931883 Remove comment to ensure the japanese/spamassassin verion number updated
and in sync. japanese/spamassassin was removed by r488786.

Approved by:	zeising (maintainer, implicit)
MFH:		2019Q4
2019-12-13 20:03:23 +00:00
Mathieu Arnold 558224994b onvert to UCL & cleanup pkg-message (categories l-m) 2019-08-13 22:29:42 +00:00
Larry Rosenman db6a3153d7 mail/spamassassin: missing dependency on net/p5-Net-CIDR-Lite
PR:		234921
Submitted by:	ler@FreeBSD.org
Approved by:	zeising
2019-02-05 18:15:42 +00:00
Niclas Zeising 018ed36728 mail/spamassassin: Revert r484326
Revert r484326, switch to gpg2, silence gpg2 memory warnings.

I have gotten multiple reports of this causing issues when upgrading or
installing.  Revert this until I can look at this in more detail.
2018-11-13 21:11:54 +00:00
Niclas Zeising d9e7af7543 Fix build in japanese/spamassassin
Fix build in japanese/spamassassin.
Fix INDEX

Pointy-hat to:	zeising
2018-11-06 21:46:49 +00:00
Niclas Zeising ee7c3c3c4f mail/spamassassin: switch gpg version, silence gpg
Switch to use gpg2 instead of the old and mostly deprecated gpg as the
default gpg version.

Add a gpg.conf file to silence the warning about using insecure memory with
gpg2 [1].

Bump portrevision

Submitted by:	Larry Rosenman (ler) [1]
2018-11-06 20:46:33 +00:00
Niclas Zeising 5ac5328fbe mail/spamassassin: Update to 3.4.2
Update mail/spamassassin to 3.4.2.  This update includes security fixes.
For complete changelog and upgrade notes, see:
https://mail-archives.apache.org/mod_mbox/spamassassin-announce/201809.mbox/%3cc44ca0f1-cba9-b129-20b2-ba59816cfd13@apache.org%3e

Big thanks to Larry Rosenman (ler) for help with testing!

PR:		231412
Reported by:	dewayne@heuristicsystems.com.au
Tested by:	ler
MFH:		2018Q3
Security:	613193a0-c1b4-11e8-ae2d-54e1ad3d6335
2018-09-26 19:30:36 +00:00
Mathieu Arnold f93e7c0f39 Do not force stop services when a package is deinstalled.
Starting or stopping services is the role of pkg(8).

Sponsored by:	Absolight
2018-06-27 13:55:56 +00:00
Mathieu Arnold c8fb02ae31 Options are already optional.
Sponsored by:	Absolight
2018-01-19 17:04:52 +00:00
Niclas Zeising 2a6ccb2800 Add missing dependency on p5-IP-Country when the nondefault option
RELAY_COUNTRY is enabled [0]

While here, carbage collect the UPDATE_AND_COMPILE option from
OPTIONS_DEFUALT, this was most likely missed in r425590

Don't bump portrevision, since this dependency is nut pulled in by default.

PR:		222649 [0]
Reported by:	Max Kostikov <max@kostikov.co> [0]
2017-10-11 19:56:07 +00:00
Niclas Zeising 60d816f57e Fix runtime on recent perl versions and change default options
Add a patch from upstream to fix runtime when using perl 5.26 or later. [0]
Change default options to include DKIM and SPF checking.
Bump portrevision.

PR:		220474 (based on) [0]
Reported by:	Trond.Endrestol@ximalas.info [0]
2017-08-09 19:30:58 +00:00
Niclas Zeising f877cd263f Grab 2017-05-25 09:56:55 +00:00
Thomas Zander bc79e16f30 Add DOCS OPTION
PR:		217955
Submitted by:	cyberbotx@cyberbotx.com
MFH:		2017Q2
2017-04-01 17:42:28 +00:00
Bartek Rutkowski a11aa7340f mail/spamassassin japanese/spamassassin: add missing run dependencies
PR:		217487
Submitted by:	Igor Roshchin <spamd-pr@str.komkon.org>
MFH:		2017Q1
2017-03-28 18:10:54 +00:00
Adam Weinberger 379dc3a0b1 Drop maintainership from a handful of ports that I no longer use. 2017-01-10 00:09:38 +00:00
Alexey Dokuchaev 3c8a36012b - Remove redundant definitions of IPV6_DESC and [OPEN]SSL_DESC when closely
matching standard ones from `Mk/bsd.options.desc.mk'
- Rename couple of options to standard name or the one that better reflects
  their usage
2016-11-14 03:15:03 +00:00
Adam Weinberger 270ceb1c43 Follow up to r425497. sa-update isn't the problem, it's sa-update in
the plist. Remove the UPDATE_ON_INSTALL option entirely, and just add
a blurb to the pkg-message instructing people to run sa-update and
sa-compile manually.

Thanks to Matthew Fuller for prodding a better solution.
2016-11-07 00:59:19 +00:00
Adam Weinberger fe5a63ec07 For quite a while now, the only update server for SpamAssassin hasn't
had a valid DNS entry. People have asked about it on the mailing list
as far back as August, but literally nobody has replied to any of those
posts, and no commits or wiki updates have been made regarding this,
making it reasonably appear that nobody on the SpamAssassin team has
noticed or cares that SpamAssassin no longer updates.

For now, just add a patch that turns sa-update(1) into a no-op.

While here, add a couple simple Makefile tweaks and bump PORTREVISION.
2016-11-06 15:38:55 +00:00
Adam Weinberger 823c03539d Remove hard dependency on p5-IO-Socket-IP and bump PORTREVISION. 2016-08-02 16:17:19 +00:00
Dmitry Marakasov e87a8bd319 - Fix trailing whitespace in pkg-messages
Approved by:	portmgr blanket
2016-05-19 11:09:14 +00:00
Adam Weinberger bd221c2699 Disable SSLv3 and enable TLSv1.1 and TLSv1.2.
This is a patch make by Debian's own Noah Meyerhans that disables SSLv3,
fixes or removes the tests that choke without SSLv3, and lets
IO::Socket::SSL choose the best TLS level rather than forcing it at
TLSv1.

I can't think of a responsible reason to allow re-enabling it as an
OPTION, so add a note to UPDATING warning people of the change and
referencing the below PR.

PORTREVISION bump.

PR:		208225
Submitted by:	Sascha Holzleiter
Obtained from:	https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7199
MFH:		2016Q2
2016-04-04 17:05:31 +00:00
Mathieu Arnold 8d6597e0bb Remove ${PORTSDIR}/ from dependencies, categories m, n, o, and p.
With hat:	portmgr
Sponsored by:	Absolight
2016-04-01 14:16:16 +00:00
Adam Weinberger b4a3b2f221 Add two patches from upstream bug #7265, which fixes incompatibilities with
Net::DNS 1.03. The FreeBSD p5-Net-DNS port has been downgraded to 1.02 but
Net::DNS will be re-issued at some point soon. The changes in these patches
seem to work well with Net::DNS 1.02.

While here, add some TEST_DEPENDS so I can run the plugin-based tests as well.

Bump PORTREVISION for spamassassin and japanese/spamassassin.

PR:		204682
Submitted by:	Mark.Martinec@ijs.si
Obtained from:	https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7265
2015-11-23 17:00:18 +00:00
Adam Weinberger 0f633ebc83 Add upstream r1684653 from bug #7208, which fixes warnings stemming from
calling each/keys on a hashref.

While here, convert @unexec stuff into preunexec and postunexec.
Submitted by:	Larry Rosenman
Obtained from:	https://svn.apache.org/viewvc?view=revision&revision=1684653
2015-10-03 18:20:59 +00:00
Mathieu Arnold afae652a2a Make it so that the default Perl is always called perl5.
- Move Perl's man1 files along with its man3 files.
- Move where Perl installs its modules man1 pages.
- Convert the ports installing man1 pages.
- Make different Perl versions installable at the same time.
  Though you should note that only the default version can be used to
  install Perl modules, and the non default Perl versions cannot use the
  modules installed via ports if they contain .so as they are installed
  in a version specific directory.

Reviewed by:	bapt (the Mk bits)
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3542
2015-09-14 12:19:48 +00:00
Adam Weinberger 9a8a02b39c Add a patch for SpamAssassin bug #7231 that resolves an incompatibility
with the output of the new Net::DNS version.

See https://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?r1=1694126&r2=1694125&pathrev=1694126&view=patch
for more information.

PR:		202281
Submitted by:	Mark Martinec, author of the upstream patch
2015-08-15 16:25:10 +00:00
Kurt Jaeger e918a42233 mail/spamassassin, japanese/spamassassin: fix bug with dns/p5-Net-DNS change
Now that a port dns/p5-Net-DNS has been upgraded to version 1.01,
this revealed an incompatibility with DNS resolving in SpamAssassin.

In short: Net::DNS::Packet->new no longer sets the RD (recursion
desired) bit in new packets, so essentially DNS queries no longer
work. Details at:
  https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7223

To bridge the time until SpamAssassin 3.4.2 gets released,
the attached patch is needed ( equivalent to
  https://svn.apache.org/viewvc?view=rev&rev=1691992 ).

For earlier version of dns/p5-Net-DNS this patch is redundant,
but does no harm.

PR:		201741
Submitted by:	Mark.Martinec@ijs.si
2015-07-21 12:56:52 +00:00
Mathieu Arnold 60d1a83c2a MASTER_SITES cleanup.
- Replace ${MASTER_SITE_FOO} with FOO.
- Merge MASTER_SITE_SUBDIR into MASTER_SITES when possible. (This means 99.9%
  of the time.)
- Remove occurrences of MASTER_SITE_LOCAL when no subdirectory was present and
  no hint of what it should be was present.
- Fix some logic.
- And generally, make things more simple and easy to understand.

While there, add magic values to the FESTIVAL, GENTOO, GIMP, GNUPG, QT and
SAMBA macros.

Also, replace some EXTRACT_SUFX occurences with USES=tar:*.

Checked by:	make fetch-urlall-list
With hat:	portmgr
Sponsored by:	Absolight
2015-05-14 10:15:04 +00:00
Adam Weinberger 503ccb2913 Correct botched group name in plist. PORTREVISION bump for plist change.
Submitted by:	Terry Kennedy
2015-04-30 02:58:43 +00:00
Adam Weinberger b8bf78dc10 Update spamassassin to 3.4.1.
Changes:
  * improved automation to help combat spammers that are abusing new top level
    domains;
  * tweaks to the SPF support to block more spoofed emails;
  * increased character set normalization to make rules easier to develop and
    stop spammers from using alternate character sets to bypass tests;
  * continued refinement to the native IPv6 support; and
  * improved Bayesian classification with better debugging and attachment
    hashing.

Full ChangeLog at https://metacpan.org/changes/distribution/Mail-SpamAssassin

The japanese/spamassassin port is broken until it's updated for 3.4.1.
2015-04-29 18:46:29 +00:00
Adam Weinberger e8c53e8c72 Allow depending on gpg2 instead of gpg1.
Inspired by:
PR:		197837
Submitted by:	bogus19@veggiechinese.net
2015-03-13 17:52:46 +00:00
John Marino 691102663f mail/spamassassin: Revert command_interpreter fix for now
There is a report that defining command_interpreter actually causes
problem for spamd, athought it should not.  While the reason is being
investigated, the previous change has been reverted per maintainer's
request.

PR	196517
2015-01-06 01:05:46 +00:00
John Marino 1f0d326644 mail/spamassassin: Add perl command_interpret to rc script
spamd is a perl script, so defining command_interpreter is required
for proper rc.d functioning.
2015-01-05 12:35:08 +00:00
Adam Weinberger f606422711 Add a patch from SA bug #7107, to quiet warnings due to bad usage of $^V
that show up during sa-learn, sa-compile, etc.

Note that other warnings can still show up, ex.:
zoom: rule __FOR_SALE_PRC_100K will loop on SpamAssassin older than 3.3.2 running under Perl 5.12 or older, Bug 6558

While here, go with the @dir new world order. SA is not poudriere clean at this time;
/var/spool/spamd is the homedir of user spamd, so I am pretty sure it shouldn't be
listed with @dir. QA sees this as a leftover dir.

PR:		195524
Submitted by:	Bernard Spil
2014-11-30 21:26:35 +00:00
Mathieu Arnold eee58d187e Change the way Perl modules are installed, update the default Perl to 5.18.
Before, we had:

  site_perl :           lib/perl5/site_perl/5.18
  site_perl/perl_arch : lib/perl5/site_perl/5.18/mach
  perl_man3 :           lib/perl5/5.18/man/man3

Now we have:

  site_perl : lib/perl5/site_perl
  site_arch : lib/perl5/site_perl/mach/5.18
  perl_man3 : lib/perl5/site_perl/man/man3

Modules without any .so will be installed at the same place regardless of the
Perl version, minimizing the upgrade when the major Perl version is changed.
It uses a version dependent directory for modules with compiled bits.

As PERL_ARCH is no longer needed in plists, it has been removed from
PLIST_SUB.

The USE_PERL5=fixpacklist keyword is removed, the .packlist file is now
always removed, as is perllocal.pod.

The old site_perl and site_perl/arch directories have been kept in the
default Perl @INC for all Perl ports, and will be phased out as these old
Perl versions expire.

PR:		194969
Differential Revision:	https://reviews.freebsd.org/D1019
Exp-run by:	antoine
Reviewed by:	perl@
Approved by:	portmgr
2014-11-26 13:08:24 +00:00
Mathieu Arnold fbadef7cc0 Add back mail/dcc-dccd
- Update to 1.3.155.
- Stage.
- Build as a user.
- Add the option back to spamassassin.

Sponsored by:	Absolight
2014-09-11 13:34:39 +00:00
Antoine Brodin 20636be0c0 Remove optional dependency on unstaged mail/dcc-dccd 2014-09-07 08:38:53 +00:00
Adam Weinberger 65d8f20e32 Add CPE data to my ports. 2014-08-10 14:47:12 +00:00
Adam Weinberger a9fd4e02ea Point users toward mail/spamass-rules if they want some extra
spam/malware-catching rulesets.
2014-07-18 01:22:28 +00:00
Adam Weinberger e7755bff5b Create /var/run/spamd manually in the rc(8) script, as pkg_tools does
not create the directory from the @dirrm /var/run/spamd in the plist.

So, we'll do it manually for the next 6 weeks.

PR:		190005
Submitted by:	Trond.Endrestol@ximalas.info
2014-07-13 17:55:41 +00:00
Adam Weinberger 0c4552bbca Add a patch to fix the DBM bayes store, which failed due to a tainted
variable in a debug message.

Submitted by:	Herbert J. Skuhra
2014-07-06 12:45:33 +00:00
Adam Weinberger 8e4b85da5b Improve OPTIONS descriptions, based on eadler's recent modifications
to bsd.options.desc.mk.
2014-07-04 21:03:10 +00:00
Adam Weinberger 0a91dea754 Don't activate code that requires pre-compiled rules if the
UPDATE_AND_COMPILE option is off. It can still be activated
later for people who do it themselves.

Submitted by:	Herbert J. Skuhra
2014-07-01 21:04:19 +00:00
Adam Weinberger 8c6663bfce * Add a patch from SA bug 7057 to fix compatibility with Net::DNS >= 0.76 [1]
* Verify that /var/run/spamd exists before starting [2]
* While here, reformat Makefile

PR:	ports/191101 [1], ports/189912 [1], ports/190005 [2]
Submitted by:	Daniel Austin <freebsd-ports@dan.me.uk> and pi [1a],
		brian@behlendorf.com [1b], Trond.Endrestol@ximalas.info [2]
2014-06-20 18:28:41 +00:00
Adam Weinberger e432a01d92 Improvements.
Let pkg-create handle ownership/mode better. Use @dirrmtry instead of
@unexec rmdir. Use COPYTREE_SHARE to ensure proper permissions.

Also, stop the spamd service on deinstall if it's running. It creates
zombie issues otherwise... I'm pretty sure this is the right thing to
do.
2014-05-01 17:01:18 +00:00
Adam Weinberger a4a4b37976 Add a patch fix bug #7018, a typo that caused the Razor
plugin to error out.

Thanks to DutchDaemon for the legwork here.
2014-04-02 19:46:27 +00:00
Adam Weinberger 3efc22c772 Partially revert r348415. There are many good scenarios where
preventing user-config file creation is a good thing. Recommend
one of those scenarios in the rc.d description.

PR:		ports/187659
Submitted by:	Lawrence "The Dreamer" Chen <beastie@tardisi.com>
2014-04-01 14:06:57 +00:00
Adam Weinberger 28631cab32 Fix order of spamd args.
Noticed by:	ume
2014-03-16 16:46:25 +00:00