[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #19450: merge from 3.4

[ned.deily]

https://hg.python.org/cpython/rev/ebe72984c1b9
changeset:   97117:ebe72984c1b9
branch:      3.5
parent:      97114:5ee8a4efc06f
parent:      97116:33dbcde76b3f
user:        Ned Deily <nad at acm.org>
date:        Tue Jul 28 23:25:41 2015 -0700
summary:
  Issue #19450: merge from 3.4

files:
  Mac/BuildScript/README.txt         |  4 ++--
  Mac/BuildScript/build-installer.py |  6 +++---
  Misc/NEWS                          |  2 +-
  3 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Mac/BuildScript/README.txt b/Mac/BuildScript/README.txt
--- a/Mac/BuildScript/README.txt
+++ b/Mac/BuildScript/README.txt
@@ -22,7 +22,7 @@
     - builds the following third-party libraries
 
         * NCurses 5.9 (http://bugs.python.org/issue15037)
-        * SQLite 3.8.3.1
+        * SQLite 3.8.11
         * XZ 5.0.5
 
     - uses system-supplied versions of third-party libraries
@@ -57,7 +57,7 @@
     - builds the following third-party libraries
 
         * NCurses 5.9 (http://bugs.python.org/issue15037)
-        * SQLite 3.8.3.1
+        * SQLite 3.8.11
         * XZ 5.0.5
 
     - uses system-supplied versions of third-party libraries
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -339,9 +339,9 @@
                   ),
           ),
           dict(
-              name="SQLite 3.8.3.1",
-              url="http://www.sqlite.org/2014/sqlite-autoconf-3080301.tar.gz",
-              checksum='509ff98d8dc9729b618b7e96612079c6',
+              name="SQLite 3.8.11",
+              url="https://www.sqlite.org/2015/sqlite-autoconf-3081100.tar.gz",
+              checksum='77b451925121028befbddbf45ea2bc49',
               extra_cflags=('-Os '
                             '-DSQLITE_ENABLE_FTS4 '
                             '-DSQLITE_ENABLE_FTS3_PARENTHESIS '
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,7 +16,7 @@
 - Issue #23254: Document how to close the TCPServer listening socket.
   Patch from Martin Panter.
 
-- Issue #19450: Update Windows builds to use SQLite 3.8.11.0
+- Issue #19450: Update Windows and OS X installer builds to use SQLite 3.8.11.
 
 - Issue #17527: Add PATCH to wsgiref.validator. Patch from Luca Sbardella.
 

-- 
Repository URL: https://hg.python.org/cpython