Bug#871244: diffoscope: support keybox files with kbxutil
tags 871244 + pending thanks This has been implemented in Git, pending upload: https://salsa.debian.org/reproducible-builds/diffoscope/commit/aa0b2654fecba1c2a15c269478e807394ffb93a6 debian/control | 1 + debian/tests/control | 2 +- diffoscope/comparators/__init__.py | 1 + diffoscope/comparators/kbx.py | 50 + diffoscope/external_tools.py | 1 + tests/comparators/test_kbx.py | 56 + tests/data/kbx_expected_diff | 31 tests/data/test1.kbx | Bin 0 -> 84420 bytes tests/data/test2.kbx | Bin 0 -> 84420 bytes 9 files changed, 141 insertions(+), 1 deletion(-) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#871244: diffoscope: support keybox files with kbxutil
forwarded 871244 https://salsa.debian.org/reproducible-builds/diffoscope/issues/23 thanks I've forwarded this upstream here: https://salsa.debian.org/reproducible-builds/diffoscope/issues/23 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#871244: diffoscope: support keybox files with kbxutil
On Mon 2017-08-07 13:33:00 +0200, Mattia Rizzolo wrote: > As you know we/I regularly backport diffoscope to Debian stable, so we > care about having those tools available there as well. > So, do you plan on making gnupg-utils available in stretch-backports > (with all the ongoing maintenance that such choice entails) or do you > think that having an alternate build-dependency+recommends is a way to > go here (possibly with a version restriction, e.g. > gnupg-utils | gnupg (<< 2.1.21-4~) > )? this looks dependency looks fine to me. I'd rather not commit to backporting gnupg to stretch-bpo just yet. > I'd like to avoid having a delta between buster and stretch-bpo, at > least not this early in the development cycle.. yep, that makes sense. > Also, do you plan on sending a patch for diffoscope? :D it's on my stack, but it won't be in the next week or two. if someone beats me to it i won't be upset :) --dkg
Bug#871244: diffoscope: support keybox files with kbxutil
Hi dkg! On Mon, Aug 07, 2017 at 02:03:13AM -0400, Daniel Kahn Gillmor wrote: > The gnupg-utils package (currently only in experimental, but hopefully > soon to be moved to unstable) ships kbxutil, which should provide > sufficient textual diffs to get a better hint at the changes. > > in debian stable, kbxutil used to be shipped in the gnupg package > itself, but depending on gnupg itself will pull in the whole suite > (including per-user daemons like gpg-agent and dirmngr, which aren't > necessary for the public data manipulation needed by diffoscope), so > gnupg-utils is probably a better way to go. As you know we/I regularly backport diffoscope to Debian stable, so we care about having those tools available there as well. So, do you plan on making gnupg-utils available in stretch-backports (with all the ongoing maintenance that such choice entails) or do you think that having an alternate build-dependency+recommends is a way to go here (possibly with a version restriction, e.g. gnupg-utils | gnupg (<< 2.1.21-4~) )? I'd like to avoid having a delta between buster and stretch-bpo, at least not this early in the development cycle.. Also, do you plan on sending a patch for diffoscope? :D -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. more about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `- signature.asc Description: PGP signature
Bug#871244: diffoscope: support keybox files with kbxutil
Package: diffoscope Version: 84 Severity: wishlist keybox files are a file format specific to the GnuPG project. The gnupg-utils package (currently only in experimental, but hopefully soon to be moved to unstable) ships kbxutil, which should provide sufficient textual diffs to get a better hint at the changes. in debian stable, kbxutil used to be shipped in the gnupg package itself, but depending on gnupg itself will pull in the whole suite (including per-user daemons like gpg-agent and dirmngr, which aren't necessary for the public data manipulation needed by diffoscope), so gnupg-utils is probably a better way to go. --dkg -- System Information: Debian Release: buster/sid APT prefers testing-debug APT policy: (500, 'testing-debug'), (500, 'testing'), (500, 'oldstable'), (200, 'unstable-debug'), (200, 'unstable'), (1, 'experimental-debug'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.11.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages diffoscope depends on: ii python33.5.3-3 ii python3-libarchive-c 2.1-3.1 ii python3-magic 1:5.30-1 ii python3-pkg-resources 36.0.1-1 Versions of packages diffoscope recommends: ii acl 2.2.52-3+b1 pn apktool pn binutils-multiarch ii bzip21.0.6-8.1 ii caca-utils 0.99.beta19-2+b2 pn colord ii default-jdk [java-sdk] 2:1.8-59 ii default-jdk-headless 2:1.8-59 pn device-tree-compiler pn docx2txt pn enjarify ii fontforge-extras 0.3-4 pn fp-utils ii genisoimage 9:1.1.11-3+b2 ii gettext 0.19.8.1-2+b1 ii ghc 8.0.1-17+b1 ii ghostscript 9.21~dfsg-1 pn giflib-tools ii gnupg2.1.21-4 ii imagemagick 8:6.9.7.4+dfsg-15 ii imagemagick-6.q16 [imagemagick] 8:6.9.7.4+dfsg-15 pn jsbeautifier pn libarchive-tools pn llvm ii mono-utils 4.6.2.7+dfsg-1 ii odt2txt 0.5-1+b2 ii oggvideotools0.9.1-4 ii openjdk-8-jdk [java-sdk] 8u141-b15-3 ii openssh-client 1:7.5p1-5 ii pdftk2.02-4+b2 ii pgpdump 0.32-0.1 ii poppler-utils0.48.0-2 pn python3-argcomplete ii python3-debian 0.1.30 pn python3-guestfs ii python3-progressbar 2.3-4 ii python3-rpm 4.12.0.2+dfsg1-2+b1 ii python3-tlsh 3.4.4+20151206-1+b3 ii r-base-core 3.3.3-1 ii rpm2cpio 4.12.0.2+dfsg1-2+b1 ii sng 1.1.0-1+b1 ii sqlite3 3.19.3-3 pn squashfs-tools ii tcpdump 4.9.0-3 ii unzip6.0-21 ii vim-common 2:8.0.0197-5 ii xxd 2:8.0.0197-5+b1 ii xz-utils 5.2.2-1.3 Versions of packages diffoscope suggests: ii libjs-jquery 3.1.1-2 -- no debconf information
