Date: Fri, 11 Apr 2014 00:51:02 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350866 - in head: . mail/vpopmail mail/vpopmail/files Message-ID: <201404110051.s3B0p2c5034140@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Apr 11 00:51:02 2014 New Revision: 350866 URL: http://svnweb.freebsd.org/changeset/ports/350866 QAT: https://qat.redports.org/buildarchive/r350866/ Log: - Update to 5.4.33 - Move auth options into its own single group - Clarify PASSWD and VALIAS options Changes: (* was already applied in our 5.4.32) Matt Brookings * - Defaulted to Server::Disable=True in vusagec.conf * - Fixed bug that didn't install vusagec.conf - Changed relevant quota code to use storage_t 64bit type - Fixed bug where backfill code wouldn't compile when FILE_LOCKING was enabled - Updated MySQL module to support larger quota sizes - Fixed typo - Added disable_maildrop flag to MySQL limits feature - More changes to allow for larger quota sizes in MySQL module Tullio Andreatta - Dynamic allocation of valias data - Use of open/fchdir rather than getcwd/chdir to maintain current working directory - Fixed a broken symbolic link check Drew Wells - Modification to vdelivermail to properly handle Maildir paths that begin with "./" <kenji@kens.fm> - Removed call to maildir_addquota inside user_over_maildirquota causing duplicate maildirsize entries Deleted: head/mail/vpopmail/files/patch-vusagec.conf Modified: head/UPDATING head/mail/vpopmail/Makefile head/mail/vpopmail/distinfo head/mail/vpopmail/files/patch-Makefile.in head/mail/vpopmail/files/patch-vpopmail.c Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Apr 10 23:58:47 2014 (r350865) +++ head/UPDATING Fri Apr 11 00:51:02 2014 (r350866) @@ -5,6 +5,18 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20140410: + AFFECTS: users of mail/vpopmail + AUTHOR: bdrewery@FreeBSD.org + + If you are storing limits in MySQL, the following schema changes must be made: + + ALTER TABLE `limits` ADD `disable_maildrop` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`; + ALTER TABLE `limits` MODIFY `diskquota` BIGINT UNSIGNED NOT NULL DEFAULT 0; + ALTER TABLE `limits` MODIFY `maxmsgcount` BIGINT UNSIGNED NOT NULL DEFAULT 0; + ALTER TABLE `limits` MODIFY `defaultquota` BIGINT UNSIGNED NOT NULL DEFAULT 0; + ALTER TABLE `limits` MODIFY `defaultmaxmsgcount` BIGINT UNSIGNED NOT NULL DEFAULT 0; + 20140403: AFFECTS: users of net/rabbitmq AUTHOR: olgeni@FreeBSD.org Modified: head/mail/vpopmail/Makefile ============================================================================== --- head/mail/vpopmail/Makefile Thu Apr 10 23:58:47 2014 (r350865) +++ head/mail/vpopmail/Makefile Fri Apr 11 00:51:02 2014 (r350866) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= vpopmail -PORTVERSION= 5.4.32 -PORTREVISION= 5 +PORTVERSION= 5.4.33 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \ SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION} @@ -47,14 +46,8 @@ OPTIONS_DEFINE= DOCS \ MD5_PASSWORDS \ CLEAR_PASSWD \ LEARN_PASSWORDS \ - MYSQL \ MYSQL_REPLICATION \ MYSQL_LIMITS \ - PGSQL \ - SYBASE \ - ORACLE \ - LDAP \ - LDAP_SASL \ VALIAS \ ROAMING \ IP_ALIAS \ @@ -75,8 +68,11 @@ OPTIONS_DEFINE= DOCS \ AUTH_LOG \ SQL_LOG \ SQL_LOG_TRIM +OPTIONS_SINGLE= AUTH +OPTIONS_SINGLE_AUTH= CDB MYSQL PGSQL LDAP LDAP_SASL ORACLE SYBASE OPTIONS_DEFAULT=MD5_PASSWORDS \ + CDB \ ROAMING \ FILE_LOCKING \ USERS_BIG_DIR \ @@ -84,7 +80,8 @@ OPTIONS_DEFAULT=MD5_PASSWORDS \ FPIC \ AUTH_LOG -PASSWD_DESC= Auth via /etc/passwd +CDB_DESC= Auth via CDB +PASSWD_DESC= /etc/passwd account support MYSQL_DESC= Auth via MySQL PGSQL_DESC= Auth via PostgreSQL SYBASE_DESC= Auth via Sybase @@ -96,7 +93,7 @@ MYSQL_LIMITS_DESC= MySQL mailbox limita ORACLE_DESC= Auth via Oracle LDAP_DESC= Auth via LDAP LDAP_SASL_DESC= Auth via LDAP SASL -VALIAS_DESC= valias processing +VALIAS_DESC= Store aliases in DB instead of .qmail files ROAMING_DESC= roaming users support IP_ALIAS_DESC= IP alias support QMAIL_EXT_DESC= qmail-like user-* address support Modified: head/mail/vpopmail/distinfo ============================================================================== --- head/mail/vpopmail/distinfo Thu Apr 10 23:58:47 2014 (r350865) +++ head/mail/vpopmail/distinfo Fri Apr 11 00:51:02 2014 (r350866) @@ -1,2 +1,2 @@ -SHA256 (vpopmail-5.4.32.tar.gz) = 20dc467d46703f7f9fb5ab5f77929ed599cbdc73fb0490691f41210ed76776b6 -SIZE (vpopmail-5.4.32.tar.gz) = 612426 +SHA256 (vpopmail-5.4.33.tar.gz) = 383c7436dfb18e773336f608f1771fc08559143c4f3938a5807a0cc5994c44f4 +SIZE (vpopmail-5.4.33.tar.gz) = 612271 Modified: head/mail/vpopmail/files/patch-Makefile.in ============================================================================== --- head/mail/vpopmail/files/patch-Makefile.in Thu Apr 10 23:58:47 2014 (r350865) +++ head/mail/vpopmail/files/patch-Makefile.in Fri Apr 11 00:51:02 2014 (r350866) @@ -1,19 +1,19 @@ Description: Install config files with -dist, do not add -fPIC. Install the config files with a -dist extension. Do not unconditionally add -fPIC, this is done only for shared libs. - Actually look for and install the vusagec.conf sample file! Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> Last-Update: 2010-09-13 ---- a/Makefile.in -+++ b/Makefile.in -@@ -357,12 +357,12 @@ +--- Makefile.in.orig 2011-02-28 11:00:45.000000000 -0600 ++++ Makefile.in 2014-04-10 11:17:21.360658218 -0500 +@@ -357,13 +357,12 @@ noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c client.c conf.c ippp.c CONFIG_CLEAN_FILES = vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load -MYSQLCONF = $(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql -VLIMITS = $(DESTDIR)@vpopmaildir@/etc/vlimits.default +-VUSAGECCONF = $(DESTDIR)@vpopmaildir@/etc/vusagec.conf +MYSQLCONF = $(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql-dist +VLIMITS = $(DESTDIR)@vpopmaildir@/etc/vlimits.default-dist +VUSAGECCONF = $(DESTDIR)@vpopmaildir@/etc/vusagec.conf-dist Modified: head/mail/vpopmail/files/patch-vpopmail.c ============================================================================== --- head/mail/vpopmail/files/patch-vpopmail.c Thu Apr 10 23:58:47 2014 (r350865) +++ head/mail/vpopmail/files/patch-vpopmail.c Fri Apr 11 00:51:02 2014 (r350866) @@ -9,9 +9,9 @@ Author: Peter Pentchev <roam@FreeBSD.org Alex Dupre <ale@FreeBSD.org> Last-Update: 2009-11-26 ---- a/vpopmail.c -+++ b/vpopmail.c -@@ -945,6 +945,7 @@ +--- vpopmail.c.orig 2011-02-28 11:00:45.000000000 -0600 ++++ vpopmail.c 2014-04-10 11:20:59.892641589 -0500 +@@ -981,6 +981,7 @@ int vdelfiles(char *dir) /* print error message and return and error */ fprintf (stderr, "Failed to delete directory %s", mydirent->d_name); @@ -19,7 +19,7 @@ Last-Update: 2009-11-26 return(-1); } } -@@ -1563,7 +1564,7 @@ +@@ -1603,7 +1604,7 @@ while(( s[i]==' ')||(s[i]=='\t')) { i++; } @@ -28,7 +28,7 @@ Last-Update: 2009-11-26 if( i>0 ) { for( j=0; j<k; j++ ) { -@@ -1575,7 +1576,7 @@ +@@ -1615,7 +1616,7 @@ if( i>0 ) { // trim spaces and tabs from end i = strlen(s) - 1; @@ -37,8 +37,8 @@ Last-Update: 2009-11-26 i--; } -@@ -2348,7 +2349,12 @@ - char calling_dir[MAX_BUFF]; +@@ -2387,7 +2388,12 @@ char *make_user_dir(char *username, char + int call_dir; char domain_dir[MAX_BUFF]; const char *dirnames[] = {"Maildir", "Maildir/new", "Maildir/cur", - "Maildir/tmp"}; @@ -51,21 +51,21 @@ Last-Update: 2009-11-26 int i; verrori = 0; -@@ -3114,6 +3120,13 @@ - if (mkdir("cur",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); } - if (mkdir("new",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); } - if (mkdir("tmp",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); } +@@ -3154,6 +3160,13 @@ int vmake_maildir(char *domain, char *di + if (mkdir("cur",VPOPMAIL_DIR_MODE) == -1) { fchdir(call_dir); close(call_dir); return(-1); } + if (mkdir("new",VPOPMAIL_DIR_MODE) == -1) { fchdir(call_dir); close(call_dir); return(-1); } + if (mkdir("tmp",VPOPMAIL_DIR_MODE) == -1) { fchdir(call_dir); close(call_dir); return(-1); } +#ifdef SPAM_JUNKFOLDER -+ if (mkdir(".Junk",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); } -+ if (chdir(".Junk") == -1) { chdir(calling_dir); return(-1); } -+ if (mkdir("cur",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); } -+ if (mkdir("new",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); } -+ if (mkdir("tmp",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); } ++ if (mkdir(".Junk",VPOPMAIL_DIR_MODE) == -1) { fchdir(call_dir); close(call_dir); return(-1); } ++ if (chdir(".Junk") == -1) { fchdir(call_dir); close(call_dir); return(-1); } ++ if (mkdir("cur",VPOPMAIL_DIR_MODE) == -1) { fchdir(call_dir); close(call_dir); return(-1); } ++ if (mkdir("new",VPOPMAIL_DIR_MODE) == -1) { fchdir(call_dir); close(call_dir); return(-1); } ++ if (mkdir("tmp",VPOPMAIL_DIR_MODE) == -1) { fchdir(call_dir); close(call_dir); return(-1); } +#endif /* set permissions on the user's dir */ chdir(dir); -@@ -4163,11 +4176,19 @@ +@@ -4220,12 +4233,20 @@ int call_onchange ( const char *cmd ) } else if ( pid > 0 ) { @@ -89,3 +89,4 @@ Last-Update: 2009-11-26 + return(rv); } #endif +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404110051.s3B0p2c5034140>