bump(app-crypt/pesign): sync with upstream

2025-08-18 02:16:59 +02:00 · 2017-02-09 16:43:40 -08:00 · 2017-02-09 16:43:40 -08:00 · 64bba4f659
commit 64bba4f659
parent 22bf1d99f9
9 changed files with 189 additions and 38 deletions
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pesign/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pesign/ChangeLog
@ -1,9 +0,0 @@
-# ChangeLog for app-crypt/pesign
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pesign/ChangeLog,v 1.1 2013/08/29 23:18:55 gregkh Exp $
-
-*pesign-0.108 (29 Aug 2013)
-
-  29 Aug 2013; Greg Kroah-Hartman <gregkh@gentoo.org> +files/destdir.patch,
-  +metadata.xml, +pesign-0.108.ebuild:
-  0.108 pesign added
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pesign/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pesign/Manifest
@ -1,5 +1,10 @@
 AUX destdir.patch 249 SHA256 75aae3e3b4c009ab5ac039203cd6cfb382d2c8d0e670df62b6a8c64a34971449 SHA512 dc35c71d6143c164d17723bfbb5f899c863abb4ca46a96356054e46fcedf9d708f9f4ef3345bd5966b9e492cbfa9dd5e3e85545853799859315ed57640c03ee4 WHIRLPOOL bf0fc9403299166fe9dfebe46628417e069697e261c0bd17b74043497b1bc1e5b27662725980b3108da63ddbbf3adaca5a859bd93f728d60f47d76c29ca42404
