diff options
author | Pacho Ramos <pacho@gentoo.org> | 2016-08-19 12:01:38 +0200 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2016-08-19 12:01:38 +0200 |
commit | 80ac5fd077f9784904755baa7a20ea38bce5bd38 (patch) | |
tree | 5d1bff1560fb3691406b10bf10f49d350c5c175c /app-crypt | |
parent | app-backup/tarsnap: Cleanup due to bug #42273 (diff) | |
download | gentoo-80ac5fd077f9784904755baa7a20ea38bce5bd38.tar.gz gentoo-80ac5fd077f9784904755baa7a20ea38bce5bd38.tar.bz2 gentoo-80ac5fd077f9784904755baa7a20ea38bce5bd38.zip |
app-crypt/efitools: Cleanup due to bug #42273
Package-Manager: portage-2.3.0
Diffstat (limited to 'app-crypt')
-rw-r--r-- | app-crypt/efitools/Manifest | 2 | ||||
-rw-r--r-- | app-crypt/efitools/efitools-1.4.1-r1.ebuild | 23 | ||||
-rw-r--r-- | app-crypt/efitools/efitools-1.4.1-r2.ebuild | 29 | ||||
-rw-r--r-- | app-crypt/efitools/efitools-1.4.1.ebuild | 21 | ||||
-rw-r--r-- | app-crypt/efitools/efitools-1.4.2-r1.ebuild | 25 | ||||
-rw-r--r-- | app-crypt/efitools/efitools-1.4.2.ebuild | 22 | ||||
-rw-r--r-- | app-crypt/efitools/files/xxdi.patch | 110 | ||||
-rw-r--r-- | app-crypt/efitools/metadata.xml | 4 |
8 files changed, 0 insertions, 236 deletions
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest index 199a3d10c082..2f220cc564b7 100644 --- a/app-crypt/efitools/Manifest +++ b/app-crypt/efitools/Manifest @@ -1,3 +1 @@ -DIST efitools-1.4.1.tar.gz 91444 SHA256 6946e7894118012ca12503a6e55a4f8f17310d0eb02d8f1ab8947d9012ad8b51 SHA512 0994fdd9f934575691f740631dfbcc67f15e56f873cba10657536389d61b5bb955b0de91261f0486bfa5381e27f42b5dd0b6ea55fe3643f8b0dae2f9b1916ef1 WHIRLPOOL 7eb973fd0239fa41d2ff82ccfda526725032c0da64d0cd5223a7d66abf42c951f4ba2d3613c024c3bceebf6e032af88527f6a35eff76f258f19e12431cbac0bd -DIST efitools-1.4.2.tar.gz 97303 SHA256 df7b9d7570b2fb85ee060e14b1952233d28e277f5b2f839c225f093890e5d843 SHA512 19433b6ccc95a18649b05376c0090f4325345d1a9ccf2601e9b4818a7a888379ab1bb620022f393498e520073f06e10962f5322632219fc21da390e4e5cd4c9f WHIRLPOOL 43000942f99fdf888bf2d2447eb28ca5eba9440194f5de71fd4532ad61a3735b23a08e4fdef4f89a9fd06e30537e9f6305e5f320e1c27ab60a6c4cb91762d74d DIST efitools-1.7.0.tar.bz2 96042 SHA256 6221323665359ded31aefd2979853203cc08509d35bed09b05a28a9c060866ea SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb WHIRLPOOL fc1762b5a35111f5f103273615b03318a4c319147e1e66898ceb748fd767cd977d8cf4d466e2cd7289fea66a755a4b13f44d9f7498a6a2216213045439726bf7 diff --git a/app-crypt/efitools/efitools-1.4.1-r1.ebuild b/app-crypt/efitools/efitools-1.4.1-r1.ebuild deleted file mode 100644 index c6dd05a574ac..000000000000 --- a/app-crypt/efitools/efitools-1.4.1-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -DESCRIPTION="Tools for manipulating UEFI secure boot platforms" -HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git" -SRC_URI="https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-libs/openssl - sys-apps/util-linux" -DEPEND="${RDEPEND} - sys-apps/help2man - sys-boot/gnu-efi - app-editors/vim-core - app-crypt/sbsigntool - virtual/pkgconfig" diff --git a/app-crypt/efitools/efitools-1.4.1-r2.ebuild b/app-crypt/efitools/efitools-1.4.1-r2.ebuild deleted file mode 100644 index 952a8ec9e9bb..000000000000 --- a/app-crypt/efitools/efitools-1.4.1-r2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -inherit eutils - -DESCRIPTION="Tools for manipulating UEFI secure boot platforms" -HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git" -SRC_URI="https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-libs/openssl - sys-apps/util-linux" -DEPEND="${RDEPEND} - sys-apps/help2man - sys-boot/gnu-efi - dev-perl/File-Slurp - app-crypt/sbsigntool - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/xxdi.patch - chmod 755 "${WORKDIR}/${P}/xxdi.pl" -} diff --git a/app-crypt/efitools/efitools-1.4.1.ebuild b/app-crypt/efitools/efitools-1.4.1.ebuild deleted file mode 100644 index 0e95ec146ea5..000000000000 --- a/app-crypt/efitools/efitools-1.4.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -DESCRIPTION="Tools for manipulating UEFI secure boot platforms" -HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git" -SRC_URI="https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-libs/openssl - sys-apps/util-linux" -DEPEND="${RDEPEND} - sys-apps/help2man - sys-boot/gnu-efi - virtual/pkgconfig" diff --git a/app-crypt/efitools/efitools-1.4.2-r1.ebuild b/app-crypt/efitools/efitools-1.4.2-r1.ebuild deleted file mode 100644 index f231f2c0f4b8..000000000000 --- a/app-crypt/efitools/efitools-1.4.2-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -DESCRIPTION="Tools for manipulating UEFI secure boot platforms" -HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git" -SRC_URI="http://blog.hansenpartnership.com/wp-uploads/2013/efitools-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-apps/util-linux" -DEPEND="${RDEPEND} - sys-apps/help2man - >=sys-boot/gnu-efi-3.0u - app-crypt/sbsigntool - virtual/pkgconfig - dev-perl/File-Slurp" diff --git a/app-crypt/efitools/efitools-1.4.2.ebuild b/app-crypt/efitools/efitools-1.4.2.ebuild deleted file mode 100644 index 9d061cce3e8c..000000000000 --- a/app-crypt/efitools/efitools-1.4.2.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -DESCRIPTION="Tools for manipulating UEFI secure boot platforms" -HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git" -SRC_URI="http://blog.hansenpartnership.com/wp-uploads/2013/efitools-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-libs/openssl - sys-apps/util-linux" -DEPEND="${RDEPEND} - sys-apps/help2man - sys-boot/gnu-efi - app-crypt/sbsigntool - virtual/pkgconfig" diff --git a/app-crypt/efitools/files/xxdi.patch b/app-crypt/efitools/files/xxdi.patch deleted file mode 100644 index ec62125ea4ad..000000000000 --- a/app-crypt/efitools/files/xxdi.patch +++ /dev/null @@ -1,110 +0,0 @@ -From gregkh@linuxfoundation.org Sun Sep 1 14:55:47 2013 -Date: Sun, 1 Sep 2013 14:58:15 -0700 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -To: James Bottomley <James.Bottomley@HansenPartnership.com> -Cc: JBottomley@Parallels.com, greg@kroah.com -Subject: [efitools PATCH] Makefile/Make.rules: don't rely on vim-core -Message-ID: <20130901215815.GA8749@kroah.com> - -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - -Subject: Makefile/Make.rules: don't rely on vim-core - -This adds the xxdi.pl script to replace the call to 'xxd -i', removing a -build dependancy on vim-core, which some distros don't really want to -have (i.e. Gentoo and its build derivatives like ChromeOS and CoreOS.) - -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - Make.rules | 2 +- - Makefile | 2 +- - xxdi.pl | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 52 insertions(+), 2 deletions(-) - create mode 100755 xxdi.pl - -diff --git a/Make.rules b/Make.rules -index 419b3b9..309b231 100644 ---- a/Make.rules -+++ b/Make.rules -@@ -38,7 +38,7 @@ endif - nm -D $@ | grep ' U ' && exit 1 || exit 0 - - %.h: %.auth -- xxd -i $< > $@ -+ ./xxdi.pl $< > $@ - - %.hash: %.efi hash-to-efi-sig-list - ./hash-to-efi-sig-list $< $@ -diff --git a/Makefile b/Makefile -index 52f4551..a39cafe 100644 ---- a/Makefile -+++ b/Makefile -@@ -62,7 +62,7 @@ DB.auth: DB.esl KEK.crt sign-efi-sig-list - - hashlist.h: HashTool.hash - cat $^ > /tmp/tmp.hash -- xxd -i /tmp/tmp.hash > $@ -+ ./xxdi.pl /tmp/tmp.hash > $@ - rm -f /tmp/tmp.hash - - -diff --git a/xxdi.pl b/xxdi.pl -new file mode 100755 -index 0000000..acc974c ---- /dev/null -+++ b/xxdi.pl -@@ -0,0 +1,50 @@ -+#!/usr/bin/env perl -+# -+# xxdi.pl - perl implementation of 'xxd -i' mode -+# -+# Copyright 2013 Greg Kroah-Hartman <gregkh@linuxfoundation.org> -+# Copyright 2013 Linux Foundation -+# -+# Released under the GPLv2. -+# -+# Implements the "basic" functionality of 'xxd -i' in perl to keep build -+# systems from having to build/install/rely on vim-core, which not all -+# distros want to do. But everyone has perl, so use it instead. -+# -+ -+use strict; -+use warnings; -+use File::Slurp qw(slurp); -+ -+my $indata = slurp(@ARGV ? $ARGV[0] : \*STDIN); -+my $len_data = length($indata); -+my $num_digits_per_line = 12; -+my $var_name; -+my $outdata; -+ -+# Use the variable name of the file we read from, converting '/' and '. -+# to '_', or, if this is stdin, just use "stdin" as the name. -+if (@ARGV) { -+ $var_name = $ARGV[0]; -+ $var_name =~ s/\//_/g; -+ $var_name =~ s/\./_/g; -+} else { -+ $var_name = "stdin"; -+} -+ -+$outdata .= "unsigned char $var_name\[] = {"; -+ -+# trailing ',' is acceptable, so instead of duplicating the logic for -+# just the last character, live with the extra ','. -+for (my $key= 0; $key < $len_data; $key++) { -+ if ($key % $num_digits_per_line == 0) { -+ $outdata .= "\n\t"; -+ } -+ $outdata .= sprintf("0x%.2x, ", ord(substr($indata, $key, 1))); -+} -+ -+$outdata .= "\n};\nunsigned int $var_name\_len = $len_data;\n"; -+ -+binmode STDOUT; -+print {*STDOUT} $outdata; -+ --- -1.8.4.6.g82e253f.dirty - - diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml index a07164c44449..097975e3adc2 100644 --- a/app-crypt/efitools/metadata.xml +++ b/app-crypt/efitools/metadata.xml @@ -1,8 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>gregkh@gentoo.org</email> - <description>do whatever</description> -</maintainer> </pkgmetadata> |