Attachment #183531 for bug #219938




# Created by: Jan-Peter Koopmann <j.koopmann@seceidos.de>
# $FreeBSD: head/mail/mailscanner/Makefile 443125 2017-06-10 23:12:19Z wen $

PORTNAME=	MailScanner
PORTVERSION=	5.0.3
PORTREVISION=	1
CATEGORIES=	mail
MASTER_SITES=	https://s3.amazonaws.com/msv5/release/
DISTNAME=	${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}.nix

	${REINPLACE_CMD} -e 's,\$$(mktemp),$$(mktemp -t tmp),' \
		${WRKSRC}/usr/lib/${PORTNAME}/wrapper/clamav-wrapper \
		${WRKSRC}/usr/lib/${PORTNAME}/wrapper/bitdefender-wrapper
	${REINPLACE_CMD} -e 's,/etc,${LOCALBASE}/etc,' \
		-e 's|/usr/bin/tnef|${LOCALBASE}/bin/tnef|g' \
		-e 's|/usr/bin/unrar|${LOCALBASE}/bin/unrar|g' \
		-e 's|/usr/bin/antiword|${LOCALBASE}/bin/antiword|g' \
		-e 's|/usr/bin/re2c|${LOCALBASE}/bin/re2c|g' \
		-e 's|/usr/bin/clamscan|${LOCALBASE}/bin/clamscan|g' \
		-e 's|/usr/share|${LOCALBASE}/share|g' \
		${WRKSRC}/usr/sbin/* \
		${WRKSRC}/usr/lib/${PORTNAME}/init/ms-init \
		${WRKSRC}/etc/${PORTNAME}/rules/* \
		${WRKSRC}/etc/${PORTNAME}/*.conf \
		${WRKSRC}/etc/${PORTNAME}/defaults \
		${WRKSRC}/usr/lib/${PORTNAME}/wrapper/* \
		${WRKSRC}/usr/share/${PORTNAME}/perl/${PORTNAME}/CustomConfig.pm \
		${WRKSRC}/usr/share/${PORTNAME}/perl/${PORTNAME}/ConfigDefs.pl \
		${WRKSRC}/usr/share/${PORTNAME}/perl/custom/SpamWhitelist.pm \
		${WRKSRC}/usr/share/${PORTNAME}/perl/${PORTNAME}/Exim.pm
	${REINPLACE_CMD} -e 's,/usr/sbin,${LOCALBASE}/sbin,' \
		-e 's,/usr/share,${LOCALBASE}/share,g' \
		${WRKSRC}/usr/sbin/* \
		${WRKSRC}/usr/lib/${PORTNAME}/init/ms-init \
		${WRKSRC}/etc/${PORTNAME}/*.conf \
		${WRKSRC}/etc/${PORTNAME}/defaults \
		${WRKSRC}/usr/share/${PORTNAME}/perl/${PORTNAME}/Exim.pm \
		${WRKSRC}/usr/lib/${PORTNAME}/wrapper/*
	${REINPLACE_CMD} -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \
		-e 's|/usr/share/${PORTNAME}|${LOCALBASE}/share/${PORTNAME}|g' \
		-e 's|/usr/lib/${PORTNAME}|${LOCALBASE}/lib/${PORTNAME}|g' \
		${WRKSRC}/usr/share/${PORTNAME}/perl/${PORTNAME}/CustomConfig.pm
	${REINPLACE_CMD} -e 's|/usr/bin/perldoc|${LOCALBASE}/bin/perldoc|g' \
		${WRKSRC}/usr/sbin/ms-perl-check
	${REINPLACE_CMD} -e 's|/usr/bin/exim|${LOCALBASE}/bin/exim|g' \
		${WRKSRC}/usr/share/${PORTNAME}/perl/${PORTNAME}/Exim.pm
	${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|g' \
		${WRKSRC}/usr/sbin/ms-create-locks \
		${WRKSRC}/usr/sbin/ms-update-bad-emails \
		${WRKSRC}/usr/sbin/ms-check \
		${WRKSRC}/usr/sbin/ms-cron \
		${WRKSRC}/etc/${PORTNAME}/virus.scanners.conf \
		${WRKSRC}/etc/${PORTNAME}/defaults

do-build:
	@${REINPLACE_CMD} \

		-e 's,/usr/lib/sendmail,/usr/sbin/sendmail,g'		\
		${WRKSRC}/usr/sbin/${PORTNAME}				\
		${WRKSRC}/usr/sbin/ms-create-locks			\
		${WRKSRC}/usr/sbin/ms-update-sa

	@${REINPLACE_CMD} \
		-e 's,/opt/${PORTNAME}/var/${PORTNAME}.pid,/var/run/${PORTNAME}.pid,g' \

		-e 's,/opt/${PORTNAME}/etc/reports,${DATADIR}/reports,g' \
		-e 's,/opt/${PORTNAME}/etc,${PREFIX}/etc/${PORTNAME},g' \
		-e 's,/opt/${PORTNAME}/lib,${PREFIX}/lib/${PORTNAME},g' \
		-e 's,/usr/bin/unrar,${LOCALBASE}/bin/unrar,g' \
		-e 's,/bin/gunzip,/usr/bin/gunzip,g' \
		-e 's,/etc/mail/spamassassin,${LOCALBASE}/etc/mail/spamassassin,g' \
		-e 's,/tmp/clamd.socket,/var/run/clamav/clamd.sock,g' \
		-e 's,/usr/local/share/clamav,/var/db/clamav,g' \
		${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf


do-install:
	(cd ${WRKSRC}/etc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/etc)
	(cd ${WRKSRC}/usr/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib)
	(cd ${WRKSRC}/usr/sbin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin)
	(cd ${WRKSRC}/usr/share && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share)
	cd ${WRKDIR} && \




08/14/2016 Changes in    v5.0.3-7
==================================
- updated init script to include a time-wait for pid files during 
  process reloads and restarts
- updated Message.pm to correctly prepend phishing notices in email
  subject
- added avast virus scanner support
- added esets virus scanner support
- added new function InitClamdParser to SweepViruses.pm 
- added new function ProcessClamdOutput to SweepViruses.pm 

05/23/2016 Changes in    v5.0.2-1
==================================
- updated chmod permissions from 0600 to 0660 on work files to address
  permission issues with clamd reading header files

05/23/2016 Changes in    v5.0.1-2
==================================
- fixed install.sh for ms-upgrade-conf

05/22/2016 Changes in    v5.0.1-1
==================================
- added logging of failed HTML disarms to Message.pm

05/13/2016 Changes in    v5.0.0-9
==================================
- RHEL installer correction: creation of /etc/mail/spamassassin/mailscanner.cf
- start levels 80 20 set in Debian and RHEL
- ms-sa-update corrected
- errant removal of /usr/lib/MailScanner corrected
- added checks to remove init.d scripts or links pre-install
- added remove to update-rc.d and chkconfig pre-install
- added add to update-rc.d and chkconfig post-install
- corrected missing variable in RHEL install.sh script
- installers refined and updated

04/30/2016 Changes in    v5.0.0-1
==================================
- New Release
Version 4.84.5
==============
- Upgrade to 4.84.5

Version 4.83.5
==============
- Upgrade to 4.83.5
- Remove extra config file targets-- config files are handled automatically
  in pkg-(de)?install scripts now.

Version 4.83.4
==============
- Upgrade to 4.83.4

Version 4.83.2
==============
- Upgrade to 4.83.2
- Update mta init script so it starts MTAs after other init scripts
  (milters, etc) that should start before "mail".

Version 4.82.6
==============
- Upgrade to 4.82.6

Version 4.81.4
==============
- Upgrade to 4.81.4
- Added dependency for p5-Sys-SigAction port

Version 4.75.11
===============
- Upgrade to 4.75.11

Version 4.67.6
==============
- Upgrade to 4.67.6
- Now works with p5-Mail-Tools Version 2.x again

Version 4.64.3
==============
- Upgrade to 4.64.3

Version 4.62.9
==============
- Upgrade to 4.62.9
- update_spamassassin and update_spamassassin.cron are untouched again. I
  currently do not have enough time to get this running the FreeBSD way.
  Patches are welcome.

Version 4.61.7
==============
- Upgrade to 4.61.7
- Attention: update_spamassassin and update_spamassassin.cron are rewritten to fit
  FreeBSD. Untested. If you are using non-standard directories or FreeBSD < 6 you will
  have to check update_spamassassin.

Version 4.60.8_2
================
- Fixed error in auto-zip: If a message contained 2 different attachments 
  with exactly the same filename, the auto-zip feature would fail and 
  MailScanner would die.

Version 4.60.8
==============
- update to 4.60.8

Version 4.59.4_2
================
- update to 4.59.4

Version 4.58.9_2
================
- clamav-wrapper contained options unarj, unace and zoo. unace
  seems to be dead and the other options are corrected to be
  arj and unzoo.

Version 4.58.9
================
- Upgrade to MailScanner 4.58
- fix: CHANGES.port was not installed anymore
- startscripts now honor RC_SUBR_SUFFIX

Version 4.57.6_1
================
- Upgrade to MailScanner 4.57

Version 4.56.8_1
================
- fixed problem with upgrade_mailscanner_config 

Version 4.56.8
==============
- Upgrade to MailScanner 4.56

Version 4.55.10
===============
- Upgrade to MailScanner 4.55
- As Julian removed the documentation from the tarball I did the same in the port.
  Manpage and html docs removed as well. All documentation can now be found on 
  the web.

Version 4.54.6_1
=================
- Path to gunzip in MailScanner.conf fixed

Version 4.54.6
=================
- Upgrade to MailScanner 4.54
- Download location changed
- added sysutils/p5-Sys-Hostname-Long dependency

Version 4.53.8
=================
- 4.53.7 contained a bug in scanning of phishing mails. This resulted in scanning loops

Version 4.53.7
=================
- Upgrade to MailScanner 4.53
- changed some patch-names
- created sa-update.cron in libexece/MailScanner to periodically run sa-update

Version 4.52.2_1
=================
- fixed bug in mta.sh script
- fixed rc.subr reference in update_phishing_sites.cron and 
  update_virus_scanners.cron --> now dynamically rewritten to correct
  location
- Exim 4.61 changed queue file format which was incompatible with 4.52.2 --> patched

Version 4.52.2
=================
- Upgrade to MailScanner 4.52

Version 4.51.5
=================
- Some changes in FreeBSD 6.1 resulted in problems in the mta.sh script.
  Fixed.
- Upgrade to MailScanenr 4.51

Version 4.50.15_1
=================
- The MailScanner binary is now put into /usr/local/sbin allowing for
  easy use of the command-line options for debugging etc.
- From this version on all ports will contain this Change Log.
- The following scripts are now installed by the port as well (into
  /usr/local/libexec/MailScanner):
	- analyse_SpamAssassin_cache
	- clean.SA.cache (use this for manual clean or in crontab)
	- clean.quarantine (use this for manual clean or in crontab)
	- update_phishing_sites (use this for manual updates)
	- update_phishing_sites.cron (use this in crontab)
	- update_virus_scanners.cron (ise this in crontab)
- The latter two can/should be used in your crontab for updating those
  components. These scripts introduce a random delay for updating (can
  be configured in rc.conf).
- Fixed a small bug in mailscanner.sh script. Status/Stop was not
  always working.

Version 4.50.15
===============
- Upgrade to MailScanner 4.50.15-1
- Start/Stop scripts are now rc.subr compliant. Please adjust your config!
- The port now optionally installs Spamassassin, ClamAV and Bitdefender.
- make renew-wrapper, renew-autoupdate and renew-reports now depend on 
  configure instead of on install allowing their usage after a portupgrade.

Lines 28-34 load_rc_config $name Link Here

(-)b/mail/mailscanner/files/mailscanner.in (-1 / +1 lines)
28	required_files=${mailscanner_configfile:-"%%PREFIX%%/etc/MailScanner/MailScanner.conf"}	28	required_files=${mailscanner_configfile:-"%%PREFIX%%/etc/MailScanner/MailScanner.conf"}
29	pidfile=${mailscanner_pidfile:-"/var/run/MailScanner.pid"}	29	pidfile=${mailscanner_pidfile:-"/var/run/MailScanner.pid"}
30		30
31	command="%%PREFIX%%/sbin/mailscanner"	31	command="%%PREFIX%%/sbin/MailScanner"
32	command_args="${required_files}"	32	command_args="${required_files}"
33	procname="MailScanner"	33	procname="MailScanner"
34	extra_commands=reload	34	extra_commands=reload




PKGVERSION=%%PKGVERSION%%
WITHOUT_SPAMASSASSIN_SYMLINK=%%WITHOUT_SPAMASSASSIN_SYMLINK%%

upgrade_lang_conf()
{
	for LANG_DIR in ${DATADIR}/reports/*
	do
	    if [ -f ${LANG_DIR}/languages.conf ] ; then
		${ECHO} -n Upgrading ${LANG_DIR}/languages.conf... Please wait..
		${PERL} ${DATADIR}/upgrade_languages_conf \
			${LANG_DIR}/languages.conf \
			${LANG_DIR}/languages.conf.sample > \
			${LANG_DIR}/languages.conf.new.${PKGVERSION} \
			2> /dev/null
		if /usr/bin/diff -bBq ${LANG_DIR}/languages.conf \
			${LANG_DIR}/languages.conf.new.${PKGVERSION}
		then	${ECHO} " no changes"
			${RM} ${LANG_DIR}/languages.conf.new.${PKGVERSION}
		else	${ECHO} " done"
			${CP} ${LANG_DIR}/languages.conf.new.${PKGVERSION} \
				${LANG_DIR}/languages.conf
			${CHMOD} u+w ${LANG_DIR}/languages.conf
		fi
	    fi
	done
}

upgrade_mailscanner_conf()
{
	${PERL} ${DATADIR}/upgrade_MailScanner_conf			\
		${PKG_PREFIX}/etc/MailScanner/MailScanner.conf		\
		${PKG_PREFIX}/etc/MailScanner/MailScanner.conf.sample >	\
	    ${PKG_PREFIX}/etc/MailScanner/MailScanner.conf.new.${PKGVERSION} \
		2> /dev/null
	if diff -b -B -q ${PKG_PREFIX}/etc/MailScanner/MailScanner.conf	\
	    ${PKG_PREFIX}/etc/MailScanner/MailScanner.conf.new.${PKGVERSION}
	then	${ECHO} "No changes in MailScanner.conf options found"
	else	${ECHO} -n "Changes in MailScanner.conf found. Please look at"
	    ${ECHO} \
	     "${PKG_PREFIX}/etc/MailScanner/MailScanner.conf.new.${PKGVERSION}"
	fi
}

initial_config()
{
	for LANG_DIR in ${DATADIR}/reports/*
	do
	    for REPORT_FILE in ${LANG_DIR}/*.sample
	    do
		[ ! -f ${REPORT_FILE%.sample} ] \
		    && cp -p ${REPORT_FILE} ${REPORT_FILE%.sample} \
		    && ${CHMOD} u+w ${REPORT_FILE%.sample}
	    done
	done

	for WRAPPER in ${PKG_PREFIX}/libexec/MailScanner/*-wrapper.sample
	do
	    [ ! -f ${WRAPPER%.sample} ] \
		&& cp -p ${WRAPPER} ${WRAPPER%.sample} \
		&& ${CHMOD} u+w ${WRAPPER%.sample}
	done

	for AUTOUPDATE in ${PKG_PREFIX}/libexec/MailScanner/*-autoupdate.sample
	do
	    [ ! -f ${AUTOUPDATE%.sample} ] \
		&& cp -p ${AUTOUPDATE} ${AUTOUPDATE%.sample} \
		&& ${CHMOD} u+w ${AUTOUPDATE%.sample}
	done

	for RULES in ${PKG_PREFIX}/etc/MailScanner/rules/*.rules.sample
	do
	    [ ! -f ${RULES%.sample} ] \
		&& cp -p ${RULES} ${RULES%.sample} \
		&& ${CHMOD} u+w ${RULES%.sample}
	done

	for MCP_FILES in %%MCP_FILES%%
	do
	    [ ! -f ${PKG_PREFIX}/etc/MailScanner/mcp/${MCP_FILES} ] \
		&& cp -p ${PKG_PREFIX}/etc/MailScanner/mcp/${MCP_FILES}.sample \
			${PKG_PREFIX}/etc/MailScanner/mcp/${MCP_FILES} \
		&& ${CHMOD} u+w ${PKG_PREFIX}/etc/MailScanner/mcp/${MCP_FILES}
	done

	for ETC in ${PKG_PREFIX}/etc/MailScanner/*.sample
	do
	    [ ! -f ${ETC%.sample} ] \
		&& cp -p ${ETC} ${ETC%.sample} \
		&& ${CHMOD} u+w ${ETC%.sample}
	done
}

case $2 in
POST-INSTALL)
	[ "x${WITHOUT_SPAMASSASSIN_SYMLINK}" = "xno" ] \
	    && [ ! -r ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf ] \
	    && ${LN} -s ${PKG_PREFIX}/etc/MailScanner/spam.assassin.prefs.conf \
		${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf
	upgrade_lang_conf
	[ -f ${PKG_PREFIX}/etc/MailScanner/MailScanner.conf ] \
		&& upgrade_mailscanner_conf
	initial_config
	exit 0
	;;
esac




%%ETCDIR%%/spam.lists.conf
%%ETCDIR%%/spamassassin.conf
%%ETCDIR%%/virus.scanners.conf
lib/MailScanner/init/ms-init
lib/MailScanner/wrapper/avast-wrapper
lib/MailScanner/wrapper/avg-autoupdate
lib/MailScanner/wrapper/avg-wrapper
lib/MailScanner/wrapper/bitdefender-autoupdate
lib/MailScanner/wrapper/bitdefender-wrapper
lib/MailScanner/wrapper/clamav-autoupdate
lib/MailScanner/wrapper/clamav-wrapper
lib/MailScanner/wrapper/esets-wrapper
lib/MailScanner/wrapper/f-secure-autoupdate
lib/MailScanner/wrapper/f-secure-wrapper
lib/MailScanner/wrapper/generic-autoupdate
lib/MailScanner/wrapper/generic-wrapper
lib/MailScanner/wrapper/sophos-autoupdate
lib/MailScanner/wrapper/sophos-wrapper
man/man8/MailScanner.8.gz
man/man8/mailscanner.8.gz
sbin/MailScanner

Return to bug 219938

Lines 1-8 Link Here

(-)b/mail/mailscanner/Makefile (-4 / +44 lines)
1	# Created by: Jan-Peter Koopmann <j.koopmann@seceidos.de>	1	# Created by: Jan-Peter Koopmann <j.koopmann@seceidos.de>
2	# $FreeBSD$	2	# $FreeBSD: head/mail/mailscanner/Makefile 443125 2017-06-10 23:12:19Z wen $
3		3
4	PORTNAME= MailScanner	4	PORTNAME= MailScanner
5	PORTVERSION= 5.0.3	5	PORTVERSION= 5.0.3
		6	PORTREVISION= 1
6	CATEGORIES= mail	7	CATEGORIES= mail
7	MASTER_SITES= https://s3.amazonaws.com/msv5/release/	8	MASTER_SITES= https://s3.amazonaws.com/msv5/release/
8	DISTNAME= ${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}.nix	9	DISTNAME= ${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}.nix
Lines 148-153 post-patch: Link Here
148	${REINPLACE_CMD} -e 's,\$$(mktemp),$$(mktemp -t tmp),' \	149	${REINPLACE_CMD} -e 's,\$$(mktemp),$$(mktemp -t tmp),' \
149	${WRKSRC}/usr/lib/${PORTNAME}/wrapper/clamav-wrapper \	150	${WRKSRC}/usr/lib/${PORTNAME}/wrapper/clamav-wrapper \
150	${WRKSRC}/usr/lib/${PORTNAME}/wrapper/bitdefender-wrapper	151	${WRKSRC}/usr/lib/${PORTNAME}/wrapper/bitdefender-wrapper
		152	${REINPLACE_CMD} -e 's,/etc,${LOCALBASE}/etc,' \
		153	-e 's\|/usr/bin/tnef\|${LOCALBASE}/bin/tnef\|g' \
		154	-e 's\|/usr/bin/unrar\|${LOCALBASE}/bin/unrar\|g' \
		155	-e 's\|/usr/bin/antiword\|${LOCALBASE}/bin/antiword\|g' \
		156	-e 's\|/usr/bin/re2c\|${LOCALBASE}/bin/re2c\|g' \
		157	-e 's\|/usr/bin/clamscan\|${LOCALBASE}/bin/clamscan\|g' \
		158	-e 's\|/usr/share\|${LOCALBASE}/share\|g' \
		159	${WRKSRC}/usr/sbin/* \
		160	${WRKSRC}/usr/lib/${PORTNAME}/init/ms-init \
		161	${WRKSRC}/etc/${PORTNAME}/rules/* \
		162	${WRKSRC}/etc/${PORTNAME}/*.conf \
		163	${WRKSRC}/etc/${PORTNAME}/defaults \
		164	${WRKSRC}/usr/lib/${PORTNAME}/wrapper/* \
		165	${WRKSRC}/usr/share/${PORTNAME}/perl/${PORTNAME}/CustomConfig.pm \
		166	${WRKSRC}/usr/share/${PORTNAME}/perl/${PORTNAME}/ConfigDefs.pl \
		167	${WRKSRC}/usr/share/${PORTNAME}/perl/custom/SpamWhitelist.pm \
		168	${WRKSRC}/usr/share/${PORTNAME}/perl/${PORTNAME}/Exim.pm
		169	${REINPLACE_CMD} -e 's,/usr/sbin,${LOCALBASE}/sbin,' \
		170	-e 's,/usr/share,${LOCALBASE}/share,g' \
		171	${WRKSRC}/usr/sbin/* \
		172	${WRKSRC}/usr/lib/${PORTNAME}/init/ms-init \
		173	${WRKSRC}/etc/${PORTNAME}/*.conf \
		174	${WRKSRC}/etc/${PORTNAME}/defaults \
		175	${WRKSRC}/usr/share/${PORTNAME}/perl/${PORTNAME}/Exim.pm \
		176	${WRKSRC}/usr/lib/${PORTNAME}/wrapper/*
		177	${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${LOCALBASE}/bin/perl\|g' \
		178	-e 's\|/usr/share/${PORTNAME}\|${LOCALBASE}/share/${PORTNAME}\|g' \
		179	-e 's\|/usr/lib/${PORTNAME}\|${LOCALBASE}/lib/${PORTNAME}\|g' \
		180	${WRKSRC}/usr/share/${PORTNAME}/perl/${PORTNAME}/CustomConfig.pm
		181	${REINPLACE_CMD} -e 's\|/usr/bin/perldoc\|${LOCALBASE}/bin/perldoc\|g' \
		182	${WRKSRC}/usr/sbin/ms-perl-check
		183	${REINPLACE_CMD} -e 's\|/usr/bin/exim\|${LOCALBASE}/bin/exim\|g' \
		184	${WRKSRC}/usr/share/${PORTNAME}/perl/${PORTNAME}/Exim.pm
		185	${REINPLACE_CMD} -e 's\|/usr/lib\|${LOCALBASE}/lib\|g' \
		186	${WRKSRC}/usr/sbin/ms-create-locks \
		187	${WRKSRC}/usr/sbin/ms-update-bad-emails \
		188	${WRKSRC}/usr/sbin/ms-check \
		189	${WRKSRC}/usr/sbin/ms-cron \
		190	${WRKSRC}/etc/${PORTNAME}/virus.scanners.conf \
		191	${WRKSRC}/etc/${PORTNAME}/defaults
151		192
152	do-build:	193	do-build:
153	@${REINPLACE_CMD} \	194	@${REINPLACE_CMD} \
Lines 169-175 do-build: Link Here
169	-e 's,/usr/lib/sendmail,/usr/sbin/sendmail,g' \	210	-e 's,/usr/lib/sendmail,/usr/sbin/sendmail,g' \
170	${WRKSRC}/usr/sbin/${PORTNAME} \	211	${WRKSRC}/usr/sbin/${PORTNAME} \
171	${WRKSRC}/usr/sbin/ms-create-locks \	212	${WRKSRC}/usr/sbin/ms-create-locks \
172	${WRKSRC}/usr/lib/${PORTNAME}/init/ms-init \	213	${WRKSRC}/usr/sbin/ms-update-sa
173		214
174	@${REINPLACE_CMD} \	215	@${REINPLACE_CMD} \
175	-e 's,/opt/${PORTNAME}/var/${PORTNAME}.pid,/var/run/${PORTNAME}.pid,g' \	216	-e 's,/opt/${PORTNAME}/var/${PORTNAME}.pid,/var/run/${PORTNAME}.pid,g' \
Lines 178-186 do-build: Link Here
178	-e 's,/opt/${PORTNAME}/etc/reports,${DATADIR}/reports,g' \	219	-e 's,/opt/${PORTNAME}/etc/reports,${DATADIR}/reports,g' \
179	-e 's,/opt/${PORTNAME}/etc,${PREFIX}/etc/${PORTNAME},g' \	220	-e 's,/opt/${PORTNAME}/etc,${PREFIX}/etc/${PORTNAME},g' \
180	-e 's,/opt/${PORTNAME}/lib,${PREFIX}/lib/${PORTNAME},g' \	221	-e 's,/opt/${PORTNAME}/lib,${PREFIX}/lib/${PORTNAME},g' \
181	-e 's,/usr/bin/unrar,${LOCALBASE}/bin/unrar,g' \
182	-e 's,/bin/gunzip,/usr/bin/gunzip,g' \	222	-e 's,/bin/gunzip,/usr/bin/gunzip,g' \
183	-e 's,/etc/mail/spamassassin,${LOCALBASE}/etc/mail/spamassassin,g' \
184	-e 's,/tmp/clamd.socket,/var/run/clamav/clamd.sock,g' \	223	-e 's,/tmp/clamd.socket,/var/run/clamav/clamd.sock,g' \
185	-e 's,/usr/local/share/clamav,/var/db/clamav,g' \	224	-e 's,/usr/local/share/clamav,/var/db/clamav,g' \
186	${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf	225	${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf
Lines 198-203 do-build: Link Here
198		237
199	do-install:	238	do-install:
200	(cd ${WRKSRC}/etc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/etc)	239	(cd ${WRKSRC}/etc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/etc)
		240	(cd ${WRKSRC}/usr/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib)
201	(cd ${WRKSRC}/usr/sbin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin)	241	(cd ${WRKSRC}/usr/sbin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin)
202	(cd ${WRKSRC}/usr/share && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share)	242	(cd ${WRKSRC}/usr/share && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share)
203	cd ${WRKDIR} && \	243	cd ${WRKDIR} && \

Lines 1-204 Link Here

(-)b/mail/mailscanner/files/CHANGES.port (-204 / +39 lines)
1	Version 4.85.2_3	1	08/14/2016 Changes in v5.0.3-7
2	==============	2	==================================
3	- Upgrade to 4.85.2-3	3	- updated init script to include a time-wait for pid files during
4		4	process reloads and restarts
5	Version 4.84.6	5	- updated Message.pm to correctly prepend phishing notices in email
6	==============	6	subject
7	- Upgrade to 4.84.6	7	- added avast virus scanner support
8	- Added some patches for tmp file bugs	8	- added esets virus scanner support
9	reported/provided by brad@comstyle.com	9	- added new function InitClamdParser to SweepViruses.pm
10	from the OpenBSD port and GitHub repository.	10	- added new function ProcessClamdOutput to SweepViruses.pm
11		11
12	Version 4.84.6	12	05/23/2016 Changes in v5.0.2-1
13	==============	13	==================================
14	- Upgrade to 4.84.6	14	- updated chmod permissions from 0600 to 0660 on work files to address
15	- Added some patches for tmp file bugs	15	permission issues with clamd reading header files
16	reported/provided by brad@comstyle.com	16
17	from the OpenBSD port and GitHub repository.	17	05/23/2016 Changes in v5.0.1-2
18		18	==================================
19	Version 4.84.5_3 (not bumped)	19	- fixed install.sh for ms-upgrade-conf
20	================	20
21	- Use OptionsNG	21	05/22/2016 Changes in v5.0.1-1
22	- Remove deprecated header information	22	==================================
23	- Removed check for perl versions that are deprecated to install and	23	- added logging of failed HTML disarms to Message.pm
24	scheduled for removal from the ports tree.	24
25		25	05/13/2016 Changes in v5.0.0-9
26	Version 4.84.5_3	26	==================================
27	================	27	- RHEL installer correction: creation of /etc/mail/spamassassin/mailscanner.cf
28	- Added FreeBSD required mktemp options	28	- start levels 80 20 set in Debian and RHEL
29		29	- ms-sa-update corrected
30	Version 4.84.5_2	30	- errant removal of /usr/lib/MailScanner corrected
31	================	31	- added checks to remove init.d scripts or links pre-install
32	- Fixed creation of mailscanner.cf symlink	32	- added remove to update-rc.d and chkconfig pre-install
33		33	- added add to update-rc.d and chkconfig post-install
34	Version 4.84.5_1	34	- corrected missing variable in RHEL install.sh script
35	================	35	- installers refined and updated
36	- Added patch for TNEF.pm bug	36
37	- Fixed creation of mailscanner.cf symlink	37	04/30/2016 Changes in v5.0.0-1
38	- Minor doc updates	38	==================================
39		39	- New Release
40	Version 4.84.5
41	==============
42	- Upgrade to 4.84.5
43
44	Version 4.83.5
45	==============
46	- Upgrade to 4.83.5
47	- Remove extra config file targets-- config files are handled automatically
48	in pkg-(de)?install scripts now.
49
50	Version 4.83.4
51	==============
52	- Upgrade to 4.83.4
53
54	Version 4.83.2
55	==============
56	- Upgrade to 4.83.2
57	- Update mta init script so it starts MTAs after other init scripts
58	(milters, etc) that should start before "mail".
59
60	Version 4.82.6
61	==============
62	- Upgrade to 4.82.6
63
64	Version 4.81.4
65	==============
66	- Upgrade to 4.81.4
67	- Added dependency for p5-Sys-SigAction port
68
69	Version 4.75.11
70	===============
71	- Upgrade to 4.75.11
72
73	Version 4.67.6
74	==============
75	- Upgrade to 4.67.6
76	- Now works with p5-Mail-Tools Version 2.x again
77
78	Version 4.64.3
79	==============
80	- Upgrade to 4.64.3
81
82	Version 4.62.9
83	==============
84	- Upgrade to 4.62.9
85	- update_spamassassin and update_spamassassin.cron are untouched again. I
86	currently do not have enough time to get this running the FreeBSD way.
87	Patches are welcome.
88
89	Version 4.61.7
90	==============
91	- Upgrade to 4.61.7
92	- Attention: update_spamassassin and update_spamassassin.cron are rewritten to fit
93	FreeBSD. Untested. If you are using non-standard directories or FreeBSD < 6 you will
94	have to check update_spamassassin.
95
96	Version 4.60.8_2
97	================
98	- Fixed error in auto-zip: If a message contained 2 different attachments
99	with exactly the same filename, the auto-zip feature would fail and
100	MailScanner would die.
101
102	Version 4.60.8
103	==============
104	- update to 4.60.8
105
106	Version 4.59.4_2
107	================
108	- update to 4.59.4
109
110	Version 4.58.9_2
111	================
112	- clamav-wrapper contained options unarj, unace and zoo. unace
113	seems to be dead and the other options are corrected to be
114	arj and unzoo.
115
116	Version 4.58.9
117	================
118	- Upgrade to MailScanner 4.58
119	- fix: CHANGES.port was not installed anymore
120	- startscripts now honor RC_SUBR_SUFFIX
121
122	Version 4.57.6_1
123	================
124	- Upgrade to MailScanner 4.57
125
126	Version 4.56.8_1
127	================
128	- fixed problem with upgrade_mailscanner_config
129
130	Version 4.56.8
131	==============
132	- Upgrade to MailScanner 4.56
133
134	Version 4.55.10
135	===============
136	- Upgrade to MailScanner 4.55
137	- As Julian removed the documentation from the tarball I did the same in the port.
138	Manpage and html docs removed as well. All documentation can now be found on
139	the web.
140
141	Version 4.54.6_1
142	=================
143	- Path to gunzip in MailScanner.conf fixed
144
145	Version 4.54.6
146	=================
147	- Upgrade to MailScanner 4.54
148	- Download location changed
149	- added sysutils/p5-Sys-Hostname-Long dependency
150
151	Version 4.53.8
152	=================
153	- 4.53.7 contained a bug in scanning of phishing mails. This resulted in scanning loops
154
155	Version 4.53.7
156	=================
157	- Upgrade to MailScanner 4.53
158	- changed some patch-names
159	- created sa-update.cron in libexece/MailScanner to periodically run sa-update
160
161	Version 4.52.2_1
162	=================
163	- fixed bug in mta.sh script
164	- fixed rc.subr reference in update_phishing_sites.cron and
165	update_virus_scanners.cron --> now dynamically rewritten to correct
166	location
167	- Exim 4.61 changed queue file format which was incompatible with 4.52.2 --> patched
168
169	Version 4.52.2
170	=================
171	- Upgrade to MailScanner 4.52
172
173	Version 4.51.5
174	=================
175	- Some changes in FreeBSD 6.1 resulted in problems in the mta.sh script.
176	Fixed.
177	- Upgrade to MailScanenr 4.51
178
179	Version 4.50.15_1
180	=================
181	- The MailScanner binary is now put into /usr/local/sbin allowing for
182	easy use of the command-line options for debugging etc.
183	- From this version on all ports will contain this Change Log.
184	- The following scripts are now installed by the port as well (into
185	/usr/local/libexec/MailScanner):
186	- analyse_SpamAssassin_cache
187	- clean.SA.cache (use this for manual clean or in crontab)
188	- clean.quarantine (use this for manual clean or in crontab)
189	- update_phishing_sites (use this for manual updates)
190	- update_phishing_sites.cron (use this in crontab)
191	- update_virus_scanners.cron (ise this in crontab)
192	- The latter two can/should be used in your crontab for updating those
193	components. These scripts introduce a random delay for updating (can
194	be configured in rc.conf).
195	- Fixed a small bug in mailscanner.sh script. Status/Stop was not
196	always working.
197
198	Version 4.50.15
199	===============
200	- Upgrade to MailScanner 4.50.15-1
201	- Start/Stop scripts are now rc.subr compliant. Please adjust your config!
202	- The port now optionally installs Spamassassin, ClamAV and Bitdefender.
203	- make renew-wrapper, renew-autoupdate and renew-reports now depend on
204	configure instead of on install allowing their usage after a portupgrade.

Lines 12-116 RM=/bin/rm Link Here

(-)b/mail/mailscanner/files/pkg-install.in (-93 lines)
12	PKGVERSION=%%PKGVERSION%%	12	PKGVERSION=%%PKGVERSION%%
13	WITHOUT_SPAMASSASSIN_SYMLINK=%%WITHOUT_SPAMASSASSIN_SYMLINK%%	13	WITHOUT_SPAMASSASSIN_SYMLINK=%%WITHOUT_SPAMASSASSIN_SYMLINK%%
14		14
15	upgrade_lang_conf()
16	{
17	for LANG_DIR in ${DATADIR}/reports/*
18	do
19	if [ -f ${LANG_DIR}/languages.conf ] ; then
20	${ECHO} -n Upgrading ${LANG_DIR}/languages.conf... Please wait..
21	${PERL} ${DATADIR}/upgrade_languages_conf \
22	${LANG_DIR}/languages.conf \
23	${LANG_DIR}/languages.conf.sample > \
24	${LANG_DIR}/languages.conf.new.${PKGVERSION} \
25	2> /dev/null
26	if /usr/bin/diff -bBq ${LANG_DIR}/languages.conf \
27	${LANG_DIR}/languages.conf.new.${PKGVERSION}
28	then ${ECHO} " no changes"
29	${RM} ${LANG_DIR}/languages.conf.new.${PKGVERSION}
30	else ${ECHO} " done"
31	${CP} ${LANG_DIR}/languages.conf.new.${PKGVERSION} \
32	${LANG_DIR}/languages.conf
33	${CHMOD} u+w ${LANG_DIR}/languages.conf
34	fi
35	fi
36	done
37	}
38
39	upgrade_mailscanner_conf()
40	{
41	${PERL} ${DATADIR}/upgrade_MailScanner_conf \
42	${PKG_PREFIX}/etc/MailScanner/MailScanner.conf \
43	${PKG_PREFIX}/etc/MailScanner/MailScanner.conf.sample > \
44	${PKG_PREFIX}/etc/MailScanner/MailScanner.conf.new.${PKGVERSION} \
45	2> /dev/null
46	if diff -b -B -q ${PKG_PREFIX}/etc/MailScanner/MailScanner.conf \
47	${PKG_PREFIX}/etc/MailScanner/MailScanner.conf.new.${PKGVERSION}
48	then ${ECHO} "No changes in MailScanner.conf options found"
49	else ${ECHO} -n "Changes in MailScanner.conf found. Please look at"
50	${ECHO} \
51	"${PKG_PREFIX}/etc/MailScanner/MailScanner.conf.new.${PKGVERSION}"
52	fi
53	}
54
55	initial_config()
56	{
57	for LANG_DIR in ${DATADIR}/reports/*
58	do
59	for REPORT_FILE in ${LANG_DIR}/*.sample
60	do
61	[ ! -f ${REPORT_FILE%.sample} ] \
62	&& cp -p ${REPORT_FILE} ${REPORT_FILE%.sample} \
63	&& ${CHMOD} u+w ${REPORT_FILE%.sample}
64	done
65	done
66
67	for WRAPPER in ${PKG_PREFIX}/libexec/MailScanner/*-wrapper.sample
68	do
69	[ ! -f ${WRAPPER%.sample} ] \
70	&& cp -p ${WRAPPER} ${WRAPPER%.sample} \
71	&& ${CHMOD} u+w ${WRAPPER%.sample}
72	done
73
74	for AUTOUPDATE in ${PKG_PREFIX}/libexec/MailScanner/*-autoupdate.sample
75	do
76	[ ! -f ${AUTOUPDATE%.sample} ] \
77	&& cp -p ${AUTOUPDATE} ${AUTOUPDATE%.sample} \
78	&& ${CHMOD} u+w ${AUTOUPDATE%.sample}
79	done
80
81	for RULES in ${PKG_PREFIX}/etc/MailScanner/rules/*.rules.sample
82	do
83	[ ! -f ${RULES%.sample} ] \
84	&& cp -p ${RULES} ${RULES%.sample} \
85	&& ${CHMOD} u+w ${RULES%.sample}
86	done
87
88	for MCP_FILES in %%MCP_FILES%%
89	do
90	[ ! -f ${PKG_PREFIX}/etc/MailScanner/mcp/${MCP_FILES} ] \
91	&& cp -p ${PKG_PREFIX}/etc/MailScanner/mcp/${MCP_FILES}.sample \
92	${PKG_PREFIX}/etc/MailScanner/mcp/${MCP_FILES} \
93	&& ${CHMOD} u+w ${PKG_PREFIX}/etc/MailScanner/mcp/${MCP_FILES}
94	done
95
96	for ETC in ${PKG_PREFIX}/etc/MailScanner/*.sample
97	do
98	[ ! -f ${ETC%.sample} ] \
99	&& cp -p ${ETC} ${ETC%.sample} \
100	&& ${CHMOD} u+w ${ETC%.sample}
101	done
102	}
103
104	case $2 in	15	case $2 in
105	POST-INSTALL)	16	POST-INSTALL)
106	[ "x${WITHOUT_SPAMASSASSIN_SYMLINK}" = "xno" ] \	17	[ "x${WITHOUT_SPAMASSASSIN_SYMLINK}" = "xno" ] \
107	&& [ ! -r ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf ] \	18	&& [ ! -r ${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf ] \
108	&& ${LN} -s ${PKG_PREFIX}/etc/MailScanner/spam.assassin.prefs.conf \	19	&& ${LN} -s ${PKG_PREFIX}/etc/MailScanner/spam.assassin.prefs.conf \
109	${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf	20	${PKG_PREFIX}/etc/mail/spamassassin/mailscanner.cf
110	upgrade_lang_conf
111	[ -f ${PKG_PREFIX}/etc/MailScanner/MailScanner.conf ] \
112	&& upgrade_mailscanner_conf
113	initial_config
114	exit 0	21	exit 0
115	;;	22	;;
116	esac	23	esac

Lines 18-23 Link Here

(-)b/mail/mailscanner/pkg-plist (+15 lines)
18	%%ETCDIR%%/spam.lists.conf	18	%%ETCDIR%%/spam.lists.conf
19	%%ETCDIR%%/spamassassin.conf	19	%%ETCDIR%%/spamassassin.conf
20	%%ETCDIR%%/virus.scanners.conf	20	%%ETCDIR%%/virus.scanners.conf
		21	lib/MailScanner/init/ms-init
		22	lib/MailScanner/wrapper/avast-wrapper
		23	lib/MailScanner/wrapper/avg-autoupdate
		24	lib/MailScanner/wrapper/avg-wrapper
		25	lib/MailScanner/wrapper/bitdefender-autoupdate
		26	lib/MailScanner/wrapper/bitdefender-wrapper
		27	lib/MailScanner/wrapper/clamav-autoupdate
		28	lib/MailScanner/wrapper/clamav-wrapper
		29	lib/MailScanner/wrapper/esets-wrapper
		30	lib/MailScanner/wrapper/f-secure-autoupdate
		31	lib/MailScanner/wrapper/f-secure-wrapper
		32	lib/MailScanner/wrapper/generic-autoupdate
		33	lib/MailScanner/wrapper/generic-wrapper
		34	lib/MailScanner/wrapper/sophos-autoupdate
		35	lib/MailScanner/wrapper/sophos-wrapper
21	man/man8/MailScanner.8.gz	36	man/man8/MailScanner.8.gz
22	man/man8/mailscanner.8.gz	37	man/man8/mailscanner.8.gz
23	sbin/MailScanner	38	sbin/MailScanner