Attachment #123623 for bug #167000

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

Lines 7-13 Link Here

(-)mailscanner/Makefile (-2 / +2 lines)
7		7
8	PORTNAME= MailScanner	8	PORTNAME= MailScanner
9	PORTVERSION= 4.84.5	9	PORTVERSION= 4.84.5
10	PORTREVISION= 2	10	PORTREVISION= 3
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/
13	DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}	13	DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
Lines 150-156 Link Here
150	-e 's,/usr/bin/clamscan,${LOCALBASE}/bin/clamscan,g' \	150	-e 's,/usr/bin/clamscan,${LOCALBASE}/bin/clamscan,g' \
151	-e 's,/usr/bin/sa-compile,${LOCALBASE}/bin/sa-compile,g' \	151	-e 's,/usr/bin/sa-compile,${LOCALBASE}/bin/sa-compile,g' \
152	-e 's,/usr/bin/sa-update,${LOCALBASE}/bin/sa-update,g' \	152	-e 's,/usr/bin/sa-update,${LOCALBASE}/bin/sa-update,g' \
153	-e 's,/usr/bin/unzip,${LOCALBASE}/bin/unzip,g' \	153	-e 's,/usr/bin/unzip,${UNZIP_CMD},g' \
154	-e 's,/usr/bin/wget,${LOCALBASE}/bin/wget,g' \	154	-e 's,/usr/bin/wget,${LOCALBASE}/bin/wget,g' \
155	-e 's,/usr/lib/sendmail,/usr/sbin/sendmail,g' \	155	-e 's,/usr/lib/sendmail,/usr/sbin/sendmail,g' \
156	${WRKSRC}/bin/MailScanner \	156	${WRKSRC}/bin/MailScanner \




Version 4.84.5_3
================
- Added FreeBSD required mktemp options

Version 4.84.5_2
================
- Fixed creation of mailscanner.cf symlink

Version 4.84.5_1
================
- Added patch for TNEF.pm bug

==============
- 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
================

Line 0 Link Here

