[gnome-continuous-yocto/gnomeostree-3.28-rocko: 196/218] lame: revert "lame: fix CVE-2017-13712"

[Emmanuele Bassi <ebassi src gnome org>]

commit d6f7a6d1dd1a26f2c163b1d0d45e876228a58e64
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date:   Mon Mar 19 16:22:03 2018 +0200

    lame: revert "lame: fix CVE-2017-13712"
    
    I don't know how this made it in, but the backported patch most definitely
    fails to apply:
    
    ERROR: lame-3.99.5-r1 do_patch: Command Error: 'quilt --quiltrc 
/home/ak/development/poky/build-musl/tmp/work/core2-64-poky-linux-musl/lame/3.99.5-r1/recipe-sysroot-native/etc/quiltrc
 push' exited with 0  Output:
    Applying patch CVE-2017-13712.patch
    patching file libmp3lame/id3tag.c
    Hunk #1 succeeded at 195 with fuzz 1 (offset 1 line).
    Hunk #11 succeeded at 1023 (offset 24 lines).
    Hunk #12 FAILED at 1051.
    
    The reason we have't seen it is that LICENSE_FLAGS_WHITELIST += " commercial"
    needs to be in config to trigger this.
    
    This reverts commit fd994b5bede3724ce23f3766e6109d83e534d3f3.
    
    (From OE-Core rev: 93aa9a5be30bbd6d9a39beb436a21bcfccceb9a7)
    
    Signed-off-by: Alexander Kanavin <alexander kanavin linux intel com>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../lame/lame/CVE-2017-13712.patch                 |  309 --------------------
 meta/recipes-multimedia/lame/lame_3.99.5.bb        |    4 +-
 2 files changed, 1 insertions(+), 312 deletions(-)
---
diff --git a/meta/recipes-multimedia/lame/lame_3.99.5.bb b/meta/recipes-multimedia/lame/lame_3.99.5.bb
index e5321bb..0477611 100644
--- a/meta/recipes-multimedia/lame/lame_3.99.5.bb
+++ b/meta/recipes-multimedia/lame/lame_3.99.5.bb
@@ -14,9 +14,7 @@ PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
            file://no-gtk1.patch \
-           file://lame-3.99.5_fix_for_automake-1.12.x.patch \
-           file://CVE-2017-13712.patch \
-           "
+           file://lame-3.99.5_fix_for_automake-1.12.x.patch "
 
 SRC_URI[md5sum] = "84835b313d4a8b68f5349816d33e07ce"
 SRC_URI[sha256sum] = "24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff"