aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-07-26 01:02:58 -0300
committerNatanael Copa <ncopa@alpinelinux.org>2019-07-26 12:10:53 +0200
commit31c79c98134fcbb3486b8e75501d4d9a409c34a6 (patch)
treee22dcbcb935f942b7b8b0c470d9cb3fd4bfcd92c
parent5e3a0aede429cc681fb71653cd4544284ceb58f7 (diff)
downloadaports-31c79c98134fcbb3486b8e75501d4d9a409c34a6.tar.gz
aports-31c79c98134fcbb3486b8e75501d4d9a409c34a6.tar.bz2
aports-31c79c98134fcbb3486b8e75501d4d9a409c34a6.tar.xz
main/sdl2: security upgrade to 2.0.10
closes #10340
-rw-r--r--main/sdl2/APKBUILD25
-rw-r--r--main/sdl2/fix-directfb-include.patch11
-rw-r--r--main/sdl2/fix-directfb-renderer.patch31
3 files changed, 18 insertions, 49 deletions
diff --git a/main/sdl2/APKBUILD b/main/sdl2/APKBUILD
index 930c7a48b9..93f3a3cc31 100644
--- a/main/sdl2/APKBUILD
+++ b/main/sdl2/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: August Klein <amatcoder@gmail.com>
# Maintainer: August Klein <amatcoder@gmail.com>
pkgname=sdl2
-pkgver=2.0.8
-pkgrel=1
+pkgver=2.0.10
+pkgrel=0
pkgdesc="A development library designed to provide low level access to audio, keyboard, mouse, joystick and graphics"
url="http://www.libsdl.org"
arch="all"
@@ -14,9 +14,22 @@ makedepends="alsa-lib-dev directfb-dev libxcursor-dev libxrandr-dev libxrender-d
subpackages="$pkgname-dev"
source="https://www.libsdl.org/release/SDL2-$pkgver.tar.gz
fix-directfb-include.patch
- fix-directfb-renderer.patch"
+ "
builddir="$srcdir/SDL2-$pkgver"
+# secfixes:
+# 2.0.10-r0:
+# - CVE-2019-7572
+# - CVE-2019-7573
+# - CVE-2019-7574
+# - CVE-2019-7575
+# - CVE-2019-7576
+# - CVE-2019-7578
+# - CVE-2019-7635
+# - CVE-2019-7636
+# - CVE-2019-7637
+# - CVE-2019-7638
+
build() {
cd "$builddir"
# NOTE: Please do not remove the --enable-video-directfb flag.
@@ -44,7 +57,5 @@ package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
}
-
-sha512sums="673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869 SDL2-2.0.8.tar.gz
-f57a7a7b89f11934835b5693d104354be1107ddd31d34f6cfc07cf480b0811d775c95685f6b6b20c6154f03744ed976c8092973ddb6e87773969b8394e852c24 fix-directfb-include.patch
-a37d0ee6f7d4570493d54a29dea9d1fbdbd28a7303a5da1f7e189a9485a9d1833ef6c04287b07820aed3f1aad05fee6ee76522099930f5bc44d1cced360eb692 fix-directfb-renderer.patch"
+sha512sums="f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 SDL2-2.0.10.tar.gz
+126fe6f072e7f45c0d8db710904ffc2a3382fa1403d34a4f9c656e1deca633147b1e5273ce9dfd148af2694cd472ab045129ff50e9ebbb0a888125253710a805 fix-directfb-include.patch"
diff --git a/main/sdl2/fix-directfb-include.patch b/main/sdl2/fix-directfb-include.patch
index 0f7cf36016..5ddf7b198a 100644
--- a/main/sdl2/fix-directfb-include.patch
+++ b/main/sdl2/fix-directfb-include.patch
@@ -14,14 +14,3 @@ index 2d18afb..6416e2f 100644
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
-@@ -79,10 +84,6 @@ struct SDL_SysWMinfo;
-
- #endif /* defined(SDL_VIDEO_DRIVER_X11) */
-
--#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
--#include <directfb.h>
--#endif
--
- #if defined(SDL_VIDEO_DRIVER_COCOA)
- #ifdef __OBJC__
- @class NSWindow;
diff --git a/main/sdl2/fix-directfb-renderer.patch b/main/sdl2/fix-directfb-renderer.patch
deleted file mode 100644
index 0a5a79e4fa..0000000000
--- a/main/sdl2/fix-directfb-renderer.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-The update to 2.0.8 broke the build of the DirectFB renderer such that
-it cannot be used anymore, see
-https://bugzilla.libsdl.org/show_bug.cgi?id=4123. This fixes the
-regression by re-inserting the affected line in the configure script.
-
-diff --git a/configure b/configure
-index 1c7f87e..c5ce9c3 100755
---- a/configure
-+++ b/configure
-@@ -21475,6 +21487,9 @@ fi
-
- $as_echo "#define SDL_VIDEO_DRIVER_DIRECTFB 1" >>confdefs.h
-
-+
-+$as_echo "#define SDL_VIDEO_RENDER_DIRECTFB 1" >>confdefs.h
-+
- SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
-
-diff --git a/configure.in b/configure.in
-index 1c7e793..262885b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2150,6 +2150,7 @@ AC_HELP_STRING([--enable-directfb-shared], [dynamically load directfb support [[
- , enable_directfb_shared=yes)
-
- AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB, 1, [ ])
-+ AC_DEFINE(SDL_VIDEO_RENDER_DIRECTFB, 1, [ ])
- SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
-