summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2019-09-11 13:23:08 +0200
committerMichał Górny <mgorny@gentoo.org>2019-09-11 18:18:18 +0200
commit74d759d3377faa148073feae3d7fa1fe9f2bcd44 (patch)
treeab08f01e11d08a10b2266a897be874603418ee41 /app-crypt/pesign/files
parentapp-crypt/osslsigncode: Drop old (diff)
downloadgentoo-74d759d3377faa148073feae3d7fa1fe9f2bcd44.tar.gz
gentoo-74d759d3377faa148073feae3d7fa1fe9f2bcd44.tar.bz2
gentoo-74d759d3377faa148073feae3d7fa1fe9f2bcd44.zip
app-crypt/pesign: Drop old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
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, 0 insertions, 86 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
deleted file mode 100644
index 6271a999859a..000000000000
--- a/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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
deleted file mode 100644
index b6147fe68e6d..000000000000
--- a/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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;
-