From 74d759d3377faa148073feae3d7fa1fe9f2bcd44 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 11 Sep 2019 13:23:08 +0200 Subject: app-crypt/pesign: Drop old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- app-crypt/pesign/Manifest | 1 - .../pesign/files/pesign-0.112-fix-cli-opts.patch | 73 ---------------------- .../files/pesign-0.112-fix-initializer.patch | 13 ---- app-crypt/pesign/pesign-0.112.ebuild | 54 ---------------- 4 files changed, 141 deletions(-) delete mode 100644 app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch delete mode 100644 app-crypt/pesign/files/pesign-0.112-fix-initializer.patch delete mode 100644 app-crypt/pesign/pesign-0.112.ebuild (limited to 'app-crypt') diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest index 0dca49cdc756..a80770139a3c 100644 --- a/app-crypt/pesign/Manifest +++ b/app-crypt/pesign/Manifest @@ -1,2 +1 @@ -DIST pesign-0.112.tar.gz 107632 BLAKE2B 737b75aec7efa9f41dbdb509405dede914cd5aa563572f0d2ede96a321f4a669170c696c7bd93bad1a5c1a6f2c65715b66317544fa6fc55d6b7f85436d778e8a SHA512 9a0cd266f973fbd7bbbd23939d0be3c34dbccd9ab20941bf967ca1b18aa5bf5d2c41cdef0799399e09e7b0fc59a0b34bc660afb6da292eb1c127db2893362018 DIST pesign-113.tar.gz 124618 BLAKE2B 36cdface6ecdf9003251da3058b21b2ee8e94eb655e47a8668b38c4ea576d990a71860952eea277d5e029bb007039c8e3ded9918e89d47f6db404423acbd1cc7 SHA512 e71dc90c2ab8085d1b000c0d2cf9cb00ddaed1ea1393db75c2d19a96f1b1c188a26b76850533ba97ec254a3b48db6b07a69b597c329ac891e64422780a358c24 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 -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 ---- - 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; - diff --git a/app-crypt/pesign/pesign-0.112.ebuild b/app-crypt/pesign/pesign-0.112.ebuild deleted file mode 100644 index 3937fb8fdcd6..000000000000 --- a/app-crypt/pesign/pesign-0.112.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils toolchain-funcs - -DESCRIPTION="Tools for manipulating signed PE-COFF binaries" -HOMEPAGE="https://github.com/vathpela/pesign" -SRC_URI="https://github.com/vathpela/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl" - -RDEPEND=" - dev-libs/nspr - dev-libs/nss - dev-libs/popt - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-apps/util-linux - sys-libs/efivar -" -DEPEND="${RDEPEND} - sys-apps/help2man - sys-boot/gnu-efi - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.112-fix-cli-opts.patch - "${FILESDIR}"/${PN}-0.112-fix-initializer.patch -) - -src_compile() { - emake AR="$(tc-is-gcc && echo "$(tc-getCC)-ar" || tc-getAR)" \ - AS="$(tc-getAS)" \ - CC="$(tc-getCC)" \ - LD="$(tc-getLD)" \ - OBJCOPY="$(tc-getOBJCOPY)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - RANLIB="$(tc-getRANLIB)" -} - -src_install() { - emake DESTDIR="${ED}" VERSION="${PVR}" install - einstalldocs - - # remove some files that don't make sense for Gentoo installs - rm -rf "${ED%/}/etc/" "${ED%/}/var/" \ - "${ED%/}/usr/share/doc/${PF}/COPYING" || die -} -- cgit v1.2.3-65-gdbad