[PATCH] update udev to scsi_id 0.7

[Patrick Mansfield <patmans@us.ibm.com>]

Update udev's scsi_id to version 0.7, this fixes a bad bug in scsi_id on
64 bit systems.

diff -uprN -X /home/patman/dontdiff udev-bk/extras/orig-scsi_id/ChangeLog udev-bk/extras/scsi_id/ChangeLog
--- udev-bk/extras/orig-scsi_id/ChangeLog	Wed Oct  6 15:59:23 2004
+++ udev-bk/extras/scsi_id/ChangeLog	Fri Oct 15 11:40:48 2004
@@ -1,3 +1,9 @@
+2004-oct-15:
+	* Makefile: Add $(QUIET) to sync with the udev version.
+
+2004-oct-06:
+	* scsi_id.c: fix alignment for use with 64 bit pointers
+
 2004-jul-30:
 	* scsi_id.c, scsi_serial.c: Align the buffer passed to scsi_serial,
 	  don't bother aligning and memcpy-ing the result in scsi_inquiry.
diff -uprN -X /home/patman/dontdiff udev-bk/extras/orig-scsi_id/Makefile udev-bk/extras/scsi_id/Makefile
--- udev-bk/extras/orig-scsi_id/Makefile	Fri Oct 15 11:32:57 2004
+++ udev-bk/extras/scsi_id/Makefile	Fri Oct 15 11:40:48 2004
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-SCSI_ID_VERSION=0.6
+SCSI_ID_VERSION=0.7
 
 prefix  etcdir =        ${prefix}/etc
diff -uprN -X /home/patman/dontdiff udev-bk/extras/orig-scsi_id/release-notes udev-bk/extras/scsi_id/release-notes
--- udev-bk/extras/orig-scsi_id/release-notes	Wed Oct  6 15:59:23 2004
+++ udev-bk/extras/scsi_id/release-notes	Fri Oct 15 14:30:44 2004
@@ -1,6 +1,6 @@
-Version 0.6 of scsi_id is available at:
+Version 0.7 of scsi_id is available at:
 
-http://www-124.ibm.com/storageio/scsi_id/scsi_id-0.6.tar.gz
+http://www-124.ibm.com/storageio/scsi_id/scsi_id-0.7.tar.gz
 
 scsi_id is a program to generate a unique identifier for a given SCSI
 device.
@@ -14,13 +14,10 @@ Requires:
 - Linux kernel 2.6
 - libsysfs 0.4.0
 
-Major changes since the last release:
+Changes since the last release:
 	
-	- add -u option, patch from Christoph Varoqui, to substitute white
-	  space with underscores so it is easier to use the output as a
-	  device name.
+	- Fix a bug introduced in version 0.6 so that buffer alignement
+	  works on 64 bit systems. Without this fix, it crashes on 64 bit
+	  systems.
 
-	- Use 254 bytes for SCSI INQUIRY commands, patch from Hannes
-	  Reinecke.
-
-See ChangeLog for more details.
+	- Add $(QUIET) to sync up with the udev Makefile
diff -uprN -X /home/patman/dontdiff udev-bk/extras/orig-scsi_id/scsi_id.c udev-bk/extras/scsi_id/scsi_id.c
--- udev-bk/extras/orig-scsi_id/scsi_id.c	Wed Oct  6 15:59:23 2004
+++ udev-bk/extras/scsi_id/scsi_id.c	Wed Oct  6 22:25:31 2004
@@ -713,7 +713,8 @@ static int scsi_id(const char *target_pa
 
 #define ALIGN   512
 	unaligned_buf = malloc(MAX_SERIAL_LEN + ALIGN);
-	serial = (char*) (((int) unaligned_buf + (ALIGN - 1)) & ~(ALIGN - 1));
+	serial = (char*) (((unsigned long) unaligned_buf + (ALIGN - 1))
+			  & ~(ALIGN - 1));
 	dprintf("buffer unaligned 0x%p; aligned 0x%p\n", unaligned_buf, serial);
 #undef ALIGN
 


-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel