Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7161efa4f36c68dfca310e1c35a02fe758bb4348
commit 7161efa4f36c68dfca310e1c35a02fe758bb4348 Author: voroskoi <[EMAIL PROTECTED]> Date: Mon Apr 28 13:39:48 2008 +0200 blender-2.45-2-x86_64 forgot the patches diff --git a/source/xapps-extra/blender/20_gcc4.3_support.diff b/source/xapps-extra/blender/20_gcc4.3_support.diff new file mode 100644 index 0000000..32b2dbd --- /dev/null +++ b/source/xapps-extra/blender/20_gcc4.3_support.diff @@ -0,0 +1,85 @@ +--- a/intern/SoundSystem/intern/SND_Utils.cpp ++++ b/intern/SoundSystem/intern/SND_Utils.cpp +@@ -47,6 +47,7 @@ + #include <fcntl.h> + #include <math.h> + #include <string.h> ++#include <cstdlib> + + #if defined(WIN32) + #include <io.h> +--- a/intern/ghost/intern/GHOST_WindowX11.cpp ++++ b/intern/ghost/intern/GHOST_WindowX11.cpp +@@ -42,6 +42,8 @@ + #include <strings.h> + #endif + ++#include <cstdio> ++ + + // For obscure full screen mode stuuf + // lifted verbatim from blut. +--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/glext.h ++++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/glext.h +@@ -54,7 +54,9 @@ + /* Header file version number, required by OpenGL ABI for Linux */ + /* glext.h last updated 2005/06/20 */ + /* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */ ++#ifndef GL_GLEXT_VERSION + #define GL_GLEXT_VERSION 29 ++#endif + + #ifndef GL_VERSION_1_2 + #define GL_UNSIGNED_BYTE_3_3_2 0x8032 +--- a/intern/string/STR_String.h ++++ b/intern/string/STR_String.h +@@ -47,6 +47,8 @@ + + #include <vector> + #include <limits.h> ++#include <cstring> ++#include <cstdlib> + using namespace std; + + +--- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp ++++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp +@@ -30,6 +30,8 @@ + * ***** END GPL/BL DUAL LICENSE BLOCK ***** + */ + ++#include <cstdlib> ++ + #include "GPC_KeyboardDevice.h" + + /** +--- a/source/blender/yafray/intern/yafray_Render.cpp ++++ b/source/blender/yafray/intern/yafray_Render.cpp +@@ -7,6 +7,7 @@ + #include "yafray_Render.h" + + #include <math.h> ++#include <cstring> + + using namespace std; + +--- a/source/blender/yafray/intern/export_Plugin.cpp ++++ b/source/blender/yafray/intern/export_Plugin.cpp +@@ -1,6 +1,7 @@ + #include "export_Plugin.h" + + #include <math.h> ++#include <cstring> + using namespace std; + + +--- a/source/blender/yafray/intern/export_File.cpp ++++ b/source/blender/yafray/intern/export_File.cpp +@@ -1,6 +1,7 @@ + #include "export_File.h" + + #include <math.h> ++#include <cstring> + + using namespace std; + diff --git a/source/xapps-extra/blender/30_fix_CVE-2008-1102.diff b/source/xapps-extra/blender/30_fix_CVE-2008-1102.diff new file mode 100644 index 0000000..75e093d --- /dev/null +++ b/source/xapps-extra/blender/30_fix_CVE-2008-1102.diff @@ -0,0 +1,12 @@ +--- a/source/blender/imbuf/intern/radiance_hdr.c ++++ b/source/blender/imbuf/intern/radiance_hdr.c +@@ -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'); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
