import CS liburing-2.3-2.el9

This commit is contained in:
eabdullin 2023-09-21 19:20:33 +00:00
parent 47a34d5d5a
commit c89a6657d5
6 changed files with 36 additions and 97 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/liburing-0.7.tar.gz
SOURCES/liburing-2.3.tar.gz

View File

@ -1 +1 @@
199c087174ee5e0b2ceb49efe9b7918ad96fd656 SOURCES/liburing-0.7.tar.gz
574d244e11125e8f9345fd368bcb259d93055ed0 SOURCES/liburing-2.3.tar.gz

View File

@ -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);

View File

@ -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-----

View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAmNhzMcQHGF4Ym9lQGtl
cm5lbC5kawAKCRD301j7KXHgpkR7D/43c13RaKp4EjW9CO8mx4AzT8ERKJg7jyN4
/NJ/iI2CZGutoZf3kvFb7cpGavrPBbQDSY0W5La28TXwwSEgcdIg0Lex8bjg0Ls5
wlOgPz7YT6/8j3ZcAk2lKOTFhBYu/ZeS3QJktHGC37p5dxP5oZa+E56RwWIRdwVi
kB9iUFCmOdCjSZJ9nyLS3UL/aCDfKAXDirNRJboY1jmm2JLYLVafrUMk+4jzy7/g
8oYU+PYc+t8siqWMSul6iFlAIKaU6g/Bc+RiJUTnXtZaUaqTtctOF+qG+4vM4/vR
CFyPw8AgfAsfMGWCIYBxD8NREfAIOixl0WT7J0AFJ+SNa1WDcSezXjwzJuCguLwR
hEqX65dvtS4wc3M3TwYqtd0Mh8dECrMU328bQM4cEIFJlJQpemdZmHLPlkSA160C
9aZkYaqGA6HqTVyhgd5VPfPYzSFG4NmHPk1vZarI5Mu5bxTvLau7heiXd070fM4O
1RA2AoALqg/h7d/5S60WxMJBfUZhHwRgi4IJGpQXlf5m3kmjInEyPcHczsEiY8le
vcPecffDq7yZnh5oCHkjoHnmZ4j/J6bZJ9+dl/oDHWUMvaQuKiaWTfZq1vUC/Oc9
m+gRLrgkvWZMOZLPvysI1TrfqmGz9u7kZWkilxgZS4osrbChpdnGX1XLPz43aHts
ENA+eYYYXA==
=eRJx
-----END PGP SIGNATURE-----

View File

@ -1,16 +1,15 @@
Name: liburing
Version: 0.7
Release: 7%{?dist}
Version: 2.3
Release: 2%{?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.
@ -47,8 +46,22 @@ for the Linux-native io_uring.
%exclude %{_libdir}/liburing.a
%{_libdir}/pkgconfig/*
%{_mandir}/man2/*
%{_mandir}/man3/*
%{_mandir}/man7/*
%changelog
* 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