Skip to contentSkip to conversation

lame: Upgrade 3.100 -> 4.0

PATCH New Leon Anavi 1 participant 1 message Sep 15

lore
Share & tools
lore

Leon Anavi

author
#0 lore raw

PATCH v2 1/1 lame: Upgrade 3.100 -> 4.0

Upgrade to release 4.0:

- Fixed a stack buffer overflow in the Blade-style encoder DLL (lame_enc.dll): beInitStream() copied a caller-supplied configuration structure using an unchecked, caller-controlled size, so an oversized or compiler-mismatched size could overwrite the stack. The size is now bounds-checked and the packed structure layout is consistent across MSVC and GCC/MinGW builds. [CVSS 8.4, Blade DLL]. Fix by Alexander Leidinger.
- Fixed an integer underflow in the AIFF header parser (parse_aiff_header()): a crafted file with a FORM chunk size below 4 wrapped the unsigned chunk-size counter to a huge value, sending the chunk-scanning loop into an effectively unbounded spin (a hang) on a tiny malicious input. The size is now validated before it is decremented. [CVSS 5.5, AIFF frontend]. Fix by Alexander Leidinger.
- Bump the major version to 4.0 (minor reset to 0). The LAME tag embedded in every encoded MP3 has a fixed 9-byte field for the encoder version string; since 3.100 the 3-digit minor version left no room for the trailing alpha/beta/release marker character, which was silently dropped.
- Export the UTF-8 ID3 tag functions id3tag_set_textinfo_utf8 and id3tag_set_comment_utf8 from the shared library, and fix a possible crash on out-of-memory in the ID3v2 user-defined tag setters.

Add id3tags.patch from the mailing list to fix issues with id3tag_set_textinfo_utf8:
https://sourceforge.net/p/lame/mailman/message/59358795/

This has been also fixed in the dev tree and will be included in LAME release 4.1.

License-Update: Correct the address of the FSF.

---
 meta/recipes-multimedia/lame/lame/clang.patch | 32 +++++-----
 .../lame/lame/id3tags.patch                   | 59 +++++++++++++++++++
 .../lame/lame/no-gtk1.patch                   | 10 ++--
 .../lame/{lame_3.100.bb => lame_4.0.bb}       |  7 ++-
 4 files changed, 84 insertions(+), 24 deletions(-)
 create mode 100644 meta/recipes-multimedia/lame/lame/id3tags.patch
 rename meta/recipes-multimedia/lame/{lame_3.100.bb => lame_4.0.bb} (76%)
meta/recipes-multimedia/lame/lame/clang.patch +16 -16
index 116000c577..9e434fcbe7 100644
@@ -16,18 +16,18 @@ so resolves the build failure.
 Upstream-Status: Pending
 Signed-off-by: Ross Burton <[email protected]>
 
-diff --git i/configure.in w/configure.in
-index 5e43179..d51b017 100644
---- i/configure.in
-+++ w/configure.in
-@@ -960,45 +960,43 @@ if test "x$HAVE_GCC" = "xyes" -o "x$HAVE_CLANG" = "xyes"; then
+diff --git i/configure.ac w/configure.ac
+index 1111111..2222222 100644
+--- i/configure.ac
++++ w/configure.ac
+@@ -1021,45 +1021,43 @@ if test "x$HAVE_GCC" = "xyes" -o "x$HAVE_CLANG" = "xyes"; then
  				;;
  			esac
  		fi
 +
 +		if test "x${HAVE_CLANG}" = "xyes"; then
 +			case "${CLANG_VERSION}" in
-+			3.[89]*|[45].*)
++			3.[[89]]*|[[45]].*|1[[0-9]].*)
 +				OPTIMIZATION="-Ofast"
 +				;;
 +			*)
@@ -48,23 +48,23 @@ index 5e43179..d51b017 100644
 +				OPTIMIZATION="${OPTIMIZATION} -march=i686 \
 +					-mtune=native"
 +				;;
-+			*86)
-+				OPTIMIZATION="${OPTIMIZATION} -march=native \
-+					-mtune=native"
-+				;;
 +			esac
 +
++			# if someone supplies own CFLAGS, we don't add our own
++			if test "x${ac_save_CFLAGS}" != "x"; then
++				OPTIMIZATION=""
++			fi
 +		fi
  		;;
  	*)
  		AC_MSG_ERROR(bad value �${CONFIG_EXPOPT}� for expopt option)
  		;;
  	esac
- 
+
 -
 -	if test "x${HAVE_CLANG}" = "xyes"; then
 -		case "${CLANG_VERSION}" in
--		3.[89]*|[45].*)
+-		3.[[89]]*|[[45]].*|1[[0-9]].*)
 -			OPTIMIZATION="-Ofast"
 -			;;
 -		*)
@@ -85,12 +85,12 @@ index 5e43179..d51b017 100644
 -			OPTIMIZATION="${OPTIMIZATION} -march=i686 \
 -				-mtune=native"
 -			;;
--		*86)
--			OPTIMIZATION="${OPTIMIZATION} -march=native \
--				-mtune=native"
--			;;
 -		esac
 -
+-		# if someone supplies own CFLAGS, we don't add our own
+-		if test "x${ac_save_CFLAGS}" != "x"; then
+-			OPTIMIZATION=""
+-		fi
 -	fi
 -
 -
meta/recipes-multimedia/lame/lame/id3tags.patch new file +59 -0

59 lines not on this page · raw message

meta/recipes-multimedia/lame/lame/no-gtk1.patch +5 -5
index e88d7f1bb4..1d7527e180 100644
@@ -2,12 +2,12 @@ Upstream-Status: Inappropriate [configuration]
 
 # Acquired from OpenEmbedded
 
---- lame-3.96.1/configure.in~no-gtk1.patch	2004-07-25 15:52:12.000000000 +0100
-+++ lame-3.96.1/configure.in	2004-09-10 15:54:39.000000000 +0100
-@@ -363,7 +363,12 @@
- 
+--- lame-4.0/configure.ac~no-gtk1.patch
++++ lame-4.0/configure.ac
+@@ -477,7 +477,12 @@
+
  dnl configure use of features
- 
+
 -AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
 +#AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
 +HAVE_GTK="no"
meta/recipes-multimedia/lame/lame_4.0.bb renamed from meta/recipes-multimedia/lame/lame_3.100.bb +4 -3
similarity index 76%
rename from meta/recipes-multimedia/lame/lame_3.100.bb
rename to meta/recipes-multimedia/lame/lame_4.0.bb
index 42689df351..0dd94e9d25 100644
@@ -4,18 +4,19 @@ HOMEPAGE = "https://lame.sourceforge.io/"
 BUGTRACKER = "http://sourceforge.net/tracker/?group_id=290&atid=100290"
 SECTION = "console/utils"
 LICENSE = "LGPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=a03aed0afc52dd24ed99db06d64a9fa3 \
                     file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b \
 "
 
-DEPENDS = "ncurses gettext-native"
+DEPENDS = "ncurses mpg123 gettext-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
            file://no-gtk1.patch \
            file://clang.patch \
+           file://id3tags.patch \
            "
 
-SRC_URI[sha256sum] = "ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e"
+SRC_URI[sha256sum] = "3df5124d5ad3a98312ffd7ba6a9b36230e4f8a3e66d3ce0f425e336c32d216eb"
 
 inherit autotools pkgconfig sourceforge-releases
 
Signature · 1 line
2.47.3