From 929f60bdcc287c683101392419160c73c9d2797b Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 24 Apr 2024 16:41:57 +0800 Subject: diffoscope: upgrade 260 -> 265 Changelog: ========== * Ensure that tests with ">=" version constraints actually print the corresponding tool name. * Prevent odt2txt tests from always being skipped due to an impossibly new version requirement. * Avoid nested parens-in-parens when printing "skipping" messages in the testsuite. * Don't crash on invalid zipfiles, even if we encounter 'badness' halfway through the file. * Fix a crash when there are (invalid) duplicate entries in .zip files. * Add note when there are duplicate entries in ZIP files. * Add an external tool reference for GNU Guix for zipdetails. * Add support for the zipdetails(1) tool included in the Perl distribution. * Don't use parenthesis within test "skipping" messages; PyTest adds its own parenthesis, so we were ending up with double nested parens. * Fix the .epub tests after supporting zipdetails(1). * Update copyright years and debian/tests/control. * Fix MozillaZipContainer's monkeypatch after Python's zipfile module changed to detect potentially insecure overlapping entries within .zip files. * Factor out Python version checking in test_zip.py. * Also skip some zip tests under 3.10.14 as well; a potential regression may have been backported to the 3.10.x series. The underlying cause is still to be investigated. * Don't crash if we encounter an .rdb file without an equivalent .rdx file. * In addition, don't identify Redis database dumps (etc.) as GNU R database files based simply on their filename. (From OE-Core rev: f22945ba9b4835e52809bedc4e3be73a91aafe07) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/diffoscope/diffoscope_260.bb | 43 ----------------------- meta/recipes-support/diffoscope/diffoscope_265.bb | 43 +++++++++++++++++++++++ 2 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 meta/recipes-support/diffoscope/diffoscope_260.bb create mode 100644 meta/recipes-support/diffoscope/diffoscope_265.bb diff --git a/meta/recipes-support/diffoscope/diffoscope_260.bb b/meta/recipes-support/diffoscope/diffoscope_260.bb deleted file mode 100644 index 297a53fb53..0000000000 --- a/meta/recipes-support/diffoscope/diffoscope_260.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "in-depth comparison of files, archives, and directories" -DESCRIPTION = "Tries to get to the bottom of what makes files or directories \ -different. It will recursively unpack archives of many kinds and transform \ -various binary formats into more human-readable form to compare them. \ -It can compare two tarballs, ISO images, or PDF just as easily." -HOMEPAGE = "https://diffoscope.org/" -BUGTRACKER = "https://salsa.debian.org/reproducible-builds/diffoscope/-/issues" -LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -PYPI_PACKAGE = "diffoscope" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "405a55502c8b2c988e46c0800d6a93e8e4e7632c1542b0a540dda50aeea41dac" - -RDEPENDS:${PN} += "\ - binutils \ - python3-curses \ - python3-difflib \ - python3-fcntl \ - python3-json \ - python3-libarchive-c \ - python3-magic \ - python3-multiprocessing \ - python3-pprint \ - python3-rpm \ - squashfs-tools \ - vim \ - " - -# Dependencies don't build for musl -COMPATIBLE_HOST:libc-musl = 'null' - -do_install:append:class-native() { - create_wrapper ${D}${bindir}/diffoscope \ - MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ - RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ - LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ - RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/diffoscope/diffoscope_265.bb b/meta/recipes-support/diffoscope/diffoscope_265.bb new file mode 100644 index 0000000000..6af5abc974 --- /dev/null +++ b/meta/recipes-support/diffoscope/diffoscope_265.bb @@ -0,0 +1,43 @@ +SUMMARY = "in-depth comparison of files, archives, and directories" +DESCRIPTION = "Tries to get to the bottom of what makes files or directories \ +different. It will recursively unpack archives of many kinds and transform \ +various binary formats into more human-readable form to compare them. \ +It can compare two tarballs, ISO images, or PDF just as easily." +HOMEPAGE = "https://diffoscope.org/" +BUGTRACKER = "https://salsa.debian.org/reproducible-builds/diffoscope/-/issues" +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PYPI_PACKAGE = "diffoscope" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "7bdcbd7fc5bc4c821bf6ab5ffbbeb265103b04e6908ea4bb12144d7e5ca002ff" + +RDEPENDS:${PN} += "\ + binutils \ + python3-curses \ + python3-difflib \ + python3-fcntl \ + python3-json \ + python3-libarchive-c \ + python3-magic \ + python3-multiprocessing \ + python3-pprint \ + python3-rpm \ + squashfs-tools \ + vim \ + " + +# Dependencies don't build for musl +COMPATIBLE_HOST:libc-musl = 'null' + +do_install:append:class-native() { + create_wrapper ${D}${bindir}/diffoscope \ + MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ + RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ + LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ + RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} +} + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf