4 files changed, 64 insertions, 29 deletions

diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile
index 18b2e4a76ea2..4547619a70cb 100644
--- a/mail/vpopmail-devel/Makefile
+++ b/mail/vpopmail-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vpopmail
-PORTVERSION=	4.9.10
-PORTREVISION=	3
+PORTVERSION=	5.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/vpopmail/
 
@@ -52,11 +51,19 @@ CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
 # APOPFILE	- location of apop secrets file
 # QMAIL_DIR     - location of qmail directory
 # PREFIX	- installation area for vpopmail (see comment below)
-# WITH_MYSQL_USER - the username for connecting to the MySQL server (root)
-# WITH_MYSQL_PASSWD - the password for connecting to the MySQL server (gipgap)
-# WITH_MYSQL_DB - the name of the MySQL database to use (vpopmail)
 # VCHKPW_GID	- the group ID of the new vchkpw group (89)
 # VPOPMAIL_UID	- the user ID of the new vpopmail user (89)
+# WITH_MYSQL_SERVER - the hostname of the MySQL server (localhost)
+# WITH_MYSQL_USER - the username for connecting to the MySQL server (root)
+# WITH_MYSQL_PASSWD - the password for connecting to the MySQL server (secret)
+# WITH_MYSQL_DB - the name of the MySQL database to use (vpopmail)
+# The server, user and password variables may be defined separately
+# for read and update access, allowing you to set up a less-priviledged
+# MySQL connection account with read-only access, and another one which
+# is used for administrative purposes:
+# WITH_MYSQL_READ_SERVER, WITH_MYSQL_READ_USER, WITH_MYSQL_READ_PASSWD
+# WITH_MYSQL_UPDATE_SERVER, WITH_MYSQL_UPDATE_USER, WITH_MYSQL_UPDATE_PASSWD
+# Those variables, if defined, override WITH_MYSQL_{SERVER,USER,PASSWD}
 #
 
 HARDQUOTA?=	10000000
@@ -85,8 +92,8 @@ QMAIL_DIR?=	/var/qmail
 CONFIGURE_ARGS+=	--enable-hardquota=${HARDQUOTA} \
 			--enable-logging=${LOGLEVEL}
 
-.if !defined(WITH_PASSWD)
-CONFIGURE_ARGS+=	--enable-passwd=n
+.if defined(WITH_PASSWD)
+CONFIGURE_ARGS+=	--enable-passwd=y
 .endif
 
 .if defined(WITH_APOP)
@@ -96,8 +103,8 @@ CONFIGURE_ARGS+=	--enable-apop=y \
 CONFIGURE_ARGS+=	--enable-apop=n
 .endif
 
-.if !defined(WITH_SQWEBMAIL)
-CONFIGURE_ARGS+=	--enable-sqwebmail-pass=n
+.if defined(WITH_SQWEBMAIL)
+CONFIGURE_ARGS+=	--enable-sqwebmail-pass=y
 .endif
 
 .if !defined(WITHOUT_ROAMING)
@@ -113,6 +120,19 @@ CONFIGURE_ARGS+=	--enable-mysql=y \
 .if defined(WITH_MYSQL_LARGE_SITE)
 CONFIGURE_ARGS+=	--enable-large-site=y
 .endif
+
+.if defined(WITH_MYSQL_SERVER)
+WITH_MYSQL_READ_SERVER?=	${WITH_MYSQL_SERVER}
+WITH_MYSQL_UPDATE_SERVER?=	${WITH_MYSQL_SERVER}
+.endif
+.if defined(WITH_MYSQL_USER)
+WITH_MYSQL_READ_USER?=	${WITH_MYSQL_USER}
+WITH_MYSQL_UPDATE_USER?=	${WITH_MYSQL_USER}
+.endif
+.if defined(WITH_MYSQL_PASSWD)
+WITH_MYSQL_READ_PASSWD?=	${WITH_MYSQL_PASSWD}
+WITH_MYSQL_UPDATE_PASSWD?=	${WITH_MYSQL_PASSWD}
+.endif
 .endif
 
 .if defined(DEFAULT_DOMAIN)
