Updated debdiff, due to some functions not yet implemented in ~beta3
G.
On Fri, 18 Dec 2020 09:34:11 +0000 Debian FTP Masters
<[email protected]> wrote:
> Source: luajit
> Source-Version: 2.1.0~beta3+dfsg-5.2
> Done: Gianfranco Costamagna <[email protected]>
>
> We believe that the bug you reported is fixed in the latest version of
> luajit, 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 [email protected],
> and the maintainer will reopen the bug report if appropriate.
>
> Debian distribution maintenance software
> pp.
> Gianfranco Costamagna <[email protected]> (supplier of updated luajit
> 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 [email protected])
>
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Format: 1.8
> Date: Fri, 18 Dec 2020 09:49:24 +0100
> Source: luajit
> Architecture: source
> Version: 2.1.0~beta3+dfsg-5.2
> Distribution: unstable
> Urgency: medium
> Maintainer: Enrico Tassi <[email protected]>
> Changed-By: Gianfranco Costamagna <[email protected]>
> Closes: 908137
> Changes:
> luajit (2.1.0~beta3+dfsg-5.2) unstable; urgency=medium
> .
> * Non-maintainer upload.
> * debian/patches/e9af1abec542e6f9851ff2368e7f196b6382a44c.patch:
> - cherry-pick upstream fix for arm64 issue (Closes: #908137)
> Checksums-Sha1:
> f273567da4f688cab824bcbe330e06f9511bc6a2 2462 luajit_2.1.0~beta3+dfsg-5.2.dsc
> 0992cf70e44d410ea225114d723f8157c41b4aaf 44368
> luajit_2.1.0~beta3+dfsg-5.2.debian.tar.xz
> 55cea3a6968faaf69c8aefe4e765316252457c27 6804
> luajit_2.1.0~beta3+dfsg-5.2_source.buildinfo
> Checksums-Sha256:
> 3e5b3247ffaceac95fde341d78a8bee1db9d8cbcdfc2ee1e32a34aaba73fab3c 2462
> luajit_2.1.0~beta3+dfsg-5.2.dsc
> 6748da498a7fa1086d15ec504325c02aa643e544728bbf25a6ab3d920a4614e2 44368
> luajit_2.1.0~beta3+dfsg-5.2.debian.tar.xz
> a26c6ee289da26d2e4f86c4a824232bb6db68ddea584db10136e8588779f99cd 6804
> luajit_2.1.0~beta3+dfsg-5.2_source.buildinfo
> Files:
> 020ea6f74f30f76d1aff58610f8ca688 2462 interpreters optional
> luajit_2.1.0~beta3+dfsg-5.2.dsc
> 6c06645493855d4630004f66a58e06ee 44368 interpreters optional
> luajit_2.1.0~beta3+dfsg-5.2.debian.tar.xz
> ce755da44d501a57f0897df786b1cbe0 6804 interpreters optional
> luajit_2.1.0~beta3+dfsg-5.2_source.buildinfo
>
> -----BEGIN PGP SIGNATURE-----
>
> iQIzBAEBCAAdFiEEkpeKbhleSSGCX3/w808JdE6fXdkFAl/cc4wACgkQ808JdE6f
> XdlFmhAAqmymT8z4kMwue0V2rdJoZobOz5UWxbTXPZ5TztJMRwjazC/MfYFS85Ow
> b8Liza6Q4/YrYTh9+Ql0VeAnf1nRTcwLRnkzsxnyrZ2s455rgQ3mZ+hZScmDjx5J
diff -Nru luajit-2.1.0~beta3+dfsg/debian/changelog
luajit-2.1.0~beta3+dfsg/debian/changelog
--- luajit-2.1.0~beta3+dfsg/debian/changelog 2020-12-18 09:49:24.000000000
+0100
+++ luajit-2.1.0~beta3+dfsg/debian/changelog 2020-12-18 12:54:55.000000000
+0100
@@ -1,3 +1,11 @@
+luajit (2.1.0~beta3+dfsg-5.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Tweak previous patch to use lua_assert instead of lj_assert{G,J},
+ not yet implemented in 2.1.0~beta3 baseline
+
+ -- Gianfranco Costamagna <[email protected]> Fri, 18 Dec 2020
12:54:55 +0100
+
luajit (2.1.0~beta3+dfsg-5.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru
luajit-2.1.0~beta3+dfsg/debian/patches/e9af1abec542e6f9851ff2368e7f196b6382a44c.patch
luajit-2.1.0~beta3+dfsg/debian/patches/e9af1abec542e6f9851ff2368e7f196b6382a44c.patch
---
luajit-2.1.0~beta3+dfsg/debian/patches/e9af1abec542e6f9851ff2368e7f196b6382a44c.patch
2020-12-18 09:49:24.000000000 +0100
+++
luajit-2.1.0~beta3+dfsg/debian/patches/e9af1abec542e6f9851ff2368e7f196b6382a44c.patch
2020-12-18 12:54:55.000000000 +0100
@@ -458,8 +458,8 @@
+ uint64_t u = o->u64;
+ uint64_t seg = lightudseg(u);
+ uint32_t *segmap = mref(g->gc.lightudseg, uint32_t);
-+ lj_assertG(tvislightud(o), "lightuserdata expected");
-+ lj_assertG(seg <= g->gc.lightudnum, "bad lightuserdata segment %d", seg);
++ lua_assert(tvislightud(o));
++ lua_assert(seg <= g->gc.lightudnum);
+ return (void *)(((uint64_t)segmap[seg] << 32) | lightudlo(u));
+}
#else
@@ -516,7 +516,7 @@
===================================================================
--- luajit.orig/src/lj_snap.c
+++ luajit/src/lj_snap.c
-@@ -626,7 +626,14 @@
+@@ -626,7 +626,12 @@
IRType1 t = ir->t;
RegSP rs = ir->prev;
if (irref_isk(ref)) { /* Restore constant slot. */
@@ -524,9 +524,7 @@
+ if (ir->o == IR_KPTR) {
+ o->u64 = (uint64_t)(uintptr_t)ir_kptr(ir);
+ } else {
-+ lj_assertJ(!(ir->o == IR_KKPTR || ir->o == IR_KNULL),
-+ "restore of const from IR %04d with bad op %d",
-+ ref - REF_BIAS, ir->o);
++ lua_assert(!(ir->o == IR_KKPTR || ir->o == IR_KNULL));
+ lj_ir_kvalue(J->L, o, ir);
+ }
return;
