backport fix for command line parsing from upstream master
This commit is contained in:
parent
ea1746905e
commit
8a2c40e6cb
73
0002-Fix-command-line-parsing.patch
Normal file
73
0002-Fix-command-line-parsing.patch
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
From 5be0515dee24308fd7e270bf2e0fb5e5a7a78f32 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Julien Cristau <jcristau@debian.org>
|
||||||
|
Date: Thu, 9 Jun 2016 14:30:37 +0200
|
||||||
|
Subject: [PATCH 2/2] Fix command line parsing
|
||||||
|
|
||||||
|
The gettext translation domain should be passed as .arg, not .descrip,
|
||||||
|
otherwise popt won't process any of the command line options (it stops
|
||||||
|
looping over the struct poptOption array when an entry has unset
|
||||||
|
longName, shortName and arg).
|
||||||
|
|
||||||
|
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||||
|
---
|
||||||
|
src/client.c | 2 +-
|
||||||
|
src/efikeygen.c | 2 +-
|
||||||
|
src/efisiglist.c | 2 +-
|
||||||
|
src/pesigcheck.c | 2 +-
|
||||||
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/client.c b/src/client.c
|
||||||
|
index 028419f..575c873 100644
|
||||||
|
--- a/src/client.c
|
||||||
|
+++ b/src/client.c
|
||||||
|
@@ -555,7 +555,7 @@ main(int argc, char *argv[])
|
||||||
|
|
||||||
|
struct poptOption options[] = {
|
||||||
|
{.argInfo = POPT_ARG_INTL_DOMAIN,
|
||||||
|
- .descrip = "pesign" },
|
||||||
|
+ .arg = "pesign" },
|
||||||
|
{.longName = "token",
|
||||||
|
.shortName = 't',
|
||||||
|
.argInfo = POPT_ARG_STRING|POPT_ARGFLAG_SHOW_DEFAULT,
|
||||||
|
diff --git a/src/efikeygen.c b/src/efikeygen.c
|
||||||
|
index 6278849..8a515a5 100644
|
||||||
|
--- a/src/efikeygen.c
|
||||||
|
+++ b/src/efikeygen.c
|
||||||
|
@@ -486,7 +486,7 @@ int main(int argc, char *argv[])
|
||||||
|
poptContext optCon;
|
||||||
|
struct poptOption options[] = {
|
||||||
|
{.argInfo = POPT_ARG_INTL_DOMAIN,
|
||||||
|
- .descrip = "pesign" },
|
||||||
|
+ .arg = "pesign" },
|
||||||
|
/* global nss-ish things */
|
||||||
|
{.longName = "dbdir",
|
||||||
|
.shortName = 'd',
|
||||||
|
diff --git a/src/efisiglist.c b/src/efisiglist.c
|
||||||
|
index cd3f1ae..40d6a93 100644
|
||||||
|
--- a/src/efisiglist.c
|
||||||
|
+++ b/src/efisiglist.c
|
||||||
|
@@ -126,7 +126,7 @@ main(int argc, char *argv[])
|
||||||
|
|
||||||
|
struct poptOption options[] = {
|
||||||
|
{.argInfo = POPT_ARG_INTL_DOMAIN,
|
||||||
|
- .descrip = "pesign" },
|
||||||
|
+ .arg = "pesign" },
|
||||||
|
{.longName = "infile",
|
||||||
|
.shortName = 'i',
|
||||||
|
.argInfo = POPT_ARG_STRING,
|
||||||
|
diff --git a/src/pesigcheck.c b/src/pesigcheck.c
|
||||||
|
index 1328fe9..0d49c1a 100644
|
||||||
|
--- a/src/pesigcheck.c
|
||||||
|
+++ b/src/pesigcheck.c
|
||||||
|
@@ -214,7 +214,7 @@ main(int argc, char *argv[])
|
||||||
|
poptContext optCon;
|
||||||
|
struct poptOption options[] = {
|
||||||
|
{.argInfo = POPT_ARG_INTL_DOMAIN,
|
||||||
|
- .descrip = "pesign" },
|
||||||
|
+ .arg = "pesign" },
|
||||||
|
{.longName = "dbfile",
|
||||||
|
.shortName = 'D',
|
||||||
|
.argInfo = POPT_ARG_CALLBACK|POPT_CBFLAG_POST,
|
||||||
|
--
|
||||||
|
2.9.2
|
||||||
|
|
@ -3,7 +3,7 @@
|
|||||||
Summary: Signing utility for UEFI binaries
|
Summary: Signing utility for UEFI binaries
|
||||||
Name: pesign
|
Name: pesign
|
||||||
Version: 0.112
|
Version: 0.112
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Group: Development/System
|
Group: Development/System
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://github.com/vathpela/pesign
|
URL: https://github.com/vathpela/pesign
|
||||||
@ -26,6 +26,7 @@ Source0: https://github.com/vathpela/pesign/releases/download/%{version}/pesign-
|
|||||||
Source1: certs.tar.xz
|
Source1: certs.tar.xz
|
||||||
|
|
||||||
Patch0001: 0001-cms-kill-generate_integer-it-doesn-t-build-on-i686-a.patch
|
Patch0001: 0001-cms-kill-generate_integer-it-doesn-t-build-on-i686-a.patch
|
||||||
|
Patch0002: 0002-Fix-command-line-parsing.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains the pesign utility for signing UEFI binaries as
|
This package contains the pesign utility for signing UEFI binaries as
|
||||||
@ -134,6 +135,9 @@ modutil -force -dbdir %{_sysconfdir}/pki/pesign -add opensc \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 12 2016 Adam Williamson <awilliam@redhat.com> - 0.112-3
|
||||||
|
- backport fix for command line parsing from upstream master
|
||||||
|
|
||||||
* Wed Aug 10 2016 Peter Jones <pjones@redhat.com> - 0.112-2
|
* Wed Aug 10 2016 Peter Jones <pjones@redhat.com> - 0.112-2
|
||||||
- Build with newer efivar.
|
- Build with newer efivar.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user