security/amavisd-new: Fix typo in previous commit

Reported by:	otis

security/amavisd-new: rar is available for both i386 and amd64

PR:		280672

security/amavisd-new: service jails readiness + fixes

Rename rc script to comply to the rc scripting recommendations (netchild)
Make script service jail aware (netchild)
Remove amavis-milter.in that should most likely have been removed with
4c8100486c3b ~18 years ago, the script hasn't been part of the package
for a long time (flo)

PR:		280139

databases/p5-DBD-mysql: Fix for MariaDB users

Add a new variable DBD_MYSQL, use that in *_DEPENDS and add mysql to USES
where required. DBD_MYSQL will automatically set the correct DBD dependency.

In cd16748194e2 databases/p5-DBD-mysql was updated to 5.x, in 5.x the
support for MariaDB was removed and only MySQL >= 8.0 is supported.

In the 4.x releases MariaDB is still supported, according to upstream 4.x
will still be supported for a while [1], so use that for now when we detect
that MYSQL_FLAVOUR is set to mariadb. databases/p5-DBD-mysql4 was added in
d95f49cb3b54.

DBD:MariaDB would be another alternative, but migrating to it might need
more analysis than just staying with the 4.x releases of p5-DBD-mysql. This

security/amavisd-new: fix config file installation

Don't use INSTALL_SCRIPT to install config file. Use the more
appropriate INSTALL_DATA.

PR:		277972
Reported by:	mikael

security/amavisd-new: Update to 2.12.3

MFH:		2024Q1
Security:	0a48e552-e470-11ee-99b3-589cfc0f81b0

bsd.sites.mk: Update all ports using USE_GITLAB

Replace GL_COMMIT by GL_TAGNAME in all ports. The new GL_TAGNAME is
backwards-compatible (accepting any commit hash as before), but also
understands an actual tag name. Moving to tag names where appropriate is
left to individual ports' maintainers.

Approved by:		portmgr (tcberner, mentor)
Differential Revision:	https://reviews.freebsd.org/D37077

security/amavisd-new: Use USE_GITLAB

Use USE_GITLAB to follow Porters Handbook more closely and be
consistent with ports tree

PR:		267089
Reviewed by:	flo (maintainer)

Remove WWW entries moved into port Makefiles

Commit b7f05445c00f has added WWW entries to port Makefiles based on
WWW: lines in pkg-descr files.

This commit removes the WWW: lines of moved-over URLs from these
pkg-descr files.

Approved by:		portmgr (tcberner)

Add WWW entries to port Makefiles

It has been common practice to have one or more URLs at the end of the
ports' pkg-descr files, one per line and prefixed with "WWW:". These
URLs should point at a project website or other relevant resources.

Access to these URLs required processing of the pkg-descr files, and
they have often become stale over time. If more than one such URL was
present in a pkg-descr file, only the first one was tarnsfered into
the port INDEX, but for many ports only the last line did contain the
port specific URL to further information.

There have been several proposals to make a project URL available as
a macro in the ports' Makefiles, over time.

security/amavisd-new: Fix installing from official pkg repo

Remove LHA from from the default options. This change makes it possible
to use amavis-new from the official packages repo again. This hasn't
been possible since archivers/lha packages may not be distributed, thus
trying to install amavisd-new failed with the following error message

pkg: amavisd-new has a missing dependency: lha

PR:		265240
Reported by:	James B. Byrne <byrnejb@harte-lyne.ca>

security/amavisd-new: Add NO_ARCH

Approved by:	portmgr (blanket)

security/amavisd-new: Update 2.12.2, add 7-Zip.org support

- update to 2.12.2
- switch to archivers/7-zip for extracting 7-Zip archives. Patch has
  been discussed with upstream and is waiting to be committed.
  https://gitlab.com/amavis/amavis/-/merge_requests/90

PR:		260866

One more small cleanup, forgotten yesterday.
Reported by:	lwhsu

all: Remove all other $FreeBSD keywords.

Remove # $FreeBSD$ from Makefiles.

Multiple ports: improve regex compliance

These changes largely fall into just two categories:

1. Need textproc/gsed for GNU extensions
2. Extraneous escapes that can go away

For #1, there's a further subdivision into those that require autoconf magic
and those that can get away with BINARY_ALIAS=sed=${LOCALBASE}/bin/gsed.
-CURRENT will soon gain GNU extensions, but these will take longer to get to
all supported releases; we must switch them to gsed to ensure we're actually
properly building them as intended.

