Skip to contentSkip to conversation

sqlite3: upgrade 3.30.1 -> 3.31.1

PATCH In review Anuj Mittal 2 participants 2 messages Feb 4, 2020 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH v2 1/1 sqlite3: upgrade 3.30.1 -> 3.31.1

---
 .../sqlite/sqlite3/CVE-2019-19244.patch       | 33 ----------
 .../sqlite/sqlite3/CVE-2019-19880.patch       | 33 ----------
 .../sqlite/sqlite3/CVE-2019-19923.patch       | 50 --------------
 .../sqlite/sqlite3/CVE-2019-19924.patch       | 65 -------------------
 .../sqlite/sqlite3/CVE-2019-19925.patch       | 33 ----------
 .../sqlite/sqlite3/CVE-2019-19926.patch       | 31 ---------
 .../sqlite/sqlite3/CVE-2019-19959.patch       | 46 -------------
 .../sqlite/sqlite3/CVE-2019-20218.patch       | 31 ---------
 meta/recipes-support/sqlite/sqlite3_3.30.1.bb | 20 ------
 meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 12 ++++
 10 files changed, 12 insertions(+), 342 deletions(-)
 delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch
 delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch
 delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch
 delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch
 delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch
 delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch
 delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch
 delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch
 delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.30.1.bb
 create mode 100644 meta/recipes-support/sqlite/sqlite3_3.31.1.bb
meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch deleted +0 -33
deleted file mode 100644
index 3f70979acc..0000000000
@@ -1,33 +0,0 @@
-CVE: CVE-2019-19244
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 0f690d4ae5ffe656762fdbb7f36cc4c2dcbb2d9d Mon Sep 17 00:00:00 2001
-From: dan <[email protected]>
-Date: Fri, 22 Nov 2019 10:14:01 +0000
-Subject: [PATCH] Fix a crash that could occur if a sub-select that uses both
- DISTINCT and window functions also used an ORDER BY that is the same as its
- select list.
-
-Amalgamation version of the patch:
-FossilOrigin-Name: bcdd66c1691955c697f3d756c2b035acfe98f6aad72e90b0021bab6e9023b3ba
----
- sqlite3.c | 5 +++--
- sqlite3.h | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/sqlite3.c b/sqlite3.c
-index 8fd740b..db1c649 100644
---- a/sqlite3.c
-+++ b/sqlite3.c
-@@ -131679,6 +131679,7 @@ SQLITE_PRIVATE int sqlite3Select(
-   */
-   if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct 
-    && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0
-+   && p->pWin==0
-   ){
-     p->selFlags &= ~SF_Distinct;
-     pGroupBy = p->pGroupBy = sqlite3ExprListDup(db, pEList, 0);
--- 
-2.24.1
-
meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch deleted +0 -33
deleted file mode 100644
index ca5c31c57b..0000000000
@@ -1,33 +0,0 @@
-CVE: CVE-2019-19880
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 3622d20ad10dfac9586d4423547ed960cbc66fcf Mon Sep 17 00:00:00 2001
-From: "D. Richard Hipp" <[email protected]>
-Date: Wed, 18 Dec 2019 00:05:50 +0000
-Subject: [PATCH] When processing constant integer values in ORDER BY clauses
- of window definitions (see check-in [7e4 ---
-
----
- sqlite3.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/sqlite3.c b/sqlite3.c
-index db1c649..a83b3d2 100644
---- a/sqlite3.c
-+++ b/sqlite3.c
-@@ -147584,9 +147584,11 @@ static ExprList *exprListAppendList(
-     int nInit = pList ? pList->nExpr : 0;
-     for(i=0; i<pAppend->nExpr; i++){
-       Expr *pDup = sqlite3ExprDup(pParse->db, pAppend->a[i].pExpr, 0);
-+      assert( pDup==0 || !ExprHasProperty(pDup, EP_MemToken) );
-       if( bIntToNull && pDup && pDup->op==TK_INTEGER ){
-         pDup->op = TK_NULL;
-         pDup->flags &= ~(EP_IntValue|EP_IsTrue|EP_IsFalse);
-+        pDup->u.zToken = 0;
-       }
-       pList = sqlite3ExprListAppend(pParse, pList, pDup);
-       if( pList ) pList->a[nInit+i].sortFlags = pAppend->a[i].sortFlags;
--- 
-2.24.1
-
meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch deleted +0 -50

50 lines not on this page · raw message

meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch deleted +0 -65

65 lines not on this page · raw message

meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch deleted +0 -33
deleted file mode 100644
index ffc2c6afff..0000000000
@@ -1,33 +0,0 @@
-CVE: CVE-2019-19925
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From e92580434d2cdca228649d32f76167492de4f512 Mon Sep 17 00:00:00 2001
-From: "D. Richard Hipp" <[email protected]>
-Date: Thu, 19 Dec 2019 15:15:40 +0000
-Subject: [PATCH] Fix the zipfile extension so that INSERT works even if the
- pathname of the file being inserted is a NULL.  Bug discovered by the
- Yongheng and Rui fuzzer.
-
-FossilOrigin-Name: a80f84b511231204658304226de3e075a55afc2e3f39ac063716f7a57f585c06
----
- shell.c   | 1 +
- sqlite3.c | 4 ++--
- sqlite3.h | 2 +-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/shell.c b/shell.c
-index 053180c..404a8d4 100644
---- a/shell.c
-+++ b/shell.c
-@@ -5827,6 +5827,7 @@ static int zipfileUpdate(
- 
-     if( rc==SQLITE_OK ){
-       zPath = (const char*)sqlite3_value_text(apVal[2]);
-+      if( zPath==0 ) zPath = "";
-       nPath = (int)strlen(zPath);
-       mTime = zipfileGetTime(apVal[4]);
-     }
--- 
-2.24.1
-
meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch deleted +0 -31
deleted file mode 100644
index 92bc7908bc..0000000000
@@ -1,31 +0,0 @@
-CVE: CVE-2019-19926
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 4165b1e1e0001165ace9051a70f938099505eadc Mon Sep 17 00:00:00 2001
-From: "D. Richard Hipp" <[email protected]>
-Date: Thu, 19 Dec 2019 22:08:19 +0000
-Subject: [PATCH] Continuation of [e2bddcd4c55ba3cb]: Add another spot where it
- is necessary to abort early due to prior errors in sqlite3WindowRewrite().
-
-FossilOrigin-Name: cba2a2a44cdf138a629109bb0ad088ed4ef67fc66bed3e0373554681a39615d2
----
- sqlite3.c | 7 ++++---
- sqlite3.h | 2 +-
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/sqlite3.c b/sqlite3.c
-index 857c28e..19a474d 100644
---- a/sqlite3.c
-+++ b/sqlite3.c
-@@ -128427,6 +128427,7 @@ static int multiSelect(
-     }
-   #endif
-   }
-+  if( pParse->nErr ) goto multi_select_end;
-   
-   /* Compute collating sequences used by 
-   ** temporary tables needed to implement the compound select.
--- 
-2.24.1
-
meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch deleted +0 -46

46 lines not on this page · raw message

meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch deleted +0 -31
deleted file mode 100644
index fb6cd6df2d..0000000000
@@ -1,31 +0,0 @@
-CVE: CVE-2019-20218
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 6bbd76d34f29f61483791231f2ce579dcadab8a5 Mon Sep 17 00:00:00 2001
-From: Dan Kennedy <[email protected]>
-Date: Fri, 27 Dec 2019 20:54:42 +0000
-Subject: [PATCH] Do not attempt to unwind the WITH stack in the Parse object
- following an error. This fixes a separate case to [de6e6d68].
-
-FossilOrigin-Name: d29edef93451cc67a5d69c1cce1b1832d9ca8fff1f600afdd51338b74d077b92
----
- sqlite3.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sqlite3.c b/sqlite3.c
-index 5bc06c8..408ec4c 100644
---- a/sqlite3.c
-+++ b/sqlite3.c
-@@ -130570,7 +130570,7 @@ static int selectExpander(Walker *pWalker, Select *p){
- 
-   /* Process NATURAL keywords, and ON and USING clauses of joins.
-   */
--  if( db->mallocFailed || sqliteProcessJoin(pParse, p) ){
-+  if( pParse->nErr || db->mallocFailed || sqliteProcessJoin(pParse, p) ){
-     return WRC_Abort;
-   }
- 
--- 
-2.24.1
-
meta/recipes-support/sqlite/sqlite3_3.30.1.bb deleted +0 -20
deleted file mode 100644
index e055aca205..0000000000
@@ -1,20 +0,0 @@
-require sqlite3.inc
-
-LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
-
-SRC_URI = "http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz \
-           file://CVE-2019-19244.patch \
-           file://CVE-2019-19880.patch \
-           file://CVE-2019-19923.patch \
-           file://CVE-2019-19924.patch \
-           file://CVE-2019-19925.patch \
-           file://CVE-2019-19926.patch \
-           file://CVE-2019-19959.patch \
-           file://CVE-2019-20218.patch \
-           "
-SRC_URI[md5sum] = "51252dc6bc9094ba11ab151ba650ff3c"
-SRC_URI[sha256sum] = "8c5a50db089bd2a1b08dbc5b00d2027602ca7ff238ba7658fabca454d4298e60"
-
-# -19242 is only an issue in specific development branch commits
-CVE_CHECK_WHITELIST += "CVE-2019-19242"
meta/recipes-support/sqlite/sqlite3_3.31.1.bb new file +12 -0
new file mode 100644
index 0000000000..903d66ab29
@@ -0,0 +1,12 @@
+require sqlite3.inc
+
+LICENSE = "PD"
+LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
+
+SRC_URI = "http://www.sqlite.org/2020/sqlite-autoconf-${SQLITE_PV}.tar.gz \
+           "
+SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125"
+SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae"
+
+# -19242 is only an issue in specific development branch commits
+CVE_CHECK_WHITELIST += "CVE-2019-19242"
Signature · 1 line
2.24.1
#2 lore raw

Hi,

slightly off topic but I was checking CVEs for sqlite3 and noticed this recipe uses the merged source tree format. This makes it very hard to cherry-pick CVE and other patches from Debian, Ubuntu, OpenSUSE etc.

Why use sqlite sources in "amalgamation" format?

https://sqlite.org/amalgamation.html

Cheers,

-Mikko