From 59ce4cdb79e54fe0742dffc22c20bafc852554a8 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 12 Jan 2019 10:52:52 +0100
Subject: 20190112.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 system/efitools/efitools.SlackBuild | 8 ++++----
 system/efitools/efitools.info       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'system/efitools')

diff --git a/system/efitools/efitools.SlackBuild b/system/efitools/efitools.SlackBuild
index b2f041bed3..844fc759b4 100644
--- a/system/efitools/efitools.SlackBuild
+++ b/system/efitools/efitools.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=efitools
-VERSION=${VERSION:-1.5.3}
+VERSION=${VERSION:-1.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -32,7 +32,7 @@ USE_KEYS=${USE_KEYS:-no}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # It's not safe to specify build flags since some EFI programs are built.
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   EFI_ARCH=ia32
 elif [ "$ARCH" = "i686" ]; then
diff --git a/system/efitools/efitools.info b/system/efitools/efitools.info
index 8946a7cacf..e496e0d12e 100644
--- a/system/efitools/efitools.info
+++ b/system/efitools/efitools.info
@@ -1,8 +1,8 @@
 PRGNAM="efitools"
-VERSION="1.5.3"
+VERSION="1.8.1"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/efitools-1.5.3.tar.gz"
-MD5SUM="19ed4d83cfbb10987b84fca5a744715a"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/efitools-1.8.1.tar.gz"
+MD5SUM="830988a246c7c0359eaea24233cbfb76"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-File-Slurp sbsigntools"
-- 
cgit v1.2.3