From ef5d216dbcdcbbb2bb3f93408a3f1425c32052e9 Mon Sep 17 00:00:00 2001 From: Haibo Chen <495810242@qq.com> Date: Sat, 30 Dec 2023 09:08:41 +0800 Subject: [PATCH] Enhancing the compatibility of options.sh. v5.0.204 (#3916) Accommodate certain complex parameters that include the "=" character, for example. `configure --extra-flags="-O2 -D_FORTIFY_SOURCE=2"` --------- Co-authored-by: john --- trunk/auto/options.sh | 2 +- trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version5.hpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 4f91236534..26545a00cd 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -442,7 +442,7 @@ function parse_user_option_to_value_and_option() { case "$option" in -*=*) value=`echo "$option" | sed -e 's|[-_a-zA-Z0-9/]*=||'` - option=`echo "$option" | sed -e 's|=[-_a-zA-Z0-9/. +,]*||'` + option=`echo "$option" | sed -e 's|=[-_a-zA-Z0-9/. +,=]*||'` ;; *) value="" ;; esac diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 864e563f04..9dd382c0cc 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2023-12-30, Merge [#3916](https://github.com/ossrs/srs/pull/3916): Enhancing the compatibility of options.sh. v5.0.204 (#3916) * v5.0, 2023-12-14, Merge [#3910](https://github.com/ossrs/srs/pull/3910): RTC: Support OPUS stereo SDP option. v5.0.203 (#3910) * v5.0, 2023-12-14, Merge [#3902](https://github.com/ossrs/srs/pull/3902): Security: Support IP whitelist for HTTP-FLV, HLS, WebRTC, and SRT. v5.0.202 (#3902) * v5.0, 2023-11-22, Merge [#3891](https://github.com/ossrs/srs/pull/3891): fix 'sed' error in options.sh. v5.0.201 (#3891) diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 2fea8c83b2..4abdeca673 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 0 -#define VERSION_REVISION 203 +#define VERSION_REVISION 204 #endif