CVS commit: pkgsrc/audio/SDL2_mixer

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Mon Jun 28 12:11:16 UTC 2021

Modified Files:
        pkgsrc/audio/SDL2_mixer: Makefile distinfo
Added Files:
        pkgsrc/audio/SDL2_mixer/patches: patch-music__fluidsynth.c

Log Message:
audio/SDL2_mixer: Update to 2.0.4nb5

Backport patch for use-after-free bug.
https://github.com/libsdl-org/SDL_mixer/commit/6160668079f91d57a5d7bf0b40ffdd843be70daf

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/SDL2_mixer/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/SDL2_mixer/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/SDL2_mixer/patches/patch-music__fluidsynth.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/SDL2_mixer/Makefile
diff -u pkgsrc/audio/SDL2_mixer/Makefile:1.13 pkgsrc/audio/SDL2_mixer/Makefile:1.14
--- pkgsrc/audio/SDL2_mixer/Makefile:1.13       Mon Apr  5 10:55:29 2021
+++ pkgsrc/audio/SDL2_mixer/Makefile    Mon Jun 28 12:11:16 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2021/04/05 10:55:29 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2021/06/28 12:11:16 micha Exp $
 
 DISTNAME=      SDL2_mixer-2.0.4
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    audio devel
 MASTER_SITES=  http://www.libsdl.org/projects/SDL_mixer/release/
 

Index: pkgsrc/audio/SDL2_mixer/distinfo
diff -u pkgsrc/audio/SDL2_mixer/distinfo:1.6 pkgsrc/audio/SDL2_mixer/distinfo:1.7
--- pkgsrc/audio/SDL2_mixer/distinfo:1.6        Thu Nov  1 21:12:40 2018
+++ pkgsrc/audio/SDL2_mixer/distinfo    Mon Jun 28 12:11:16 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2018/11/01 21:12:40 adam Exp $
+$NetBSD: distinfo,v 1.7 2021/06/28 12:11:16 micha Exp $
 
 SHA1 (SDL2_mixer-2.0.4.tar.gz) = 242a63b1c7f38e358e94b1e0dc5120a6c1f3763b
 RMD160 (SDL2_mixer-2.0.4.tar.gz) = d5674a92bc9a81e3aba0072c4d7e2314e56958d6
 SHA512 (SDL2_mixer-2.0.4.tar.gz) = 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
 Size (SDL2_mixer-2.0.4.tar.gz) = 11125077 bytes
 SHA1 (patch-configure) = 1666d97f82c5f3dca03eb45dad6b9e73dc61dffd
+SHA1 (patch-music__fluidsynth.c) = affe25cbb8fc21afe80ef3f5fd0e98853addff20

Added files:

Index: pkgsrc/audio/SDL2_mixer/patches/patch-music__fluidsynth.c
diff -u /dev/null pkgsrc/audio/SDL2_mixer/patches/patch-music__fluidsynth.c:1.1
--- /dev/null   Mon Jun 28 12:11:16 2021
+++ pkgsrc/audio/SDL2_mixer/patches/patch-music__fluidsynth.c   Mon Jun 28 12:11:16 2021
@@ -0,0 +1,21 @@
+$NetBSD: patch-music__fluidsynth.c,v 1.1 2021/06/28 12:11:16 micha Exp $
+
+A bug in SDL2_Mixer <= 2.0.4 will crash fluidsynth >= 2.1.6 because the
+objects are destroyed in an illegal order.
+https://www.fluidsynth.org/news/2021/01/23/sdl2-mixer-bug/
+https://github.com/libsdl-org/SDL_mixer/commit/6160668079f91d57a5d7bf0b40ffdd843be70daf
+
+--- music_fluidsynth.c.orig    2018-10-31 14:59:00.000000000 +0000
++++ music_fluidsynth.c
+@@ -273,9 +273,10 @@ static void FLUIDSYNTH_Stop(void *contex
+ static void FLUIDSYNTH_Delete(void *context)
+ {
+     FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
++    fluid_settings_t *settings = fluidsynth.fluid_synth_get_settings(music->synth);
+     fluidsynth.delete_fluid_player(music->player);
+-    fluidsynth.delete_fluid_settings(fluidsynth.fluid_synth_get_settings(music->synth));
+     fluidsynth.delete_fluid_synth(music->synth);
++    fluidsynth.delete_fluid_settings(settings);
+     SDL_free(music);
+ }
+