@@ -136,11 +156,23 @@ CONFIGURE_ARGS+=	--enable-deliver-filter=y
 pre-configure:
 	@PKG_PREFIX=${PREFIX}/vpopmail ${PERL5} ${PKGINSTALL}
 .if defined(WITH_MYSQL)
-.if defined(WITH_MYSQL_USER)
-	${PERL} -pi -e "s/(#define MYSQL_USER.*)root(.*)/\$$1${WITH_MYSQL_USER}\$$2/" ${WRKSRC}/vmysql.h
+.if defined(WITH_MYSQL_UPDATE_SERVER)
+	${PERL} -pi -e "s/(#define MYSQL_UPDATE_SERVER.*)localhost(.*)/\$$1${WITH_MYSQL_UPDATE_SERVER}\$$2/" ${WRKSRC}/vmysql.h
 .endif
-.if defined(WITH_MYSQL_PASSWD)
-	${PERL} -pi -e "s/(#define MYSQL_PASSWD.*)gipgap(.*)/\$$1${WITH_MYSQL_PASSWD}\$$2/" ${WRKSRC}/vmysql.h
+.if defined(WITH_MYSQL_READ_SERVER)
+	${PERL} -pi -e "s/(#define MYSQL_READ_SERVER.*)localhost(.*)/\$$1${WITH_MYSQL_READ_SERVER}\$$2/" ${WRKSRC}/vmysql.h
+.endif
+.if defined(WITH_MYSQL_UPDATE_USER)
+	${PERL} -pi -e "s/(#define MYSQL_UPDATE_USER.*)root(.*)/\$$1${WITH_MYSQL_UPDATE_USER}\$$2/" ${WRKSRC}/vmysql.h
+.endif
+.if defined(WITH_MYSQL_READ_USER)
+	${PERL} -pi -e "s/(#define MYSQL_READ_USER.*)root(.*)/\$$1${WITH_MYSQL_READ_USER}\$$2/" ${WRKSRC}/vmysql.h
+.endif
+.if defined(WITH_MYSQL_UPDATE_PASSWD)
+	${PERL} -pi -e "s/(#define MYSQL_UPDATE_PASSWD.*)secret(.*)/\$$1${WITH_MYSQL_UPDATE_PASSWD}\$$2/" ${WRKSRC}/vmysql.h
+.endif
+.if defined(WITH_MYSQL_READ_PASSWD)
+	${PERL} -pi -e "s/(#define MYSQL_READ_PASSWD.*)secret(.*)/\$$1${WITH_MYSQL_READ_PASSWD}\$$2/" ${WRKSRC}/vmysql.h
 .endif
 .if defined(WITH_MYSQL_DB)
 	${PERL} -pi -e "s/(#define MYSQL_DATABASE.*)vpopmail(.*)/\$$1${WITH_MYSQL_DB}\$$2/" ${WRKSRC}/vmysql.h
diff --git a/mail/vpopmail-devel/distinfo b/mail/vpopmail-devel/distinfo
index 56b0e0b812e8..68795c6bd872 100644
--- a/mail/vpopmail-devel/distinfo
+++ b/mail/vpopmail-devel/distinfo
@@ -1 +1 @@
-MD5 (vpopmail-4.9.10.tar.gz) = 3d92b2c49f942c93a32d885ac8eb285c
+MD5 (vpopmail-5.0.tar.gz) = 4e99a58023829e74e7cd49f30baaccc1
diff --git a/mail/vpopmail-devel/files/patch-configure b/mail/vpopmail-devel/files/patch-configure
index e35289927dce..df3302d9e94b 100644
--- a/mail/vpopmail-devel/files/patch-configure
+++ b/mail/vpopmail-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.old	Fri Nov  2 20:50:19 2001
-+++ configure	Fri Nov  2 20:50:35 2001
-@@ -1613,16 +1613,6 @@
+--- configure.old	Mon Nov 19 17:54:10 2001
++++ configure	Mon Nov 19 17:57:27 2001
+@@ -1535,15 +1535,6 @@
  rm -f vpopusername 
  
  
@@ -13,11 +13,10 @@
 -        echo "configure: warning: making a vpopmail etc directory " 1>&2
 -fi
 -
--
- open_smtp_cur="$vpopmaildir/etc/open-smtp"
- open_smtp_tmp="$vpopmaildir/etc/open-smtp.tmp"
- open_smtp_lok="$vpopmaildir/etc/open-smtp.lock"
-@@ -1658,7 +1648,7 @@
+ # Check whether --enable-roaming-users or --disable-roaming-users was given.
+ if test "${enable_roaming_users+set}" = set; then
+   enableval="$enable_roaming_users"
+@@ -1605,7 +1596,7 @@
    
          if test "$tcpserver_file" = ""
          then
@@ -26,16 +25,16 @@
      	    tcpserver_file="$vpopmaildir"/etc/tcp.smtp
  	
              echo "configure: warning: Unable to find your tcpserver relay file." 1>&2
-@@ -1873,7 +1863,7 @@
+@@ -2042,7 +2033,7 @@
          fi
- 		auth_libs="-L$sqllibdir -lmysqlclient -lz"
+ 		auth_libs="-L$libdir $extralibflags -lmysqlclient -lz"
  
--		echo "-L$vpopmaildir/lib -lvpopmail -L$sqllibdir -lmysqlclient -lz" > $vpopmaildir/etc/lib_deps
-+		echo "-L$vpopmaildir/lib -lvpopmail -L$sqllibdir -lmysqlclient -lz" > $VCFGDIR/lib_deps
+-		echo "-L$vpopmaildir/lib -lvpopmail -L$libdir -lmysqlclient -lz" > $vpopmaildir/etc/lib_deps
++		echo "-L$vpopmaildir/lib -lvpopmail -L$libdir -lmysqlclient -lz" > $VCFGDIR/lib_deps
  		
          ;;
  *)
-@@ -2007,14 +1997,14 @@
+@@ -2277,14 +2268,14 @@
  		authlib=
  		
  		auth_inc="-Icdb"
@@ -50,5 +49,5 @@
 -echo "-I$vpopmaildir/include" > $vpopmaildir/etc/inc_deps
 +echo "-I$vpopmaildir/include" > $VCFGDIR/inc_deps
  
- # Check whether --enable-roaming-users or --disable-roaming-users was given.
- if test "${enable_roaming_users+set}" = set; then
+ # Check whether --enable-qmail-ext or --disable-qmail-ext was given.
+ if test "${enable_qmail_ext+set}" = set; then
diff --git a/mail/vpopmail-devel/pkg-plist b/mail/vpopmail-devel/pkg-plist
index 4c38189c8252..10be5d30e549 100644
--- a/mail/vpopmail-devel/pkg-plist
+++ b/mail/vpopmail-devel/pkg-plist
@@ -2,11 +2,14 @@ vpopmail/bin/clearopensmtp
 vpopmail/bin/vaddaliasdomain
 vpopmail/bin/vadddomain
 vpopmail/bin/vadduser
+vpopmail/bin/valias
 vpopmail/bin/vchkpw
 vpopmail/bin/vconvert
 vpopmail/bin/vdeldomain
 vpopmail/bin/vdelivermail
+vpopmail/bin/vdeloldusers
 vpopmail/bin/vdeluser
+vpopmail/bin/vdominfo
 vpopmail/bin/vipmap
 vpopmail/bin/vmkpasswd
 vpopmail/bin/vmoduser
@@ -15,6 +18,7 @@ vpopmail/bin/vpopbull
 vpopmail/bin/vsetuserquota
 vpopmail/bin/vuserinfo
 vpopmail/doc/doc_html/vpopmail.html
+vpopmail/doc/doc_html/vpopmail5.abw
 vpopmail/doc/doc_html/vpopmailapi.png
 vpopmail/doc/man_html/clearopensmtp.html
 vpopmail/doc/man_html/index.html