From 4f2b0df7ad002798084e711a400463519fcdd68ff52fbf9246b41e321f250470 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Thu, 2 Sep 2021 15:45:42 +0000
Subject: [PATCH] Accepting request 913944 from
 home:NMoreyChaisemartin:branches:science:HPC

- Update to v4.17.0-1 (jsc#SLE-19261)
  - Anti-rollback Protection
    - Enabled Anti-rollback protection to prevent old vulnerable firmware
      versions from being flashed to the device
  - mstlink tool
    - Added support for DSFP modules
  - Parallel Firmware Burning (DMA Burning)
    - Added support for parallel firmware burning.
- Refresh PIE.patch against latest sources

OBS-URL: https://build.opensuse.org/request/show/913944
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mstflint?expand=0&rev=44
---
 PIE.patch                | 22 ++++++++++++++++------
 mstflint-4.16.0-2.tar.gz |  3 ---
 mstflint-4.17.0-1.tar.gz |  3 +++
 mstflint.changes         | 13 +++++++++++++
 mstflint.spec            |  6 +++---
 5 files changed, 35 insertions(+), 12 deletions(-)
 delete mode 100644 mstflint-4.16.0-2.tar.gz
 create mode 100644 mstflint-4.17.0-1.tar.gz

diff --git a/PIE.patch b/PIE.patch
index 6f9338c..927c779 100644
--- a/PIE.patch
+++ b/PIE.patch
@@ -1,11 +1,21 @@
-Index: mstflint-4.16.0/configure.ac
-===================================================================
---- mstflint-4.16.0.orig/configure.ac
-+++ mstflint-4.16.0/configure.ac
-@@ -58,6 +58,9 @@ LDL=""
+commit da607dd93fc67a63029d08f868e1e1c2c70e9663
+Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+Date:   Fri Jul 9 13:01:55 2021 +0200
+
+    PIE
+    
+    Hardware error from APEI Generic Hardware Error Source: 0
+    
+    Signed-off-by: Hardware error from APEI Generic Hardware Error Source: 0
+
+diff --git configure.ac configure.ac
+index 35049bcbbed4..273ce3186936 100644
+--- configure.ac
++++ configure.ac
+@@ -59,6 +59,9 @@ LDL=""
  default_en_inband=""
  
- LDFLAGS="${LDFLAGS} -L/usr/lib64 -L/usr/local/lib -L/usr/local/lib64"
+ LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/local/lib64 -L/usr/lib64"
 +if test "$host_cpu" != "s390x"; then
 +	LDFLAGS="${LDFLAGS} -pie"
 +fi
diff --git a/mstflint-4.16.0-2.tar.gz b/mstflint-4.16.0-2.tar.gz
deleted file mode 100644
index 014cbf7..0000000
--- a/mstflint-4.16.0-2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b277d36b07a2b5827f59c578d2922757cabe7e069eb4375bb4b6b85484bd929
-size 5592587
diff --git a/mstflint-4.17.0-1.tar.gz b/mstflint-4.17.0-1.tar.gz
new file mode 100644
index 0000000..3544bcb
--- /dev/null
+++ b/mstflint-4.17.0-1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe6899afd8d9c2c60ceb8482ebc790fc3d1670fc213ddb8093b56b4276bc1b0c
+size 5762849
diff --git a/mstflint.changes b/mstflint.changes
index 778fe95..e91d867 100644
--- a/mstflint.changes
+++ b/mstflint.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Jul  7 11:31:14 UTC 2021 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+
+- Update to v4.17.0-1 (jsc#SLE-19261)
+  - Anti-rollback Protection
+    - Enabled Anti-rollback protection to prevent old vulnerable firmware
+      versions from being flashed to the device
+  - mstlink tool
+    - Added support for DSFP modules
+  - Parallel Firmware Burning (DMA Burning)
+    - Added support for parallel firmware burning.
+- Refresh PIE.patch against latest sources
+
 -------------------------------------------------------------------
 Tue May 25 16:58:42 UTC 2021 - Wolfgang Frisch <wolfgang.frisch@suse.com>
 
diff --git a/mstflint.spec b/mstflint.spec
index a91a814..dd90ada 100644
--- a/mstflint.spec
+++ b/mstflint.spec
@@ -16,10 +16,10 @@
 #
 
 
-%define extra_version -2
+%define extra_version -1
 
 Name:           mstflint
-Version:        4.16.0
+Version:        4.17.0
 Release:        0
 Summary:        Mellanox Firmware Burning and Diagnostics Tools
 License:        BSD-2-Clause OR GPL-2.0-only
@@ -53,7 +53,7 @@ the downloads page at the Mellanox web site.
 %patch1
 %patch4
 %patch5
-%patch6 -p1
+%patch6
 
 %build
 ./autogen.sh