- updated to 1.12HEADauto/th/cciss_vol_status-1.12-1master

2 files changed, 21 insertions, 44 deletions

diff --git a/cciss_vol_status.spec b/cciss_vol_status.spec
index fe22466..d1b6f69 100644
--- a/cciss_vol_status.spec
+++ b/cciss_vol_status.spec
@@ -1,12 +1,12 @@
 Summary:	Shows status of logical drives attached to HP SmartArray controllers
 Summary(pl.UTF-8):	Wyświetla status logicznych dysków stworzonych w kontrolerach HP SmartArray
 Name:		cciss_vol_status
-Version:	1.11
-Release:	2
+Version:	1.12
+Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/cciss/%{name}-%{version}.tar.gz
-# Source0-md5:	e97de30e79874fb479d766c638421483
+# Source0-md5:	83cbd9907efeff48eb30e2a3ca89faa5
 Patch0:		new-ids.patch
 URL:		http://cciss.sourceforge.net/#cciss_utils
 BuildRequires:	autoconf
diff --git a/new-ids.patch b/new-ids.patch
index 2f291e7..231a2f1 100644
--- a/new-ids.patch
+++ b/new-ids.patch
@@ -25,47 +25,24 @@ Index: cciss-vol-status/cciss_vol_status.c
  	{ 0x324A103C, "Smart Array P712m", 0, 1},
  	{ 0x324B103C, "Smart Array P711m", 0, 1},
  	{ 0x3350103C, "Smart Array P222", 0, 1},
-@@ -157,15 +154,44 @@ struct smartarray_id_t {
- 	{ 0x3354103C, "Smart Array P420i", 0, 1},
- 	{ 0x3355103C, "Smart Array P220i", 0, 1},
- 	{ 0x3356103C, "Smart Array P721m", 0, 1},
--	{ 0x1920103C, "Smart Array", 0, 1},
--	{ 0x1921103C, "Smart Array", 0, 1},
--	{ 0x1922103C, "Smart Array", 0, 1},
--	{ 0x1923103C, "Smart Array", 0, 1},
--	{ 0x1924103C, "Smart Array", 0, 1},
--	{ 0x1925103C, "Smart Array", 0, 1},
--	{ 0x1926103C, "Smart Array", 0, 1},
--	{ 0x1928103C, "Smart Array", 0, 1},
--	{ 0x334D103C, "Smart Array P822se", 0, 1},
-+	{ 0x1920103C, "Smart Array P430i", 0, 1},
-+	{ 0x1921103C, "Smart Array P830i", 0, 1},
-+	{ 0x1922103C, "Smart Array P430", 0, 1},
-+	{ 0x1923103C, "Smart Array P431", 0, 1},
-+	{ 0x1924103C, "Smart Array P830", 0, 1},
-+	{ 0x1925103C, "Smart Array P831", 0, 1},
-+	{ 0x1926103C, "Smart Array P731m", 0, 1},
-+	{ 0x1928103C, "Smart Array P230i", 0, 1},
-+	{ 0x1929103C, "Smart Array P530", 0, 1},
-+	{ 0x192A103C, "Smart Array P531", 0, 1},
-+	{ 0x21BD103C, "Smart Array P244br", 0, 1},
-+	{ 0x21BE103C, "Smart Array P741m", 0, 1},
-+	{ 0x21BF103C, "Smart HBA H240ar", 0, 1},
-+	{ 0x21C0103C, "Smart Array P440ar", 0, 1},
+@@ -177,17 +174,30 @@
+ 	{ 0x21BE103C, "Smart Array P741m", 0, 1},
+ 	{ 0x21BF103C, "Smart HBA H240ar", 0, 1},
+ 	{ 0x21C0103C, "Smart Array P440ar", 0, 1},
 +	{ 0x21C1103C, "Smart Array P840ar", 0, 1},
-+	{ 0x21C2103C, "Smart Array P440", 0, 1},
-+	{ 0x21C3103C, "Smart Array P441", 0, 1},
+ 	{ 0x21C2103C, "Smart Array P440", 0, 1},
+ 	{ 0x21C3103C, "Smart Array P441", 0, 1},
 +	{ 0x21C4103C, "Smart Array", 0, 1},
-+	{ 0x21C5103C, "Smart Array P841", 0, 1},
-+	{ 0x21C6103C, "Smart HBA H244br", 0, 1},
-+	{ 0x21C7103C, "Smart HBA H240", 0, 1},
-+	{ 0x21C8103C, "Smart HBA H241", 0, 1},
+ 	{ 0x21C5103C, "Smart Array P841", 0, 1},
+ 	{ 0x21C6103C, "Smart HBA H244br", 0, 1},
+ 	{ 0x21C7103C, "Smart HBA H240", 0, 1},
+ 	{ 0x21C8103C, "Smart HBA H241", 0, 1},
 +	{ 0x21C9103C, "Smart Array", 0, 1},
-+	{ 0x21CA103C, "Smart Array P246br", 0, 1},
-+	{ 0x21CB103C, "Smart Array P840", 0, 1},
-+	{ 0x21CC103C, "Smart Array", 0, 1},
-+	{ 0x21CD103C, "Smart Array", 0, 1},
-+	{ 0x21CE103C, "Smart HBA", 0, 1},
+ 	{ 0x21CA103C, "Smart Array P246br", 0, 1},
+ 	{ 0x21CB103C, "Smart Array P840", 0, 1},
+ 	{ 0x21CC103C, "Smart Array P542t", 0, 1},
+ 	{ 0x21CD103C, "Smart Array P240tr", 0, 1},
+ 	{ 0x21CE103C, "Smart HBA H240tr", 0, 1},
 +	{ 0x00761590, "HP Storage P1224 Array Controller", 0, 1}, /* VID = 3PAR */
 +	{ 0x00871590, "HP Storage P1224e Array Controller", 0, 1},
 +	{ 0x007D1590, "HP Storage P1228 Array Controller", 0, 1},
@@ -76,6 +53,6 @@ Index: cciss-vol-status/cciss_vol_status.c
 +	{ 0xe0200e11, "HP MSA500 G2",		1, 0},
 +	{ 0xe0300e11, "HP MSA20",		1, 0},
 +	{ 0x3118103c, "HP B110i",		0, 1},
- 	{ 0x00451590, "Dynamic Smart Array B320i", 0, 1},
- 	{ 0x00471590, "Dynamic Smart Array B320i", 0, 1}, 
- 	{ 0x00481590, "Dynamic Smart Array B120i", 0, 1},
+ 
+ 
+ #ifdef HAVE_SCSI_SG_H