View | Details | Raw Unified | Return to bug 108976
Collapse All | Expand All

(-)Makefile (-2 / +4 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	MailScanner
8
PORTNAME=	MailScanner
9
PORTVERSION=	4.57.6
9
PORTVERSION=	4.58.9
10
PORTREVISION=	1
10
PORTREVISION=	1
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
12
MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
Lines 122-128 Link Here
122
		nod32-autoupdate rav-autoupdate \
122
		nod32-autoupdate rav-autoupdate \
123
		rav-wrapper sophos-autoupdate
123
		rav-wrapper sophos-autoupdate
124
124
125
USE_RC_SUBR=	mailscanner.sh mta.sh
125
USE_RC_SUBR=	mailscanner mta
126
SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
126
127
127
post-extract:
128
post-extract:
128
	cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}/* .
129
	cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}/* .
Lines 277-282 Link Here
277
	# Sophos install script
278
	# Sophos install script
278
	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${DOCSDIR}
279
	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${DOCSDIR}
279
	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR}
280
	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR}
281
	cd ${FILESDIR} && ${INSTALL_DATA} CHANGES.port ${DOCSDIR}
280
.endif
282
.endif
281
	cd ${FILESDIR} && \
283
	cd ${FILESDIR} && \
282
		${INSTALL_MAN} ${MAN8} ${MAN5PREFIX}/man/man8
284
		${INSTALL_MAN} ${MAN8} ${MAN5PREFIX}/man/man8
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (MailScanner-install-4.57.6-1.tar.gz) = b025773a1854140f75dca48a52818ed3
1
MD5 (MailScanner-install-4.58.9-1.tar.gz) = 5c641a7d76beaa0bb7d9efcb04f6b333
2
SHA256 (MailScanner-install-4.57.6-1.tar.gz) = 52cbacb22c6a82fc39b2aef89b74774e504bb8d4baf5530c225369b08ee52754
2
SHA256 (MailScanner-install-4.58.9-1.tar.gz) = 4e4f362fc8778c9a0deaff696f8c966081c4bf08227f3bd036f39fbbe6d7010c
3
SIZE (MailScanner-install-4.57.6-1.tar.gz) = 7051901
3
SIZE (MailScanner-install-4.58.9-1.tar.gz) = 7058345
(-)pkg-plist (+3 lines)
Lines 22-27 Link Here
22
lib/MailScanner/MailScanner/CustomFunctions/DavidHooton.pm
22
lib/MailScanner/MailScanner/CustomFunctions/DavidHooton.pm
23
lib/MailScanner/MailScanner/CustomFunctions/ZMRouterDirHash.pm
23
lib/MailScanner/MailScanner/CustomFunctions/ZMRouterDirHash.pm
24
lib/MailScanner/MailScanner/CustomFunctions/SpamWhitelist.pm
24
lib/MailScanner/MailScanner/CustomFunctions/SpamWhitelist.pm
25
lib/MailScanner/MailScanner/CustomFunctions/LastSpam.pm
26
lib/MailScanner/MailScanner/CustomFunctions/Ruleset-from-Function.pm
25
lib/MailScanner/MailScanner/Exim.pm
27
lib/MailScanner/MailScanner/Exim.pm
26
lib/MailScanner/MailScanner/EximDiskStore.pm
28
lib/MailScanner/MailScanner/EximDiskStore.pm
27
lib/MailScanner/MailScanner/GenericSpam.pm
29
lib/MailScanner/MailScanner/GenericSpam.pm
Lines 513-518 Link Here
513
%%DATADIR%%/reports/sk/sender.size.report.txt.sample
515
%%DATADIR%%/reports/sk/sender.size.report.txt.sample
514
%%DATADIR%%/reports/sk/stored.size.message.txt.sample
516
%%DATADIR%%/reports/sk/stored.size.message.txt.sample
515
%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
517
%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
518
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.port
516
%%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
519
%%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
517
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.FreeBSD
520
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.FreeBSD
518
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.OpenBSD
521
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.OpenBSD
(-)files/CHANGES.port (+6 lines)
Lines 1-3 Link Here
1
Version 4.58.9
2
================
3
- Upgrade to MailScanner 4.58
4
- fix: CHANGES.port was not installed anymore
5
- startscripts now honor RC_SUBR_SUFFIX
6
1
Version 4.57.6_1
7
Version 4.57.6_1
2
================
8
================
3
- Upgrade to MailScanner 4.57
9
- Upgrade to MailScanner 4.57
(-)files/mailscanner.in (+43 lines)
Added Link Here
1
#! /bin/sh
2
3
# PROVIDE: mailscanner
4
# REQUIRE: mta
5
# KEYWORD: shutdown
6
7
#
8
# Add the following lines to /etc/rc.conf to enable mailscanner:
9
# mailscanner_enable (bool):      Set to "NO" by default.
10
#                                 Set it to "YES" to enable mailscanner
11
# mailscanner_configfile (path):  Set to "%%PREFIX%%/etc/MailScanner/MailScanner.conf" by default.
12
# mailscanner_pidfile (path):     Set to "/var/run/MailScanner.pid" by default.
13
#
14
15
. %%RC_SUBR%%
16
17
name="mailscanner"
18
rcvar=`set_rcvar`
19
20
load_rc_config $name
21
22
: ${mailscanner_enable="NO"}
23
: ${mailscanner_configfile="%%PREFIX%%/etc/MailScanner/MailScanner.conf"}
24
: ${mailscanner_pidfile="/var/run/MailScanner.pid"}
25
26
command="%%PREFIX%%/sbin/mailscanner"
27
pidfile=${mailscanner_pidfile}
28
command_args="${mailscanner_configfile}"
29
30
required_files="${mailscanner_configfile}"
31
32
_ms_start_precmd() {
33
	# Quietly try to raise the open_files limit
34
	#
35
	ulimit -n 2000 >/dev/null 2>&1
36
}
37
38
start_precmd=_ms_start_precmd
39
40
procname="MailScanner"
41
42
run_rc_command "$1"
43
(-)files/mailscanner.sh.in (-43 lines)
Removed Link Here
1
#! /bin/sh
2
3
# PROVIDE: mailscanner
4
# REQUIRE: mta
5
# KEYWORD: shutdown
6
7
#
8
# Add the following lines to /etc/rc.conf to enable mailscanner:
9
# mailscanner_enable (bool):      Set to "NO" by default.
10
#                                 Set it to "YES" to enable mailscanner
11
# mailscanner_configfile (path):  Set to "%%PREFIX%%/etc/MailScanner/MailScanner.conf" by default.
12
# mailscanner_pidfile (path):     Set to "/var/run/MailScanner.pid" by default.
13
#
14
15
. %%RC_SUBR%%
16
17
name="mailscanner"
18
rcvar=`set_rcvar`
19
20
load_rc_config $name
21
22
: ${mailscanner_enable="NO"}
23
: ${mailscanner_configfile="%%PREFIX%%/etc/MailScanner/MailScanner.conf"}
24
: ${mailscanner_pidfile="/var/run/MailScanner.pid"}
25
26
command="%%PREFIX%%/sbin/mailscanner"
27
pidfile=${mailscanner_pidfile}
28
command_args="${mailscanner_configfile}"
29
30
required_files="${mailscanner_configfile}"
31
32
_ms_start_precmd() {
33
	# Quietly try to raise the open_files limit
34
	#
35
	ulimit -n 2000 >/dev/null 2>&1
36
}
37
38
start_precmd=_ms_start_precmd
39
40
procname="MailScanner"
41
42
run_rc_command "$1"
43
(-)files/mta.in (+151 lines)
Added Link Here
1
#!/bin/sh
2
#
3
# mta.sh - start multiple MTA instances, e.g. for MailScanner
4
5
# PROVIDE: mta
6
# REQUIRE: LOGIN cleanvar
7
# BEFORE:
8
# KEYWORD: shutdown
9
10
#
11
# Add the following lines to /etc/rc.conf to enable mta at boot-up time:
12
# mta_enable (bool):      Set to "NO" by default.
13
#                         Set it to "YES" to enable mta
14
# mta_type (str):         Type of MTA (sendmail, exim, unknown), defaults to "sendmail"
15
# mta_profiles (string):  Undefined by default. Define your profiles here.
16
# mta_flags (str):        Set to "" by default.
17
#                         Extra flags passed to start command.
18
# mta_program (str):      Path to program, defaults depending on $mta_type
19
#			  either to "/usr/sbin/sendmail" or "/usr/local/sbin/exim"
20
# mta_configfile (str):   Config file, defaults depending on $mta_type either
21
#			  to "/etc/mail/sendmail.cf" or "/usr/local/etc/exim/configure"
22
# mta_pidfile (str):      PID file, defaults depending on $mta_type either
23
#			  to "/var/run/sendmail.pid" or "/var/run/exim.pid"
24
#
25
#
26
# ATTENTION: All of the above entries are necessary in order for mta.sh to work correctly!
27
#
28
29
#
30
# Examples:
31
#
32
# Exim, 2 instances (for MailScanner):
33
#
34
# mta_enable="YES"
35
# mta_type="exim"
36
# mta_profiles="incoming outgoing"
37
# mta_incoming_configfile="/usr/local/etc/exim/configure.in"
38
# mta_incoming_flags="-bd"
39
# mta_incoming_pidfile="/var/run/exim_in.pid"
40
# mta_outgoing_configfile="/usr/local/etc/exim/configure.out"
41
# mta_outgoing_flags="-q15m"
42
# mta_outgoing_pidfile="/var/run/exim_out.pid"
43
#
44
# Sendmail, 3 instances (for MailScanner):
45
#
46
# mta_enable="YES"
47
# mta_type="sendmail"
48
# mta_profiles="incoming outgoing submitqueue"
49
# mta_incoming_flags="-L sm-mta-in -bd -OPrivacyOptions=noetrn -OQueueDirectory=/var/spool/mqueue.in -ODeliveryMode=queueonly"
50
# mta_incoming_pidfile="/var/run/sendmail_in.pid"
51
# mta_incoming_configfile="/etc/mail/sendmail.cf"
52
# mta_outgoing_flags="-L sm-mta-out -q15m"
53
# mta_outgoing_pidfile="/var/run/sendmail_out.pid"
54
# mta_outgoing_configfile="/etc/mail/sendmail.cf"
55
# mta_submitqueue_flags="-L sm-msp-queue -Ac -q15m"
56
# mta_submitqueue_pidfile="/var/spool/clientmqueue/sm-client.pid"
57
# mta_submitqueue_configfile="/etc/mail/submit.cf"
58
59
PATH=$PATH:/sbin:/usr/sbin; export PATH
60
61
. %%RC_SUBR%%
62
63
name="mta"
64
rcvar=`set_rcvar`
65
66
_mta_rc_script="%%PREFIX%%/etc/rc.d/mta%%RC_SUBR_SUFFIX%%"
67
68
load_rc_config $name
69
70
: ${mta_enable="NO"}
71
: ${mta_type="sendmail"}
72
: ${mta_flags=""}
73
74
case "${mta_type}" in
75
76
	sendmail)
77
		_mta_program="/usr/sbin/sendmail"
78
		_mta_configfile="/etc/mail/sendmail.cf"
79
		_mta_pidfile="/var/run/sendmail.pid"
80
		;;
81
82
	exim)
83
		_mta_program="/usr/local/sbin/exim"
84
		_mta_configfile="/usr/local/etc/exim/configure"
85
		_mta_pidfile="/var/run/exim.pid"
86
		;;
87
esac
88
89
: ${mta_program=${_mta_program}}
90
: ${mta_configfile=${_mta_configfile}}
91
: ${mta_pidfile=${_mta_pidfile}}
92
93
# support SIGHUP to reparse configuration file
94
extra_commands="reload"
95
96
# command and arguments
97
command="${mta_program}"
98
99
if [ -n "${2}" -o -n "$profile" ]; then
100
	profile=${profile-$2}
101
	export profile
102
	if [ "x${mta_profiles}" != "x" ]; then
103
		eval mta_configfile=\${mta_${profile}_configfile}
104
		[ "x${mta_configfile}" = "x" ] && {
105
			echo "You must define a configuration file (mta_${profile}_configfile)"
106
			exit 1
107
		}
108
		eval mta_enable=\${mta_${profile}_enable:-YES}
109
		eval mta_flags=\${mta_${profile}_flags:-${mta_flags}}
110
		eval mta_configfile=\${mta_${profile}_configfile:-${mta_configfile}}
111
		eval mta_pidfile=\${mta_${profile}_pidfile:-${mta_pidfile}}
112
		pidfile="${_pidprefix}.${profile}.pid"
113
	else
114
		echo "$_mta_rc_script: extra argument ignored"
115
	fi
116
else
117
	if [ "x${mta_profiles}" != "x" ]; then
118
	for profile in ${mta_profiles}; do
119
		echo "===> mta profile: ${profile}"
120
		$_mta_rc_script $1 $profile
121
		retcode=$?
122
		if [ "$?" -ne 0 ]; then
123
			failed="${profile} ({$retcode}) ${failed}"
124
		else
125
			success="${profile} ${success}"
126
		fi
127
	done
128
	exit 0
129
	fi
130
fi
131
132
133
pidfile=${mta_pidfile}
134
required_files="${mta_configfile}"
135
136
# select correct command arguments
137
case "${mta_type}" in
138
139
	sendmail)
140
		command_args="-C'${mta_configfile}' -OPidFile='${pidfile}'"
141
		;;
142
143
	exim)
144
		command_args="-C '${mta_configfile}' -oP '${pidfile}'"
145
		;;
146
147
	*)
148
		command_args=""
149
		;;
150
esac
151
run_rc_command "$1"
(-)files/mta.sh.in (-158 lines)
Removed Link Here
1
#!/bin/sh
2
#
3
# mta.sh - start multiple MTA instances, e.g. for MailScanner
4
5
# PROVIDE: mta
6
# REQUIRE: LOGIN cleanvar
7
# BEFORE:
8
# KEYWORD: shutdown
9
10
#
11
# Add the following lines to /etc/rc.conf to enable mta at boot-up time:
12
# mta_enable (bool):      Set to "NO" by default.
13
#                         Set it to "YES" to enable mta
14
# mta_type (str):         Type of MTA (sendmail, exim, unknown), defaults to "sendmail"
15
# mta_profiles (string):  Undefined by default. Define your profiles here.
16
# mta_flags (str):        Set to "" by default.
17
#                         Extra flags passed to start command.
18
# mta_program (str):      Path to program, defaults depending on $mta_type
19
#			  either to "/usr/sbin/sendmail" or "/usr/local/sbin/exim"
20
# mta_configfile (str):   Config file, defaults depending on $mta_type either
21
#			  to "/etc/mail/sendmail.cf" or "/usr/local/etc/exim/configure"
22
# mta_pidfile (str):      PID file, defaults depending on $mta_type either
23
#			  to "/var/run/sendmail.pid" or "/var/run/exim.pid"
24
#
25
#
26
# ATTENTION: All of the above entries are necessary in order for mta.sh to work correctly!
27
#
28
29
#
30
# Examples:
31
#
32
# Exim, 2 instances (for MailScanner):
33
#
34
# mta_enable="YES"
35
# mta_type="exim"
36
# mta_profiles="incoming outgoing"
37
# mta_incoming_configfile="/usr/local/etc/exim/configure.in"
38
# mta_incoming_flags="-bd"
39
# mta_incoming_pidfile="/var/run/exim_in.pid"
40
# mta_outgoing_configfile="/usr/local/etc/exim/configure.out"
41
# mta_outgoing_flags="-q15m"
42
# mta_outgoing_pidfile="/var/run/exim_out.pid"
43
#
44
# Sendmail, 3 instances (for MailScanner):
45
#
46
# mta_enable="YES"
47
# mta_type="sendmail"
48
# mta_profiles="incoming outgoing submitqueue"
49
# mta_incoming_flags="-L sm-mta-in -bd -OPrivacyOptions=noetrn -OQueueDirectory=/var/spool/mqueue.in -ODeliveryMode=queueonly"
50
# mta_incoming_pidfile="/var/run/sendmail_in.pid"
51
# mta_incoming_configfile="/etc/mail/sendmail.cf"
52
# mta_outgoing_flags="-L sm-mta-out -q15m"
53
# mta_outgoing_pidfile="/var/run/sendmail_out.pid"
54
# mta_outgoing_configfile="/etc/mail/sendmail.cf"
55
# mta_submitqueue_flags="-L sm-msp-queue -Ac -q15m"
56
# mta_submitqueue_pidfile="/var/spool/clientmqueue/sm-client.pid"
57
# mta_submitqueue_configfile="/etc/mail/submit.cf"
58
59
PATH=$PATH:/sbin:/usr/sbin; export PATH
60
61
. %%RC_SUBR%%
62
63
name="mta"
64
rcvar=`set_rcvar`
65
66
_mta_rc_script="%%PREFIX%%/etc/rc.d/mta"
67
_mta_osversion="`sysctl -n kern.osreldate`"
68
if [ \( "$_mta_osversion" -lt "600101" \) -o \
69
	\( \( $_mta_osversion -ge 700000 \) -a \
70
		\( $_mta_osversion -lt 700007 \) \) ]
71
then
72
	_mta_rc_script="${_mta_rc_script}.sh"
73
fi
74
75
load_rc_config $name
76
77
: ${mta_enable="NO"}
78
: ${mta_type="sendmail"}
79
: ${mta_flags=""}
80
81
case "${mta_type}" in
82
83
	sendmail)
84
		_mta_program="/usr/sbin/sendmail"
85
		_mta_configfile="/etc/mail/sendmail.cf"
86
		_mta_pidfile="/var/run/sendmail.pid"
87
		;;
88
89
	exim)
90
		_mta_program="/usr/local/sbin/exim"
91
		_mta_configfile="/usr/local/etc/exim/configure"
92
		_mta_pidfile="/var/run/exim.pid"
93
		;;
94
esac
95
96
: ${mta_program=${_mta_program}}
97
: ${mta_configfile=${_mta_configfile}}
98
: ${mta_pidfile=${_mta_pidfile}}
99
100
# support SIGHUP to reparse configuration file
101
extra_commands="reload"
102
103
# command and arguments
104
command="${mta_program}"
105
106
if [ -n "${2}" -o -n "$profile" ]; then
107
	profile=${profile-$2}
108
	export profile
109
	if [ "x${mta_profiles}" != "x" ]; then
110
		eval mta_configfile=\${mta_${profile}_configfile}
111
		[ "x${mta_configfile}" = "x" ] && {
112
			echo "You must define a configuration file (mta_${profile}_configfile)"
113
			exit 1
114
		}
115
		eval mta_enable=\${mta_${profile}_enable:-YES}
116
		eval mta_flags=\${mta_${profile}_flags:-${mta_flags}}
117
		eval mta_configfile=\${mta_${profile}_configfile:-${mta_configfile}}
118
		eval mta_pidfile=\${mta_${profile}_pidfile:-${mta_pidfile}}
119
		pidfile="${_pidprefix}.${profile}.pid"
120
	else
121
		echo "$_mta_rc_script: extra argument ignored"
122
	fi
123
else
124
	if [ "x${mta_profiles}" != "x" ]; then
125
	for profile in ${mta_profiles}; do
126
		echo "===> mta profile: ${profile}"
127
		$_mta_rc_script $1 $profile
128
		retcode=$?
129
		if [ "$?" -ne 0 ]; then
130
			failed="${profile} ({$retcode}) ${failed}"
131
		else
132
			success="${profile} ${success}"
133
		fi
134
	done
135
	exit 0
136
	fi
137
fi
138
139
140
pidfile=${mta_pidfile}
141
required_files="${mta_configfile}"
142
143
# select correct command arguments
144
case "${mta_type}" in
145
146
	sendmail)
147
		command_args="-C'${mta_configfile}' -OPidFile='${pidfile}'"
148
		;;
149
150
	exim)
151
		command_args="-C '${mta_configfile}' -oP '${pidfile}'"
152
		;;
153
154
	*)
155
		command_args=""
156
		;;
157
esac
158
run_rc_command "$1"

Return to bug 108976