Attachment #123002 for bug #166254

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





PORTNAME=	MailScanner
PORTVERSION=	4.84.5
PORTREVISION=	1
CATEGORIES=	mail
MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}

USE_PERL5=	yes

WRKSRC=		${WRKDIR}/${PORTNAME}-install-${PORTVERSION}
SUB_FILES=	MailScanner.8 pkg-message pkg-install pkg-deinstall
SUB_LIST=	DATADIR=${DATADIR} \
		PERL=${PERL} \
		PKGVERSION=${PKGVERSION} \
		PORTVERSION=${PORTVERSION} \
		ETC_FILES="${ETC_FILES}" \
		MCP_FILES="${MCP_FILES}"


.else
	@${ECHO_MSG} -n ">> Installing manpage..."
.endif
	@cd ${WRKDIR} && \
		${INSTALL_MAN} ${MAN8} ${MAN5PREFIX}/man/man8
	@${ECHO_MSG} " [DONE]"


Lines 1-3 Link Here

(-)mailscanner/files/CHANGES.port (+6 lines)
		1	Version 4.84.5_1
		2	================
		3	- Added patch for TNEF.pm bug
		4	- Fixed creation of mailscanner.cf symlink
		5	- Minor doc updates
		6
1	Version 4.84.5	7	Version 4.84.5
2	==============	8	==============
3	- Upgrade to 4.84.5	9	- Upgrade to 4.84.5




.TH "MailScanner" "8" "4.52.2" "Julian Field" "Mail"
.SH "NAME"
.LP 
MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
.SH "SEE ALSO"
.LP 
Please see http://www.mailscanner.info for current documentation. All current configuration options can be found at 
.br 

.br 
http://www.mailscanner.info/MailScanner.conf.index.html





.TH "MailScanner" "8" "%%PORTVERSION%%" "Julian Field" "Mail"
.SH "NAME"
.LP 
MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
.SH "SEE ALSO"
.LP 
Please see http://www.mailscanner.info for current documentation. All current configuration options can be found at 
.br 

.br 
http://www.mailscanner.info/MailScanner.conf.index.html





The MailScanner port is using the original MailScanner tarball from 
www.mailscanner.info. Unfortunately the tarball consists of MailScanner
and perl modules etc, MailScanner depends on. The port is not using
Julian's install.sh or the provided modules. All modules that MailScanner
depends on are installed via ports as well.

In order to make the installation FreeBSD compliant the port installs files


The port installs two start/stop scripts in /usr/local/etc/rc.d:

mailscanner
mta

My suggestion is to use mta instead of the usual FreeBSD MTA startup
process. This of course means that you will have to disable MTA startup 
in rc.conf completely. Put this in your rc.conf:


port will try to update all your languages conf files.


If you have suggestions for this port please contact the port maintainer.

j.koopmann@seceidos.de


Thanks,
  Jan-Peter Koopmann


Lines 1-4 Link Here

(-)mailscanner/files/mailscanner.in (-1 / +1 lines)
1	#! /bin/sh	1	#!/bin/sh
2		2
3	# PROVIDE: mailscanner	3	# PROVIDE: mailscanner
4	# REQUIRE: mta	4	# REQUIRE: mta

Lines 23-29 Link Here

(-)mailscanner/files/mta.in (-1 / +1 lines)
23	# to "/var/run/sendmail.pid" or "/var/run/exim.pid"	23	# to "/var/run/sendmail.pid" or "/var/run/exim.pid"
24	#	24	#
25	#	25	#
26	# ATTENTION: All of the above entries are necessary in order for mta.sh to work correctly!	26	# ATTENTION: All of the above entries are necessary in order for mta to work correctly!
27	#	27	#
28		28
29	#	29	#




--- ./lib/MailScanner/TNEF.pm.orig	2011-08-20 08:32:02.000000000 -0400
+++ ./lib/MailScanner/TNEF.pm	2012-03-15 11:28:31.000000000 -0400
@@ -229,15 +229,14 @@
 
   # Create the subdir to unpack it into
   #my $unpackdir = "tnef.$$";
-  my ($tmpfh, $unpackdir) = tempfile("tnefXXXXXX", TMPDIR => $dir, UNLINK => 0);
-  $dir =~ s,^.*/,,;
+  my $unpackdir = tempdir("tnefXXXXXX");
   $unpackdir = $message->MakeNameSafe($unpackdir, $dir);
   unless (mkdir "$dir/$unpackdir", 0777) {
     MailScanner::Log::WarnLog("Trying to unpack %s in message %s, could not create subdirectory %s, failed to unpack TNEF message", $tnefname, $message->{id},
                               "$dir/$unpackdir");
     return 0;
   }
-  chmod 0700, "$dir/$unpackdir";
+  chmod 0770, "$dir/$unpackdir";
 
   my $cmd = MailScanner::Config::Value('tnefexpander') .
             " -f $dir/$tnefname -C $dir/$unpackdir --overwrite";

Lines 102-108 Link Here

(-)mailscanner/files/pkg-install.in (-1 / +1 lines)
102		102
103	case $2 in	103	case $2 in
104	POST-INSTALL)	104	POST-INSTALL)
105	[ ! -z "${WITHOUT_SPAMASSASSIN_SYMLINK}" ] \	105	[ -z "${WITHOUT_SPAMASSASSIN_SYMLINK}" ] \
106	&& [ ! -r ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf ] \	106	&& [ ! -r ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf ] \
107	&& ${LN} -s ${PKG_PREFIX}/etc/MailScanner/spam.assassin.prefs.conf \	107	&& ${LN} -s ${PKG_PREFIX}/etc/MailScanner/spam.assassin.prefs.conf \
108	${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf	108	${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf

Return to bug 166254

Lines 7-12 Link Here

(-)mailscanner/Makefile (-2 / +4 lines)
7		7
8	PORTNAME= MailScanner	8	PORTNAME= MailScanner
9	PORTVERSION= 4.84.5	9	PORTVERSION= 4.84.5
		10	PORTREVISION= 1
10	CATEGORIES= mail	11	CATEGORIES= mail
11	MASTER_SITES= http://www.mailscanner.info/files/4/tar/	12	MASTER_SITES= http://www.mailscanner.info/files/4/tar/
12	DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}	13	DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
Lines 51-60 Link Here
51	USE_PERL5= yes	52	USE_PERL5= yes
52		53
53	WRKSRC= ${WRKDIR}/${PORTNAME}-install-${PORTVERSION}	54	WRKSRC= ${WRKDIR}/${PORTNAME}-install-${PORTVERSION}
54	SUB_FILES= pkg-message pkg-install pkg-deinstall	55	SUB_FILES= MailScanner.8 pkg-message pkg-install pkg-deinstall
55	SUB_LIST= DATADIR=${DATADIR} \	56	SUB_LIST= DATADIR=${DATADIR} \
56	PERL=${PERL} \	57	PERL=${PERL} \
57	PKGVERSION=${PKGVERSION} \	58	PKGVERSION=${PKGVERSION} \
		59	PORTVERSION=${PORTVERSION} \
58	ETC_FILES="${ETC_FILES}" \	60	ETC_FILES="${ETC_FILES}" \
59	MCP_FILES="${MCP_FILES}"	61	MCP_FILES="${MCP_FILES}"
60		62
Lines 272-278 Link Here
272	.else	274	.else
273	@${ECHO_MSG} -n ">> Installing manpage..."	275	@${ECHO_MSG} -n ">> Installing manpage..."
274	.endif	276	.endif
275	@cd ${FILESDIR} && \	277	@cd ${WRKDIR} && \
276	${INSTALL_MAN} ${MAN8} ${MAN5PREFIX}/man/man8	278	${INSTALL_MAN} ${MAN8} ${MAN5PREFIX}/man/man8
277	@${ECHO_MSG} " [DONE]"	279	@${ECHO_MSG} " [DONE]"
278		280

Lines 1-12 Link Here

(-)mailscanner/files/MailScanner.8 (-12 lines)
1	.TH "MailScanner" "8" "4.52.2" "Julian Field" "Mail"
2	.SH "NAME"
3	.LP
4	MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
5	.SH "SEE ALSO"
6	.LP
7	Please see http://www.mailscanner.info for current documentation. All current configuration options can be found at
8	.br
9
10	.br
11	http://www.mailscanner.info/MailScanner.conf.index.html
12

Line 0 Link Here

(-)mailscanner/files/MailScanner.8.in (+12 lines)
	1	.TH "MailScanner" "8" "%%PORTVERSION%%" "Julian Field" "Mail"
	2	.SH "NAME"
	3	.LP
	4	MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
	5	.SH "SEE ALSO"
	6	.LP
	7	Please see http://www.mailscanner.info for current documentation. All current configuration options can be found at
	8	.br
	9
	10	.br
	11	http://www.mailscanner.info/MailScanner.conf.index.html
	12

Lines 1-7 Link Here

(-)mailscanner/files/README.FreeBSD.port (-14 / +7 lines)
1	The MailScanner port is using the original MailScanner tarball from	1	The MailScanner port is using the original MailScanner tarball from
2	www.mailscanner.info. Unfortunatly the tarball consists of MailScanner	2	www.mailscanner.info. Unfortunately the tarball consists of MailScanner
3	and perl modules etc. MailScanner depends on. The port is not using	3	and perl modules etc, MailScanner depends on. The port is not using
4	Julians install.sh or the provided modules. All modules that MailScanner	4	Julian's install.sh or the provided modules. All modules that MailScanner
5	depends on are installed via ports as well.	5	depends on are installed via ports as well.
6		6
7	In order to make the installation FreeBSD compliant the port installs files	7	In order to make the installation FreeBSD compliant the port installs files
Lines 17-26 Link Here
17		17
18	The port installs two start/stop scripts in /usr/local/etc/rc.d:	18	The port installs two start/stop scripts in /usr/local/etc/rc.d:
19		19
20	mailscanner.sh	20	mailscanner
21	mta.sh	21	mta
22		22
23	My suggestion is to use mta.sh instead of the usual FreeBSD MTA startup	23	My suggestion is to use mta instead of the usual FreeBSD MTA startup
24	process. This of course means that you will have to disable MTA startup	24	process. This of course means that you will have to disable MTA startup
25	in rc.conf completely. Put this in your rc.conf:	25	in rc.conf completely. Put this in your rc.conf:
26		26
Lines 36-46 Link Here
36	port will try to update all your languages conf files.	36	port will try to update all your languages conf files.
37		37
38		38
39	If you have suggestions for this port please let me know and drop me an e-mail at	39	If you have suggestions for this port please contact the port maintainer.
40
41	j.koopmann@seceidos.de
42
43
44	Thanks,
45	Jan-Peter Koopmann
46

Line 0 Link Here

(-)mailscanner/files/patch-lib__MailScanner__TNEF.pm (+20 lines)
	1	--- ./lib/MailScanner/TNEF.pm.orig 2011-08-20 08:32:02.000000000 -0400
	2	+++ ./lib/MailScanner/TNEF.pm 2012-03-15 11:28:31.000000000 -0400
	3	@@ -229,15 +229,14 @@
	4
	5	# Create the subdir to unpack it into
	6	#my $unpackdir = "tnef.$$";
	7	- my ($tmpfh, $unpackdir) = tempfile("tnefXXXXXX", TMPDIR => $dir, UNLINK => 0);
	8	- $dir =~ s,^.*/,,;
	9	+ my $unpackdir = tempdir("tnefXXXXXX");
	10	$unpackdir = $message->MakeNameSafe($unpackdir, $dir);
	11	unless (mkdir "$dir/$unpackdir", 0777) {
	12	MailScanner::Log::WarnLog("Trying to unpack %s in message %s, could not create subdirectory %s, failed to unpack TNEF message", $tnefname, $message->{id},
	13	"$dir/$unpackdir");
	14	return 0;
	15	}
	16	- chmod 0700, "$dir/$unpackdir";
	17	+ chmod 0770, "$dir/$unpackdir";
	18
	19	my $cmd = MailScanner::Config::Value('tnefexpander') .
	20	" -f $dir/$tnefname -C $dir/$unpackdir --overwrite";