From 22bf1d99f97e321b69370d154e0cd404c496ac9e Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 9 Feb 2017 12:09:20 -0800 Subject: [PATCH 1/2] bump(sys-libs/efivar): sync with upstream --- .../metadata/md5-cache/sys-libs/efivar-0.21 | 12 +++++ .../metadata/md5-cache/sys-libs/efivar-0.23 | 12 +++++ .../metadata/md5-cache/sys-libs/efivar-27 | 12 +++++ .../metadata/md5-cache/sys-libs/efivar-30 | 12 +++++ .../portage-stable/sys-libs/efivar/Manifest | 15 ++++++ .../sys-libs/efivar/efivar-0.21.ebuild | 31 ++++++++++++ .../sys-libs/efivar/efivar-0.23.ebuild | 45 +++++++++++++++++ .../sys-libs/efivar/efivar-27.ebuild | 44 +++++++++++++++++ .../sys-libs/efivar/efivar-30.ebuild | 48 +++++++++++++++++++ .../efivar/files/0.21-initializer.patch | 42 ++++++++++++++++ .../efivar/files/0.21-nvme_ioctl.h.patch | 30 ++++++++++++ .../sys-libs/efivar/files/0.22-flags.patch | 41 ++++++++++++++++ .../efivar/files/0.23-sysmacros.patch | 29 +++++++++++ .../sys-libs/efivar/metadata.xml | 11 +++++ 14 files changed, 384 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.21 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.23 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-27 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-30 create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.21.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.23.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-27.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-30.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-initializer.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.22-flags.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.23-sysmacros.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/efivar/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.21 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.21 new file mode 100644 index 0000000000..41f69ef76f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.21 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure prepare +DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 +DESCRIPTION=Tools and library to manipulate EFI variables +EAPI=5 +HOMEPAGE=https://github.com/rhinstaller/efivar +KEYWORDS=amd64 ia64 x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/popt +SLOT=0 +SRC_URI=https://github.com/rhinstaller/efivar/releases/download/0.21/efivar-0.21.tar.bz2 +_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=eb41f3ab5fc1f61234c7fed03e0a1d4c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.23 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.23 new file mode 100644 index 0000000000..96ce6599d1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-0.23 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 +DESCRIPTION=Tools and library to manipulate EFI variables +EAPI=5 +HOMEPAGE=https://github.com/rhinstaller/efivar +KEYWORDS=~amd64 ~ia64 ~x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/popt +SLOT=0 +SRC_URI=https://github.com/rhinstaller/efivar/releases/download/0.23/efivar-0.23.tar.bz2 +_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=e1a0176fe2e6768e0f06f0148ee76598 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-27 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-27 new file mode 100644 index 0000000000..77a66a20df --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-27 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 +DESCRIPTION=Tools and library to manipulate EFI variables +EAPI=6 +HOMEPAGE=https://github.com/rhinstaller/efivar +KEYWORDS=~amd64 ~ia64 ~x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/popt +SLOT=0/27 +SRC_URI=https://github.com/rhinstaller/efivar/archive/27.tar.gz -> efivar-27.tar.gz +_eclasses_=multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=5df423bb6b4ba7d7a438eb6ba3fa878c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-30 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-30 new file mode 100644 index 0000000000..82fd928c72 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/efivar-30 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 +DESCRIPTION=Tools and library to manipulate EFI variables +EAPI=6 +HOMEPAGE=https://github.com/rhinstaller/efivar +KEYWORDS=amd64 ~ia64 x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/popt +SLOT=0/1 +SRC_URI=https://github.com/rhinstaller/efivar/archive/30.tar.gz -> efivar-30.tar.gz +_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=ba772dacaf9bc79f70df8724a7f8ef4d diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/Manifest new file mode 100644 index 0000000000..d0abb1ddf6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/Manifest @@ -0,0 +1,15 @@ +AUX 0.21-initializer.patch 1261 SHA256 ce6792192c9014bd0db4acbf0866f3d6eb1e608225177cbfaf6dd54b7d447bf5 SHA512 e7593fcefead06007a2314217b4be61161261b2be06c631065ede00f48098b924395605faba2ef859be9b6a242d531942460f2b51ea346d1cb93af94ecb23b3c WHIRLPOOL efcec5c85046ba5acff2b8559fad7c05175ed791ea84f47587013e90a3e2c301df507a776097795f0003625fbc40b95d79ecb1a349ee5ee08d5b4a7ad841b452 +AUX 0.21-nvme_ioctl.h.patch 728 SHA256 f71fb95d12800bc6934213ee2541dbeea2adb8e545929330b4baf5a049bb52e6 SHA512 55dcb19d7d651ba32426c903b9000957829b924f1a0eda52a6368f0378b04f80da3849d86bb28258360592b568105ae0c0b0a20e6663cfb99c2d28dac1592611 WHIRLPOOL 708cb89b07f886168b19c8b9a8bf1ab37596efb65035102631eb0615ebc4ff41b447574bdf441e9a7fc58471e4abef59e220c728154719abd3ece4b164459b7d +AUX 0.22-flags.patch 1436 SHA256 b4cd72973b860d0377e37aa1d44f6324ccbbc99f1bd79b3139c189f08c24c008 SHA512 aa793faa4c583d5cc585bb1942c87e2906b8db74bb99e567aae54b065237e3ad4a74659d1220db700e0badca411f5daa5edc00eed3327a79dfa83f52cf2b3627 WHIRLPOOL 28535287d5dabe6b993909fabd064e2f8636e69caa15f2ae9f9320a8822b31407bbab038f44ea59e70293ba6ad6f921b9c4dcd1dbeb93364c25c17046354c839 +AUX 0.23-sysmacros.patch 619 SHA256 2e54f440504881f7bba0554f48ff0cd389eb4522a442d7cbb7a5092cf227cb9a SHA512 8e7bf9d98c4a9d57dda785a4b70b8bdf723cec2efa13d42ca5a13c52822760306673cefece7a7f03a3768d962bba80698b6133c3036c6b88d8319ab623862188 WHIRLPOOL d8ca7633d1854c355aa2026df2464127cca26e71957ccb5df99a1eba677193864dc20e1da3f19dc5f1ba37abe1a727e1e9f680eff8a8988f71f503cd4674b562 +DIST efivar-0.21.tar.bz2 66677 SHA256 04b9b9de9d9a1a013395400438a033daf4a4290f497ec5be04a120e2ac535094 SHA512 851b5e29c2dab213bb81c6ea5c5c211d36fb6846de8aa1086b0657f06917c2f93bf154aa3a4c2dda22103bdf1d67ca877f9771dc3f979c9311ca24e0bc09492a WHIRLPOOL d6cdb2e2f047a22677d046581490ee4e64a2ac0631be8e41bf6250241b2554f62ddf81226fa3970ee80ebb9ec62665ca21f4fec94cc5ebe05414b0c674ad38dd +DIST efivar-0.23.tar.bz2 67558 SHA256 9ca81f56b0c9177b6536c8187c9cf5974723abcaf57cd34173500c80bff3caa4 SHA512 ff95c735425708cef0f85f1e9f8909e64651d10c303927d9e77d44fcb0a02ec90e4a364b0315cc3f5e30d77059ed2d8f43cc1efbed2db09a695ef7a6f1bb58f4 WHIRLPOOL 35207e4040041c03d105bbf7b2f7f103f1415dbc51dce9614ddba99786b6cacdf88136ab3a888551cf494c3d55685c7991c72fac1c6223255128c7c191e0318c +DIST efivar-27.tar.gz 86132 SHA256 d9457b06f234c9430aeaa6f30f7d7c786fb8ce3261a935afa8de51e2c1b4816d SHA512 354934c166b37f78a11497a4819075b13d44bf43587dc52d0a9773d77df52df2d2b553e5ff799911ab506441d0ea82825f6d1b019932e0bcfbacdd69a241bc9e WHIRLPOOL 5eae9999aa7790112beb5aa03e98ac7d380b1bf9f3fdef10ca7ffda73ee68b1a4cb1a410d0060dca1caef3734fc80d6778a90eccc80719904d5d7f9285db7ab0 +DIST efivar-30.tar.gz 86395 SHA256 20709c76311f8eb8be92977b7ac008ce62501fa9f7fe885a784321540fc352f9 SHA512 ab73c2a49175e01cb4872bfb47708a71399c6f8237a02fbbbf4755fcd10efb82984baf76a83c3b3e7f5cf4183050e535cf18dff2bbfed10d9a0f5d4cf2021b32 WHIRLPOOL d0a7fe13e4359ddafb717b666b81fdecf786f8cc3a794e47a46d80064cd402780feeab5f501f9b0796d3a847b58611b7581341e0e9cb4449d86e75e6903591eb +EBUILD efivar-0.21.ebuild 706 SHA256 47939529738177827ba067256fe0c6ea48cf04a41f03f88af0d741074d144e22 SHA512 fc6a3a1c76ec8b25d30ea583d396c7865d744885af53bea2925c30447de80733b61c2d0a117f880204f7f4dfada2d4ecec5809fb542d0427fabc6453ee7bd287 WHIRLPOOL a02fe6a6b935d96dfac4486c512da83a252ca9c860402362a80626eee9c9249fc7e0c2cd9be5124725f0d53a40f913f5391c33340af0a8be7611b85df0729e4f +EBUILD efivar-0.23.ebuild 916 SHA256 af96e11494bb76c3bbe793362bf23fc8aca8818d4bb171e420c26049e4a6bdca SHA512 062a4b66bed578fb88936763663c5d832ad02d27388b83f92a83ac0ba2dd28a6771ecb6320dc6d3888f9516c231e201c842223f5227bf4ae0f89d3d992eebec8 WHIRLPOOL 918e0df209b0e9dd17906ccffbd382c1b1dfe54d11784609ee082a42104a7fd90f25d213eccddaad57bbe76b7f8b070514a26521dd956304c0779c7c65a4efc0 +EBUILD efivar-27.ebuild 853 SHA256 5230427c3652dcb3658321aeb88b590c83a657aabbca5ef4f7a4d7874f815a1f SHA512 97747190705d76d11a28d14e9485c2a76445cc03d0284a771dc538960ff5a64159c634ae0da901cbed8a65668f60b0786d94f68a051febc6f6f68ec4dd0e51d3 WHIRLPOOL 90431a70a1d261fce537aab25fafaf201a9dcf789532145f2c656aca7df224374c9e681a11307639d12da2dd9ef275cc18aea035092a14009cf1d74d1549a66a +EBUILD efivar-30.ebuild 934 SHA256 1ac71cc5b573619273abd86cf4d5937b2c6aaa11d319c5055c779c2b4169c17f SHA512 2b2121ae75e660db96c9939b7f990f580c8f22a243b86dd846848e81ea067cf4984d4fdb35799db3c754b9dba67df1481c836a03345b637ed079b565c1be2e17 WHIRLPOOL eaee11dcd010b099efb1c7de959200fb9fe964c9fcc9ad5117839651bfeedd4c3dcc019c9a8febc274ee9fc1cb7fcd219c7008d44f2c9afcf1c88a97b8b6bdcd +MISC ChangeLog 5093 SHA256 a7e3e89cd86e8ad9cac2ed75c7acc58e26ea86a1bcad2dd59f4bafd007a74353 SHA512 1c762c73aaafcb54493d2c999563bece398c2a0a1779f9a1b08849f1c26c2b38c4cca8773f977112c286bca9d403319b0facf1fd215c730ab5c2932425084f2d WHIRLPOOL 7956e84bb38f194dc89bd0216971a67dc52dfb9f7294b318c79f36a306fdf69e00abbbb1b154f4a602384d3c8f728eafe4d139f31cc98f9286f18b8f43e3fa83 +MISC ChangeLog-2015 1400 SHA256 19acadd29d4ade26e28eb1b3c90b53fe7bd656c994429ddd2c0210a5c4781ef7 SHA512 a3ddd6f45f6b7d7f29435fea17bd76448dcaed5d15f06aa8e8824d7e1a92848c2ef19204cac4201c4a940103d6f874148f3e9b1726af99c9c778dab5f09598bc WHIRLPOOL 9a685232976e2381e39f103e98fb3df05c0c9ac1ef48ef063f5a2dbab414cd6de464bc775a8d9890cf1f9f2aafe2c102e16ac9c22e04d938f0039c2fcd319bed +MISC metadata.xml 329 SHA256 562af8ae9d4eac40cd37ccea2827ecb766176649c836296a10a75dddc4446181 SHA512 a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df WHIRLPOOL b6c568a210bf85aea3dffae55d3f861fae101047b431b9ed64f60a61ac5b76d4866d63298a8a11e42f78c013388bc932b1fdd73d44a82fa2476138f2521f3444 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.21.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.21.ebuild new file mode 100644 index 0000000000..f53d3363b0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.21.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="Tools and library to manipulate EFI variables" +HOMEPAGE="https://github.com/rhinstaller/efivar" +SRC_URI="https://github.com/rhinstaller/${PN}/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ia64 x86" + +RDEPEND="dev-libs/popt" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-3.18" + +src_prepare() { + epatch "${FILESDIR}/0.21-initializer.patch" + epatch "${FILESDIR}/0.21-nvme_ioctl.h.patch" + epatch_user +} + +src_configure() { + tc-export CC + export libdir="/usr/$(get_libdir)" + unset LIBS # Bug 562004 +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.23.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.23.ebuild new file mode 100644 index 0000000000..49b536202a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-0.23.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="Tools and library to manipulate EFI variables" +HOMEPAGE="https://github.com/rhinstaller/efivar" +SRC_URI="https://github.com/rhinstaller/${PN}/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~x86" + +RDEPEND="dev-libs/popt" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-3.18" + +src_prepare() { + epatch "${FILESDIR}/0.21-nvme_ioctl.h.patch" + epatch "${FILESDIR}/0.23-sysmacros.patch" + epatch_user +} + +src_configure() { + tc-export CC + tc-ld-disable-gold + export libdir="/usr/$(get_libdir)" + unset LIBS # Bug 562004 +} + +src_compile() { + # Avoid building static binary/libs + opts=( + BINTARGETS=efivar + STATICLIBTARGETS= + ) + emake "${opts[@]}" +} + +src_install() { + emake "${opts[@]}" DESTDIR="${D}" install +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-27.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-27.ebuild new file mode 100644 index 0000000000..7db73e1e64 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-27.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="Tools and library to manipulate EFI variables" +HOMEPAGE="https://github.com/rhinstaller/efivar" +SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ia64 ~x86" + +RDEPEND="dev-libs/popt" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-3.18" + +src_prepare() { + default + sed -i -e s/-Werror// gcc.specs || die +} + +src_configure() { + tc-export CC + tc-ld-disable-gold + export libdir="/usr/$(get_libdir)" + unset LIBS # Bug 562004 +} + +src_compile() { + # Avoid building static binary/libs + opts=( + BINTARGETS=efivar + STATICLIBTARGETS= + ) + emake "${opts[@]}" +} + +src_install() { + emake "${opts[@]}" DESTDIR="${D}" install +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-30.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-30.ebuild new file mode 100644 index 0000000000..dfb105faae --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/efivar-30.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Tools and library to manipulate EFI variables" +HOMEPAGE="https://github.com/rhinstaller/efivar" +SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/1" +KEYWORDS="amd64 ~ia64 x86" + +RDEPEND="dev-libs/popt" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-3.18" + +src_prepare() { + default + sed -i -e s/-Werror// gcc.specs || die +} + +src_configure() { + tc-export CC + + # https://github.com/rhinstaller/efivar/issues/64 + append-cflags -flto + + tc-ld-disable-gold + export libdir="/usr/$(get_libdir)" + unset LIBS # Bug 562004 +} + +src_compile() { + # Avoid building static binary/libs + opts=( + BINTARGETS=efivar + STATICLIBTARGETS= + ) + emake "${opts[@]}" +} + +src_install() { + emake "${opts[@]}" DESTDIR="${D}" install +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-initializer.patch b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-initializer.patch new file mode 100644 index 0000000000..25d0659683 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-initializer.patch @@ -0,0 +1,42 @@ +From a3606c02fd271d32e364fcc540e34ba1899309f6 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 14 Jul 2015 09:33:54 -0400 +Subject: [PATCH] Sometimes the compiler doesn't like { 0, } as an + initializer... + +Because it really wants to be { {0, },} or something, and sometimes the +compiler, knowing full well what we're trying to do, likes to complain +about the rigor applied to our technique in doing it. + +memset() the struct ifreq to 0 instead so I don't need to figure out its +internal structure just to zero it out. + +Resolves #28 + +Signed-off-by: Peter Jones +--- + src/linux.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/linux.c b/src/linux.c +index 57f71f3..817b8e6 100644 +--- a/src/linux.c ++++ b/src/linux.c +@@ -847,12 +847,13 @@ ssize_t + __attribute__((__visibility__ ("hidden"))) + make_mac_path(uint8_t *buf, ssize_t size, const char * const ifname) + { +- struct ifreq ifr = { 0, }; ++ struct ifreq ifr; + struct ethtool_drvinfo drvinfo = { 0, }; + int fd, rc; + ssize_t ret = -1, sz, off=0; + char busname[PATH_MAX+1] = ""; + ++ memset(&ifr, 0, sizeof (ifr)); + strncpy(ifr.ifr_name, ifname, IF_NAMESIZE); + drvinfo.cmd = ETHTOOL_GDRVINFO; + ifr.ifr_data = (caddr_t)&drvinfo; +-- +2.4.6 + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch new file mode 100644 index 0000000000..221ec5a731 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.21-nvme_ioctl.h.patch @@ -0,0 +1,30 @@ +From ae0869b71a90bc14e67f3c917bd9c96db25c99a6 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 14 Jan 2016 17:02:31 -0500 +Subject: [PATCH] Workaround rename of linux/nvme.h + +Bug: https://bugs.gentoo.org/571548 +--- + src/linux.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/linux.c b/src/linux.c +index 5ebc151..e551377 100644 +--- a/src/linux.c ++++ b/src/linux.c +@@ -22,7 +22,12 @@ + #include + #include + #include ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) ++#include ++#else + #include ++#endif + #include + #include + #include +-- +2.7.0 + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.22-flags.patch b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.22-flags.patch new file mode 100644 index 0000000000..df49f43af7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.22-flags.patch @@ -0,0 +1,41 @@ +From 5bc17590cb096340fc695da3020883130437d745 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 12 Feb 2016 13:22:13 -0500 +Subject: [PATCH] Make.defaults: Improve gcc/clang detection + +The old filter only matched "gcc" or "clang". + +The new findstring call matches any occurance of gcc or clang. This is +useful when CC includes the full host tuple, like x86_64-pc-linux-gnu-gcc. + +Signed-off-by: Mike Gilbert +--- + Make.defaults | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index bf814b8..5aed21e 100644 +--- a/Make.defaults ++++ b/Make.defaults +@@ -25,14 +25,14 @@ PKGS = + clang_cflags = + gcc_cflags = -specs=$(TOPDIR)/gcc.specs + cflags = $(CFLAGS) -I${TOPDIR}/src/include/efivar/ \ +- $(if $(filter $(CC),clang),$(clang_cflags),) \ +- $(if $(filter $(CC),gcc),$(gcc_cflags),) \ ++ $(if $(findstring clang,$(CC)),$(clang_cflags),) \ ++ $(if $(findstring gcc,$(CC)),$(gcc_cflags),) \ + $(call pkg-config-cflags) + clang_ccldflags = + gcc_ccldflags = + ccldflags = $(cflags) $(CCLDFLAGS) $(LDFLAGS) \ +- $(if $(filter $(CCLD),clang),$(clang_ccldflags),) \ +- $(if $(filter $(CCLD),gcc),$(gcc_ccldflags),) \ ++ $(if $(findstring clang,$(CCLD)),$(clang_ccldflags),) \ ++ $(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \ + $(call pkg-config-ccldflags) + SOFLAGS=-shared + LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs) +-- +2.7.1 + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.23-sysmacros.patch b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.23-sysmacros.patch new file mode 100644 index 0000000000..526b8436c2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/files/0.23-sysmacros.patch @@ -0,0 +1,29 @@ +From 554b0255f9ee265f7d093ac875215207fac8fb1e Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 15 Apr 2016 17:58:15 -0400 +Subject: [PATCH] Include sys/sysmacros.h when sys/types.h does not define + major + +glibc is planning to drop this from sys/types.h. +--- + src/linux.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/linux.c b/src/linux.c +index 866455d..fde6947 100644 +--- a/src/linux.c ++++ b/src/linux.c +@@ -36,6 +36,10 @@ + #include + #include + ++#ifndef major ++#include ++#endif ++ + #include + #include + +-- +2.8.1 + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/efivar/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/metadata.xml new file mode 100644 index 0000000000..f9d83d4843 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/efivar/metadata.xml @@ -0,0 +1,11 @@ + + + + + floppym@gentoo.org + Mike Gilbert + + + rhinstaller/efivar + + From 64bba4f65972cefc76a919a4d3ce84b672d9f5db Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 9 Feb 2017 16:43:40 -0800 Subject: [PATCH 2/2] bump(app-crypt/pesign): sync with upstream --- .../portage-stable/app-crypt/pesign/ChangeLog | 9 --- .../portage-stable/app-crypt/pesign/Manifest | 13 +++- .../files/pesign-0.112-fix-cli-opts.patch | 73 +++++++++++++++++++ .../files/pesign-0.112-fix-initializer.patch | 13 ++++ .../app-crypt/pesign/metadata.xml | 15 +++- .../app-crypt/pesign/pesign-0.108.ebuild | 33 +++++---- .../app-crypt/pesign/pesign-0.112.ebuild | 47 ++++++++++++ .../metadata/md5-cache/app-crypt/pesign-0.108 | 11 +-- .../metadata/md5-cache/app-crypt/pesign-0.112 | 13 ++++ 9 files changed, 189 insertions(+), 38 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pesign/ChangeLog create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pesign/pesign-0.112.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pesign-0.112 diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pesign/ChangeLog b/sdk_container/src/third_party/portage-stable/app-crypt/pesign/ChangeLog deleted file mode 100644 index b397e94b63..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pesign/ChangeLog +++ /dev/null @@ -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 +files/destdir.patch, - +metadata.xml, +pesign-0.108.ebuild: - 0.108 pesign added diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pesign/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/pesign/Manifest index d2e759e14e..ccaf1074bc 100644 --- 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 diff --git 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 new file mode 100644 index 0000000000..6271a99985 --- /dev/null +++ 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 +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/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 new file mode 100644 index 0000000000..b6147fe68e --- /dev/null +++ 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; + diff --git 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 index 0947421cbd..ac45696842 100644 --- 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 @@ - - vapier@gentoo.org - do whatever - + + david.michael@coreos.com + David Michael + + + proxy-maint@gentoo.org + Proxy Maintainers + + + vathpela/pesign + diff --git 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 index f8ea85373d..3189c1c7ef 100644 --- 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() { diff --git 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 new file mode 100644 index 0000000000..7e59afdb78 --- /dev/null +++ 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 +} diff --git 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 index b7907cc36d..623adf5926 100644 --- 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 diff --git 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 new file mode 100644 index 0000000000..c4ac4d4689 --- /dev/null +++ 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