From 5194415a66bc9c2d4b18757d9b345b5fa93ed4fd Mon Sep 17 00:00:00 2001
From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 23 Nov 2023 07:30:24 -0500
Subject: [PATCH] Update to liburing 2.5.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 0001-enable-libc.patch | 22 ----------------------
 liburing.spec          | 10 ++++++----
 sources                |  4 ++--
 3 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 0001-enable-libc.patch

diff --git a/0001-enable-libc.patch b/0001-enable-libc.patch
deleted file mode 100644
index ddee088..0000000
--- a/0001-enable-libc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure b/configure
-index 28f3eb0..9f7cff4 100755
---- a/configure
-+++ b/configure
-@@ -413,9 +413,15 @@ int main(void){
- #endif
- }
- EOF
--if compile_prog "" "" "nolibc support"; then
--  liburing_nolibc="yes"
--fi
-+# Temporarily disable nolibc because false positives exist and compilation may
-+# fail later. The issue is that compile_prog does not use the CFLAGS modified
-+# for nolibc, so it cannot detect when nolibc won't work (e.g. due to the gcc
-+# stack protector requiring __stack_chk_fail_local from libc on i686).
-+#
-+# if compile_prog "" "" "nolibc support"; then
-+#   liburing_nolibc="yes"
-+# fi
-+liburing_nolibc="no"
- print_config "nolibc support" "$liburing_nolibc";
- #############################################################################
diff --git a/liburing.spec b/liburing.spec
index 735fade..b61159a 100644
--- a/liburing.spec
+++ b/liburing.spec
@@ -1,11 +1,10 @@
 Name: liburing
-Version: 2.4
-Release: 3%{?dist}
+Version: 2.5
+Release: 1%{?dist}
 Summary: Linux-native io_uring I/O access library
 License: (GPLv2 with exceptions and LGPLv2+) or MIT
 Source0: https://brick.kernel.dk/snaps/%{name}-%{version}.tar.gz
 Source1: https://brick.kernel.dk/snaps/%{name}-%{version}.tar.gz.asc
-Patch1: 0001-enable-libc.patch
 URL: https://git.kernel.dk/cgit/liburing/
 BuildRequires: gcc
 BuildRequires: gcc-c++
@@ -29,7 +28,7 @@ for the Linux-native io_uring.
 
 %build
 %set_build_flags
-./configure --prefix=%{_prefix} --libdir=/%{_libdir} --libdevdir=/%{_libdir} --mandir=%{_mandir} --includedir=%{_includedir}
+./configure --prefix=%{_prefix} --libdir=/%{_libdir} --libdevdir=/%{_libdir} --mandir=%{_mandir} --includedir=%{_includedir} --use-libc
 
 %make_build
 
@@ -54,6 +53,9 @@ for the Linux-native io_uring.
 %{_mandir}/man7/*
 
 %changelog
+* Thu Nov 23 2023 Stefan Hajnoczi <stefanha@redhat.com> - 2.5-1
+- Update to liburing 2.5.
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index a17dda3..f524fbd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (liburing-2.4.tar.gz) = bd402dc79e86007dff2f91a87aad04350e3d1cde2b29ff19d4c39cb68e3964e4cdc55abb3f91bbe2ec57c68774c6f06670d48d0719bf70e0bbf87027829cd7da
-SHA512 (liburing-2.4.tar.gz.asc) = d7294b36df28413bf78f7f93168dc923c64db7428e32191128ed1cbaa1e6e4aa01c025094acddaac64812c9ae94d49cf6ac1e8d2deb7c439bf6e7a58f20633a4
+SHA512 (liburing-2.5.tar.gz) = 574a343d11e3881fb258a4fc201cfadf61f00dcd9610577a3ddba1e856456a609757f2988c5cabb6037a72997acf77b23dfe17eba089fe27dbb36a332f85ab6b
+SHA512 (liburing-2.5.tar.gz.asc) = cd851ad4bf5ac006a79c69c54b11656e76c3dfcbeff9a45b4e2cb848c54743b0a1ef73cd7b1bf3e183575ca1c0b206efca48906af3b15346487161531b9396d6