diff options
author | Sam James <sam@gentoo.org> | 2022-04-17 19:37:13 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2022-04-17 19:59:05 +0100 |
commit | ba753bec10846f7d21b2ba0ab9aaaf878709243a (patch) | |
tree | dcc4453b7b5a0016eff00cf03a96930ca534b8aa | |
parent | app-crypt/coolkey: drop 1.1.0-r7 (diff) | |
download | gentoo-ba753bec10846f7d21b2ba0ab9aaaf878709243a.tar.gz gentoo-ba753bec10846f7d21b2ba0ab9aaaf878709243a.tar.bz2 gentoo-ba753bec10846f7d21b2ba0ab9aaaf878709243a.zip |
app-crypt/pesign: drop 113
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r-- | app-crypt/pesign/Manifest | 1 | ||||
-rw-r--r-- | app-crypt/pesign/files/pesign-113-enum-conversion.patch | 46 | ||||
-rw-r--r-- | app-crypt/pesign/files/pesign-113-nss.patch | 47 | ||||
-rw-r--r-- | app-crypt/pesign/pesign-113.ebuild | 59 |
4 files changed, 0 insertions, 153 deletions
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest index cb3b8faf21c7..e3ca7ffe3ede 100644 --- a/app-crypt/pesign/Manifest +++ b/app-crypt/pesign/Manifest @@ -1,2 +1 @@ -DIST pesign-113.tar.gz 124618 BLAKE2B 36cdface6ecdf9003251da3058b21b2ee8e94eb655e47a8668b38c4ea576d990a71860952eea277d5e029bb007039c8e3ded9918e89d47f6db404423acbd1cc7 SHA512 e71dc90c2ab8085d1b000c0d2cf9cb00ddaed1ea1393db75c2d19a96f1b1c188a26b76850533ba97ec254a3b48db6b07a69b597c329ac891e64422780a358c24 DIST pesign-114.tar.gz 148898 BLAKE2B 0dae3b4e17c61bcea02a6f81f6a62f8d526e83954bf95d0de24726daa81e45a3b42b6867f2d64decd69f421a14f5e2ff6ff1ec26246f44d68b242b452e60d9a1 SHA512 567176718e098c3494e27ce29b61ef396ca2503137260fc36c784951f0bd2130c9f61c655461d6091e9bdb0df77c9e00cf2fde8fb1b1c5ab83e4b9c57d65fdab diff --git a/app-crypt/pesign/files/pesign-113-enum-conversion.patch b/app-crypt/pesign/files/pesign-113-enum-conversion.patch deleted file mode 100644 index 89a57e460fbe..000000000000 --- a/app-crypt/pesign/files/pesign-113-enum-conversion.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c555fd74c009242c3864576bd5f17a1f8f4fdffd Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Tue, 18 Feb 2020 16:28:56 -0500 -Subject: [PATCH] pesigcheck: Fix a wrong assignment - -gcc says: - - pesigcheck.c: In function 'check_signature': - pesigcheck.c:321:17: error: implicit conversion from 'enum <anonymous>' to 'enum <anonymous>' [-Werror=enum-conversion] - 321 | reason->type = siBuffer; - | ^ - pesigcheck.c:333:17: error: implicit conversion from 'enum <anonymous>' to 'enum <anonymous>' [-Werror=enum-conversion] - 333 | reason->type = siBuffer; - | ^ - cc1: all warnings being treated as errors - -And indeed, that line of code makes no sense at all - it was supposed to -be reason->sig.type. - -Signed-off-by: Peter Jones <pjones@redhat.com> ---- - src/pesigcheck.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/pesigcheck.c b/src/pesigcheck.c -index 524cce3..8fa0f1a 100644 ---- a/src/pesigcheck.c -+++ b/src/pesigcheck.c -@@ -318,7 +318,7 @@ check_signature(pesigcheck_context *ctx, int *nreasons, - reason->type = SIGNATURE; - reason->sig.data = data; - reason->sig.len = datalen; -- reason->type = siBuffer; -+ reason->sig.type = siBuffer; - nreason += 1; - is_invalid = true; - } -@@ -330,7 +330,7 @@ check_signature(pesigcheck_context *ctx, int *nreasons, - reason->type = SIGNATURE; - reason->sig.data = data; - reason->sig.len = datalen; -- reason->type = siBuffer; -+ reason->sig.type = siBuffer; - nreason += 1; - has_valid_cert = true; - } diff --git a/app-crypt/pesign/files/pesign-113-nss.patch b/app-crypt/pesign/files/pesign-113-nss.patch deleted file mode 100644 index 5a227a87268b..000000000000 --- a/app-crypt/pesign/files/pesign-113-nss.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b535d1ac5cbcdf18a97d97a92581e38080d9e521 Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Tue, 14 May 2019 11:28:38 -0400 -Subject: [PATCH] efikeygen: Fix the build with nss 3.44 - -NSS 3.44 adds some certificate types, which changes a type and makes -some encoding stuff weird. As a result, we get: - -gcc8 -I/wrkdirs/usr/ports/sysutils/pesign/work/pesign-0.110/include -O2 -pipe -fstack-protector-strong -Wl,-rpath=/usr/local/lib/gcc8 -isystem /usr/local/include -fno-strict-aliasing -g -O0 -g -O0 -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants --std=gnu99 -D_GNU_SOURCE -Wno-unused-result -Wno-unused-function -I../include/ -I/usr/local/include/nss -I/usr/local/include/nss/nss -I/usr/local/include/nspr -Werror -fPIC -isystem /usr/local/include -DCONFIG_amd64 -DCONFIG_amd64 -c efikeygen.c -o efikeygen.o -In file included from /usr/local/include/nss/nss/cert.h:22, - from efikeygen.c:39: -efikeygen.c: In function 'add_cert_type': -/usr/local/include/nss/nss/certt.h:445:5: error: unsigned conversion from 'int' to 'unsigned char' changes value from '496' to '240' [-Werror=overflow] - (NS_CERT_TYPE_SSL_CLIENT | NS_CERT_TYPE_SSL_SERVER | NS_CERT_TYPE_EMAIL | \ - ^ -efikeygen.c:208:23: note: in expansion of macro 'NS_CERT_TYPE_APP' - unsigned char type = NS_CERT_TYPE_APP; - ^~~~~~~~~~~~~~~~ -cc1: all warnings being treated as errors - -This is fixed by just making it an int. - -Fixes github issue #48. - -Signed-off-by: Peter Jones <pjones@redhat.com> -Upstream-Status: Accepted -[https://github.com/rhboot/pesign/commit/b535d1ac5cbcdf18a97d97a92581e38080d9e521] ---- - src/efikeygen.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/efikeygen.c b/src/efikeygen.c -index ede76ef..2cd953e 100644 ---- a/src/efikeygen.c -+++ b/src/efikeygen.c -@@ -208,7 +208,7 @@ static int - add_cert_type(cms_context *cms, void *extHandle, int is_ca) - { - SECItem bitStringValue; -- unsigned char type = NS_CERT_TYPE_APP; -+ int type = NS_CERT_TYPE_APP; - - if (is_ca) - type |= NS_CERT_TYPE_SSL_CA | --- -2.22.0 - diff --git a/app-crypt/pesign/pesign-113.ebuild b/app-crypt/pesign/pesign-113.ebuild deleted file mode 100644 index 1b6a9bf475c8..000000000000 --- a/app-crypt/pesign/pesign-113.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Tools for manipulating signed PE-COFF binaries" -HOMEPAGE="https://github.com/rhboot/pesign" -SRC_URI="https://github.com/rhboot/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-libs/nspr - dev-libs/nss - dev-libs/openssl:0= - dev-libs/popt - sys-apps/util-linux - sys-libs/efivar -" -DEPEND="${RDEPEND} - sys-boot/gnu-efi -" -BDEPEND=" - sys-apps/help2man - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-113-nss.patch - "${FILESDIR}"/${PN}-113-enum-conversion.patch -) - -src_configure() { - append-cflags -O1 #721934 - default -} - -src_compile() { - emake AR="$(tc-getAR)" \ - ARFLAGS="-cvqs" \ - 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 -} |