!4 smp_utils: update to 0.99 version

Merge pull request !4 from liuzhiqiang/master

0000-smp_utils-0.98-sysmacros.patch

@@ -1,36 +0,0 @@
-diff --git a/lib/smp_aac_io.c b/lib/smp_aac_io.c
-index 110d0cc..ef91f71 100644
---- a/lib/smp_aac_io.c
-+++ b/lib/smp_aac_io.c
-@@ -6,6 +6,7 @@
- #include <stddef.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-diff --git a/lib/smp_lin_bsg.c b/lib/smp_lin_bsg.c
-index 0995ded..e19a166 100644
---- a/lib/smp_lin_bsg.c
-+++ b/lib/smp_lin_bsg.c
-@@ -40,6 +40,7 @@
- #include <fcntl.h>
- //#include <curses.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-diff --git a/lib/smp_mptctl_io.c b/lib/smp_mptctl_io.c
-index 5512913..def386d 100644
---- a/lib/smp_mptctl_io.c
-+++ b/lib/smp_mptctl_io.c
-@@ -15,6 +15,7 @@
- #include <fcntl.h>
- //#include <curses.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>

0001-Add-files-via-upload.patch

@@ -1,80 +0,0 @@
-From 8e7ca311f55fe2074e5b02a17249c5a707edeb3c Mon Sep 17 00:00:00 2001
-From: doug-gilbert <32302704+doug-gilbert@users.noreply.github.com>
-Date: Wed, 28 Feb 2018 11:49:45 -0500
-Subject: [PATCH 12/13] Add files via upload
-
-smp_conf_phy_event: fix file pointer leak;
----
-diff --git a/src/smp_conf_phy_event.c b/src/smp_conf_phy_event.c
-index b2ad100..70ce4f5 100644
---- a/src/smp_conf_phy_event.c
-+++ b/src/smp_conf_phy_event.c
-@@ -336,6 +336,7 @@ build_joint_arr(const char * file_name, unsigned char * pes_arr,
-     char line[512];
-     int off = 0;
-     int in_len, k, j, m, have_stdin, ind, bit0, err;
-+    int ret = 0;
-     char * lcp;
-     FILE * fp;
-     unsigned int unum;
-@@ -376,7 +377,8 @@ build_joint_arr(const char * file_name, unsigned char * pes_arr,
-         if ((k < in_len) && ('#' != lcp[k])) {
-             fprintf(stderr, "build_joint_arr: syntax error at "
-                     "line %d, pos %d\n", j + 1, m + k + 1);
--            return 1;
-+            ret = 1;
-+            goto fini;
-         }
-         for (k = 0; k < 1024; ++k) {
-             unum = get_unum(lcp, &err);
-@@ -386,7 +388,8 @@ build_joint_arr(const char * file_name, unsigned char * pes_arr,
-                 if (ind >= max_arr_len) {
-                     fprintf(stderr, "build_joint_arr: array length "
-                             "exceeded\n");
--                    return 1;
-+                    ret = 1;
-+                    goto fini;
-                 }
-                 if (bit0)
-                     thres_arr[ind] = unum;
-@@ -394,7 +397,8 @@ build_joint_arr(const char * file_name, unsigned char * pes_arr,
-                     if (unum > 255) {
-                         fprintf(stderr, "build_joint_arr: pes (%u) too "
-                                 "large\n", unum);
--                        return 1;
-+                        ret = 1;
-+                        goto fini;
-                     }
-                     pes_arr[ind] = (unsigned char)unum;
-                 }
-@@ -412,7 +416,8 @@ build_joint_arr(const char * file_name, unsigned char * pes_arr,
-                 fprintf(stderr, "build_joint_arr: error in "
-                         "line %d, at pos %d\n", j + 1,
-                         (int)(lcp - line + 1));
--                return 1;
-+                ret = 1;
-+                goto fini;
-             }
-         }
-         off += (k + 1);
-@@ -420,10 +425,14 @@ build_joint_arr(const char * file_name, unsigned char * pes_arr,
-     if (0x1 & off) {
-         fprintf(stderr, "build_joint_arr: expect LBA,NUM pairs but decoded "
-                 "odd number\n  from %s\n", have_stdin ? "stdin" : file_name);
--        return 1;
-+        ret = 1;
-+        goto fini;
-     }
-     *arr_len = off >> 1;
--    return 0;
-+fini:
-+    if (! have_stdin)
-+        fclose(fp);
-+    return ret;
- }
-
- static void
-
--- 
-2.19.1
-

smp_utils.spec

@@ -1,12 +1,10 @@
 Name:           smp_utils
-Version:        0.98
+Version:        0.99
-Release:        15
+Release:        1
 Summary:        Utilities for SAS management protocol (SMP)
 License:        BSD
 URL:            http://sg.danny.cz/sg/smp_utils.html
 Source0:        http://sg.danny.cz/sg/p/%{name}-%{version}.tgz
-Patch0:         0000-smp_utils-0.98-sysmacros.patch
-Patch1:         0001-Add-files-via-upload.patch
 
 BuildRequires:  gcc,git
 Provides:       %{name}-libs %{name}-libs%{?_isa}
@@ -74,6 +72,9 @@ make install \
 
 
 %changelog
+* Thu Jul 16 2020 Zhiqiang Liu <liuzhiqiang26@huawei.com> -0.99-1
+- update to v0.99 version
+
 * Tue Jun 30 2020 volcanodragon <linfeilong@huawei.com> -0.98-15
 - rename patches