ports/51153: MAINTAINER UPDATE: amavisd-new
Blaz Zupan
blaz at amis.net
Sat Apr 19 13:30:17 UTC 2003
The following reply was made to PR ports/51153; it has been noted by GNATS.
From: Blaz Zupan <blaz at amis.net>
To: FreeBSD-gnats-submit at FreeBSD.org
Cc:
Subject: Re: ports/51153: MAINTAINER UPDATE: amavisd-new
Date: Sat, 19 Apr 2003 15:23:16 +0200 (CEST)
Just hours after submitting this PR, found the PR ports/50893, which contains
a fix for use of amavisd-new with the DrWeb virus scanner. Here is a new port
update patch, use this one instead of the previous one, as this one
incorporates the patch in ports/50893. ports/50893 can then be closed.
diff -urN amavisd-new.orig/Makefile amavisd-new/Makefile
--- amavisd-new.orig/Makefile Mon Apr 7 06:54:00 2003
+++ amavisd-new/Makefile Sat Apr 19 11:03:04 2003
@@ -7,8 +7,7 @@
# Based on amavisd ports makefile.
PORTNAME= amavisd-new
-PORTVERSION= 20021227.p2
-PORTREVISION= 2
+PORTVERSION= 20030314.p1
CATEGORIES= security
MASTER_SITES= http://www.ijs.si/software/amavisd/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-p/}
@@ -75,7 +74,7 @@
-e 's,%%PREFIX%%,${PREFIX},g' \
< ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
done
- for file in amavisd.conf amavisd amavisdconf; do \
+ for file in amavisd.conf amavisd; do \
${SED} -e 's,%%AMAVISUSER%%,${AMAVISUSER},g' \
-e 's,%%AMAVISGROUP%%,${AMAVISGROUP},g' \
-e 's,%%AMAVISDIR%%,${AMAVISDIR},g' \
@@ -93,7 +92,6 @@
${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)
@@ -102,7 +100,7 @@
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.old README_FILES/README.old.scanners \
+ 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}
diff -urN amavisd-new.orig/distinfo amavisd-new/distinfo
--- amavisd-new.orig/distinfo Fri Jan 17 12:58:12 2003
+++ amavisd-new/distinfo Sat Apr 19 10:38:20 2003
@@ -1 +1 @@
-MD5 (amavisd-new-20021227-p2.tar.gz) = b147d532730cf7c77fef71114234ff65
+MD5 (amavisd-new-20030314-p1.tar.gz) = 3dcee8ad46afbf23d09bdea64621e5a3
diff -urN amavisd-new.orig/files/DEINSTALL.tmpl amavisd-new/files/DEINSTALL.tmpl
--- amavisd-new.orig/files/DEINSTALL.tmpl Sat Jan 4 12:52:47 2003
+++ amavisd-new/files/DEINSTALL.tmpl Sat Apr 19 10:45:26 2003
@@ -11,18 +11,15 @@
if [ "$2" = "POST-DEINSTALL" ]; then
if /usr/sbin/pw group show "${GROUP}" 2>&1 >/dev/null; then
- /usr/sbin/pw groupdel ${GROUP}
- echo "Deleted group \"${GROUP}\"."
+ echo "You should manually remove the \"${GROUP}\" group."
fi
if /usr/sbin/pw user show "${USER}" 2>&1 >/dev/null; then
- /usr/sbin/pw userdel ${USER}
- echo "Deleted user \"${USER}\"."
+ echo "You should manually remove the \"${USER}\" user."
fi
if [ -e ${DIR} ]; then
- /bin/rm -rf ${DIR}
- echo "Deleted \"${DIR}\" directory."
+ echo "You should manually remove the \"${DIR}\" directory."
fi
if [ -e ${QUARANTINE} ]; then
diff -urN amavisd-new.orig/files/patch-amavisd.conf amavisd-new/files/patch-amavisd.conf
--- amavisd-new.orig/files/patch-amavisd.conf Sat Jan 4 12:52:47 2003
+++ amavisd-new/files/patch-amavisd.conf Sat Apr 19 15:20:17 2003
@@ -1,35 +1,40 @@
---- amavisd.conf.orig Fri Dec 27 16:04:17 2002
-+++ amavisd.conf Fri Jan 3 22:29:45 2003
-@@ -36,11 +36,11 @@
- #
-
- # Set the user and group to which the daemon will change when started as root:
--$daemon_user = 'amavis'; # (no default; customary: vscan or amavis)
--$daemon_group = 'amavis'; # (no default)
+--- amavisd.conf.orig Fri Mar 21 18:19:23 2003
++++ amavisd.conf Sat Apr 19 15:20:08 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)
-
- # Runtime directory (no trailing slash, defaults to '/var/amavis')
--$TEMPBASE = '/var/amavis';
-+$TEMPBASE = '%%AMAVISDIR%%';
++$daemon_group = '%%AMAVISGROUP%%'; # (no default; customary: vscan or amavis)
-
- # MTA SETTINGS, UNCOMMENT AS APPROPRIATE, defaults to 'smtp:127.0.0.1:10025'
-@@ -309,7 +309,7 @@
+ # 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)
+ # (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
+@@ -1118,7 +1118,7 @@
+
+ ### http://drweb.imshop.de/
+ ['DrWeb Antivirus for Linux/FreeBSD/Solaris', 'drweb',
+- '-al -ar -fm -go -ha -ml -ni -ot -sd -up {}',
++ '-al -ar -fm -go -ha -ml -ot -sd -up {}',
+ [0], [1], sub {('no-name')} ],
- # A finer control of quarantining is available through variable
-@@ -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(
+ ### http://www.f-secure.com/products/anti-virus/
diff -urN amavisd-new.orig/files/patch-amavisdconf amavisd-new/files/patch-amavisdconf
--- amavisd-new.orig/files/patch-amavisdconf Mon Apr 7 03:18:06 2003
+++ amavisd-new/files/patch-amavisdconf Thu Jan 1 01:00:00 1970
@@ -1,20 +0,0 @@
---- 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;
diff -urN amavisd-new.orig/files/patch-config.h.in amavisd-new/files/patch-config.h.in
--- amavisd-new.orig/files/patch-config.h.in Thu Jan 1 01:00:00 1970
+++ amavisd-new/files/patch-config.h.in Sat Apr 19 10:33:10 2003
@@ -0,0 +1,15 @@
+--- 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
diff -urN amavisd-new.orig/files/patch-configure amavisd-new/files/patch-configure
--- amavisd-new.orig/files/patch-configure Thu Jan 1 01:00:00 1970
+++ amavisd-new/files/patch-configure Sat Apr 19 10:55:11 2003
@@ -0,0 +1,23 @@
+--- 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
diff -urN amavisd-new.orig/pkg-plist amavisd-new/pkg-plist
--- amavisd-new.orig/pkg-plist Mon Apr 7 06:54:00 2003
+++ amavisd-new/pkg-plist Sat Apr 19 10:46:51 2003
@@ -1,13 +1,13 @@
%%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
@@ -19,4 +19,3 @@
%%AMAVIS_NOMILTER%%sbin/amavis
%%AMAVIS_NOMILTER%%sbin/amavis-milter
sbin/amavisd
-sbin/amavisdconf
More information about the freebsd-ports-bugs
mailing list