diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-12-29 08:52:16 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-12-31 13:35:59 +1000 |
| commit | c730732bdafbfc931bfbf6a8cf4cdd5ea9d8dd45 (patch) | |
| tree | dccd41832380503ac6dae79a2aa0c466ca402473 /pkgs/development/libraries/sqlite | |
| parent | eedd93a413a53adf96ea5b8aeb3a21aee2d38fb2 (diff) | |
| download | nixpkgs-c730732bdafbfc931bfbf6a8cf4cdd5ea9d8dd45.tar nixpkgs-c730732bdafbfc931bfbf6a8cf4cdd5ea9d8dd45.tar.gz nixpkgs-c730732bdafbfc931bfbf6a8cf4cdd5ea9d8dd45.tar.bz2 nixpkgs-c730732bdafbfc931bfbf6a8cf4cdd5ea9d8dd45.tar.lz nixpkgs-c730732bdafbfc931bfbf6a8cf4cdd5ea9d8dd45.tar.xz nixpkgs-c730732bdafbfc931bfbf6a8cf4cdd5ea9d8dd45.tar.zst nixpkgs-c730732bdafbfc931bfbf6a8cf4cdd5ea9d8dd45.zip | |
sqlite: 3.40.0 -> 3.40.1
https://www.sqlite.org/releaselog/3_40_1.html
Diffstat (limited to 'pkgs/development/libraries/sqlite')
| -rw-r--r-- | pkgs/development/libraries/sqlite/3.39.4-autoconf-CVE-2022-46908.patch | 25 | ||||
| -rw-r--r-- | pkgs/development/libraries/sqlite/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/sqlite/tools.nix | 4 |
3 files changed, 4 insertions, 33 deletions
diff --git a/pkgs/development/libraries/sqlite/3.39.4-autoconf-CVE-2022-46908.patch b/pkgs/development/libraries/sqlite/3.39.4-autoconf-CVE-2022-46908.patch deleted file mode 100644 index 27ab2af2014..00000000000 --- a/pkgs/development/libraries/sqlite/3.39.4-autoconf-CVE-2022-46908.patch +++ /dev/null @@ -1,25 +0,0 @@ -adapted for preprocessed source files from upstream -https://sqlite.org/src/vpatch?from=a60e56627fc0ef88&to=cefc032473ac5ad2 - -diff --git a/shell.c b/shell.c -index e66ae08..d423278 100644 ---- a/shell.c -+++ b/shell.c -@@ -12921,7 +12921,7 @@ static int safeModeAuth( - "zipfile", - "zipfile_cds", - }; -- UNUSED_PARAMETER(zA2); -+ UNUSED_PARAMETER(zA1); - UNUSED_PARAMETER(zA3); - UNUSED_PARAMETER(zA4); - switch( op ){ -@@ -12936,7 +12936,7 @@ static int safeModeAuth( - case SQLITE_FUNCTION: { - int i; - for(i=0; i<ArraySize(azProhibitedFunctions); i++){ -- if( sqlite3_stricmp(zA1, azProhibitedFunctions[i])==0 ){ -+ if( sqlite3_stricmp(zA2, azProhibitedFunctions[i])==0 ){ - failIfSafeMode(p, "cannot use the %s() function in safe mode", - azProhibitedFunctions[i]); - } diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 3f4081acc04..eb27c8c8b9e 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -17,19 +17,15 @@ in stdenv.mkDerivation rec { pname = "sqlite${optionalString interactive "-interactive"}"; - version = "3.40.0"; + version = "3.40.1"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "sha256-AzNVIHbScAx1NSJW6Rx4v1zWJJFYm6DGmu0KgYaJgOc="; + sha256 = "sha256-LF3qIH+lCNdlrx72ILY33LBlcq+m8B8IFb1bv4ZLM9k="; }; - patches = [ - ./3.39.4-autoconf-CVE-2022-46908.patch - ]; - outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 1b7fca210fa..bb0a1a7d739 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.40.0"; + version = "3.40.1"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip"; - sha256 = "sha256-SFUIKBQgUSk+F5/8aoUg9vv9guHNyni5N5L3ZsyJuOI="; + sha256 = "sha256-UGQSaqUNsgw1V4thK1bDEpQlwFBu1NFhDvpKDwG9+NA="; }; nativeBuildInputs = [ unzip ]; |