-DIST 0.108.tar.gz 96838 SHA256 2019882be0286df1c58efa8c588332106b89418a6bd0fce3de8da4ca16636986 SHA512 f72fb9c3e843341300b68e06bb153690734f6e506cdd9f0d9362c760ff48194ed1ed29e0b58a5050e7331069ad47a9902cc9e34bf616667baf84208f2b69a918 WHIRLPOOL 0af005d0b6dbdff23787c009153cae07c6907d111f57831611e85c49656e29e150ffd71683f349880cfb8975547ea3a3e655cdce31b047b355ecf097e7c7ba77
-EBUILD pesign-0.108.ebuild 1290 SHA256 2d9a121989069d960c76bc548f7fbdf601b3a306bb33595a8243193bfac5f054 SHA512 ad8ee75edffeb19a9e05f57a81e3b4c711253ba0ac08f7d1a12886d6f79fa9b6235fbbbc84c25f133b73470d763a19804ad5822a9436a22a44ff79482fb8ea3e WHIRLPOOL f5a17f023674af27cfd715385265497923627fc5e62a894fb09d09be0b8dac3759e352eef5298cfbdbbd066cffa3566bba769878186558a4acd6b3a07bd23d7e
-MISC ChangeLog 370 SHA256 cb55b2d04ee9f5ddf3cf6eaed2a3ba7e975538a05fe40b2fff6f57baa418c019 SHA512 d99ff90a4b2ee4a99ffedbfc7ef5a84ffd787fbb965cbab5b3218de047264b28ea26d556fafa76779f4bc3bee0593f146437cbd9e965f9ed2ced10f68cd157c3 WHIRLPOOL 83c89288e05a2471c0aaec029e372b467d0c90491eedea24c459d97c62039bb2158513c143219630422d7290cbbdbd18e70e5cd34dc371cb2bff40f2fbec94a3
-MISC metadata.xml 240 SHA256 060d4d570194ff567e10d66246f85d4b9fee1efb17d111aeb9f03345f6e20efd SHA512 41a5c4b9e67d814937a0524714617a059c1351a00ac12d9344373f43b41d074e24fab5598e44c8a22f1848bfa12b8fc76cd5674ca62cd1f917b3235c77721971 WHIRLPOOL da0b560d9528cfe4fcff409de2d9749cf9ae8b7a04468b42463e8097b89e152a67a0da0ea7e6db1186f852687979c2e843e487a5eb76e663717148a796aa093d
+AUX pesign-0.112-fix-cli-opts.patch 2228 SHA256 387de650336376a8b5edb2cdc4097114c75231b52c5dc4fe4408d606f51cdbfd SHA512 62d2ec0059ff518b576b6399a217f47b1f361c41292055b8a7326e81cda30190b4a62dad7dd8150855b2025af1ad25458a2cbbfd3ae89ca6c870067224662695 WHIRLPOOL 59d6308b157fc42da606b61b9c27097039c4cab9b15d9ecbe3f6b4db3f44a7cbfc9b75b88122fe3593532674f8556278d352bca4a3977d6a239b6ccddcd5948f
+AUX pesign-0.112-fix-initializer.patch 388 SHA256 417d2a19d929627a0dec093767bbd19f0c7774184e0f5e607ef90a789e9b630b SHA512 1b76c6dfe7ddc76a2051038894b7e2da72c01ebc05a46d4b6ebc05a092a55d699161e04c4df73d1afb7752e6a138ed8c9c28eda55897c82934ca852be42dae84 WHIRLPOOL 05d5c1a34ff01767ca211545922c9e13208f5ec9fab99738da307465838f78111152adc18d952ca3ea7fcd35a4a8077c33b4cce77583bb98c9c9c09c0d52850f
+DIST pesign-0.108.tar.gz 96838 SHA256 2019882be0286df1c58efa8c588332106b89418a6bd0fce3de8da4ca16636986 SHA512 f72fb9c3e843341300b68e06bb153690734f6e506cdd9f0d9362c760ff48194ed1ed29e0b58a5050e7331069ad47a9902cc9e34bf616667baf84208f2b69a918 WHIRLPOOL 0af005d0b6dbdff23787c009153cae07c6907d111f57831611e85c49656e29e150ffd71683f349880cfb8975547ea3a3e655cdce31b047b355ecf097e7c7ba77
+DIST pesign-0.112.tar.gz 107632 SHA256 df4f5459137126e2fdb06484d755a81b6ec9a7b50099dcc3088ea2d41047cd06 SHA512 9a0cd266f973fbd7bbbd23939d0be3c34dbccd9ab20941bf967ca1b18aa5bf5d2c41cdef0799399e09e7b0fc59a0b34bc660afb6da292eb1c127db2893362018 WHIRLPOOL e5f3d3801ff7df7d643e87bc851f2645931e18df140b25a7add4136db1bd89c2a8da75d8f018533d5b16ab80695740d00ac379e166993a1912ba9ad2abee6791
+EBUILD pesign-0.108.ebuild 1187 SHA256 3512d04b3631b3e03f9b3f93d1348903c9ae7cba86e339c4d68ed630a2c77499 SHA512 3d5c8f3b393bbfe24aa0622e9d641674f1b8e5b3f1aa20d6641b2d17d29c4824ebedabfbb5239916d46fe090f2abf5e654f9e1729f32628cd097f8f3ddf3dcfe WHIRLPOOL 59607edc0472cefd7696a42b5421f38b6e25e68ded895868131feb9734d7b4880b283ac6caba6858737711efa096519df12269660a3562edc707e501846cb05e
+EBUILD pesign-0.112.ebuild 1007 SHA256 00c5b745c07108ce8a5f841222fcf610bb8504df3800e496db214f1072263aee SHA512 713b6b493080dfac5c2468b2462c263d7ec01f37dfecb9f63d31a201bca5ab2bb4205761d809a39d3289fabd5c833c42306240ba6fe8fe3024e7d722ffd15780 WHIRLPOOL 6b076a89c9bc779771188b9b24e522ccc2ec7cb27b88d8723dc056c14d3c3f45ead8a8a920e9eedd8becd94441397451f23cb99c45af225bad14a464658a8c0b
+MISC ChangeLog 2454 SHA256 f5c5d6fa0fad7b3b0c0c691d91f52a97156350b9ab9afb72d8f23c2ef6c6db0c SHA512 c0e8166c72bdd47be814ac780c46f33d2eb7b15666a686aed4c8c568a0c0fda1bd4eabc5f2b2a04d49644e7e16199487668715a783390ee1a1470e5791f33d82 WHIRLPOOL f644d83492550f0293c5b304a2d629f6f8e744d34dece049c2cd3f5603eb87431ab8ec39a88dab0bb7809d7d7603f6cfe4fa165b6e8d5186416e97212c86cc7e
+MISC ChangeLog-2015 1045 SHA256 c4b1ea3c1832dbd4f460aa346974789fb65824cbd69aacb24dc3a8834377e6be SHA512 970be07aec9815faf2ffbf9855c8331c07eabec884c70d7382d980fc1f376f7f77977f6e653c20e820073db5b001539132a38cc0586ae4db43d036c641d4ab3e WHIRLPOOL 1c9b8f75019201c42ebabb79f89313eb144b2fb33a56cf17857973b8284c0078c337c46194a27ff17ff163ba2fbd268f873993f5e0bdfe87fdc8aed3c31460c2
+MISC metadata.xml 466 SHA256 ed83ff7c2420eafe66aed4da117b1869c3dfb4f4a29865b4b18ca5ca6ccc9e28 SHA512 cffb289b804411ba72b52113ac4784e2873c0c0730496eb3b29a35c2d2a8891031f579e70cb7a64f0da685fedbcf3f0787ed2c630664cb6c363ddbd66e0d1364 WHIRLPOOL 22ad17121a5743d51a59b78837933e65de31de9032bf9da4e92d28655d4568dcb2f186f8f196bff9be901ccb4923afdda989dab0646c96ba08910ce58bfa713d
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch
+++ b/sdk_container/src/third_party/portage-stable/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
+
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch
+++ b/sdk_container/src/third_party/portage-stable/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;
+ 
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pesign/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pesign/metadata.xml
@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
- <email>vapier@gentoo.org</email>
- <description>do whatever</description>
-</maintainer>
+  <maintainer type="person">
+    <email>david.michael@coreos.com</email>
+    <name>David Michael</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">vathpela/pesign</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pesign/pesign-0.108.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pesign/pesign-0.108.ebuild
@ -1,43 +1,44 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pesign/pesign-0.108.ebuild,v 1.1 2013/08/29 23:18:55 gregkh Exp $
+# $Id$
+
+EAPI=5

