diff --git a/0000-smp_utils-0.98-sysmacros.patch b/0000-smp_utils-0.98-sysmacros.patch deleted file mode 100644 index 27591e3b07d4e92cd7e314e4c30b7e2306fb1bf2..0000000000000000000000000000000000000000 --- a/0000-smp_utils-0.98-sysmacros.patch +++ /dev/null @@ -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 - #include - #include -+#include - #include - #include - #include -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 - //#include - #include -+#include - #include - #include - #include -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 - //#include - #include -+#include - #include - #include - #include diff --git a/6000-Add-files-via-upload.patch b/6000-Add-files-via-upload.patch deleted file mode 100644 index f9431ca8b1fa05f63e9a770a53b6a4a260b1d39f..0000000000000000000000000000000000000000 --- a/6000-Add-files-via-upload.patch +++ /dev/null @@ -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 - diff --git a/smp_utils-0.98.tgz b/smp_utils-0.98.tgz deleted file mode 100644 index e83faa1bfc7d7e0a416f1b543975288473df17c7..0000000000000000000000000000000000000000 Binary files a/smp_utils-0.98.tgz and /dev/null differ diff --git a/smp_utils-0.99.tgz b/smp_utils-0.99.tgz new file mode 100644 index 0000000000000000000000000000000000000000..b20900bbc7ecb1824051ea1ccf29d104fbb82e74 Binary files /dev/null and b/smp_utils-0.99.tgz differ diff --git a/smp_utils.spec b/smp_utils.spec index 21d69538997cf7a49752ec9e97815b0b7a98e6ec..2e0cd2041c920822d20bfba167ce1368c8255b24 100644 --- a/smp_utils.spec +++ b/smp_utils.spec @@ -1,12 +1,10 @@ Name: smp_utils -Version: 0.98 -Release: 14 +Version: 0.99 +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 -Patch0000: 0000-smp_utils-0.98-sysmacros.patch -Patch6000: 6000-Add-files-via-upload.patch BuildRequires: gcc,git Provides: %{name}-libs %{name}-libs%{?_isa} @@ -74,5 +72,8 @@ make install \ %changelog +* Thu Jul 30 2020 yanglongkang - 0.99-1 +- update to 0.99 version + * Fri Aug 30 2019 mingfangsen -0.98-13.2 - Package init