| OLD | NEW | 
|---|
| 1 Name: sqlite | 1 Name: sqlite | 
| 2 License File: src/LICENSE | 2 License File: src/LICENSE | 
| 3 URL: http://sqlite.org/ | 3 URL: http://sqlite.org/ | 
| 4 Version: 3.6.18 | 4 Version: 3.7.6.3 | 
| 5 Included In Release: Yes | 5 Included In Release: Yes | 
| 6 Security Critical: Yes | 6 Security Critical: Yes | 
| 7 | 7 | 
| 8 Instructions for importing a new release of SQLite from sqlite.org. | 8 Instructions for importing a new release of SQLite from sqlite.org. | 
| 9 | 9 | 
| 10 Note: our current base version is 3.6.18. | 10 Note: our current base version is 3.7.6.3. | 
| 11 | 11 | 
| 12 First, you need to be on Linux. | 12 First, you need to be on Linux. | 
| 13 | 13 | 
| 14 # Determine the versions of the release you want and the release we currently | 14 # Determine the versions of the release you want and the release we currently | 
| 15 # have. (See the VERSION file to determine which release we currently have.) | 15 # have. (See the VERSION file to determine which release we currently have.) | 
| 16 # You may wish to consult http://www.sqlite.org/changes.html to find out what | 16 # You may wish to consult http://www.sqlite.org/changes.html to find out what | 
| 17 # changes have been made in each release. | 17 # changes have been made in each release. | 
| 18 # Note - this is just an example. Always refer to the version above for our | 18 # Note - this is just an example. Always refer to the version above for our | 
| 19 # real current version. | 19 # real current version. | 
| 20 # Set some variables to remember the versions, e.g.: | 20 # Set some variables to remember the versions, e.g.: | 
| 21 BASE=3.6.18 | 21 BASE=3.7.6.3 | 
| 22 LATEST=3.6.22 | 22 LATEST=3.7.6.4 | 
| 23 | 23 | 
| 24 # Get to the src/third_party directory in your Chromium client: | 24 # Get to the src/third_party directory in your Chromium client: | 
| 25 cd src/third_party | 25 cd src/third_party | 
| 26 | 26 | 
| 27 # Download the .tar.gz files for the releases: | 27 # Download the .tar.gz files for the releases: | 
| 28 # (If the URL changes you might need to find the new one.) | 28 # (If the URL changes you might need to find the new one.) | 
|  | 29 # TODO(shess): Rewrite this to track the new naming format.  Meanwhile, | 
|  | 30 # manually navigate to www.sqlite.org and find downloads, use "legacy" version. | 
| 29 wget http://www.sqlite.org/sqlite-$BASE.tar.gz | 31 wget http://www.sqlite.org/sqlite-$BASE.tar.gz | 
| 30 wget http://www.sqlite.org/sqlite-$LATEST.tar.gz | 32 wget http://www.sqlite.org/sqlite-$LATEST.tar.gz | 
| 31 | 33 | 
| 32 # Extract the vanilla current and desired versions: | 34 # Extract the vanilla current and desired versions: | 
| 33 tar xzf sqlite-$BASE.tar.gz | 35 tar xzf sqlite-$BASE.tar.gz | 
| 34 tar xzf sqlite-$LATEST.tar.gz | 36 tar xzf sqlite-$LATEST.tar.gz | 
| 35 | 37 | 
| 36 # Use kdiff3 to merge the changes: | 38 # Use kdiff3 to merge the changes: | 
| 37 kdiff3 -m sqlite-$BASE sqlite-$LATEST sqlite | 39 kdiff3 -m sqlite-$BASE sqlite-$LATEST sqlite | 
| 38 | 40 | 
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 168    os_unix.c, to allow Chromium's Posix VFS implementation in | 170    os_unix.c, to allow Chromium's Posix VFS implementation in | 
| 169    WebKit/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp | 171    WebKit/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp | 
| 170    to correctly implement the "unused file descriptors" logic in the | 172    to correctly implement the "unused file descriptors" logic in the | 
| 171    xDlOpen() method. The new functions are | 173    xDlOpen() method. The new functions are | 
| 172    chromium_sqlite3_get_reusable_file_handle(), | 174    chromium_sqlite3_get_reusable_file_handle(), | 
| 173    chromium_sqlite3_update_reusable_file_handle() and | 175    chromium_sqlite3_update_reusable_file_handle() and | 
| 174    chromium_sqlite3_destroy_reusable_file_handle(). Also, added the | 176    chromium_sqlite3_destroy_reusable_file_handle(). Also, added the | 
| 175    chromium_sqlite3_fill_in_unix_sqlite3_file() function that calls | 177    chromium_sqlite3_fill_in_unix_sqlite3_file() function that calls | 
| 176    fillInUnixFile(), which will be made static again as soon as a | 178    fillInUnixFile(), which will be made static again as soon as a | 
| 177    WebKit patch using the new function lands. | 179    WebKit patch using the new function lands. | 
| OLD | NEW | 
|---|