Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=c4bbc6f06466cdd2c10844a0301bc03ef4a84235
commit c4bbc6f06466cdd2c10844a0301bc03ef4a84235 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Sun Jun 8 16:38:02 2008 +0200 blender-2.45-2kalgan1-i686 - added 20_gcc4.3_support.diff - added 30_fix_CVE-2008-1102.diff - closes #3039 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'); diff --git a/source/xapps-extra/blender/FrugalBuild b/source/xapps-extra/blender/FrugalBuild index 40ea028..81d9424 100644 --- a/source/xapps-extra/blender/FrugalBuild +++ b/source/xapps-extra/blender/FrugalBuild @@ -5,25 +5,26 @@ pkgname=blender pkgver=2.45 pkgextraver= -pkgrel=1 +pkgrel=2kalgan1 pkgdesc="A 3D modeling/rendering/animation/gaming application" url="http://blender.org"; Finclude python -depends=('libjpeg' 'libpng' 'freetype2' 'freealut' 'openexr' 'ffmpeg>=20070422' 'openal>=0.0.8-4' "python>=$_F_python_ver" 'libtiff') +depends=('libjpeg' 'libpng' 'freetype2' 'freealut' 'openexr' 'openal>=0.0.8-4' "python>=$_F_python_ver" 'libtiff') groups=('xapps-extra') archs=('i686' 'x86_64') makedepends=('cmake' 'ftgl') up2date="lynx -dump http://www.blender.org/download/source-code/ |grep tar |sed -ne 's/.*r \(.*\).ta.*/\1/;1p' -e s/$pkgextraver//" source=(http://download.blender.org/source/$pkgname-$pkgver$pkgextraver.tar.gz \ - blender.desktop blender.png py$_F_python_ver.patch) + blender.desktop blender.png py$_F_python_ver.patch 20_gcc4.3_support.diff 30_fix_CVE-2008-1102.diff) build() { + unset MAKEFLAGS Fpatchall #Fsed 'ADD_LIBRARY(${name} ${INC_ALL} ${sources})' 'ADD_LIBRARY(${name} SHARED ${INC_ALL} ${sources})' CMake/macros.cmake mkdir -p ../build || Fdie cd ../build || Fdie cmake ../$pkgname-$pkgver -DCMAKE_INSTALL_PREFIX=$Fprefix \ - -DWITH_BULLET=ON -DWITH_ELBEEM=ON -DWITH_FFMPEG=ON -DWITH_GAMEENGINE=ON \ + -DWITH_BULLET=ON -DWITH_ELBEEM=ON -DWITH_FFMPEG=OFF -DWITH_GAMEENGINE=ON \ -DWITH_INTERNATIONAL=ON -DWITH_OPENAL=ON -DWITH_OPENEXR=ON \ -DWITH_PLAYER=ON -DWITH_QUICKTIME=OFF -DWITH_VERSE=ON -DYESIAMSTUPID=ON || Fdie make || Fdie @@ -44,6 +45,8 @@ build() { sha1sums=('ff66ec5f0129fd04a2ba5c063627ef13033c0598' \ '44ee67a0ed814481aacca0dfc8cf45ae7a48eed5' \ '5d2583d847735c913c26c96ace8192a646323da8' \ - 'c7357731664aa7fa704d05d74b75d9e101cf7af5') + 'c7357731664aa7fa704d05d74b75d9e101cf7af5' \ + 'ca4a990b760be8415444241e3950eb929937e8bb' \ + 'e9dae2704eec86ec1d042097ddf2d39b16949137') # optimization OK _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
