gentoo resync : 12.05.2022

4 files changed, 0 insertions, 156 deletions

diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index ddc0018d7c6b..3e385ae1df1a 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1,10 +1,6 @@
-AUX pesign-113-enum-conversion.patch 1571 BLAKE2B b1e8f90a220ba7dbdba9d16c1c568fed6e463f8d550b678d85d6c806bc451a023d989ad0830075a4e4b28411685e29d60c5c887d3af100b85a048dcff0a103c0 SHA512 cfa001265bfda5428ef72134d05ec16bee679a3906832aab4100f2c567f22e62d089b8cd475b9707926485c30958e70ba48c4035e118c480d008114fb6876c62
-AUX pesign-113-nss.patch 2092 BLAKE2B f75730c2ab48f0ff6af4237fc46c535b3ceead357e31a548c28b78648fec7d52a5cc1bc9dfdb9db4e6cf22b7312cc452afb04a3088810140055ae88b55fb2f1d SHA512 7a4ebd4c875cf6678a6d2ca4083eafea552259e2c1692d167d0b948ac73d50244db3feea1c6d7c403e152236421609da5d92cd6405fb3107e1c3933c2f94fece
 AUX pesign-114-format-string.patch 4359 BLAKE2B 12a7c43162d806050c2fe4c5cf8e289fe262a158ac8cefb60a26a3233831526cfe3e98bea956f7158ea648b22da6cd0cc36e807101485b299f8be6cb2bc93ec2 SHA512 133f452089ec6691d3b50ff7a73399382b5e300f1d1686e9e4f98ffcfa1fce824503c146589d249a67e28df5dfc7c737fb05ad67e2c707aa97fb1dfebb550993
 AUX pesign-114-no-werror.patch 537 BLAKE2B a92e320460d83a943f60ee2524344a24f907d5fa09416ecc1e5024941d7f4130afe339f508301594d7ff0e6f53166093086e64b774a8448c55a3fbb73e74568e SHA512 e64b2f3ebeabba2e74c281a2a8205faa0ba0fac91e9153a8979e3edbf695274d4e940502736db12ba6bcb19a70179c5529b262f6a8b23779f19a750ff810cda3
 AUX pesign-114-wanalyzer-diagnostic.patch 734 BLAKE2B dcfae1fb4bea691ffb2bbd3f2e4f40e1e21f16840f4dfcc9293f856fdf6f75913bf6c12f7739ffa0e453949a9aa0add9925e7a0ee4adea6452c1007c4a40e11b SHA512 21ef15d5d1358bb9ff92f337a1da149bf993f04a6c0cd391956ce7175ac15f83596a3601a68eb51a9f88eb76c69dba8a3f57b672d9e628d0f75e9678d819a593
-DIST pesign-113.tar.gz 124618 BLAKE2B 36cdface6ecdf9003251da3058b21b2ee8e94eb655e47a8668b38c4ea576d990a71860952eea277d5e029bb007039c8e3ded9918e89d47f6db404423acbd1cc7 SHA512 e71dc90c2ab8085d1b000c0d2cf9cb00ddaed1ea1393db75c2d19a96f1b1c188a26b76850533ba97ec254a3b48db6b07a69b597c329ac891e64422780a358c24
 DIST pesign-114.tar.gz 148898 BLAKE2B 0dae3b4e17c61bcea02a6f81f6a62f8d526e83954bf95d0de24726daa81e45a3b42b6867f2d64decd69f421a14f5e2ff6ff1ec26246f44d68b242b452e60d9a1 SHA512 567176718e098c3494e27ce29b61ef396ca2503137260fc36c784951f0bd2130c9f61c655461d6091e9bdb0df77c9e00cf2fde8fb1b1c5ab83e4b9c57d65fdab
-EBUILD pesign-113.ebuild 1183 BLAKE2B 5b997df6d0d7670b7f64ea61404ba5682e6be810c3634c36002514b5617be88b72ed95ca603a982bcc0502e422f07a5857eca450ccf7d92b2445393bc0f5f2ff SHA512 dc6e6bc4ae0b80446628ab9c15691d7896d594eb7bb4404667f15d452c3a337e89bec9b4e63bbbb0f99421e33b44efcbc114cc973db6c29283a83edcc9372c9b
 EBUILD pesign-114.ebuild 1233 BLAKE2B b61a091d19b2f6d58e697af779ca5032b44f29a89c97c42c5f1b4c64eb595ea616fe37dc2c7155ce4f3d1eff82ffcc326cd58448e1cbb05a079fec6d2d517f08 SHA512 0b7f43429fa81ebbe551044da0a737745891f2b2d8cd16bf71e8a88faef631151e32059e8f85c156160295f5577d151cca27a4b4061e4185febfaab2e152a8db
 MISC metadata.xml 249 BLAKE2B 0928166bc28197e80603bef476a41c55e1e593a7e2636ecb634cecd26b5df5896667b06f049e1a2737f6da0330d243387068b6beededab2c3c8cab7208c1016d SHA512 dcbdae805ad96a8343af41708b249dfb119c7b18146279212b9747a91fbb64beb9e23b606151a77b42ea4f2fbbcf9f81d48067cd26122c61dee8b8178277d307
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
-}