Attachment #30359 for bug #51153

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




# Based on amavisd ports makefile.

PORTNAME=	amavisd-new
PORTVERSION=	20030314.p1
PORTREVISION=	2
CATEGORIES=	security
MASTER_SITES=	http://www.ijs.si/software/amavisd/
DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-p/}

		       -e 's,%%PREFIX%%,${PREFIX},g' \
	               < ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
	done
	for file in amavisd.conf amavisd; do \
		${SED} -e 's,%%AMAVISUSER%%,${AMAVISUSER},g' \
		       -e 's,%%AMAVISGROUP%%,${AMAVISGROUP},g' \
		       -e 's,%%AMAVISDIR%%,${AMAVISDIR},g' \

	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${PREFIX}/sbin
.endif
	${INSTALL_SCRIPT} ${WRKDIR}/amavisd ${PREFIX}/sbin
	${INSTALL_SCRIPT} ${WRKDIR}/amavisdconf ${PREFIX}/sbin
	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist
	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.sh ${PREFIX}/etc/rc.d
.if !defined(NOPORTDOCS)

	README_FILES/README.customize README_FILES/README.exim_v3 \
	README_FILES/README.exim_v4 README_FILES/README.exim_v4_app \
	README_FILES/README.lookups README_FILES/README.milter \
	README_FILES/README.chroot README_FILES/README.old.scanners \
	README_FILES/README.performance README_FILES/README.postfix \
	README_FILES/README.sendmail RELEASE_NOTES
	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}

Line 1 Link Here

(-)amavisd-new/distinfo (-1 / +1 lines)
1	MD5 (amavisd-new-20021227-p2.tar.gz) = b147d532730cf7c77fef71114234ff65	1	MD5 (amavisd-new-20030314-p1.tar.gz) = 3dcee8ad46afbf23d09bdea64621e5a3




if [ "$2" = "POST-DEINSTALL" ]; then

    if /usr/sbin/pw group show "${GROUP}" 2>&1 >/dev/null; then
	echo "You should manually remove the \"${GROUP}\" group."
	echo "Deleted group \"${GROUP}\"."
    fi

    if /usr/sbin/pw user show "${USER}" 2>&1 >/dev/null; then
	echo "You should manually remove the \"${USER}\" user."
	echo "Deleted user \"${USER}\"."
    fi

    if [ -e ${DIR} ]; then
	echo "You should manually remove the \"${DIR}\" directory."
	echo "Deleted \"${DIR}\" directory."
    fi
    
    if [ -e ${QUARANTINE} ]; then




--- amavisd.conf.orig	Wed Mar 12 20:51:53 2003
+++ amavisd.conf	Sat Mar 15 16:08:46 2003
@@ -41,7 +41,7 @@
 # $MYHOME serves as a quick default for some other configuration settings.
 # More refined control is available with each individual setting further down.
 # $MYHOME is never used directly by the program. No trailing slash!
-#$MYHOME = '/var/lib/amavis';   # (default is '/var/amavis')
+$MYHOME = '%%AMAVISDIR%%';   # (default is '/var/amavis')
 
 # $mydomain serves as a quick default for some other configuration settings.
 # More refined control is available with each individual setting further down.
@@ -50,8 +50,8 @@
 
 # Set the user and group to which the daemon will change if started as root
 # (otherwise just keep the UID unchanged, and these settings have no effect):
-$daemon_user  = 'vscan';	# (no default;  customary: vscan or amavis)
-$daemon_group = 'sweep';	# (no default;  customary: vscan or amavis)
+$daemon_user  = '%%AMAVISUSER%%';	# (no default;  customary: vscan or amavis)
+$daemon_group = '%%AMAVISGROUP%%';	# (no default;  customary: vscan or amavis)
 
 # Runtime directory (no trailing slash, defaults to '/var/amavis')
-$TEMPBASE = '/var/amavis';
+$TEMPBASE = '%%AMAVISDIR%%';
 
 
 # Runtime working directory (cwd), and a place where
 # temporary directories for unpacking mail are created.
@@ -468,7 +468,7 @@
 #   or a directory (no trailing slash)
 #   (the default value is undef, meaning no quarantine)
 #
-$QUARANTINEDIR = '/var/virusmails';
+$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
 
 #$virus_quarantine_method = "local:virus-%i-%n";    # default
 #$spam_quarantine_method  = "local:spam-%b-%i-%n";  # default
