From e992aea6e51bd711416dd6ae63a9922b6a8b4e47 Mon Sep 17 00:00:00 2001
From: groni <groni@pisilinux.org>
Date: Tue, 24 Jan 2017 16:34:10 +0100
Subject: [PATCH] change version

---
 .../efivar/files/deprecated-readdir_r.patch   | 36 +++++++++++++++++++
 system/boot/efivar/pspec.xml                  | 22 +++++-------
 2 files changed, 44 insertions(+), 14 deletions(-)
 create mode 100644 system/boot/efivar/files/deprecated-readdir_r.patch

diff --git a/system/boot/efivar/files/deprecated-readdir_r.patch b/system/boot/efivar/files/deprecated-readdir_r.patch
new file mode 100644
index 0000000000..53472ef0f6
--- /dev/null
+++ b/system/boot/efivar/files/deprecated-readdir_r.patch
@@ -0,0 +1,36 @@
+From 5e2f64ebb96f45155d0301a81ccd141a17fd7d9b Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Tue, 12 Jul 2016 10:34:50 +0200
+Subject: [PATCH] Remove use of deprecated readdir_r
+
+Signed-off-by: Andreas Schwab <schwab@suse.de>
+---
+Index: efivar-0.23/src/vars.c
+===================================================================
+--- efivar-0.23.orig/src/vars.c
++++ efivar-0.23/src/vars.c
+@@ -128,19 +128,15 @@ is_64bit(void)
+ 	if (dfd < 0)
+ 		goto err;
+ 
+-	struct dirent entry;
+-	struct dirent *result = NULL;
+ 	while (1) {
+-		int rc = readdir_r(dir, &entry, &result);
+-		if (rc != 0)
+-			break;
+-		if (result == NULL)
++		struct dirent *entry = readdir(dir);
++		if (entry == NULL)
+ 			break;
+ 
+-		if (!strcmp(entry.d_name, "..") || !strcmp(entry.d_name, "."))
++		if (!strcmp(entry->d_name, "..") || !strcmp(entry->d_name, "."))
+ 			continue;
+ 
+-		ssize_t size = get_file_data_size(dfd, entry.d_name);
++		ssize_t size = get_file_data_size(dfd, entry->d_name);
+ 		if (size < 0) {
+ 			continue;
+ 		} else if (size == 2084) {
+ 
diff --git a/system/boot/efivar/pspec.xml b/system/boot/efivar/pspec.xml
index 5ad4821770..133fd3be12 100644
--- a/system/boot/efivar/pspec.xml
+++ b/system/boot/efivar/pspec.xml
@@ -12,14 +12,15 @@
         <IsA>app:console</IsA>
         <Summary>Tools and library to manipulate EFI variables</Summary>
         <Description>Tools and library to manipulate EFI variables.</Description>
-        <Archive sha1sum="d76fe8cf679606b13c3037b340b50790d269de64" type="tarbz2">https://github.com/rhinstaller/efivar/releases/download/30/efivar-30.tar.bz2</Archive>
+        <Archive sha1sum="952cec04ed9968c2a23c04a55ee7d0481c7c4ced" type="tarbz2">https://github.com/rhinstaller/efivar/releases/download/26/efivar-26.tar.bz2</Archive>
         <BuildDependencies>
            <Dependency>popt-devel</Dependency>
         </BuildDependencies>
-        <!--<Patches>
-            <Patch level="1">0001-Workaround-rename-of-linux-nvme.h.patch</Patch>
+        <Patches>
+            <!--<Patch level="1">0001-Workaround-rename-of-linux-nvme.h.patch</Patch>-->
+            <!--<Patch level="1">deprecated-readdir_r.patch</Patch>-->
             <Patch level="1">efivar-no-static.patch</Patch>
-        </Patches>-->
+        </Patches>
     </Source>
 
     <Package>
@@ -42,20 +43,13 @@
     </Package>
 
     <History>
-        <Update release="3">
+        <Update release="5">
             <Date>2017-01-24</Date>
-            <Version>0.30</Version>
+            <Version>26</Version>
             <Comment>Version bump.</Comment>
             <Name>Stefan Gronewold(groni)</Name>
             <Email>groni@pisilinux.org</Email>
-        </Update>
-        <Update release="2">
-            <Date>2016-06-08</Date>
-            <Version>0.23</Version>
-            <Comment>Release Bump</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
+        </Update>                
         <Update release="1">
             <Date>2016-03-29</Date>
             <Version>0.23</Version>