Update vpopmail to version 5.2.

Introduce two new build knobs:
- WITH_CLEAR_PASSWD	actually enable the clear passwords management
	that was turned on by default in 5.2 (hello, POLA!)
- WITH_MD5_PASSWORDS	for the encrypted passwords, use MD5 hashes.

Prompted by:	Claus Rasmussen <claus@webclaus.com>

6 files changed, 39 insertions, 9 deletions

diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile
index 200c3a3917b9..335be4006418 100644
--- a/mail/vpopmail-devel/Makefile
+++ b/mail/vpopmail-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vpopmail
-PORTVERSION=	5.0.1
+PORTVERSION=	5.2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/vpopmail/
 
@@ -34,8 +34,10 @@ CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
 # Define these to change from the default behaviour
 #
 # WITH_PASSWD   - allow authentication off /etc/passwd
+# WITH_MD5_PASSWORDS - store encrypted passwords in MD5 format
 # WITH_MYSQL	- allow authentitation via mysql
 # WITH_MYSQL_LARGE_SITE - enables large site layout
+# WITH_CLEAR_PASSWD - store passwords in plaintext into the MySQL db
 # WITH_APOP     - allow apop authentication
 # WITHOUT_ROAMING - disallow roaming users
 # WITH_IP_ALIAS - enables IP aliasing
@@ -90,13 +92,17 @@ QMAIL_DIR?=	/var/qmail
 # Some suggestions from Gabriel Ambuehl <gabriel_ambuehl@buz.ch>
 #
 
-CONFIGURE_ARGS+=	--enable-hardquota=${HARDQUOTA} \
+CONFIGURE_ARGS+=	--enable-defaultquota=${HARDQUOTA} \
 			--enable-logging=${LOGLEVEL}
 
 .if defined(WITH_PASSWD)
 CONFIGURE_ARGS+=	--enable-passwd=y
 .endif
 
+.if defined(WITH_MD5_PASSWORDS)
+CONFIGURE_ARGS+=	--enable-md5-passwords=y
+.endif
+
 .if defined(WITH_APOP)
 CONFIGURE_ARGS+=	--enable-apop=y \
 			--enable-apop-file=${APOPFILE}
@@ -113,6 +119,10 @@ CONFIGURE_ARGS+=	--enable-roaming-users=y \
 			--enable-relay-clear-minutes=${RELAYCLEAR}
 .endif
 
+.if !defined(WITH_CLEAR_PASSWD)
+CONFIGURE_ARGS+=	--enable-clear-passwd=n
+.endif
+
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--enable-mysql=y \
diff --git a/mail/vpopmail-devel/distinfo b/mail/vpopmail-devel/distinfo
index 181db176eb29..f462e5a4788d 100644
--- a/mail/vpopmail-devel/distinfo
+++ b/mail/vpopmail-devel/distinfo
@@ -1 +1 @@
-MD5 (vpopmail-5.0.1.tar.gz) = 4402f272aca753ba4ad799fc59d37f2d
+MD5 (vpopmail-5.2.tar.gz) = fe0249785fd53deaa5f14813f292884d
diff --git a/mail/vpopmail-stable/Makefile b/mail/vpopmail-stable/Makefile
index 200c3a3917b9..335be4006418 100644
--- a/mail/vpopmail-stable/Makefile
+++ b/mail/vpopmail-stable/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vpopmail
-PORTVERSION=	5.0.1
+PORTVERSION=	5.2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/vpopmail/
 
@@ -34,8 +34,10 @@ CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
 # Define these to change from the default behaviour
 #
 # WITH_PASSWD   - allow authentication off /etc/passwd
+# WITH_MD5_PASSWORDS - store encrypted passwords in MD5 format
 # WITH_MYSQL	- allow authentitation via mysql
 # WITH_MYSQL_LARGE_SITE - enables large site layout
+# WITH_CLEAR_PASSWD - store passwords in plaintext into the MySQL db
 # WITH_APOP     - allow apop authentication
 # WITHOUT_ROAMING - disallow roaming users
 # WITH_IP_ALIAS - enables IP aliasing
@@ -90,13 +92,17 @@ QMAIL_DIR?=	/var/qmail
 # Some suggestions from Gabriel Ambuehl <gabriel_ambuehl@buz.ch>
 #
 
-CONFIGURE_ARGS+=	--enable-hardquota=${HARDQUOTA} \
+CONFIGURE_ARGS+=	--enable-defaultquota=${HARDQUOTA} \
 			--enable-logging=${LOGLEVEL}
 
 .if defined(WITH_PASSWD)
 CONFIGURE_ARGS+=	--enable-passwd=y
 .endif
 
+.if defined(WITH_MD5_PASSWORDS)
+CONFIGURE_ARGS+=	--enable-md5-passwords=y
+.endif
+
 .if defined(WITH_APOP)
 CONFIGURE_ARGS+=	--enable-apop=y \
 			--enable-apop-file=${APOPFILE}
@@ -113,6 +119,10 @@ CONFIGURE_ARGS+=	--enable-roaming-users=y \
 			--enable-relay-clear-minutes=${RELAYCLEAR}
 .endif
 
+.if !defined(WITH_CLEAR_PASSWD)
+CONFIGURE_ARGS+=	--enable-clear-passwd=n
+.endif
+
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--enable-mysql=y \
diff --git a/mail/vpopmail-stable/distinfo b/mail/vpopmail-stable/distinfo
index 181db176eb29..f462e5a4788d 100644
--- a/mail/vpopmail-stable/distinfo
+++ b/mail/vpopmail-stable/distinfo
@@ -1 +1 @@
-MD5 (vpopmail-5.0.1.tar.gz) = 4402f272aca753ba4ad799fc59d37f2d
+MD5 (vpopmail-5.2.tar.gz) = fe0249785fd53deaa5f14813f292884d
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index 200c3a3917b9..335be4006418 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vpopmail
-PORTVERSION=	5.0.1
+PORTVERSION=	5.2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/vpopmail/
 
@@ -34,8 +34,10 @@ CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
 # Define these to change from the default behaviour
 #
 # WITH_PASSWD   - allow authentication off /etc/passwd
+# WITH_MD5_PASSWORDS - store encrypted passwords in MD5 format
 # WITH_MYSQL	- allow authentitation via mysql
 # WITH_MYSQL_LARGE_SITE - enables large site layout
+# WITH_CLEAR_PASSWD - store passwords in plaintext into the MySQL db
 # WITH_APOP     - allow apop authentication
 # WITHOUT_ROAMING - disallow roaming users
 # WITH_IP_ALIAS - enables IP aliasing
@@ -90,13 +92,17 @@ QMAIL_DIR?=	/var/qmail
 # Some suggestions from Gabriel Ambuehl <gabriel_ambuehl@buz.ch>
 #
 
-CONFIGURE_ARGS+=	--enable-hardquota=${HARDQUOTA} \
+CONFIGURE_ARGS+=	--enable-defaultquota=${HARDQUOTA} \
 			--enable-logging=${LOGLEVEL}
 
 .if defined(WITH_PASSWD)
 CONFIGURE_ARGS+=	--enable-passwd=y
 .endif
 
+.if defined(WITH_MD5_PASSWORDS)
+CONFIGURE_ARGS+=	--enable-md5-passwords=y
+.endif
+
 .if defined(WITH_APOP)
 CONFIGURE_ARGS+=	--enable-apop=y \
 			--enable-apop-file=${APOPFILE}
@@ -113,6 +119,10 @@ CONFIGURE_ARGS+=	--enable-roaming-users=y \
 			--enable-relay-clear-minutes=${RELAYCLEAR}
 .endif
 
+.if !defined(WITH_CLEAR_PASSWD)
+CONFIGURE_ARGS+=	--enable-clear-passwd=n
+.endif
+
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--enable-mysql=y \
diff --git a/mail/vpopmail/distinfo b/mail/vpopmail/distinfo
index 181db176eb29..f462e5a4788d 100644
--- a/mail/vpopmail/distinfo
+++ b/mail/vpopmail/distinfo
@@ -1 +1 @@
-MD5 (vpopmail-5.0.1.tar.gz) = 4402f272aca753ba4ad799fc59d37f2d
+MD5 (vpopmail-5.2.tar.gz) = fe0249785fd53deaa5f14813f292884d