CVE-2020-14409_CVE-2020-14410.patch

@@ -0,0 +1,73 @@
+From a7ff6e96155f550a5597621ebeddd03c98aa9294 Mon Sep 17 00:00:00 2001
+From: Sam Lantinga <slouken@libsdl.org>
+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)) {

Fix-build-against-wayland-1.20.patch

@@ -0,0 +1,42 @@
+From 068c13b1cac4fead98a458b70ef482ddc8205358 Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+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
+

SDL2-2.0.9-khrplatform.patch

@@ -0,0 +1,15 @@
+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 <KHR/khrplatform.h>
++typedef khronos_intptr_t GLintptr;
++typedef khronos_ssize_t GLsizeiptr;
+ #endif
+ #define GL_BUFFER_SIZE                    0x8764
+ #define GL_BUFFER_USAGE                   0x8765

SDL2.spec

@@ -1,23 +1,24 @@
 Name:           SDL2
-Version:        2.30.0
+Version:        2.0.12
-Release:        1
+Release:        4
 Summary:        Cross-platform multimedia library
 License:        zlib and MIT
 URL:            http://www.libsdl.org/
-Source0:        https://github.com/libsdl-org/SDL/releases/download/release-%{version}/%{name}-%{version}.tar.gz
+Source0:        http://www.libsdl.org/release/%{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
 
 BuildRequires:  alsa-lib-devel audiofile-devel mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel mesa-libEGL-devel libglvnd-devel
 BuildRequires:  libXext-devel libX11-devel libXi-devel libXrandr-devel
 BuildRequires:  libXrender-devel libXScrnSaver-devel libusb-devel
 BuildRequires:  libXinerama-devel libXcursor-devel systemd-devel
-%ifarch loongarch64
-BuildRequires:  pkgconfig(libpulse-simple) 
-%else
 BuildRequires:  pkgconfig(libpulse-simple) pkgconfig(jack)
-%endif
 BuildRequires:  pkgconfig(dbus-1) pkgconfig(ibus-1.0)
 BuildRequires:  pkgconfig(wayland-client) pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-cursor) pkgconfig(wayland-protocols)
@@ -50,6 +51,7 @@ 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 \
@@ -73,11 +75,12 @@ 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 TODO.txt WhatsNew.txt
+%doc README.txt TODO.txt WhatsNew.txt
 %{_bindir}/*-config
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/sdl2.pc
@@ -86,24 +89,10 @@ rm -vf %{buildroot}%{_libdir}/*.la
 %{_datadir}/aclocal/*
 
 %files static
+%license COPYING.txt
 %{_libdir}/lib*.a
 
 %changelog
-* Wed Feb 28 2024 xu_ping <707078654@qq.com> - 2.30.0-1
-- Upgrade version to 2.30.0
-
-* Thu Oct 19 2023 xu_ping <707078654@qq.com> - 2.28.4-1
-- Upgrade version to 2.28.4
-
-* Mon Apr 24 2023 panchenbo <panchenbo@kylinsec.com.cn> - 2.0.12-7
-- add sw_64 support
-
-* Thu Mar 02 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 2.0.12-6
-- add loongarch support
-
-* Tue Jan 10 2023 jiangpeng <jiangpeng01@ncti-gba.cn> - 2.0.12-5
-- fix CVE-2022-4743
-
 * Mon Apr 11 2022 yaoxin <yaoxin30@h-partners.com> - 2.0.12-4
 - Fix CVE-2020-14409 CVE-2020-14410
 

SDL_config.h

@@ -60,8 +60,6 @@
 #include "SDL_config-arm.h"
 #elif defined(__alpha__)
 #include "SDL_config-alpha.h"
-#elif defined(__sw_64__)
-#include "SDL_config-sw_64.h"
 #elif defined(__sparc__) && defined (__arch64__)
 #include "SDL_config-sparc64.h"
 #elif defined(__sparc__)
@@ -78,8 +76,6 @@
 #include "SDL_config-mips.h"
 #elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
 #include "SDL_config-riscv64.h"
-#elif defined(__loongarch64)
-#include "SDL_config-loongarch64.h"
 #else
 #error "The SDL2-devel package is not usable with the architecture."
 #endif

backport-CVE-2021-33657.patch

@@ -0,0 +1,33 @@
+From 8c91cf7dba5193f5ce12d06db1336515851c9ee9 Mon Sep 17 00:00:00 2001
+From: Sam Lantinga <slouken@libsdl.org>
+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);

multilib.patch

@@ -1,16 +1,15 @@
-diff --git a/sdl2-config.in b/sdl2-config.in
+diff -uNr SDL2-2.0.0.orig/sdl2-config.in SDL2-2.0.0/sdl2-config.in
-index f6eca7668..93460f7ae 100644
+--- SDL2-2.0.0.orig/sdl2-config.in	2013-08-12 06:57:54.000000000 +0400
---- a/sdl2-config.in
++++ SDL2-2.0.0/sdl2-config.in	2013-08-24 12:50:01.630268642 +0400
-+++ b/sdl2-config.in
+@@ -3,7 +3,6 @@
-@@ -7,7 +7,6 @@ bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
+ prefix=@prefix@
- 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]"
-@@ -49,12 +48,11 @@ while test $# -gt 0; do
+@@ -45,11 +44,11 @@
        echo -I@includedir@/SDL2 @SDL_CFLAGS@
        ;;
  @ENABLE_SHARED_TRUE@    --libs)
@@ -19,9 +18,8 @@ index f6eca7668..93460f7ae 100644
  @ENABLE_SHARED_TRUE@      ;;
  @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
  @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--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_RLD_FLAGS@ @SDL_STATIC_LIBS@
--@ENABLE_STATIC_TRUE@      echo -L@libdir@ $sdl_static_libs
++@ENABLE_STATIC_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
-+@ENABLE_STATIC_TRUE@      echo @SDL_LIBS@ @SDL_STATIC_LIBS@
  @ENABLE_STATIC_TRUE@      ;;
      *)
        echo "${usage}" 1>&2