diff options
| -rw-r--r-- | media-gfx/blender/ChangeLog | 11 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.43-r1.ebuild | 133 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.45-r2.ebuild | 138 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.45-r3.ebuild | 137 | ||||
| -rw-r--r-- | media-gfx/blender/files/blender-2.45-cve-2008-1102.patch | 13 |
5 files changed, 431 insertions, 1 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index aead6fd7b716..28350aa4adb4 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,15 @@ # 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.132 2008/04/12 10:22:13 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.133 2008/04/27 12:19:52 maekke Exp $ + +*blender-2.45-r3 (27 Apr 2008) +*blender-2.45-r2 (27 Apr 2008) +*blender-2.43-r1 (27 Apr 2008) + + 27 Apr 2008; Markus Meier <maekke@gentoo.org> + +files/blender-2.45-cve-2008-1102.patch, +blender-2.43-r1.ebuild, + +blender-2.45-r2.ebuild, +blender-2.45-r3.ebuild: + revision bumps for security bug #219008 12 Apr 2008; Tiziano Müller <dev-zero@gentoo.org> +files/blender-2.45-missing_includes.patch, blender-2.45.ebuild, diff --git a/media-gfx/blender/blender-2.43-r1.ebuild b/media-gfx/blender/blender-2.43-r1.ebuild new file mode 100644 index 000000000000..77be9978b1fd --- /dev/null +++ b/media-gfx/blender/blender-2.43-r1.ebuild @@ -0,0 +1,133 @@ +# 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 $ + +inherit multilib flag-o-matic eutils python + +#IUSE="jpeg mozilla png sdl static truetype" +IUSE="blender-game ffmpeg jpeg nls openal openexr png" +FFMPEG_SNAP="0.4.9-p20070330" +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="http://www.blender.org/" +SRC_URI="http://download.blender.org/source/${P}.tar.gz + ffmpeg? ( mirror://gentoo/ffmpeg-${FFMPEG_SNAP}.tar.bz2 )" + +SLOT="0" +LICENSE="|| ( GPL-2 BL )" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=">=dev-libs/openssl-0.9.6 + ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_SNAP/-/_} + media-libs/x264 ) + jpeg? ( media-libs/jpeg ) + media-libs/tiff + nls? ( >=media-libs/freetype-2.0 + virtual/libintl + >=media-libs/ftgl-2.1 ) + openal? ( media-libs/openal + media-libs/freealut ) + openexr? ( media-libs/openexr ) + png? ( media-libs/libpng ) + >=media-libs/libsdl-1.2 + virtual/opengl" + +DEPEND="dev-util/scons + x11-libs/libXt + x11-proto/inputproto + ${RDEPEND}" + +blend_with() { + local UWORD="$2" + if [ -z "${UWORD}" ]; then + UWORD="$1" + fi + if useq $1; then + echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \ + >> "${S}"/user-config.py + else + echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \ + >> "${S}"/user-config.py + fi + return 0 +} + +src_unpack() { + unpack ${A} + cd "${S}"/release/plugins + chmod 755 bmake + rmdir include + cp -pPR "${S}"/source/blender/blenpluginapi include + + cd "${S}" + epatch "${FILESDIR}"/blender-2.37-dirs.patch + epatch "${FILESDIR}"/blender-2.45-cve-2008-1102.patch + + if use ffmpeg ; then + cd "${S}"/extern + mv ffmpeg/Makefile ffmpeg/common.mak "${T}" + unpack ffmpeg-${FFMPEG_SNAP}.tar.bz2 + mv "${T}"/Makefile "${T}"/common.mak ffmpeg + fi + # pass compiler flags to the scons build system + echo "CFLAGS += '${CFLAGS}'" >> "${S}"/user-config.py + echo "CCFLAGS += ['${CXXFLAGS//' '/','}','-DYESIAMSTUPID']" \ + >> "${S}"/user-config.py + # disable blender-player and iconv + # echo "WITH_BF_PLAYER=0" >> ${S}/user-config.py + # echo "WITH_BF_ICONV=0" >> ${S}/user-config.py +} + +src_compile() { + myconf="${myconf} $(blend_with openal)" + myconf="${myconf} $(blend_with openexr)" + myconf="${myconf} $(blend_with jpeg)" + myconf="${myconf} $(blend_with ffmpeg)" + myconf="${myconf} $(blend_with png)" + myconf="${myconf} $(blend_with nls international)" + myconf="${myconf} $(blend_with blender-game gameengine)" + + # scons uses -l differently -> remove it + scons ${MAKEOPTS/-l[0-9]} -h > scons.config + scons ${MAKEOPTS/-l[0-9]} || die \ + "!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org" + + cd "${S}"/release/plugins + emake || die +} + +src_install() { + exeinto /usr/bin/ + doexe "${WORKDIR}"/install/linux2/blender + + dodir /usr/share/${PN} + + exeinto /usr/$(get_libdir)/${PN}/textures + doexe "${S}"/release/plugins/texture/*.so + exeinto /usr/$(get_libdir)/${PN}/sequences + doexe "${S}"/release/plugins/sequence/*.so + insinto /usr/include/${PN} + doins "${S}"/release/plugins/include/*.h + + if use nls ; then + mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \ + "${D}"/usr/share/${PN} + mv "${WORKDIR}"/install/linux2/.blender/locale \ + "${D}"/usr/share/locale + fi + + mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN} + + insinto /usr/share/pixmaps + doins "${FILESDIR}"/${PN}.png + insinto /usr/share/applications + doins "${FILESDIR}"/${PN}.desktop + + dodoc INSTALL README +} + +pkg_preinst(){ + if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ]; + then + rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include + fi +} diff --git a/media-gfx/blender/blender-2.45-r2.ebuild b/media-gfx/blender/blender-2.45-r2.ebuild new file mode 100644 index 000000000000..c8b3b71e44c4 --- /dev/null +++ b/media-gfx/blender/blender-2.45-r2.ebuild @@ -0,0 +1,138 @@ +# 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 $ + +inherit multilib flag-o-matic eutils python + +#IUSE="jpeg mozilla png sdl static truetype" +IUSE="blender-game ffmpeg jpeg nls openal openexr png verse" +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="http://www.blender.org/" +SRC_URI="http://download.blender.org/source/${P}.tar.gz" + +SLOT="0" +LICENSE="|| ( GPL-2 BL )" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=">=dev-libs/openssl-0.9.6 + ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r1 + media-libs/x264 ) + jpeg? ( media-libs/jpeg ) + media-libs/tiff + >=dev-lang/python-2.4 + nls? ( >=media-libs/freetype-2.0 + virtual/libintl + >=media-libs/ftgl-2.1 ) + openal? ( media-libs/openal + media-libs/freealut ) + openexr? ( media-libs/openexr ) + png? ( media-libs/libpng ) + >=media-libs/libsdl-1.2 + virtual/opengl" + +DEPEND="dev-util/scons + x11-libs/libXt + x11-proto/inputproto + ${RDEPEND}" + +blend_with() { + local UWORD="$2" + if [ -z "${UWORD}" ]; then + UWORD="$1" + fi + if useq $1; then + echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \ + >> "${S}"/user-config.py + else + echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \ + >> "${S}"/user-config.py + fi +} + +src_unpack() { + unpack ${A} + cd "${S}"/release/plugins + chmod 755 bmake + cp -pPR "${S}"/source/blender/blenpluginapi include + + cd "${S}" + epatch "${FILESDIR}"/blender-2.37-dirs.patch + 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 + + if use ffmpeg ; then + cd "${S}"/extern + rm -rf ffmpeg + fi + # pass compiler flags to the scons build system + # and set python version to current version in use + python_version + cat <<- EOF >> "${S}"/user-config.py + CFLAGS += '${CFLAGS}' + BF_PYTHON_VERSION="${PYVER}" + BF_PYTHON_INC="/usr/include/python${PYVER}" + BF_PYTHON_BINARY="/usr/bin/python${PYVER}" + BF_PYTHON_LIB="python${PYVER}" + EOF + +} + +src_compile() { + for arg in 'openal' \ + 'openexr' \ + 'jpeg' \ + 'ffmpeg' \ + 'png' \ + 'verse' \ + 'nls international' \ + 'blender-game gameengine'; do + blend_with ${arg} + done + + # scons uses -l differently -> remove it + scons ${MAKEOPTS/-l[0-9]} -h > scons.config + scons ${MAKEOPTS/-l[0-9]} || die \ + "!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org" + + cd "${S}"/release/plugins + emake || die +} + +src_install() { + exeinto /usr/bin/ + doexe "${WORKDIR}"/install/linux2/blender + + dodir /usr/share/${PN} + + exeinto /usr/$(get_libdir)/${PN}/textures + doexe "${S}"/release/plugins/texture/*.so + exeinto /usr/$(get_libdir)/${PN}/sequences + doexe "${S}"/release/plugins/sequence/*.so + insinto /usr/include/${PN} + doins "${S}"/release/plugins/include/*.h + + if use nls ; then + mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \ + "${D}"/usr/share/${PN} + mv "${WORKDIR}"/install/linux2/.blender/locale \ + "${D}"/usr/share/locale + fi + + mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN} + + insinto /usr/share/pixmaps + doins "${FILESDIR}"/${PN}.png + insinto /usr/share/applications + doins "${FILESDIR}"/${PN}.desktop + + dodoc INSTALL README +} + +pkg_preinst(){ + if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ]; + then + rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include + fi +} diff --git a/media-gfx/blender/blender-2.45-r3.ebuild b/media-gfx/blender/blender-2.45-r3.ebuild new file mode 100644 index 000000000000..564b28b48638 --- /dev/null +++ b/media-gfx/blender/blender-2.45-r3.ebuild @@ -0,0 +1,137 @@ +# 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.1 2008/04/27 12:19:52 maekke Exp $ + +inherit multilib flag-o-matic eutils python + +#IUSE="jpeg mozilla png sdl static truetype" +IUSE="blender-game ffmpeg jpeg nls openal openexr png verse" +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="http://www.blender.org/" +SRC_URI="http://download.blender.org/source/${P}.tar.gz" + +SLOT="0" +LICENSE="|| ( GPL-2 BL )" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=">=dev-libs/openssl-0.9.6 + ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 ) + jpeg? ( media-libs/jpeg ) + media-libs/tiff + >=dev-lang/python-2.4 + nls? ( >=media-libs/freetype-2.0 + virtual/libintl + >=media-libs/ftgl-2.1 ) + openal? ( media-libs/openal + media-libs/freealut ) + openexr? ( media-libs/openexr ) + png? ( media-libs/libpng ) + >=media-libs/libsdl-1.2 + virtual/opengl" + +DEPEND="dev-util/scons + x11-libs/libXt + x11-proto/inputproto + ${RDEPEND}" + +blend_with() { + local UWORD="$2" + if [ -z "${UWORD}" ]; then + UWORD="$1" + fi + if useq $1; then + echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \ + >> "${S}"/user-config.py + else + echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \ + >> "${S}"/user-config.py + fi +} + +src_unpack() { + unpack ${A} + cd "${S}"/release/plugins + chmod 755 bmake + cp -pPR "${S}"/source/blender/blenpluginapi include + + cd "${S}" + epatch "${FILESDIR}"/blender-2.37-dirs.patch + 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 + + if use ffmpeg ; then + cd "${S}"/extern + rm -rf ffmpeg + fi + # pass compiler flags to the scons build system + # and set python version to current version in use + python_version + cat <<- EOF >> "${S}"/user-config.py + CFLAGS += '${CFLAGS}' + BF_PYTHON_VERSION="${PYVER}" + BF_PYTHON_INC="/usr/include/python${PYVER}" + BF_PYTHON_BINARY="/usr/bin/python${PYVER}" + BF_PYTHON_LIB="python${PYVER}" + EOF + +} + +src_compile() { + for arg in 'openal' \ + 'openexr' \ + 'jpeg' \ + 'ffmpeg' \ + 'png' \ + 'verse' \ + 'nls international' \ + 'blender-game gameengine'; do + blend_with ${arg} + done + + # scons uses -l differently -> remove it + scons ${MAKEOPTS/-l[0-9]} -h > scons.config + scons ${MAKEOPTS/-l[0-9]} || die \ + "!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org" + + cd "${S}"/release/plugins + emake || die +} + +src_install() { + exeinto /usr/bin/ + doexe "${WORKDIR}"/install/linux2/blender + + dodir /usr/share/${PN} + + exeinto /usr/$(get_libdir)/${PN}/textures + doexe "${S}"/release/plugins/texture/*.so + exeinto /usr/$(get_libdir)/${PN}/sequences + doexe "${S}"/release/plugins/sequence/*.so + insinto /usr/include/${PN} + doins "${S}"/release/plugins/include/*.h + + if use nls ; then + mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \ + "${D}"/usr/share/${PN} + mv "${WORKDIR}"/install/linux2/.blender/locale \ + "${D}"/usr/share/locale + fi + + mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN} + + insinto /usr/share/pixmaps + doins "${FILESDIR}"/${PN}.png + insinto /usr/share/applications + doins "${FILESDIR}"/${PN}.desktop + + dodoc INSTALL README +} + +pkg_preinst(){ + if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ]; + then + rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include + fi +} diff --git a/media-gfx/blender/files/blender-2.45-cve-2008-1102.patch b/media-gfx/blender/files/blender-2.45-cve-2008-1102.patch new file mode 100644 index 000000000000..43015b3c052b --- /dev/null +++ b/media-gfx/blender/files/blender-2.45-cve-2008-1102.patch @@ -0,0 +1,13 @@ +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'); |