[packages/libvxhs] - rediff patch, rebuild with openssl 3.0.0, rel 2
baggins
baggins at pld-linux.org
Tue Oct 5 23:26:37 CEST 2021
commit ecde1d1a81323e44face17feb95f3979bf68d14e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Oct 5 23:26:18 2021 +0200
- rediff patch, rebuild with openssl 3.0.0, rel 2
libvxhs-types.patch | 101 +++++++++++++++++++++++++++-------------------------
libvxhs.spec | 2 +-
2 files changed, 54 insertions(+), 49 deletions(-)
---
diff --git a/libvxhs.spec b/libvxhs.spec
index d78dd5b..f4dce02 100644
--- a/libvxhs.spec
+++ b/libvxhs.spec
@@ -4,7 +4,7 @@ Name: libvxhs
Version: 1.0
%define gitref 19255696d892a6d50dd39e803e791feedfdd6a07
%define snap 20170421
-%define rel 1
+%define rel 2
Release: 0.%{snap}.%{rel}
License: GPL v2+
Group: Libraries
diff --git a/libvxhs-types.patch b/libvxhs-types.patch
index 0a0fdb9..bba40a1 100644
--- a/libvxhs-types.patch
+++ b/libvxhs-types.patch
@@ -1,6 +1,7 @@
---- libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/lib/qnio/nio_client.c.orig 2017-04-20 02:26:17.000000000 +0200
-+++ libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/lib/qnio/nio_client.c 2020-05-22 08:50:31.620777403 +0200
-@@ -537,7 +537,7 @@
+diff -urNp -x '*.orig' libqnio-19255696d892a6d50dd39e803e791feedfdd6a07.org/src/lib/qnio/nio_client.c libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/lib/qnio/nio_client.c
+--- libqnio-19255696d892a6d50dd39e803e791feedfdd6a07.org/src/lib/qnio/nio_client.c 2017-04-20 02:26:17.000000000 +0200
++++ libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/lib/qnio/nio_client.c 2021-10-05 23:25:59.547804335 +0200
+@@ -537,8 +537,8 @@ static inline int
send_on_connection(struct qnio_msg *msg, struct conn *c)
{
msg->ctx = c;
@@ -10,9 +11,11 @@
+ msg->hinfo.crc = (unsigned char)((uintptr_t) msg % CRC_MODULO);
nioDbg("Msg is born on client side msgid=%ld %p",msg->hinfo.cookie, msg);
if (ck_pr_load_int(&c->flags) & CONN_FLAG_DISCONNECTED) {
---- libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/lib/qnio/nio_core.c.orig 2017-04-20 02:26:17.000000000 +0200
-+++ libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/lib/qnio/nio_core.c 2020-05-22 09:05:07.942696626 +0200
-@@ -91,7 +91,7 @@
+ nioDbg("Connection is not usable");
+diff -urNp -x '*.orig' libqnio-19255696d892a6d50dd39e803e791feedfdd6a07.org/src/lib/qnio/nio_core.c libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/lib/qnio/nio_core.c
+--- libqnio-19255696d892a6d50dd39e803e791feedfdd6a07.org/src/lib/qnio/nio_core.c 2017-04-20 02:26:17.000000000 +0200
++++ libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/lib/qnio/nio_core.c 2021-10-05 23:25:59.547804335 +0200
+@@ -91,7 +91,7 @@ process_client_message(struct conn *conn
struct iovec resp;
rinfo = &conn->rinfo;
@@ -21,7 +24,7 @@
nioDbg("Msg is recvd from wire on client side msgid=%ld", msg->hinfo.cookie);
LIST_DEL(&msg->lnode);
nioDbg("Msg removed from pending list msgid=%ld", msg->hinfo.cookie);
-@@ -149,13 +149,13 @@
+@@ -149,13 +149,13 @@ process_header(struct conn *conn)
return err;
}
if (conn->ctx->mode == QNIO_CLIENT_MODE) {
@@ -37,7 +40,7 @@
rinfo->buf_source = BUF_SRC_MALLOC;
}
} else if (conn->ctx->mode == QNIO_SERVER_MODE) {
-@@ -166,7 +166,7 @@
+@@ -166,7 +166,7 @@ process_header(struct conn *conn)
} else {
nioDbg("Server side message, assigning default buffer");
aligned_size = ((hinfo->payload_size / BUF_ALIGN) + 1) * BUF_ALIGN;
@@ -46,8 +49,45 @@
rinfo->buf_source = BUF_SRC_MALLOC;
}
} else {
---- libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/test/server.c.orig 2017-04-20 02:26:17.000000000 +0200
-+++ libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/test/server.c 2020-05-22 09:06:50.795472758 +0200
+diff -urNp -x '*.orig' libqnio-19255696d892a6d50dd39e803e791feedfdd6a07.org/src/lib/qnio/slab.c libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/lib/qnio/slab.c
+--- libqnio-19255696d892a6d50dd39e803e791feedfdd6a07.org/src/lib/qnio/slab.c 2017-04-20 02:26:17.000000000 +0200
++++ libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/lib/qnio/slab.c 2021-10-05 23:25:59.547804335 +0200
+@@ -31,7 +31,9 @@ slab_init(slab_t *slab, uint32_t size, u
+ if(fptr != NULL)
+ entry = fptr(NULL);
+ else if(alignment != 0)
+- posix_memalign(&entry, alignment, alloc_size);
++ {
++ if(posix_memalign(&entry, alignment, alloc_size)) entry = NULL; // FIXME: real error handling
++ }
+ else
+ entry = malloc(alloc_size);
+ node = (fifo_node_t *) malloc(sizeof(fifo_node_t));
+@@ -67,7 +69,9 @@ slab_get(slab_t *slab)
+ if(slab->init_fptr != NULL)
+ entry = slab->init_fptr(NULL);
+ else if(slab->alignment != 0)
+- posix_memalign(&entry, slab->alignment, slab->alloc_size);
++ {
++ if(posix_memalign(&entry, slab->alignment, slab->alloc_size)) entry = NULL; // FIXME: real error handling
++ }
+ else
+ entry = malloc(slab->alloc_size);
+ node = (fifo_node_t *) malloc(sizeof(fifo_node_t));
+@@ -101,7 +105,9 @@ slab_get_unsafe(slab_t *slab)
+ else
+ {
+ if(slab->alignment != 0)
+- posix_memalign(&entry, slab->alignment, slab->alloc_size);
++ {
++ if(posix_memalign(&entry, slab->alignment, slab->alloc_size)) entry = NULL; // FIXME: real error handling
++ }
+ else
+ entry = malloc(slab->alloc_size);
+ node = (fifo_node_t *) malloc(sizeof(fifo_node_t));
+diff -urNp -x '*.orig' libqnio-19255696d892a6d50dd39e803e791feedfdd6a07.org/src/test/server.c libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/test/server.c
+--- libqnio-19255696d892a6d50dd39e803e791feedfdd6a07.org/src/test/server.c 2017-04-20 02:26:17.000000000 +0200
++++ libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/test/server.c 2021-10-05 23:25:59.547804335 +0200
@@ -8,6 +8,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
@@ -56,7 +96,7 @@
#include <pthread.h>
#include <libgen.h>
#include "defs.h"
-@@ -64,7 +65,7 @@
+@@ -64,7 +65,7 @@ static int vdisk_read(struct qnio_msg *m
fclose(backing_file);
if (verbose) {
@@ -65,7 +105,7 @@
}
returnd->iov_len = size;
-@@ -117,7 +118,7 @@
+@@ -117,7 +118,7 @@ static int vdisk_write(struct qnio_msg *
fclose(backing_file);
if (verbose) {
@@ -74,7 +114,7 @@
}
msg->hinfo.err = 0;
-@@ -146,7 +147,7 @@
+@@ -146,7 +147,7 @@ void *pdispatch(void *data)
int fd;
if (verbose) {
@@ -83,38 +123,3 @@
}
switch (opcode) {
---- libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/lib/qnio/slab.c.orig 2017-04-20 02:26:17.000000000 +0200
-+++ libqnio-19255696d892a6d50dd39e803e791feedfdd6a07/src/lib/qnio/slab.c 2020-05-22 09:29:40.824717340 +0200
-@@ -31,7 +31,9 @@
- if(fptr != NULL)
- entry = fptr(NULL);
- else if(alignment != 0)
-- posix_memalign(&entry, alignment, alloc_size);
-+ {
-+ if(posix_memalign(&entry, alignment, alloc_size)) entry = NULL; // FIXME: real error handling
-+ }
- else
- entry = malloc(alloc_size);
- node = (fifo_node_t *) malloc(sizeof(fifo_node_t));
-@@ -67,7 +69,9 @@
- if(slab->init_fptr != NULL)
- entry = slab->init_fptr(NULL);
- else if(slab->alignment != 0)
-- posix_memalign(&entry, slab->alignment, slab->alloc_size);
-+ {
-+ if(posix_memalign(&entry, slab->alignment, slab->alloc_size)) entry = NULL; // FIXME: real error handling
-+ }
- else
- entry = malloc(slab->alloc_size);
- node = (fifo_node_t *) malloc(sizeof(fifo_node_t));
-@@ -101,7 +105,9 @@
- else
- {
- if(slab->alignment != 0)
-- posix_memalign(&entry, slab->alignment, slab->alloc_size);
-+ {
-+ if(posix_memalign(&entry, slab->alignment, slab->alloc_size)) entry = NULL; // FIXME: real error handling
-+ }
- else
- entry = malloc(slab->alloc_size);
- node = (fifo_node_t *) malloc(sizeof(fifo_node_t));
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libvxhs.git/commitdiff/ecde1d1a81323e44face17feb95f3979bf68d14e
More information about the pld-cvs-commit
mailing list