patch 9.1.0691: python3: stable-abi may cause segfault on Python 3.11

Problem:  python3: stable-abi may cause segfault on Python 3.11
          (Audrius Kažukauskas, after v9.1.0668)
Solution: do not enable the stable Python ABI by default, only when used
          with --with-python3-stable-abi argument is given

related: #15543

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/auto/configure b/src/auto/configure
index f094827bbeddc3feafb9eefa19f6d43b0db2a85f..7059554821b7b8abd16d2aa4d594cbea583426cc 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7092,21 +7092,16 @@ printf %s "checking --with-python3-stable-abi argument... " >&6; }
 if test ${with_python3_stable_abi+y}
 then :
   withval=$with_python3_stable_abi;
-        if test "X$withval" = "Xyes"; then
-          vi_cv_var_python3_stable_abi=$python3_stable_abi_default
-        else
-          vi_cv_var_python3_stable_abi="$withval"
-        fi
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_stable_abi" >&5
+     if test "X$withval" = "Xyes"; then
+       vi_cv_var_python3_stable_abi=$python3_stable_abi_default
+     else
+       vi_cv_var_python3_stable_abi="$withval"
+     fi
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_stable_abi" >&5
 printf "%s\n" "$vi_cv_var_python3_stable_abi" >&6; }
-else $as_nop
-
-        vi_cv_var_python3_stable_abi=$python3_stable_abi_default
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no. defaults to $python3_stable_abi_default." >&5
-printf "%s\n" "no. defaults to $python3_stable_abi_default." >&6; }
 fi
 
-      if test "X$vi_cv_var_python3_stable_abi" != "Xno"; then
+      if test "X$vi_cv_var_python3_stable_abi" != "X"; then
         if test ${vi_cv_var_python3_stable_abi_hex+y}
 then :
   printf %s "(cached) " >&6

diff --git a/src/configure.ac b/src/configure.ac
index 43832dcc630046834cc41ce9cb4c605a5a7b8107..abd0c44e73fcbb94b79d0b18421b5d110c684e72 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1544,16 +1544,13 @@ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic";
       AC_SUBST(vi_cv_var_python3_stable_abi)
       AC_ARG_WITH(python3-stable-abi, [  --with-python3-stable-abi=VERSION  stable ABI version to target (default: 3.8)],
         [
-        if test "X$withval" = "Xyes"; then
-          vi_cv_var_python3_stable_abi=$python3_stable_abi_default
-        else
-          vi_cv_var_python3_stable_abi="$withval"
-        fi
-        AC_MSG_RESULT($vi_cv_var_python3_stable_abi)],
-        [
-        vi_cv_var_python3_stable_abi=$python3_stable_abi_default
-        AC_MSG_RESULT(no. defaults to $python3_stable_abi_default.)])
-      if test "X$vi_cv_var_python3_stable_abi" != "Xno"; then
+     if test "X$withval" = "Xyes"; then
+       vi_cv_var_python3_stable_abi=$python3_stable_abi_default
+     else
+       vi_cv_var_python3_stable_abi="$withval"
+     fi
+     AC_MSG_RESULT($vi_cv_var_python3_stable_abi)])
+      if test "X$vi_cv_var_python3_stable_abi" != "X"; then
         AC_CACHE_VAL(vi_cv_var_python3_stable_abi_hex,
         [
          vi_cv_var_python3_stable_abi_hex=`

diff --git a/src/version.c b/src/version.c
index 9a6a9458f4125ddeabf64bfd5724dc8c44ed2f37..3a34efed573a8a278694351947b7ab881538d351 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    691,
 /**/
     690,
 /**/