@@ -638,7 +638,7 @@
 # a hash lookup table can be read from a file,
 # one address per line, comments and empty lines are permitted:
 #
-read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
+#read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
 
 # ... or set directly:
 map { $whitelist_sender{lc($_)}=1 } (qw(




--- amavisdconf.orig	Fri Dec 27 14:56:01 2002
+++ amavisdconf	Thu Mar  6 21:18:16 2003
@@ -9,7 +9,7 @@
 #  (none) show the value as will be used by amavisd;
 #   -d  show default value as in the absence of the config file;
 #   -n  only show variable if its value is different from the default.
-#   -c conf-file ... use the specified file instead of /etc/amavisd.conf
+#   -c conf-file ... use the specified file instead of %%PREFIX%%/etc/amavisd.conf
 #
 # If a variable is specified, show only that variable, otherwise show
 # all configurable variables. (Note: the leading $, @ or % must be included
@@ -179,7 +179,7 @@
   }
 
   my($what,$onevar);
-  my($config_file) = '/etc/amavisd.conf';
+  my($config_file) = '%%PREFIX%%/etc/amavisd.conf';
   while (@ARGV) {
     if (@ARGV >= 1 && $ARGV[0] =~ /^-([nd])$/) {
       $what = $1; shift @ARGV;




--- helper-progs/config.h.in.orig	Fri Mar  7 22:56:50 2003
+++ helper-progs/config.h.in	Sat Mar 15 16:15:40 2003
@@ -14,10 +14,10 @@
 #define X_HEADER_LINE "by-amavisd-new-via-milter"
 
 /* Define if you have the mkdtemp function, undefine otherwise */
-#undef HAVE_MKDTEMP
+#define HAVE_MKDTEMP
 
 /* Define if you have the mktemp function, undefine otherwise */
-#define HAVE_MKTEMP
+#undef HAVE_MKTEMP
 
 /* Define if we have the snprintf function, undefine otherwise */
 #undef HAVE_SNPRINTF




--- helper-progs/configure.orig	Thu Dec 26 12:35:33 2002
+++ helper-progs/configure	Sat Apr 19 10:54:31 2003
@@ -2041,20 +2041,3 @@
 
 
 
-if test "$AMAVISUSER" != "" ; then
-   id $AMAVISUSER > /dev/null 2>&1
-   if test "$?" != 0 ; then
-      echo ""
-      echo "Note:  The Amavis user '$AMAVISUSER' does not seem to"
-      echo "exist.  Please create this user before continuing."
-   fi
-fi
-
-if test "$SENDMAILPROG" != "no" ; then
-        sendmailversion=`$SENDMAILPROG -bv -d0.1 | $AWK '/Version/ {print $2}'`
-        echo ""
-        echo "Note: sendmail version $sendmailversion detected"
-        echo "check http://www.sendmail.org/~ca/email/sm-812.html for sendmail bugs and patches"
-        echo "It's advised to run sendmail latest versions when using MILTER"
-        echo ""
-fi




%%PORTDOCS%%share/doc/amavisd-new/AAAREADME.first
%%PORTDOCS%%share/doc/amavisd-new/INSTALL
%%PORTDOCS%%share/doc/amavisd-new/LICENSE
%%PORTDOCS%%share/doc/amavisd-new/README.chroot
%%PORTDOCS%%share/doc/amavisd-new/README.customize
%%PORTDOCS%%share/doc/amavisd-new/README.exim_v3
%%PORTDOCS%%share/doc/amavisd-new/README.exim_v4
%%PORTDOCS%%share/doc/amavisd-new/README.exim_v4_app
%%PORTDOCS%%share/doc/amavisd-new/README.lookups
%%PORTDOCS%%share/doc/amavisd-new/README.milter
%%PORTDOCS%%share/doc/amavisd-new/README.old
%%PORTDOCS%%share/doc/amavisd-new/README.old.scanners
%%PORTDOCS%%share/doc/amavisd-new/README.performance
%%PORTDOCS%%share/doc/amavisd-new/README.postfix

%%AMAVIS_NOMILTER%%sbin/amavis
%%AMAVIS_NOMILTER%%sbin/amavis-milter
sbin/amavisd
sbin/amavisdconf

Return to bug 51153

Lines 7-14 Link Here

(-)amavisd-new/Makefile (-5 / +3 lines)
7	# Based on amavisd ports makefile.	7	# Based on amavisd ports makefile.
8		8
9	PORTNAME= amavisd-new	9	PORTNAME= amavisd-new
10	PORTVERSION= 20021227.p2	10	PORTVERSION= 20030314.p1
11	PORTREVISION= 2
12	CATEGORIES= security	11	CATEGORIES= security
13	MASTER_SITES= http://www.ijs.si/software/amavisd/	12	MASTER_SITES= http://www.ijs.si/software/amavisd/
14	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-p/}	13	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-p/}
Lines 75-81 Link Here
75	-e 's,%%PREFIX%%,${PREFIX},g' \	74	-e 's,%%PREFIX%%,${PREFIX},g' \
76	< ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \	75	< ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
77	done	76	done
78	for file in amavisd.conf amavisd amavisdconf; do \	77	for file in amavisd.conf amavisd; do \
79	${SED} -e 's,%%AMAVISUSER%%,${AMAVISUSER},g' \	78	${SED} -e 's,%%AMAVISUSER%%,${AMAVISUSER},g' \
80	-e 's,%%AMAVISGROUP%%,${AMAVISGROUP},g' \	79	-e 's,%%AMAVISGROUP%%,${AMAVISGROUP},g' \
81	-e 's,%%AMAVISDIR%%,${AMAVISDIR},g' \	80	-e 's,%%AMAVISDIR%%,${AMAVISDIR},g' \
Lines 93-99 Link Here
93	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${PREFIX}/sbin	92	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${PREFIX}/sbin
94	.endif	93	.endif
95	${INSTALL_SCRIPT} ${WRKDIR}/amavisd ${PREFIX}/sbin	94	${INSTALL_SCRIPT} ${WRKDIR}/amavisd ${PREFIX}/sbin
96	${INSTALL_SCRIPT} ${WRKDIR}/amavisdconf ${PREFIX}/sbin
97	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist	95	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist
98	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.sh ${PREFIX}/etc/rc.d	96	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.sh ${PREFIX}/etc/rc.d
99	.if !defined(NOPORTDOCS)	97	.if !defined(NOPORTDOCS)
Lines 102-108 Link Here
102	README_FILES/README.customize README_FILES/README.exim_v3 \	100	README_FILES/README.customize README_FILES/README.exim_v3 \
103	README_FILES/README.exim_v4 README_FILES/README.exim_v4_app \	101	README_FILES/README.exim_v4 README_FILES/README.exim_v4_app \
104	README_FILES/README.lookups README_FILES/README.milter \	102	README_FILES/README.lookups README_FILES/README.milter \
105	README_FILES/README.old README_FILES/README.old.scanners \	103	README_FILES/README.chroot README_FILES/README.old.scanners \
106	README_FILES/README.performance README_FILES/README.postfix \	104	README_FILES/README.performance README_FILES/README.postfix \
107	README_FILES/README.sendmail RELEASE_NOTES	105	README_FILES/README.sendmail RELEASE_NOTES
108	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}	106	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}

