diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2020-05-07 12:39:09 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2020-05-07 14:12:21 +0000 |
| commit | a946d0746f23d2eb717f3c7d7f83c170f6454a90 (patch) | |
| tree | 6cbfeaba5568af2c107be2931960a9e7a2c29d30 | |
| parent | e22f8098714fcd1ded5249a650bdcd4276f64449 (diff) | |
| download | aports-a946d0746f23d2eb717f3c7d7f83c170f6454a90.tar.bz2 aports-a946d0746f23d2eb717f3c7d7f83c170f6454a90.tar.xz | |
main/sqlite: security fix (CVE-2020-11655)3.8-stable
fixes #11508
| -rw-r--r-- | main/sqlite/APKBUILD | 22 | ||||
| -rw-r--r-- | main/sqlite/CVE-2020-11655.patch | 24 |
2 files changed, 36 insertions, 10 deletions
diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD index 4fa92a78e1..261c8859ab 100644 --- a/main/sqlite/APKBUILD +++ b/main/sqlite/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> pkgname=sqlite pkgver=3.25.3 -pkgrel=3 +pkgrel=4 pkgdesc="C library that implements an SQL database engine" url="http://www.sqlite.org" arch="all" @@ -35,12 +35,21 @@ source="http://www.sqlite.org/2018/$pkgname-autoconf-$_ver.tar.gz CVE-2019-16168.patch CVE-2019-19242.patch CVE-2019-19244.patch + CVE-2020-11655.patch " # secfixes: +# 3.25.0-r4: +# - CVE-2020-11655 # 3.25.3-r3: # - CVE-2019-19242 # - CVE-2019-19242 +# 3.25.3-r2: +# - CVE-2018-20346 +# 3.25.3-r1: +# - CVE-2019-8457 +# 3.25.3-r0: +# - CVE-2018-20346 # additional CFLAGS to set _amalgamation="-DSQLITE_ENABLE_FTS4 \ @@ -55,14 +64,6 @@ _amalgamation="-DSQLITE_ENABLE_FTS4 \ -DSQLITE_MAX_VARIABLE_NUMBER=250000 \ -DSQLITE_ENABLE_JSON1" -# secfixes: -# 3.25.3-r2: -# - CVE-2018-20346 -# 3.25.3-r1: -# - CVE-2019-8457 -# 3.25.3-r0: -# - CVE-2018-20346 - build() { cd "$builddir" @@ -107,4 +108,5 @@ sha512sums="5bc501d15367e097f4070185974b0c3a8246c06b205fb2258ed18870ff3fbf120ac5 ab795b18d5426ff9ccad20f413de4f46fce7b532ebbf72dfbafc7db2d2e46453541abe992535c7aea598ec69c8557b477008e58299e3426afd2e8ab458c859e4 CVE-2019-8457.patch 19eb036e0d03543127a9ed67155522952cb7f3ce9da81ee49fba14a1c0bfc2cd0c86acab1b47b794043cac033959d861dce7ec97fca2293cb146a7ee1b83b8fa CVE-2019-16168.patch 7fc69d4d9f38b1142d86d3061a4d0168c3eebda5771e07d71a127121d7770f436e361f3e1f11f9a037b2ce9687092c9e2c808719e6b45125b9d953c636f3f6ec CVE-2019-19242.patch -e7982014a62b4fa465918fd65384cec406ea09598f3e0511eb2b68f618983b2f29a932267397aff9b88b97367dc8e05c4074fa8e276e3f4294ac019df498a724 CVE-2019-19244.patch" +e7982014a62b4fa465918fd65384cec406ea09598f3e0511eb2b68f618983b2f29a932267397aff9b88b97367dc8e05c4074fa8e276e3f4294ac019df498a724 CVE-2019-19244.patch +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 + |