rpms/smartmontools/devel smartmontools-5.37-3ware.patch, NONE, 1.1 smartmontools.spec, 1.33, 1.34

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/smartmontools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22545

Modified Files:
	smartmontools.spec 
Added Files:
	smartmontools-5.37-3ware.patch 
Log Message:
* Mon Aug 20 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-5
- add support for 24 disks on 3ware RAID controllers (related #252055)
- fix #245442 - add %{arm} to smartmontools's set of build archs
- update license tag


smartmontools-5.37-3ware.patch:

--- NEW FILE smartmontools-5.37-3ware.patch ---
--- smartmontools-5.37/smartctl.cpp.3ware	2006-10-09 13:45:12.000000000 +0200
+++ smartmontools-5.37/smartctl.cpp	2007-08-20 13:20:24.000000000 +0200
@@ -463,8 +463,8 @@
             if (split_report_arg2(s, &i)) {
                  sprintf(extraerror, "Option -d 3ware,N requires N to be a non-negative integer\n");
                  badarg = TRUE;
-            } else if (i<0 || i>15) {
-                 sprintf(extraerror, "Option -d 3ware,N (N=%d) must have 0 <= N <= 15\n", i);
+            } else if (i<0 || i>23) {
+                 sprintf(extraerror, "Option -d 3ware,N (N=%d) must have 0 <= N <= 23\n", i);
                  badarg = TRUE;
             } else {
  	        // NOTE: controller_port == disk number + 1
--- smartmontools-5.37/smartd.cpp.3ware	2006-11-12 05:49:09.000000000 +0100
+++ smartmontools-5.37/smartd.cpp	2007-08-20 13:20:45.000000000 +0200
@@ -3038,8 +3038,8 @@
               PrintOut(LOG_CRIT, "File %s line %d (drive %s): Directive -d 3ware,N requires N integer\n",
                	       configfile, lineno, name);
               badarg=1;
-          } else if ( i<0 || i>15) {
-              PrintOut(LOG_CRIT, "File %s line %d (drive %s): Directive -d 3ware,N (N=%d) must have 0 <= N <= 15\n",
+          } else if ( i<0 || i>23) {
+              PrintOut(LOG_CRIT, "File %s line %d (drive %s): Directive -d 3ware,N (N=%d) must have 0 <= N <= 23\n",
                        configfile, lineno, name, i);
               badarg=1;
           } else {
--- smartmontools-5.37/smartd.conf.5.in.3ware	2006-12-20 08:30:43.000000000 +0100
+++ smartmontools-5.37/smartd.conf.5.in	2007-08-20 13:16:39.000000000 +0200
@@ -298,10 +298,10 @@
 
 .I 3ware,N
 \- the device consists of one or more ATA disks connected to a 3ware
-RAID controller. The non-negative integer N (in the range from 0 to 15
+RAID controller. The non-negative integer N (in the range from 0 to 23
 inclusive) denotes which disk on the controller is monitored.  In log
 files and email messages this disk will be identified as 3ware_disk_XX
-with XX in the range from 00 to 15 inclusive.
+with XX in the range from 00 to 23 inclusive.
 
 This Directive may at first appear confusing, because the 3ware
 controller is a SCSI device (such as /dev/sda) and should be listed as
@@ -729,7 +729,7 @@
 is set to the device path (examples: /dev/hda, /dev/sdb).
 .IP \fBSMARTD_DEVICETYPE\fP 4
 is set to the device type (possible values: ata, scsi, 3ware,N, hpt,L/M/N).
-Here N=0,...,15 denotes the ATA disk behind a 3ware RAID controller and
+Here N=0,...,23 denotes the ATA disk behind a 3ware RAID controller and
 L/M/N denotes the SATA disk behind a HighPoint RocketRAID controller.
 .IP \fBSMARTD_DEVICESTRING\fP 4
 is set to the device description.  For SMARTD_DEVICETYPE of ata or


Index: smartmontools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- smartmontools.spec	21 Jun 2007 13:26:38 -0000	1.33
+++ smartmontools.spec	20 Aug 2007 11:23:11 -0000	1.34
@@ -1,23 +1,24 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.37
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Epoch:		1
 Group:		System Environment/Base
-License:	GPL
+License:	GPLv2+
 URL:		http://smartmontools.sourceforge.net/
 Source0:	http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:	smartd.initd
 Source2:	smartd-conf.py
 Source3:	smartmontools.sysconf
 Patch1:		smartmontools-5.37-cloexec.patch
+Patch2:		smartmontools-5.37-3ware.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 PreReq:		/sbin/chkconfig /sbin/service
 Requires:	fileutils mailx
 BuildRequires: 	readline-devel ncurses-devel /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf util-linux groff gettext
 Obsoletes:	kernel-utils
-ExclusiveArch:	i386 x86_64 ia64 ppc ppc64
+ExclusiveArch:	i386 x86_64 %{arm} ia64 ppc ppc64
 
 %description
 The smartmontools package contains two utility programs (smartctl
@@ -39,6 +40,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .cloexec
+%patch2 -p1 -b .3ware
 
 %build
 %configure
@@ -89,6 +91,11 @@
 %exclude %{_sbindir}/smartd-conf.py[co]
 
 %changelog
+* Mon Aug 20 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-5
+- add support for 24 disks on 3ware RAID controllers (related #252055)
+- fix #245442 - add %%{arm} to smartmontools's set of build archs
+- update license tag
+
 * Thu Jun 21 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-4
 - fix #241389 - smartd-conf.py pulls in a big dependency chain, so
   build a separate config package