For #2, I've fixed these as I can and we should upstream these fixes.

security/maia,amavisd-new: drop optional dependency on expired mail/altermime

Update to 2.12.0

amavisd-new moved to https://gitlab.com/amavis/amavis/ and was renamed to
amavis. I'm keeping the portname for now, but will likely rename it in a
second step.

Tested by:	Herbert J. Skuhra <herbert@gojira.at>

Convert to UCL & cleanup pkg-message (categories s)

Add a missing backslash-escape to left brace in a regexp

Perl 5.28 introduced a warning about unescaped left brace in a regexp,
resulting in a warning issued during amavisd startup:

Unescaped left brace in regex is deprecated here (and will be fatal in Perl
5.32), passed through in regex; marked by <-- HERE in m/ ( { <-- HERE }
(?: / \* )? | \* ) / at (eval 112) line 830.

Currently the warning is harmless although annoying, but will become a fatal
error
with the next version of perl.

PR:		234173
Submitted by:	Mark.Martinec@ijs.si

Update to 2.11.1

security/amavisd-new: drop non-default and expired dependency on
archivers/freeze

Don't warn when using ramdisk, according to the submitter who discussed it
with kib, the warning is no longer appropriate.

Reported by:	Willem Jan Withagen <wjw@digiware.nl>

Fix a harmless typo (archviers/rar -> archivers/rar).

Noticed by:	asmodai

- Update WWW

Approved by:	portmgr blanket

Begin deorbit burn of ia64.  We have not attempted to build packages for
it for many years.

While here, alphabetize ARCHs, pet portlint, and modernize usages.

Approved by:	portmgr (tier-2 blanket)

Switch the dependency on archivers/freeze to default to off.

The dependency on archivers/freeze make it so that amavisd-new can check
inside freeze archives, however there are issues with that port that keeps
it from being built, and that makes amavisd-new not build either.  It is
still possible to install freeze separately and have amavisd-new use it.

Approved by:	flo (maintainer)

Revert removal of UNRAR description from these ports

It was determined that the custom descriptions were more useful

Reported by:	mat

UNRAR description is now available in bsd.options.desc.mk

Approved by:	portmgr (with hat)

- fix clamd socket file location in default config file [1]
- prevent error messages from amavisd-p0fanalyzer rc script [2]
- add a patch to fix dkim siging that was broken in 2.11.0 [3]

PR:		200036 [1], 209038 [2], 214202 [3]
Submitted by:	barnerd [1]
		Miroslav Lachman <000.fbsd@quip.cz> [2]
		ari@stonepile.fi [3]

- update to 2.11.0
- take maintainership

PR:		212695
Approved by:	gabor (private mail)

Remove NLS, DOCS, EXAMPLES and IPV6 from OPTIONS_DEFAULT, they are enabled by
default anyway and don't need to be listed

Approved by:	portmgr blanket

- Fix trailing whitespace in pkg-messages

Approved by:	portmgr blanket

- Fix trailing whitespace in pkg-descrs, categories [p-x]*

Approved by:	portmgr blanket

Remove ${PORTSDIR}/ from dependencies, categories r, s, t, and u.

With hat:	portmgr
Sponsored by:	Absolight

Fix usage of ${PERL5}.

${PERL5} points to a specific version of perl, say, perl5.22.1, it is
fine to use it in a ports Makefile to do Perly things, but ports using
it must use ${PERL}, that points to /usr/local/bin/perl so that if the
minor version is updated, the shebang keep working.

While there, make some ports use shebangfix, regen a few patches, and
bump PORTREVISION where a shebang went from PERL5 to PERL.

PR:		205367
With hat:	portmgr
Sponsored by:	Absolight

- Convert pkg-install script to @dir
- Use options helpers
- Remove unneeded @dir's from plist

PR:		203045
Submitted by:	amdmi3
Approved by:	maintainer timeout (gabor, 2 weeks)

- Add dependency that was forgotten during the update

PR:		197994
Submitted by:	madpilot

- Update to 2.10.1
- Add p0f-analyzer.pl to SHEBANG_FILES [1]
- Remove reference to deprecated virus scanners [2]
- Use conventional sample file naming [2]

