summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-04-10 07:11:45 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-04-10 07:11:45 +0000
commit2053313304f281580dfbdf51ab091a18626b8bf2 (patch)
tree2b600989ecbc7bb93f6d720808c20d900c4b972a
parentMerging upstream version 3.23.0. (diff)
downloadsqlite3-2053313304f281580dfbdf51ab091a18626b8bf2.zip
sqlite3-2053313304f281580dfbdf51ab091a18626b8bf2.tar.xz
Merging debian version 3.23.0-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog8
-rw-r--r--debian/libsqlite3-0.symbols7
-rw-r--r--debian/patches/40-CVE-2018-8740.patch51
-rw-r--r--debian/patches/series1
4 files changed, 15 insertions, 52 deletions
diff --git a/debian/changelog b/debian/changelog
index c980eff..4f88389 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sqlite3 (3.23.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update libsqlite3-0 symbols.
+ * Remove backport fix of CVE-2018-8740 as this release contains it.
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Mon, 02 Apr 2018 19:47:04 +0000
+
sqlite3 (3.22.0-2~dschinn1) dschinn-backports; urgency=high
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/libsqlite3-0.symbols b/debian/libsqlite3-0.symbols
index 4b1cce2..4a841b4 100644
--- a/debian/libsqlite3-0.symbols
+++ b/debian/libsqlite3-0.symbols
@@ -250,6 +250,8 @@ libsqlite3.so.0 libsqlite3-0 #MINVER#
sqlite3changegroup_output_strm@Base 3.13.0
sqlite3changeset_apply@Base 3.13.0
sqlite3changeset_apply_strm@Base 3.13.0
+ sqlite3changeset_apply_v2@Base 3.23.0
+ sqlite3changeset_apply_v2_strm@Base 3.23.0
sqlite3changeset_concat@Base 3.13.0
sqlite3changeset_concat_strm@Base 3.13.0
sqlite3changeset_conflict@Base 3.13.0
@@ -264,6 +266,11 @@ libsqlite3.so.0 libsqlite3-0 #MINVER#
sqlite3changeset_pk@Base 3.13.0
sqlite3changeset_start@Base 3.13.0
sqlite3changeset_start_strm@Base 3.13.0
+ sqlite3rebaser_configure@Base 3.23.0
+ sqlite3rebaser_create@Base 3.23.0
+ sqlite3rebaser_delete@Base 3.23.0
+ sqlite3rebaser_rebase@Base 3.23.0
+ sqlite3rebaser_rebase_strm@Base 3.23.0
sqlite3session_attach@Base 3.13.0
sqlite3session_changeset@Base 3.13.0
sqlite3session_changeset_strm@Base 3.13.0
diff --git a/debian/patches/40-CVE-2018-8740.patch b/debian/patches/40-CVE-2018-8740.patch
deleted file mode 100644
index 605a83a..0000000
--- a/debian/patches/40-CVE-2018-8740.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: sqlite3/src/build.c
-==================================================================
---- sqlite3/src/build.c
-+++ sqlite3/src/build.c
-@@ -1854,12 +1854,10 @@
- }
- assert( !db->mallocFailed );
- p = pParse->pNewTable;
- if( p==0 ) return;
-
-- assert( !db->init.busy || !pSelect );
--
- /* If the db->init.busy is 1 it means we are reading the SQL off the
- ** "sqlite_master" or "sqlite_temp_master" table on the disk.
- ** So do not write to the disk again. Extract the root page number
- ** for the table from the db->init.newTnum field. (The page number
- ** should have been put there by the sqliteOpenCb routine.)
-@@ -1866,10 +1864,14 @@
- **
- ** If the root page number is 1, that means this is the sqlite_master
- ** table itself. So mark it read-only.
- */
- if( db->init.busy ){
-+ if( pSelect ){
-+ sqlite3ErrorMsg(pParse, "");
-+ return;
-+ }
- p->tnum = db->init.newTnum;
- if( p->tnum==1 ) p->tabFlags |= TF_Readonly;
- }
-
- /* Special processing for WITHOUT ROWID Tables */
-
-Index: sqlite3/src/prepare.c
-==================================================================
---- sqlite3/src/prepare.c
-+++ sqlite3/src/prepare.c
-@@ -27,11 +27,11 @@
- sqlite3 *db = pData->db;
- if( !db->mallocFailed && (db->flags & SQLITE_WriteSchema)==0 ){
- char *z;
- if( zObj==0 ) zObj = "?";
- z = sqlite3MPrintf(db, "malformed database schema (%s)", zObj);
-- if( zExtra ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra);
-+ if( zExtra && zExtra[0] ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra);
- sqlite3DbFree(db, *pData->pzErrMsg);
- *pData->pzErrMsg = z;
- }
- pData->rc = db->mallocFailed ? SQLITE_NOMEM_BKPT : SQLITE_CORRUPT_BKPT;
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 0d7138f..1efabf4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
10-665363-disable-malloc-usable-size.patch
31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch
02-use-packaged-lempar.c.patch
-40-CVE-2018-8740.patch