Accepting request 990038 from Base:System

OBS-URL: https://build.opensuse.org/request/show/990038
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ledmon?expand=0&rev=23

0002-add-Dell-15G-servers.patch

@@ -0,0 +1,56 @@
+From 7274b21797d1ad76a2f4ccd2e3f70279e50512b4 Mon Sep 17 00:00:00 2001
+From: prabhakar <prabhakar.pujeri@dell.com>
+Date: Tue, 5 Jul 2022 08:16:18 -0400
+Subject: [PATCH 2/2] add Dell 15G servers
+
+---
+ src/dellssd.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/dellssd.c b/src/dellssd.c
+index 5a7ac5f4a629..fce3110d62d5 100644
+--- a/src/dellssd.c
++++ b/src/dellssd.c
+@@ -93,6 +93,9 @@ enum {
+   DELL_13G_MODULAR    = 0x21,
+   DELL_14G_MONOLITHIC = 0x30,
+   DELL_14G_MODULAR    = 0x31,
++  DELL_15G_MONOLITHIC = 0x40,
++  DELL_15G_MODULAR    = 0x41,
++
+ };
+ 
+ int get_dell_server_type()
+@@ -125,6 +128,9 @@ int get_dell_server_type()
+ 	case DELL_13G_MODULAR:
+ 	case DELL_14G_MONOLITHIC:
+ 	case DELL_14G_MODULAR:
++	case DELL_15G_MONOLITHIC:
++	case DELL_15G_MODULAR:
++
+ 		gen = rdata[10];
+ 		return gen;
+ 	default:
+@@ -166,6 +172,9 @@ static int ipmi_setled(int b, int d, int f, int state)
+ 		break;
+ 	case DELL_14G_MONOLITHIC:
+ 	case DELL_14G_MODULAR:
++	case DELL_15G_MONOLITHIC:
++	case DELL_15G_MODULAR:
++
+ 		data[1] = DELL_OEM_STORAGE_GETDRVMAP_14G;
+ 		break;
+ 	}
+@@ -206,6 +215,9 @@ static int ipmi_setled(int b, int d, int f, int state)
+ 		break;
+ 	case DELL_14G_MONOLITHIC:
+ 	case DELL_14G_MODULAR:
++	case DELL_15G_MONOLITHIC:
++	case DELL_15G_MODULAR:
++
+ 		data[1] = DELL_OEM_STORAGE_SETDRVSTATUS_14G;
+ 		break;
+ 	}
+-- 
+2.34.1
+

ledmon-0.95.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f3cec0d8f111e68ab2fff4aeb797193523be3753a51c94b22dac867af201ca7
-size 82048

ledmon-0.96.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97534302a60f03b90e69228a6a56096cf3fdfc8eb31fea52a974445268fdf5d9
+size 83222

ledmon.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Jul 18 15:09:00 UTC 2022 - Heming Zhao <heming.zhao@suse.com>
+
+- Update to version 0.96: (PED-85)
+  * Manual updates, clarify --listed-only option
+  * Fix cache indexing of ATA port
+  * Fixes in regard to macros
+  * Fix memory leak in amd_ipmi.c
+  * Fix NULL pointer dereferences in sysfs.c
+  * Make messages appear in service log immediately
+- add patches after 0.96:
+  + 0001-Ledctl-slots-management-94.patch
+  + 0002-add-Dell-15G-servers.patch
+
 -------------------------------------------------------------------
 Fri Oct 15 07:28:48 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
 

ledmon.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ledmon
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,16 @@
 
 
 Name:           ledmon
-Version:        0.95
+Version:        0.96
 Release:        0
 Summary:        Enclosure LED Utilities
 License:        GPL-2.0-only
 Group:          Hardware/Other
 URL:            https://github.com/intel/ledmon/
 Source0:        https://github.com/intel/ledmon/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0:	harden_ledmon.service.patch
+Patch0:         harden_ledmon.service.patch
+Patch1:         0001-Ledctl-slots-management-94.patch
+Patch2:         0002-add-Dell-15G-servers.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libsgutils-devel