Prereq: "2.8.10" diff -cr --new-file /var/tmp/postfix-2.8.10/src/global/mail_version.h ./src/global/mail_version.h *** /var/tmp/postfix-2.8.10/src/global/mail_version.h Tue Apr 24 13:27:06 2012 --- ./src/global/mail_version.h Sun May 20 18:20:59 2012 *************** *** 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 "20120424" ! #define MAIL_VERSION_NUMBER "2.8.10" #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 "20120520" ! #define MAIL_VERSION_NUMBER "2.8.11" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff -cr --new-file /var/tmp/postfix-2.8.10/HISTORY ./HISTORY *** /var/tmp/postfix-2.8.10/HISTORY Tue Apr 24 13:35:34 2012 --- ./HISTORY Sun May 20 18:06:35 2012 *************** *** 16781,16783 **** --- 16781,16831 ---- a patch by Victor Duchovni. Files: proto/TLS_README.html, proto/postconf.proto, tls/tls.h, tls/tls_misc.c, tls/tls_client.c, tls/tls_server.c. + + 20120425 + + Workaround: bugs in 10-year old gcc versions break compilation + with #ifdef inside a macro invocation (NOT: definition). + Files: tls/tls.h, tls/tls_client.c, tls/tls_server.c. + + 20120516 + + Workaround: apparently, FreeBSD 8.3 kqueue notifications + sometimes break when a dnsblog(8) process loses an accept() + race on a shared socket, resulting in repeated "connect to + private/dnsblog service: Connection refused" warnings. This + condition is unique to dnsblog(8). The postscreen(8) daemon + closes a postscreen-to-dnsblog connection as soon as it + receives a dnsblog(8) reply, resulting in hundreds or + thousands of connection requests per second. All other + multi-server daemons such as anvil(8) or proxymap(8) have + connection lifetimes ranging from 5s to 1000s depending on + server load. The workaround is for dnsblog to use the + single_server driver instead of the multi_server driver. + This one-line code change eliminates the accept() race + without any Postfix performance impact. Problem reported + by Sahil Tandon. File: dnsblog/dnsblog.c. + + 20120517 + + Workaround: to avoid crashes when the OpenSSL library is + updated without "postfix reload", the Postfix TLS session + cache ID now includes the OpenSSL library version number. + Note: this problem cannot be fixed in tlsmgr(8). Code by + Victor Duchovni. Files: tls/tls_server.c, tls_client.c. + + 20120520 + + Bugfix (introduced Postfix 2.4): the event_drain() function + was comparing bitmasks incorrectly causing the program to + always wait for the full time limit. This error affected + the unused postkick command, but only after s/fifo/unix/ + in master.cf. File: util/events.c. + + Cleanup: laptop users have always been able to avoid + unnecessary disk spin-up by doing s/fifo/unix/ in master.cf + (this is currently not supported on Solaris systems). + However, to make this work reliably, the "postqueue -f" + command must wait until its requests have reached the pickup + and qmgr servers before closing the UNIX-domain request + sockets. Files: postqueue/postqueue.c, postqueue/Makefile.in. diff -cr --new-file /var/tmp/postfix-2.8.10/src/dnsblog/dnsblog.c ./src/dnsblog/dnsblog.c *** /var/tmp/postfix-2.8.10/src/dnsblog/dnsblog.c Sun Mar 13 16:14:57 2011 --- ./src/dnsblog/dnsblog.c Sat May 19 21:14:57 2012 *************** *** 257,262 **** --- 257,263 ---- query = vstring_alloc(100); why = vstring_alloc(100); result = vstring_alloc(100); + var_use_limit = 0; } MAIL_VERSION_STAMP_DECLARE; *************** *** 275,283 **** */ MAIL_VERSION_STAMP_ALLOCATE; ! multi_server_main(argc, argv, dnsblog_service, ! MAIL_SERVER_TIME_TABLE, time_table, ! MAIL_SERVER_POST_INIT, post_jail_init, ! MAIL_SERVER_UNLIMITED, ! 0); } --- 276,284 ---- */ MAIL_VERSION_STAMP_ALLOCATE; ! single_server_main(argc, argv, dnsblog_service, ! MAIL_SERVER_TIME_TABLE, time_table, ! MAIL_SERVER_POST_INIT, post_jail_init, ! MAIL_SERVER_UNLIMITED, ! 0); } diff -cr --new-file /var/tmp/postfix-2.8.10/src/postqueue/Makefile.in ./src/postqueue/Makefile.in *** /var/tmp/postfix-2.8.10/src/postqueue/Makefile.in Sun Jan 9 17:12:07 2011 --- ./src/postqueue/Makefile.in Sun May 20 18:04:28 2012 *************** *** 61,66 **** --- 61,67 ---- postqueue.o: ../../include/attr.h postqueue.o: ../../include/clean_env.h postqueue.o: ../../include/connect.h + postqueue.o: ../../include/events.h postqueue.o: ../../include/flush_clnt.h postqueue.o: ../../include/iostuff.h postqueue.o: ../../include/mail_conf.h diff -cr --new-file /var/tmp/postfix-2.8.10/src/postqueue/postqueue.c ./src/postqueue/postqueue.c *** /var/tmp/postfix-2.8.10/src/postqueue/postqueue.c Tue Feb 2 07:08:19 2010 --- ./src/postqueue/postqueue.c Sun May 20 18:05:49 2012 *************** *** 186,191 **** --- 186,192 ---- #include #include #include + #include /* Global library. */ *************** *** 351,356 **** --- 352,358 ---- if (mail_flush_maildrop() < 0) msg_fatal_status(EX_UNAVAILABLE, "Cannot flush mail queue - mail system is down"); + event_drain(2); } /* flush_site - flush mail for site */ diff -cr --new-file /var/tmp/postfix-2.8.10/src/tls/tls.h ./src/tls/tls.h *** /var/tmp/postfix-2.8.10/src/tls/tls.h Tue Apr 24 13:25:28 2012 --- ./src/tls/tls.h Sun May 20 09:47:18 2012 *************** *** 159,169 **** --- 159,173 ---- #define TLS_PROTOCOL_TLSv1_1 (1<<3) /* TLSv1_1 */ #else #define TLS_PROTOCOL_TLSv1_1 0 /* Unknown */ + #undef SSL_OP_NO_TLSv1_1 + #define SSL_OP_NO_TLSv1_1 0L /* Noop */ #endif #ifdef SSL_TXT_TLSV1_2 #define TLS_PROTOCOL_TLSv1_2 (1<<4) /* TLSv1_2 */ #else #define TLS_PROTOCOL_TLSv1_2 0 /* Unknown */ + #undef SSL_OP_NO_TLSv1_2 + #define SSL_OP_NO_TLSv1_2 0L /* Noop */ #endif #define TLS_KNOWN_PROTOCOLS \ ( TLS_PROTOCOL_SSLv2 | TLS_PROTOCOL_SSLv3 | TLS_PROTOCOL_TLSv1 \ diff -cr --new-file /var/tmp/postfix-2.8.10/src/tls/tls_client.c ./src/tls/tls_client.c *** /var/tmp/postfix-2.8.10/src/tls/tls_client.c Tue Apr 24 13:25:28 2012 --- ./src/tls/tls_client.c Sun May 20 09:51:01 2012 *************** *** 784,789 **** --- 784,795 ---- vstring_sprintf_append(myserverid, "&c=%s", cipher_list); /* + * Finally, salt the session key with the OpenSSL library version, + * (run-time, rather than compile-time, just in case that matters). + */ + vstring_sprintf_append(myserverid, "&l=%ld", (long) SSLeay()); + + /* * Allocate a new TLScontext for the new connection and get an SSL * structure. Add the location of TLScontext to the SSL to later retrieve * the information inside the tls_verify_certificate_callback(). *************** *** 815,826 **** if (protomask != 0) SSL_set_options(TLScontext->con, ((protomask & TLS_PROTOCOL_TLSv1) ? SSL_OP_NO_TLSv1 : 0L) - #ifdef SSL_OP_NO_TLSv1_1 | ((protomask & TLS_PROTOCOL_TLSv1_1) ? SSL_OP_NO_TLSv1_1 : 0L) - #endif - #ifdef SSL_OP_NO_TLSv1_2 | ((protomask & TLS_PROTOCOL_TLSv1_2) ? SSL_OP_NO_TLSv1_2 : 0L) - #endif | ((protomask & TLS_PROTOCOL_SSLv3) ? SSL_OP_NO_SSLv3 : 0L) | ((protomask & TLS_PROTOCOL_SSLv2) ? SSL_OP_NO_SSLv2 : 0L)); --- 821,828 ---- diff -cr --new-file /var/tmp/postfix-2.8.10/src/tls/tls_server.c ./src/tls/tls_server.c *** /var/tmp/postfix-2.8.10/src/tls/tls_server.c Tue Apr 24 13:25:28 2012 --- ./src/tls/tls_server.c Sun May 20 09:51:01 2012 *************** *** 181,189 **** #define GEN_CACHE_ID(buf, id, len, service) \ do { \ ! buf = vstring_alloc(2 * (len) + 1 + strlen(service) + 3); \ hex_encode(buf, (char *) (id), (len)); \ vstring_sprintf_append(buf, "&s=%s", (service)); \ } while (0) --- 181,190 ---- #define GEN_CACHE_ID(buf, id, len, service) \ do { \ ! buf = vstring_alloc(2 * (len + strlen(service))); \ hex_encode(buf, (char *) (id), (len)); \ vstring_sprintf_append(buf, "&s=%s", (service)); \ + vstring_sprintf_append(buf, "&l=%ld", (long) SSLeay()); \ } while (0) *************** *** 397,408 **** if (protomask != 0) SSL_CTX_set_options(server_ctx, ((protomask & TLS_PROTOCOL_TLSv1) ? SSL_OP_NO_TLSv1 : 0L) - #ifdef SSL_OP_NO_TLSv1_1 | ((protomask & TLS_PROTOCOL_TLSv1_1) ? SSL_OP_NO_TLSv1_1 : 0L) - #endif - #ifdef SSL_OP_NO_TLSv1_2 | ((protomask & TLS_PROTOCOL_TLSv1_2) ? SSL_OP_NO_TLSv1_2 : 0L) - #endif | ((protomask & TLS_PROTOCOL_SSLv3) ? SSL_OP_NO_SSLv3 : 0L) | ((protomask & TLS_PROTOCOL_SSLv2) ? SSL_OP_NO_SSLv2 : 0L)); --- 398,405 ---- diff -cr --new-file /var/tmp/postfix-2.8.10/src/util/events.c ./src/util/events.c *** /var/tmp/postfix-2.8.10/src/util/events.c Wed Oct 6 15:25:28 2010 --- ./src/util/events.c Sun May 20 16:46:56 2012 *************** *** 180,185 **** --- 180,186 ---- #define EVENT_MASK_SET(fd, mask) FD_SET((fd), (mask)) #define EVENT_MASK_ISSET(fd, mask) FD_ISSET((fd), (mask)) #define EVENT_MASK_CLR(fd, mask) FD_CLR((fd), (mask)) + #define EVENT_MASK_CMP(m1, m2) memcmp((m1), (m2), EVENT_MASK_BYTE_COUNT(m1)) #else /* *************** *** 226,231 **** --- 227,234 ---- (EVENT_MASK_FD_BYTE((fd), (mask)) & EVENT_MASK_FD_BIT(fd)) #define EVENT_MASK_CLR(fd, mask) \ (EVENT_MASK_FD_BYTE((fd), (mask)) &= ~EVENT_MASK_FD_BIT(fd)) + #define EVENT_MASK_CMP(m1, m2) \ + memcmp((m1)->data, (m2)->data, EVENT_MASK_BYTE_COUNT(m1)) #endif /* *************** *** 664,671 **** max_time = event_present + time_limit; while (event_present < max_time && (event_timer_head.pred != &event_timer_head ! || memcmp(&zero_mask, &event_xmask, ! EVENT_MASK_BYTE_COUNT(&zero_mask)) != 0)) { event_loop(1); #if (EVENTS_STYLE != EVENTS_STYLE_SELECT) if (EVENT_MASK_BYTE_COUNT(&zero_mask) --- 667,673 ---- max_time = event_present + time_limit; while (event_present < max_time && (event_timer_head.pred != &event_timer_head ! || EVENT_MASK_CMP(&zero_mask, &event_xmask) != 0)) { event_loop(1); #if (EVENTS_STYLE != EVENTS_STYLE_SELECT) if (EVENT_MASK_BYTE_COUNT(&zero_mask)