(-)mailscanner/files/patch-bin__Sophos.install (+11 lines)
	1	--- ./bin/Sophos.install.orig 2011-08-20 08:32:02.000000000 -0400
	2	+++ ./bin/Sophos.install 2012-04-16 10:42:59.000000000 -0400
	3	@@ -125,7 +125,7 @@
	4	#rm -f /tmp/crontab.$$
	5	#crontab -l \| sed -e 's/^$.savupdate.$$/# &/' > /tmp/crontab.$$
	6	#crontab /tmp/crontab.$$
	7	- crontmpfile=$(mktemp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	8	+ crontmpfile=$(mktemp -t tmp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	9	crontab -l \| sed -e 's/^$.savupdate.$$/# &/' > $crontmpfile
	10	crontab $crontmpfile
	11	rm -f $crontmpfile

Line 0 Link Here

(-)mailscanner/files/patch-bin__Sophos.install.linux (+11 lines)
	1	--- ./bin/Sophos.install.linux.orig 2011-08-20 08:32:02.000000000 -0400
	2	+++ ./bin/Sophos.install.linux 2012-04-16 10:43:06.000000000 -0400
	3	@@ -125,7 +125,7 @@
	4	#rm -f /tmp/crontab.$$
	5	#crontab -l \| sed -e 's/^$.savupdate.$$/# &/' > /tmp/crontab.$$
	6	#crontab /tmp/crontab.$$
	7	- crontmpfile=$(mktemp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	8	+ crontmpfile=$(mktemp -t tmp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	9	crontab -l \| sed -e 's/^$.savupdate.$$/# &/' > $crontmpfile
	10	crontab $crontmpfile
	11	rm -f $crontmpfile




--- ./lib/clamav-wrapper.orig	2011-08-20 08:32:02.000000000 -0400
+++ ./lib/clamav-wrapper	2012-03-09 08:41:47.000000000 -0500
@@ -51,6 +51,9 @@
 
 # You may want to check this script for bash-isms
 
+PATH=$PATH:/usr/local/bin
+export PATH
+
 #TempDir="/tmp/clamav.$$"
 TempDir=$(mktemp) || { echo "$0: Cannot make name for temporary dir" >&2; exit 1; }
 ClamUser="clamav"

Line 0 Link Here

(-)mailscanner/files/patch-lib__bitdefender-wrapper (+11 lines)
	1	--- ./lib/bitdefender-wrapper.orig 2011-08-20 08:20:04.000000000 -0400
	2	+++ ./lib/bitdefender-wrapper 2012-04-16 10:43:25.000000000 -0400
	3	@@ -34,7 +34,7 @@
	4	extras=''
	5
	6	#LogFile=/tmp/log.bdc.$$
	7	-LogFile=$(mktemp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	8	+LogFile=$(mktemp -t tmp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	9
	10	if [ -x ${PackageDir}/bdscan ]; then
	11	# Version 7.5 is installed




--- ./lib/clamav-wrapper.orig	2012-04-16 10:38:36.000000000 -0400
+++ ./lib/clamav-wrapper	2012-04-16 10:41:34.000000000 -0400
@@ -51,8 +51,11 @@
 
 # You may want to check this script for bash-isms
 
+PATH=$PATH:/usr/local/bin
+export PATH
+
 #TempDir="/tmp/clamav.$$"
-TempDir=$(mktemp) || { echo "$0: Cannot make name for temporary dir" >&2; exit 1; }
+TempDir=$(mktemp -t tmp) || { echo "$0: Cannot make name for temporary dir" >&2; exit 1; }
 ClamUser="clamav"
 ClamGroup="clamav"
 




--- ./lib/kaspersky-wrapper.orig	2011-08-20 08:32:02.000000000 -0400
+++ ./lib/kaspersky-wrapper	2012-04-16 10:43:41.000000000 -0400
@@ -42,7 +42,7 @@
 Scanner=kav4fs/bin/kav4fs-kavscanner
 if [ -x ${PackageDir}/$Scanner ]; then
   #Report=/tmp/kavoutput.tmp.$$
-  Report=$(mktemp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
+  Report=$(mktemp -t tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
   ScanOptions="-xp -i0" # Don't report progress, don't attempt to clean
   if [ "x$1" = "x-IsItInstalled" ]; then
     exit 0
@@ -61,7 +61,7 @@
 Scanner=kav4unix/bin/kavscanner
 if [ -x ${PackageDir}/$Scanner ]; then
   #Report=/tmp/kavoutput.tmp.$$
-  Report=$(mktemp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
+  Report=$(mktemp -t tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
   ScanOptions="-xp -i0" # Don't report progress, don't attempt to clean
   if [ "x$1" = "x-IsItInstalled" ]; then
     exit 0
@@ -80,7 +80,7 @@
 Scanner=bin/kavscanner
 if [ -x ${PackageDir}/$Scanner ]; then
   #Report=/tmp/kavoutput.tmp.$$
-  Report=$(mktemp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
+  Report=$(mktemp -t tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
   ScanOptions="-xp -i0" # Don't report progress, don't attempt to clean
   if [ "x$1" = "x-IsItInstalled" ]; then
     exit 0

Line 0 Link Here

(-)mailscanner/files/patch-lib__trend-autoupdate (+11 lines)
	1	--- ./lib/trend-autoupdate.orig 2011-08-20 08:27:46.000000000 -0400
	2	+++ ./lib/trend-autoupdate 2012-04-16 10:43:16.000000000 -0400
	3	@@ -16,7 +16,7 @@
	4	shift
	5
	6	#TEMPDIR=/tmp/trend-update.$$
	7	-TEMPDIR=$(mktemp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	8	+TEMPDIR=$(mktemp -t tmp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	9	# In case it's a link
	10	rm -f $TEMPDIR >/dev/null 2>&1
	11	# In case it's a dir

Return to bug 167000

Lines 1-3 Link Here

(-)mailscanner/files/CHANGES.port (-2 / +10 lines)
		1	Version 4.84.5_3
		2	================
		3	- Added FreeBSD required mktemp options
		4
		5	Version 4.84.5_2
		6	================
		7	- Fixed creation of mailscanner.cf symlink
		8
1	Version 4.84.5_1	9	Version 4.84.5_1
2	================	10	================
3	- Added patch for TNEF.pm bug	11	- Added patch for TNEF.pm bug
Lines 57-64 Link Here
57	==============	65	==============
58	- Upgrade to 4.61.7	66	- Upgrade to 4.61.7
59	- Attention: update_spamassassin and update_spamassassin.cron are rewritten to fit	67	- Attention: update_spamassassin and update_spamassassin.cron are rewritten to fit
60	FreeBSD. Untestet. If you are using non-standard directories or FreeBSD < 6 you will	68	FreeBSD. Untested. If you are using non-standard directories or FreeBSD < 6 you will
61	have to tweck update_spamassassin.	69	have to check update_spamassassin.
62		70
63	Version 4.60.8_2	71	Version 4.60.8_2
64	================	72	================

Lines 1-12 Link Here

(-)mailscanner/files/patch-lib-clamav-wrapper (-12 lines)
1	--- ./lib/clamav-wrapper.orig 2011-08-20 08:32:02.000000000 -0400
2	+++ ./lib/clamav-wrapper 2012-03-09 08:41:47.000000000 -0500
3	@@ -51,6 +51,9 @@
4
5	# You may want to check this script for bash-isms
6
7	+PATH=$PATH:/usr/local/bin
8	+export PATH
9	+
10	#TempDir="/tmp/clamav.$$"
11	TempDir=$(mktemp) \|\| { echo "$0: Cannot make name for temporary dir" >&2; exit 1; }
12	ClamUser="clamav"

Line 0 Link Here

(-)mailscanner/files/patch-lib__clamav-wrapper (+15 lines)
	1	--- ./lib/clamav-wrapper.orig 2012-04-16 10:38:36.000000000 -0400
	2	+++ ./lib/clamav-wrapper 2012-04-16 10:41:34.000000000 -0400
	3	@@ -51,8 +51,11 @@
	4
	5	# You may want to check this script for bash-isms
	6
	7	+PATH=$PATH:/usr/local/bin
	8	+export PATH
	9	+
	10	#TempDir="/tmp/clamav.$$"
	11	-TempDir=$(mktemp) \|\| { echo "$0: Cannot make name for temporary dir" >&2; exit 1; }
	12	+TempDir=$(mktemp -t tmp) \|\| { echo "$0: Cannot make name for temporary dir" >&2; exit 1; }
	13	ClamUser="clamav"
	14	ClamGroup="clamav"
	15

Line 0 Link Here

(-)mailscanner/files/patch-lib__kaspersky-wrapper (+29 lines)
	1	--- ./lib/kaspersky-wrapper.orig 2011-08-20 08:32:02.000000000 -0400
	2	+++ ./lib/kaspersky-wrapper 2012-04-16 10:43:41.000000000 -0400
	3	@@ -42,7 +42,7 @@
	4	Scanner=kav4fs/bin/kav4fs-kavscanner
	5	if [ -x ${PackageDir}/$Scanner ]; then
	6	#Report=/tmp/kavoutput.tmp.$$
	7	- Report=$(mktemp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	8	+ Report=$(mktemp -t tmp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	9	ScanOptions="-xp -i0" # Don't report progress, don't attempt to clean
	10	if [ "x$1" = "x-IsItInstalled" ]; then
	11	exit 0
	12	@@ -61,7 +61,7 @@
	13	Scanner=kav4unix/bin/kavscanner
	14	if [ -x ${PackageDir}/$Scanner ]; then
	15	#Report=/tmp/kavoutput.tmp.$$
	16	- Report=$(mktemp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	17	+ Report=$(mktemp -t tmp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	18	ScanOptions="-xp -i0" # Don't report progress, don't attempt to clean
	19	if [ "x$1" = "x-IsItInstalled" ]; then
	20	exit 0
	21	@@ -80,7 +80,7 @@
	22	Scanner=bin/kavscanner
	23	if [ -x ${PackageDir}/$Scanner ]; then
	24	#Report=/tmp/kavoutput.tmp.$$
	25	- Report=$(mktemp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	26	+ Report=$(mktemp -t tmp) \|\| { echo "$0: Cannot create temporary file" >&2; exit 1; }
	27	ScanOptions="-xp -i0" # Don't report progress, don't attempt to clean
	28	if [ "x$1" = "x-IsItInstalled" ]; then
	29	exit 0