Upgrade to 4.9.4.

This changes a default - you now need to specify WITH_PASSWD to
authenticate against /etc/passwd.  This means the vchkpw needn't run as
root.

2 files changed, 53 insertions, 4 deletions

diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index 4b854b9e14db..67233aeb3ec6 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vpopmail
-PORTVERSION=	4.9
+PORTVERSION=	4.9.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/vpopmail/
 
@@ -25,9 +25,29 @@ CONFIGURE_ARGS=	--enable-qmail-dir=${QMAIL_DIR} \
 		--enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp
 
 #
-# Attempt to set the location of qmail by a simple check.  Override this
-# if your qmail lives elsewhere.
+# User-configurable variables
 #
+# Define these to change from the default behaviour
+#
+# WITH_PASSWD   - allow authentication off /etc/passwd
+# WITH_APOP     - allow apop authentication
+# WITHOUT_ROAMING - disallow roaming users
+#
+# Set these to the values you'd prefer
+#
+# HARDQUOTA     - size of hard quota, or 'n' for no hard quota
+# RELAYCLEAR    - time in minutes before clearing relay hole (requires roaming)
+# LOGLEVEL	- n - no logging, y - log all,
+#                 e - log errors, p - log passwords in errors
+# APOPFILE	- location of apop secrets file
+# QMAIL_DIR     - location of qmail directory
+# PREFIX	- installation area for vpopmail (see comment below)
+#
+
+HARDQUOTA?=	10000000
+RELAYCLEAR?=	30
+LOGLEVEL?=	y
+APOPFILE?=	/etc/apop-secrets
 
 .if exists(${LOCALBASE}/qmail/bin/qmail-send)
 QMAIL_DIR?=     ${LOCALBASE}/qmail
@@ -35,6 +55,35 @@ QMAIL_DIR?=     ${LOCALBASE}/qmail
 QMAIL_DIR?=     /var/qmail
 .endif
 
+# Uncomment this, or set PREFIX to /home if you have an existing
+# vpopmail install with the vpopmail users' home directory set to
+# /home/vpopmail - package rules dictate we default to /usr/local/vpopmail
+#
+#PREFIX?=	/home
+
+# End of user-configurable variables
+
+#
+# Some suggestions from Gabriel Ambuehl <gabriel_ambuehl@buz.ch>
+#
+
+CONFIGURE_ARGS+=	--enable-hardquota=${HARDQUOTA} \
+			--enable-logging=${LOGLEVEL}
+
+.if !defined(WITH_PASSWD)
+CONFIGURE_ARGS+=	--enable-passwd=n
+.endif
+
+.if defined(WITH_APOP)
+CONFIGURE_ARGS+=	--enable-apop=y \
+			--enable-apop-file=${APOPFILE}
+.endif
+
+.if !defined(WITHOUT_ROAMING)
+CONFIGURE_ARGS+=	--enable-roaming-users=y \
+			--enable-relay-clear-minutes=${RELAYCLEAR}
+.endif
+
 #
 # This port doesn't honour PREFIX, it honours vpopmail's home directory.
 # Since we create vpopmail if it doesn't exist, we set it so that it
diff --git a/mail/vpopmail/distinfo b/mail/vpopmail/distinfo
index cd3c85023f67..a122ec2e667d 100644
--- a/mail/vpopmail/distinfo
+++ b/mail/vpopmail/distinfo
@@ -1 +1 @@
-MD5 (vpopmail-4.9.tar.gz) = 2b9d71ea69cbeacedce9654fc439ee19
+MD5 (vpopmail-4.9.4.tar.gz) = 7bac93ecd0641eb8c991c081a4cfd08e