6 files changed, 51 insertions, 5 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 054039f3c0cb..1a7bc2faf985 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.135 2008/05/01 15:07:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.136 2008/05/07 21:07:25 maekke Exp $
+
+*blender-2.45-r4 (07 May 2008)
+*blender-2.43-r2 (07 May 2008)
+
+  07 May 2008; Markus Meier <maekke@gentoo.org>
+  +files/blender-2.45-cve-2008-1103-1.patch,
+  +files/blender-2.45-cve-2008-1103-2.patch, -blender-2.43-r1.ebuild,
+  +blender-2.43-r2.ebuild, -blender-2.45-r2.ebuild, blender-2.45-r3.ebuild,
+  +blender-2.45-r4.ebuild:
+  security bump, add CVE-2008-1103 patches from fedora, security bug #219008
 
   01 May 2008; Markus Meier <maekke@gentoo.org> blender-2.45-r3.ebuild:
   apply ffmpeg patch, bug #219935
diff --git a/media-gfx/blender/blender-2.43-r1.ebuild b/media-gfx/blender/blender-2.43-r2.ebuild
index 77be9978b1fd..5a1fdabb3b77 100644
--- a/media-gfx/blender/blender-2.43-r1.ebuild
+++ b/media-gfx/blender/blender-2.43-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.43-r1.ebuild,v 1.1 2008/04/27 12:19:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.43-r2.ebuild,v 1.1 2008/05/07 21:07:25 maekke Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -61,6 +61,8 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/blender-2.37-dirs.patch
 	epatch "${FILESDIR}"/blender-2.45-cve-2008-1102.patch
+	epatch "${FILESDIR}"/blender-2.45-cve-2008-1103-1.patch
+	epatch "${FILESDIR}"/blender-2.45-cve-2008-1103-2.patch
 
 	if use ffmpeg ; then
 		cd "${S}"/extern
diff --git a/media-gfx/blender/blender-2.45-r3.ebuild b/media-gfx/blender/blender-2.45-r3.ebuild
index 3ab75f1e2fe2..bc132de08982 100644
--- a/media-gfx/blender/blender-2.45-r3.ebuild
+++ b/media-gfx/blender/blender-2.45-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45-r3.ebuild,v 1.2 2008/05/01 15:07:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45-r3.ebuild,v 1.3 2008/05/07 21:07:25 maekke Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -59,8 +59,10 @@ src_unpack() {
 	epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
 	epatch "${FILESDIR}"/blender-2.44-swscale.patch
 	epatch "${FILESDIR}"/${P}-missing_includes.patch
-	epatch "${FILESDIR}"/${P}-cve-2008-1102.patch
 	epatch "${FILESDIR}"/${P}-ffmpeg.patch
+	epatch "${FILESDIR}"/${P}-cve-2008-1102.patch
+	epatch "${FILESDIR}"/${P}-cve-2008-1103-1.patch
+	epatch "${FILESDIR}"/${P}-cve-2008-1103-2.patch
 
 	if use ffmpeg ; then
 		cd "${S}"/extern
diff --git a/media-gfx/blender/blender-2.45-r2.ebuild b/media-gfx/blender/blender-2.45-r4.ebuild
index c8b3b71e44c4..292eb4a82ac4 100644
--- a/media-gfx/blender/blender-2.45-r2.ebuild
+++ b/media-gfx/blender/blender-2.45-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45-r2.ebuild,v 1.1 2008/04/27 12:19:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45-r4.ebuild,v 1.1 2008/05/07 21:07:25 maekke Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -61,6 +61,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/blender-2.44-swscale.patch
 	epatch "${FILESDIR}"/${P}-missing_includes.patch
 	epatch "${FILESDIR}"/${P}-cve-2008-1102.patch
+	epatch "${FILESDIR}"/${P}-cve-2008-1103-1.patch
+	epatch "${FILESDIR}"/${P}-cve-2008-1103-2.patch
 
 	if use ffmpeg ; then
 		cd "${S}"/extern
diff --git a/media-gfx/blender/files/blender-2.45-cve-2008-1103-1.patch b/media-gfx/blender/files/blender-2.45-cve-2008-1103-1.patch
new file mode 100644
index 000000000000..b1c5a9dad275
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.45-cve-2008-1103-1.patch
@@ -0,0 +1,12 @@
+diff -urN blender-2.36.orig/source/blender/blenkernel/intern/blender.c blender-2.36/source/blender/blenkernel/intern/blender.c
+--- blender-2.36.orig/source/blender/blenkernel/intern/blender.c	2005-03-11 01:54:56.000000000 +0900
++++ blender-2.36/source/blender/blenkernel/intern/blender.c	2005-03-11 01:57:26.000000000 +0900
+@@ -647,7 +647,7 @@
+ 		
+ 	BLI_make_file_string("/", str, U.tempdir, "quit.blend");
+ 
+-	file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC, 0666);
++	file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC+O_EXCL, 0666);
+ 	if(file == -1) {
+ 		printf("Unable to save %s\n", str);
+ 		return;
diff --git a/media-gfx/blender/files/blender-2.45-cve-2008-1103-2.patch b/media-gfx/blender/files/blender-2.45-cve-2008-1103-2.patch
new file mode 100644
index 000000000000..96cd097fcd22
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.45-cve-2008-1103-2.patch
@@ -0,0 +1,18 @@
+diff -up blender-2.45/source/blender/src/usiblender.c.cve3 blender-2.45/source/blender/src/usiblender.c
+--- blender-2.45/source/blender/src/usiblender.c.cve3	2007-09-18 06:58:42.000000000 +0200
++++ blender-2.45/source/blender/src/usiblender.c	2008-05-07 17:32:10.000000000 +0200
+@@ -172,10 +172,12 @@ static void init_userdef_file(void)
+ 		U.tb_rightmouse= 5;
+ 	}
+ 	if(U.mixbufsize==0) U.mixbufsize= 2048;
+-	if (BLI_streq(U.tempdir, "/")) {
++	if (BLI_streq(U.tempdir, "/") || BLI_streq(U.tempdir, "/tmp/")) {
+ 		char *tmp= getenv("TEMP");
++                char *home= getenv("HOME");
+ 		
+-		strcpy(U.tempdir, tmp?tmp:"/tmp/");
++		strcpy(U.tempdir, tmp?tmp:home);
++                if (!tmp) strcat(U.tempdir, "/.blender/");
+ 	}
+ 	if (U.savetime <= 0) {
+ 		U.savetime = 1;