rpms/sqlite
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rebase to version 3.36.0 (#1973815)

Browse Source
This commit is contained in:
Ondrej Dubaj 2021-07-01 14:42:36 +02:00
parent bee3a4ab7c
commit 219120d4fc
3 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (sqlite-src-3350500.zip) = f9afd11b3c42a8241f91e2ecafc3928e7391cc0f1fbee236b8122c2d3ca922d0c82d2605968b131351b6c5e38f983f8eed29b86c94cfa72799e2387b3b3db561 SHA512 (sqlite-doc-3360000.zip) = c9b5628f823c322688e2fcce0effe7564dccaf8bcdbb3397ee09c433975bfb5fd63fd81830c5c6d573314e1e55d25cdf1b3842d798f7be63b9b88b32f6694add
SHA512 (sqlite-doc-3350500.zip) = 2da5357623f4db7003f46ec7ea8bdd8a794ad6e1be9a25a8ebccfe5222da43eabc32d9d17acfd7766aa4cf1fd010e476a8087fab78ac6f6596c7c5b8a06de685 SHA512 (sqlite-src-3360000.zip) = 4083f96265c59001d21dce4d0288ddc6ea80ae079cbce2144c0fc3200b1904fd0d665fc54b08978c6b818527580042cde025c03b73d20d0bc56ccbeb75a330c3
SHA512 (sqlite-autoconf-3350500.tar.gz) = 039af796f79fc4517be0bd5ba37886264d49da309e234ae6fccdb488ef0109ed2b917fc3e6c1fc7224dff4f736824c653aaf8f0a37550c5ebc14d035cb8ac737 SHA512 (sqlite-autoconf-3360000.tar.gz) = e59c57f421b4956c7759af528a2da929167e15179ab9d28267474683e2272f93c901203e5a648732f1a3d43e7be3ac4217c3cdd7adf108c378b9127b771a7cd0

54
sqlite-3.34.1-remove-SHA-1.patch
View File

@ -1,6 +1,6 @@
From ea78e7c89ddd5dfcde7f93efe450d173f8fa63b2 Mon Sep 17 00:00:00 2001 From f1980238b5607c3b9c9484da81b01e1e2de7ccc5 Mon Sep 17 00:00:00 2001
From: Ondrej Dubaj <odubaj@redhat.com> From: Ondrej Dubaj <odubaj@redhat.com>
Date: Thu, 15 Apr 2021 07:43:31 +0200 Date: Thu, 1 Jul 2021 12:55:27 +0200
Subject: [PATCH] remove SHA-1 algorithms according to its deprecation in Subject: [PATCH] remove SHA-1 algorithms according to its deprecation in
RHEL-9 RHEL-9
@ -12,16 +12,16 @@ Subject: [PATCH] remove SHA-1 algorithms according to its deprecation in
manifest | 1 - manifest | 1 -
src/sqlite.h.in | 4 +- src/sqlite.h.in | 4 +-
tool/dbhash.c | 491 ---------------------------------------------- tool/dbhash.c | 491 ----------------------------------------------
tool/mksourceid.c | 188 +----------------- tool/mksourceid.c | 192 +-----------------
8 files changed, 4 insertions(+), 1089 deletions(-) 8 files changed, 4 insertions(+), 1093 deletions(-)
delete mode 100644 ext/misc/sha1.c delete mode 100644 ext/misc/sha1.c
delete mode 100644 tool/dbhash.c delete mode 100644 tool/dbhash.c
diff --git a/Makefile.in b/Makefile.in diff --git a/Makefile.in b/Makefile.in
index 6ab49db..2bb9078 100644 index 2795ffa..6663dbc 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -583,7 +583,6 @@ TESTPROGS = \ @@ -585,7 +585,6 @@ TESTPROGS = \
sqlite3$(TEXE) \ sqlite3$(TEXE) \
sqlite3_analyzer$(TEXE) \ sqlite3_analyzer$(TEXE) \
sqldiff$(TEXE) \ sqldiff$(TEXE) \
@ -39,19 +39,19 @@ index 6ab49db..2bb9078 100644
scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \ $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
$(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS) $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
@@ -1477,7 +1473,6 @@ clean: @@ -1482,7 +1478,6 @@ clean:
rm -f fuzzershell fuzzershell.exe rm -f fuzzershell fuzzershell.exe
rm -f fuzzcheck fuzzcheck.exe rm -f fuzzcheck fuzzcheck.exe
rm -f sqldiff sqldiff.exe rm -f sqldiff sqldiff.exe
- rm -f dbhash dbhash.exe - rm -f dbhash dbhash.exe
rm -f fts5.* fts5parse.* rm -f fts5.* fts5parse.*
rm -f threadtest5
distclean: clean
diff --git a/Makefile.msc b/Makefile.msc diff --git a/Makefile.msc b/Makefile.msc
index 404e3b2..5380e05 100644 index 4f20c0c..c85a7f0 100644
--- a/Makefile.msc --- a/Makefile.msc
+++ b/Makefile.msc +++ b/Makefile.msc
@@ -1661,7 +1661,6 @@ TESTPROGS = \ @@ -1665,7 +1665,6 @@ TESTPROGS = \
sqlite3_analyzer.exe \ sqlite3_analyzer.exe \
sqlite3_checker.exe \ sqlite3_checker.exe \
sqldiff.exe \ sqldiff.exe \
@ -59,7 +59,7 @@ index 404e3b2..5380e05 100644
sqltclsh.exe sqltclsh.exe
# Databases containing fuzzer test cases # Databases containing fuzzer test cases
@@ -1782,9 +1781,6 @@ $(SQLITE3EXE): shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLIT @@ -1784,9 +1783,6 @@ $(SQLITE3EXE): shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLIT
sqldiff.exe: $(TOP)\tool\sqldiff.c $(SQLITE3C) $(SQLITE3H) sqldiff.exe: $(TOP)\tool\sqldiff.c $(SQLITE3C) $(SQLITE3H)
$(LTLINK) $(NO_WARN) $(TOP)\tool\sqldiff.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS) $(LTLINK) $(NO_WARN) $(TOP)\tool\sqldiff.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
@ -69,7 +69,7 @@ index 404e3b2..5380e05 100644
scrub.exe: $(TOP)\ext\misc\scrub.c $(SQLITE3C) $(SQLITE3H) scrub.exe: $(TOP)\ext\misc\scrub.c $(SQLITE3C) $(SQLITE3H)
$(LTLINK) $(NO_WARN) -DSCRUB_STANDALONE=1 $(TOP)\ext\misc\scrub.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS) $(LTLINK) $(NO_WARN) -DSCRUB_STANDALONE=1 $(TOP)\ext\misc\scrub.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
@@ -2618,7 +2614,7 @@ clean: @@ -2620,7 +2616,7 @@ clean:
del /Q shell.c sqlite3ext.h sqlite3session.h 2>NUL del /Q shell.c sqlite3ext.h sqlite3session.h 2>NUL
del /Q sqlite3_analyzer.exe sqlite3_analyzer.c 2>NUL del /Q sqlite3_analyzer.exe sqlite3_analyzer.c 2>NUL
del /Q sqlite-*-output.vsix 2>NUL del /Q sqlite-*-output.vsix 2>NUL
@ -478,10 +478,10 @@ index 9fe6cae..0000000
- return rc; - return rc;
-} -}
diff --git a/main.mk b/main.mk diff --git a/main.mk b/main.mk
index e47e85f..391c565 100644 index 16d72ff..d176f8b 100644
--- a/main.mk --- a/main.mk
+++ b/main.mk +++ b/main.mk
@@ -503,7 +503,6 @@ TESTPROGS = \ @@ -505,7 +505,6 @@ TESTPROGS = \
sqlite3_analyzer$(EXE) \ sqlite3_analyzer$(EXE) \
sqlite3_checker$(EXE) \ sqlite3_checker$(EXE) \
sqldiff$(EXE) \ sqldiff$(EXE) \
@ -489,7 +489,7 @@ index e47e85f..391c565 100644
sqltclsh$(EXE) sqltclsh$(EXE)
# Databases containing fuzzer test cases # Databases containing fuzzer test cases
@@ -564,10 +563,6 @@ sqldiff$(EXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h @@ -565,10 +564,6 @@ sqldiff$(EXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
$(TCCX) -o sqldiff$(EXE) -DSQLITE_THREADSAFE=0 \ $(TCCX) -o sqldiff$(EXE) -DSQLITE_THREADSAFE=0 \
$(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS) $(THREADLIB) $(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS) $(THREADLIB)
@ -501,10 +501,10 @@ index e47e85f..391c565 100644
$(TCC) -I. -DSCRUB_STANDALONE -o scrub$(EXE) $(TOP)/ext/misc/scrub.c sqlite3.o $(THREADLIB) $(TCC) -I. -DSCRUB_STANDALONE -o scrub$(EXE) $(TOP)/ext/misc/scrub.c sqlite3.o $(THREADLIB)
diff --git a/manifest b/manifest diff --git a/manifest b/manifest
index 37ade30..b3ececf 100644 index a203587..f819a2e 100644
--- a/manifest --- a/manifest
+++ b/manifest +++ b/manifest
@@ -1791,7 +1791,6 @@ F tool/build-all-msvc.bat c12328d06c45fec8baada5949e3d5af54bf8c887 x @@ -1822,7 +1822,6 @@ F tool/build-all-msvc.bat c12328d06c45fec8baada5949e3d5af54bf8c887 x
F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
F tool/cg_anno.tcl c1f875f5a4c9caca3d59937b16aff716f8b1883935f1b4c9ae23124705bc8099 x F tool/cg_anno.tcl c1f875f5a4c9caca3d59937b16aff716f8b1883935f1b4c9ae23124705bc8099 x
F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
@ -513,7 +513,7 @@ index 37ade30..b3ececf 100644
F tool/dbtotxt.md c9a57af8739957ef36d2cfad5c4b1443ff3688ed33e4901ee200c8b651f43f3c F tool/dbtotxt.md c9a57af8739957ef36d2cfad5c4b1443ff3688ed33e4901ee200c8b651f43f3c
F tool/enlargedb.c 3e8b2612b985cfa7e3e8800031ee191b43ae80de96abb5abbd5eada62651ee21 F tool/enlargedb.c 3e8b2612b985cfa7e3e8800031ee191b43ae80de96abb5abbd5eada62651ee21
diff --git a/src/sqlite.h.in b/src/sqlite.h.in diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 1493a77..68a9075 100644 index f8037a2..7f2639f 100644
--- a/src/sqlite.h.in --- a/src/sqlite.h.in
+++ b/src/sqlite.h.in +++ b/src/sqlite.h.in
@@ -114,8 +114,8 @@ extern "C" { @@ -114,8 +114,8 @@ extern "C" {
@ -522,7 +522,7 @@ index 1493a77..68a9075 100644
** within its configuration management system. ^The SQLITE_SOURCE_ID ** within its configuration management system. ^The SQLITE_SOURCE_ID
-** string contains the date and time of the check-in (UTC) and a SHA1 -** string contains the date and time of the check-in (UTC) and a SHA1
-** or SHA3-256 hash of the entire source tree. If the source code has -** or SHA3-256 hash of the entire source tree. If the source code has
+** string contains the date and time of the check-in (UTC) and SHA3-256 +** string contains the date and time of the check-in (UTC) and a SHA3-256
+** hash of the entire source tree. If the source code has +** hash of the entire source tree. If the source code has
** been edited in any way since it was last checked in, then the last ** been edited in any way since it was last checked in, then the last
** four hexadecimal digits of the hash may be modified. ** four hexadecimal digits of the hash may be modified.
@ -1025,7 +1025,7 @@ index 78685dc..0000000
- return 0; - return 0;
-} -}
diff --git a/tool/mksourceid.c b/tool/mksourceid.c diff --git a/tool/mksourceid.c b/tool/mksourceid.c
index dd15399..be8f248 100644 index dd15399..ec5dd0a 100644
--- a/tool/mksourceid.c --- a/tool/mksourceid.c
+++ b/tool/mksourceid.c +++ b/tool/mksourceid.c
@@ -517,23 +517,6 @@ static int sha3sum_file(const char *zFilename, int iSize, char *pCksum){ @@ -517,23 +517,6 @@ static int sha3sum_file(const char *zFilename, int iSize, char *pCksum){
@ -1078,7 +1078,7 @@ index dd15399..be8f248 100644
/* /*
* Hash a single 512-bit block. This is the core of the algorithm. * Hash a single 512-bit block. This is the core of the algorithm.
*/ */
@@ -578,156 +542,10 @@ struct SHA1Context { @@ -578,156 +542,6 @@ struct SHA1Context {
#define d qq[3] #define d qq[3]
#define e qq[4] #define e qq[4]
@ -1137,8 +1137,8 @@ index dd15399..be8f248 100644
- state[3] += d; - state[3] += d;
- state[4] += e; - state[4] += e;
-} -}
-
-
-/* -/*
- * SHA1Init - Initialize new context - * SHA1Init - Initialize new context
- */ - */
@ -1151,8 +1151,8 @@ index dd15399..be8f248 100644
- context->state[4] = 0xC3D2E1F0; - context->state[4] = 0xC3D2E1F0;
- context->count[0] = context->count[1] = 0; - context->count[0] = context->count[1] = 0;
-} -}
-
-
-/* -/*
- * Run your data through this. - * Run your data through this.
- */ - */
@ -1235,7 +1235,7 @@ index dd15399..be8f248 100644
/* /*
** Print a usage comment and quit. ** Print a usage comment and quit.
*/ */
@@ -804,11 +622,7 @@ int main(int argc, char **argv){ @@ -804,11 +618,7 @@ int main(int argc, char **argv){
char *zFilename = &zLine[2]; char *zFilename = &zLine[2];
char *zMHash = nextToken(zFilename); char *zMHash = nextToken(zFilename);
nextToken(zMHash); nextToken(zMHash);
@ -1249,5 +1249,5 @@ index dd15399..be8f248 100644
allValid = 0; allValid = 0;
if( bVerbose ){ if( bVerbose ){
-- --
2.30.2 2.31.1

9
sqlite.spec
View File

@ -4,9 +4,9 @@
%bcond_with static %bcond_with static
%bcond_without check %bcond_without check
%define realver 3350500 %define realver 3360000
%define docver 3350500 %define docver 3360000
%define rpmver 3.35.5 %define rpmver 3.36.0
%define year 2021 %define year 2021
Summary: Library that implements an embeddable SQL database engine Summary: Library that implements an embeddable SQL database engine
@ -260,6 +260,9 @@ make test
%endif %endif
%changelog %changelog
* Thu Jul 01 2021 Ondrej Dubaj <odubaj@redhat.com> - 3.36.0-1
- Updated to version 3.36.0 (https://sqlite.org/releaselog/3_36_0.html)
* Tue Apr 20 2021 Ondrej Dubaj <odubaj@redhat.com> - 3.35.5-1 * Tue Apr 20 2021 Ondrej Dubaj <odubaj@redhat.com> - 3.35.5-1
- Updated to version 3.35.5 (https://sqlite.org/releaselog/3_35_5.html) - Updated to version 3.35.5 (https://sqlite.org/releaselog/3_35_5.html)