[arch-commits] Commit in efitools/repos (6 files)

[Jan Steffens]

    Date: Friday, March 24, 2017 @ 18:42:56
  Author: heftig
Revision: 291255

archrelease: copy trunk to staging-x86_64, staging-i686

Added:
  efitools/repos/staging-i686/
  efitools/repos/staging-i686/PKGBUILD
    (from rev 291254, efitools/trunk/PKGBUILD)
  efitools/repos/staging-i686/openssl11.patch
    (from rev 291254, efitools/trunk/openssl11.patch)
  efitools/repos/staging-x86_64/
  efitools/repos/staging-x86_64/PKGBUILD
    (from rev 291254, efitools/trunk/PKGBUILD)
  efitools/repos/staging-x86_64/openssl11.patch
    (from rev 291254, efitools/trunk/openssl11.patch)

--------------------------------+
 staging-i686/PKGBUILD          |   48 +++++++++++++++++++++++++++++++++++++++
 staging-i686/openssl11.patch   |   13 ++++++++++
 staging-x86_64/PKGBUILD        |   48 +++++++++++++++++++++++++++++++++++++++
 staging-x86_64/openssl11.patch |   13 ++++++++++
 4 files changed, 122 insertions(+)

Copied: efitools/repos/staging-i686/PKGBUILD (from rev 291254, efitools/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2017-03-24 18:42:56 UTC (rev 291255)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Mirco Tischler <mt-ml at gmx dot de>
+# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+
+pkgname="efitools"
+pkgver=1.7.0.5.g0649468
+pkgrel=1
+pkgdesc="Tools for manipulating UEFI secure boot platforms"
+url="http://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+arch=('x86_64' 'i686')
+replaces=('prebootloader')
+license=('GPL' 'LGPL2.1')
+options=('!strip' '!makeflags')
+makedepends=('gnu-efi-libs' 'help2man' 'sbsigntools' 'perl-file-slurp' 'git')
+depends=('openssl')
+_commit=0649468475d20d8ca5634433c4912467cef3ce93  # master
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#commit=$_commit"
+        openssl11.patch)
+md5sums=('SKIP'
+         '08672dd4dc23daf7345a6f2535960fc1')
+
+pkgver() {
+	cd "${pkgname}"
+	echo "$(git describe --tags)" | sed -e 's|-|\.|g' -e 's|^v||g'
+}
+
+prepare() {
+	cd "${pkgname}"
+	git clean -x -d -f
+	patch -Np1 -i ../openssl11.patch
+	sed -i "s/-O2/${CFLAGS} -Wno-pointer-sign/" Make.rules
+}
+
+build() {
+	cd "${pkgname}"
+	# fix PreLoader.efi building on x86_64 #49314
+	export ARCH="${CARCH}"
+	make
+}
+
+package() {
+	# http://www.rodsbooks.com/efi-bootloaders/secureboot.html#prebootloader
+	# http://blog.hansenpartnership.com/uefi-secure-boot/
+	# http://blog.hansenpartnership.com/linux-foundation-secure-boot-system-released
+	cd "${pkgname}"
+	make DESTDIR="${pkgdir}" install
+}

Copied: efitools/repos/staging-i686/openssl11.patch (from rev 291254, efitools/trunk/openssl11.patch)
===================================================================
--- staging-i686/openssl11.patch	                        (rev 0)
+++ staging-i686/openssl11.patch	2017-03-24 18:42:56 UTC (rev 291255)
@@ -0,0 +1,13 @@
+diff --git i/cert-to-efi-hash-list.c w/cert-to-efi-hash-list.c
+index d4484f9b8e6535f3..399ba704eaab238d 100644
+--- i/cert-to-efi-hash-list.c
++++ w/cert-to-efi-hash-list.c
+@@ -135,7 +135,7 @@ main(int argc, char *argv[])
+         X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
+ 	unsigned char *cert_buf = NULL;
+ 
+-	int cert_len = i2d_X509_CINF(cert->cert_info, &cert_buf);
++	int cert_len = i2d_re_X509_tbs(cert, &cert_buf);
+ 	ERR_print_errors_fp(stdout);
+ 
+ 	int len, digest_len, time_offset;

Copied: efitools/repos/staging-x86_64/PKGBUILD (from rev 291254, efitools/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2017-03-24 18:42:56 UTC (rev 291255)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Mirco Tischler <mt-ml at gmx dot de>
+# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+
+pkgname="efitools"
+pkgver=1.7.0.5.g0649468
+pkgrel=1
+pkgdesc="Tools for manipulating UEFI secure boot platforms"
+url="http://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+arch=('x86_64' 'i686')
+replaces=('prebootloader')
+license=('GPL' 'LGPL2.1')
+options=('!strip' '!makeflags')
+makedepends=('gnu-efi-libs' 'help2man' 'sbsigntools' 'perl-file-slurp' 'git')
+depends=('openssl')
+_commit=0649468475d20d8ca5634433c4912467cef3ce93  # master
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#commit=$_commit"
+        openssl11.patch)
+md5sums=('SKIP'
+         '08672dd4dc23daf7345a6f2535960fc1')
+
+pkgver() {
+	cd "${pkgname}"
+	echo "$(git describe --tags)" | sed -e 's|-|\.|g' -e 's|^v||g'
+}
+
+prepare() {
+	cd "${pkgname}"
+	git clean -x -d -f
+	patch -Np1 -i ../openssl11.patch
+	sed -i "s/-O2/${CFLAGS} -Wno-pointer-sign/" Make.rules
+}
+
+build() {
+	cd "${pkgname}"
+	# fix PreLoader.efi building on x86_64 #49314
+	export ARCH="${CARCH}"
+	make
+}
+
+package() {
+	# http://www.rodsbooks.com/efi-bootloaders/secureboot.html#prebootloader
+	# http://blog.hansenpartnership.com/uefi-secure-boot/
+	# http://blog.hansenpartnership.com/linux-foundation-secure-boot-system-released
+	cd "${pkgname}"
+	make DESTDIR="${pkgdir}" install
+}

Copied: efitools/repos/staging-x86_64/openssl11.patch (from rev 291254, efitools/trunk/openssl11.patch)
===================================================================
--- staging-x86_64/openssl11.patch	                        (rev 0)
+++ staging-x86_64/openssl11.patch	2017-03-24 18:42:56 UTC (rev 291255)
@@ -0,0 +1,13 @@
+diff --git i/cert-to-efi-hash-list.c w/cert-to-efi-hash-list.c
+index d4484f9b8e6535f3..399ba704eaab238d 100644
+--- i/cert-to-efi-hash-list.c
++++ w/cert-to-efi-hash-list.c
+@@ -135,7 +135,7 @@ main(int argc, char *argv[])
+         X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
+ 	unsigned char *cert_buf = NULL;
+ 
+-	int cert_len = i2d_X509_CINF(cert->cert_info, &cert_buf);
++	int cert_len = i2d_re_X509_tbs(cert, &cert_buf);
+ 	ERR_print_errors_fp(stdout);
+ 
+ 	int len, digest_len, time_offset;