diff --git a/CVE-2020-14409_CVE-2020-14410.patch b/CVE-2020-14409_CVE-2020-14410.patch deleted file mode 100644 index 4c9b59d..0000000 --- a/CVE-2020-14409_CVE-2020-14410.patch +++ /dev/null @@ -1,73 +0,0 @@ -From a7ff6e96155f550a5597621ebeddd03c98aa9294 Mon Sep 17 00:00:00 2001 -From: Sam Lantinga -Date: Wed, 17 Jun 2020 08:44:45 -0700 -Subject: [PATCH] Fixed overflow in surface pitch calculation - ---- - src/video/SDL_surface.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c -index 085d9ff1e17..bff826f7cc6 100644 ---- a/src/video/SDL_surface.c -+++ b/src/video/SDL_surface.c -@@ -28,24 +28,23 @@ - #include "SDL_yuv_c.h" - - --/* Check to make sure we can safely check multiplication of surface w and pitch and it won't overflow size_t */ --SDL_COMPILE_TIME_ASSERT(surface_size_assumptions, -- sizeof(int) == sizeof(Sint32) && sizeof(size_t) >= sizeof(Sint32)); -+/* Check to make sure we can safely check multiplication of surface w and pitch and it won't overflow Sint64 */ -+SDL_COMPILE_TIME_ASSERT(surface_size_assumptions, sizeof(int) == sizeof(Sint32)); - - /* Public routines */ - - /* - * Calculate the pad-aligned scanline width of a surface - */ --static int -+static Sint64 - SDL_CalculatePitch(Uint32 format, int width) - { -- int pitch; -+ Sint64 pitch; - - if (SDL_ISPIXELFORMAT_FOURCC(format) || SDL_BITSPERPIXEL(format) >= 8) { -- pitch = (width * SDL_BYTESPERPIXEL(format)); -+ pitch = ((Sint64)width * SDL_BYTESPERPIXEL(format)); - } else { -- pitch = ((width * SDL_BITSPERPIXEL(format)) + 7) / 8; -+ pitch = (((Sint64)width * SDL_BITSPERPIXEL(format)) + 7) / 8; - } - pitch = (pitch + 3) & ~3; /* 4-byte aligning for speed */ - return pitch; -@@ -59,11 +58,19 @@ SDL_Surface * - SDL_CreateRGBSurfaceWithFormat(Uint32 flags, int width, int height, int depth, - Uint32 format) - { -+ Sint64 pitch; - SDL_Surface *surface; - - /* The flags are no longer used, make the compiler happy */ - (void)flags; - -+ pitch = SDL_CalculatePitch(format, width); -+ if (pitch < 0 || pitch > SDL_MAX_SINT32) { -+ /* Overflow... */ -+ SDL_OutOfMemory(); -+ return NULL; -+ } -+ - /* Allocate the surface */ - surface = (SDL_Surface *) SDL_calloc(1, sizeof(*surface)); - if (surface == NULL) { -@@ -78,7 +85,7 @@ SDL_CreateRGBSurfaceWithFormat(Uint32 flags, int width, int height, int depth, - } - surface->w = width; - surface->h = height; -- surface->pitch = SDL_CalculatePitch(format, width); -+ surface->pitch = (int)pitch; - SDL_SetClipRect(surface, NULL); - - if (SDL_ISPIXELFORMAT_INDEXED(surface->format->format)) { diff --git a/CVE-2022-4743.patch b/CVE-2022-4743.patch deleted file mode 100644 index 2f51d08..0000000 --- a/CVE-2022-4743.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 00b67f55727bc0944c3266e2b875440da132ce4b Mon Sep 17 00:00:00 2001 -From: zhailiangliang -Date: Wed, 21 Sep 2022 10:30:38 +0800 -Subject: [PATCH] Fix potential memory leak in GLES_CreateTexture - ---- - src/render/opengles/SDL_render_gles.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/render/opengles/SDL_render_gles.c b/src/render/opengles/SDL_render_gles.c -index a5fbab309eda..ba08a46e2805 100644 ---- a/src/render/opengles/SDL_render_gles.c -+++ b/src/render/opengles/SDL_render_gles.c -@@ -359,6 +359,9 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) - renderdata->glGenTextures(1, &data->texture); - result = renderdata->glGetError(); - if (result != GL_NO_ERROR) { -+ if (texture->access == SDL_TEXTUREACCESS_STREAMING) { -+ SDL_free(data->pixels); -+ } - SDL_free(data); - return GLES_SetError("glGenTextures()", result); - } -@@ -387,6 +390,9 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) - - result = renderdata->glGetError(); - if (result != GL_NO_ERROR) { -+ if (texture->access == SDL_TEXTUREACCESS_STREAMING) { -+ SDL_free(data->pixels); -+ } - SDL_free(data); - return GLES_SetError("glTexImage2D()", result); - } diff --git a/Fix-build-against-wayland-1.20.patch b/Fix-build-against-wayland-1.20.patch deleted file mode 100644 index 4287964..0000000 --- a/Fix-build-against-wayland-1.20.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 068c13b1cac4fead98a458b70ef482ddc8205358 Mon Sep 17 00:00:00 2001 -From: David Redondo -Date: Fri, 10 Dec 2021 16:22:34 +0100 -Subject: [PATCH] Fix build against wayland 1.20 - -Fixes #5088 ---- - src/video/wayland/SDL_waylanddyn.h | 2 ++ - src/video/wayland/SDL_waylandsym.h | 4 ++++ - 2 files changed, 6 insertions(+) - -diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h -index 485a9c1..8ab0505 100644 ---- a/src/video/wayland/SDL_waylanddyn.h -+++ b/src/video/wayland/SDL_waylanddyn.h -@@ -78,6 +78,8 @@ void SDL_WAYLAND_UnloadSymbols(void); - #define wl_proxy_set_user_data (*WAYLAND_wl_proxy_set_user_data) - #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data) - #define wl_proxy_get_version (*WAYLAND_wl_proxy_get_version) -+#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags) -+#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags) - #define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener) - #define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor) - #define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned) -diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h -index c4c189d..789f49e 100644 ---- a/src/video/wayland/SDL_waylandsym.h -+++ b/src/video/wayland/SDL_waylandsym.h -@@ -71,6 +71,10 @@ SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_prox - SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10) - SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...)) - -+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20) -+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...)) -+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, union wl_argument *args)) -+ - SDL_WAYLAND_INTERFACE(wl_seat_interface) - SDL_WAYLAND_INTERFACE(wl_surface_interface) - SDL_WAYLAND_INTERFACE(wl_shm_pool_interface) --- -1.8.3.1 - diff --git a/SDL2-2.0.12.tar.gz b/SDL2-2.0.12.tar.gz deleted file mode 100644 index 111a62b..0000000 Binary files a/SDL2-2.0.12.tar.gz and /dev/null differ diff --git a/SDL2-2.0.9-khrplatform.patch b/SDL2-2.0.9-khrplatform.patch deleted file mode 100644 index b6c3927..0000000 --- a/SDL2-2.0.9-khrplatform.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up SDL2-2.0.9/include/SDL_opengl_glext.h.khrplatform SDL2-2.0.9/include/SDL_opengl_glext.h ---- SDL2-2.0.9/include/SDL_opengl_glext.h.khrplatform 2019-02-15 20:22:39.173773779 -0500 -+++ SDL2-2.0.9/include/SDL_opengl_glext.h 2019-02-15 20:22:58.176399330 -0500 -@@ -469,8 +469,9 @@ GLAPI void APIENTRY glBlendEquation (GLe - typedef long GLsizeiptr; - typedef long GLintptr; - #else --typedef ptrdiff_t GLsizeiptr; --typedef ptrdiff_t GLintptr; -+#include -+typedef khronos_intptr_t GLintptr; -+typedef khronos_ssize_t GLsizeiptr; - #endif - #define GL_BUFFER_SIZE 0x8764 - #define GL_BUFFER_USAGE 0x8765 diff --git a/SDL2-2.28.4.tar.gz b/SDL2-2.28.4.tar.gz new file mode 100644 index 0000000..176c485 Binary files /dev/null and b/SDL2-2.28.4.tar.gz differ diff --git a/SDL2.spec b/SDL2.spec index f9c93c0..2978c31 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -1,18 +1,12 @@ Name: SDL2 -Version: 2.0.12 -Release: 7 +Version: 2.28.4 +Release: 1 Summary: Cross-platform multimedia library License: zlib and MIT URL: http://www.libsdl.org/ -Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz +Source0: https://github.com/libsdl-org/SDL/releases/download/release-%{version}/%{name}-%{version}.tar.gz Source1: SDL_config.h Patch0000: multilib.patch -Patch0001: SDL2-2.0.9-khrplatform.patch -Patch0002: Fix-build-against-wayland-1.20.patch -#https://github.com/libsdl-org/SDL/commit/a7ff6e96155f550a5597621ebeddd03c98aa9294 -Patch0003: CVE-2020-14409_CVE-2020-14410.patch -Patch6000: backport-CVE-2021-33657.patch -Patch6001: CVE-2022-4743.patch BuildRequires: alsa-lib-devel audiofile-devel mesa-libGL-devel BuildRequires: mesa-libGLU-devel mesa-libEGL-devel libglvnd-devel @@ -56,7 +50,6 @@ Static libraries for SDL2. %prep %autosetup -p1 sed -i -e 's/.*AM_PATH_ESD.*//' configure.ac -sed -i -e 's/\r//g' TODO.txt README.txt WhatsNew.txt BUGS.txt COPYING.txt CREDITS.txt README-SDL.txt %build %configure \ @@ -80,12 +73,11 @@ rm -vf %{buildroot}%{_libdir}/*.la %ldconfig_scriptlets %files -%license COPYING.txt %doc BUGS.txt CREDITS.txt README-SDL.txt %{_libdir}/lib*.so.* %files devel -%doc README.txt TODO.txt WhatsNew.txt +%doc TODO.txt WhatsNew.txt %{_bindir}/*-config %{_libdir}/lib*.so %{_libdir}/pkgconfig/sdl2.pc @@ -94,10 +86,12 @@ rm -vf %{buildroot}%{_libdir}/*.la %{_datadir}/aclocal/* %files static -%license COPYING.txt %{_libdir}/lib*.a %changelog +* Thu Oct 19 2023 xu_ping <707078654@qq.com> - 2.28.4-1 +- Upgrade version to 2.28.4 + * Mon Apr 24 2023 panchenbo - 2.0.12-7 - add sw_64 support diff --git a/backport-CVE-2021-33657.patch b/backport-CVE-2021-33657.patch deleted file mode 100644 index 31c0c52..0000000 --- a/backport-CVE-2021-33657.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8c91cf7dba5193f5ce12d06db1336515851c9ee9 Mon Sep 17 00:00:00 2001 -From: Sam Lantinga -Date: Tue, 30 Nov 2021 12:36:46 -0800 -Subject: [PATCH] Always create a full 256-entry map in case color values are - out of range - -Fixes https://github.com/libsdl-org/SDL/issues/5042 ---- - src/video/SDL_pixels.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/video/SDL_pixels.c b/src/video/SDL_pixels.c -index ac04533c5d5..9bb02f771d0 100644 ---- a/src/video/SDL_pixels.c -+++ b/src/video/SDL_pixels.c -@@ -947,7 +947,7 @@ Map1to1(SDL_Palette * src, SDL_Palette * dst, int *identical) - } - *identical = 0; - } -- map = (Uint8 *) SDL_malloc(src->ncolors); -+ map = (Uint8 *) SDL_calloc(256, sizeof(Uint8)); - if (map == NULL) { - SDL_OutOfMemory(); - return (NULL); -@@ -971,7 +971,7 @@ Map1toN(SDL_PixelFormat * src, Uint8 Rmod, Uint8 Gmod, Uint8 Bmod, Uint8 Amod, - SDL_Palette *pal = src->palette; - - bpp = ((dst->BytesPerPixel == 3) ? 4 : dst->BytesPerPixel); -- map = (Uint8 *) SDL_malloc(pal->ncolors * bpp); -+ map = (Uint8 *) SDL_calloc(256, bpp); - if (map == NULL) { - SDL_OutOfMemory(); - return (NULL); diff --git a/multilib.patch b/multilib.patch index 955b398..db59b08 100644 --- a/multilib.patch +++ b/multilib.patch @@ -1,15 +1,16 @@ -diff -uNr SDL2-2.0.0.orig/sdl2-config.in SDL2-2.0.0/sdl2-config.in ---- SDL2-2.0.0.orig/sdl2-config.in 2013-08-12 06:57:54.000000000 +0400 -+++ SDL2-2.0.0/sdl2-config.in 2013-08-24 12:50:01.630268642 +0400 -@@ -3,7 +3,6 @@ - prefix=@prefix@ +diff --git a/sdl2-config.in b/sdl2-config.in +index f6eca7668..93460f7ae 100644 +--- a/sdl2-config.in ++++ b/sdl2-config.in +@@ -7,7 +7,6 @@ bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") + prefix=$(cd -P -- "$bindir/@bin_prefix_relpath@" && printf '%s\n' "$(pwd -P)") exec_prefix=@exec_prefix@ exec_prefix_set=no -libdir=@libdir@ @ENABLE_STATIC_FALSE@usage="\ @ENABLE_STATIC_FALSE@Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" -@@ -45,11 +44,11 @@ +@@ -49,12 +48,11 @@ while test $# -gt 0; do echo -I@includedir@/SDL2 @SDL_CFLAGS@ ;; @ENABLE_SHARED_TRUE@ --libs) @@ -18,8 +19,9 @@ diff -uNr SDL2-2.0.0.orig/sdl2-config.in SDL2-2.0.0/sdl2-config.in @ENABLE_SHARED_TRUE@ ;; @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) --@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ -+@ENABLE_STATIC_TRUE@ echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ +-@ENABLE_STATIC_TRUE@ sdl_static_libs=$(echo "@SDL_LIBS@ @SDL_STATIC_LIBS@" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g") +-@ENABLE_STATIC_TRUE@ echo -L@libdir@ $sdl_static_libs ++@ENABLE_STATIC_TRUE@ echo @SDL_LIBS@ @SDL_STATIC_LIBS@ @ENABLE_STATIC_TRUE@ ;; *) echo "${usage}" 1>&2