CVS commit: pkgsrc/sysutils/arm-trusted-firmware-fiptool

["Jason R Thorpe" <thorpej%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Tue May 14 04:08:51 UTC 2019

Modified Files:
        pkgsrc/sysutils/arm-trusted-firmware-fiptool: Makefile distinfo
Added Files:
        pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches:
            patch-fiptool_uuid_parse

Log Message:
Pluck the following patch from upstream:

tools/fiptool: Fix UUID parsing in blob handling
Commit 0336486 ("Make TF UUID RFC 4122 compliant") changed the scanf
parsing string to handle endianness correctly.
However that changed the number of items sscanf handles, without
adjusting the sanity check just below.

Increase the expected return value from 11 to 16 to let fiptool handle
UUIDs given as blob parameters correctly again.

Signed-off-by: Andre Przywara <andre.przywara%arm.com@localhost>


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile
diff -u pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile:1.3 pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile:1.4
--- pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile:1.3   Sun Jan 20 17:39:05 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile       Tue May 14 04:08:51 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2019/01/20 17:39:05 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2019/05/14 04:08:51 thorpej Exp $
 
 GITHUB_PROJECT=        arm-trusted-firmware
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 DISTNAME=      arm-trusted-firmware-2.0
 PKGNAME=       ${DISTNAME:S/firmware/firmware-fiptool/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ARM-software/}
 EXTRACT_SUFX=  .zip

Index: pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo
diff -u pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo:1.2 pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo:1.3
--- pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo:1.2   Sun Jan 20 17:39:05 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo       Tue May 14 04:08:51 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2019/01/20 17:39:05 wiz Exp $
+$NetBSD: distinfo,v 1.3 2019/05/14 04:08:51 thorpej Exp $
 
 SHA1 (arm-trusted-firmware-2.0.zip) = d789e7aac0e987d8524a11587cc598bf5d894581
 RMD160 (arm-trusted-firmware-2.0.zip) = a7a49da9b0e27c45df867ea1de4809cb89d9b8cc
 SHA512 (arm-trusted-firmware-2.0.zip) = 39180d12be7532b742949f162759793e97c0a6ac835d66aaf857bd3c1d9c0ab10b7ccd5e6a47831ad909a92b4727e181c82a74c90b5d941e469f3a5cf66b0e7c
 Size (arm-trusted-firmware-2.0.zip) = 3949049 bytes
 SHA1 (patch-Makefile) = b5c27e44135e6a99c1a598daec91db58d6ff894d
+SHA1 (patch-fiptool_uuid_parse) = 6ef5785e2f696e0297239cb597b94dd3ac4a6c7d

Added files:

Index: pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse
diff -u /dev/null pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse:1.1
--- /dev/null   Tue May 14 04:08:51 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse       Tue May 14 04:08:51 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-fiptool_uuid_parse,v 1.1 2019/05/14 04:08:51 thorpej Exp $
+
+Patch from upstream to fix UUID parsing bug in --blob handling.
+
+--- fiptool.c.orig     2019-05-14 04:51:36.000000000 +0000
++++ fiptool.c
+@@ -271,10 +271,10 @@ static void uuid_from_str(uuid_t *u, con
+           &u->node[2], &u->node[3],
+           &u->node[4], &u->node[5]);
+       /*
+-       * Given the format specifier above, we expect 11 items to be scanned
++       * Given the format specifier above, we expect 16 items to be scanned
+        * for a properly formatted UUID.
+        */
+-      if (n != 11)
++      if (n != 16)
+               log_errx("Invalid UUID: %s", s);
+ }
+