media-libs/libsdl: multiple CVEs v1.2.15_p20210224

Bug: https://bugs.gentoo.org/772194
Bug: https://bugs.gentoo.org/692388

EAPI 7
Bug: https://bugs.gentoo.org/774024

Dropping older patches included in snapshot

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/19733
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

3 files changed, 142 insertions, 2 deletions

diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index ba7c034a228a..f155eac13db1 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1 +1,2 @@
 DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
+DIST SDL-1.2.15_p20210224.tar.gz 3991106 BLAKE2B be0906950c80cddf15bc458f7734a3ebfa767b11e2f54bf9f771155f4420947900b95bbbebf01341d9dba4c1c7cfe9d54e43150e5f7781622b99668b3362adeb SHA512 3521fe996cf8a8ebb9beaa4802ac05cf5f3a2e7ed1c9b362a818d965b26ec8b3bbebfaac7c827feae44becf5bdd764378cb4282d129285f23a982b5c7474e006
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch
index f430428e6e90..457c934b6c40 100644
--- a/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch
+++ b/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch
@@ -2,8 +2,8 @@ Only output -L -rpath cruft if using a non-standard install location.
 
 Makes ABI / cross-compiling easier on the soul.
 
---- sdl-config.in
-+++ sdl-config.in
+--- a/sdl-config.in
++++ b/sdl-config.in
 @@ -44,7 +44,12 @@
        echo -I@includedir@/SDL @SDL_CFLAGS@
        ;;
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
new file mode 100644
index 000000000000..726f2c151c58
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+MY_COMMIT="99d7f1d1c5492f0fb3c799255042ca7a3f4a5de4"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="https://libsdl.org/"
+SRC_URI="https://github.com/libsdl-org/SDL-1.2/archive/${MY_COMMIT}.tar.gz -> SDL-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+# WARNING:
+# If you turn on the custom-cflags use flag in USE and something breaks,
+# you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
+IUSE="aalib alsa custom-cflags dga fbcon +joystick libcaca nas opengl oss pulseaudio +sound static-libs tslib +video X xinerama xv"
+
+RDEPEND="
+	aalib? ( >=media-libs/aalib-1.4_rc5-r6[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	nas? (
+		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	)
+	opengl? (
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	)
+	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	nas? ( x11-base/xorg-proto )
+	X? ( x11-base/xorg-proto )
+	x86? (
+		|| (
+			>=dev-lang/yasm-0.6.0
+			>=dev-lang/nasm-0.98.39-r3
+		)
+	)"
+
+S=${WORKDIR}/SDL-1.2-${MY_COMMIT}
+
+pkg_setup() {
+	if use custom-cflags ; then
+		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
+		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
+		ewarn "libsdl without the custom-cflags use flag in USE."
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-sdl-config.patch
+	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-gamma.patch
+)
+
+DOCS=( BUGS CREDITS README-SDL.txt TODO WhatsNew )
+
+HTML_DOCS=( {docs,VisualC}.html docs/{html,images,index.html} )
+
+src_prepare() {
+	default
+	AT_M4DIR="${EPREFIX}/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=
+	if use !x86 && use !x86-linux ; then
+		myconf="${myconf} --disable-nasm"
+	else
+		myconf="${myconf} --enable-nasm"
+	fi
+	use custom-cflags || strip-flags
+	use sound || myconf="${myconf} --disable-audio"
+	use video \
+		&& myconf="${myconf} --enable-video-dummy" \
+		|| myconf="${myconf} --disable-video"
+	use joystick || myconf="${myconf} --disable-joystick"
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable prefix rpath) \
+		--disable-arts \
+		--disable-esd \
+		--enable-events \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-file \
+		--enable-cpuinfo \
+		--disable-alsa-shared \
+		--disable-esd-shared \
+		--disable-pulseaudio-shared \
+		--disable-arts-shared \
+		--disable-nas-shared \
+		--disable-osmesa-shared \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable pulseaudio) \
+		$(use_enable nas) \
+		$(use_enable X video-x11) \
+		$(use_enable dga) \
+		$(use_enable xv video-x11-xv) \
+		$(use_enable xinerama video-x11-xinerama) \
+		$(use_enable X video-x11-xrandr) \
+		$(use_enable dga video-dga) \
+		$(use_enable fbcon video-fbcon) \
+		--disable-video-ggi \
+		--disable-video-svga \
+		$(use_enable aalib video-aalib) \
+		$(use_enable libcaca video-caca) \
+		$(use_enable opengl video-opengl) \
+		--disable-video-ps3 \
+		$(use_enable tslib input-tslib) \
+		$(use_with X x) \
+		$(use_enable static-libs static) \
+		--disable-video-x11-xme \
+		--disable-video-directfb \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -type f -name "*.la" -delete || die
+	einstalldocs
+}