gentoo auto-resync : 24:08:2023 - 03:50:35

4 files changed, 43 insertions, 30 deletions

diff --git a/sys-boot/mokutil/Manifest b/sys-boot/mokutil/Manifest
index daddd517b8cc..516d51ec3f97 100644
--- a/sys-boot/mokutil/Manifest
+++ b/sys-boot/mokutil/Manifest
@@ -1,5 +1,4 @@
-DIST mokutil-0.5.0.tar.gz 37181 BLAKE2B 6bd74e4ef2777afcd80cfe1d56dba7c861b9cb7bb957db19529dc36df7d6172c1d43870b80fbacd5f2bf20dbe9c8174be0d4cb5ce3638ce83a99795ae7627c4b SHA512 600c142fcc44e33efd307341b814018ef956668790b56d42a523140e81098746d14ae096fc6c93985b3c26bb414b8b6862f59312f2c4bd9d657a11e4becc6ea7
+AUX mokutil-0.6.0-conflict.patch 1098 BLAKE2B 304be1d9237ff04915f5421680da94ba0a5462d447ffb6b5d4af46ef63ce87056ba58be4b60d0aca914186bed62c95215fa3c18fb996349d92c3a3b36dcc2c1a SHA512 1ace1309e3010d45769248fea70a92f9273fdb4658c3d7575cee4cc9c85d661108f4abde51a90370434eb66994fbd204113ba02c54b5170706db415ac629747b
 DIST mokutil-0.6.0.tar.gz 38047 BLAKE2B f2307807c700091f1e5a783b3ad8e7b3eaa17e05580b2c24fd0e92433c6b9bedfb51e9eb2d5d1c71448623b12b6667a573dd51ed03fc738aaf9815083e118ca0 SHA512 11a9d172dba4fbb674e58e5d82cb1dc65a80cff844c0eaebd106b4d4608b24a8207e0cfabf36fe1eedb67f68a8a18db2136c7b62aa3230ac104615e8284dbd7d
-EBUILD mokutil-0.5.0-r1.ebuild 560 BLAKE2B 95644c634226181843c3eb6e4d988e16f3f43a2187a2d7cb318d4f21ada38c5d6a44c254ecc380ad3d040316dd83a549030e34255a33e4130a90da6b6a203a0a SHA512 02668a462d47eef98cc517ec7952d0463194688b7f9bf7ee7512c5635838b17d6fa0cbc43a2765d8f49f749699b6bc2911937d142274523854a4b93a3cdbd440
-EBUILD mokutil-0.6.0.ebuild 560 BLAKE2B 548bef83e75844fcc68afd6f5743fe2cd2772a3f681bce329fc9c03a09ae82507d5d3923fd7ca55a0cfe76acacd3faebfbe0bfaf1938e488631cd9e7a55fabec SHA512 095e83605147ba2771ca5245823f56e387a5ede8628fcb55a9f9e3d2e8565e039c142621424d3c16d6ac029ee054678f1521f9fcdea161535c2f49b83415df5a
+EBUILD mokutil-0.6.0.ebuild 616 BLAKE2B 5c3643ea7f1c88cbd85b3edb416df568716fd197884874d08b90c6ac4c727c8103ce499f8a51a09fc4e701b25193120f53358c10575f2dbb10e76eef4e7de38e SHA512 3b7e7dcf26dbabae49cb2fe4fb2af4d2de69f5f890e071de81a6a17720506fd34ab1b22345faa23fef42e9ec85b8c1aac48a8f07deaa77fa1acd03a86a646054
 MISC metadata.xml 324 BLAKE2B 803a9f3dfc400fd7358eb385dbdcd68c75cb26fbaf90ceb26ff41c7eef6ed3c34cb2d1418e2baa2c3b479615d473583fa7aa6b88544b6b1399cdd1e304ad3cbc SHA512 c0d24dc6c45f5d6f4d6d2b01b14a79376f4adf5847348bd9e5cdde20af1fe88ec9681bc6fd88126febf749dc0822d3b78bd2babcfa80abbbff3d1580aafc530e
diff --git a/sys-boot/mokutil/files/mokutil-0.6.0-conflict.patch b/sys-boot/mokutil/files/mokutil-0.6.0-conflict.patch
new file mode 100644
index 000000000000..6283fa331635
--- /dev/null
+++ b/sys-boot/mokutil/files/mokutil-0.6.0-conflict.patch
@@ -0,0 +1,38 @@
+From dd55c28236809fc30a7f079882914cde45560277 Mon Sep 17 00:00:00 2001
+From: Gary Lin <glin@suse.com>
+Date: Fri, 30 Jun 2023 10:36:54 +0800
+Subject: [PATCH] Avoid conflicting efi_char16_t type definitions
+
+It's not necessary to define 'efi_char16_t' as 'wchar_t' since we don't
+need any wchar functions. Besides, it may conflict with efivar-38. This
+commit defines 'efi_char16_t' as 'uint16_t' and adds the conditional
+check to avoid the potential conflict.
+
+Fixes: https://github.com/lcp/mokutil/issues/66
+
+Signed-off-by: Gary Lin <glin@suse.com>
+---
+ src/mokutil.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/mokutil.h b/src/mokutil.h
+index d47a380..bd02608 100644
+--- a/src/mokutil.h
++++ b/src/mokutil.h
+@@ -33,13 +33,14 @@
+ #define __MOKUTIL_H__
+ 
+ #include <ctype.h>
+-#include <wchar.h>
+ 
+ #include "signature.h"
+ 
+ typedef unsigned long efi_status_t;
+ typedef uint8_t efi_bool_t;
+-typedef wchar_t efi_char16_t;		/* UNICODE character */
++#ifndef efi_char16_t
++typedef uint16_t efi_char16_t;		/* UNICODE character */
++#endif
+ 
+ typedef enum {
+ 	DELETE_MOK = 0,
diff --git a/sys-boot/mokutil/mokutil-0.5.0-r1.ebuild b/sys-boot/mokutil/mokutil-0.5.0-r1.ebuild
deleted file mode 100644
index 560c290cb156..000000000000
--- a/sys-boot/mokutil/mokutil-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="The utility to manipulate machines owner keys which managed in shim"
-HOMEPAGE="https://github.com/lcp/mokutil"
-SRC_URI="https://github.com/lcp/mokutil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/openssl:=
-	sys-apps/keyutils:=
-	sys-libs/efivar:=
-	virtual/libcrypt:="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-boot/mokutil/mokutil-0.6.0.ebuild b/sys-boot/mokutil/mokutil-0.6.0.ebuild
index cf7a65403d0e..b57693258f14 100644
--- a/sys-boot/mokutil/mokutil-0.6.0.ebuild
+++ b/sys-boot/mokutil/mokutil-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,6 +20,8 @@ DEPEND="dev-libs/openssl:=
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/mokutil-0.6.0-conflict.patch )
+
 src_prepare() {
 	default
 	eautoreconf