Prereq: "2.7.15" diff -cr --new-file /var/tmp/postfix-2.7.15/src/global/mail_version.h ./src/global/mail_version.h *** /var/tmp/postfix-2.7.15/src/global/mail_version.h Thu Sep 5 08:52:22 2013 --- ./src/global/mail_version.h Thu Jan 16 08:40:52 2014 *************** *** 20,27 **** * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ ! #define MAIL_RELEASE_DATE "20130905" ! #define MAIL_VERSION_NUMBER "2.7.15" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE --- 20,27 ---- * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ ! #define MAIL_RELEASE_DATE "20140116" ! #define MAIL_VERSION_NUMBER "2.7.16" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff -cr --new-file /var/tmp/postfix-2.7.15/HISTORY ./HISTORY *** /var/tmp/postfix-2.7.15/HISTORY Sun Sep 1 18:41:50 2013 --- ./HISTORY Thu Jan 16 08:41:43 2014 *************** *** 16165,16167 **** --- 16165,16191 ---- each smtpd(8) process. The workaround turns off session tickets. In 2.11 we'll enable session tickets properly. Viktor Dukhovni. File: tls/tls_server.c. + + 20131026 + + Future proofing: API changes in the PCRE library. File: + util/dict_pcre.c. + + 20131127 + + Bugfix (introduced: 20090106): the postconf '-#' option + erased prior options. File: postconf/postconf.c. + + 20131129 + + Bugfix: Makefile example in MULTI_INSTANCE_README. Viktor + Dukhovni. File: proto/MULTI_INSTANCE_README.html. + + 20131220 + + Documentation: typo in SASL_README. Patrick Ben Koetter. + File: proto/SASL_README.html. + + 20140104 + + Bugfix: malformed error message. File: conf/post-install. diff -cr --new-file /var/tmp/postfix-2.7.15/README_FILES/MULTI_INSTANCE_README ./README_FILES/MULTI_INSTANCE_README *** /var/tmp/postfix-2.7.15/README_FILES/MULTI_INSTANCE_README Sat Apr 4 20:42:11 2009 --- ./README_FILES/MULTI_INSTANCE_README Fri Dec 20 10:35:22 2013 *************** *** 177,183 **** generic: Makefile @echo Creating $@ @rm -f $@.tmp ! @printf '%s\t%s+root=%s\n' root $MTAADMIN `uname -n` > $@.tmp @mv $@.tmp generic %.cdb: % --- 177,183 ---- generic: Makefile @echo Creating $@ @rm -f $@.tmp ! @printf '%s\t%s+root=%s\n' root ${MTAADMIN} `uname -n` > $@.tmp @mv $@.tmp generic %.cdb: % *************** *** 327,333 **** (MAIL_CONFIG=/etc/postfix-out) of the output instance. * Lines 1-2: With "authorized_submit_users = root", the superuser can test ! the postix-out instance with "postmulti -i postfix-out -x sendmail -bv recipient...", but otherwise local submission remains disabled. * Lines 1-2: With "master_service_disable =", the "inet" listeners are re- --- 327,333 ---- (MAIL_CONFIG=/etc/postfix-out) of the output instance. * Lines 1-2: With "authorized_submit_users = root", the superuser can test ! the postfix-out instance with "postmulti -i postfix-out -x sendmail -bv recipient...", but otherwise local submission remains disabled. * Lines 1-2: With "master_service_disable =", the "inet" listeners are re- *************** *** 492,499 **** $readme_directory. * Entries in /etc/passwd and /etc/group for the $mail_owner user and ! $setgid_group group. The the $mail_owner user provides the mail system with ! a protected (non-root) execution context. The $setgid_group group is used exclusively to support the setgid postdrop(1) and postqueue(1) utilities (it mmuusstt nnoott be the primary group or secondary group of any users, including the $mail_owner user). --- 492,499 ---- $readme_directory. * Entries in /etc/passwd and /etc/group for the $mail_owner user and ! $setgid_group group. The $mail_owner user provides the mail system with a ! protected (non-root) execution context. The $setgid_group group is used exclusively to support the setgid postdrop(1) and postqueue(1) utilities (it mmuusstt nnoott be the primary group or secondary group of any users, including the $mail_owner user). diff -cr --new-file /var/tmp/postfix-2.7.15/README_FILES/SASL_README ./README_FILES/SASL_README *** /var/tmp/postfix-2.7.15/README_FILES/SASL_README Sat Feb 13 21:09:06 2010 --- ./README_FILES/SASL_README Fri Dec 20 10:35:22 2013 *************** *** 445,451 **** sql_user: username sql_passwd: secret sql_database: dbname ! sql_select: SELECT password FROM users WHERE user = '%u'@'%r' NNoottee --- 445,451 ---- sql_user: username sql_passwd: secret sql_database: dbname ! sql_select: SELECT password FROM users WHERE user = '%u@%r' NNoottee diff -cr --new-file /var/tmp/postfix-2.7.15/conf/post-install ./conf/post-install *** /var/tmp/postfix-2.7.15/conf/post-install Wed Feb 3 16:06:53 2010 --- ./conf/post-install Sat Jan 4 15:46:42 2014 *************** *** 464,470 **** case $type in [hl]) continue;; [df]) ;; ! *) echo unknown type $type for $path in $daemon_directory/postfix-files1>&2; exit 1;; esac # Expand $name, and canonicalize null fields. for name in path owner group flags --- 464,470 ---- case $type in [hl]) continue;; [df]) ;; ! *) echo unknown type $type for $path in $daemon_directory/postfix-files 1>&2; exit 1;; esac # Expand $name, and canonicalize null fields. for name in path owner group flags diff -cr --new-file /var/tmp/postfix-2.7.15/html/MULTI_INSTANCE_README.html ./html/MULTI_INSTANCE_README.html *** /var/tmp/postfix-2.7.15/html/MULTI_INSTANCE_README.html Fri Jan 1 19:01:09 2010 --- ./html/MULTI_INSTANCE_README.html Fri Dec 20 10:35:22 2013 *************** *** 233,239 **** generic: Makefile @echo Creating $@ @rm -f $@.tmp ! @printf '%s\t%s+root=%s\n' root $MTAADMIN `uname -n` > $@.tmp @mv $@.tmp generic %.cdb: % --- 233,239 ---- generic: Makefile @echo Creating $@ @rm -f $@.tmp ! @printf '%s\t%s+root=%s\n' root ${MTAADMIN} `uname -n` > $@.tmp @mv $@.tmp generic %.cdb: % *************** *** 420,426 ****
Lines 1-2: With "authorized_submit_users = root", the ! superuser can test the postix-out instance with "postmulti -i postfix-out -x sendmail -bv recipient...", but otherwise local submission remains disabled.
--- 420,426 ----Lines 1-2: With "authorized_submit_users = root", the ! superuser can test the postfix-out instance with "postmulti -i postfix-out -x sendmail -bv recipient...", but otherwise local submission remains disabled.
*************** *** 620,626 **** $manpage_directory and $readme_directory.Entries in /etc/passwd and /etc/group for the $mail_owner user and ! $setgid_group group. The the $mail_owner user provides the mail system with a protected (non-root) execution context. The $setgid_group group is used exclusively to support the setgid postdrop(1) and postqueue(1) utilities (it must not be the primary group or secondary group --- 620,626 ---- $manpage_directory and $readme_directory.
Entries in /etc/passwd and /etc/group for the $mail_owner user and ! $setgid_group group. The $mail_owner user provides the mail system with a protected (non-root) execution context. The $setgid_group group is used exclusively to support the setgid postdrop(1) and postqueue(1) utilities (it must not be the primary group or secondary group diff -cr --new-file /var/tmp/postfix-2.7.15/html/SASL_README.html ./html/SASL_README.html *** /var/tmp/postfix-2.7.15/html/SASL_README.html Sat Feb 13 21:09:06 2010 --- ./html/SASL_README.html Fri Dec 20 10:35:22 2013 *************** *** 739,745 **** sql_user: username sql_passwd: secret sql_database: dbname ! sql_select: SELECT password FROM users WHERE user = '%u'@'%r' --- 739,745 ---- sql_user: username sql_passwd: secret sql_database: dbname ! sql_select: SELECT password FROM users WHERE user = '%u@%r' diff -cr --new-file /var/tmp/postfix-2.7.15/proto/MULTI_INSTANCE_README.html ./proto/MULTI_INSTANCE_README.html *** /var/tmp/postfix-2.7.15/proto/MULTI_INSTANCE_README.html Sat Apr 4 20:42:03 2009 --- ./proto/MULTI_INSTANCE_README.html Tue Dec 17 15:46:48 2013 *************** *** 233,239 **** generic: Makefile @echo Creating $@ @rm -f $@.tmp ! @printf '%s\t%s+root=%s\n' root $MTAADMIN `uname -n` > $@.tmp @mv $@.tmp generic %.cdb: % --- 233,239 ---- generic: Makefile @echo Creating $@ @rm -f $@.tmp ! @printf '%s\t%s+root=%s\n' root ${MTAADMIN} `uname -n` > $@.tmp @mv $@.tmp generic %.cdb: % *************** *** 420,426 ****
Lines 1-2: With "authorized_submit_users = root", the ! superuser can test the postix-out instance with "postmulti -i postfix-out -x sendmail -bv recipient...", but otherwise local submission remains disabled.
--- 420,426 ----Lines 1-2: With "authorized_submit_users = root", the ! superuser can test the postfix-out instance with "postmulti -i postfix-out -x sendmail -bv recipient...", but otherwise local submission remains disabled.
*************** *** 620,626 **** $manpage_directory and $readme_directory.Entries in /etc/passwd and /etc/group for the $mail_owner user and ! $setgid_group group. The the $mail_owner user provides the mail system with a protected (non-root) execution context. The $setgid_group group is used exclusively to support the setgid postdrop(1) and postqueue(1) utilities (it must not be the primary group or secondary group --- 620,626 ---- $manpage_directory and $readme_directory.
Entries in /etc/passwd and /etc/group for the $mail_owner user and ! $setgid_group group. The $mail_owner user provides the mail system with a protected (non-root) execution context. The $setgid_group group is used exclusively to support the setgid postdrop(1) and postqueue(1) utilities (it must not be the primary group or secondary group diff -cr --new-file /var/tmp/postfix-2.7.15/proto/SASL_README.html ./proto/SASL_README.html *** /var/tmp/postfix-2.7.15/proto/SASL_README.html Sat Feb 13 21:07:55 2010 --- ./proto/SASL_README.html Fri Dec 20 10:35:15 2013 *************** *** 739,745 **** sql_user: username sql_passwd: secret sql_database: dbname ! sql_select: SELECT password FROM users WHERE user = '%u'@'%r' --- 739,745 ---- sql_user: username sql_passwd: secret sql_database: dbname ! sql_select: SELECT password FROM users WHERE user = '%u@%r' diff -cr --new-file /var/tmp/postfix-2.7.15/src/postconf/postconf.c ./src/postconf/postconf.c *** /var/tmp/postfix-2.7.15/src/postconf/postconf.c Thu Dec 31 14:02:14 2009 --- ./src/postconf/postconf.c Sun Dec 8 12:49:43 2013 *************** *** 1109,1115 **** break; #endif case '#': ! cmd_mode = COMMENT_OUT; break; case 'h': --- 1109,1115 ---- break; #endif case '#': ! cmd_mode |= COMMENT_OUT; break; case 'h': diff -cr --new-file /var/tmp/postfix-2.7.15/src/util/dict_pcre.c ./src/util/dict_pcre.c *** /var/tmp/postfix-2.7.15/src/util/dict_pcre.c Thu Apr 24 15:52:18 2008 --- ./src/util/dict_pcre.c Tue Dec 17 15:35:16 2013 *************** *** 60,65 **** --- 60,74 ---- #include "pcre.h" /* + * Backwards compatibility. + */ + #ifdef PCRE_STUDY_JIT_COMPILE + #define DICT_PCRE_FREE_STUDY(x) pcre_free_study(x) + #else + #define DICT_PCRE_FREE_STUDY(x) pcre_free((char *) (x)) + #endif + + /* * Support for IF/ENDIF based on an idea by Bert Driehuis. */ #define DICT_PCRE_OP_MATCH 1 /* Match this regexp */ *************** *** 387,393 **** if (match_rule->pattern) myfree((char *) match_rule->pattern); if (match_rule->hints) ! myfree((char *) match_rule->hints); if (match_rule->replacement) myfree((char *) match_rule->replacement); break; --- 396,402 ---- if (match_rule->pattern) myfree((char *) match_rule->pattern); if (match_rule->hints) ! DICT_PCRE_FREE_STUDY(match_rule->hints); if (match_rule->replacement) myfree((char *) match_rule->replacement); break; *************** *** 396,402 **** if (if_rule->pattern) myfree((char *) if_rule->pattern); if (if_rule->hints) ! myfree((char *) if_rule->hints); break; case DICT_PCRE_OP_ENDIF: break; --- 405,411 ---- if (if_rule->pattern) myfree((char *) if_rule->pattern); if (if_rule->hints) ! DICT_PCRE_FREE_STUDY(if_rule->hints); break; case DICT_PCRE_OP_ENDIF: break; *************** *** 677,683 **** if (engine.pattern) myfree((char *) engine.pattern); if (engine.hints) ! myfree((char *) engine.hints); CREATE_MATCHOP_ERROR_RETURN(0); } #endif --- 686,692 ---- if (engine.pattern) myfree((char *) engine.pattern); if (engine.hints) ! DICT_PCRE_FREE_STUDY(engine.hints); CREATE_MATCHOP_ERROR_RETURN(0); } #endif