Lines 11-28 Link Here

(-)amavisd-new/files/DEINSTALL.tmpl (-6 / +3 lines)
11	if [ "$2" = "POST-DEINSTALL" ]; then	11	if [ "$2" = "POST-DEINSTALL" ]; then
12		12
13	if /usr/sbin/pw group show "${GROUP}" 2>&1 >/dev/null; then	13	if /usr/sbin/pw group show "${GROUP}" 2>&1 >/dev/null; then
14	/usr/sbin/pw groupdel ${GROUP}	14	echo "You should manually remove the \"${GROUP}\" group."
15	echo "Deleted group \"${GROUP}\"."
16	fi	15	fi
17		16
18	if /usr/sbin/pw user show "${USER}" 2>&1 >/dev/null; then	17	if /usr/sbin/pw user show "${USER}" 2>&1 >/dev/null; then
19	/usr/sbin/pw userdel ${USER}	18	echo "You should manually remove the \"${USER}\" user."
20	echo "Deleted user \"${USER}\"."
21	fi	19	fi
22		20
23	if [ -e ${DIR} ]; then	21	if [ -e ${DIR} ]; then
24	/bin/rm -rf ${DIR}	22	echo "You should manually remove the \"${DIR}\" directory."
25	echo "Deleted \"${DIR}\" directory."
26	fi	23	fi
27		24
28	if [ -e ${QUARANTINE} ]; then	25	if [ -e ${QUARANTINE} ]; then

Lines 1-35 Link Here

(-)amavisd-new/files/patch-amavisd.conf (-28 / +24 lines)
1	--- amavisd.conf.orig Fri Dec 27 16:04:17 2002	1	--- amavisd.conf.orig Wed Mar 12 20:51:53 2003
2	+++ amavisd.conf Fri Jan 3 22:29:45 2003	2	+++ amavisd.conf Sat Mar 15 16:08:46 2003
3	@@ -36,11 +36,11 @@	3	@@ -41,7 +41,7 @@
4	#	4	# $MYHOME serves as a quick default for some other configuration settings.
5		5	# More refined control is available with each individual setting further down.
6	# Set the user and group to which the daemon will change when started as root:	6	# $MYHOME is never used directly by the program. No trailing slash!
7	-$daemon_user = 'amavis'; # (no default; customary: vscan or amavis)	7	-#$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis')
8	-$daemon_group = 'amavis'; # (no default)	8	+$MYHOME = '%%AMAVISDIR%%'; # (default is '/var/amavis')
		9
		10	# $mydomain serves as a quick default for some other configuration settings.
		11	# More refined control is available with each individual setting further down.
		12	@@ -50,8 +50,8 @@
		13
		14	# Set the user and group to which the daemon will change if started as root
		15	# (otherwise just keep the UID unchanged, and these settings have no effect):
		16	-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis)
		17	-$daemon_group = 'sweep'; # (no default; customary: vscan or amavis)
9	+$daemon_user = '%%AMAVISUSER%%'; # (no default; customary: vscan or amavis)	18	+$daemon_user = '%%AMAVISUSER%%'; # (no default; customary: vscan or amavis)
10	+$daemon_group = '%%AMAVISGROUP%%'; # (no default)	19	+$daemon_group = '%%AMAVISGROUP%%'; # (no default; customary: vscan or amavis)
11
12	# Runtime directory (no trailing slash, defaults to '/var/amavis')
13	-$TEMPBASE = '/var/amavis';
14	+$TEMPBASE = '%%AMAVISDIR%%';
15
16		20
17	# MTA SETTINGS, UNCOMMENT AS APPROPRIATE, defaults to 'smtp:127.0.0.1:10025'	21	# Runtime working directory (cwd), and a place where
18	@@ -309,7 +309,7 @@	22	# temporary directories for unpacking mail are created.
		23	@@ -468,7 +468,7 @@
19	# or a directory (no trailing slash)	24	# or a directory (no trailing slash)
20	# (the default value is undef, meaning no quarantine)	25	# (the default value is undef, meaning no quarantine)
21	#	26	#
22	-$QUARANTINEDIR = '/var/virusmails';	27	-$QUARANTINEDIR = '/var/virusmails';
23	+$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';	28	+$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
24		29
25		30	#$virus_quarantine_method = "local:virus-%i-%n"; # default
26	# A finer control of quarantining is available through variable	31	#$spam_quarantine_method = "local:spam-%b-%i-%n"; # default
27	@@ -638,7 +638,7 @@
28	# a hash lookup table can be read from a file,
29	# one address per line, comments and empty lines are permitted:
30	#
31	-read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
32	+#read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
33
34	# ... or set directly:
35	map { $whitelist_sender{lc($_)}=1 } (qw(

Lines 1-20 Link Here

(-)amavisd-new/files/patch-amavisdconf (-20 lines)
1	--- amavisdconf.orig Fri Dec 27 14:56:01 2002
2	+++ amavisdconf Thu Mar 6 21:18:16 2003
3	@@ -9,7 +9,7 @@
4	# (none) show the value as will be used by amavisd;
5	# -d show default value as in the absence of the config file;
6	# -n only show variable if its value is different from the default.
7	-# -c conf-file ... use the specified file instead of /etc/amavisd.conf
8	+# -c conf-file ... use the specified file instead of %%PREFIX%%/etc/amavisd.conf
9	#
10	# If a variable is specified, show only that variable, otherwise show
11	# all configurable variables. (Note: the leading $, @ or % must be included
12	@@ -179,7 +179,7 @@
13	}
14
15	my($what,$onevar);
16	- my($config_file) = '/etc/amavisd.conf';
17	+ my($config_file) = '%%PREFIX%%/etc/amavisd.conf';
18	while (@ARGV) {
19	if (@ARGV >= 1 && $ARGV[0] =~ /^-([nd])$/) {
20	$what = $1; shift @ARGV;

Line 0 Link Here

(-)amavisd-new/files/patch-config.h.in (+15 lines)
	1	--- helper-progs/config.h.in.orig Fri Mar 7 22:56:50 2003
	2	+++ helper-progs/config.h.in Sat Mar 15 16:15:40 2003
	3	@@ -14,10 +14,10 @@
	4	#define X_HEADER_LINE "by-amavisd-new-via-milter"
	5
	6	/* Define if you have the mkdtemp function, undefine otherwise */
	7	-#undef HAVE_MKDTEMP
	8	+#define HAVE_MKDTEMP
	9
	10	/* Define if you have the mktemp function, undefine otherwise */
	11	-#define HAVE_MKTEMP
	12	+#undef HAVE_MKTEMP
	13
	14	/* Define if we have the snprintf function, undefine otherwise */
	15	#undef HAVE_SNPRINTF

Line 0 Link Here

(-)amavisd-new/files/patch-configure (+23 lines)
	1	--- helper-progs/configure.orig Thu Dec 26 12:35:33 2002
	2	+++ helper-progs/configure Sat Apr 19 10:54:31 2003
	3	@@ -2041,20 +2041,3 @@
	4
	5
	6
	7	-if test "$AMAVISUSER" != "" ; then
	8	- id $AMAVISUSER > /dev/null 2>&1
	9	- if test "$?" != 0 ; then
	10	- echo ""
	11	- echo "Note: The Amavis user '$AMAVISUSER' does not seem to"
	12	- echo "exist. Please create this user before continuing."
	13	- fi
	14	-fi
	15	-
	16	-if test "$SENDMAILPROG" != "no" ; then
	17	- sendmailversion=`$SENDMAILPROG -bv -d0.1 \| $AWK '/Version/ {print $2}'`
	18	- echo ""
	19	- echo "Note: sendmail version $sendmailversion detected"
	20	- echo "check http://www.sendmail.org/~ca/email/sm-812.html for sendmail bugs and patches"
	21	- echo "It's advised to run sendmail latest versions when using MILTER"
	22	- echo ""
	23	-fi

Lines 1-13 Link Here

(-)amavisd-new/pkg-plist (-2 / +1 lines)
1	%%PORTDOCS%%share/doc/amavisd-new/AAAREADME.first	1	%%PORTDOCS%%share/doc/amavisd-new/AAAREADME.first
2	%%PORTDOCS%%share/doc/amavisd-new/INSTALL	2	%%PORTDOCS%%share/doc/amavisd-new/INSTALL
3	%%PORTDOCS%%share/doc/amavisd-new/LICENSE	3	%%PORTDOCS%%share/doc/amavisd-new/LICENSE
		4	%%PORTDOCS%%share/doc/amavisd-new/README.chroot
4	%%PORTDOCS%%share/doc/amavisd-new/README.customize	5	%%PORTDOCS%%share/doc/amavisd-new/README.customize
5	%%PORTDOCS%%share/doc/amavisd-new/README.exim_v3	6	%%PORTDOCS%%share/doc/amavisd-new/README.exim_v3
6	%%PORTDOCS%%share/doc/amavisd-new/README.exim_v4	7	%%PORTDOCS%%share/doc/amavisd-new/README.exim_v4
7	%%PORTDOCS%%share/doc/amavisd-new/README.exim_v4_app	8	%%PORTDOCS%%share/doc/amavisd-new/README.exim_v4_app
8	%%PORTDOCS%%share/doc/amavisd-new/README.lookups	9	%%PORTDOCS%%share/doc/amavisd-new/README.lookups
9	%%PORTDOCS%%share/doc/amavisd-new/README.milter	10	%%PORTDOCS%%share/doc/amavisd-new/README.milter
10	%%PORTDOCS%%share/doc/amavisd-new/README.old
11	%%PORTDOCS%%share/doc/amavisd-new/README.old.scanners	11	%%PORTDOCS%%share/doc/amavisd-new/README.old.scanners
12	%%PORTDOCS%%share/doc/amavisd-new/README.performance	12	%%PORTDOCS%%share/doc/amavisd-new/README.performance
13	%%PORTDOCS%%share/doc/amavisd-new/README.postfix	13	%%PORTDOCS%%share/doc/amavisd-new/README.postfix
Lines 19-22 Link Here
19	%%AMAVIS_NOMILTER%%sbin/amavis	19	%%AMAVIS_NOMILTER%%sbin/amavis
20	%%AMAVIS_NOMILTER%%sbin/amavis-milter	20	%%AMAVIS_NOMILTER%%sbin/amavis-milter
21	sbin/amavisd	21	sbin/amavisd
22	sbin/amavisdconf