[star/f14/master] fix segfault with multivol option due to signedness(#666015)

[Ondrej Vasik]

commit 3b8cd4d64ef1ad0bd5eae9ce601a05b4d3c6a5dd
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Tue Jan 4 14:13:29 2011 +0100

    fix segfault with multivol option due to signedness(#666015)

 star-1.5.1-multivolsigsegv.patch |   12 ++++++++++++
 star.spec                        |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/star-1.5.1-multivolsigsegv.patch b/star-1.5.1-multivolsigsegv.patch
new file mode 100644
index 0000000..204a29d
--- /dev/null
+++ b/star-1.5.1-multivolsigsegv.patch
@@ -0,0 +1,12 @@
+diff -urNp star-1.5.1-orig/star/buffer.c star-1.5.1/star/buffer.c
+--- star-1.5.1-orig/star/buffer.c	2009-07-13 21:05:02.000000000 +0200
++++ star-1.5.1/star/buffer.c	2011-01-04 13:50:25.452138625 +0100
+@@ -799,7 +799,7 @@ initbuf(nblocks)
+ 
+ 		bigptr = bigbuf = ___malloc((size_t) bufsize+10+pagesize,
+ 								"buffer");
+-		bigptr = bigbuf = (char *)roundup((Intptr_t)bigptr, pagesize);
++		bigptr = bigbuf = (char *)roundup((UIntptr_t)bigptr, pagesize);
+ 		fillbytes(bigbuf, bufsize, '\0');
+ 		fillbytes(&bigbuf[bufsize], 10, 'U');
+ 
diff --git a/star.spec b/star.spec
index 9c0a2a8..a53f210 100644
--- a/star.spec
+++ b/star.spec
@@ -4,7 +4,7 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.5.1
-Release: 4%{?dist}.1
+Release: 5%{?dist}
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
 
@@ -20,6 +20,8 @@ Patch4: star-1.5-stdioconflict.patch
 Patch5: star-1.5.1-bufferoverflow.patch
 #Fix some invalid manpage references (#624612)
 Patch6: star-1.5.1-manpagereferences.patch
+#fix signedness segfault with multivol option(#666015)
+Patch7: star-1.5.1-multivolsigsegv.patch
 
 License: CDDL
 Group: Applications/Archiving
@@ -41,6 +43,7 @@ and can restore individual files from the archive. Star supports ACL.
 %patch4 -p1 -b .stdio
 %patch5 -p1 -b .namesoverflow
 %patch6 -p1 -b .references
+%patch7 -p1 -b .multivol
 cp -a star/all.mk star/Makefile
 iconv -f iso_8859-1 -t utf-8 AN-1.5 >AN-1.5_utf8
 mv AN-1.5_utf8 AN-1.5
@@ -118,6 +121,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man4/star.4*
 
 %changelog
+* Tue Jan 04 2011 Ondrej Vasik <ovasik at redhat.com> 1.5.1-5
+- fix segfault with multivol option due to signedness(#666015)
+
 * Tue Oct 05 2010 jkeating - 1.5.1-4.1
 - Rebuilt for gcc bug 634757