ports/59605: [Update] Port: mail/vpopmail

[Alex Dupre]

>Number:         59605
>Category:       ports
>Synopsis:       [Update] Port: mail/vpopmail
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 23 03:30:20 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD armada.alexdupre.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Fri Nov 21 17:45:13 CET 2003 alex at armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386


	
>Description:
Update to 5.3.30 release.
Fix for roaming users.
Better handling of vlimits.default file.
	
>How-To-Repeat:
	
>Fix:

	

--- vpopmail.diff begins here ---
diff -ruN vpopmail.orig/Makefile vpopmail/Makefile
--- vpopmail.orig/Makefile	Sun Nov 23 11:29:22 2003
+++ vpopmail/Makefile	Sun Nov 23 11:46:25 2003
@@ -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}
@@ -308,9 +308,6 @@
 		else \
 			${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
diff -ruN vpopmail.orig/distinfo vpopmail/distinfo
--- vpopmail.orig/distinfo	Sun Nov 23 11:29:22 2003
+++ vpopmail/distinfo	Sun Nov 23 11:32:40 2003
@@ -1 +1 @@
-MD5 (vpopmail-5.3.29.tar.gz) = 42904ce91d4b0398ae8f964d692f88af
+MD5 (vpopmail-5.3.30.tar.gz) = 45a87b772bb158468c1c1039f8765965
diff -ruN vpopmail.orig/files/patch-Makefile.in vpopmail/files/patch-Makefile.in
--- vpopmail.orig/files/patch-Makefile.in	Sun Nov 23 11:29:22 2003
+++ vpopmail/files/patch-Makefile.in	Sun Nov 23 12:06:31 2003
@@ -1,13 +1,34 @@
---- Makefile.in.orig	Thu Sep  4 23:45:08 2003
-+++ Makefile.in	Thu Sep  4 23:46:17 2003
-@@ -705,10 +705,7 @@
+--- Makefile.in.orig	Fri Nov 21 00:10:01 2003
++++ Makefile.in	Sun Nov 23 11:58:04 2003
+@@ -723,29 +723,15 @@
+ 	echo "-I at vpopmaildir@/include" > @vpopmaildir@/etc/inc_deps
+ 	echo "-L at 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); \
+ 	fi
  	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); \
+-	    echo "# MYSQL CONNECTION SETTINGS FOR VPOPMAIL" >> $(MYSQLCONF); \
+-	    echo "#" >> $(MYSQLCONF); \
+-	    echo "# Line 1 defines the connection to use for database reads," >> $(MYSQLCONF); \
+-	    echo "# Line 2 defines the connection to use for database updates/writes." >> $(MYSQLCONF); \
+-	    echo "#" >> $(MYSQLCONF); \
+-	    echo "# If you omit line 2, then the same settings will be" >> $(MYSQLCONF); \
+-	    echo "# used for both read and write." >> $(MYSQLCONF); \
+-	    echo "#" >> $(MYSQLCONF); \
+-	    echo "# settings for each line:" >> $(MYSQLCONF); \
+-	    echo "# host|port|user|password|database" >> $(MYSQLCONF); \
+-	    echo "#" >> $(MYSQLCONF); \
 -	    echo "localhost|0|root|secret|vpopmail" >> $(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); \
 +	    touch $(MYSQLCONF); \
  	  fi ; \
  	  chown @vpopuser@  $(MYSQLCONF) ; \
diff -ruN vpopmail.orig/pkg-plist vpopmail/pkg-plist
--- vpopmail.orig/pkg-plist	Sun Nov 23 11:29:22 2003
+++ vpopmail/pkg-plist	Sun Nov 23 12:03:54 2003
@@ -3,6 +3,7 @@
 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/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
+ at 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/lib/libvpopmail.a
 @dirrm vpopmail/lib
 @dirrm vpopmail/include
- at dirrm vpopmail/etc
+ at 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
--- vpopmail.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: