Your message dated Sun, 09 Feb 2020 07:20:04 +0000
with message-id <e1j0gsu-0001bn...@fasolo.debian.org>
and subject line Bug#950974: fixed in sqlite3 3.31.1-2
has caused the Debian Bug report #950974,
regarding sqlite3: Regressions on big-endian targets break other packages
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
950974: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=950974
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: sqlite3
Severity: critical
Tags: patch
Justification: breaks unrelated software
User: debian-s...@lists.debian.org
Usertags: s390x

Hi!

Due to a regression in sqlite3, git has been failing to build from source
on multiple big-endian targets, including the release target s390x [1].

openSUSE has recently cherry-picked two upstream commits which address
this issue [2, 3, 4] and I have verified that these patches fix git
in Debian on ppc64 (and I assume s390x and sparc64 as well). Thus, please
include these patches to unbreak git on ppc64, sparc64 and s390x.

Severity set to 'critical' as this bug breaks unrelated software.

Attaching the two patches taken from openSUSE.

Thanks,
Adrian

> [1] https://marc.info/?l=git&m=158120991004802&w=2
> [2] 
> https://build.opensuse.org/package/rdiff/server:database/sqlite3?linkrev=base&rev=241
> [3] https://sqlite.org/src/info/04885763c4cd00cb
> [4] https://sqlite.org/src/info/b20503aaf5b6595a

--
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
Index: ext/fts5/test/fts5matchinfo.test
==================================================================
--- ext/fts5/test/fts5matchinfo.test
+++ ext/fts5/test/fts5matchinfo.test
@@ -498,23 +498,26 @@
   CREATE VIRTUAL TABLE t1 USING fts5(x, y);
   INSERT INTO t1 VALUES('a', 'b');
   INSERT INTO t1 VALUES('c', 'd');
 }
 
+if {$tcl_platform(byteOrder)=="littleEndian"} {
+  set res {X'02000000'}
+} else {
+  set res {X'00000002'}
+}
 do_execsql_test 15.1 {
   SELECT quote(matchinfo(t1, 'n')) FROM t1 LIMIT 1;
-} {X'02000000'}
-
+} $res
 do_execsql_test 15.2 {
   DELETE FROM t1_content WHERE rowid=1;
   SELECT quote(matchinfo(t1, 'n')) FROM t1 LIMIT 1;
-} {X'02000000'}
+} $res
 
 fts5_aux_test_functions db
 do_execsql_test 15.3 {
   SELECT fts5_test_all(t1) FROM t1 LIMIT 1;
 } {
   {columnsize {0 0} columntext {c d} columntotalsize {2 2} poslist {} tokenize 
{c d} rowcount 2}
 }
 
 finish_test
-

Index: test/fts4aa.test
==================================================================
--- test/fts4aa.test
+++ test/fts4aa.test
@@ -227,17 +227,22 @@
 } {1 {database disk image is malformed}}
 
 # 2019-11-18 https://bugs.chromium.org/p/chromium/issues/detail?id=1025467
 db close
 sqlite3 db :memory:
+if {$tcl_platform(byteOrder)=="littleEndian"} {
+  set res 
{X'0200000000000000000000000E0000000E00000001000000010000000100000001000000'}
+} else {
+  set res 
{X'0000000200000000000000000000000E0000000E00000001000000010000000100000001'}
+}
 do_execsql_test fts4aa-6.10 {
   CREATE VIRTUAL TABLE f USING fts4();
   INSERT INTO f_segdir VALUES (77,91,0,0,'255 
77',x'0001308000004d5c4ddddddd4d4d7b4d4d4d614d8019ff4d05000001204d4d2e4d6e4d4d4d4b4d6c4d004d4d4d4d4d4d3d000000004d5d4d4d645d4d004d4d4d4d4d4d4d4d4d454d6910004d05ffff054d646c4d004d5d4d4d4d4d3d000000004d4d4d4d4d4d4d4d4d4d4d69624d4d4d04004d4d4d4d4d604d4ce1404d554d45');
   INSERT INTO f_segdir VALUES (77,108,0,0,'255 
77',x'0001310000fa64004d4d4d3c5d4d654d4d4d614d8000ff4d05000001204d4d2e4d6e4d4d4dff4d4d4d4d4d4d00104d4d4d4d000000004d4d4d0400311d4d4d4d4d4d4d4d4d4d684d6910004d05ffff054d4d6c4d004d4d4d4d4d4d3d000000004d4d4d4d644d4d4d4d4d4d69624d4d4d03ed4d4d4d4d4d604d4ce1404d550080');
   INSERT INTO f_stat VALUES 
(0,x'80808080100000000064004d4d4d3c4d4d654d4d4d614d8000ff4df6ff1a00204d4d2e4d6e4d4d4d104d4d4d4d4d4d00104d4d4d4d4d4d69574d4d4d000031044d4d4d3e4d4d4c4d05004d6910');
   SELECT quote(matchinfo(f,'pnax')) from f where f match '0 1';
-} {X'0200000000000000000000000E0000000E00000001000000010000000100000001000000'}
+} $res
 
 # 2019-11-18 Detect infinite loop in fts3SelectLeaf()
 db close
 sqlite3 db :memory:
 do_catchsql_test fts4aa-7.10 {

Index: src/insert.c
==================================================================
--- src/insert.c
+++ src/insert.c
@@ -2168,16 +2168,18 @@
             ** Hence, make a complete copy of the opcode, rather than using
             ** a pointer to the opcode. */
             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);
             }
             nConflictCk--;
             addrConflictCk++;


--- End Message ---
--- Begin Message ---
Source: sqlite3
Source-Version: 3.31.1-2

We believe that the bug you reported is fixed in the latest version of
sqlite3, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 950...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Laszlo Boszormenyi (GCS) <g...@debian.org> (supplier of updated sqlite3 package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sun, 09 Feb 2020 06:23:33 +0000
Source: sqlite3
Architecture: source
Version: 3.31.1-2
Distribution: unstable
Urgency: medium
Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
Changed-By: Laszlo Boszormenyi (GCS) <g...@debian.org>
Closes: 950974
Changes:
 sqlite3 (3.31.1-2) unstable; urgency=medium
 .
   * Backport upstream fixes for big-endian architectures (closes: #950974):
     - compatibility with the s390 architecture,
     - adapt FTS test cases to work on big-endian platforms,
     - fix a problem in sqlite3CodecQueryParameters(),
     - fix a 4 byte OOB read in test_multiplex.
Checksums-Sha1:
 d0b8278262cc97e872d371815bc4eea6fdddac97 2404 sqlite3_3.31.1-2.dsc
 56ca7c4735a473616fdee196825aae8efa97b4e8 22032 sqlite3_3.31.1-2.debian.tar.xz
Checksums-Sha256:
 af3a8d578990f1803825ae529fcfc2a9800dbb56c86eb0d48fadba739ae7f833 2404 
sqlite3_3.31.1-2.dsc
 e947dde3d58899b0059f02bf295795a5c69920653eb9f25b4a9b3cbeaea7cdff 22032 
sqlite3_3.31.1-2.debian.tar.xz
Files:
 87f9f6dd056fe749d24527df190ca6db 2404 devel optional sqlite3_3.31.1-2.dsc
 cc3683a8ea5ba4698f0ca7048caaed88 22032 devel optional 
sqlite3_3.31.1-2.debian.tar.xz

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfYh9yLp7u6e4NeO63OMQ54ZMyL8FAl4/rz0ACgkQ3OMQ54ZM
yL8E4w/+MEz6NrNM+liTgckrf16nW5Fal9ZsJbkLoKWyOaTbeLMM336xb9pmRWuL
yNG53vTolqHJfDcRid0larqztKDRwH5GTM6x/U9z5ta84+VBIq1Ae4tXW0AMItjs
H1nTrusrwyKw1S2kCRA6d8lqcoL4x9LNe1BkxZAm7+xXfD4YznCy/jal9c0L09u3
ZuRT/J2pMjPTSM9sllYE8H9l7sc41sH07GAs35r1HMP0Rzqm+vq+a0aXYMsYWn+9
EPnc0KrmheIyzVKRDG71MqPrXtrrvYIE2ioRDOdfNKY4mlDpIeggee9e5APOoKzr
8VNOHwktDljpUcHeo0/9u6oX8B+R4xgiQRm7mq0F3OsOvhXrbDaX4afVPmV+JiJs
X1Rs55mQ6sWl38GPO39Tvp9J6xO+WFqQU7ZBbke4kmr9e6YIduU7rhASvx7uWuS6
GL3TQzEAITRfOknBEqKU6YBLZxGBl+n4zcPX/zEpWsqu+IFAx8m1YVBQBT9olcsk
CIihT1MZ+22Z8J0nQ6jcomjpNMgOaS+V9DR+c7VBT+1zYdV2wsGOqktS0OUQP2e2
1QwJVwjXbanINKAWCIbq/8EJckgSb+qh693EMNv+VvFylUlIk20eoYWUeIQifjaS
xBM1jon1QSPaKRWevlDioaziGx3vLgVjCD+fwlkQvVRnZXC1s/w=
=W8Ag
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to