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
4c8100486c ~18 years ago, the script hasn't been part of the package
for a long time (flo)

PR:		280139

UPDATING

@@ -5,6 +5,21 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20240809:
+  AFFECTS: sysutils/amavisd-new
+  AUTHOR: netchildFreeBSD.org
+
+  The start scripts of amavisd have been renamed to amavisd_snmp and
+  amavis_p0fanalyzer for improved compatibility with other parts of the
+  system. The automatic start at boot (rc.conf variable settings) is
+  not affected, but if you have some other automatism you may want to
+  change
+    ".../etc/rc.d/amavisd-snmp" to ".../etc/rc.d/amavisd_snmp"
+    ".../etc/rc.d/amavis-p0fanalyzer" to ".../etc/rc.d/amavis-p0fanalyzer"
+  or
+    "service amavisd-snmp ..." to "service amavisd_snmp ..."
+    "service amavis-p0fanalyzer ..." to "service amavis_p0fanalyzer ..."
+
 20240727:
   AFFECTS: lang/php8[13]
   AUTHOR: netchildFreeBSD.org

security/amavisd-new/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	amavisd-new
 DISTVERSION=	2.12.3
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	security
 
@@ -99,7 +99,7 @@ RUN_DEPENDS+=	p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6
 .endif
 
 .if ${PORT_OPTIONS:MSNMP} && ${PORT_OPTIONS:MBDB}
-USE_RC_SUBR+=	amavisd-snmp
+USE_RC_SUBR+=	amavisd_snmp
 RUN_DEPENDS+=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 .endif
 
@@ -134,7 +134,7 @@ RUN_DEPENDS+=	spamassassin>=0:mail/spamassassin
 
 .if ${PORT_OPTIONS:MP0F}
 RUN_DEPENDS+=	${LOCALBASE}/bin/p0f:net-mgmt/p0f
-USE_RC_SUBR+=	amavis-p0fanalyzer
+USE_RC_SUBR+=	amavis_p0fanalyzer
 .else
 AMAVIS_NOP0F=	"@comment "
 .endif

security/amavisd-new/files/amavis-milter.in

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: amavis_milter
-# REQUIRE: amavisd
-# BEFORE: mail
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable amavis-milter:
-#
-# amavis_milter_enable="YES"
-#
-
-. /etc/rc.subr
-
-name=amavis_milter
-rcvar=amavis_milter_enable
-
-load_rc_config $name
-
-: ${amavis_milter_enable:=NO}
-: ${amavis_milter_flags=-D -p %%AMAVISDIR%%/amavis-milter.sock}
-: ${amavis_milter_user=%%AMAVISUSER%%}
-
-command=%%PREFIX%%/sbin/amavis-milter
-required_files=%%PREFIX%%/etc/amavisd.conf
-
-run_rc_command $1

security/amavisd-new/files/amavis_p0fanalyzer.in

@@ -16,6 +16,7 @@ load_rc_config $name
 : ${amavis_p0fanalyzer_pidfile1=/var/run/p0fanalyzer1.pid}
 : ${amavis_p0fanalyzer_pidfile2=/var/run/p0fanalyzer2.pid}
 : ${amavis_p0fanalyzer_flags=2345}
+: ${amavis_p0fanalyzer_scj_options:="net_basic"}
 
 start_cmd=p0fanalyzer_start
 stop_cmd=p0fanalyzer_stop

security/amavisd-new/files/amavisd.in

@@ -28,6 +28,7 @@ extra_commands=reload
 start_precmd=start_precmd
 stop_postcmd="rm -f $pidfile"
 reload_cmd="$command reload"
+: ${amavisd_svcj_options:="net_basic"}	# svcjs may be incompatible with amavisd_ram
 
 
 # possible values include: amavisd_ram="512m"

security/amavisd-new/files/amavisd_snmp.in

@@ -21,6 +21,7 @@ load_rc_config $name
 : ${amavisd_snmp_dbdir=%%AMAVISDIR%%/db}
 # log_level 0..5, default 0
 : ${amavisd_snmp_loglevel=0}
+: ${amavisd_snmp_svcj_options:="net_basic"}
 
 command=%%PREFIX%%/sbin/amavisd-snmp-subagent
 command_interpreter=%%PERL%%