efivar: bump to 38

The new patch can be hacky, and I didn't properly test the outcome.
Should technically be working fine, but give me a heads up if it isn't
working as expected.

10 files changed, 31 insertions, 352 deletions

diff --git a/extra/efivar/build b/extra/efivar/build
index 427316ac..2973fd4f 100755
--- a/extra/efivar/build
+++ b/extra/efivar/build
@@ -2,12 +2,9 @@
 
 export LDFLAGS="$LDFLAGS -static"
 
-for patch in *.patch; do
-    patch -p1 < "$patch"
-done
-
 mk() {
     make \
+        TOPDIR=.. \
         libdir=/usr/lib/ \
         bindir=/usr/bin/ \
         mandir=/usr/share/man/ \
@@ -17,9 +14,12 @@ mk() {
 
 (
     cd src
+    clsed '/#include <sys\/cdefs.h>/d' compiler.h
 
     # Build static targets.
-    mk libefiboot.a libefivar.a efivar-static efiboot.pc efivar.pc
+    mk libefiboot.a libefivar.a efiboot.pc efivar.pc
+    patch -p2 < ../musl-compat.patch
+    mk efivar-static
 
     # Install the binary.
     clinst -Dm755 efivar-static "$1/usr/bin/efivar"
diff --git a/extra/efivar/checksums b/extra/efivar/checksums
index d71f9187..26e3425a 100644
--- a/extra/efivar/checksums
+++ b/extra/efivar/checksums
@@ -1,6 +1,3 @@
-3c67feb93f901b98fbb897d5ca82931a6698b5bcd6ac34f0815f670d77747b9f  efivar-37.tar.bz2
-475ca086eecabeaaff6111c3e6766f7e31d88a4fb6e0d082e34201e2cfaf295a  01-b98ba8921010d03f46704a476c69861515deb1ca.patch
-7e72f92eb0d03558b9b14ede6a68e29c0051ffe745a8c7a84d06dce6af458351  02-c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
-c3dcda97408b7d4957d440b1802081d1861a9923c7d4eb5ee6d3c9e31ae668fc  03-0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
-4d53ca9f09e3704aa0cc58f36cf475f9c0e54464305930d0ea9e26e7d0461ef6  04-fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch
-bc552a018399fb9c976b0087f3407ec34004f8b64a5982af76556dcd790852aa  05-4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch
+%BLAKE3
+0405511d4aa0483c19b57440ee15af2a64a457aa44f3ed4e59df008b53dd3722  efivar-38.tar.bz2
+1ac4baa5bfdb5786fe3c5028a174f6795b140c671f949f89e614b4b35ed8cd13  musl-compat.patch
diff --git a/extra/efivar/patches/01-b98ba8921010d03f46704a476c69861515deb1ca.patch b/extra/efivar/patches/01-b98ba8921010d03f46704a476c69861515deb1ca.patch
deleted file mode 100644
index f40942f4..00000000
--- a/extra/efivar/patches/01-b98ba8921010d03f46704a476c69861515deb1ca.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b98ba8921010d03f46704a476c69861515deb1ca Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Mon, 7 Jan 2019 10:30:59 -0500
-Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers
- safely.
-
-GCC 9 adds -Werror=address-of-packed-member, which causes us to see the
-build error reported at
- https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 .
-
-That bug report shows us the following:
-
-In file included from dp.c:26:
-dp.h: In function 'format_vendor_helper':
-dp.h:120:37: error: taking address of packed member of 'struct <anonymous>' may result in an unaligned pointer value [-Werror=address-of-packed-member]
-  120 |  format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid);
-      |                                     ^~~~~~~~~~~~~~~~~~~~~~~~~~
-dp.h:74:25: note: in definition of macro 'format_guid'
-   74 |   _rc = efi_guid_to_str(guid, &_guidstr);   \
-      |                         ^~~~
-cc1: all warnings being treated as errors
-
-This patch makes format_guid() use a local variable as a bounce buffer
-in the case that the guid we're passed is aligned as chaotic neutral.
-
-Note that this only fixes this instance and there may be others that bz
-didn't show because it exited too soon, and I don't have a gcc 9 build
-in front of me right now.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/dp.h | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/dp.h b/src/dp.h
-index aa4e390..20cb608 100644
---- a/src/dp.h
-+++ b/src/dp.h
-@@ -70,8 +70,15 @@
- #define format_guid(buf, size, off, dp_type, guid) ({			\
- 		int _rc;						\
- 		char *_guidstr = NULL;					\
--									\
--		_rc = efi_guid_to_str(guid, &_guidstr);			\
-+		efi_guid_t _guid;					\
-+		const efi_guid_t * const _guid_p =			\
-+			likely(__alignof__(guid) == sizeof(guid))	\
-+				? guid					\
-+				: &_guid;				\
-+								        \
-+		if (unlikely(__alignof__(guid) == sizeof(guid)))	\
-+			memmove(&_guid, guid, sizeof(_guid));		\
-+		_rc = efi_guid_to_str(_guid_p, &_guidstr);		\
- 		if (_rc < 0) {						\
- 			efi_error("could not build %s GUID DP string",	\
- 				  dp_type);				\
diff --git a/extra/efivar/patches/02-c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch b/extra/efivar/patches/02-c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
deleted file mode 100644
index bbb6a99a..00000000
--- a/extra/efivar/patches/02-c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From c3c553db85ff10890209d0fe48fb4856ad68e4e0 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 21 Feb 2019 15:20:12 -0500
-Subject: [PATCH] Fix all the places -Werror=address-of-packed-member catches.
-
-This gets rid of all the places GCC 9's -Werror=address-of-packed-member
-flags as problematic.
-
-Fixes github issue #123
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/dp-message.c            |  6 ++++--
- src/dp.h                    | 12 ++++--------
- src/guid.c                  |  2 +-
- src/include/efivar/efivar.h |  2 +-
- src/ucs2.h                  | 27 +++++++++++++++++++--------
- 5 files changed, 29 insertions(+), 20 deletions(-)
-
-diff --git a/src/dp-message.c b/src/dp-message.c
-index 3724e5f..9f96466 100644
---- a/src/dp-message.c
-+++ b/src/dp-message.c
-@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp dp)
- 			  ) / sizeof(efi_ip_addr_t);
- 		format(buf, size, off, "Dns", "Dns(");
- 		for (int i=0; i < end; i++) {
--			const efi_ip_addr_t *addr = &dp->dns.addrs[i];
-+			efi_ip_addr_t addr;
-+
-+			memcpy(&addr, &dp->dns.addrs[i], sizeof(addr));
- 			if (i != 0)
- 				format(buf, size, off, "Dns", ",");
- 			format_ip_addr(buf, size, off, "Dns",
--				       dp->dns.is_ipv6, addr);
-+				       dp->dns.is_ipv6, &addr);
- 		}
- 		format(buf, size, off, "Dns", ")");
- 		break;
-diff --git a/src/dp.h b/src/dp.h
-index 20cb608..1f921d5 100644
---- a/src/dp.h
-+++ b/src/dp.h
-@@ -71,13 +71,9 @@
- 		int _rc;						\
- 		char *_guidstr = NULL;					\
- 		efi_guid_t _guid;					\
--		const efi_guid_t * const _guid_p =			\
--			likely(__alignof__(guid) == sizeof(guid))	\
--				? guid					\
--				: &_guid;				\
--								        \
--		if (unlikely(__alignof__(guid) == sizeof(guid)))	\
--			memmove(&_guid, guid, sizeof(_guid));		\
-+		const efi_guid_t * const _guid_p = &_guid;		\
-+									\
-+		memmove(&_guid, guid, sizeof(_guid));			\
- 		_rc = efi_guid_to_str(_guid_p, &_guidstr);		\
- 		if (_rc < 0) {						\
- 			efi_error("could not build %s GUID DP string",	\
-@@ -86,7 +82,7 @@
- 			_guidstr = onstack(_guidstr,			\
- 					   strlen(_guidstr)+1);		\
- 			_rc = format(buf, size, off, dp_type, "%s",	\
--				     _guidstr);	\
-+				     _guidstr);				\
- 		}							\
- 		_rc;							\
- 	})
-diff --git a/src/guid.c b/src/guid.c
-index 306c9ff..3156b3b 100644
---- a/src/guid.c
-+++ b/src/guid.c
-@@ -31,7 +31,7 @@
- extern const efi_guid_t efi_guid_zero;
- 
- int NONNULL(1, 2) PUBLIC
--efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b)
-+efi_guid_cmp(const void * const a, const void * const b)
- {
- 	return memcmp(a, b, sizeof (efi_guid_t));
- }
-diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h
-index 316891c..ad6449d 100644
---- a/src/include/efivar/efivar.h
-+++ b/src/include/efivar/efivar.h
-@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid)
- 
- extern int efi_guid_is_zero(const efi_guid_t *guid);
- extern int efi_guid_is_empty(const efi_guid_t *guid);
--extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b);
-+extern int efi_guid_cmp(const void * const a, const void * const b);
- 
- /* import / export functions */
- typedef struct efi_variable efi_variable_t;
-diff --git a/src/ucs2.h b/src/ucs2.h
-index dbb5900..edd8367 100644
---- a/src/ucs2.h
-+++ b/src/ucs2.h
-@@ -23,16 +23,21 @@
- 	(((val) & ((mask) << (shift))) >> (shift))
- 
- static inline size_t UNUSED
--ucs2len(const uint16_t * const s, ssize_t limit)
-+ucs2len(const void *vs, ssize_t limit)
- {
- 	ssize_t i;
--	for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++)
-+	const uint16_t *s = vs;
-+	const uint8_t *s8 = vs;
-+
-+	for (i = 0;
-+	     i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0;
-+	     i++, s8 += 2, s++)
- 		;
- 	return i;
- }
- 
- static inline size_t UNUSED
--ucs2size(const uint16_t * const s, ssize_t limit)
-+ucs2size(const void *s, ssize_t limit)
- {
- 	size_t rc = ucs2len(s, limit);
- 	rc *= sizeof (uint16_t);
-@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit)
- }
- 
- static inline unsigned char * UNUSED
--ucs2_to_utf8(const uint16_t * const chars, ssize_t limit)
-+ucs2_to_utf8(const void * const voidchars, ssize_t limit)
- {
- 	ssize_t i, j;
- 	unsigned char *ret;
-+	const uint16_t * const chars = voidchars;
- 
- 	if (limit < 0)
- 		limit = ucs2len(chars, -1);
-@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t limit)
- }
- 
- static inline ssize_t UNUSED NONNULL(4)
--utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8)
-+utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8)
- {
- 	ssize_t req;
- 	ssize_t i, j;
-+	uint16_t *ucs2 = ucs2void;
-+	uint16_t val16;
- 
- 	if (!ucs2 && size > 0) {
- 		errno = EINVAL;
-@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8)
- 			val = utf8[i] & 0x7f;
- 			i += 1;
- 		}
--		ucs2[j] = val;
-+		val16 = val;
-+		ucs2[j] = val16;
-+	}
-+	if (terminate) {
-+		val16 = 0;
-+		ucs2[j++] = val16;
- 	}
--	if (terminate)
--		ucs2[j++] = (uint16_t)0;
- 	return j;
- };
- 
diff --git a/extra/efivar/patches/03-0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch b/extra/efivar/patches/03-0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
deleted file mode 100644
index e4a43582..00000000
--- a/extra/efivar/patches/03-0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 0dad6d78a7fb5f6c5fb4a1d646040539db6cf865 Mon Sep 17 00:00:00 2001
-From: Chih-Wei Huang <cwhuang@linux.org.tw>
-Date: Tue, 26 Feb 2019 18:42:20 +0800
-Subject: [PATCH] Fix another error of -Werror=address-of-packed-member
-
-Android 9 clang complains:
-
-external/efivar/src/dp-message.c:367:24: error: taking address of packed member '' of class or structure 'efidp_infiniband' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member]
-                                    (efi_guid_t *)&dp->infiniband.ioc_guid);
-                                                   ^~~~~~~~~~~~~~~~~~~~~~~
-external/efivar/src/dp.h:76:19: note: expanded from macro 'format_guid'
-                memmove(&_guid, guid, sizeof(_guid));                   \
-                                ^~~~
-1 error generated.
-
-Since commit c3c553d the fifth parameter of format_guid() is treated as
-a const void *. The casting is unnecessary.
-
-Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
----
- src/dp-media.c   | 3 +--
- src/dp-message.c | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/dp-media.c b/src/dp-media.c
-index 96a576f..be691c4 100644
---- a/src/dp-media.c
-+++ b/src/dp-media.c
-@@ -46,8 +46,7 @@ _format_media_dn(char *buf, size_t size, const_efidp dp)
- 			break;
- 		case EFIDP_HD_SIGNATURE_GUID:
- 			format(buf, size, off, "HD", "GPT,");
--			format_guid(buf, size, off, "HD",
--				    (efi_guid_t *)dp->hd.signature);
-+			format_guid(buf, size, off, "HD", dp->hd.signature);
- 			format(buf, size, off, "HD",
- 			       ",0x%"PRIx64",0x%"PRIx64")",
- 			       dp->hd.start, dp->hd.size);
-diff --git a/src/dp-message.c b/src/dp-message.c
-index 9f96466..6b8e907 100644
---- a/src/dp-message.c
-+++ b/src/dp-message.c
-@@ -364,7 +364,7 @@ _format_message_dn(char *buf, size_t size, const_efidp dp)
- 			       dp->infiniband.port_gid[1],
- 			       dp->infiniband.port_gid[0]);
- 			format_guid(buf, size, off, "Infiniband",
--				    (efi_guid_t *)&dp->infiniband.ioc_guid);
-+				    &dp->infiniband.ioc_guid);
- 			format(buf, size, off, "Infiniband",
- 			       ",%"PRIu64",%"PRIu64")",
- 			       dp->infiniband.target_port_id,
diff --git a/extra/efivar/patches/04-fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch b/extra/efivar/patches/04-fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch
deleted file mode 100644
index 513c0e73..00000000
--- a/extra/efivar/patches/04-fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fdb803402fb32fa6d020bac57a40c7efe4aabb7d Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Tue, 5 Mar 2019 17:23:24 +0100
-Subject: [PATCH] ucs2.h: remove unused variable
-
-The const uint16_t pointer is not used since now the two bytes of the
-UCS-2 chars are checked to know if is the termination of the string.
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- src/ucs2.h | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/ucs2.h b/src/ucs2.h
-index edd8367..e0390c3 100644
---- a/src/ucs2.h
-+++ b/src/ucs2.h
-@@ -26,12 +26,11 @@ static inline size_t UNUSED
- ucs2len(const void *vs, ssize_t limit)
- {
- 	ssize_t i;
--	const uint16_t *s = vs;
- 	const uint8_t *s8 = vs;
- 
- 	for (i = 0;
- 	     i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0;
--	     i++, s8 += 2, s++)
-+	     i++, s8 += 2)
- 		;
- 	return i;
- }
diff --git a/extra/efivar/patches/05-4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch b/extra/efivar/patches/05-4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch
deleted file mode 100644
index 176e3fd1..00000000
--- a/extra/efivar/patches/05-4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Tue, 5 Mar 2019 17:23:32 +0100
-Subject: [PATCH] ucs2.h: fix logic that checks for UCS-2 string termination
-
-Currently the loop to count the lenght of the UCS-2 string ends if either
-of the two bytes are 0, but 0 is a valid value for UCS-2 character codes.
-
-So only break the loop when 0 is the value for both UCS-2 char bytes.
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- src/ucs2.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ucs2.h b/src/ucs2.h
-index e0390c3..fd8b056 100644
---- a/src/ucs2.h
-+++ b/src/ucs2.h
-@@ -29,7 +29,7 @@ ucs2len(const void *vs, ssize_t limit)
- 	const uint8_t *s8 = vs;
- 
- 	for (i = 0;
--	     i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0;
-+	     i < (limit >= 0 ? limit : i+1) && !(s8[0] == 0 && s8[1] == 0);
- 	     i++, s8 += 2)
- 		;
- 	return i;
diff --git a/extra/efivar/patches/musl-compat.patch b/extra/efivar/patches/musl-compat.patch
new file mode 100644
index 00000000..100cf871
--- /dev/null
+++ b/extra/efivar/patches/musl-compat.patch
@@ -0,0 +1,20 @@
+--- a/src/guid-symbols.c	Thu Apr 28 01:31:10 2022
++++ b/src/guid-symbols.c	Thu Apr 28 01:30:44 2022
+@@ -207,7 +207,7 @@
+ 
+ const struct efivar_guidname
+ 	__attribute__((__visibility__ ("default")))
+-	efi_well_known_guids_[42]= {
++	efi_well_known_guids[42]= {
+ 		{.guid={.a=cpu_to_le32(0),
+ 		        .b=cpu_to_le16(0),
+ 		        .c=cpu_to_le16(0),
+@@ -589,7 +589,7 @@
+ };
+ const struct efivar_guidname
+ 	__attribute__((__visibility__ ("default")))
+-	efi_well_known_names_[42]= {
++	efi_well_known_names[42]= {
+ 		{.guid={.a=cpu_to_le32(0x3b053091),
+ 		        .b=cpu_to_le16(0x6c9f),
+ 		        .c=cpu_to_le16(0x4cc),
diff --git a/extra/efivar/sources b/extra/efivar/sources
index a6f7b98c..1537f661 100644
--- a/extra/efivar/sources
+++ b/extra/efivar/sources
@@ -1,6 +1,2 @@
-https://github.com/rhboot/efivar/releases/download/37/efivar-37.tar.bz2
-patches/01-b98ba8921010d03f46704a476c69861515deb1ca.patch
-patches/02-c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
-patches/03-0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
-patches/04-fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch
-patches/05-4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch
+https://github.com/rhboot/efivar/releases/download/38/efivar-38.tar.bz2
+patches/musl-compat.patch
diff --git a/extra/efivar/version b/extra/efivar/version
index de8594ab..25eef31d 100644
--- a/extra/efivar/version
+++ b/extra/efivar/version
@@ -1 +1 @@
-37 3
+38 1