summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Michael <david.michael@coreos.com>2017-02-07 13:23:11 -0800
committerGöktürk Yüksek <gokturk@gentoo.org>2017-02-09 18:41:17 -0500
commitbc18c616f9a7e080e08092b848032c5af38120f1 (patch)
tree4f15bfbf8506c65c806fbaceb20eb20e2517cf9a /app-crypt/pesign/files
parentnet-misc/curl: arm64 keyword (bug 606098 part 1). (diff)
downloadgentoo-bc18c616f9a7e080e08092b848032c5af38120f1.tar.gz
gentoo-bc18c616f9a7e080e08092b848032c5af38120f1.tar.bz2
gentoo-bc18c616f9a7e080e08092b848032c5af38120f1.zip
app-crypt/pesign: Add an ebuild for 0.112 #608572
Diffstat (limited to 'app-crypt/pesign/files')
-rw-r--r--app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch73
-rw-r--r--app-crypt/pesign/files/pesign-0.112-fix-initializer.patch13
2 files changed, 86 insertions, 0 deletions
diff --git a/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch b/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch
new file mode 100644
index 000000000000..6271a999859a
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch
@@ -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
+
diff --git a/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch b/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch
new file mode 100644
index 000000000000..b6147fe68e6d
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch
@@ -0,0 +1,13 @@
+This addresses a -Werror=missing-braces build failure from GCC bug #53119.
+
+--- a/libdpe/pe_allocspace.c
++++ b/libdpe/pe_allocspace.c
+@@ -61,7 +61,7 @@
+ struct pe32plus_opt_hdr *opthdr = pe->state.pe32plus_exe.opthdr;
+
+ Pe_Scn *scn = NULL;
+- struct section_header shdr = { 0, }, tmp_shdr;
++ struct section_header shdr = { { 0, } }, tmp_shdr;
+ if (pehdr->sections < 1)
+ return -1;
+