From 8eeb5bae02331cec3bea98adef784357c6e3c910 Mon Sep 17 00:00:00 2001 From: Randy MacLeod Date: Fri, 1 Feb 2019 16:16:28 -0500 Subject: libsolv: Drop now uneeded musl patch Drop the musl specific fopencookie patches since musl added support for fopencookie in: 06184334 implement the fopencookie extension to stdio in December 2017 so it has been in musl since v1.1.19. There was no change in libsolv's configure log when building with musl and these patches dropped. Signed-off-by: Randy MacLeod Signed-off-by: Richard Purdie --- ...es-to-internal-fopencookie-implementation.patch | 105 --------------------- 1 file changed, 105 deletions(-) delete mode 100644 meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch (limited to 'meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch') diff --git a/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch b/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch deleted file mode 100644 index 93b8cc9c18..0000000000 --- a/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 84e12bf7ece49073c559dfd58005132a6099a964 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?= - =?UTF-8?q?=E3=82=B3=E3=82=99=E3=83=B3=E3=83=8F=E3=82=9A=29?= - -Date: Mon, 23 Nov 2015 18:19:41 -0500 -Subject: [PATCH 2/2] Fixes to internal fopencookie() implementation - -Credits to the fixes go to nsz on #musl on Freenode, -who gloriously fixed the implementation such that -the tests all pass. - -Upstream-Status: Denied [https://github.com/openSUSE/libsolv/pull/112] -Signed-off-by: Alexander Kanavin - ---- - ext/solv_xfopen_fallback_fopencookie.c | 19 ++++++++++--------- - ext/solv_xfopen_fallback_fopencookie.h | 10 +++++----- - 2 files changed, 15 insertions(+), 14 deletions(-) - -diff --git a/ext/solv_xfopen_fallback_fopencookie.c b/ext/solv_xfopen_fallback_fopencookie.c -index 0ce2571..89426a9 100644 ---- a/ext/solv_xfopen_fallback_fopencookie.c -+++ b/ext/solv_xfopen_fallback_fopencookie.c -@@ -1,10 +1,10 @@ --/* -+/* - * Provides a very limited fopencookie() for environments with a libc - * that lacks it. -- * -- * Author: zhasha -+ * -+ * Authors: zhasha & nsz - * Modified for libsolv by Neal Gompa -- * -+ * - * This program is licensed under the BSD license, read LICENSE.BSD - * for further information. - * -@@ -33,7 +33,7 @@ static void *proxy(void *arg) - { - struct ctx *ctx = arg; - ssize_t r; -- size_t n; -+ size_t n, k; - - pthread_detach(pthread_self()); - -@@ -47,17 +47,18 @@ static void *proxy(void *arg) - } - if (r == 0) { break; } - -+ n = r, k = 0; - while (n > 0) { - r = ctx->io.write ? -- (ctx->io.write)(ctx->cookie, ctx->buf + ((size_t)r - n), n) : -- write(ctx->fd, ctx->buf + ((size_t)r - n), n); -+ (ctx->io.write)(ctx->cookie, ctx->buf + k, n) : -+ write(ctx->fd, ctx->buf + k, n); - if (r < 0) { - if (errno != EINTR) { break; } - continue; - } - if (r == 0) { break; } - -- n -= (size_t)r; -+ n -= r, k += r; - } - if (n > 0) { break; } - } -@@ -77,8 +78,8 @@ FILE *fopencookie(void *cookie, const char *mode, struct cookie_io_functions_t i - - switch (mode[0]) { - case 'a': -- case 'r': rd = 1; break; - case 'w': wr = 1; break; -+ case 'r': rd = 1; break; - default: - errno = EINVAL; - return NULL; -diff --git a/ext/solv_xfopen_fallback_fopencookie.h b/ext/solv_xfopen_fallback_fopencookie.h -index 6a7bfee..7223e3f 100644 ---- a/ext/solv_xfopen_fallback_fopencookie.h -+++ b/ext/solv_xfopen_fallback_fopencookie.h -@@ -1,13 +1,13 @@ --/* -+/* - * Provides a very limited fopencookie() for environments with a libc - * that lacks it. -- * -- * Author: zhasha -+ * -+ * Authors: zhasha & nsz - * Modified for libsolv by Neal Gompa -- * -+ * - * This program is licensed under the BSD license, read LICENSE.BSD - * for further information. -- * -+ * - */ - - #ifndef SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H --- -2.4.0 - -- cgit 1.2.3-korg