pool/libstoragemgmt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Sync patches with fedora:

Browse Source 
* 0002-C-library-Bug-fix-for-incorrect-use-of-sizeof.patch
  * 0003-Simc-plugin-Fix-gcc-warning-on-fallthrough-switch.patch

OBS-URL: https://build.opensuse.org/package/show/Base:System/libstoragemgmt?expand=0&rev=35
This commit is contained in:
Martin Pluskal 2017-05-16 10:40:06 +00:00 committed by Git OBS Bridge
parent 7c1587d507
commit d10e0013c8
4 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
0001-Fix-gcc-warning-on-non-x86-platform.patch
View File

@ -27,11 +27,11 @@ Signed-off-by: Gris Ge <fge@redhat.com>
tools/udev/scan-scsi-target.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/udev/scan-scsi-target.c b/tools/udev/scan-scsi-target.c
index bb83c65..00126b9 100644
--- a/tools/udev/scan-scsi-target.c
+++ b/tools/udev/scan-scsi-target.c
@@ -54,7 +54,7 @@ static void __attribute__ ((__noreturn__)) invalid(char **argv, char *devpath)
Index: tools/udev/scan-scsi-target.c
===================================================================
--- tools/udev/scan-scsi-target.c.orig
+++ tools/udev/scan-scsi-target.c
@@ -54,7 +54,7 @@ static void __attribute__ ((__noreturn__
int main(int argc, char **argv)
{

16
0002-C-library-Bug-fix-for-incorrect-use-of-sizeof.patch Normal file
View File

@ -0,0 +1,16 @@
Index: c_binding/libses.c
===================================================================
--- c_binding/libses.c.orig
+++ c_binding/libses.c
@@ -341,9 +341,9 @@ static int _ses_sg_paths_get(char *err_m
(strncmp(sg_name, "sg", strlen("sg")) != 0))
continue;
sysfs_sg_type_path = (char *)
- malloc(sizeof(char) * (sizeof(_SYSFS_SG_ROOT_PATH) +
+ malloc(sizeof(char) * (strlen(_SYSFS_SG_ROOT_PATH) +
strlen("/") +
- sizeof(sg_name) +
+ strlen(sg_name) +
strlen("/device/type") +
1 /* trailing \0 */));
_alloc_null_check(err_msg, sysfs_sg_type_path, rc, out);

7
libstoragemgmt.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 16 10:30:33 UTC 2017 - mpluskal@suse.com
- Sync patches with fedora:
* 0002-C-library-Bug-fix-for-incorrect-use-of-sizeof.patch
* 0003-Simc-plugin-Fix-gcc-warning-on-fallthrough-switch.patch
-------------------------------------------------------------------
Tue Apr 25 07:27:25 UTC 2017 - alarrosa@suse.com

5
libstoragemgmt.spec
View File

@ -28,6 +28,8 @@ Url: https://github.com/libstorage/libstoragemgmt
Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM 0001-Fix-gcc-warning-on-non-x86-platform.patch -- Fix build in ppc64le/s390x related to getopt_long
Patch0: 0001-Fix-gcc-warning-on-non-x86-platform.patch
# PATCH-FIX-UPSTREAM 0002-C-library-Bug-fix-for-incorrect-use-of-sizeof.patch
Patch1: 0002-C-library-Bug-fix-for-incorrect-use-of-sizeof.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libconfig-devel
@ -194,7 +196,8 @@ management via hpssacli.
%prep
%setup -q
%patch0 -p1
%patch0
%patch1
%build
%configure \