diff options
-rw-r--r-- | main/sqlite/APKBUILD | 10 | ||||
-rw-r--r-- | main/sqlite/CVE-2020-11655.patch | 24 |
2 files changed, 32 insertions, 2 deletions
diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD index 33be2fa5df..e6a75fecb0 100644 --- a/main/sqlite/APKBUILD +++ b/main/sqlite/APKBUILD @@ -3,7 +3,7 @@ pkgname=sqlite # NOTE: pkgver needs to correspond with sqlite-tcl pkgver=3.31.1 -pkgrel=2 +pkgrel=3 pkgdesc="C library that implements an SQL database engine" url="https://www.sqlite.org/" arch="all" @@ -30,9 +30,12 @@ _ver=${_a}${_b}${_c}${_d} builddir="$srcdir/$pkgname-autoconf-$_ver" source="https://www.sqlite.org/2020/$pkgname-autoconf-$_ver.tar.gz license.txt + CVE-2020-11655.patch " # secfixes: +# 3.30.1-r3: +# - CVE-2020-11655 # 3.30.1-r1: # - CVE-2019-19242 # - CVE-2019-19242 @@ -65,6 +68,8 @@ prepare() { fi ) fi + + default_prepare } build() { @@ -114,4 +119,5 @@ static() { } sha512sums="d85250ba5f78f0c918880f663741709aba662192f04888b2324a0df17affdf5b8540e8428c6c7315119806e7adad758ea281c9b403c0ad94ac6a9bd1b93fd617 sqlite-autoconf-3310100.tar.gz -5bde14bec5bf18cc686b8b90a8b2324c8c6600bca1ae56431a795bb34b8b5ae85527143f3b5f0c845c776bce60eaa537624104cefc3a47b3820d43083f40c6e9 license.txt" +5bde14bec5bf18cc686b8b90a8b2324c8c6600bca1ae56431a795bb34b8b5ae85527143f3b5f0c845c776bce60eaa537624104cefc3a47b3820d43083f40c6e9 license.txt +c9d9f440543fa59fb4cb75d069b69adcccfdeb1c31bc9bd8d2f27b178013ea72934f6301d3df28e37a67cb6dbc38b2fc7bf87bacd93d756a62f3bf59a52ab3f2 CVE-2020-11655.patch" diff --git a/main/sqlite/CVE-2020-11655.patch b/main/sqlite/CVE-2020-11655.patch new file mode 100644 index 0000000000..ee58cf62e8 --- /dev/null +++ b/main/sqlite/CVE-2020-11655.patch @@ -0,0 +1,24 @@ +From 660733d19a17c9927275dbcde537d12531a8d121 Mon Sep 17 00:00:00 2001 +From: Leonardo Arena <rnalrd@alpinelinux.org> +Date: Thu, 7 May 2020 12:37:05 +0000 +Subject: [PATCH] CVE-2020-11655 + +--- + sqlite3.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sqlite3.c b/sqlite3.c +index 55dc686..f0ccb2d 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -133217,6 +133217,7 @@ static void resetAccumulator(Parse *pParse, AggInfo *pAggInfo){ + struct AggInfo_func *pFunc; + int nReg = pAggInfo->nFunc + pAggInfo->nColumn; + if( nReg==0 ) return; ++ if( pParse->nErr ) return; + #ifdef SQLITE_DEBUG + /* Verify that all AggInfo registers are within the range specified by + ** AggInfo.mnReg..AggInfo.mxReg */ +-- +2.26.0 + |