From 9e2c54af0683055ed64eca0ba5120c0ccaaf3eca Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: May 19 2008 18:25:46 +0000 Subject: New upstream release --- diff --git a/blender-2.45-cve-2008-1102.patch b/blender-2.45-cve-2008-1102.patch deleted file mode 100644 index 43015b3..0000000 --- a/blender-2.45-cve-2008-1102.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up blender-2.45/source/blender/imbuf/intern/radiance_hdr.c.csv blender-2.45/source/blender/imbuf/intern/radiance_hdr.c ---- blender-2.45/source/blender/imbuf/intern/radiance_hdr.c.csv 2008-04-24 16:22:36.000000000 +0200 -+++ blender-2.45/source/blender/imbuf/intern/radiance_hdr.c 2008-04-24 16:25:59.000000000 +0200 -@@ -191,7 +191,8 @@ struct ImBuf *imb_loadhdr(unsigned char - } - } - if (found) { -- sscanf((char*)&mem[x+1], "%s %d %s %d", (char*)&oriY, &height, (char*)&oriX, &width); -+ if (sscanf((char *)&mem[x+1], "%79s %d %79s %d", (char*)&oriY, &height, -+ (char*)&oriX, &width) != 4) return NULL; - - /* find end of this line, data right behind it */ - ptr = (unsigned char *)strchr((char*)&mem[x+1], '\n'); diff --git a/blender-2.45-cve-2008-1103-1.patch b/blender-2.45-cve-2008-1103-1.patch deleted file mode 100644 index b1c5a9d..0000000 --- a/blender-2.45-cve-2008-1103-1.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/blender-2.45-cve-2008-1103-2.patch b/blender-2.45-cve-2008-1103-2.patch deleted file mode 100644 index 96cd097..0000000 --- a/blender-2.45-cve-2008-1103-2.patch +++ /dev/null @@ -1,18 +0,0 @@ -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; diff --git a/blender-2.45-gcc43.patch b/blender-2.45-gcc43.patch deleted file mode 100644 index 6aa444e..0000000 --- a/blender-2.45-gcc43.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -up blender-2.45/source/blender/yafray/intern/yafray_Render.cpp.gcc43 blender-2.45/source/blender/yafray/intern/yafray_Render.cpp ---- blender-2.45/source/blender/yafray/intern/yafray_Render.cpp.gcc43 2007-09-18 06:58:44.000000000 +0200 -+++ blender-2.45/source/blender/yafray/intern/yafray_Render.cpp 2008-01-17 20:49:05.000000000 +0100 -@@ -8,6 +8,8 @@ - - #include - -+#include -+ - using namespace std; - - void yafrayRender_t::clearAll() -diff -up blender-2.45/source/blender/yafray/intern/export_File.cpp.gcc43 blender-2.45/source/blender/yafray/intern/export_File.cpp ---- blender-2.45/source/blender/yafray/intern/export_File.cpp.gcc43 2007-09-18 06:58:44.000000000 +0200 -+++ blender-2.45/source/blender/yafray/intern/export_File.cpp 2008-01-17 20:49:05.000000000 +0100 -@@ -2,6 +2,8 @@ - - #include - -+#include -+ - using namespace std; - - static string command_path = ""; -diff -up blender-2.45/source/blender/yafray/intern/export_Plugin.cpp.gcc43 blender-2.45/source/blender/yafray/intern/export_Plugin.cpp ---- blender-2.45/source/blender/yafray/intern/export_Plugin.cpp.gcc43 2007-09-18 06:58:44.000000000 +0200 -+++ blender-2.45/source/blender/yafray/intern/export_Plugin.cpp 2008-01-17 20:49:05.000000000 +0100 -@@ -1,6 +1,9 @@ - #include "export_Plugin.h" - - #include -+ -+#include -+ - using namespace std; - - -diff -up blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp.gcc43 blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp ---- blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp.gcc43 2008-01-17 20:56:36.000000000 +0100 -+++ blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp 2008-01-17 20:57:03.000000000 +0100 -@@ -32,6 +32,8 @@ - - #include "GPC_KeyboardDevice.h" - -+#include -+ - /** - * NextFrame toggles currentTable with previousTable, - * and copies relevant event information from previous to current table -diff -up blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h.gcc43 blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h ---- blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h.gcc43 2007-09-18 06:58:17.000000000 +0200 -+++ blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h 2008-01-17 20:49:05.000000000 +0100 -@@ -56,7 +56,7 @@ - # undef GL_ARB_vertex_program - #endif - --#include "glext.h" -+// #include "glext.h" - - #include "EXT_separate_specular_color.h" - #include "ARB_multitexture.h" -diff -up blender-2.45/intern/string/STR_String.h.gcc43 blender-2.45/intern/string/STR_String.h ---- blender-2.45/intern/string/STR_String.h.gcc43 2007-09-18 06:58:01.000000000 +0200 -+++ blender-2.45/intern/string/STR_String.h 2008-01-17 20:49:05.000000000 +0100 -@@ -47,6 +47,10 @@ - - #include - #include -+ -+#include -+#include -+ - using namespace std; - - -diff -up blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp.gcc43 blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp ---- blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp.gcc43 2007-09-18 06:57:51.000000000 +0200 -+++ blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp 2008-01-17 20:49:05.000000000 +0100 -@@ -42,6 +42,8 @@ - #include - #endif - -+#include -+#include - - // For obscure full screen mode stuuf - // lifted verbatim from blut. diff --git a/blender-2.45-sc.patch b/blender-2.45-sc.patch deleted file mode 100644 index a461aa4..0000000 --- a/blender-2.45-sc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up blender-2.45/tools/btools.py.scons blender-2.45/tools/btools.py ---- blender-2.45/tools/btools.py.scons 2007-09-18 07:00:48.000000000 +0200 -+++ blender-2.45/tools/btools.py 2008-04-27 21:23:27.000000000 +0200 -@@ -1,7 +1,10 @@ - import os - import os.path - import SCons.Options --import SCons.Options.BoolOption -+try: -+ import SCons.Options.BoolOption -+except ImportError: -+ pass - try: - import subprocess - except ImportError: diff --git a/blender-2.45-yafray.patch b/blender-2.45-yafray.patch deleted file mode 100644 index 3c64b90..0000000 --- a/blender-2.45-yafray.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- blender-2.45/source/blender/yafray/intern/export_Plugin.cpp.orig 2007-09-18 05:58:44.000000000 +0100 -+++ blender-2.45/source/blender/yafray/intern/export_Plugin.cpp 2008-02-05 14:32:07.000000000 +0000 -@@ -97,8 +97,8 @@ - #else - static char *alternative[]= - { -- "/usr/local/lib/", -- "/usr/lib/", -+ "/usr/local/lib64/", -+ "/usr/lib64/", - NULL - }; - -@@ -120,8 +120,8 @@ - #else - static char *alternative[]= - { -- "/usr/local/lib/yafray", -- "/usr/lib/yafray", -+ "/usr/local/lib64/yafray", -+ "/usr/lib64/yafray", - NULL - }; - diff --git a/blender.spec b/blender.spec index 9fa4136..da2a40f 100644 --- a/blender.spec +++ b/blender.spec @@ -1,9 +1,10 @@ + %define blenderlib %{_datadir}/blender %define plugins %{_libdir}/blender/plugins Name: blender -Version: 2.45 -Release: 14%{?dist} +Version: 2.46 +Release: 1%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -27,13 +28,8 @@ Source7: blender-2.44.config Patch1: blender-2.44-scons.patch Patch2: blender-2.44-bid.patch -Patch3: blender-2.45-gcc43.patch -Patch4: blender-2.45-yafray.patch -Patch5: blender-2.45-sc.patch -Patch100: blender-2.45-cve-2008-1102.patch -Patch101: blender-2.45-cve-2008-1103-1.patch -Patch102: blender-2.45-cve-2008-1103-2.patch +Patch100: blender-2.46rc3-cve-2008-1103-1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,17 +75,8 @@ available. %setup -q %patch1 -p1 -b .org %patch2 -p1 -b .bid -%patch3 -p1 -b .gcc43 -%patch5 -p1 -b .scons - - -%if "%{?_lib}" == "lib64" -%patch4 -p1 -%endif -%patch100 -p1 -b .cve1 -%patch101 -p1 -b .cve2 -%patch102 -p1 -b .cve3 +%patch100 -p1 -b .cve PYVER=$(%{__python} -c "import sys ; print sys.version[:3]") @@ -132,8 +119,7 @@ cp -a release/scripts/bpydata ${RPM_BUILD_ROOT}/%{blenderlib} cp -a release/scripts ${RPM_BUILD_ROOT}/%{blenderlib} pushd bin/.blender/locale -mv pt_br pt_BR -mv zh_cn uh_CN + rm -rf $(find -name '.svn' -print) popd @@ -193,6 +179,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mime/packages/blender.xml %changelog +* Mon May 19 2008 Jochen Schmitt 2.46-1 +- New upstream release + * Wed May 7 2008 Jochen Schmitt 2.45-14 - Fix CVE-2008-1103 (#444535) diff --git a/sources b/sources index e7816a3..8202811 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f88b8a5860f6919bd72dc9946a55f3b blender-2.45-noffmpeg.tar.gz +9ec37f0c4ea1d17c619963036bf846e8 blender-2.46-noffmpeg.tar.gz