rpms/dmraid/devel dmraid-1.0.0.rc11-hpt37x-errorlog.patch, NONE, 1.1 dmraid.spec, 1.55, 1.56

[fedora-cvs-commits redhat com]

Author: pjones

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21522

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc11-hpt37x-errorlog.patch 
Log Message:
- get rid of the .a
- package libdmraid.so* unconditionally
- fix bounds checking in hpt37x format handler.


dmraid-1.0.0.rc11-hpt37x-errorlog.patch:
 hpt37x.c |    3 ++-
 hpt37x.h |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE dmraid-1.0.0.rc11-hpt37x-errorlog.patch ---
--- dmraid/1.0.0.rc11/lib/format/ataraid/hpt37x.c.errorlog	2006-07-28 15:42:22.000000000 -0400
+++ dmraid/1.0.0.rc11/lib/format/ataraid/hpt37x.c	2006-07-28 15:56:05.000000000 -0400
@@ -124,7 +124,8 @@
 	CVT32(hpt->boot_mode);
 
 	for (l = hpt->errorlog;
-	     l < hpt->errorlog + hpt->error_log_entries;
+	     l < hpt->errorlog + hpt->error_log_entries &&
+                l < &hpt->errorlog[HPT_MAX_ERRORS];
 	     l++) {
 		CVT32(l->timestamp);
 		CVT32(l->lba);
--- dmraid/1.0.0.rc11/lib/format/ataraid/hpt37x.h.errorlog	2006-07-28 15:56:20.000000000 -0400
+++ dmraid/1.0.0.rc11/lib/format/ataraid/hpt37x.h	2006-07-28 15:56:30.000000000 -0400
@@ -90,7 +90,8 @@
 	       uint8_t        status;
 	       uint8_t        sectors;
 	       uint32_t       lba;
-       } errorlog[32];
+#define HPT_MAX_ERRORS         32
+       } errorlog[HPT_MAX_ERRORS];
        uint8_t        filler[60];
 } __attribute__ ((packed));
 #endif


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- dmraid.spec	12 Jul 2006 05:39:53 -0000	1.55
+++ dmraid.spec	28 Jul 2006 20:10:35 -0000	1.56
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc11
-Release: FC6.1.1
+Release: FC6.2
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -16,12 +16,11 @@
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2
 Patch0: dmraid-1.0.0.rc11-metadata-stride.patch
 Patch1: dmraid-1.0.0.rc11-format-handler-dos.patch
+Patch2: dmraid-1.0.0.rc11-hpt37x-errorlog.patch
 
 ExcludeArch:	s390
 ExcludeArch:	s390x
 
-%define dmraid_build_dso 0
-
 %description
 DMRAID supports RAID device discovery, RAID set activation and display of
 properties for ATARAID on Linux >= 2.4 using device-mapper.
@@ -38,6 +37,7 @@
 %setup -q -n dmraid/%{version}
 %patch0 -p2
 %patch1 -p2
+%patch2 -p2
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link
@@ -45,12 +45,7 @@
 mv tools/dmraid tools/dmraid.static
 make clean
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link
-%if "%{dmraid_build_dso}" == "1"
 (cd lib ; make DESTDIR=$RPM_BUILD_ROOT libdmraid.so)
-make DESTDIR=$RPM_BUILD_ROOT
-%else
-make DESTDIR=$RPM_BUILD_ROOT
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -59,15 +54,10 @@
 install -m 755 tools/dmraid.static $RPM_BUILD_ROOT/sbin/dmraid.static
 install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
 
-# install the static library
-install -m 755 lib/libdmraid.a $RPM_BUILD_ROOT%{_libdir}
-
 # if requested, install the dso
-%if "%{dmraid_build_dso}" == "1"
 install -m 755 lib/libdmraid.so \
 	$RPM_BUILD_ROOT%{_libdir}/libdmraid.so.%{version}
 (cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so)
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,22 +67,20 @@
 %doc CHANGELOG CREDITS KNOWN_BUGS LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/dmraid_design.txt
 /%{_mandir}/man8/*
 /sbin/*
-%if "%{dmraid_build_dso}" == "1"
 %{_libdir}/libdmraid.so.*
-%endif
 /var/lock/dmraid
 
 %files -n dmraid-devel
 %defattr(-,root,root)
 %dir %{_includedir}/dmraid
 %{_includedir}/dmraid/*
-%{_libdir}/libdmraid.a
-
-%if "%{dmraid_build_dso}" == "1"
 %{_libdir}/libdmraid.so
-%endif
 
 %changelog
+* Fri Jul 28 2006 Peter Jones <pjones redhat com> - 1.0.0.rc11-FC6.2
+- Fix bounds checking on hpt37x error log
+- Only build the .so, not the .a
+
 * Wed Jul 12 2006 Jesse Keating <jkeating redhat com> - 1.0.0.rc11-FC6.1.1
 - rebuild