From a82aaf58fcac55a2aa59cd4860b1f366997f5eea Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Wed, 31 May 2023 17:16:58 +0800 Subject: [PATCH] Remove unused i option in authvar (cherry picked from commit 8ae8e743cdbbdd56050ad18b620aaf5478f6c0c3) --- Remove-unused-i-option-in-authvar.patch | 16 ++++++++++++++++ pesign.spec | 7 +++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 Remove-unused-i-option-in-authvar.patch diff --git a/Remove-unused-i-option-in-authvar.patch b/Remove-unused-i-option-in-authvar.patch new file mode 100644 index 0000000..7b92d69 --- /dev/null +++ b/Remove-unused-i-option-in-authvar.patch @@ -0,0 +1,16 @@ +diff -Nur a/src/authvar.c b/src/authvar.c +--- a/src/authvar.c 2022-03-09 01:46:30.000000000 +0800 ++++ b/src/authvar.c 2023-05-31 16:47:15.329069974 +0800 +@@ -324,12 +324,6 @@ + .arg = &ctx.valuefile, + .descrip = "read value from ", + .argDescrip = "" }, +- {.longName = "import", +- .shortName = 'i', +- .argInfo = POPT_ARG_STRING, +- .arg = &ctx.importfile, +- .descrip = "import variable from ", +- .argDescrip = "" }, + {.longName = "export", + .shortName = 'e', + .argInfo = POPT_ARG_STRING, diff --git a/pesign.spec b/pesign.spec index 844afc8..d49f2f7 100644 --- a/pesign.spec +++ b/pesign.spec @@ -2,7 +2,7 @@ Name: pesign Summary: Signing utility for UEFI binaries Version: 115 -Release: 4 +Release: 5 License: GPLv2 URL: https://github.com/rhboot/pesign Source0: https://github.com/rhboot/pesign/archive/refs/tags/115.tar.gz @@ -18,7 +18,7 @@ BuildRequires: python3-rpm-macros python3 systemd python3-devel gcc mandoc Patch0001: Bugfix-cms_common-fix-cert-match-check.patch Patch0002: Bugfix-Free-resources-if-certificate-cannot-be-found.patch - +Patch0003: Remove-unused-i-option-in-authvar.patch # Feature: support SM2 and SM3 Patch9000: Feature-pesign-support-SM3-digest-algorithm.patch Patch9001: Feature-pesign-support-SM2-signature-algorithm.patch @@ -100,6 +100,9 @@ exit 0 %{_mandir}/man*/* %changelog +* Wed May 31 2023 liyanan - 115-5 +- Remove unused i option in authvar + * Tue Feb 14 2023 luopihui - 115-4 - Fix CVE-2022-3560 -- Gitee