From 3401dfc9de9d9955571ea6bc86237c9ea3b76c31daad37e2bd075327242ce73f Mon Sep 17 00:00:00 2001
From: Raymund Will <rw@suse.com>
Date: Wed, 6 Feb 2019 13:44:01 +0000
Subject: [PATCH 1/4] OBS-URL:
 https://build.opensuse.org/package/show/hardware:nvdimm/ipmctl?expand=0&rev=22

---
 ipmctl.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ipmctl.spec b/ipmctl.spec
index 9ca0095..1f7bb66 100644
--- a/ipmctl.spec
+++ b/ipmctl.spec
@@ -65,6 +65,7 @@ Obsoletes:      lib%{name}2
 # for impctl
 Obsoletes:      ixpdimm-cli < 01.00.00.3000
 # for (obsoleted) libipmctl2 et.al.
+Obsoletes:      ipmctl-data < %{version}
 Obsoletes:      ixpdimm-data < 01.00.00.3000
 Obsoletes:      ixpdimm_sw < 01.00.00.3000
 Obsoletes:      libixpdimm < 01.00.00.3000

From 02dc5758a2a6b7c5cfb9a7d87be876f543321718f4409e6f1ff8bd48a85082a8 Mon Sep 17 00:00:00 2001
From: Raymund Will <rw@suse.com>
Date: Wed, 13 Mar 2019 17:45:23 +0000
Subject: [PATCH 2/4] Accepting request 684769 from
 home:rwill:branches:hardware:nvdimm

- Update to version v01.00.00.3440.
  - Support more than 16 sockets.  [FATE327556, bsc#1123735]
  - Fix flashing FW of DCPMM modules.  [bsc#1128830]

OBS-URL: https://build.opensuse.org/request/show/684769
OBS-URL: https://build.opensuse.org/package/show/hardware:nvdimm/ipmctl?expand=0&rev=23
---
 .gitattributes                              |  2 -
 ChangeLog.xz                                |  4 +-
 _service                                    | 10 ++++
 _servicedata                                |  4 +-
 ipmctl-01.00.00.3402.tar.gz                 |  3 --
 ipmctl-01.00.00.3440.tar.gz                 |  3 ++
 ipmctl-python3.patch                        |  2 +-
 ipmctl.changes                              | 11 +++++
 ipmctl.spec                                 | 13 +++--
 libsafec-03032018.0-g570fa5.tar.gz          |  3 --
 libsafec-patches.tar                        |  3 --
 mkSafeC                                     | 55 +++++++++++++++------
 safeclib-3.3.v03032018+git7.59eba324.tar.xz |  3 ++
 safeclib-patches.tar                        |  0
 14 files changed, 79 insertions(+), 37 deletions(-)
 delete mode 100644 ipmctl-01.00.00.3402.tar.gz
 create mode 100644 ipmctl-01.00.00.3440.tar.gz
 delete mode 100644 libsafec-03032018.0-g570fa5.tar.gz
 delete mode 100644 libsafec-patches.tar
 create mode 100644 safeclib-3.3.v03032018+git7.59eba324.tar.xz
 create mode 100644 safeclib-patches.tar

diff --git a/.gitattributes b/.gitattributes
index d850095..9b03811 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,5 +21,3 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
-## Specific LFS patterns
-libsafec-patches.tar filter=lfs diff=lfs merge=lfs -text
diff --git a/ChangeLog.xz b/ChangeLog.xz
index 57a5ffe..ef93180 100644
--- a/ChangeLog.xz
+++ b/ChangeLog.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25967dbca09c632b4c2155cf913204c4d93b8642d3ebda3fe6c1677ddc6feb92
-size 30552
+oid sha256:cd07e7d159c5f9a0aa34e3a05331dcbb8eb9effa711126f4de6ccae2a5d7efdb
+size 3320
diff --git a/_service b/_service
index a42f72c..5398995 100644
--- a/_service
+++ b/_service
@@ -1,4 +1,14 @@
 <services>
+  <service name="tar_scm" mode="disabled">
+    <param name="scm">git</param>
+    <param name="url">https://github.com/rurban/safeclib</param>
+    <param name="filename">safeclib</param>
+    <param name="versionprefix">3.3</param>
+    <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
+    <param name="revision">59eba324c20c07f7ca8190238dd415525f4925dc</param>
+    <param name="exclude">.git</param>
+    <param name="changesgenerate">enable</param>
+  </service>
   <service name="tar_scm" mode="disabled">
     <param name="scm">git</param>
     <param name="url">https://github.com/intel/ipmctl.git</param>
diff --git a/_servicedata b/_servicedata
index 162a04b..f24a555 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/intel/ipmctl.git</param>
-              <param name="changesrevision">b7a59dac174c4e8c5d1d15300b413eba274ea345</param></service></servicedata>
+              <param name="changesrevision">0320099f3792e9ab11ecc531c734d0048989f85b</param></service><service name="tar_scm">
+            <param name="url">https://github.com/rurban/safeclib</param>
+          <param name="changesrevision">59eba324c20c07f7ca8190238dd415525f4925dc</param></service></servicedata>
\ No newline at end of file
diff --git a/ipmctl-01.00.00.3402.tar.gz b/ipmctl-01.00.00.3402.tar.gz
deleted file mode 100644
index b313761..0000000
--- a/ipmctl-01.00.00.3402.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c076446c1414d2f2bc80d3ff16abfaed1cd231415408a7af2be5355af1065e0
-size 10456674
diff --git a/ipmctl-01.00.00.3440.tar.gz b/ipmctl-01.00.00.3440.tar.gz
new file mode 100644
index 0000000..fc9940e
--- /dev/null
+++ b/ipmctl-01.00.00.3440.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b516488c527f5023b3618356b01eabdd79220ea2d6082fddc551f4b220eef3ad
+size 10461546
diff --git a/ipmctl-python3.patch b/ipmctl-python3.patch
index 0b39017..4b302f5 100644
--- a/ipmctl-python3.patch
+++ b/ipmctl-python3.patch
@@ -19,7 +19,7 @@
  BaseTools/BinWrappers/PosixLike/UPT                       |    2 ++
  BaseTools/BinWrappers/PosixLike/build                     |    2 ++
  BaseTools/Tests/GNUmakefile                               |    2 +-
- 21 files changed, 48 insertions(+), 3 deletions(-)
+ 20 files changed, 39 insertions(+), 1 deletion(-)
 
 --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc
 +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc
diff --git a/ipmctl.changes b/ipmctl.changes
index 7f19171..6ea521e 100644
--- a/ipmctl.changes
+++ b/ipmctl.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Mar 13 17:14:58 UTC 2019 - rw@suse.com
+
+- Update to version v01.00.00.3440.
+  - Support more than 16 sockets.  [FATE327556, bsc#1123735]
+  - Fix flashing FW of DCPMM modules.  [bsc#1128830]
+  (For detailed changes see 'ChangeLog.xz')
+- Update SafeC dependency (as used in 3440).
+- Refresh patch(es)
+  (ipmctl-python3.patch)
+
 -------------------------------------------------------------------
 Tue Jan 29 14:03:31 UTC 2019 - rw@suse.com
 
diff --git a/ipmctl.spec b/ipmctl.spec
index 1f7bb66..f28eafa 100644
--- a/ipmctl.spec
+++ b/ipmctl.spec
@@ -19,12 +19,11 @@
 %define abi     3
 #define vgit    .1547861714.b7a59da
 %define vgit    %{nil}
-%define vSafeC  03032018
-%define pSafeC  rurban/safeclib/releases/download/v%{vSafeC}
+%define vSafeC  3.3.v03032018+git7.59eba324
 %bcond_with     precompiledSafeC
 
 Name:           ipmctl
-Version:        01.00.00.3402
+Version:        01.00.00.3440
 Release:        0
 Summary:        Utility for managing Intel Optane DC persistent memory modules
 License:        BSD-3-Clause
@@ -37,9 +36,9 @@ Source:         %{name}-%{version}%{vgit}.tar.gz
 %endif
 Source1:        ChangeLog.xz
 Source2:        %{name}-rpmlintrc
-Source10:       https://github.com/%{pSafeC}/libsafec-%{vSafeC}.0-g570fa5.tar.gz
+Source10:       safeclib-%{vSafeC}.tar.xz
 Source11:       mkSafeC
-Source12:       libsafec-patches.tar
+Source12:       safeclib-patches.tar
 Patch1:         ipmctl-python3.patch
 
 Recommends:     logrotate
@@ -54,7 +53,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  systemd
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(libndctl) >= 58.2
-# for libsafec
+# for SafeC
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc
@@ -113,7 +112,7 @@ API for development of Intel Optane DC persistent memory management utilities.
 ! grep -lri 'INTEL CONFIDENTIAL' || exit 1
 
 %if %{with precompiledSafeC}
-  tar xfJ ../../SOURCES/libsafec-prebuild.tar.xz || sleep 5
+  tar xfJ ../../SOURCES/safeclib-prebuild.tar.xz || sleep 5
 %endif
 
 %build
diff --git a/libsafec-03032018.0-g570fa5.tar.gz b/libsafec-03032018.0-g570fa5.tar.gz
deleted file mode 100644
index 22085cb..0000000
--- a/libsafec-03032018.0-g570fa5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e3af263e2d794c1e24435d89d0ee00640b3f9f5d8d73d0250e97cae273c6637
-size 906503
diff --git a/libsafec-patches.tar b/libsafec-patches.tar
deleted file mode 100644
index 8ec8177..0000000
--- a/libsafec-patches.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:120d12e728670fc709e2f180f9ff57797f74bd1ad882aef341df9111c3358aeb
-size 10240
diff --git a/mkSafeC b/mkSafeC
index 6b3f8a7..5016804 100644
--- a/mkSafeC
+++ b/mkSafeC
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+#SafeC=libsafec
+SafeC=safeclib
+SafeCpatches="$1"; shift
+
 [ -r CMakeLists.txt ]
 
 perl -pi.00 -e '
@@ -16,33 +20,54 @@ perl -pi.00 -e 's{/usr/share/ipmctl}{/etc}' src/os/ini/ini.c
 
 CONTRIB=$PWD/contrib
 if [ -d $CONTRIB/include ]; then
-   cd $CONTRIB/src/libsafec*
+   cd $CONTRIB/src/${SFAEC}*
    LSC=${PWD##*/} 
    cp -p COPYING $CONTRIB/COPYING.$LSC
    sleep 2
    exit 0 
 fi
 
-mkdir -p contrib/src/patches/libsafec
+mkdir -p contrib/{src,patches/${SafeC}}
 
-mv libsafec* contrib/src
-[ -z "$1" ] || tar xvfC "$1" contrib/src/patches/libsafec
-cd contrib/src/libsafec*
-for p in ../patches/libsafec/*.patch; do
-  patch -p1 < $p
-done
+mv ${SafeC}* contrib/src
 
-autoreconf -Wall --install
-./configure --disable-shared \
+cd contrib/src/${SafeC}*
+LSC=${PWD##*/} 
+API="$(perl -n -e 'print "$1\n"
+	 if (m{AC_SUBST\(\[SAFEC_API_VERSION\], \[([0-9]+\.[0-9+])\]\)})
+	' configure.ac)"
+SafeCver="${LSC##*-$API.v}"
+[ "$SafeCtar" != "$SafeCver" ] || {
+  echo "unsupported $SafeC version!" >&2
+  exit 1
+}
+SafeCver="${SafeCver%.tar.*}"
+SafeCver="${SafeCver/+git/-}"
+
+if [ -n "$SafeCpatches" -a  -s "$SafeCpatches" ]; then
+  tar xvfC "$SafeCpatches" ../../patches/${SafeC}
+  for p in ../../patches/${SafeC}/*.patch; do
+    patch -p1 < $p
+  done
+else
+  echo "$SafeCver" > .tarball-version
+  perl -pi.00 -e '
+    s{\[libsafec\]}{[safec-'"$API"']}
+  ' configure.ac
+  diff -u configure.ac{.00,} || sleep 4
+fi
+
+autoreconf -Wall --install || exit
+./configure --disable-shared --disable-doc \
 	--enable-static --enable-strmax=0x8000 \
 	--prefix=$CONTRIB \
-	CFLAGS="$RPM_OPT_FLAGS -fPIC -DHAVE_C99"
-make $2
+	CFLAGS="$RPM_OPT_FLAGS -DHAVE_C99 -DNO_MSABI_VA_FUNCS -fPIC"
+make "$@"
 make install
 
-LSC=${PWD##*/} 
 cp -p COPYING $CONTRIB/COPYING.$LSC
 
-[ -d $CONTRIB/include/libsafec ] || exit 1
+[ -r $CONTRIB/include/*/safe_mem_lib.h ] || exit 1
+
 cd $CONTRIB/..
-tar cf /tmp/libsafec-prebuild.tar contrib
+tar cf /tmp/${SafeC}-prebuild.tar contrib
diff --git a/safeclib-3.3.v03032018+git7.59eba324.tar.xz b/safeclib-3.3.v03032018+git7.59eba324.tar.xz
new file mode 100644
index 0000000..0027b05
--- /dev/null
+++ b/safeclib-3.3.v03032018+git7.59eba324.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:edc4d793d89f1b9a67e0228ab3c810ad1bec099214dc87a20ff84d9dddac41bf
+size 1833672
diff --git a/safeclib-patches.tar b/safeclib-patches.tar
new file mode 100644
index 0000000..473a0f4

From 3d493b942120fea32bcc74c6275774af9c5b8d1a84b83fc52b18d5394f646c80 Mon Sep 17 00:00:00 2001
From: Raymund Will <rw@suse.com>
Date: Thu, 14 Mar 2019 13:30:59 +0000
Subject: [PATCH 3/4] Accepting request 685019 from
 home:rwill:branches:hardware:nvdimm

Fix typo in mkSafeC...

OBS-URL: https://build.opensuse.org/request/show/685019
OBS-URL: https://build.opensuse.org/package/show/hardware:nvdimm/ipmctl?expand=0&rev=24
---
 mkSafeC | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkSafeC b/mkSafeC
index 5016804..202b0f5 100644
--- a/mkSafeC
+++ b/mkSafeC
@@ -20,7 +20,7 @@ perl -pi.00 -e 's{/usr/share/ipmctl}{/etc}' src/os/ini/ini.c
 
 CONTRIB=$PWD/contrib
 if [ -d $CONTRIB/include ]; then
-   cd $CONTRIB/src/${SFAEC}*
+   cd $CONTRIB/src/${SafeC}*
    LSC=${PWD##*/} 
    cp -p COPYING $CONTRIB/COPYING.$LSC
    sleep 2

From 37729cf0363ffe287c9e4c334f437071466c511ed900c9352044f7e1f768807d Mon Sep 17 00:00:00 2001
From: Raymund Will <rw@suse.com>
Date: Fri, 15 Mar 2019 13:16:10 +0000
Subject: [PATCH 4/4] OBS-URL:
 https://build.opensuse.org/package/show/hardware:nvdimm/ipmctl?expand=0&rev=25

---
 ipmctl.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipmctl.changes b/ipmctl.changes
index 6ea521e..c38c69f 100644
--- a/ipmctl.changes
+++ b/ipmctl.changes
@@ -2,7 +2,7 @@
 Wed Mar 13 17:14:58 UTC 2019 - rw@suse.com
 
 - Update to version v01.00.00.3440.
-  - Support more than 16 sockets.  [FATE327556, bsc#1123735]
+  - Support more than 16 sockets.  [FATE#327556, bsc#1123735]
   - Fix flashing FW of DCPMM modules.  [bsc#1128830]
   (For detailed changes see 'ChangeLog.xz')
 - Update SafeC dependency (as used in 3440).