[arch-commits] Commit in efitools/repos/extra-x86_64 (3 files)

[Tobias Powalowski]

    Date: Friday, June 22, 2018 @ 08:11:59
  Author: tpowa
Revision: 327435

archrelease: copy trunk to extra-x86_64

Added:
  efitools/repos/extra-x86_64/PKGBUILD
    (from rev 327434, efitools/trunk/PKGBUILD)
Deleted:
  efitools/repos/extra-x86_64/PKGBUILD
  efitools/repos/extra-x86_64/openssl11.patch

-----------------+
 PKGBUILD        |   93 ++++++++++++++++++++++++++----------------------------
 openssl11.patch |   13 -------
 2 files changed, 45 insertions(+), 61 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-22 08:11:53 UTC (rev 327434)
+++ PKGBUILD	2018-06-22 08:11:59 UTC (rev 327435)
@@ -1,48 +0,0 @@
-# $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/extra-x86_64/PKGBUILD (from rev 327434, efitools/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-22 08:11:59 UTC (rev 327435)
@@ -0,0 +1,45 @@
+# $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.8.1
+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')
+replaces=('prebootloader')
+license=('GPL' 'LGPL2.1')
+options=('!strip' '!makeflags')
+makedepends=('gnu-efi-libs' 'help2man' 'sbsigntools' 'perl-file-slurp' 'git')
+depends=('openssl')
+_commit=28687de80b18b3b35271de1d70769eac3c0b1ab4 # master
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#commit=$_commit")
+md5sums=('SKIP')
+
+pkgver() {
+	cd "${pkgname}"
+	echo "$(git describe --tags)" | sed -e 's|-|\.|g' -e 's|^v||g'
+}
+
+prepare() {
+	cd "${pkgname}"
+	git clean -x -d -f
+	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
+}

Deleted: openssl11.patch
===================================================================
--- openssl11.patch	2018-06-22 08:11:53 UTC (rev 327434)
+++ openssl11.patch	2018-06-22 08:11:59 UTC (rev 327435)
@@ -1,13 +0,0 @@
-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;