From def4f0f67382fb748e13d6a0d26eec0b12d2321b Mon Sep 17 00:00:00 2001
From: Jeff Moyer <jmoyer@redhat.com>
Date: Mon, 13 Nov 2023 11:31:36 -0500
Subject: [PATCH] Rebase to 2.5

This pulls in support for the latest kernel features.  Additionally,
it includes the following spec file changes:
- get rid of the leading slash in front of the libdir macros
- pass --use-libc so that -fstack-protector will work
- add new library variants for foreign function interfaces (ffi).
  This allows other languages to link against and call functions
  in liburing.

Resolves: RHEL-16030

Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
---
 .gitignore    |  2 ++
 liburing.spec | 13 ++++++++++---
 sources       |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index ac8314f..7c9565c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@
 /liburing-2.1.tar.gz.asc
 /liburing-2.3.tar.gz
 /liburing-2.3.tar.gz.asc
+/liburing-2.5.tar.gz
+/liburing-2.5.tar.gz.asc
diff --git a/liburing.spec b/liburing.spec
index a0f44ab..57f97d3 100644
--- a/liburing.spec
+++ b/liburing.spec
@@ -1,6 +1,6 @@
 Name: liburing
-Version: 2.3
-Release: 2%{?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
@@ -28,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
 
@@ -37,19 +37,26 @@ for the Linux-native io_uring.
 
 %files
 %attr(0755,root,root) %{_libdir}/liburing.so.*
+%attr(0755,root,root) %{_libdir}/liburing-ffi.so.*
 %license COPYING
 
 %files devel
 %{_includedir}/liburing/
 %{_includedir}/liburing.h
 %{_libdir}/liburing.so
+%{_libdir}/liburing-ffi.so
 %exclude %{_libdir}/liburing.a
+%exclude %{_libdir}/liburing-ffi.a
 %{_libdir}/pkgconfig/*
 %{_mandir}/man2/*
 %{_mandir}/man3/*
 %{_mandir}/man7/*
 
 %changelog
+* Mon Nov 13 2023 Jeff Moyer <jmoyer@redhat.com> - 2.5-1.el9
+- Rebase to 2.5.
+- Resolves: RHEL-16030
+
 * Thu Apr 27 2023 Jeff Moyer <jmoyer@redhat.com> - 2.3-2.el9
 - n-v-r bump
 - Related: rhbz#2182163
diff --git a/sources b/sources
index 4998e2b..f524fbd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (liburing-2.3.tar.gz) = 23e353bde22998ce806f359446b6d37dfb4a6a2f670dfe81f681e543ec4edeaca097e29fcf58839df8db121f5fb8d36b39e5e3294bd0630431c3a793366d00dc
-SHA512 (liburing-2.3.tar.gz.asc) = 485218122fe0cad3782ea800442d795afd50caa493439c7a00b572afc28a18718b129b2a3ba0dede17f30c2e8b096d2dc9ae808cc2257372725be51717333552
+SHA512 (liburing-2.5.tar.gz) = 574a343d11e3881fb258a4fc201cfadf61f00dcd9610577a3ddba1e856456a609757f2988c5cabb6037a72997acf77b23dfe17eba089fe27dbb36a332f85ab6b
+SHA512 (liburing-2.5.tar.gz.asc) = cd851ad4bf5ac006a79c69c54b11656e76c3dfcbeff9a45b4e2cb848c54743b0a1ef73cd7b1bf3e183575ca1c0b206efca48906af3b15346487161531b9396d6