From 2c422e6fc9bc1bd15a0d86ab8dbaae6409989924 Mon Sep 17 00:00:00 2001 From: Phil Pennock Date: Fri, 26 Oct 2012 20:33:33 -0400 Subject: [PATCH] 4.81 to 4.82 Avoiding confusion of 4.80.1 vs 4.81, we went with skipping to 4.82 instead. --- doc/doc-txt/ChangeLog | 4 ++-- doc/doc-txt/NewStuff | 2 +- doc/doc-txt/OptionLists.txt | 8 ++++---- src/ACKNOWLEDGMENTS | 2 +- src/README.UPDATING | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 8daf3578e..e115bf246 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,7 +1,7 @@ Change log file for Exim from version 4.21 ------------------------------------------- -Exim version 4.81 +Exim version 4.82 ----------------- PP/01 Add -bI: framework, and -bI:sieve for querying sieve capabilities. @@ -90,7 +90,7 @@ Exim version 4.80.1 PP/01 SECURITY: protect DKIM DNS decoding from remote exploit. CVE-2012-5671 - This, or similar/improved, will also be change PP/11 of 4.81. + This, or similar/improved, will also be change PP/11 of 4.82. Exim version 4.80 diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index 5347246c4..be854d9d8 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -6,7 +6,7 @@ Before a formal release, there may be quite a lot of detail so that people can test from the snapshots or the CVS before the documentation is updated. Once the documentation is updated, this file is reduced to a short list. -Version 4.81 +Version 4.82 ------------ 1. New command-line option -bI:sieve will list all supported sieve extensions diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 05074bba7..fa692bfb1 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -180,14 +180,14 @@ dns_qualify_single boolean true smtp dns_retrans time 0s main 1.60 dns_retry integer 0 main 1.60 dns_search_parents boolean false smtp -dns_use_dnssec integer -1 main 4.81 +dns_use_dnssec integer -1 main 4.82 dns_use_edns0 integer -1 main 4.76 domains domain list unset routers 4.00 driver string unset authenticators unset routers 4.00 unset transports drop_cr boolean false main 4.00 became a no-op in 4.21 -dscp string unset smtp 4.81 +dscp string unset smtp 4.82 dsn_from string* + main 4.67 envelope_to_add boolean false transports envelope_to_remove boolean true main @@ -243,7 +243,7 @@ gecos_name string* unset main gecos_pattern string unset main gethostbyname boolean false smtp gnutls_compat_mode boolean unset main 4.70 -gnutls_enable_pkcs11 boolean false main 4.81 +gnutls_enable_pkcs11 boolean false main 4.82 gnutls_require_kx string* unset main 4.67 deprecated, warns string* unset smtp 4.67 deprecated, warns gnutls_require_mac string* unset main 4.67 deprecated, warns @@ -551,7 +551,7 @@ tls_advertise_hosts host list * main tls_certificate string* unset main 3.20 unset smtp 3.20 tls_dh_max_bits integer 2236 main 4.80 -tls_dh_min_bits integer 1024 smtp 4.81 +tls_dh_min_bits integer 1024 smtp 4.82 tls_dhparam string* unset main 3.20 tls_on_connect_ports string unset main 4.43 tls_privatekey string* unset main 3.20 diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS index dbdc40cb3..404920eab 100644 --- a/src/ACKNOWLEDGMENTS +++ b/src/ACKNOWLEDGMENTS @@ -460,7 +460,7 @@ Steve Haslam Debian, Exim 4 Andreas Metzler Debian, current(*) maintenance Christian Perrier Debian, current(*) maintenance -(*) Current as of our last information as of release: Exim 4.81 +(*) Current as of our last information as of release: Exim 4.82 # vim: set fileencoding=utf-8 expandtab : diff --git a/src/README.UPDATING b/src/README.UPDATING index 5742a64b9..dacb5d3aa 100644 --- a/src/README.UPDATING +++ b/src/README.UPDATING @@ -26,7 +26,7 @@ The rest of this document contains information about changes in 4.xx releases that might affect a running system. -Exim version 4.81 +Exim version 4.82 ----------------- * New option gnutls_enable_pkcs11 defaults false; if you have GnuTLS 2.12.0 -- 2.25.1