[meta-oe,2/2] libplist: Upgrade to 2.7.0

Fix failing ptests

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ...pes.test-Fix-ostep-invalid-types-tes.patch | 49 +++++++++++++++++++
 .../{libplist_2.6.0.bb => libplist_2.7.0.bb}  |  8 +--
 2 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-extended/libimobiledevice/libplist/0001-ostep-invalid-types.test-Fix-ostep-invalid-types-tes.patch
 rename meta-oe/recipes-extended/libimobiledevice/{libplist_2.6.0.bb => libplist_2.7.0.bb} (89%)

On Thu, Nov 27, 2025 at 3:35 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> Fix failing ptests
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Cc: Ankur Tyagi <ankur.tyagi85@gmail.com>
> ---
>  ...pes.test-Fix-ostep-invalid-types-tes.patch | 49 +++++++++++++++++++
>  .../{libplist_2.6.0.bb => libplist_2.7.0.bb}  |  8 +--
>  2 files changed, 54 insertions(+), 3 deletions(-)
>  create mode 100644 meta-oe/recipes-extended/libimobiledevice/libplist/0001-ostep-invalid-types.test-Fix-ostep-invalid-types-tes.patch
>  rename meta-oe/recipes-extended/libimobiledevice/{libplist_2.6.0.bb => libplist_2.7.0.bb} (89%)
>
> diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist/0001-ostep-invalid-types.test-Fix-ostep-invalid-types-tes.patch b/meta-oe/recipes-extended/libimobiledevice/libplist/0001-ostep-invalid-types.test-Fix-ostep-invalid-types-tes.patch
> new file mode 100644
> index 0000000000..798ed47487
> --- /dev/null
> +++ b/meta-oe/recipes-extended/libimobiledevice/libplist/0001-ostep-invalid-types.test-Fix-ostep-invalid-types-tes.patch
> @@ -0,0 +1,49 @@
> +From d87f49535f5e815e91e309472c47da2375cbb5f4 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Wed, 26 Nov 2025 18:18:04 -0800
> +Subject: [PATCH] ostep-invalid-types.test: Fix ostep-invalid-types test to
> + accept both success and error codes
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +The ostep-invalid-types.test expects plistutil to return exit code 2
> +when converting binary plist data containing NSData objects to OpenStep
> +format, since OpenStep format doesn't natively support binary data types.
> +
> +However, plistutil's current behavior is to succeed (exit 0) and output
> +the binary data as hex-encoded strings in OpenStep format, which is a
> +valid fallback representation.
> +
> +This patch updates the test to accept both behaviors:
> +- Exit code 0: Success with hex-encoded binary data (current behavior)
> +- Exit code 2: Explicit rejection of unsupported type (expected behavior)
> +
> +Both outcomes are acceptable - either the tool can gracefully handle the
> +conversion by encoding binary data as strings, or it can reject formats
> +that don't support all input types. The test should not fail in either case.
> +
> +Upstream never noticed because they wrote -neq instead of -ne, so the
> +first check is effectively broken and doesn’t enforce the exit code.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + test/ostep-invalid-types.test | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/test/ostep-invalid-types.test b/test/ostep-invalid-types.test
> +index 240505c..ebfc6b0 100755
> +--- a/test/ostep-invalid-types.test
> ++++ b/test/ostep-invalid-types.test
> +@@ -14,7 +14,8 @@ export PLIST_OSTEP_DEBUG=1
> +
> + echo "Converting (failure expected)"
> + $top_builddir/tools/plistutil -f openstep -i $DATASRC/$TESTFILE0 -o /dev/null
> +-if [ $? -ne 2 ]; then
> ++rc=$?
> ++if [ $rc -ne 0 ] && [ $rc -ne 2 ]; then

Thanks for the fixes Khem.

There is also a typo in this test, format "openstepn" instead of "openstep" .
While you are at it, will you be able to sort that one as well?

> +   exit 1
> + fi
> +
> diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_2.6.0.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_2.7.0.bb
> similarity index 89%
> rename from meta-oe/recipes-extended/libimobiledevice/libplist_2.6.0.bb
> rename to meta-oe/recipes-extended/libimobiledevice/libplist_2.7.0.bb
> index 5f8d1f8d72..1f93e60d45 100644
> --- a/meta-oe/recipes-extended/libimobiledevice/libplist_2.6.0.bb
> +++ b/meta-oe/recipes-extended/libimobiledevice/libplist_2.7.0.bb
> @@ -8,13 +8,13 @@ DEPENDS = "libxml2 glib-2.0 swig python3"
>
>  inherit autotools pkgconfig python3native python3targetconfig ptest
>
> -SRCREV = "2117b8fdb6b4096455bd2041a63e59a028120136"
> +SRCREV = "cf5897a71ea412ea2aeb1e2f6b5ea74d4fabfd8c"
>  SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master;tag=${PV} \
>             file://run-ptest \
>             file://0001-test-fix-operator-error.patch \
> +           file://0001-ostep-invalid-types.test-Fix-ostep-invalid-types-tes.patch \
>  "
>
> -
>  CVE_STATUS_GROUPS += "CVE_STATUS_LIBLIST"
>  CVE_STATUS_LIBLIST[status] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
>  CVE_STATUS_LIBLIST = " \
> @@ -37,8 +37,10 @@ do_install_ptest(){
>      # tests expect a particular directory structure for input and output
>      install -d ${D}${PTEST_PATH}/input/test/data
>      install -d ${D}${PTEST_PATH}/test/tools
> +    install -d ${D}${PTEST_PATH}/test/tools/.libs
>      install -d ${D}${PTEST_PATH}/test/test/.libs
>      install -d ${D}${PTEST_PATH}/test/test/data
> +    install -m 0755 ${B}/tools/.libs/plistutil ${D}${PTEST_PATH}/test/tools/.libs/
>      install ${S}/test/data/* ${D}${PTEST_PATH}/input/test/data/
>      install ${S}/test/*.test ${D}${PTEST_PATH}/test/
>      install -m 0755 ${B}/test/.libs/plist* ${D}${PTEST_PATH}/test/test/.libs/
> @@ -66,4 +68,4 @@ FILES:${PN}++ = "${libdir}/libplist++-2.0${SOLIBS}"
>  FILES:${PN}-utils = "${bindir}/*"
>  FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*"
>
> -RDEPENDS:${PN}-ptest += "bash"
> +RDEPENDS:${PN}-ptest += "bash diffutils"