Update to vpopmail-5.3.30, fixing a critical update_rules bug.

Revamp a bit the creation of the MySQL credentials file.

PR:		59605
Submitted by:	Alex Dupre <sysadmin@alexdupre.com> (mostly)
Approved by:	portmgr (will)

8 files changed, 94 insertions, 36 deletions

diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile
index bc1f059f62f3..26e24b44deba 100644
--- a/mail/vpopmail-devel/Makefile
+++ b/mail/vpopmail-devel/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	vpopmail
-PORTVERSION=	5.3.29
-PORTREVISION=	1
+PORTVERSION=	5.3.30
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -309,15 +309,12 @@ post-install:
 			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
 		fi; \
 	fi
-	if [ ! -e "${PREFIX}/vpopmail/etc/vlimits.default" ]; then \
-		${TOUCH} ${PREFIX}/vpopmail/etc/vlimits.default; \
-	fi
 .if defined(DEFAULT_DOMAIN)
 	${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain
 .endif
 .if defined(WITH_MYSQL)
 	${ECHO_CMD} "${WITH_MYSQL_READ_SERVER}|0|${WITH_MYSQL_READ_USER}|${WITH_MYSQL_READ_PASSWD}|${WITH_MYSQL_DB}" \
-		> ${PREFIX}/vpopmail/etc/vpopmail.mysql
+		>> ${PREFIX}/vpopmail/etc/vpopmail.mysql
 	${ECHO_CMD} "${WITH_MYSQL_UPDATE_SERVER}|0|${WITH_MYSQL_UPDATE_USER}|${WITH_MYSQL_UPDATE_PASSWD}|${WITH_MYSQL_DB}" \
 		>> ${PREFIX}/vpopmail/etc/vpopmail.mysql
 .endif
diff --git a/mail/vpopmail-devel/distinfo b/mail/vpopmail-devel/distinfo
index 50e88b0f4b7d..f7e8b6e0ead1 100644
--- a/mail/vpopmail-devel/distinfo
+++ b/mail/vpopmail-devel/distinfo
@@ -1 +1 @@
-MD5 (vpopmail-5.3.29.tar.gz) = 42904ce91d4b0398ae8f964d692f88af
+MD5 (vpopmail-5.3.30.tar.gz) = 45a87b772bb158468c1c1039f8765965
diff --git a/mail/vpopmail-devel/files/patch-Makefile.in b/mail/vpopmail-devel/files/patch-Makefile.in
index 52cd7794c969..05603c4b036b 100644
--- a/mail/vpopmail-devel/files/patch-Makefile.in
+++ b/mail/vpopmail-devel/files/patch-Makefile.in
@@ -1,14 +1,43 @@
---- Makefile.in.orig	Thu Sep  4 23:45:08 2003
-+++ Makefile.in	Thu Sep  4 23:46:17 2003
-@@ -705,10 +705,7 @@
- 
- 	if test "@USE_MYSQL@" = "1"; then \
- 	  if test ! -r $(MYSQLCONF); then \
--	    echo "# MySQL settings, line 1 is config for read-only," > $(MYSQLCONF); \
--	    echo "# line 2 is config for update.  Settings for each" >> $(MYSQLCONF); \
--	    echo "# line: server|port|user|password|database" >> $(MYSQLCONF); \
+--- Makefile.in.old	Thu Nov 27 11:26:31 2003
++++ Makefile.in	Thu Nov 27 11:28:06 2003
+@@ -43,10 +43,10 @@
+ 
+ top_builddir = .
+ 
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
++ACLOCAL = /usr/bin/true
++AUTOCONF = /usr/bin/true
++AUTOMAKE = /usr/bin/true
++AUTOHEADER = /usr/bin/true
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+@@ -723,6 +723,8 @@
+ 	echo "-I@vpopmaildir@/include" > @vpopmaildir@/etc/inc_deps
+ 	echo "-L@vpopmaildir@/lib -lvpopmail @auth_libs@ @LIBS@" > @vpopmaildir@/etc/lib_deps
+ 
++	$(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
++	  vlimits.default $(VLIMITS)-dist; \
+ 	if test ! -r $(VLIMITS); then \
+ 	  $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
+ 	    vlimits.default $(VLIMITS); \
+@@ -740,12 +742,15 @@
+ 	    echo "# settings for each line:" >> $(MYSQLCONF); \
+ 	    echo "# host|port|user|password|database" >> $(MYSQLCONF); \
+ 	    echo "#" >> $(MYSQLCONF); \
 -	    echo "localhost|0|root|secret|vpopmail" >> $(MYSQLCONF); \
-+	    touch $(MYSQLCONF); \
+ 	    echo "#" >> $(MYSQLCONF); \
+ 	    echo "# Note:" >> $(MYSQLCONF); \
+ 	    echo "#   The value of host may be either a hostname or an IP address." >> $(MYSQLCONF); \
+ 	    echo "#   If host is 'localhost', then sockets (Unix) or named pipes (Windows)" >> $(MYSQLCONF); \
+ 	    echo "#   will be used instead of TCP/IP to connect to the server."   >> $(MYSQLCONF); \
++	  fi ; \
++	  chown @vpopuser@  $(MYSQLCONF) ; \
++	  chgrp @vpopgroup@ $(MYSQLCONF) ; \
++	  chmod 0600        $(MYSQLCONF) ; \
  	  fi ; \
  	  chown @vpopuser@  $(MYSQLCONF) ; \
  	  chgrp @vpopgroup@ $(MYSQLCONF) ; \
diff --git a/mail/vpopmail-devel/pkg-plist b/mail/vpopmail-devel/pkg-plist
index e2f3ec4d2ec6..9894c433d1fa 100644
--- a/mail/vpopmail-devel/pkg-plist
+++ b/mail/vpopmail-devel/pkg-plist
@@ -3,6 +3,7 @@ vpopmail/bin/vaddaliasdomain
 vpopmail/bin/vadddomain
 vpopmail/bin/vadduser
 vpopmail/bin/valias
+vpopmail/bin/vchangepw
 vpopmail/bin/vchkpw
 vpopmail/bin/vconvert
 vpopmail/bin/vdeldomain
@@ -40,6 +41,8 @@ vpopmail/doc/man_html/vsetuserquota.html
 vpopmail/etc/inc_deps
 vpopmail/etc/lib_deps
 @unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
+@unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi
+vpopmail/etc/vlimits.default-dist
 @unexec if [ -f %D/vpopmail/etc/vpopmail.mysql ]; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi
 vpopmail/include/config.h
 vpopmail/include/vauth.h
@@ -49,7 +52,7 @@ vpopmail/include/vpopmail_config.h
 vpopmail/lib/libvpopmail.a
 @dirrm vpopmail/lib
 @dirrm vpopmail/include
-@dirrm vpopmail/etc
+@unexec rmdir %D/vpopmail/etc 2>/dev/null || true
 @unexec rmdir %D/vpopmail/domains 2>/dev/null || true
 @dirrm vpopmail/doc/man_html
 @dirrm vpopmail/doc/doc_html
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index bc1f059f62f3..26e24b44deba 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	vpopmail
-PORTVERSION=	5.3.29
-PORTREVISION=	1
+PORTVERSION=	5.3.30
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -309,15 +309,12 @@ post-install:
 			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
 		fi; \
 	fi
-	if [ ! -e "${PREFIX}/vpopmail/etc/vlimits.default" ]; then \
-		${TOUCH} ${PREFIX}/vpopmail/etc/vlimits.default; \
-	fi
 .if defined(DEFAULT_DOMAIN)
 	${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain
 .endif
 .if defined(WITH_MYSQL)
 	${ECHO_CMD} "${WITH_MYSQL_READ_SERVER}|0|${WITH_MYSQL_READ_USER}|${WITH_MYSQL_READ_PASSWD}|${WITH_MYSQL_DB}" \
-		> ${PREFIX}/vpopmail/etc/vpopmail.mysql
+		>> ${PREFIX}/vpopmail/etc/vpopmail.mysql
 	${ECHO_CMD} "${WITH_MYSQL_UPDATE_SERVER}|0|${WITH_MYSQL_UPDATE_USER}|${WITH_MYSQL_UPDATE_PASSWD}|${WITH_MYSQL_DB}" \
 		>> ${PREFIX}/vpopmail/etc/vpopmail.mysql
 .endif
diff --git a/mail/vpopmail/distinfo b/mail/vpopmail/distinfo
index 50e88b0f4b7d..f7e8b6e0ead1 100644
--- a/mail/vpopmail/distinfo
+++ b/mail/vpopmail/distinfo
@@ -1 +1 @@
-MD5 (vpopmail-5.3.29.tar.gz) = 42904ce91d4b0398ae8f964d692f88af
+MD5 (vpopmail-5.3.30.tar.gz) = 45a87b772bb158468c1c1039f8765965
diff --git a/mail/vpopmail/files/patch-Makefile.in b/mail/vpopmail/files/patch-Makefile.in
index 52cd7794c969..05603c4b036b 100644
--- a/mail/vpopmail/files/patch-Makefile.in
+++ b/mail/vpopmail/files/patch-Makefile.in
@@ -1,14 +1,43 @@
---- Makefile.in.orig	Thu Sep  4 23:45:08 2003
-+++ Makefile.in	Thu Sep  4 23:46:17 2003
-@@ -705,10 +705,7 @@
- 
- 	if test "@USE_MYSQL@" = "1"; then \
- 	  if test ! -r $(MYSQLCONF); then \
--	    echo "# MySQL settings, line 1 is config for read-only," > $(MYSQLCONF); \
--	    echo "# line 2 is config for update.  Settings for each" >> $(MYSQLCONF); \
--	    echo "# line: server|port|user|password|database" >> $(MYSQLCONF); \
+--- Makefile.in.old	Thu Nov 27 11:26:31 2003
++++ Makefile.in	Thu Nov 27 11:28:06 2003
+@@ -43,10 +43,10 @@
+ 
+ top_builddir = .
+ 
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
++ACLOCAL = /usr/bin/true
++AUTOCONF = /usr/bin/true
++AUTOMAKE = /usr/bin/true
++AUTOHEADER = /usr/bin/true
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+@@ -723,6 +723,8 @@
+ 	echo "-I@vpopmaildir@/include" > @vpopmaildir@/etc/inc_deps
+ 	echo "-L@vpopmaildir@/lib -lvpopmail @auth_libs@ @LIBS@" > @vpopmaildir@/etc/lib_deps
+ 
++	$(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
++	  vlimits.default $(VLIMITS)-dist; \
+ 	if test ! -r $(VLIMITS); then \
+ 	  $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
+ 	    vlimits.default $(VLIMITS); \
+@@ -740,12 +742,15 @@
+ 	    echo "# settings for each line:" >> $(MYSQLCONF); \
+ 	    echo "# host|port|user|password|database" >> $(MYSQLCONF); \
+ 	    echo "#" >> $(MYSQLCONF); \
 -	    echo "localhost|0|root|secret|vpopmail" >> $(MYSQLCONF); \
-+	    touch $(MYSQLCONF); \
+ 	    echo "#" >> $(MYSQLCONF); \
+ 	    echo "# Note:" >> $(MYSQLCONF); \
+ 	    echo "#   The value of host may be either a hostname or an IP address." >> $(MYSQLCONF); \
+ 	    echo "#   If host is 'localhost', then sockets (Unix) or named pipes (Windows)" >> $(MYSQLCONF); \
+ 	    echo "#   will be used instead of TCP/IP to connect to the server."   >> $(MYSQLCONF); \
++	  fi ; \
++	  chown @vpopuser@  $(MYSQLCONF) ; \
++	  chgrp @vpopgroup@ $(MYSQLCONF) ; \
++	  chmod 0600        $(MYSQLCONF) ; \
  	  fi ; \
  	  chown @vpopuser@  $(MYSQLCONF) ; \
  	  chgrp @vpopgroup@ $(MYSQLCONF) ; \
diff --git a/mail/vpopmail/pkg-plist b/mail/vpopmail/pkg-plist
index e2f3ec4d2ec6..9894c433d1fa 100644
--- a/mail/vpopmail/pkg-plist
+++ b/mail/vpopmail/pkg-plist
@@ -3,6 +3,7 @@ vpopmail/bin/vaddaliasdomain
 vpopmail/bin/vadddomain
 vpopmail/bin/vadduser
 vpopmail/bin/valias
+vpopmail/bin/vchangepw
 vpopmail/bin/vchkpw
 vpopmail/bin/vconvert
 vpopmail/bin/vdeldomain
@@ -40,6 +41,8 @@ vpopmail/doc/man_html/vsetuserquota.html
 vpopmail/etc/inc_deps
 vpopmail/etc/lib_deps
 @unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
+@unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi
+vpopmail/etc/vlimits.default-dist
 @unexec if [ -f %D/vpopmail/etc/vpopmail.mysql ]; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi
 vpopmail/include/config.h
 vpopmail/include/vauth.h
@@ -49,7 +52,7 @@ vpopmail/include/vpopmail_config.h
 vpopmail/lib/libvpopmail.a
 @dirrm vpopmail/lib
 @dirrm vpopmail/include
-@dirrm vpopmail/etc
+@unexec rmdir %D/vpopmail/etc 2>/dev/null || true
 @unexec rmdir %D/vpopmail/domains 2>/dev/null || true
 @dirrm vpopmail/doc/man_html
 @dirrm vpopmail/doc/doc_html