diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-05-30 13:55:44 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-03 22:28:48 +0200 |
commit | d3e3a6adcd77abdf6c8253b5c13ac0d3a3d80fdd (patch) | |
tree | f77e6f6d3f75091c2b6f2db4508578344c092118 /gnu/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch | |
parent | 1f889a59020f497fcbef8c51586aa73cfa06798a (diff) | |
download | guix-patches-d3e3a6adcd77abdf6c8253b5c13ac0d3a3d80fdd.tar guix-patches-d3e3a6adcd77abdf6c8253b5c13ac0d3a3d80fdd.tar.gz |
gnu: Remove libevent@2.0.
* gnu/packages/patches/libevent-2.0-CVE-2016-10195.patch,
gnu/packages/patches/libevent-2.0-CVE-2016-10196.patch,
gnu/packages/patches/libevent-2.0-CVE-2016-10197.patch,
gnu/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch,
gnu/packages/patches/libevent-dns-tests.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/libevent.scm (libevevent-2.0): Remove variable.
Diffstat (limited to 'gnu/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch')
-rw-r--r-- | gnu/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/gnu/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch b/gnu/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch deleted file mode 100644 index 0253700bf6..0000000000 --- a/gnu/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a8769ef12d7e223e33fc47bed03fba2bfa2f3536 Mon Sep 17 00:00:00 2001 -From: Marcus Sundberg <marcus@marcussundberg.com> -Date: Sat, 26 Mar 2016 20:11:43 +0100 -Subject: [PATCH] evbuffer_add: Use last_with_datap if set, not last. - -evbuffer_add() would always put data in the last chain, even if there -was available space in a previous chain, and in doing so it also -failed to update last_with_datap, causing subsequent calls to other -functions that do look at last_with_datap to add data in the middle -of the evbuffer instead of at the end. - -Fixes the evbuffer_add() part of issue #335, and the evbuffer/add2 and -evbuffer/add3 tests, and also prevents wasting space available in the -chain pointed to by last_with_datap. ---- - buffer.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/buffer.c b/buffer.c -index 7cca0e8a..f378b731 100644 ---- a/buffer.c -+++ b/buffer.c -@@ -1732,7 +1732,11 @@ evbuffer_add(struct evbuffer *buf, const void *data_in, size_t datlen) - goto done; - } - -- chain = buf->last; -+ if (*buf->last_with_datap == NULL) { -+ chain = buf->last; -+ } else { -+ chain = *buf->last_with_datap; -+ } - - /* If there are no chains allocated for this buffer, allocate one - * big enough to hold all the data. */ --- -2.12.0 - |