Github messages for voidlinux
 help / color / mirror / Atom feed
From: rmccask <rmccask@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] sqlite: update to 3.32.1.
Date: Wed, 27 May 2020 05:09:45 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22344@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

There is a new pull request by rmccask against master on the void-packages repository

https://github.com/rmccask/void-packages sqlite-3.32.1
https://github.com/void-linux/void-packages/pull/22344

sqlite: update to 3.32.1.


A patch file from https://github.com/void-linux/void-packages/pull/22344.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sqlite-3.32.1-22344.patch --]
[-- Type: text/x-diff, Size: 2989 bytes --]

From db4e23c1a836317ec5a45877f82d00a054a976ae Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Tue, 26 May 2020 23:07:37 -0400
Subject: [PATCH] sqlite: update to 3.32.1.

---
 srcpkgs/sqlite/patches/fix-crash.patch | 35 --------------------------
 srcpkgs/sqlite/template                |  6 ++---
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/sqlite/patches/fix-crash.patch

diff --git a/srcpkgs/sqlite/patches/fix-crash.patch b/srcpkgs/sqlite/patches/fix-crash.patch
deleted file mode 100644
index 3da6e8c792b..00000000000
--- a/srcpkgs/sqlite/patches/fix-crash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 90b1adc1f130148a11e1ae11a154edc67bc521f6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 9 Feb 2020 16:47:57 +0100
-Subject: [PATCH] Fix segfault on some platforms
-
-This can be reproduced on e.g. firefox with ppc64 after updating
-sqlite from 3.30.1. This is a cherry-pick of an upstream revision
-that fixes the problem (https://sqlite.org/src/info/04885763c4cd00cb).
----
- sqlite3.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git sqlite3.c sqlite3.c
-index 55dc686..0fb0b55 100644
---- sqlite3.c
-+++ sqlite3.c
-@@ -121302,12 +121302,14 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
-             x = *sqlite3VdbeGetOp(v, addrConflictCk);
-             if( x.opcode!=OP_IdxRowid ){
-               int p2;      /* New P2 value for copied conflict check opcode */
-+              const char *zP4;
-               if( sqlite3OpcodeProperty[x.opcode]&OPFLG_JUMP ){
-                 p2 = lblRecheckOk;
-               }else{
-                 p2 = x.p2;
-               }
--              sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, x.p4.z, x.p4type);
-+              zP4 = x.p4type==P4_INT32 ? SQLITE_INT_TO_PTR(x.p4.i) : x.p4.z;
-+              sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, zP4, x.p4type);
-               sqlite3VdbeChangeP5(v, x.p5);
-               VdbeCoverageIf(v, p2!=x.p2);
-             }
--- 
-2.24.0
-
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 66001eea7d6..a801e447ddb 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,7 +1,7 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.31.1
-revision=3
+version=3.32.1
+revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2020/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae
+checksum=486748abfb16abd8af664e3a5f03b228e5f124682b0c942e157644bf6fff7d10
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \

             reply	other threads:[~2020-05-27  3:09 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-27  3:09 rmccask [this message]
2020-05-27 18:24 ` [PR PATCH] [Merged]: " Hoshpak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22344@inbox.vuxu.org \
    --to=rmccask@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).