[gentoo-commits] repo/proj/guru:master commit in: dev-games/godot/files/, dev-games/godot/
commit: 220f64b1c15644bd4853eff296c38b2cd4018f76
Author: Jay Faulkner jvf cc>
AuthorDate: Fri Sep 2 02:20:28 2022 +
Commit: Ronny Gutbrod tastytea de>
CommitDate: Fri Sep 2 02:21:00 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=220f64b1
dev-games/godot: treeclean, migrated to ::gentoo
Signed-Off-By: Jay Faulkner jvf.cc>
dev-games/godot/Manifest | 1 -
.../godot/files/godot-3.3.2-fix-llvm-build.patch | 36 -
dev-games/godot/godot-3.3.2-r1.ebuild | 145 -
dev-games/godot/metadata.xml | 30 -
4 files changed, 212 deletions(-)
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
deleted file mode 100644
index 26b22352d..0
--- a/dev-games/godot/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST godot-3.3.2.tar.gz 29524679 BLAKE2B
1d7ee1703388d98c41524f64a99859216b060daad4502c4118adf31a95d45aa230d058630ae8735282a9b5d9f7c1ee464fb4caf9f92e3e55340370e007102f8d
SHA512
3a8d187d44460ce0f28f9d26fabb30b5a9af651d9d1a1446480823885aae3ad018e32a072d4d60cf5d2c152b97759cee2172ca314c517d01cff8ddf05d91c24e
diff --git a/dev-games/godot/files/godot-3.3.2-fix-llvm-build.patch
b/dev-games/godot/files/godot-3.3.2-fix-llvm-build.patch
deleted file mode 100644
index 7cb5823eb..0
--- a/dev-games/godot/files/godot-3.3.2-fix-llvm-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index c30f533..388be69 100644
a/SConstruct
-+++ b/SConstruct
-@@ -174,6 +174,8 @@ opts.Add(BoolVariable("builtin_zstd", "Use the built-in
Zstd library", True))
- # Compilation environment setup
- opts.Add("CXX", "C++ compiler")
- opts.Add("CC", "C compiler")
-+opts.Add("AR", "Archiver")
-+opts.Add("RANLIB", "Random Access Library Indexer")
- opts.Add("LINK", "Linker")
- opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers")
- opts.Add("CFLAGS", "Custom flags for the C compiler")
-diff --git a/platform/x11/detect.py b/platform/x11/detect.py
-index ba5fb30..d907701 100644
a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -129,7 +129,6 @@ def configure(env):
- if "clang++" not in os.path.basename(env["CXX"]):
- env["CC"] = "clang"
- env["CXX"] = "clang++"
--env.extra_suffix = ".llvm" + env.extra_suffix
-
- if env["use_lld"]:
- if env["use_llvm"]:
-@@ -189,10 +188,6 @@ def configure(env):
- env.Append(CCFLAGS=["-flto"])
- env.Append(LINKFLAGS=["-flto"])
-
--if not env["use_llvm"]:
--env["RANLIB"] = "gcc-ranlib"
--env["AR"] = "gcc-ar"
--
- env.Append(CCFLAGS=["-pipe"])
- env.Append(LINKFLAGS=["-pipe"])
-
diff --git a/dev-games/godot/godot-3.3.2-r1.ebuild
b/dev-games/godot/godot-3.3.2-r1.ebuild
deleted file mode 100644
index bee4feb73..0
--- a/dev-games/godot/godot-3.3.2-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit desktop python-any-r1 scons-utils toolchain-funcs xdg
-
-DESCRIPTION="Multi-platform 2D and 3D game engine"
-HOMEPAGE="https://godotengine.org;
-
-SRC_URI="https://github.com/godotengine/${PN}/archive/${PV}-stable.tar.gz ->
${P}.tar.gz"
-S="${WORKDIR}/${P}-stable"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD CC-BY-3.0 MIT MPL-2.0 OFL-1.1 public-domain
ZLIB"
-SLOT="0/3"
-IUSE="+bullet debug deprecated +enet +freetype lto +mbedtls +ogg +opus
pulseaudio +raycast +theora +udev +upnp +vorbis +webp"
-
-RDEPEND="
- app-arch/lz4
- app-arch/zstd
- dev-libs/libpcre2[pcre32]
- media-libs/alsa-lib
- media-libs/embree:3
- media-libs/libpng:0=
- media-libs/libvpx
- media-libs/mesa[gles2]
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- virtual/glu
- virtual/opengl
- bullet? ( >=sci-physics/bullet-2.89 )
- enet? ( net-libs/enet:= )
- freetype? ( media-libs/freetype:2 )
- mbedtls? ( net-libs/mbedtls )
- ogg? ( media-libs/libogg )
- opus? (
- media-libs/opus
- media-libs/opusfile
- )
- pulseaudio? ( media-sound/pulseaudio )
- theora? ( media-libs/libtheora )
- udev? ( virtual/udev )
- upnp? ( net-libs/miniupnpc )
- vorbis? ( media-libs/libvorbis )
- webp? ( media-libs/libwebp )
-"
-DEPEND="
- ${RDEPEND}
- dev-lang/yasm
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-llvm-build.patch
-)
-
-src_prepare() {
- default
- rm -r
thirdparty/{bullet,embree,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zstd}
|| die
-}
-
-src_configure() {
- myesconsargs=(
- CC="$(tc-getCC)"
-
[gentoo-commits] repo/proj/guru:master commit in: dev-games/godot/files/, dev-games/godot/
commit: f739c38fe13101375ee632c644aac795369aed5f
Author: Ross Charles Campbell gmail com>
AuthorDate: Sat May 8 22:21:51 2021 +
Commit: Andrew Ammerlaan riseup net>
CommitDate: Sat May 8 22:24:18 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f739c38f
dev-games/godot: Fix building issues on 3.3
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ross Charles Campbell gmail.com>
.../godot/files/godot-3.3-fix-llvm-build.patch | 36 ++
dev-games/godot/godot-3.3.ebuild | 3 +-
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/dev-games/godot/files/godot-3.3-fix-llvm-build.patch
b/dev-games/godot/files/godot-3.3-fix-llvm-build.patch
new file mode 100644
index 0..7cb5823eb
--- /dev/null
+++ b/dev-games/godot/files/godot-3.3-fix-llvm-build.patch
@@ -0,0 +1,36 @@
+diff --git a/SConstruct b/SConstruct
+index c30f533..388be69 100644
+--- a/SConstruct
b/SConstruct
+@@ -174,6 +174,8 @@ opts.Add(BoolVariable("builtin_zstd", "Use the built-in
Zstd library", True))
+ # Compilation environment setup
+ opts.Add("CXX", "C++ compiler")
+ opts.Add("CC", "C compiler")
++opts.Add("AR", "Archiver")
++opts.Add("RANLIB", "Random Access Library Indexer")
+ opts.Add("LINK", "Linker")
+ opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers")
+ opts.Add("CFLAGS", "Custom flags for the C compiler")
+diff --git a/platform/x11/detect.py b/platform/x11/detect.py
+index ba5fb30..d907701 100644
+--- a/platform/x11/detect.py
b/platform/x11/detect.py
+@@ -129,7 +129,6 @@ def configure(env):
+ if "clang++" not in os.path.basename(env["CXX"]):
+ env["CC"] = "clang"
+ env["CXX"] = "clang++"
+-env.extra_suffix = ".llvm" + env.extra_suffix
+
+ if env["use_lld"]:
+ if env["use_llvm"]:
+@@ -189,10 +188,6 @@ def configure(env):
+ env.Append(CCFLAGS=["-flto"])
+ env.Append(LINKFLAGS=["-flto"])
+
+-if not env["use_llvm"]:
+-env["RANLIB"] = "gcc-ranlib"
+-env["AR"] = "gcc-ar"
+-
+ env.Append(CCFLAGS=["-pipe"])
+ env.Append(LINKFLAGS=["-pipe"])
+
diff --git a/dev-games/godot/godot-3.3.ebuild b/dev-games/godot/godot-3.3.ebuild
index 5b217fa4a..29a02956d 100644
--- a/dev-games/godot/godot-3.3.ebuild
+++ b/dev-games/godot/godot-3.3.ebuild
@@ -56,12 +56,11 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-fix-llvm-build.patch
- "${FILESDIR}"/${P}-fix-CVE-2021-26825.patch
)
src_prepare() {
default
- rm -r
thirdparty/{bullet,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zlib,zstd}
|| die
+ rm -r
thirdparty/{bullet,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zstd}
|| die
}
src_configure() {
[gentoo-commits] repo/proj/guru:master commit in: dev-games/godot/files/, dev-games/godot/
commit: 378fd39928de4e862e0859082620e71449457ae7
Author: Ross Charles Campbell gmail com>
AuthorDate: Wed Feb 10 04:58:17 2021 +
Commit: Andrew Ammerlaan riseup net>
CommitDate: Wed Feb 10 05:05:06 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=378fd399
dev-games/godot: fix CVE-2021-26825
An integer overflow issue exists in Godot Engine up to v3.2 that can
be triggered when loading specially crafted.TGA image files. The
vulnerability exists in ImageLoaderTGA::load_image() function at line:
const size_t buffer_size = (tga_header.image_width * tga_header.image_height) *
pixel_size;
The bug leads to Dynamic stack buffer overflow. Depending on the
context of the application, attack vector can be local or remote,
and can lead to code execution and/or system crash.
Reference: https://nvd.nist.gov/vuln/detail/CVE-2021-26825
Reference: https://github.com/godotengine/godot/pull/45702
Closes: https://bugs.gentoo.org/769761
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ross Charles Campbell gmail.com>
.../files/godot-3.2.3-fix-CVE-2021-26825.patch | 108 +
.../{godot-3.2.3.ebuild => godot-3.2.3-r1.ebuild} | 5 +-
2 files changed, 112 insertions(+), 1 deletion(-)
diff --git a/dev-games/godot/files/godot-3.2.3-fix-CVE-2021-26825.patch
b/dev-games/godot/files/godot-3.2.3-fix-CVE-2021-26825.patch
new file mode 100644
index ..e2602f5e
--- /dev/null
+++ b/dev-games/godot/files/godot-3.2.3-fix-CVE-2021-26825.patch
@@ -0,0 +1,108 @@
+commit 113b5ab1c45c01b8e6d54d13ac8876d091f883a8
+Author: Hein-Pieter van Braam-Stewart
+Date: Thu Feb 4 12:56:33 2021 +0100
+
+Fix a crash in the TGA loader with malformed input
+
+diff --git a/modules/tga/image_loader_tga.cpp
b/modules/tga/image_loader_tga.cpp
+index d60efdd5bc..964dc091a7 100644
+--- a/modules/tga/image_loader_tga.cpp
b/modules/tga/image_loader_tga.cpp
+@@ -55,6 +55,10 @@ Error ImageLoaderTGA::decode_tga_rle(const uint8_t
*p_compressed_buffer, size_t
+ compressed_pos += 1;
+ count = (c & 0x7f) + 1;
+
++ if (output_pos + count * p_pixel_size > output_pos) {
++ return ERR_PARSE_ERROR;
++ }
++
+ if (c & 0x80) {
+ for (size_t i = 0; i < p_pixel_size; i++) {
+ pixels_w.ptr()[i] =
p_compressed_buffer[compressed_pos];
+@@ -78,7 +82,7 @@ Error ImageLoaderTGA::decode_tga_rle(const uint8_t
*p_compressed_buffer, size_t
+ return OK;
+ }
+
+-Error ImageLoaderTGA::convert_to_image(Ref p_image, const uint8_t
*p_buffer, const tga_header_s _header, const uint8_t *p_palette, const bool
p_is_monochrome) {
++Error ImageLoaderTGA::convert_to_image(Ref p_image, const uint8_t
*p_buffer, const tga_header_s _header, const uint8_t *p_palette, const bool
p_is_monochrome, size_t p_output_size) {
+
+ #define TGA_PUT_PIXEL(r, g, b, a) \
+ int image_data_ofs = ((y * width) + x); \
+@@ -130,6 +134,9 @@ Error ImageLoaderTGA::convert_to_image(Ref p_image,
const uint8_t *p_buff
+ if (p_is_monochrome) {
+ while (y != y_end) {
+ while (x != x_end) {
++ if (i > p_output_size) {
++ return ERR_PARSE_ERROR;
++ }
+ uint8_t shade = p_buffer[i];
+
+ TGA_PUT_PIXEL(shade, shade, shade, 0xff)
+@@ -143,6 +150,9 @@ Error ImageLoaderTGA::convert_to_image(Ref p_image,
const uint8_t *p_buff
+ } else {
+ while (y != y_end) {
+ while (x != x_end) {
++ if (i > p_output_size) {
++ return ERR_PARSE_ERROR;
++ }
+ uint8_t index = p_buffer[i];
+ uint8_t r = 0x00;
+ uint8_t g = 0x00;
+@@ -171,6 +181,10 @@ Error ImageLoaderTGA::convert_to_image(Ref
p_image, const uint8_t *p_buff
+ } else if (p_header.pixel_depth == 24) {
+ while (y != y_end) {
+ while (x != x_end) {
++ if (i + 2 > p_output_size) {
++ return ERR_PARSE_ERROR;
++ }
++
+ uint8_t r = p_buffer[i + 2];
+ uint8_t g = p_buffer[i + 1];
+ uint8_t b = p_buffer[i + 0];
+@@ -186,6 +200,10 @@ Error ImageLoaderTGA::convert_to_image(Ref
p_image, const uint8_t *p_buff
+ } else if (p_header.pixel_depth == 32) {
+ while (y != y_end) {
+ while (x != x_end) {
++
[gentoo-commits] repo/proj/guru:master commit in: dev-games/godot/files/, dev-games/godot/
commit: a4c500da08a55ab3ff4b8f78e28dcfdc4372af65
Author: Ross Charles Campbell gmail com>
AuthorDate: Sat Jan 2 15:57:46 2021 +
Commit: Andrew Ammerlaan riseup net>
CommitDate: Sat Jan 2 15:59:18 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a4c500da
dev-games/godot: New Package
Closes: https://bugs.gentoo.org/532730
Closes: https://github.com/gentoo/gentoo/pull/17874
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ross Charles Campbell gmail.com>
dev-games/godot/Manifest | 1 +
.../godot/files/godot-3.2.3-fix-llvm-build.patch | 36 ++
dev-games/godot/godot-3.2.3.ebuild | 139 +
dev-games/godot/metadata.xml | 28 +
4 files changed, 204 insertions(+)
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
new file mode 100644
index ..36fd2278
--- /dev/null
+++ b/dev-games/godot/Manifest
@@ -0,0 +1 @@
+DIST godot-3.2.3.tar.gz 22459811 BLAKE2B
fdebfc4fc4a259d52496feb2904ff1e311a8df3fd57568091b181380e28b789efd16d598df7a2331f22f182acebacb7af1f5aa88583f8b7e992be52f2f494198
SHA512
229a32f082e412f20533b781ee95a1e7a9039a6329fe3429f9a3388ba3aada311bcc49c2abecdeec7496ef039a81358009126b21daaeeb127c170b77c3def99f
diff --git a/dev-games/godot/files/godot-3.2.3-fix-llvm-build.patch
b/dev-games/godot/files/godot-3.2.3-fix-llvm-build.patch
new file mode 100644
index ..40c45f34
--- /dev/null
+++ b/dev-games/godot/files/godot-3.2.3-fix-llvm-build.patch
@@ -0,0 +1,36 @@
+diff --git a/SConstruct b/SConstruct
+index 26019e6..f460aef 100644
+--- a/SConstruct
b/SConstruct
+@@ -170,6 +170,8 @@ opts.Add(BoolVariable("builtin_zstd", "Use the built-in
Zstd library", True))
+ # Compilation environment setup
+ opts.Add("CXX", "C++ compiler")
+ opts.Add("CC", "C compiler")
++opts.Add("AR", "Archiver")
++opts.Add("RANLIB", "Random Access Library Indexer")
+ opts.Add("LINK", "Linker")
+ opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers")
+ opts.Add("CFLAGS", "Custom flags for the C compiler")
+diff --git a/platform/x11/detect.py b/platform/x11/detect.py
+index 716930d..28b1df4 100644
+--- a/platform/x11/detect.py
b/platform/x11/detect.py
+@@ -130,7 +130,6 @@ def configure(env):
+ env["CXX"] = "clang++"
+ env["LINK"] = "clang++"
+ env.Append(CPPDEFINES=["TYPED_METHOD_BIND"])
+-env.extra_suffix = ".llvm" + env.extra_suffix
+
+ if env["use_lld"]:
+ if env["use_llvm"]:
+@@ -173,10 +172,6 @@ def configure(env):
+ env.Append(CCFLAGS=["-flto"])
+ env.Append(LINKFLAGS=["-flto"])
+
+-if not env["use_llvm"]:
+-env["RANLIB"] = "gcc-ranlib"
+-env["AR"] = "gcc-ar"
+-
+ env.Append(CCFLAGS=["-pipe"])
+ env.Append(LINKFLAGS=["-pipe"])
+
diff --git a/dev-games/godot/godot-3.2.3.ebuild
b/dev-games/godot/godot-3.2.3.ebuild
new file mode 100644
index ..b0115ed9
--- /dev/null
+++ b/dev-games/godot/godot-3.2.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit desktop python-any-r1 scons-utils xdg
+
+DESCRIPTION="Multi-platform 2D and 3D game engine"
+HOMEPAGE="http://godotengine.org;
+
+SRC_URI="https://github.com/godotengine/${PN}/archive/${PV}-stable.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${P}-stable"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="Apache-2.0 BSD BSL-1.1 CC-BY-3.0 MIT MPL-2.0 OFL-1.1 public-domain
ZLIB"
+SLOT="0"
+IUSE="+bullet debug +enet +freetype lto +mbedtls +ogg +opus pulseaudio +theora
+udev +upnp +vorbis +webp"
+
+RDEPEND="
+ app-arch/lz4
+ app-arch/zstd
+ dev-libs/libpcre2[pcre32]
+ media-libs/alsa-lib
+ media-libs/libpng:0=
+ media-libs/libvpx
+ media-libs/mesa[gles2]
+ sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ virtual/glu
+ virtual/opengl
+ bullet? ( >=sci-physics/bullet-2.89 )
+ enet? ( net-libs/enet:= )
+ freetype? ( media-libs/freetype:2 )
+ mbedtls? ( net-libs/mbedtls )
+ ogg? ( media-libs/libogg )
+ opus? (
+ media-libs/opus
+ media-libs/opusfile
+ )
+ pulseaudio? ( media-sound/pulseaudio )
+ theora? ( media-libs/libtheora )
+ udev? ( virtual/udev )
+ upnp? ( net-libs/miniupnpc )
+ vorbis? ( media-libs/libvorbis )
+ webp? ( media-libs/libwebp )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-lang/yasm
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-llvm-build.patch )
+
+src_prepare() {
+ default
+ rm -r
thirdparty/{bullet,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zlib,zstd}
|| die
+}
+
+src_configure() {
+
