sys-boot/mokutil: Sync with Gentoo

It's from Gentoo commit 477d4ee20e9669bde29f334dc5d41bc65ec0ae20.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot 2026-02-02 07:31:11 +00:00
parent 501569593a
commit 12e64060f3
3 changed files with 0 additions and 67 deletions

View File

@ -1,2 +1 @@
DIST mokutil-0.6.0.tar.gz 38047 BLAKE2B f2307807c700091f1e5a783b3ad8e7b3eaa17e05580b2c24fd0e92433c6b9bedfb51e9eb2d5d1c71448623b12b6667a573dd51ed03fc738aaf9815083e118ca0 SHA512 11a9d172dba4fbb674e58e5d82cb1dc65a80cff844c0eaebd106b4d4608b24a8207e0cfabf36fe1eedb67f68a8a18db2136c7b62aa3230ac104615e8284dbd7d
DIST mokutil-0.7.2.tar.gz 39226 BLAKE2B e3b639070e03a41c9bbf45fd7c95656b1e149a1bf43fdc15396853303cf776b9b8279c48049ff5ec1c4397cb15c58d69c618b884864a7941ad747567963cd491 SHA512 cdab37f86191c009b8264f065c3ca8ca051d8c1366191dca4c142d4146a0f7b7614cb17e53b6a8ca6fde0462bc113d4a1a751673b755eea0b3ed6e90da507f5a

View File

@ -1,38 +0,0 @@
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,

View File

@ -1,28 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
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"
PATCHES=( "${FILESDIR}"/mokutil-0.6.0-conflict.patch )
src_prepare() {
default
eautoreconf
}