PR:		195870 [1], 194412 [2]
Submitted by:	me@nileshgr.com [1], takefu@airport.fm [2]

- Use the ports framework to create user/group
- Shebangfix
- Allow staging as a regular user

- Update to 2.9.1 [1]
- Staging [2]

PR:		189479 [1] (based on), 191695 [2]
Submitted by:	paul@inetstat.net [1], Dan Lukes <dan@obluda.cz> [2]

Move {mail,japanese}/p5-Mail-SpamAssassin to &/spamassassin, in the name of
improving accessibility.

I think people who want to just find the port/package and install it are
more likely to look for "spamassassin the program" than "spamassassin the
perl module collection."

Fix properties on pkg-plist

Add NO_STAGE all over the place in preparation for the staging support (cat:
security)

Convert to new perl framework
Convert USE_GMAKE to USES=gmake

- Remove unnecessary depend on PERL_LEVEL < 5.12

PR:		ports/178928
Submitted by:	az
Approved by:	maintainer (timeout)

Fix syntaxe error introduced by conversion to new options framework

Convert security to new options framework

- Remove A/An in COMMENT
- Trim Header where applicable

- Set default perl version for ports which currently using
  (5.x+ and x < 12) scheme.

Approved by: bapt@ (portmgr@)

RC fixes;

- Use REQUIRE in lieu of BEFORE where possible
- Include KEYWORD: shutdown for persistent services
- load_rc_config should precede any default settings
- Style fixes, indenting functions, remove single-line functions

Approved by:	gabor (maintainer)
Feature safe:	yes

- Fix mistakenly expanded variable substitution

Noticed by:	zeising
Feature safe:	yes

- Let amavisd_ram respect tmpfs [1]
- Fix amavis-p0fanalyzer startup script [2]
- Bump PORTREVISION

PR:		ports/169660 [1],
		ports/172182 [2]
Submitted by:	Helmut Schneider <jumper99@gmx.de> [1],
		Rouslan Iskhakov <rouslan@rshell.net> [2]
Feature safe:	yes

Fix what looks like a copy-paste-o that originated in the same script:

command=foo >/dev/null 2>&1
	|
	v
command=foo
command_args='>/dev/null 2>&1'

This is clearly what should have been done, for several reasons.

No PORTREVISION bump because the old version simply ignored everything
after the space, and does not seem to have done any harm. However
it's good to clean these up so that similar errors aren't pasted into
a new script where they might actually matter.

Move the rc.d scripts of the form *.sh.in to *.in

Where necessary add $FreeBSD$ to the file

No PORTREVISION bump necessary because this is a no-op

- Update to 2.8.0
- Fix typo in LICENSE
- Remove old upgrade message

- Remove SITE_PERL from *_DEPENDS

Approved by: portmgr@ (bapt@)

In the rc.d scripts, change assignments to rcvar to use the
literal name_enable wherever possible, and ${name}_enable
when it's not, to prepare for the demise of set_rcvar().

In cases where I had to hand-edit unusual instances also
modify formatting slightly to be more uniform (and in
some cases, correct). This includes adding some $FreeBSD$
tags, and most importantly moving rcvar= to right after
name= so it's clear that one is derived from the other.

- Update to 2.7.0
- Beautify OPTIONS
- Remove unnecessary patch

PR:             ports/158613
Submitted by:   sahil

- Update to 2.6.6

PR:             ports/157352
Submitted by:   Niclas Zeising <niclas.zeising@gmail.com>

- Turn IPV6 support on by default
- Bump PORTREVISION

Requested by:   dougb, delphij
Feature safe:   yes

- Make IPv6 support optional because it causes a delay on systems that
  do not support it

PR:             ports/153431
Submitted by:   Michael Scheidell <michael.scheidell@secnap.com>
Feature safe:   yes

- Chase security/libksba shlib version bump

Requested by:   kwm
Pointyhat to:   glarkin

Change dependency on old p5-Compress-Zlib, p5-IO-Compress-Base,
p5-IO-Compress-Zlib and p5-IO-Compress-Bzip2 modules to p5-IO-Compress.
Explicitly depend on p5-IO-Compress only if PERL_LEVEL < 500903
Bump PORTREVISION

- Rename net/p5-IO-INET6 to net/p5-IO-Socket-INET6.

PR:     ports/148309
Submitted by:   Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>

- Remove BDB version requirement. This doesn't fix the problem because
  amavisd-new uses BDB through databases/p5-BerkeleyDB and if that port
  is already present on the system when we install amavisd-new, this knob
  won't guarantee that we get the proper version.  The underlying port
  should be changed to use a more modern version of BDB, so instead of
  adding quirks here, a PR has been submitted for that port
  (ports/148494). [1] [2]
- Proper handling of the WITH_RAR case [3]
- Remove -M option from mdmfs when using ramdisk.  This reportedly
  stop crashes. [4]
- Bump PORTREVISION

PR:             ports/147794 [1], ports/147856 [2]
Submitted by:   delphij [1], Joe Horn <joehorn@gmail.com> [2],
                Scot Hetzel <swhetzel@gmail.com> [3],
                Andy Dills <andy@xecu.net> (via private mail) [4]

- Use BerkeleyDB 4.2 if compiled with WITH_BDB. Using 4.1, which was
  indirectly pulled in by dependencies, has a serious performance
  problem.
- Bum PORTREVISION

Requested by:   Andy Dills <andy@xecu.net> (via private mail)

Begin the process of deprecating sysutils/rc_subr by
s#. %%RC_SUBR%%#. /etc/rc.subr#

- Remove unneeded dependencies which is in perl-5.8.9 dist
  (part 8).

Approved by:    portmgr (itetcu)

- Statically hardcode the hostname at build-time isn't correct because
  packages will hold the hostname of the building cluster in this way.
  Just set $localhost_name to $myhostname instead. The latter is
  tunable in the configuration file.
- Bump PORTREVISION

Pointed out by: delphij

- Match default Clamav socket to the Clamav port's default [1]
- Change $localhost_name to real hostname instead of 'localhost' [2]
- Bump PORTREVISION

PR:             ports/141206 [1]
Submitted by:   Petr Rehor <prehor@gmail.com> [1]
Requested by:   delphij [2]

- Don't overwrite edited configuration file

PR:             ports/138801
Submitted by:   "Herbert J. Skuhra" <h.skuhra@gmail.com>
Feature safe:   yes

- Add support for SNMP subagent [1]
- Fix bug sending 2 reject notifications [2]

PR:             ports/136151 [1], ports/137333 [2]
Submitted by:   Olli Hauer <ohauer@gmx.de>
More info:     
http://www.mail-archive.com/amavis-user@lists.sourceforge.net/msg14060.html [2]

- Update to 2.6.4

PR:             ports/136078
Submitted by:   Sylvio Cesar <scjamorim@bsd.com.br>

- Add forgotten patch for the last commit

- Fix the 'Can't locate object method "new" via package "Amavis::SpamControl"
  at /usr/local/sbin/amavisd line 13878.' bug
- Bump PORTREVISION

PR:             ports/134882 [1]
Submitted by:   Elliot Dierksen <ebd@oau.org> [1],
                Kirill Angelov <kirill@dubna.ru>
Obtained from:  Debian Project

- Update to 2.6.3

PR:             ports/134163
Submitted by:   Michael Scheidell <scheidell@secnap.net>

- Do not hardcode pidfile in the rc.d script [1]
- Depend on p5-Mail-DKIM >= 0.33 [2]
- Patch clamscan timeout bug [2]
- REQUIRE: mysql postgresql in rc.d script [2]
- Bump PORTREVISION
- pkg-message nits

PR:             ports/132575 [1], ports/133073 [2]
Submitted by:   Helmut Schneider <jumper99@gmx.de> [1],
                Michael Scheidell <scheidell@secnap.net> [2]

- Fix config file path
- Fix reload target in the rc script
- Bump PORTREVISION

Reported by:    Florian Smeets <flo@kasimir.com>,
                Arjo Hooimeijer <arjo.hooimeijer@xs4all.nl>,
                Michael Scheidell <scheidell@secnap.net>

- Fix SQL logging problem [1]
- Remove old dependency [1]
- Add a warning when memdisk is used, because it is unsafe [2]
- Fix on Perl 5.8.9 [3]
- Bump PORTREVISION

PR:             ports/130835 [1], ports/131633 [2]
Submitted by:   Michael Scheidell <scheidell@secnap.net> [1][2]

- Update to 2.6.2 [1]
- Inplace edit Perl path to be ${PERL} [2]

PR:             ports/129670 [1]
Submitted by:   Michael Scheidell <scheidell@secnap.net> [1]
Requested by:   Andre Luiz dos Santos <andre@netvision.com.br> [2]

- Fix modes of the temp directory [1]
- Fix a bug in SMTP handling [2]
- Bump PORTREVISION

PR:             ports/127216 [1]
Submitted by:   Juan J Lopez <jlopez@evsis.com.ar> [1],
                Matt Emmerton <matt@gsicomp.on.ca> [2] (via private mail)
Approved by:    portmgr (erwin)

- Update to 2.6.1

PR:             ports/125368
Submitted by:   Helmut Schneider <jumper99@gmx.de>

Bump portrevision due to upgrade of devel/gettext.

The affected ports are the ones with gettext as a run-dependency
according to ports/INDEX-7 (5007 of them) and the ones with USE_GETTEXT
in Makefile (29 of them).

PR:             ports/124340
Submitted by:   edwin@
Approved by:    portmgr (pav)

- Fix dependency and fix INDEX

Broken by:      gabor
Reported by:    erwin

- Update to 2.6.0 [1]
- Add Ms Word support via textproc/ripole

PR:             ports/123227 [1]
Submitted by:   Michael Scheidell <scheidell@secnap.net> [1]

- Update to 2.5.4

PR:             ports/121666
Submitted by:   garga

- Fix a typo in pkg-message

Submitted by:   miwi

- Update to 2.5.3

This is a maintainance release.
Release notes: http://www.ijs.si/software/amavisd/release-notes.txt

PR:             ports/118631 [1],
                ports/118732 [2]
Submitted by:   Olli Hauer <ohauer@gmx.de> [1],
                Michael Scheidell <scheidell@secnap.net> [2]

Welcome bsd.perl.mk.  Add support for constructs such as USE_PERL5=5.8.0+.
Drop support for antique perl.

Work done by:   gabor
Sponsored by:   Google Summer of Code 2007
Hat:            portmgr

- Make a dependency version more accurate. According to pkg_version(1)
  the current one is fine, but it is reported that portupgrade(1)
  has troubles with the current way.  No PORTREVISION bump, as it just blocked
  the upgrade, but we don't want to require people to rebuild again.

Reported by:    Aurelien Croc <aurelien@ap2c.org>

- Update to 2.5.2 [1]
- Don't try to install if WITH_RAR is selected and IA32 compatibility is not
  available [2]

PR:             ports/114084 [1], ports/113941 [2]
Submitted by:   garga [1], Michael Scheidell <scheidell@secnap.net> [2]

- Update to 2.5.1
- Dependency changes
- Require the fixed versions of zoo/unzoo, which are not vulnerable
- Add ramdisk support

PR:             ports/113396
Submitted by:   Michael Scheidell <scheidell@secnap.net>
Reviewed by:    Mark Martinec <Mark.Martinec@ijs.si> (author)

Fix packaging. No PORTREVISION bump, since it installs and deinstalls cleanly,
just does not package. Somehow tinderbox did not reflect this issue, but
pointyhat and local tests did.

Reported by:    Bryan Fullerton <bryanf@samurai.com>,
                pointyhat (via kris)
Approved by:    portmgr (linimon)

- Update to 2.5.0
- Add Altermime support
- Add P7Zip support

Release Notes:  http://www.ijs.si/software/amavisd/release-notes.txt

PR:             ports/112048
Submitted by:   Michael Scheidell <scheidell@secnap.net>

- Remove explicit -l from command line options of p0fanalyzer in the rc.d
  script and now amavis_p0f_daemon_flags defaults to -l, which was empty so far
- Bump PORTREVISION

Another round of the periodic sweep for removal of the
KEYWORD: FreeBSD scourge. We have ignored this keyword
for a long time now, so this is a non-functional change
(therefore no PORTREVISION bumps).

Insert a $FreeBSD tag where needed, and adjust a comment
in mail/milter-regex to match reality.

- Remove support for FreeBSD 4.x

Approved by:    erwin (mentor, implicit)

- Fix dependency [1]
- Turn on WITH_FILE at default
- Bump PORTREVISION

PR:             ports/108734 [1]
Reported by:    Attila Nagy <bra@fsn.hu> [1]
Submitted by:   Martin Matuska <martin@matuska.org> [1]
Approved by:    erwin (mentor)