rpms/blender/F-12 blender-2.49b-uid.patch, NONE, 1.1 blender.spec, 1.126, 1.127

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/pkgs/rpms/blender/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26420

Modified Files:
	blender.spec 
Added Files:
	blender-2.49b-uid.patch 
Log Message:
Try to fix BZ ä572186

blender-2.49b-uid.patch:
 storage.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE blender-2.49b-uid.patch ---
diff -up blender-2.49b/source/blender/blenlib/intern/storage.c.sf blender-2.49b/source/blender/blenlib/intern/storage.c
--- blender-2.49b/source/blender/blenlib/intern/storage.c.sf	2010-03-28 10:14:15.140027561 +0200
+++ blender-2.49b/source/blender/blenlib/intern/storage.c	2010-03-28 10:19:55.630278553 +0200
@@ -381,7 +381,8 @@ void BLI_adddirstrings()
 			struct passwd *pwuser;
 			pwuser = getpwuid(files[num].s.st_uid);
 			if ( pwuser ) {
-			strcpy(files[num].owner, pwuser->pw_name);
+			  strncpy(files[num].owner, pwuser->pw_name, sizeof(files[num].owner)-1);
+                          files[num].owner[sizeof(files[num].owner)-1] = '\0';
 			} else {
 				sprintf(files[num].owner, "%d", files[num].s.st_uid);
             }


Index: blender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blender/F-12/blender.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- blender.spec	18 Jan 2010 17:03:23 -0000	1.126
+++ blender.spec	2 Apr 2010 14:48:48 -0000	1.127
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.49b
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -24,6 +24,7 @@ Source100:      blender-repack.sh
 
 Patch1:         blender-2.49-scons.patch
 Patch2:		blender-2.44-bid.patch
+Patch3:		blender-2.49b-uid.patch
 
 # Both patches are forwarded to upstream via email
 #Patch100:	blender-2.46rc3-cve-2008-1103-1.patch
@@ -105,6 +106,7 @@ Blender Game Engine.
 %setup -q 
 %patch1 -p1 -b .org
 %patch2 -p1 -b .bid
+%patch3 -p1 -b .uid
 
 %patch100 -p1 -b .cve
 # %patch101 -p1
@@ -244,7 +246,10 @@ fi || :
 %{_bindir}/blenderplayer.bin
 
 %changelog
-* Wed Jan 13 2010 Jochen Schmitt <Jochen herr-schmitt de> - 2.49b-5
+* Sun Mar 28 2010 Jochen Schmitt <s4504kr at omega> 2.49b-6
+- Try to fix copy of userid into files.owner (#572186)
+
+* Wed Jan 13 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.49b-5
 - Add forgotten patch
 
 * Wed Jan 13 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.49b-4