From ee2deb69623ebf1489db3ef6ab493f682aefe2df Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 21 Nov 2024 16:08:47 +0100
Subject: update to 6.0.0RC1

use 6.0.0-4 to workaround https://github.com/swoole/swoole-src/issues/5531
drop patch merged upstream
fix https://github.com/swoole/swoole-src/issues/5577 build with liburing < 2.6
  using patch from https://github.com/swoole/swoole-src/pull/5579
---
 5579.patch | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 5579.patch

(limited to '5579.patch')

diff --git a/5579.patch b/5579.patch
new file mode 100644
index 0000000..83c0a38
--- /dev/null
+++ b/5579.patch
@@ -0,0 +1,39 @@
+From fab5c53f92612e973072db691176672de237bae0 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 21 Nov 2024 15:21:27 +0100
+Subject: [PATCH] Fix #5577 error in HAVE_IOURING_FUTEX detection
+
+---
+ config.m4 | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/config.m4 b/config.m4
+index 3b12e5fce4..05e7b1f4de 100644
+--- a/config.m4
++++ b/config.m4
+@@ -960,16 +960,22 @@ EOF
+ 
+         LINUX_VERSION=`uname -r | cut -d '-' -f 1`
+         LINUX_MAJOR_VERSION=`echo $LINUX_VERSION | cut -d '.' -f 1`
+-        LINUX_MINIO_VERSION=`echo $LINUX_VERSION | cut -d '.' -f 2`
++        LINUX_MINOR_VERSION=`echo $LINUX_VERSION | cut -d '.' -f 2`
+ 
+         _PKG_CONFIG(URING_VERSION, [modversion], [liburing])
+         IOURING_MAJOR_VERSION=`echo $pkg_cv_URING_VERSION | cut -d '.' -f 1`
+         IOURING_MINOR_VERSION=`echo $pkg_cv_URING_VERSION | cut -d '.' -f 2`
+ 
+-        if test $IOURING_MAJOR_VERSION > 2 || (test $IOURING_MAJOR_VERSION = 2 && test $IOURING_MINOR_VERSION >= 6); then
+-            if test $LINUX_MAJOR_VERSION > 6 || (test $LINUX_MAJOR_VERSION = 6 && test $LINUX_MAJOR_VERSION >= 7); then
++        AC_MSG_CHECKING([checking for io_uring futex feature])
++        if test $IOURING_MAJOR_VERSION -gt 2 || (test $IOURING_MAJOR_VERSION -eq 2 && test $IOURING_MINOR_VERSION -ge 6); then
++            if test $LINUX_MAJOR_VERSION -gt 6 || (test $LINUX_MAJOR_VERSION -eq 6 && test $LINUX_MINOR_VERSION -ge 7); then
++                AC_MSG_RESULT(yes)
+                 AC_DEFINE(HAVE_IOURING_FUTEX, 1, [have io_uring futex feature])
++            else
++                AC_MSG_RESULT([no, Linux $LINUX_VERSION is too old])
+             fi
++        else
++            AC_MSG_RESULT([no, liburing $IOURING_MAJOR_VERSION.$IOURING_MINOR_VERSION is too old])
+         fi
+     fi
+ 
-- 
cgit