Merge pull request #40 from gregkh/app-crypt

fix(app-crypt/efitools) remove vim-core build dependancy

sdk_container/src/third_party/portage-stable/app-crypt/efitools/ChangeLog

@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/efitools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/efitools/ChangeLog,v 1.2 2013/08/30 16:29:26 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/efitools/ChangeLog,v 1.3 2013/09/01 22:19:56 gregkh Exp $
+
+*efitools-1.4.1-r2 (01 Sep 2013)
+
+  01 Sep 2013; Greg Kroah-Hartman <gregkh@gentoo.org> +efitools-1.4.1-r2.ebuild,
+  +files/xxdi.patch:
+  remove vim-core build dependancy by replacing it with a small perl script that
+  has been send upstream.
 
 *efitools-1.4.1-r1 (30 Aug 2013)
 

sdk_container/src/third_party/portage-stable/app-crypt/efitools/Manifest

@@ -1,5 +1,7 @@
+AUX xxdi.patch 3046 SHA256 b2b716d5291529c252daa8ab890521e1f56731818073dcab183d7f6f4d5816cf SHA512 9b3612115ca594b7a1b3a99008650409cb9a90369ff73cd8d602385e77030026a921c510534e44ed7a76fcca2347d016e36f08223b9a49c7ca17518124bdb8ac WHIRLPOOL 4dcfcf930eaec0468cd090a294cf6cf00e6a48a59ce2c84884bec9d4b1fc093d8db48df0090763432b8af2d19263aff92ecfedc5bacf173993156ac439ddaf6c
 DIST efitools-1.4.1.tar.gz 91444 SHA256 6946e7894118012ca12503a6e55a4f8f17310d0eb02d8f1ab8947d9012ad8b51 SHA512 0994fdd9f934575691f740631dfbcc67f15e56f873cba10657536389d61b5bb955b0de91261f0486bfa5381e27f42b5dd0b6ea55fe3643f8b0dae2f9b1916ef1 WHIRLPOOL 7eb973fd0239fa41d2ff82ccfda526725032c0da64d0cd5223a7d66abf42c951f4ba2d3613c024c3bceebf6e032af88527f6a35eff76f258f19e12431cbac0bd
 EBUILD efitools-1.4.1-r1.ebuild 708 SHA256 40e89bc0b677141ea60f3b39f0940764cc82f0d1d29f2cb1d8f5ebc0cf963e14 SHA512 294889e49b2eeae8406087cf424fcc607123c36b9c184f99eeedd1b0215e15aa6f73d3e6ad6f0ee32fdb8cd44ddf56ca40c00f8910c32311d2a573b7dcb796b4 WHIRLPOOL 63fb5596fad11c1bdda61e3031879903e3acd78101d275fda407730c70e3e91988b32c5917817798dd8f755b1de75167f05a513359f052a6b11591b3f6fbeb1e
+EBUILD efitools-1.4.1-r2.ebuild 808 SHA256 1c8ec6d13b1de53152eb01616cb6eef39174697500d61bd4675ea9e5f438d113 SHA512 37d40a488abda2a8c745645037a91f743b2e779d8d583b2a0f143c52bd12d54831e4c1841c40bb374c5054f24751ad52b9deff168e634bd255b8e23a51bad0cc WHIRLPOOL 54c5993bace3f2150becf8fb7970ff13f699db52cdb622ad3942211601ecc1fcaf91ecc601e7d3d2986113ee8127962a7cae25e758e91856a50393c603e6e1c2
 EBUILD efitools-1.4.1.ebuild 661 SHA256 0a56075e737240471092e99bbf950960d3efe1e23fa7cfa868c9864384512e9a SHA512 6e992bf79b36d1c41895e16a6f391c5fbe361d39e65200d689acb67e06d76b7276086bb7815e16ccbb8a2c59c42506d60a7e81e1b13b83dbcc8ee44d5f7bcd72 WHIRLPOOL 32376292e09812cd96e412cc130eb5a241416c28b2e119c8346efc97fadcaa4a296d11b72fb97ced9e68f46c0a133e86c7106da5b60f06876c6344f98888c041
-MISC ChangeLog 539 SHA256 e838d27c01434ed475e3767c6dfb45f569f6cdfc1efe1f5d0c281eda828cc95c SHA512 9c2beaf206f2fe6ef100a91f77358467e398b359220e69bc28d1f11b9cfe6c2d9d66a05f4782a79f6a538b0008528ebabc0616bf38b855a924ff305ef6976f27 WHIRLPOOL cb2cf2fa92b8f915c14ceb0be9edbf5eb891d8681db82b0ee69e9e986a8e79283eb72c97908469e750a7c74729125cebd64043dc1669668d29f305feb5de8d8d
+MISC ChangeLog 783 SHA256 280060a6a378c8b4fa86e3d8efd79a5a207f069a7d0dd4f59a16277f70602fa3 SHA512 ff59c368473151839acb6121ff39d6b2c666f47263c0d5408f1c49dbc80e30b916e7e937526229a04aa47418ae473944d7618951bf241fb7178b827a41cfd9de WHIRLPOOL aa1c9953ad9eb4ba98759527b0c9eb90563d1e150e9c4fa7fdb65779fe89b472b423ddf06e117306810d3b7d18c2deb48dd8fe1c983e7090334ce3038e6792f7
 MISC metadata.xml 240 SHA256 218f6016b45c0a0d55b04630266085c44107606f2b79024c15a9797b4b828bd5 SHA512 659a6ebd2024aefd2989e9c412b7bb10271a5d6b12f291dcc8dbdfb3568e8eddb8dfa674cf6befa80eb8036e222e434276d36ba5b164733cfc934e4e7a3ae101 WHIRLPOOL 252a9a3addb2a1ecf3b3734a5e65c097d3c6d032f18b05d33458298fbeb36b7cb6147830c85d4d80764e05653bc7a4bb48ec070662d28b148799cad42ecd05d0

sdk_container/src/third_party/portage-stable/app-crypt/efitools/efitools-1.4.1-r2.ebuild

@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/efitools/efitools-1.4.1-r2.ebuild,v 1.1 2013/09/01 22:19:56 gregkh Exp $
+
+EAPI="4"
+inherit eutils
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="git://git.kernel.org/pub/scm/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
+}

sdk_container/src/third_party/portage-stable/app-crypt/efitools/files/xxdi.patch

@@ -0,0 +1,110 @@
+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
+
+