Processing of diffoscope_181_amd64.changes

2021-08-20 Thread Debian FTP Masters
diffoscope_181_amd64.changes uploaded successfully to localhost
along with the files:
  diffoscope_181.dsc
  diffoscope_181.tar.xz
  diffoscope_181_amd64.buildinfo

Greetings,

Your Debian queue daemon (running on host usper.debian.org)

___
Reproducible-builds mailing list
Reproducible-builds@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/reproducible-builds


diffoscope_181_amd64.changes ACCEPTED into unstable

2021-08-20 Thread Debian FTP Masters



Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Fri, 20 Aug 2021 10:03:35 +0100
Source: diffoscope
Built-For-Profiles: nocheck
Architecture: source
Version: 181
Distribution: unstable
Urgency: medium
Maintainer: Reproducible builds folks 

Changed-By: Chris Lamb 
Closes: 991059
Changes:
 diffoscope (181) unstable; urgency=medium
 .
   [ Chris Lamb ]
 .
   * New features and bug fixes:
 - Don't require apksigner in order to compare .apk files using apktool.
 - Add a special-case to squshfs image extraction to not fail if we aren't
   root/superuser. (Closes: #991059)
 - Reduce the maximum line length to avoid O(n^2) Wagner-Fischer algorithm,
   which meant that diff generation took an inordinate amount of time.
   (Closes: reproducible-builds/diffoscope#272)
 - Include profiling information in --debug output if --profile is not set.
 - Don't print an orphan newline when the Black source code formatter
   self-test passes.
 .
   * Tests:
 - Update test to check specific contents of squashfs listing, otherwise it
   fails depending on the test systems uid-to-username mapping in passwd(5).
 - Assign "seen" and "expected" values to local variables to improve
   contextual information in/around failed tests.
 .
   * Misc changes:
 - Print the size of generated HTML, text (etc.) reports.
 - Profile calls to specialize and diffoscope.diff.linediff.
 - Update various copyright years.
Checksums-Sha1:
 0e5f4a306050ef58f7b9435a477fbc52e4ac75ef 4938 diffoscope_181.dsc
 d59229648a66bae0a166360d1e588238a7b79f48 1021288 diffoscope_181.tar.xz
 c474e7387490678f88b6538b42f3be351e07bb2d 6816 diffoscope_181_amd64.buildinfo
Checksums-Sha256:
 e6b13d0bf8d27cf62399086f4a62b7ad754cd4c0d71739a776764bb82600ea23 4938 
diffoscope_181.dsc
 f4e3f1006b73b22f79a97704cc6c7dbc3d00925b9a3ceda95c2c3518e4841e96 1021288 
diffoscope_181.tar.xz
 cc69b57590b24fc0b0d0e71c36da3e01481c7a8bc8948d5fd0fd0ce9d533ce8e 6816 
diffoscope_181_amd64.buildinfo
Files:
 9818c1915fa81c37277b33e6146d7080 4938 devel optional diffoscope_181.dsc
 68abbf03316aef43860770c26ea37aaf 1021288 devel optional diffoscope_181.tar.xz
 0c71a23036ebc93ddca1d3469681f13c 6816 devel optional 
diffoscope_181_amd64.buildinfo

-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmEfcBwACgkQHpU+J9Qx
Hlh9sA/+LtgrnfLEY2kqtWdehj5cXF4si/Wfe7/jaHv3C1hEsIwci2y0CYbqyhC1
q4ChTNenj23Wtqvrb+QcOV+Va7yEW3IK8Vo6ski9BXYkDPcsKX+nfe2PC7BFs/Rm
lShdSJ+ZONgE053LOBsm6kBeH+d3jYX+NaZzeGKoB4orV1E69700sQ954OJ0fvYU
ZvGhprveH6GKmSirzzdE4Xw38crC6vY+JeRtMQiEy1ADy3WeUqjTvzioR+nD7oLd
ct82UAY96lzKqo6P81GCN/oRvpZSHHTSgF4tLXtC0kLkkHsDjbKhEyN5f1aJTdwP
V/obPgnF/PE8BOCAxOCIFcVBsEkdEpu5jRZW8cGSP0PNXXYENWzacJejzXrclpFu
i4GHNnXrody3+7iFURx6hI1gSjzinaMd31R/y2RrJ2yKLYz5rEaNKoDXmaUV4lbE
HrNXHCAcfz3+OQ9dgBh7fLJ2h+Nzl8t1zDKRPmta2d53rKdN8IqeATA/3v9W7V7X
9gEUwLgYS2totKwxS7aMSQSToQ2ZmOaSnbkME93mE/OyH5BZRjV6aq4faKsgLxOe
20f5CzUIw65sOzjAEAzrovU4a7d8G5TjxFBDe+Hhpi4mAMHfb8w9eEKX5O5gqUzL
BT8KpDAfoLPZYY5yAqubYTqvqbYptTwJ226C2AAd0IaVDGT9fsE=
=9G/H
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

___
Reproducible-builds mailing list
Reproducible-builds@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/reproducible-builds


Bug#991059: marked as done (diffoscope: subprocess.CalledProcessError: Command unsquashfs... returned non-zero exit status 1)

2021-08-20 Thread Debian Bug Tracking System
Your message dated Fri, 20 Aug 2021 09:18:38 +
with message-id 
and subject line Bug#991059: fixed in diffoscope 181
has caused the Debian Bug report #991059,
regarding diffoscope: subprocess.CalledProcessError: Command unsquashfs... 
returned non-zero exit status 1
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.)


-- 
991059: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=991059
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: diffoscope
Version: 177
Severity: normal
x-debbugs-cc: Roland Clobus 

Dear Maintainer,

https://jenkins.debian.net/job/reproducible_debian_live_build_cinnamon_bullseye/lastFailedBuild/consoleFull
shows a failure to run diffoscope on a cinnamon libe-build hybris.iso:

+ timeout 30m nice schroot --directory 
/srv/reproducible-results/live-build-cinnamon-Xj14Z0Pu -c 
source:jenkins-reproducible-unstable-diffoscope diffoscope -- --html 
/srv/reproducible-results/live-build-cinnamon-Xj14Z0Pu/live-build/cinnamon/live-image-amd64.hybrid.iso.html
 
/srv/reproducible-results/live-build-cinnamon-Xj14Z0Pu/b1/live-build/cinnamon/live-image-amd64.hybrid.iso
 
/srv/reproducible-results/live-build-cinnamon-Xj14Z0Pu/b2/live-build/cinnamon/live-image-amd64.hybrid.iso
+ RESULT=2
++ grep '^E: 15binfmt: update-binfmts: unable to open' 
/srv/reproducible-results/live-build-cinnamon-Xj14Z0Pu/tmp.VaTe8khm5d
++ true
+ LOG_RESULT=
+ '[' '!' -z '' ']'
+ true
+ set -e
+ cat /srv/reproducible-results/live-build-cinnamon-Xj14Z0Pu/tmp.VaTe8khm5d
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/diffoscope/comparators/utils/file.py", 
line 494, in compare
difference = self._compare_using_details(other, source)
  File "/usr/lib/python3/dist-packages/diffoscope/comparators/utils/file.py", 
line 429, in _compare_using_details
details.extend(
  File 
"/usr/lib/python3/dist-packages/diffoscope/comparators/utils/container.py", 
line 130, in comparisons
my_members = OrderedDict(self.get_adjusted_members_sizes())
  File 
"/usr/lib/python3/dist-packages/diffoscope/comparators/utils/container.py", 
line 122, in get_adjusted_members_sizes
for name, member in self.get_adjusted_members():
  File 
"/usr/lib/python3/dist-packages/diffoscope/comparators/utils/container.py", 
line 78, in get_filtered_members
for name in filter_excludes(self.get_member_names()):
  File "/usr/lib/python3/dist-packages/diffoscope/comparators/squashfs.py", 
line 250, in get_member_names
self.ensure_unpacked()
  File "/usr/lib/python3/dist-packages/diffoscope/comparators/squashfs.py", 
line 263, in ensure_unpacked
output = our_check_output(
  File 
"/usr/lib/python3/dist-packages/diffoscope/comparators/utils/command.py", line 
117, in our_check_output
return subprocess.check_output(cmd, *args, **kwargs)
  File "/usr/lib/python3.9/subprocess.py", line 424, in check_output
return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
  File "/usr/lib/python3.9/subprocess.py", line 528, in run
raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '('unsquashfs', '-n', '-f', '-no', 
'-li', '-d', '.', 
'/tmp/diffoscope_tj0g1di9_cinnamon/tmp_ss17mt0LibarchiveContainerWithFilelist/0/891.squashfs')'
 returned non-zero exit status 1.

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/diffoscope/main.py", line 746, in main
sys.exit(run_diffoscope(parsed_args))
  File "/usr/lib/python3/dist-packages/diffoscope/main.py", line 700, in 
run_diffoscope
difference = compare_root_paths(path1, path2)
  File 
"/usr/lib/python3/dist-packages/diffoscope/comparators/utils/compare.py", line 
69, in compare_root_paths
difference = compare_files(file1, file2)
  File 
"/usr/lib/python3/dist-packages/diffoscope/comparators/utils/compare.py", line 
125, in compare_files
return file1.compare(file2, source)
  File "/usr/lib/python3/dist-packages/diffoscope/comparators/utils/file.py", 
line 494, in compare
difference = self._compare_using_details(other, source)
  File "/usr/lib/python3/dist-packages/diffoscope/comparators/utils/file.py", 
line 430, in _compare_using_details
self.as_container.compare(
  File 
"/usr/lib/python3/dist-packages/diffoscope/comparators/utils/libarchive.py", 
line 366, in compare
differences.extend(super().compare(other, **kwargs))
  File 
"/usr/lib/python3/dist-packages/diffoscope/comparators/utils/container.py", 
line 191, in compare_pair
difference = compare_files(
  File 
"/usr/lib/python3/dist-packag

Re: archive wide rebuild with "-DCMAKE_SKIP_RPATH=ON"?

2021-08-20 Thread Chris Lamb
Hi Lucas et al.,

> yes, to do a comparative rebuild, I just need such a script that adjusts
> the build environment to whatever is needed. See other examples in
> https://salsa.debian.org/lucas/collab-qa-tools/-/tree/master/modes

For reference, the relevant part of debhelper's cmake.pm is:

push(@flags, "-DCMAKE_SKIP_RPATH=ON", '-DCMAKE_BUILD_RPATH_USE_ORIGIN=ON') 
if not compat(13);

Two quick questions arising from this:

1. Am I right in thinking we take out the "if not compat(13)"
   conditional as part of this experiment?

2. Would the best way of introducing this be a custom rebuild of the
   src:debhelper package, similar to the way, for example, boost was
   tested earlier this year [0]?  (I suspect this is the case if
   customisation script is run before installation of packages,
   otherwise we could simply sed the relevant file, similar to how we
   tested fixfilepath [1] where we could rely on dpkg being installed.)


 [0] https://salsa.debian.org/lucas/collab-qa-tools/-/blob/master/modes/boost
 [1] 
https://salsa.debian.org/lucas/collab-qa-tools/-/blob/master/modes/dpkg-reproducible-fixfilepath


> I have a few rebuilds to run and process, and little time for Debian
> currently, but I'll find the time eventually.

Thanks :)


Best wishes,

--
  o
⬋   ⬊  Chris Lamb
   o o reproducible-builds.org 💠
⬊   ⬋
  o

___
Reproducible-builds mailing list
Reproducible-builds@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/reproducible-builds