patch 9.0.1816: configure: sed uses non-portable regex

Problem:  configure: sed uses non-portable regex
Solution: use '*' modifier instead of '\?' in regex
          for luajit version detection

closes: #12954

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: ichizok <gclient.gaap@gmail.com>

diff --git a/src/auto/configure b/src/auto/configure
index b3985d59dbc109a3e07cdac4a708be513839a166..7f326c429c842612c98a73acb9571c8150ad11c6 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5385,7 +5385,7 @@ $as_echo_n "checking LuaJIT version... " >&6; }
 if ${vi_cv_version_luajit+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-   vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-\?[a-z0-9]*\)* .*/\1/'`
+   vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-*[a-z0-9]*\)* .*/\1/'`
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_luajit" >&5
 $as_echo "$vi_cv_version_luajit" >&6; }

diff --git a/src/configure.ac b/src/configure.ac
index 6a847222cc634429b59ab841da874f125c93ee73..c7e01f0b804d292e7168935b613acebf5bd6dea2 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -638,7 +638,7 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
       if test "X$vi_cv_path_luajit" != "X"; then
        dnl -- find LuaJIT version
        AC_CACHE_CHECK(LuaJIT version, vi_cv_version_luajit,
-       [ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-9]]\(-\?[[a-z0-9]]*\)* .*/\1/'` ])
+       [ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-9]]\(-*[[a-z0-9]]*\)* .*/\1/'` ])
        AC_CACHE_CHECK(Lua version of LuaJIT, vi_cv_version_lua_luajit,
        [ vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'` ])
        vi_cv_path_lua="$vi_cv_path_luajit"

diff --git a/src/version.c b/src/version.c
index 6d818ada90457399b660ae9862d33874f0c76278..8a755f07eba00611c31871cfa59c93f34712a11c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1816,
 /**/
     1815,
 /**/