Upstream released 4.1.0-1.46.gb1cdaf7. Remade disableWerror.patch accordingly, so timestamps won't trigger aclocal.

3 files changed, 41 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd7975fb6382..9e68b08d0fb1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Mon Dec 14 02:25:52 UTC 2015
 pkgbase = mstflint
 	pkgdesc = OpenFabrics Alliance firmware burning application for Mellanox HCA/NIC cards
-	pkgver = 4.0.1
+	pkgver = 4.1.0
 	pkgrel = 1
 	url = https://www.openfabrics.org/index.php/overview.html
 	arch = x86_64
@@ -10,10 +12,10 @@ pkgbase = mstflint
 	depends = bash
 	depends = zlib
 	depends = libibmad
-	source = https://www.openfabrics.org/downloads/mstflint/mstflint-4.0.1-1.43.g97d7275.tar.gz
+	source = https://www.openfabrics.org/downloads/mstflint/mstflint-4.1.0-1.46.gb1cdaf7.tar.gz
 	source = disableWerror.patch
-	md5sums = 7bcf30aa21f1951c6da918dbae25b23a
-	md5sums = 526da982d2827af23d00fe8f7306923b
+	md5sums = 030179e989e09562320e11511648f4e7
+	md5sums = 00467463d323ca845f121145bdd22dde
 
 pkgname = mstflint
 
diff --git a/PKGBUILD b/PKGBUILD
index 47df0496bc89..655b61ed5414 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # namcap says dependency 'libibmad' is not needed, but without it, configure fails with "cannot find infiniband/mad.h", provided by libibmad, and mstflint-4.0.1/mtcr_ul/mtcr_ib_ofed.c does include "infiniband/mad.h"
 
 pkgname=mstflint
-pkgver=4.0.1
-_pkgver_subver=1.43
-_pkgver_commit=g97d7275
+pkgver=4.1.0
+_pkgver_subver=1.46
+_pkgver_commit=gb1cdaf7
 pkgrel=1
 pkgdesc='OpenFabrics Alliance firmware burning application for Mellanox HCA/NIC cards'
 arch=('x86_64' 'i686')
@@ -13,8 +13,8 @@ license=('GPL2' 'custom:"Open Fabrics Alliance BSD"')
 depends=('bash' 'zlib' 'libibmad')
 source=("https://www.openfabrics.org/downloads/${pkgname}/${pkgname}-${pkgver}-${_pkgver_subver}.${_pkgver_commit}.tar.gz"
         'disableWerror.patch')
-md5sums=('7bcf30aa21f1951c6da918dbae25b23a'
-         '526da982d2827af23d00fe8f7306923b')
+md5sums=('030179e989e09562320e11511648f4e7'
+         '00467463d323ca845f121145bdd22dde')
 
 prepare() {
   # v4.0.1.143.g97d7275 triggers -Werror, due to maybe uninitialized variables at fs3_ops.cpp:1727, 1863, and 1068
diff --git a/disableWerror.patch b/disableWerror.patch
index b56e457a764f..e40f78969c21 100644
--- a/disableWerror.patch
+++ b/disableWerror.patch
@@ -1,6 +1,6 @@
-diff -rupN mstflint-4.0.1.original/cmdif/Makefile.am mstflint-4.0.1/cmdif/Makefile.am
---- mstflint-4.0.1.original/cmdif/Makefile.am	2015-06-23 13:19:21.000000000 +0000
-+++ mstflint-4.0.1/cmdif/Makefile.am	2015-06-23 13:19:21.000000000 +0000
+diff -rupN mstflint-4.1.0.original/cmdif/Makefile.am mstflint-4.1.0/cmdif/Makefile.am
+--- mstflint-4.1.0.original/cmdif/Makefile.am	2015-09-06 07:05:27.000000000 +0000
++++ mstflint-4.1.0/cmdif/Makefile.am	2015-09-06 07:05:27.000000000 +0000
 @@ -36,7 +36,7 @@ MTCR_DIR = $(USER_DIR)/include/mtcr_ul
  TOOLS_LAYOUTS_DIR = $(USER_DIR)/tools_layouts
  INCLUDES = -I. -I../common -I../tools_layouts  -I$(MTCR_DIR) -I.. -I$(USER_DIR)/mtcr_ul
@@ -10,9 +10,9 @@ diff -rupN mstflint-4.0.1.original/cmdif/Makefile.am mstflint-4.0.1/cmdif/Makefi
  CMDIF_VERSION = 1
  noinst_LIBRARIES = libcmdif.a
  
-diff -rupN mstflint-4.0.1.original/cmdif/Makefile.in mstflint-4.0.1/cmdif/Makefile.in
---- mstflint-4.0.1.original/cmdif/Makefile.in	2015-06-23 13:40:50.000000000 +0000
-+++ mstflint-4.0.1/cmdif/Makefile.in	2015-06-23 13:40:50.000000000 +0000
+diff -rupN mstflint-4.1.0.original/cmdif/Makefile.in mstflint-4.1.0/cmdif/Makefile.in
+--- mstflint-4.1.0.original/cmdif/Makefile.in	2015-09-06 07:07:11.000000000 +0000
++++ mstflint-4.1.0/cmdif/Makefile.in	2015-09-06 07:07:11.000000000 +0000
 @@ -322,7 +322,7 @@ USER_DIR = $(top_srcdir)
  MTCR_DIR = $(USER_DIR)/include/mtcr_ul
  TOOLS_LAYOUTS_DIR = $(USER_DIR)/tools_layouts
@@ -22,9 +22,9 @@ diff -rupN mstflint-4.0.1.original/cmdif/Makefile.in mstflint-4.0.1/cmdif/Makefi
  CMDIF_VERSION = 1
  noinst_LIBRARIES = libcmdif.a
  libcmdif_a_SOURCES = tools_cif.c
-diff -rupN mstflint-4.0.1.original/configure mstflint-4.0.1/configure
---- mstflint-4.0.1.original/configure	2015-06-23 13:40:52.000000000 +0000
-+++ mstflint-4.0.1/configure	2015-06-23 13:40:52.000000000 +0000
+diff -rupN mstflint-4.1.0.original/configure mstflint-4.1.0/configure
+--- mstflint-4.1.0.original/configure	2015-09-06 07:07:14.000000000 +0000
++++ mstflint-4.1.0/configure	2015-09-06 07:07:14.000000000 +0000
 @@ -15230,8 +15230,8 @@ if test "x$enable_dynamic_ld" = "xyes";
  
  fi
@@ -36,9 +36,9 @@ diff -rupN mstflint-4.0.1.original/configure mstflint-4.0.1/configure
  
  ac_config_files="$ac_config_files mstflint.spec"
  
-diff -rupN mstflint-4.0.1.original/configure.ac mstflint-4.0.1/configure.ac
---- mstflint-4.0.1.original/configure.ac	2015-06-23 13:19:21.000000000 +0000
-+++ mstflint-4.0.1/configure.ac	2015-06-23 13:19:21.000000000 +0000
+diff -rupN mstflint-4.1.0.original/configure.ac mstflint-4.1.0/configure.ac
+--- mstflint-4.1.0.original/configure.ac	2015-09-06 07:05:27.000000000 +0000
++++ mstflint-4.1.0/configure.ac	2015-09-06 07:05:27.000000000 +0000
 @@ -61,8 +61,8 @@ AS_IF([test "x$enable_dynamic_ld" = "xye
    LDFLAGS="$LDFLAGS -Wl,--dynamic-linker=/lib64/ld64.so.2"
  ])
@@ -50,9 +50,9 @@ diff -rupN mstflint-4.0.1.original/configure.ac mstflint-4.0.1/configure.ac
  
  AC_CONFIG_FILES( mstflint.spec )
  
-diff -rupN mstflint-4.0.1.original/mft_utils/Makefile.am mstflint-4.0.1/mft_utils/Makefile.am
---- mstflint-4.0.1.original/mft_utils/Makefile.am	2015-06-23 13:19:22.000000000 +0000
-+++ mstflint-4.0.1/mft_utils/Makefile.am	2015-06-23 13:19:22.000000000 +0000
+diff -rupN mstflint-4.1.0.original/mft_utils/Makefile.am mstflint-4.1.0/mft_utils/Makefile.am
+--- mstflint-4.1.0.original/mft_utils/Makefile.am	2015-09-06 07:05:28.000000000 +0000
++++ mstflint-4.1.0/mft_utils/Makefile.am	2015-09-06 07:05:28.000000000 +0000
 @@ -34,7 +34,7 @@
  USER_DIR = $(top_srcdir)
  INCLUDES = -I. -I$(USER_DIR)/common
@@ -62,9 +62,9 @@ diff -rupN mstflint-4.0.1.original/mft_utils/Makefile.am mstflint-4.0.1/mft_util
  
  noinst_HEADERS = mft_sig_handler.h errmsg.h
  
-diff -rupN mstflint-4.0.1.original/mft_utils/Makefile.in mstflint-4.0.1/mft_utils/Makefile.in
---- mstflint-4.0.1.original/mft_utils/Makefile.in	2015-06-23 13:40:50.000000000 +0000
-+++ mstflint-4.0.1/mft_utils/Makefile.in	2015-06-23 13:40:50.000000000 +0000
+diff -rupN mstflint-4.1.0.original/mft_utils/Makefile.in mstflint-4.1.0/mft_utils/Makefile.in
+--- mstflint-4.1.0.original/mft_utils/Makefile.in	2015-09-06 07:07:11.000000000 +0000
++++ mstflint-4.1.0/mft_utils/Makefile.in	2015-09-06 07:07:11.000000000 +0000
 @@ -341,7 +341,7 @@ top_srcdir = @top_srcdir@
  # Makefile.am -- Process this file with automake to produce Makefile.in
  USER_DIR = $(top_srcdir)
@@ -74,9 +74,9 @@ diff -rupN mstflint-4.0.1.original/mft_utils/Makefile.in mstflint-4.0.1/mft_util
  noinst_HEADERS = mft_sig_handler.h errmsg.h
  noinst_LIBRARIES = libmftutils.a
  libmftutils_a_SOURCES = mft_sig_handler.c errmsg.cpp
-diff -rupN mstflint-4.0.1.original/reg_access/Makefile.am mstflint-4.0.1/reg_access/Makefile.am
---- mstflint-4.0.1.original/reg_access/Makefile.am	2015-06-23 13:19:23.000000000 +0000
-+++ mstflint-4.0.1/reg_access/Makefile.am	2015-06-23 13:19:23.000000000 +0000
+diff -rupN mstflint-4.1.0.original/reg_access/Makefile.am mstflint-4.1.0/reg_access/Makefile.am
+--- mstflint-4.1.0.original/reg_access/Makefile.am	2015-09-06 07:05:28.000000000 +0000
++++ mstflint-4.1.0/reg_access/Makefile.am	2015-09-06 07:05:28.000000000 +0000
 @@ -38,7 +38,7 @@ USER_DIR = $(top_srcdir)
  
  INCLUDES = -I. -I$(USER_DIR) -I$(srcdir) -I$(LAYOUTS_DIR) -I$(USER_DIR)/include/mtcr_ul
@@ -86,9 +86,9 @@ diff -rupN mstflint-4.0.1.original/reg_access/Makefile.am mstflint-4.0.1/reg_acc
  
  noinst_LIBRARIES = libreg_access.a
  
-diff -rupN mstflint-4.0.1.original/reg_access/Makefile.in mstflint-4.0.1/reg_access/Makefile.in
---- mstflint-4.0.1.original/reg_access/Makefile.in	2015-06-23 13:40:51.000000000 +0000
-+++ mstflint-4.0.1/reg_access/Makefile.in	2015-06-23 13:40:51.000000000 +0000
+diff -rupN mstflint-4.1.0.original/reg_access/Makefile.in mstflint-4.1.0/reg_access/Makefile.in
+--- mstflint-4.1.0.original/reg_access/Makefile.in	2015-09-06 07:07:13.000000000 +0000
++++ mstflint-4.1.0/reg_access/Makefile.in	2015-09-06 07:07:13.000000000 +0000
 @@ -323,7 +323,7 @@ COMMON_DIR = $(top_srcdir)/common
  LAYOUTS_DIR = $(top_srcdir)/tools_layouts
  USER_DIR = $(top_srcdir)
@@ -98,9 +98,9 @@ diff -rupN mstflint-4.0.1.original/reg_access/Makefile.in mstflint-4.0.1/reg_acc
  noinst_LIBRARIES = libreg_access.a
  libreg_access_a_SOURCES = reg_access.c
  libreg_access_a_DEPENDENCIES = $(USER_DIR)/tools_layouts/libtools_layouts.a
-diff -rupN mstflint-4.0.1.original/tools_res_mgmt/Makefile.am mstflint-4.0.1/tools_res_mgmt/Makefile.am
---- mstflint-4.0.1.original/tools_res_mgmt/Makefile.am	2015-06-23 13:19:23.000000000 +0000
-+++ mstflint-4.0.1/tools_res_mgmt/Makefile.am	2015-06-23 13:19:23.000000000 +0000
+diff -rupN mstflint-4.1.0.original/tools_res_mgmt/Makefile.am mstflint-4.1.0/tools_res_mgmt/Makefile.am
+--- mstflint-4.1.0.original/tools_res_mgmt/Makefile.am	2015-09-06 07:05:28.000000000 +0000
++++ mstflint-4.1.0/tools_res_mgmt/Makefile.am	2015-09-06 07:05:28.000000000 +0000
 @@ -35,7 +35,7 @@ USER_DIR = $(top_srcdir)
  MTCR_DIR = $(USER_DIR)/include/mtcr_ul
  INCLUDES = -I. -I../common -I$(MTCR_DIR) -I.. -I$(USER_DIR)/mtcr_ul
@@ -110,9 +110,9 @@ diff -rupN mstflint-4.0.1.original/tools_res_mgmt/Makefile.am mstflint-4.0.1/too
  noinst_LIBRARIES = libtools_res_mgmt.a
  
  libtools_res_mgmt_a_SOURCES = tools_res_mgmt.c
-diff -rupN mstflint-4.0.1.original/tools_res_mgmt/Makefile.in mstflint-4.0.1/tools_res_mgmt/Makefile.in
---- mstflint-4.0.1.original/tools_res_mgmt/Makefile.in	2015-06-23 13:40:51.000000000 +0000
-+++ mstflint-4.0.1/tools_res_mgmt/Makefile.in	2015-06-23 13:40:51.000000000 +0000
+diff -rupN mstflint-4.1.0.original/tools_res_mgmt/Makefile.in mstflint-4.1.0/tools_res_mgmt/Makefile.in
+--- mstflint-4.1.0.original/tools_res_mgmt/Makefile.in	2015-09-06 07:07:13.000000000 +0000
++++ mstflint-4.1.0/tools_res_mgmt/Makefile.in	2015-09-06 07:07:13.000000000 +0000
 @@ -321,7 +321,7 @@ top_srcdir = @top_srcdir@
  USER_DIR = $(top_srcdir)
  MTCR_DIR = $(USER_DIR)/include/mtcr_ul