diff options
author | Peter Pentchev <roam@FreeBSD.org> | 2003-02-17 12:21:10 +0000 |
---|---|---|
committer | Peter Pentchev <roam@FreeBSD.org> | 2003-02-17 12:21:10 +0000 |
commit | c8ea705c5e174f8f0554357c9bf567c447bea1c8 (patch) | |
tree | c1b0c1cdffd19a642650bb3f9eb5385173e70e5e /mail/vpopmail-devel | |
parent | * Upgrade to 0.10.3 (diff) |
Update to vpopmail-5.3.16:
- WITH_MYSQL_LIMITS works now, move it where users can actually see it
and remove the BROKEN mark;
- remove the vmysql.h patch that defined the 'limits' table creation -
it was fixed in the meantime;
- remove the annoying configure script check for id == 0.
Notes
Notes:
svn path=/head/; revision=75694
Diffstat (limited to 'mail/vpopmail-devel')
-rw-r--r-- | mail/vpopmail-devel/Makefile | 6 | ||||
-rw-r--r-- | mail/vpopmail-devel/distinfo | 2 | ||||
-rw-r--r-- | mail/vpopmail-devel/files/patch-configure | 21 | ||||
-rw-r--r-- | mail/vpopmail-devel/files/patch-vlimits.c | 16 | ||||
-rw-r--r-- | mail/vpopmail-devel/files/patch-vmysql.h | 15 |
5 files changed, 26 insertions, 34 deletions
diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile index bc4469ff461a..1458869d69a5 100644 --- a/mail/vpopmail-devel/Makefile +++ b/mail/vpopmail-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= vpopmail -PORTVERSION= 5.3.9 -PORTREVISION= 2 +PORTVERSION= 5.3.16 CATEGORIES= mail MASTER_SITES= http://www.inter7.com/devel/ @@ -41,6 +40,7 @@ CONFIGURE_ARGS= --enable-qmaildir=${QMAIL_DIR} \ # WITH_MYSQL - allow authentitation via mysql # WITH_MYSQL_LARGE_SITE - enables large site layout # WITH_MYSQL_REPLICATION - enables MySQL database replication +# WITH_MYSQL_LIMITS - enables the MySQL mailbox limit code # WITH_SYBASE - allow authentication via Sybase (NOT TESTED!) # WITH_ORACLE - allow authentication via Oracle (NOT TESTED!) # WITH_CLEAR_PASSWD - store passwords in plaintext into the MySQL db @@ -82,7 +82,6 @@ CONFIGURE_ARGS= --enable-qmaildir=${QMAIL_DIR} \ # 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} -# WITH_MYSQL_LIMITS - enable vpopmail handling of .qmailadmin-limits (BROKEN) # # Oracle database configuration options # @@ -179,7 +178,6 @@ CONFIGURE_ARGS+= --enable-mysql-replication=y CONFIGURE_ARGS+= --enable-mysql-logging=y .endif .if defined(WITH_MYSQL_LIMITS) -BROKEN= "the MySQL limits code is not usable yet; please unset WITH_MYSQL_LIMITS" CONFIGURE_ARGS+= --enable-mysql-limits=y .endif diff --git a/mail/vpopmail-devel/distinfo b/mail/vpopmail-devel/distinfo index d6e0ec11cc6d..b530b66b2b69 100644 --- a/mail/vpopmail-devel/distinfo +++ b/mail/vpopmail-devel/distinfo @@ -1 +1 @@ -MD5 (vpopmail-5.3.9.tar.gz) = ffe8fa35ab259368ad7f75584c04389a +MD5 (vpopmail-5.3.16.tar.gz) = fc08d11e0db920171db30b29e95b03bc diff --git a/mail/vpopmail-devel/files/patch-configure b/mail/vpopmail-devel/files/patch-configure index df3302d9e94b..07ab9b4f24a2 100644 --- a/mail/vpopmail-devel/files/patch-configure +++ b/mail/vpopmail-devel/files/patch-configure @@ -1,6 +1,15 @@ ---- configure.old Mon Nov 19 17:54:10 2001 -+++ configure Mon Nov 19 17:57:27 2001 -@@ -1535,15 +1535,6 @@ +--- configure.old Thu Feb 13 17:37:40 2003 ++++ configure Thu Feb 13 17:38:32 2003 +@@ -1285,7 +1285,7 @@ + ;; + esac + +-if test `$idcommand` != "0" ++if false && test `$idcommand` != "0" + then + echo "configure: warning: === vpopmail must be configured as root. ===" 1>&2 + echo "configure: warning: === please switch to the root user and ===" 1>&2 +@@ -1563,15 +1563,6 @@ rm -f vpopusername @@ -16,7 +25,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 @@ +@@ -1637,7 +1628,7 @@ if test "$tcpserver_file" = "" then @@ -25,7 +34,7 @@ tcpserver_file="$vpopmaildir"/etc/tcp.smtp echo "configure: warning: Unable to find your tcpserver relay file." 1>&2 -@@ -2042,7 +2033,7 @@ +@@ -2142,7 +2133,7 @@ fi auth_libs="-L$libdir $extralibflags -lmysqlclient -lz" @@ -34,7 +43,7 @@ ;; *) -@@ -2277,14 +2268,14 @@ +@@ -2399,14 +2390,14 @@ authlib= auth_inc="-Icdb" diff --git a/mail/vpopmail-devel/files/patch-vlimits.c b/mail/vpopmail-devel/files/patch-vlimits.c index f784777116d4..27b078822274 100644 --- a/mail/vpopmail-devel/files/patch-vlimits.c +++ b/mail/vpopmail-devel/files/patch-vlimits.c @@ -1,27 +1,27 @@ ---- vlimits.c.orig Sat Nov 2 22:39:03 2002 -+++ vlimits.c Sat Nov 2 22:41:10 2002 -@@ -49,7 +49,7 @@ +--- vlimits.c.old Fri Feb 14 14:44:38 2003 ++++ vlimits.c Fri Feb 14 14:45:21 2003 +@@ -46,7 +46,7 @@ /* get filename */ - vget_assign(domain, dir, sizeof(dir), &uid, &gid); + vget_assign(mydomain, dir, sizeof(dir), &uid, &gid); - strncat(dir, "/.qmailadmin-limits", sizeof(dir)); + strncat(dir, "/.qmailadmin-limits", sizeof(dir) - strlen(dir) - 1); /* open file */ if ((fs = fopen(dir, "r")) != NULL) { -@@ -143,7 +143,7 @@ +@@ -209,7 +209,7 @@ /* get filename */ - vget_assign(domain, dir, sizeof(dir), &uid, &gid); + vget_assign(mydomain, dir, sizeof(dir), &uid, &gid); - strncat(dir, "/.qmailadmin-limits", sizeof(dir)); + strncat(dir, "/.qmailadmin-limits", sizeof(dir) - strlen(dir) - 1); /* open file */ if ((fs = fopen(dir, "w+")) != NULL) { -@@ -183,7 +183,7 @@ +@@ -265,7 +265,7 @@ /* get filename */ - vget_assign(domain, dir, sizeof(dir), &uid, &gid); + vget_assign(mydomain, dir, sizeof(dir), &uid, &gid); - strncat(dir, "/.qmailadmin-limits", sizeof(dir)); + strncat(dir, "/.qmailadmin-limits", sizeof(dir) - strlen(dir) - 1); return unlink(dir); diff --git a/mail/vpopmail-devel/files/patch-vmysql.h b/mail/vpopmail-devel/files/patch-vmysql.h deleted file mode 100644 index 347342723a14..000000000000 --- a/mail/vpopmail-devel/files/patch-vmysql.h +++ /dev/null @@ -1,15 +0,0 @@ ---- vmysql.h.orig Sat Nov 2 23:02:32 2002 -+++ vmysql.h Sat Nov 2 23:06:01 2002 -@@ -250,3 +250,12 @@ - INDEX error_idx (error), INDEX message_idx (message)" - #endif - -+#ifdef ENABLE_MYSQL_LIMITS -+#define LIMITS_TABLE_LAYOUT "id BIGINT PRIMARY KEY AUTO_INCREMENT, \ -+ domain CHAR(64), maxpopaccounts INTEGER, maxaliases INTEGER, \ -+ maxforwards INT, maxautoresponders INT, maxmailinglists INT \ -+ diskquota INT, defaultquota INT, disablepop INT, disableimap INT, \ -+ disabledialup INT, disablepasswordchanging INT, disablewebmail INT, \ -+ disablerelay INT, \ -+ INDEX domain_idx (domain)" -+#endif |