Bug#926118: Alternative for Re: Bug#926118: unblock: libmspack/0.10.1-1
control: affects -1 + winetricks cabextract libmspack
Hi,
please find attached a targeted fix for #912687 (libmspack0: Regression
when extracting cabinets using -F option fixed upstream, needs to be
patched). In my (winetricks maintainer) opinion that is the most
pressing issue with libmspack/buster.
I'm posting this now because I'm really worried about the lack of
progress with this issue. However as stated before by me in this bug
here, and by the libmspack maintainer in #923885, we both think that
0.10.1-1 is for various reasons better, and better tested and thus risk
free.
About this alternative version here:
+libmspack (0.10.1+really0.8-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Revert back to libmspack/0.8-1.
+ * Add build-dependency on quilt.
+ * Add patch from upstream to fix regression when extracting cabinets
+ using -F option (Closes: #912687).
+
+ -- Jens Reyer <jre.winesim@gmail.com> Sat, 01 Jun 2019 14:32:06 +0200
+
1.) Versioning and targeted suite
This proposal reverts the upstream version back from 0.10 (unstable) to
0.8 (testing), therefore the "new" upstream version 0.10.1+really0.8.
For building I just symlinked the 0.8 orig.tar.
It's based directly on 0.8-1, dropping all debian/ changes (including
the changelog) since then.
So this version should be fine to go via unstable (not sure about the
reverted d/changelog)).
Alternatively we could go via testing-proposed.
2.) Code
I took only the "fix" part from the upstream commit fixing this, but not
the documentation or updated testsuite (which includes changed binaries).
I verified that the issue affecting winetricks is solved.
I assume a fix for #914794 (libmspack fails tests on big endian
architectures (s390x, mips)), reported against 0.9.1-1 is not necessary.
However if that was caused by a change in the toolchain instead of
changes in the package, I'll also add that fix here.
I'm looking forward to get some feedback from the release team,
preferably by:
unblock libmspack/0.10.1-1
Otherwise please tell us if we should go with this version (targeting
unstable or testing-proposed?), or something else (e.g. filing bugs for
every issue fixed in 0.10.1-1)
Before (if at all) doing any upload I'll of course coordinate it with
the libmspack maintainer.
Greets
jre
diff -Nru libmspack-0.8/debian/changelog libmspack-0.10.1+really0.8/debian/changelog
--- libmspack-0.8/debian/changelog 2018-10-24 03:03:13.000000000 +0200
+++ libmspack-0.10.1+really0.8/debian/changelog 2019-06-01 14:32:06.000000000 +0200
@@ -1,3 +1,13 @@
+libmspack (0.10.1+really0.8-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Revert back to libmspack/0.8-1.
+ * Add build-dependency on quilt.
+ * Add patch from upstream to fix regression when extracting cabinets
+ using -F option (Closes: #912687).
+
+ -- Jens Reyer <jre.winesim@gmail.com> Sat, 01 Jun 2019 14:32:06 +0200
+
libmspack (0.8-1) unstable; urgency=medium
* New upstream release:
diff -Nru libmspack-0.8/debian/control libmspack-0.10.1+really0.8/debian/control
--- libmspack-0.8/debian/control 2018-04-12 12:20:00.000000000 +0200
+++ libmspack-0.10.1+really0.8/debian/control 2019-06-01 14:32:06.000000000 +0200
@@ -4,7 +4,7 @@
Maintainer: Marc Dequènes (Duck) <Duck@DuckCorp.org>
Standards-Version: 4.1.4
Build-Depends: dpkg-dev (>= 1.16.1.1), debhelper (>= 11)
-Build-Depends-indep: doxygen, graphviz
+Build-Depends-indep: doxygen, graphviz, quilt
Vcs-Browser: https://salsa.debian.org/debian/libmspack
Vcs-Git: https://salsa.debian.org/debian/libmspack.git
Homepage: https://www.cabextract.org.uk/libmspack/
diff -Nru libmspack-0.8/debian/patches/fix-cabd_extract.patch libmspack-0.10.1+really0.8/debian/patches/fix-cabd_extract.patch
--- libmspack-0.8/debian/patches/fix-cabd_extract.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmspack-0.10.1+really0.8/debian/patches/fix-cabd_extract.patch 2019-06-01 14:32:06.000000000 +0200
@@ -0,0 +1,22 @@
+Description: Fix regression when extracting cabinets using -F option
+Origin: upstream, https://github.com/kyz/libmspack/commit/2d86d4e70026cd03730ce0b00b12579c2e21620a
+Bug: https://github.com/kyz/libmspack/issues/22
+Bug-Debian: https://bugs.debian.org/912687
+
+--- a/mspack/cabd.c
++++ b/mspack/cabd.c
+@@ -1125,11 +1125,9 @@ static int cabd_extract(struct mscab_dec
+ * and pass back MSPACK_ERR_READ
+ */
+ self->d->outfh = NULL;
+- if ((self->d->comp_type & cffoldCOMPTYPE_MASK) != cffoldCOMPTYPE_LZX) {
+- if ((bytes = file->offset - self->d->offset)) {
+- error = self->d->decompress(self->d->state, bytes);
+- self->error = (error == MSPACK_ERR_READ) ? self->read_error : error;
+- }
++ if ((bytes = file->offset - self->d->offset)) {
++ error = self->d->decompress(self->d->state, bytes);
++ self->error = (error == MSPACK_ERR_READ) ? self->read_error : error;
+ }
+
+ /* if getting to the correct offset was error free, unpack file */
diff -Nru libmspack-0.8/debian/patches/series libmspack-0.10.1+really0.8/debian/patches/series
--- libmspack-0.8/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ libmspack-0.10.1+really0.8/debian/patches/series 2019-06-01 14:32:06.000000000 +0200
@@ -0,0 +1 @@
+fix-cabd_extract.patch
Reply to: