[arch-commits] Commit in efitools/trunk (PKGBUILD openssl11.patch)

[Jan Steffens]

    Date: Friday, March 24, 2017 @ 18:42:23
  Author: heftig
Revision: 291254

1.7.0.5.g0649468-1: openssl 1.1

Added:
  efitools/trunk/openssl11.patch
Modified:
  efitools/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   20 ++++++++++++--------
 openssl11.patch |   13 +++++++++++++
 2 files changed, 25 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-24 17:13:01 UTC (rev 291253)
+++ PKGBUILD	2017-03-24 18:42:23 UTC (rev 291254)
@@ -4,7 +4,7 @@
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
 pkgname="efitools"
-pkgver=1.7.0.3.g791e463
+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"
@@ -14,23 +14,28 @@
 options=('!strip' '!makeflags')
 makedepends=('gnu-efi-libs' 'help2man' 'sbsigntools' 'perl-file-slurp' 'git')
 depends=('openssl')
-#source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#tag=v${pkgver}")
-source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#commit=791e4639ee837f70c8d5e1190e01dc3441d4a401")
+_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' 
+	echo "$(git describe --tags)" | sed -e 's|-|\.|g' -e 's|^v||g'
 }
 
 prepare() {
-        cd "${pkgname}"
+	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}"
+	cd "${pkgname}"
 	# fix PreLoader.efi building on x86_64 #49314
-        export ARCH="${CARCH}"
+	export ARCH="${CARCH}"
 	make
 }
 
@@ -41,4 +46,3 @@
 	cd "${pkgname}"
 	make DESTDIR="${pkgdir}" install
 }
-md5sums=('SKIP')

Added: openssl11.patch
===================================================================
--- openssl11.patch	                        (rev 0)
+++ openssl11.patch	2017-03-24 18:42:23 UTC (rev 291254)
@@ -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;