From 927038715f9afa74aa2bd85453301ef57b3278b6df0e40135679aef6ef9ac396 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sun, 29 Aug 2021 09:46:22 +0000 Subject: [PATCH 1/2] - update to version 182: - Also ignore, for example, spurious "fwGCC: (Debian ... )" lines in output from strings(1). - Only use "java -jar /path/to/apksigner.jar" if we have a .jar as newer versions of apksigner use a shell wrapper script which will obviously be rejected by the JVM. Also mention in the diff if apksigner is missing. - Pass "-f" to apktool to avoid creating a strangely-named subdirectory and to simplify code. - If we specify a suffix for temporary file or directory, ensure it starts with a "_" to make the generated filenames more human-readable. - Drop an unused File import. - Update the minimum version of the Black source code formatter. - Support parsing the return value of squashfs versions which discriminate between fatal and non-fatal errors. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/diffoscope?expand=0&rev=30 --- diffoscope-181.tar.bz2 | 3 --- diffoscope-181.tar.bz2.asc | 16 ---------------- diffoscope-182.tar.bz2 | 3 +++ diffoscope-182.tar.bz2.asc | 16 ++++++++++++++++ diffoscope.changes | 18 ++++++++++++++++++ diffoscope.spec | 2 +- 6 files changed, 38 insertions(+), 20 deletions(-) delete mode 100644 diffoscope-181.tar.bz2 delete mode 100644 diffoscope-181.tar.bz2.asc create mode 100644 diffoscope-182.tar.bz2 create mode 100644 diffoscope-182.tar.bz2.asc diff --git a/diffoscope-181.tar.bz2 b/diffoscope-181.tar.bz2 deleted file mode 100644 index e075de1..0000000 --- a/diffoscope-181.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c289b7febd2847b2bccddcf51b12c8990e1685ce16a733c6c23a976f7f66c70e -size 1282073 diff --git a/diffoscope-181.tar.bz2.asc b/diffoscope-181.tar.bz2.asc deleted file mode 100644 index c16c8c3..0000000 --- a/diffoscope-181.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmEfb/0ACgkQHpU+J9Qx -Hlg+SBAAg/Ju6/F1lOV77iQ0fHf0ZSg0cNZwtKQbl2R4g+1Hzw7GuU1tsCIs3vQr -GoEYaXEsmL3vkOjlTTe7fwjguT2xvbiu7BmpVo1qLwplzBouXNXkI6c4sK0RElCp -yaJNbXXTN7RLG2enRGLj3cf2sYYbcGY1Zx9CZ84AaRqUdTPqflyHthKW384iUF4U -C81PIvla0vd5RyUPmJjrrJ2Pzw5fOYYxzpRNBGvxoUAxSBsZyEcs8r3GXZ6znS/o -TDtCte417jHPYO7jtk6gyBrDKCU/cQ8hRzRefG/0vckLy9Jyf4YXumwQbWMasEvr -Q9jt2v5lpACFylJpvS/0plt4j9K2AsdILCrSGO2BANNhU+eGevij3+5K2ygKjzvB -P4k2pxEH5Vchgnr/pbm1yaGgYB0cMf0IP43uoUvrP9ZrIIlxaQd6EMrlElRJ+XKE -ibLtw99l+FZBvNtAaU0xdRIprRKqIMJ/znqWDTSzFD2Qw8nJTyXg/qXpzYthgPwn -9fgLjNlgPHxarGz7WirmzFv4QdhZojTe8KP331lcY4hegH0U/R8Rm1zMgd1Lgj95 -KwzW6y7GFzRF1aj9qU4ZY0kPBADMQMYJPQTwXY0hfvu9vAS1gs9DjIizketGSe5f -hDviM8gXqeWNfoGap1rX+ocLTYSfqqiOLkt9h9nJw1apJDa9xeg= -=0ZE7 ------END PGP SIGNATURE----- diff --git a/diffoscope-182.tar.bz2 b/diffoscope-182.tar.bz2 new file mode 100644 index 0000000..4270393 --- /dev/null +++ b/diffoscope-182.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ad5b254c7b09be23f483744f7ecf52582cb54e143b20a6cd812fd5a064b9550 +size 1280911 diff --git a/diffoscope-182.tar.bz2.asc b/diffoscope-182.tar.bz2.asc new file mode 100644 index 0000000..9193e01 --- /dev/null +++ b/diffoscope-182.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmEonlYACgkQHpU+J9Qx +HljK8xAAs+yil4GTTeaouHb0jfYamRkGuJLJgL6SRFF9uN0M0xFY2kzU22VTqODB +cLLpcjhrP5Fx4KhLNrPm4VB9qtqu7+sxN6ydVApQ+iJv66HXPcEvd5MM9XXoQtr8 +KOiQ+FKGGQDqArPx+fMdrCfTfPuQiwZlks2ThIM1LtYd8tJ4WREwk+q0AQiMM5gp +hYdA9A1DQeDImLWNxayrMZW0HLGVwDewrz5YsUkRsOKcvjtPzkOX0CKn2BOkP8zl +yK7NgO8ZJMpcDd0H45l5UMPJlhGRaapvXYzV/fc9vnAQl3p0ITEIKqJ5+GHbGOMI +h3XcMlg8MuKz8Jc5V8GK7N0fjswIZLGhtYIkrvpSlblHTqF1p5NWsnBZ+qUbrNjV +8qUblhvgVUb60rZBxnmdI8EwvzZj1cG4RC+dBf9rdYcDbeN/0DmOw5SPrp6ie1SV +p3t9856jyIWmJOn9CFpy2fwoTWLpdiHBuKh4TNymKv5e5EdVcAoH13yzXUsmyKq8 +U/Vl8S9wQ/Q4naA9oqQLtuPg9nXJTP7MNRPhCfNVWOkeHgyTl4cH9X1ONkyw8h0Q +BuqubrMqipk1sns6OH06sla36RG7jKbPp2e2rDwaG6QBRnn7DYEFlDZCgYuu5e2q +4Y41a9ckYEnIBw/iPmCo1LhU+pOUMX0PZkvUMZuFfwHZXnYDq5E= +=TJA7 +-----END PGP SIGNATURE----- diff --git a/diffoscope.changes b/diffoscope.changes index 1cb4c9b..7130269 100644 --- a/diffoscope.changes +++ b/diffoscope.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sun Aug 29 09:41:54 UTC 2021 - Sebastian Wagner + +- update to version 182: + - Also ignore, for example, spurious "fwGCC: (Debian ... )" lines in output + from strings(1). + - Only use "java -jar /path/to/apksigner.jar" if we have a .jar as newer + versions of apksigner use a shell wrapper script which will obviously be + rejected by the JVM. Also mention in the diff if apksigner is missing. + - Pass "-f" to apktool to avoid creating a strangely-named subdirectory and + to simplify code. + - If we specify a suffix for temporary file or directory, ensure it starts + with a "_" to make the generated filenames more human-readable. + - Drop an unused File import. + - Update the minimum version of the Black source code formatter. + - Support parsing the return value of squashfs versions which discriminate + between fatal and non-fatal errors. + ------------------------------------------------------------------- Fri Aug 20 19:49:53 UTC 2021 - Sebastian Wagner diff --git a/diffoscope.spec b/diffoscope.spec index 352768f..b9effef 100644 --- a/diffoscope.spec +++ b/diffoscope.spec @@ -17,7 +17,7 @@ Name: diffoscope -Version: 181 +Version: 182 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later From 9209d7533bac16fa1b5bc2951b04ef0df13811a9f580aa60a38ef879430f07be Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sat, 4 Sep 2021 17:53:37 +0000 Subject: [PATCH 2/2] - update to version 183: - Add support for extracting Android signing blocks. (Closes: reproducible-builds/diffoscope#246) - Format debug messages for elf sections using our diffoscope.utils.format_class utility. - Clarify a comment about the HUGE_TOOLS dict in diffoscope.external_tools. - Clarify output around APK Signing Blocks and remove an accidental duplicate "0x" prefix. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/diffoscope?expand=0&rev=31 --- diffoscope-182.tar.bz2 | 3 --- diffoscope-182.tar.bz2.asc | 16 ---------------- diffoscope-183.tar.bz2 | 3 +++ diffoscope-183.tar.bz2.asc | 16 ++++++++++++++++ diffoscope.changes | 12 ++++++++++++ diffoscope.spec | 2 +- 6 files changed, 32 insertions(+), 20 deletions(-) delete mode 100644 diffoscope-182.tar.bz2 delete mode 100644 diffoscope-182.tar.bz2.asc create mode 100644 diffoscope-183.tar.bz2 create mode 100644 diffoscope-183.tar.bz2.asc diff --git a/diffoscope-182.tar.bz2 b/diffoscope-182.tar.bz2 deleted file mode 100644 index 4270393..0000000 --- a/diffoscope-182.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ad5b254c7b09be23f483744f7ecf52582cb54e143b20a6cd812fd5a064b9550 -size 1280911 diff --git a/diffoscope-182.tar.bz2.asc b/diffoscope-182.tar.bz2.asc deleted file mode 100644 index 9193e01..0000000 --- a/diffoscope-182.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmEonlYACgkQHpU+J9Qx -HljK8xAAs+yil4GTTeaouHb0jfYamRkGuJLJgL6SRFF9uN0M0xFY2kzU22VTqODB -cLLpcjhrP5Fx4KhLNrPm4VB9qtqu7+sxN6ydVApQ+iJv66HXPcEvd5MM9XXoQtr8 -KOiQ+FKGGQDqArPx+fMdrCfTfPuQiwZlks2ThIM1LtYd8tJ4WREwk+q0AQiMM5gp -hYdA9A1DQeDImLWNxayrMZW0HLGVwDewrz5YsUkRsOKcvjtPzkOX0CKn2BOkP8zl -yK7NgO8ZJMpcDd0H45l5UMPJlhGRaapvXYzV/fc9vnAQl3p0ITEIKqJ5+GHbGOMI -h3XcMlg8MuKz8Jc5V8GK7N0fjswIZLGhtYIkrvpSlblHTqF1p5NWsnBZ+qUbrNjV -8qUblhvgVUb60rZBxnmdI8EwvzZj1cG4RC+dBf9rdYcDbeN/0DmOw5SPrp6ie1SV -p3t9856jyIWmJOn9CFpy2fwoTWLpdiHBuKh4TNymKv5e5EdVcAoH13yzXUsmyKq8 -U/Vl8S9wQ/Q4naA9oqQLtuPg9nXJTP7MNRPhCfNVWOkeHgyTl4cH9X1ONkyw8h0Q -BuqubrMqipk1sns6OH06sla36RG7jKbPp2e2rDwaG6QBRnn7DYEFlDZCgYuu5e2q -4Y41a9ckYEnIBw/iPmCo1LhU+pOUMX0PZkvUMZuFfwHZXnYDq5E= -=TJA7 ------END PGP SIGNATURE----- diff --git a/diffoscope-183.tar.bz2 b/diffoscope-183.tar.bz2 new file mode 100644 index 0000000..b5405a1 --- /dev/null +++ b/diffoscope-183.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c516b4660a913652f6510842df3daa2d2e49728cb8820d693215690848e1d93 +size 1279643 diff --git a/diffoscope-183.tar.bz2.asc b/diffoscope-183.tar.bz2.asc new file mode 100644 index 0000000..bf2962c --- /dev/null +++ b/diffoscope-183.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmEx9bEACgkQHpU+J9Qx +HlhSBQ/+OLKsx3o8h8f7bskVTucxd+YyQ9Cps/6j2EabmCf6vegbjTxLdnVhHiFs +xIqTa+r9D0SRG3ptTbltvCGxtvyNR/ML7wqS8aWhyDlko2F/prEI6aZwvsK7N5GP +vdZZtFoq3a7GHmB7lFPTYVLzRdvPsQr+7ZOkLR8XcEs07DrETiDJejbU0JkNfary +w3LDM0mthqEReZEKZy0QBWIVYbF4jY9rwHx+5ZgQhYCk1hBIQoa+gC5s7CnqAMQi +XVJwFQjSEAbUCtOmG58XqUjE5v5yjoEwdrfz0yOK/SbKmAFvnYIg3z9DMzCx8Bc3 +w9SlP9VmXGwhhe0sgiQQxF7oLuyT11DUW/cUIM67BwYte21m+YoeIE0uU50D44NU +lw06sWFUPlAPHqJ3CZwBpDQDv9+SSYypYdGRKFT9WK0KilHiRZYzTcbAEyDhbQke +Gmm8l1GGGElBnBU1QxjAmdc1dFvguyNVECkBQzyEAf3PRS45dqFqnEEMWtm6q8U6 +WTA4OKsq/U/qEVm6RGCeUfV2HecHoVWYi6SoaBGkZOJK5xmr3LkLq5o5EL+lsVXx +1zgJHd0xMGhv6sEF0hBNcd9W2bALysdsGVpD/bgxKfb0xS4WyXqJ9rMg1hCCfvSI +pwMinPWshnaSSSuz/irNH9oVWmZMvGjRQv0rh1jqgAs3kTT+p3U= +=/iOD +-----END PGP SIGNATURE----- diff --git a/diffoscope.changes b/diffoscope.changes index 7130269..f6d05d8 100644 --- a/diffoscope.changes +++ b/diffoscope.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Sep 4 17:53:01 UTC 2021 - Sebastian Wagner + +- update to version 183: + - Add support for extracting Android signing blocks. + (Closes: reproducible-builds/diffoscope#246) + - Format debug messages for elf sections using our + diffoscope.utils.format_class utility. + - Clarify a comment about the HUGE_TOOLS dict in diffoscope.external_tools. + - Clarify output around APK Signing Blocks and remove an accidental duplicate + "0x" prefix. + ------------------------------------------------------------------- Sun Aug 29 09:41:54 UTC 2021 - Sebastian Wagner diff --git a/diffoscope.spec b/diffoscope.spec index b9effef..02c5dd5 100644 --- a/diffoscope.spec +++ b/diffoscope.spec @@ -17,7 +17,7 @@ Name: diffoscope -Version: 182 +Version: 183 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later