Accepting request 826614 from home:gary_lin:branches:Base:System

- Update mokutil-support-revoke-builtin-cert.patch
  + Add "--revoke-cert" to the man page

OBS-URL: https://build.opensuse.org/request/show/826614
OBS-URL: https://build.opensuse.org/package/show/Base:System/mokutil?expand=0&rev=43

mokutil-support-revoke-builtin-cert.patch

@@ -1,7 +1,7 @@
 From 93ded288224a18f336f9e3654a33a48bcb748b11 Mon Sep 17 00:00:00 2001
 From: Gary Ching-Pang Lin <glin@suse.com>
 Date: Fri, 21 Feb 2014 17:56:55 +0800
-Subject: [PATCH 1/3] Add the option to revoke the built-in certificate
+Subject: [PATCH 1/4] Add the option to revoke the built-in certificate
 
 This is an openSUSE-only patch.
 
@@ -141,13 +141,13 @@ index e2d567d..1ada2a0 100644
  			print_help ();
  			break;
 -- 
-2.21.0
+2.27.0
 
 
 From 17f9850edce4dd40f96107c97d3d720406bf9f09 Mon Sep 17 00:00:00 2001
 From: Gary Ching-Pang Lin <glin@suse.com>
 Date: Tue, 4 Nov 2014 14:50:36 +0800
-Subject: [PATCH 2/3] Use the efivar functions to access UEFI variables
+Subject: [PATCH 2/4] Use the efivar functions to access UEFI variables
 
 This is an openSUSE-only patch.
 
@@ -236,13 +236,13 @@ index 1ada2a0..dcf55dc 100644
  		goto error;
  	}
 -- 
-2.21.0
+2.27.0
 
 
 From 1ab85ee4d98a5436c4612b8f893c3c73f113a6e0 Mon Sep 17 00:00:00 2001
 From: Gary Lin <glin@suse.com>
 Date: Wed, 13 Jul 2016 14:58:15 +0800
-Subject: [PATCH 3/3] Use efi_set_variable from efivar 0.24
+Subject: [PATCH 3/4] Use efi_set_variable from efivar 0.24
 
 This is an openSUSE-only patch.
 ---
@@ -264,5 +264,43 @@ index dcf55dc..0160c06 100644
  		goto error;
  	}
 -- 
-2.21.0
+2.27.0
+
+
+From ca9db2e9aa89a945651787b23046a6213af4144d Mon Sep 17 00:00:00 2001
+From: Gary Lin <glin@suse.com>
+Date: Fri, 14 Aug 2020 14:57:23 +0800
+Subject: [PATCH 4/4] man: add "--revoke-cert"
+
+The argument "--revoke-cert" was not addressed in the man page.
+
+This is an openSUSE-only patch.
+
+Signed-off-by: Gary Lin <glin@suse.com>
+---
+ man/mokutil.1 | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/man/mokutil.1 b/man/mokutil.1
+index 25fe8b4..bf27a52 100644
+--- a/man/mokutil.1
++++ b/man/mokutil.1
+@@ -73,6 +73,8 @@ mokutil \- utility to manipulate machine owner keys
+ .br
+ \fBmokutil\fR [--dbx]
+ .br
++\fBmokutil\fR [--revoke-cert]
++.br
+ 
+ .SH DESCRIPTION
+ \fBmokutil\fR is a tool to import or delete the machines owner keys
+@@ -173,3 +175,6 @@ List the keys in the secure boot signature store (db)
+ \fB--dbx\fR
+ List the keys in the secure boot blacklist signature store (dbx)
+ .TP
++\fB--revoke-cert\fR
++Revoke the agreement of using the built-in certificate in shim (openSUSE Specfic)
++.TP
+-- 
+2.27.0
 

mokutil.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 14 06:59:46 UTC 2020 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Update mokutil-support-revoke-builtin-cert.patch
+  + Add "--revoke-cert" to the man page
+
 -------------------------------------------------------------------
 Fri Dec 13 10:38:44 UTC 2019 - Michel Normand <normand@linux.vnet.ibm.com>
 

mokutil.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mokutil
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@ Release:        0
 Summary:        Tools for manipulating machine owner keys
 License:        GPL-3.0-only
 Group:          Productivity/Security
-Url:            https://github.com/lcp/mokutil
+URL:            https://github.com/lcp/mokutil
 Source:         https://github.com/lcp/%{name}/archive/%{version}.tar.gz
 Source1:        modhash
 # PATCH-FIX-UPSTREAM mokutil-remove-shebang-from-bash-completion-file.patch glin@suse.com -- Remove shebang from bash-completion/mokutil