From: lramage94 <ramage.lucas94@gmail.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Lucas Ramage <ramage.lucas@openmailbox.org>
Subject: [alpine-aports] [PATCH] testing/efivar: upgrade to 36
Date: Tue, 19 Jun 2018 12:07:18 -0400
Message-Id: <20180619160718.29192-1-ramage.lucas@openmailbox.org>
Precedence: list

From: Lucas Ramage <ramage.lucas@openmailbox.org>

---
 testing/efivar/APKBUILD            | 13 ++++---------
 testing/efivar/musl-strndupa.patch | 13 -------------
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 testing/efivar/musl-strndupa.patch

diff --git a/testing/efivar/APKBUILD b/testing/efivar/APKBUILD
index 5c2e86a99d..14aa713a8f 100644
--- a/testing/efivar/APKBUILD
+++ b/testing/efivar/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Lucas Ramage <ramage.lucas@openmailbox.org>
 pkgname=efivar
-pkgver=35
+pkgver=36
 pkgrel=0
 pkgdesc="Tools and library to manipulate EFI variables"
 url="https://github.com/rhboot/efivar"
@@ -13,8 +13,7 @@ makedepends="$depends_dev popt-dev linux-headers"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="https://github.com/rhboot/efivar/releases/download/$pkgver/efivar-$pkgver.tar.bz2
-	musl-bswap.patch
-	musl-strndupa.patch"
+	musl-bswap.patch"
 builddir="$srcdir/efivar-$pkgver"
 
 build() {
@@ -28,12 +27,8 @@ package() {
 }
 
 check() {
-	ln -s "$builddir"/src/libefivar.so \
-		"$builddir"/src/libefivar.so.1 
 	LD_LIBRARY_PATH="$builddir"/src \
 		"$builddir"/src/efivar --help > /dev/null
 }
-
-sha512sums="c7ba60b2112053f088ad0b74aaa834860601b7fe17118c35b012050176f5205d948fba9c4b6de35991249f702e3bc24832539e2eb3c235c4188e1eabc78965ee  efivar-35.tar.bz2
-84fd5baf91df91889cfcfed2bcf59f073dc754f6aba1944059203bbe99f4bbb6dc92addff9fae8f687a2c95f9438b0eb301dd0320728a8a2a6edd5e2b2b5ba94  musl-bswap.patch
-d7c0ed2cbb4e3b93921ef5adad9667d2a2f18bc5da8d4dba71edb5b424c68c24e9d1c495d4dcccc1cd563cdfdc598308a74ae5b4d4ed78ff4391f4456554a18a  musl-strndupa.patch"
+sha512sums="951feabe2d238826fdd6e74e8f7a24f04d705f9ef925cfcfb852944d2d7a4f04e3a6c23f276c40e5564da42614558941dbe7aaf21efa6a722a616e4d165aba2d  efivar-36.tar.bz2
+84fd5baf91df91889cfcfed2bcf59f073dc754f6aba1944059203bbe99f4bbb6dc92addff9fae8f687a2c95f9438b0eb301dd0320728a8a2a6edd5e2b2b5ba94  musl-bswap.patch"
diff --git a/testing/efivar/musl-strndupa.patch b/testing/efivar/musl-strndupa.patch
deleted file mode 100644
index 5fcc1847c2..0000000000
--- a/testing/efivar/musl-strndupa.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/linux.c	2017-02-13 17:52:14.000000000 +0100
-+++ ./src/linux.c	2017-02-18 04:42:13.893911649 +0100
-@@ -44,6 +44,10 @@
- #include <efivar.h>
- #include <efiboot.h>
- 
-+#if !defined(__GLIBC__)
-+#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s)
-+#endif
-+
- #include "dp.h"
- #include "linux.h"
- #include "util.h"
-- 
2.16.4



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---