Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2017-01-25 22:35:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postfix" Changes: -------- --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2017-01-15 11:15:12.926732112 +0100 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes 2017-01-25 22:35:16.718196723 +0100 @@ -1,0 +2,18 @@ +Sat Jan 21 23:27:34 UTC 2017 - [email protected] + +- update postfix-mysql + * update mysql_*.cf files + * update postfix-mysql.sql (INNODB, utf8) +- update postfix-main.cf.patch + * uncomment smtpd_sasl_path, smtpd_sasl_type + can be changed via POSTFIX_SMTP_AUTH_SERVICE=(cyrus,dovecot) + * add option for smtp_tls_policy_maps (commented) +- update postfix-master.cf.patch + * fix indentation of submission, smtps options for correct + enabling via config.postfix +- update config.postfix + * fix sync of CA certificates + * fix master.cf generation for submission, smtps +- rebase postfix-vda-v14-3.0.3.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix-SuSE.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/config.postfix new/postfix-SuSE/config.postfix --- old/postfix-SuSE/config.postfix 2017-01-11 15:27:51.257806602 +0100 +++ new/postfix-SuSE/config.postfix 2017-01-21 23:16:39.016674120 +0100 @@ -172,6 +172,7 @@ "$(echo "$POSTFIX_SMTP_TLS_CLIENT" | tr 'A-Z' 'a-z' )" != "no" ]; then # sync the CA certificates + [[ -d ./etc/ssl ]] && install -d ./etc/ssl ; rsync -avH --copy-unsafe-links /etc/ssl/certs ./etc/ssl # sync default postfix ssl DIR (/etc/postfix/ssl) @@ -973,7 +974,13 @@ $line = " ".$1; } } elsif( /^\#?\s{3}(-o\s+smtpd_sasl_auth_enable=.*)/ ) { - if ( $tlsserver ne "yes" && $authserver ne "yes") { + if ( $tlsserver eq "yes" && $authserver eq "yes") { + $line = " ".$1; + } else { + $line = "# ".$1; + } + } elsif( /^\#?\s{3}(-o\s+smtpd_relay_restrictions=.*)/ ) { + if ( $tlsserver ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; @@ -1007,13 +1014,19 @@ $line = " ".$1; } } elsif( /^\#?\s{4}(-o\s+content_filter=.*)/ ) { - if ( $sslserver ne "yes" && $use_amavis ne "yes" ) { - $line = "# ".$1; - } else { + if ( $sslserver eq "yes" && $use_amavis eq "yes" ) { $line = " ".$1; + } else { + $line = "# ".$1; } } elsif( /^\#?\s{4}(-o\s+smtpd_sasl_auth_enable=.*)/ ) { - if ( $sslserver ne "yes" && $authserver ne "yes") { + if ( $sslserver eq "yes" && $authserver eq "yes") { + $line = " ".$1; + } else { + $line = "# ".$1; + } + } elsif( /^\#?\s{4}(-o\s+smtpd_relay_restrictions=.*)/ ) { + if ( $sslserver ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/sysconfig.postfix new/postfix-SuSE/sysconfig.postfix --- old/postfix-SuSE/sysconfig.postfix 2017-01-11 15:19:30.673048424 +0100 +++ new/postfix-SuSE/sysconfig.postfix 2017-01-22 00:07:25.345079441 +0100 @@ -441,7 +441,7 @@ POSTFIX_TLS_KEYFILE="certs/postfixkey.pem" # -# The following options are used by SuSEconfig.postix and mkpostfixcert +# The following options are used by /usr/sbin/config.postfix and mkpostfixcert # to create a CA and certificates # POSTFIX_SSL_COUNTRY must be a two letter code defined by ISO 3166 # ++++++ postfix-main.cf.patch ++++++ --- /var/tmp/diff_new_pack.gs0bPM/_old 2017-01-25 22:35:17.774037045 +0100 +++ /var/tmp/diff_new_pack.gs0bPM/_new 2017-01-25 22:35:17.778036440 +0100 @@ -10,7 +10,7 @@ # PARALLEL DELIVERY TO THE SAME DESTINATION # -@@ -673,4 +674,120 @@ sample_directory = +@@ -673,4 +674,121 @@ sample_directory = # readme_directory: The location of the Postfix README files. # readme_directory = @@ -64,8 +64,8 @@ +smtp_sasl_security_options = +smtp_sasl_password_maps = +smtpd_sasl_auth_enable = no -+#smtpd_sasl_path = private/auth -+#smtpd_sasl_type = dovecot ++smtpd_sasl_path = smtpd ++smtpd_sasl_type = cyrus +############################################################ +# TLS stuff +############################################################ @@ -80,6 +80,7 @@ +smtp_tls_CApath = +smtp_tls_cert_file = +smtp_tls_key_file = ++#smtp_tls_policy_maps = hash:/etc/postfix/tls_policy +#smtp_tls_session_cache_timeout = 3600s +smtp_tls_session_cache_database = + ++++++ postfix-master.cf.patch ++++++ --- /var/tmp/diff_new_pack.gs0bPM/_old 2017-01-25 22:35:17.790034625 +0100 +++ /var/tmp/diff_new_pack.gs0bPM/_new 2017-01-25 22:35:17.794034021 +0100 @@ -2,7 +2,7 @@ =================================================================== --- conf/master.cf.orig +++ conf/master.cf -@@ -10,6 +10,11 @@ +@@ -10,32 +10,38 @@ # (yes) (yes) (no) (never) (100) # ========================================================================== smtp inet n - n - - smtpd @@ -14,14 +14,53 @@ #smtp inet n - n - 1 postscreen #smtpd pass - - n - - smtpd #dnsblog unix - - n - 0 dnsblog -@@ -28,6 +33,7 @@ smtp inet n - n + #tlsproxy unix - - n - 0 tlsproxy + #submission inet n - n - - smtpd +-# -o syslog_name=postfix/submission +-# -o smtpd_tls_security_level=encrypt +-# -o smtpd_sasl_auth_enable=yes +-# -o smtpd_reject_unlisted_recipient=no +-# -o smtpd_client_restrictions=$mua_client_restrictions +-# -o smtpd_helo_restrictions=$mua_helo_restrictions +-# -o smtpd_sender_restrictions=$mua_sender_restrictions +-# -o smtpd_recipient_restrictions= +-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject +-# -o milter_macro_daemon_name=ORIGINATING ++# -o syslog_name=postfix/submission ++# -o smtpd_tls_security_level=encrypt ++# -o smtpd_sasl_auth_enable=yes ++# -o smtpd_reject_unlisted_recipient=no ++# -o smtpd_client_restrictions=$mua_client_restrictions ++# -o smtpd_helo_restrictions=$mua_helo_restrictions ++# -o smtpd_sender_restrictions=$mua_sender_restrictions ++# -o smtpd_recipient_restrictions= ++# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject ++# -o milter_macro_daemon_name=ORIGINATING #smtps inet n - n - - smtpd - # -o syslog_name=postfix/smtps - # -o smtpd_tls_wrappermode=yes -+# -o content_filter=smtp:[127.0.0.1]:10024 - # -o smtpd_sasl_auth_enable=yes - # -o smtpd_reject_unlisted_recipient=no - # -o smtpd_client_restrictions=$mua_client_restrictions +-# -o syslog_name=postfix/smtps +-# -o smtpd_tls_wrappermode=yes +-# -o smtpd_sasl_auth_enable=yes +-# -o smtpd_reject_unlisted_recipient=no +-# -o smtpd_client_restrictions=$mua_client_restrictions +-# -o smtpd_helo_restrictions=$mua_helo_restrictions +-# -o smtpd_sender_restrictions=$mua_sender_restrictions +-# -o smtpd_recipient_restrictions= +-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject +-# -o milter_macro_daemon_name=ORIGINATING ++# -o syslog_name=postfix/smtps ++# -o smtpd_tls_wrappermode=yes ++# -o content_filter=smtp:[127.0.0.1]:10024 ++# -o smtpd_sasl_auth_enable=yes ++# -o smtpd_reject_unlisted_recipient=no ++# -o smtpd_client_restrictions=$mua_client_restrictions ++# -o smtpd_helo_restrictions=$mua_helo_restrictions ++# -o smtpd_sender_restrictions=$mua_sender_restrictions ++# -o smtpd_recipient_restrictions= ++# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject ++# -o milter_macro_daemon_name=ORIGINATING + #628 inet n - n - - qmqpd + pickup unix n - n 60 1 pickup + cleanup unix n - n - 0 cleanup @@ -62,6 +68,27 @@ virtual unix - n n lmtp unix - - n - - lmtp anvil unix - - n - 1 anvil ++++++ postfix-mysql.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-mysql/mysql_relay_domains_maps.cf new/postfix-mysql/mysql_relay_domains_maps.cf --- old/postfix-mysql/mysql_relay_domains_maps.cf 2006-02-18 19:56:14.000000000 +0100 +++ new/postfix-mysql/mysql_relay_domains_maps.cf 2016-11-14 22:58:18.000000000 +0100 @@ -3,7 +3,8 @@ hosts = localhost #hosts = 127.0.0.1 dbname = postfix -table = domain -select_field = domain -where_field = domain -additional_conditions = and backupmx = '1' +#table = domain +#select_field = domain +#where_field = domain +#additional_conditions = and backupmx = '1' +query = SELECT domain FROM domain WHERE domain='%s' and backupmx='1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-mysql/mysql_virtual_alias_maps.cf new/postfix-mysql/mysql_virtual_alias_maps.cf --- old/postfix-mysql/mysql_virtual_alias_maps.cf 2006-02-18 19:56:39.000000000 +0100 +++ new/postfix-mysql/mysql_virtual_alias_maps.cf 2016-11-14 22:58:52.000000000 +0100 @@ -3,6 +3,7 @@ hosts = localhost #hosts = 127.0.0.1 dbname = postfix -table = alias -select_field = goto -where_field = address +#table = alias +#select_field = goto +#where_field = address +query = SELECT goto FROM alias WHERE address='%s' AND active='1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-mysql/mysql_virtual_domains_maps.cf new/postfix-mysql/mysql_virtual_domains_maps.cf --- old/postfix-mysql/mysql_virtual_domains_maps.cf 2006-02-18 19:57:03.000000000 +0100 +++ new/postfix-mysql/mysql_virtual_domains_maps.cf 2016-11-22 01:36:18.000000000 +0100 @@ -4,6 +4,7 @@ #hosts = 127.0.0.1 dbname = postfix table = domain -select_field = domain -where_field = domain -additional_conditions = and backupmx = '0' and active = '1' +#select_field = domain +#where_field = domain +#additional_conditions = and backupmx = '0' and active = '1' +query = SELECT domain FROM domain WHERE domain='%s' and backupmx='0' and active='1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-mysql/mysql_virtual_mailbox_limit_maps.cf new/postfix-mysql/mysql_virtual_mailbox_limit_maps.cf --- old/postfix-mysql/mysql_virtual_mailbox_limit_maps.cf 2006-02-18 19:57:37.000000000 +0100 +++ new/postfix-mysql/mysql_virtual_mailbox_limit_maps.cf 2016-11-14 23:00:01.000000000 +0100 @@ -3,7 +3,8 @@ hosts = localhost #hosts = 127.0.0.1 dbname = postfix -table = mailbox -select_field = quota -where_field = username -additional_conditions = and active = '1' +#table = mailbox +#select_field = quota +#where_field = username +#additional_conditions = and active = '1' +query = SELECT quota FROM mailbox WHERE username='%s' and active='1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-mysql/mysql_virtual_mailbox_maps.cf new/postfix-mysql/mysql_virtual_mailbox_maps.cf --- old/postfix-mysql/mysql_virtual_mailbox_maps.cf 2006-04-11 00:14:32.000000000 +0200 +++ new/postfix-mysql/mysql_virtual_mailbox_maps.cf 2016-11-14 23:00:23.000000000 +0100 @@ -3,7 +3,8 @@ hosts = localhost #hosts = 127.0.0.1 dbname = postfix -table = mailbox -select_field = maildir -where_field = username -additional_conditions = and active = '1' +#table = mailbox +#select_field = maildir +#where_field = username +#additional_conditions = and active = '1' +query = SELECT maildir FROM mailbox WHERE username='%s' AND active='1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-mysql/postfix-mysql.sql new/postfix-mysql/postfix-mysql.sql --- old/postfix-mysql/postfix-mysql.sql 2014-06-23 23:37:56.005907752 +0200 +++ new/postfix-mysql/postfix-mysql.sql 2017-01-21 19:35:04.000000000 +0100 @@ -1,187 +1,284 @@ --- MySQL dump 9.10 +-- MySQL dump 10.15 Distrib 10.0.28-MariaDB, for Linux (x86_64) -- --- Host: localhost Database: postfix +-- Host: localhost Database: localhost -- ------------------------------------------------------ --- Server version 4.0.18 +-- Server version 10.0.28-MariaDB + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; -- -- Table structure for table `admin` -- -DROP TABLE IF EXISTS admin; -CREATE TABLE admin ( - username varchar(255) NOT NULL default '', - password varchar(255) NOT NULL default '', - created datetime NOT NULL default '0000-00-00 00:00:00', - modified datetime NOT NULL default '0000-00-00 00:00:00', - active tinyint(1) NOT NULL default '1', - PRIMARY KEY (username), - KEY username (username) -) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Admins'; - --- --- Dumping data for table `admin` --- - - -/*!40000 ALTER TABLE admin DISABLE KEYS */; -LOCK TABLES admin WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE admin ENABLE KEYS */; +DROP TABLE IF EXISTS `admin`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `admin` ( + `username` varchar(255) NOT NULL, + `password` varchar(255) NOT NULL, + `superadmin` tinyint(1) NOT NULL DEFAULT '0', + `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `modified` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT '1', + PRIMARY KEY (`username`) +) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Admins'; +/*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `alias` -- -DROP TABLE IF EXISTS alias; -CREATE TABLE alias ( - address varchar(255) NOT NULL default '', - goto text NOT NULL, - domain varchar(255) NOT NULL default '', - created datetime NOT NULL default '0000-00-00 00:00:00', - modified datetime NOT NULL default '0000-00-00 00:00:00', - active tinyint(1) NOT NULL default '1', - PRIMARY KEY (address) -) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Aliases'; - --- --- Dumping data for table `alias` --- - - -/*!40000 ALTER TABLE alias DISABLE KEYS */; -LOCK TABLES alias WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE alias ENABLE KEYS */; +DROP TABLE IF EXISTS `alias`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `alias` ( + `address` varchar(255) NOT NULL, + `goto` text NOT NULL, + `domain` varchar(255) NOT NULL, + `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `modified` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT '1', + PRIMARY KEY (`address`), + KEY `domain` (`domain`) +) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Aliases'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `alias_domain` +-- + +DROP TABLE IF EXISTS `alias_domain`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `alias_domain` ( + `alias_domain` varchar(255) NOT NULL, + `target_domain` varchar(255) NOT NULL, + `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `modified` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT '1', + PRIMARY KEY (`alias_domain`), + KEY `active` (`active`), + KEY `target_domain` (`target_domain`) +) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Domain Aliases'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `config` +-- + +DROP TABLE IF EXISTS `config`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `config` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '', + `value` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + UNIQUE KEY `name` (`name`) +) ENGINE=INNODB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='PostfixAdmin settings'; +/*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `domain` -- -DROP TABLE IF EXISTS domain; -CREATE TABLE domain ( - domain varchar(255) NOT NULL default '', - description varchar(255) NOT NULL default '', - aliases int(10) NOT NULL default '0', - mailboxes int(10) NOT NULL default '0', - maxquota int(10) NOT NULL default '0', - transport varchar(255) default NULL, - backupmx tinyint(1) NOT NULL default '0', - created datetime NOT NULL default '0000-00-00 00:00:00', - modified datetime NOT NULL default '0000-00-00 00:00:00', - active tinyint(1) NOT NULL default '1', - PRIMARY KEY (domain) -) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Domains'; - --- --- Dumping data for table `domain` --- - - -/*!40000 ALTER TABLE domain DISABLE KEYS */; -LOCK TABLES domain WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE domain ENABLE KEYS */; +DROP TABLE IF EXISTS `domain`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `domain` ( + `domain` varchar(255) NOT NULL, + `description` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, + `aliases` int(10) NOT NULL DEFAULT '0', + `mailboxes` int(10) NOT NULL DEFAULT '0', + `maxquota` bigint(20) NOT NULL DEFAULT '0', + `quota` bigint(20) NOT NULL DEFAULT '0', + `transport` varchar(255) NOT NULL, + `backupmx` tinyint(1) NOT NULL DEFAULT '0', + `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `modified` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT '1', + PRIMARY KEY (`domain`) +) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Domains'; +/*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `domain_admins` -- -DROP TABLE IF EXISTS domain_admins; -CREATE TABLE domain_admins ( - username varchar(255) NOT NULL default '', - domain varchar(255) NOT NULL default '', - created datetime NOT NULL default '0000-00-00 00:00:00', - active tinyint(1) NOT NULL default '1', - KEY username (username) -) ENGINE=MyISAM COMMENT='Postfix Admin - Domain Admins'; - --- --- Dumping data for table `domain_admins` --- - - -/*!40000 ALTER TABLE domain_admins DISABLE KEYS */; -LOCK TABLES domain_admins WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE domain_admins ENABLE KEYS */; +DROP TABLE IF EXISTS `domain_admins`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `domain_admins` ( + `username` varchar(255) NOT NULL, + `domain` varchar(255) NOT NULL, + `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT '1', + KEY `username` (`username`) +) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Domain Admins'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `fetchmail` +-- + +DROP TABLE IF EXISTS `fetchmail`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `fetchmail` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `domain` varchar(255) DEFAULT '', + `mailbox` varchar(255) NOT NULL, + `src_server` varchar(255) NOT NULL, + `src_auth` enum('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any') CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, + `src_user` varchar(255) NOT NULL, + `src_password` varchar(255) NOT NULL, + `src_folder` varchar(255) NOT NULL, + `poll_time` int(11) unsigned NOT NULL DEFAULT '10', + `fetchall` tinyint(1) unsigned NOT NULL DEFAULT '0', + `keep` tinyint(1) unsigned NOT NULL DEFAULT '0', + `protocol` enum('POP3','IMAP','POP2','ETRN','AUTO') CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, + `usessl` tinyint(1) unsigned NOT NULL DEFAULT '0', + `sslcertck` tinyint(1) NOT NULL DEFAULT '0', + `sslcertpath` varchar(255) CHARACTER SET utf8 DEFAULT '', + `sslfingerprint` varchar(255) DEFAULT '', + `extra_options` text, + `returned_text` text, + `mda` varchar(255) NOT NULL, + `date` timestamp NOT NULL DEFAULT '2000-01-01 00:00:00', + `created` timestamp NOT NULL DEFAULT '2000-01-01 00:00:00', + `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `active` tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`) +) ENGINE=INNODB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `log` -- -DROP TABLE IF EXISTS log; -CREATE TABLE log ( - timestamp datetime NOT NULL default '0000-00-00 00:00:00', - username varchar(255) NOT NULL default '', - domain varchar(255) NOT NULL default '', - action varchar(255) NOT NULL default '', - data varchar(255) NOT NULL default '', - KEY timestamp (timestamp) -) ENGINE=MyISAM COMMENT='Postfix Admin - Log'; - --- --- Dumping data for table `log` --- - - -/*!40000 ALTER TABLE log DISABLE KEYS */; -LOCK TABLES log WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE log ENABLE KEYS */; +DROP TABLE IF EXISTS `log`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `log` ( + `timestamp` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `username` varchar(255) NOT NULL, + `domain` varchar(255) NOT NULL, + `action` varchar(255) NOT NULL, + `data` text NOT NULL, + KEY `timestamp` (`timestamp`), + KEY `domain_timestamp` (`domain`,`timestamp`) +) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Log'; +/*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `mailbox` -- -DROP TABLE IF EXISTS mailbox; -CREATE TABLE mailbox ( - username varchar(255) NOT NULL default '', - password varchar(255) NOT NULL default '', - name varchar(255) NOT NULL default '', - maildir varchar(255) NOT NULL default '', - quota int(10) NOT NULL default '0', - domain varchar(255) NOT NULL default '', - created datetime NOT NULL default '0000-00-00 00:00:00', - modified datetime NOT NULL default '0000-00-00 00:00:00', - active tinyint(1) NOT NULL default '1', - PRIMARY KEY (username) -) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Mailboxes'; - --- --- Dumping data for table `mailbox` --- - - -/*!40000 ALTER TABLE mailbox DISABLE KEYS */; -LOCK TABLES mailbox WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE mailbox ENABLE KEYS */; +DROP TABLE IF EXISTS `mailbox`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `mailbox` ( + `username` varchar(255) NOT NULL, + `password` varchar(255) NOT NULL, + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, + `maildir` varchar(255) NOT NULL, + `quota` bigint(20) NOT NULL DEFAULT '0', + `local_part` varchar(255) NOT NULL, + `domain` varchar(255) NOT NULL, + `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `modified` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT '1', + PRIMARY KEY (`username`), + KEY `domain` (`domain`) +) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Mailboxes'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `quota` +-- + +DROP TABLE IF EXISTS `quota`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `quota` ( + `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, + `path` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, + `current` bigint(20) NOT NULL DEFAULT '0', + PRIMARY KEY (`username`,`path`) +) ENGINE=INNODB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `quota2` +-- + +DROP TABLE IF EXISTS `quota2`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `quota2` ( + `username` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, + `bytes` bigint(20) NOT NULL DEFAULT '0', + `messages` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`username`) +) ENGINE=INNODB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `vacation` -- -DROP TABLE IF EXISTS vacation; -CREATE TABLE vacation ( - email varchar(255) NOT NULL default '', - subject varchar(255) NOT NULL default '', - body text NOT NULL, - cache text NOT NULL, - domain varchar(255) NOT NULL default '', - created datetime NOT NULL default '0000-00-00 00:00:00', - active tinyint(1) NOT NULL default '1', - PRIMARY KEY (email), - KEY email (email) -) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Vacation'; - --- --- Dumping data for table `vacation` --- - - -/*!40000 ALTER TABLE vacation DISABLE KEYS */; -LOCK TABLES vacation WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE vacation ENABLE KEYS */; +DROP TABLE IF EXISTS `vacation`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `vacation` ( + `email` varchar(255) NOT NULL, + `subject` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, + `body` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, + `activefrom` timestamp NOT NULL DEFAULT '2000-01-01 00:00:00', + `activeuntil` timestamp NOT NULL DEFAULT '2000-01-01 00:00:00', + `cache` text NOT NULL, + `domain` varchar(255) NOT NULL, + `interval_time` int(11) NOT NULL DEFAULT '0', + `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00', + `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `active` tinyint(1) NOT NULL DEFAULT '1', + PRIMARY KEY (`email`), + KEY `email` (`email`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Vacation'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `vacation_notification` +-- + +DROP TABLE IF EXISTS `vacation_notification`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `vacation_notification` ( + `on_vacation` varchar(255) NOT NULL, + `notified` varchar(255) NOT NULL, + `notified_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`on_vacation`,`notified`), + CONSTRAINT `vacation_notification_pkey` FOREIGN KEY (`on_vacation`) REFERENCES `vacation` (`email`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Vacation Notifications'; +/*!40101 SET character_set_client = @saved_cs_client */; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; +-- Dump completed on 2017-01-21 17:52:02 ++++++ postfix-vda-v14-3.0.3.patch ++++++ --- /var/tmp/diff_new_pack.gs0bPM/_old 2017-01-25 22:35:17.898018295 +0100 +++ /var/tmp/diff_new_pack.gs0bPM/_new 2017-01-25 22:35:17.898018295 +0100 @@ -174,7 +174,7 @@ /* deliver_mailbox_file - deliver to recipient mailbox */ static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr) -@@ -213,62 +277,72 @@ int deliver_mailbox(LOCAL_STATE stat +@@ -214,62 +279,72 @@ int deliver_mailbox(LOCAL_STATE stat * Look up the mailbox owner rights. Defer in case of trouble. */ uid_res = mail_addr_find(virtual_uid_maps, state.msg_attr.user,
