Import from AlmaLinux stable repository
This commit is contained in:
parent
9c94f95fb5
commit
18a142c419
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/liburing-0.7.tar.gz
|
||||
SOURCES/liburing-2.5.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
199c087174ee5e0b2ceb49efe9b7918ad96fd656 SOURCES/liburing-0.7.tar.gz
|
||||
45fed44f6bf60a147a915de425cb27b48423cbd1 SOURCES/liburing-2.5.tar.gz
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
examples/ucontext-cp.c: cope with variable SIGSTKSZ
|
||||
|
||||
BZ: 1980845
|
||||
|
||||
commit 8aac320ae8445c5434ab3be1761414a5247e5d42
|
||||
Author: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Date: Tue Apr 13 16:03:19 2021 +0100
|
||||
|
||||
examples/ucontext-cp.c: cope with variable SIGSTKSZ
|
||||
|
||||
The size of C arrays at file scope must be constant. The following
|
||||
compiler error occurs with recent upstream glibc (2.33.9000):
|
||||
|
||||
CC ucontext-cp
|
||||
ucontext-cp.c:31:23: error: variably modified ‘stack_buf’ at file scope
|
||||
31 | unsigned char stack_buf[SIGSTKSZ];
|
||||
| ^~~~~~~~~
|
||||
make[1]: *** [Makefile:26: ucontext-cp] Error 1
|
||||
|
||||
The following glibc commit changed SIGSTKSZ from a constant value to a
|
||||
variable:
|
||||
|
||||
commit 6c57d320484988e87e446e2e60ce42816bf51d53
|
||||
Author: H.J. Lu <hjl.tools@gmail.com>
|
||||
Date: Mon Feb 1 11:00:38 2021 -0800
|
||||
|
||||
sysconf: Add _SC_MINSIGSTKSZ/_SC_SIGSTKSZ [BZ #20305]
|
||||
...
|
||||
+# define SIGSTKSZ sysconf (_SC_SIGSTKSZ)
|
||||
|
||||
Allocate the stack buffer explicitly to avoid declaring an array at file
|
||||
scope.
|
||||
|
||||
Cc: H.J. Lu <hjl.tools@gmail.com>
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
||||
|
||||
diff --git a/examples/ucontext-cp.c b/examples/ucontext-cp.c
|
||||
index 0b2a6b5..ea0c934 100644
|
||||
--- a/examples/ucontext-cp.c
|
||||
+++ b/examples/ucontext-cp.c
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
typedef struct {
|
||||
struct io_uring *ring;
|
||||
- unsigned char stack_buf[SIGSTKSZ];
|
||||
+ unsigned char *stack_buf;
|
||||
ucontext_t ctx_main, ctx_fnew;
|
||||
} async_context;
|
||||
|
||||
@@ -115,8 +115,13 @@ static int setup_context(async_context *pctx, struct io_uring *ring)
|
||||
perror("getcontext");
|
||||
return -1;
|
||||
}
|
||||
- pctx->ctx_fnew.uc_stack.ss_sp = &pctx->stack_buf;
|
||||
- pctx->ctx_fnew.uc_stack.ss_size = sizeof(pctx->stack_buf);
|
||||
+ pctx->stack_buf = malloc(SIGSTKSZ);
|
||||
+ if (!pctx->stack_buf) {
|
||||
+ perror("malloc");
|
||||
+ return -1;
|
||||
+ }
|
||||
+ pctx->ctx_fnew.uc_stack.ss_sp = pctx->stack_buf;
|
||||
+ pctx->ctx_fnew.uc_stack.ss_size = SIGSTKSZ;
|
||||
pctx->ctx_fnew.uc_link = &pctx->ctx_main;
|
||||
|
||||
return 0;
|
||||
@@ -174,6 +179,7 @@ static void copy_file_wrapper(arguments_bundle *pbundle)
|
||||
free(iov.iov_base);
|
||||
close(pbundle->infd);
|
||||
close(pbundle->outfd);
|
||||
+ free(pbundle->pctx->stack_buf);
|
||||
free(pbundle->pctx);
|
||||
free(pbundle);
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAl8IfmQQHGF4Ym9lQGtl
|
||||
cm5lbC5kawAKCRD301j7KXHgptt1D/991BdIlo1tw+PoGHEddAj2xWGW9sJQcrsg
|
||||
crfGOkDEz5mzARU/NaDXkTsMm4sc64SI4l8cYtivOeXq5cYAaKuP+8qpfm2Orjqd
|
||||
U1ZKjsbR6g/mpTobWJJfHh4uWl9ydVCNXk6lIor0g2KTAE9T+fti0JnWS/tS+gjk
|
||||
BpkzILNWtRfiDBooO4WlvGsCy6PQfijgoxH/GRbal6+OdEFhIEc8OHMDd0jXTg6Q
|
||||
o7ehM0kPi2VF2OX91C6lDUwcR+FPK8BZScAlsPN4djRFXYIN4FXuzMYF17wEr51n
|
||||
jf08GbYE3im9xfKDBnKZL1NGEAfaF2Ot7oydLu/sMx2x4QOgQyClKH+JvmAawtAZ
|
||||
KFDefuN4OJVPVNqW1iFbhezt06HxvxlbEvJu1rohiuXSZ0QpPIcEtNCQBttFVSTf
|
||||
YbA0O0I21QQ5uStwIyMXbHFAqliiogYIpVUdXGfdX1lk5Fsx3QXUXm9bA5CXQeLy
|
||||
SVgKJgUCR0uuprVIykNNsgZfwc9J8L3ngPdlz28GIWOwgvZx7tIwU2jGsmQqfCq1
|
||||
8Np4WYi5NslHQpZdHm2OI+atCfPWxA6bYeH51tQF7vETtpEq55TNsDR9RYcpMivb
|
||||
WYjKRzz55T023h4Huf9lD7NupcKqxNBqnmg/WctfnGMKlGe0QmPlQlTfkm+AuakT
|
||||
wpJqI+i0jw==
|
||||
=zAPn
|
||||
-----END PGP SIGNATURE-----
|
||||
17
SOURCES/liburing-2.5.tar.gz.asc
Normal file
17
SOURCES/liburing-2.5.tar.gz.asc
Normal file
@ -0,0 +1,17 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAmVGs2UQHGF4Ym9lQGtl
|
||||
cm5lbC5kawAKCRD301j7KXHgpo8JD/9ThG0ebI63f1f+Rrh2ic7FOwXrS4B2VtXH
|
||||
96+LRqfBJW4L0tvDmH8ej87PgymF8bsoum739JiicK4xUbmwSU4JYkBk0YD1icgx
|
||||
6EuV9Ax7YqxMSCJqQnhOTvZAr/+3nH3NfRkPSNhLBS0maE2GNp+uRIK0brNitQY7
|
||||
wDQIe7dM2ldMJQQ2lA/vgHXFxET6O6qPKGeqZ9OCSlOUVtXlpyEo1DtUYHMC9uSh
|
||||
DdeRG41qnHf+O/We/aiiepOVI9FJwZP7ifnmCCsdJOENUZpkuw5qJEpp743/GcO+
|
||||
XxMchAW1GumLkeCAjq6HjV4DuO64gQ+m7Ud7evxGOLzFbuEcW/X2DZ/gYjp4ZcRV
|
||||
6YYAjLQvjhJqfDPBp4x0Im3xHZ530ES5ySIqcMFyDPjiY3zu9onUCp9S5RWNzVMB
|
||||
NSZrSJWjmF/8UKVcAHs5dlbneHQlcbydO9Kc2fGomb2qO8dBpz6tGCPrsn6A1lXm
|
||||
u026C24YRGUSrQyN0bhT/UnVnayfrzoWdXiGOowI2GHJ2RHLtYE1KOhqBxX3Rzil
|
||||
uFK+yANIvwzbpkMzLQ6tTnwL0EQHzS/SWzVEcTtLuqbF9C/F9S/amFnh53elsbUD
|
||||
BXdqAZNkBG1k3Y9P4X7XMWj45LF5o2n1oCYKlqI6RO2fE7Eqm6AkrX4RT9P13K0e
|
||||
kb6WEeN8Yg==
|
||||
=L1ts
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,16 +1,15 @@
|
||||
Name: liburing
|
||||
Version: 0.7
|
||||
Release: 7%{?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
|
||||
URL: https://git.kernel.dk/cgit/liburing/
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: make
|
||||
|
||||
Patch0: 8aac320-examples-ucontext-cp.c-cope-with-variable-SIGSTKSZ.patch
|
||||
|
||||
%description
|
||||
Provides native async IO for the Linux kernel, in a fast and efficient
|
||||
manner, for both buffered and O_DIRECT.
|
||||
@ -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
|
||||
|
||||
@ -38,17 +37,38 @@ 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
|
||||
|
||||
* Tue Apr 18 2023 Jeff Moyer <jmoyer@redhat.com> - 2.3-1.el9
|
||||
- Rebase to 2.3.
|
||||
- Resolves: rhbz#2182163
|
||||
|
||||
* Fri Jun 17 2022 Jeff Moyer <jmoyer@redhat.com> - 2.1-1.el9
|
||||
- Rebase to 2.1.
|
||||
- Resolves: rhbz#2070603
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.7-7
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
Loading…
Reference in New Issue
Block a user