- argh, strnlen.patch is back; rel 3

Changed files:
    cciss_vol_status.spec -> 1.9
    strnlen.patch -> 1.3

diff --git a/cciss_vol_status.spec b/cciss_vol_status.spec
index 4665d53e7cf8d2b38d88233e865e543f7421f7c5..6adafd95702292a6fa9794dc63ccda3dc7d385c1 100644 (file)
--- a/cciss_vol_status.spec
+++ b/cciss_vol_status.spec
@@ -2,12 +2,13 @@ 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.06
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Applications
 Source0:       http://dl.sourceforge.net/cciss/%{name}-%{version}.tar.gz
 # Source0-md5: 210b97af7adeb601a49ee0e743c4d2b7
 URL:           http://cciss.sourceforge.net/
+Patch0:                strnlen.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: linux-libc-headers
@@ -24,6 +25,7 @@ dysków kontrolera Smart Array jak również MSA1000.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__aclocal}

diff --git a/strnlen.patch b/strnlen.patch
new file mode 100644 (file)
index 0000000..993b9dd
--- /dev/null
+++ b/strnlen.patch
@@ -0,0 +1,11 @@
+--- cciss_vol_status-1.06/cciss_vol_status.c~  2009-11-18 19:13:06.000000000 +0200
++++ cciss_vol_status-1.06/cciss_vol_status.c   2009-11-20 19:24:20.856775735 +0200
+@@ -1004,7 +1004,7 @@
+       if (status < 0) 
+               return 0;
+       for (i = 0; prod[i] != NULL; i++) {
+-              if (strncmp(std_inq+8, prod[i], strnlen(prod[i])) == 0)
++              if (strncmp(std_inq+8, prod[i], strlen(prod[i])) == 0)
+                       return 1;
+       }
+       return 0;