-EAPI="4"
 inherit eutils multilib

 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"
-
+SRC_URI="https://github.com/vathpela/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="libressl"

-RDEPEND="dev-libs/openssl
-	sys-apps/util-linux"
+RDEPEND="
+	dev-libs/nspr
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-apps/util-linux
+"
 DEPEND="${RDEPEND}
 	sys-apps/help2man
 	sys-boot/gnu-efi
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"

 src_prepare() {
 	epatch "${FILESDIR}"/destdir.patch
 }

 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc README COPYING TODO || die
+	default

 	# remove some files that don't make sense for Gentoo installs
-	rm -rf ${D}/etc/
-	rm -rf ${D}/usr/share/doc/pesign/
+	rm -rf "${ED}/etc/" "${ED}/usr/share/doc/pesign/" || die

 	# create .so symlink
-	cd ${D}/usr/$(get_libdir)/
-	#cd ${D}/lib64/
-	ln -s libdpe.so libdpe.so.0
+	ln -s libdpe.so "${ED}/usr/$(get_libdir)/libdpe.so.0"
 }
 #
 #src_prepare() {
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pesign/pesign-0.112.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pesign/pesign-0.112.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-apps/util-linux
+"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	sys-libs/efivar
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.112-fix-cli-opts.patch
+	"${FILESDIR}"/${PN}-0.112-fix-initializer.patch
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+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
+}
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pesign-0.108
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pesign-0.108
@ -1,12 +1,13 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/openssl sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
+DEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
 DESCRIPTION=Tools for manipulating signed PE-COFF binaries
-EAPI=4
+EAPI=5
 HOMEPAGE=https://github.com/vathpela/pesign
+IUSE=libressl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-apps/util-linux
+RDEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
 SLOT=0
-SRC_URI=https://github.com/vathpela/pesign/archive/0.108.tar.gz
+SRC_URI=https://github.com/vathpela/pesign/archive/0.108.tar.gz -> pesign-0.108.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=259e34e6e0876dacb819b79947297bd7
+_md5_=8311442311bed24572e8d9ed430c9b6b
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pesign-0.112
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pesign-0.112
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi sys-libs/efivar virtual/pkgconfig
+DESCRIPTION=Tools for manipulating signed PE-COFF binaries
+EAPI=6
+HOMEPAGE=https://github.com/vathpela/pesign
+IUSE=libressl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
+SLOT=0
+SRC_URI=https://github.com/vathpela/pesign/archive/0.112.tar.gz -> pesign-0.112.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=55093dd8d11644b0a9c626ac699b3958