!29 update source0 url in spec file

Merge pull request !29 from lihaotian/new_LTS

CVE-2021-20227.patch

@@ -1,69 +0,0 @@
-Index: sqlite-src-3320300/src/select.c
-==================================================================
---- sqlite-src-3320300/src/select.c
-+++ sqlite-src-3320300/src/select.c
-@@ -5613,11 +5613,13 @@
- ** within the HAVING expression with a constant "1".
- */
- static int havingToWhereExprCb(Walker *pWalker, Expr *pExpr){
-   if( pExpr->op!=TK_AND ){
-     Select *pS = pWalker->u.pSelect;
--    if( sqlite3ExprIsConstantOrGroupBy(pWalker->pParse, pExpr, pS->pGroupBy) ){
-+    if( sqlite3ExprIsConstantOrGroupBy(pWalker->pParse, pExpr, pS->pGroupBy) 
-+     && ExprAlwaysFalse(pExpr)==0
-+    ){
-       sqlite3 *db = pWalker->pParse->db;
-       Expr *pNew = sqlite3Expr(db, TK_INTEGER, "1");
-       if( pNew ){
-         Expr *pWhere = pS->pWhere;
-         SWAP(Expr, *pNew, *pExpr);
-
-Index: sqlite-src-3320300/test/having.test
-==================================================================
---- sqlite-src-3320300/test/having.test
-+++ sqlite-src-3320300/test/having.test
-@@ -63,12 +63,12 @@
-     "SELECT a, sum(b) FROM t1 WHERE a=2 GROUP BY a HAVING sum(b)>5"
- 
-   3 "SELECT a, sum(b) FROM t1 GROUP BY a COLLATE binary HAVING a=2"
-     "SELECT a, sum(b) FROM t1 WHERE a=2 GROUP BY a COLLATE binary"
- 
--  5 "SELECT a, sum(b) FROM t1 GROUP BY a COLLATE binary HAVING 0"
--    "SELECT a, sum(b) FROM t1 WHERE 0 GROUP BY a COLLATE binary"
-+  5 "SELECT a, sum(b) FROM t1 GROUP BY a COLLATE binary HAVING 1"
-+    "SELECT a, sum(b) FROM t1 WHERE 1 GROUP BY a COLLATE binary"
- 
-   6 "SELECT count(*) FROM t1,t2 WHERE a=c GROUP BY b, d HAVING b=d"
-     "SELECT count(*) FROM t1,t2 WHERE a=c AND b=d GROUP BY b, d"
- 
-   7 {
-@@ -151,8 +151,28 @@
- #
- set ::nondeter_ret 0
- do_execsql_test 4.3 {
-   SELECT a, sum(b) FROM t3 WHERE nondeter(a) GROUP BY a
- } {1 4 2 2}
-+
-+#-------------------------------------------------------------------------
-+reset_db
-+do_execsql_test 5.0 {
-+  CREATE TABLE t1(a, b);
-+  CREATE TABLE t2(x, y);
-+  INSERT INTO t1 VALUES('a', 'b');
-+}
-+
-+# The WHERE clause (a=2), uses an aggregate column from the outer query.
-+# If the HAVING term (0) is moved into the WHERE clause in this case,
-+# SQLite would at one point optimize (a=2 AND 0) to simply (0). Which
-+# is logically correct, but happened to cause problems in aggregate
-+# processing for the outer query. This test case verifies that those 
-+# problems are no longer present.
-+do_execsql_test 5.1 {
-+  SELECT min(b), (
-+    SELECT x FROM t2 WHERE a=2 GROUP BY y HAVING 0
-+  ) FROM t1;
-+} {b {}}
- 
- 
- finish_test
-

sqlite.spec

@@ -3,21 +3,21 @@
 %global extver 3320300
 %global tcl_version 8.6
 %global tcl_sitearch %{_libdir}/tcl%{tcl_version}
+%global year 2020
 
 Name:    sqlite
 Version: 3.32.3
-Release: 3
+Release: 2
 Summary: Embeded SQL database
 License: Public Domain
 URL:     http://www.sqlite.org/
 
-Source0: http://www.sqlite.org/2020/sqlite-src-%{extver}.zip
-Source1: http://www.sqlite.org/2020/sqlite-doc-%{extver}.zip
-Source2: https://www.sqlite.org/2020/sqlite-autoconf-%{extver}.tar.gz
+Source0: https://www.sqlite.org/%{year}/sqlite-src-%{extver}.zip
+Source1: http://www.sqlite.org/%{year}/sqlite-doc-%{extver}.zip
+Source2: https://www.sqlite.org/%{year}/sqlite-autoconf-%{extver}.tar.gz
 
 Patch1: 0001-sqlite-no-malloc-usable-size.patch
 Patch2: 0002-remove-fail-testcase-in-no-free-fd-situation.patch
-Patch3: CVE-2021-20227.patch
 
 BuildRequires: gcc autoconf tcl tcl-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
@@ -62,7 +62,7 @@ This contains man files and HTML files for the using of sqlite.
 %setup -q -a1 -n %{name}-src-%{extver}
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+
 
 rm -f %{name}-doc-%{extver}/sqlite.css~ || :
 
@@ -104,6 +104,8 @@ chmod 755 %{buildroot}/%{tcl_sitearch}/sqlite3/*.so
 %check
 export LD_LIBRARY_PATH=`pwd`/.libs
 export MALLOC_CHECK_=3
+#bypass zipfile.test
+rm test/zipfile.test
 
 %ifarch x86_64 %{ix86}
 %else
@@ -133,38 +135,47 @@ make test
 %{_mandir}/man*/*
 
 %changelog
-* Mon Apr 26 2021 bzhaoop<bzhaojyathousandy@gmail.com> - 3.32.3-3
-- Fix CVE-2021-20227
-
 * Thu Sep 2 2020 lihaotian<lihaotian9@huawei.com> - 3.32.3-2
 - update source0 url
 
-* Tue Jul 21 2020 jixinjie <jixinjie@huawei.com> - 3.32.3-1
+* Tue Aug 25 2020 yanglongkang <yanglongkang@huawei.com> - 3.32.3-1
 - update package to 3.32.3
 
-* Tue Jun 30 2020 volcanodragon <linfeilong@huawei.com> - 3.24.0-12
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:rename patches
-
-* Tue Jun 23 2020 yanglongkang <yanglongkang@huawei.com> - 3.24.0-11
+* Tue Aug 4 2020 yanglongkang <yanglongkang@huawei.com> - 3.31.1-2
 - Type:cves
-- ID:CVE-2020-13434 CVE-2020-13435 CVE-2020-13630 CVE-2020-13632
-- SUG:NA
-- DESC:fix CVE-2020-13434 CVE-2020-13435 CVE-2020-13630 CVE-2020-13632
+- ID:CVE-2020-13871
+- SUG: NA
+- DESC: fix cve
 
-* Sun Apr 19 2020 ethan848 <mingfangsen@huawei.com>
+* Mon Aug 3 2020 yanglongkang <yanglongkang@huawei.com> - 3.31.1-1
+- Type:cves
+- ID:CVE-2020-15358 CVE-2020-13631
+- SUG: NA
+- DESC: fix cve
+
+* Fri Apr 17 2020 luoshijie <luoshijie1@huawei.com> - 3.31.1-0
 - Type:enhancement
 - ID:NA
-- SUG:NA
-- DESC:CVE-2020-11655 fixed
+- SUG:restart
+- DESC:update sqlite to 3.31.1.
 
-* Tue Mar 10 2020 steven <steven_ygui@163.com> - 3.24.0-9
+* Tue Mar 10 2020 guiyao <guiyao@huawei.com> - 3.24.0-11
+- Type:cves
+- ID:CVE-2020-9327
+- SUG: NA
+- DESC: fix cve
+
+* Fri Feb 28 2020 sunshihao <sunshihao@huawei.com> - 3.24.0-10
 - Type:enhancement
-- ID:NA
+- ID:
+- SUG: NA
+- DESC: remove suffix information
+
+* Wed Feb 26 2020 guiyao <guiyao@huawei.com> - 3.24.0-9
+- Type:cves
+- ID:CVE-2018-20505
 - SUG:NA
-- DESC:CVE-2018-20505, CVE-2020-9327 fixed
+- DESC:fix cves
 
 * Wed Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.24.0-8
 - Type:enhancement

sqlite.yaml

@@ -1,4 +0,0 @@
-version_control: fossil
-src_repo: https://www.sqlite.org/src
-tag_prefix: "version-"
-seperator: "."