basesystem-jjsandbox/ToshikazuOhiwa/master-jj

recipes

9 files changed, 0 insertions, 821 deletions

diff --git a/external/poky/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch b/external/poky/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch
deleted file mode 100644
index e5cb60dd..00000000
--- a/external/poky/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From 47c6f1b4332a9e4935c48cca826786a6b8fe6f59 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?=
- <ngompa13@gmail.com>
-Date: Wed, 11 Nov 2015 20:32:17 -0500
-Subject: [PATCH 1/2] Add fallback fopencookie() implementation
-
-In environments where neither fopencookie() nor funopen()
-are implemented, we need to provide a suitable implementation
-of fopencookie() that we can use.
-
-Alex Kanavin: rebased CMakeLists.txt change to apply to latest upstream code.
-
-Upstream-Status: Denied [https://github.com/openSUSE/libsolv/pull/112]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- ext/CMakeLists.txt                     |   7 ++
- ext/solv_xfopen.c                      |  10 +--
- ext/solv_xfopen_fallback_fopencookie.c | 123 +++++++++++++++++++++++++++++++++
- ext/solv_xfopen_fallback_fopencookie.h |  28 ++++++++
- 4 files changed, 164 insertions(+), 4 deletions(-)
- create mode 100644 ext/solv_xfopen_fallback_fopencookie.c
- create mode 100644 ext/solv_xfopen_fallback_fopencookie.h
-
-diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
-index b8917a2..fac6c32 100644
---- a/ext/CMakeLists.txt
-+++ b/ext/CMakeLists.txt
-@@ -4,6 +4,13 @@ SET (libsolvext_SRCS
- SET (libsolvext_HEADERS
-     tools_util.h solv_xfopen.h testcase.h)
- 
-+IF (NOT HAVE_FOPENCOOKIE AND NOT HAVE_FUNOPEN)
-+    SET (libsolvext_SRCS ${libsolvext_SRCS}
-+        solv_xfopen_fallback_fopencookie.c)
-+    SET (libsolvext_HEADERS ${libsolvext_HEADERS}
-+        solv_xfopen_fallback_fopencookie.h)
-+ENDIF (NOT HAVE_FOPENCOOKIE AND NOT HAVE_FUNOPEN)
-+
- IF (ENABLE_RPMDB OR ENABLE_RPMPKG)
-     SET (libsolvext_SRCS ${libsolvext_SRCS}
-         pool_fileconflicts.c repo_rpmdb.c)
-diff --git a/ext/solv_xfopen.c b/ext/solv_xfopen.c
-index 2c64bb6..eb3a3ad 100644
---- a/ext/solv_xfopen.c
-+++ b/ext/solv_xfopen.c
-@@ -12,6 +12,10 @@
- #include <string.h>
- #include <fcntl.h>
- 
-+#if !defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE)
-+#include "solv_xfopen_fallback_fopencookie.h"
-+#endif
-+
- #include "solv_xfopen.h"
- #include "util.h"
- 
-@@ -21,7 +25,7 @@ static FILE *cookieopen(void *cookie, const char *mode,
- 	ssize_t (*cwrite)(void *, const char *, size_t),
- 	int (*cclose)(void *))
- {
--#ifdef HAVE_FUNOPEN
-+#if defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE)
-   if (!cookie)
-     return 0;
-   return funopen(cookie,
-@@ -30,7 +34,7 @@ static FILE *cookieopen(void *cookie, const char *mode,
-       (fpos_t (*)(void *, fpos_t, int))NULL,					/* seekfn */
-       cclose
-       );
--#elif defined(HAVE_FOPENCOOKIE)
-+#else
-   cookie_io_functions_t cio;
- 
-   if (!cookie)
-@@ -42,8 +46,6 @@ static FILE *cookieopen(void *cookie, const char *mode,
-     cio.write = cwrite;
-   cio.close = cclose;
-   return  fopencookie(cookie, *mode == 'w' ? "w" : "r", cio);
--#else
--# error Need to implement custom I/O
- #endif
- }
- 
-diff --git a/ext/solv_xfopen_fallback_fopencookie.c b/ext/solv_xfopen_fallback_fopencookie.c
-new file mode 100644
-index 0000000..0ce2571
---- /dev/null
-+++ b/ext/solv_xfopen_fallback_fopencookie.c
-@@ -0,0 +1,123 @@
-+/* 
-+ *	Provides a very limited fopencookie() for environments with a libc
-+ *	that lacks it.
-+ *	
-+ *	Author: zhasha
-+ *	Modified for libsolv by Neal Gompa
-+ *	
-+ *	This program is licensed under the BSD license, read LICENSE.BSD
-+ *	for further information.
-+ *
-+ */
-+
-+#define _LARGEFILE64_SOURCE 1
-+#include <pthread.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <sys/types.h>
-+#include <errno.h>
-+#include "solv_xfopen_fallback_fopencookie.h"
-+
-+extern int pipe2(int[2], int);
-+
-+struct ctx {
-+    int fd;
-+    void *cookie;
-+    struct cookie_io_functions_t io;
-+    char buf[1024];
-+};
-+
-+static void *proxy(void *arg)
-+{
-+    struct ctx *ctx = arg;
-+    ssize_t r;
-+    size_t n;
-+
-+    pthread_detach(pthread_self());
-+
-+    while (1) {
-+        r = ctx->io.read ?
-+            (ctx->io.read)(ctx->cookie, ctx->buf, sizeof(ctx->buf)) :
-+            read(ctx->fd, ctx->buf, sizeof(ctx->buf));
-+        if (r < 0) {
-+            if (errno != EINTR) { break; }
-+            continue;
-+        }
-+        if (r == 0) { break; }
-+
-+        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);
-+            if (r < 0) {
-+                if (errno != EINTR) { break; }
-+                continue;
-+            }
-+            if (r == 0) { break; }
-+
-+            n -= (size_t)r;
-+        }
-+        if (n > 0) { break; }
-+    }
-+
-+    if (ctx->io.close) { (ctx->io.close)(ctx->cookie); }
-+    close(ctx->fd);
-+    return NULL;
-+}
-+
-+FILE *fopencookie(void *cookie, const char *mode, struct cookie_io_functions_t io)
-+{
-+    struct ctx *ctx = NULL;
-+    int rd = 0, wr = 0;
-+    int p[2] = { -1, -1 };
-+    FILE *f = NULL;
-+    pthread_t dummy;
-+
-+    switch (mode[0]) {
-+        case 'a':
-+        case 'r': rd = 1; break;
-+        case 'w': wr = 1; break;
-+        default:
-+            errno = EINVAL;
-+            return NULL;
-+    }
-+    switch (mode[1]) {
-+        case '\0': break;
-+        case '+':
-+            if (mode[2] == '\0') {
-+                errno = ENOTSUP;
-+                return NULL;
-+            }
-+        default:
-+            errno = EINVAL;
-+            return NULL;
-+    }
-+    if (io.seek) {
-+        errno = ENOTSUP;
-+        return NULL;
-+    }
-+
-+    ctx = malloc(sizeof(*ctx));
-+    if (!ctx) { return NULL; }
-+    if (pipe2(p, O_CLOEXEC) != 0) { goto err; }
-+    if ((f = fdopen(p[wr], mode)) == NULL) { goto err; }
-+    p[wr] = -1;
-+    ctx->fd = p[rd];
-+    ctx->cookie = cookie;
-+    ctx->io.read = rd ? io.read : NULL;
-+    ctx->io.write = wr ? io.write : NULL;
-+    ctx->io.seek = NULL;
-+    ctx->io.close = io.close;
-+    if (pthread_create(&dummy, NULL, proxy, ctx) != 0) { goto err; }
-+
-+    return f;
-+
-+err:
-+    if (p[0] >= 0) { close(p[0]); }
-+    if (p[1] >= 0) { close(p[1]); }
-+    if (f) { fclose(f); }
-+    free(ctx);
-+    return NULL;
-+}
-diff --git a/ext/solv_xfopen_fallback_fopencookie.h b/ext/solv_xfopen_fallback_fopencookie.h
-new file mode 100644
-index 0000000..6a7bfee
---- /dev/null
-+++ b/ext/solv_xfopen_fallback_fopencookie.h
-@@ -0,0 +1,28 @@
-+/* 
-+ *	Provides a very limited fopencookie() for environments with a libc
-+ *	that lacks it.
-+ *	
-+ *	Author: zhasha
-+ *	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
-+#define SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H
-+
-+#include <stdio.h>
-+#include <stdint.h>
-+
-+typedef struct cookie_io_functions_t {
-+    ssize_t (*read)(void *, char *, size_t);
-+    ssize_t (*write)(void *, const char *, size_t);
-+    int (*seek)(void *, off64_t, int);
-+    int (*close)(void *);
-+} cookie_io_functions_t;
-+
-+FILE *fopencookie(void *cookie, const char *mode, struct cookie_io_functions_t io);
-+
-+#endif
--- 
-2.4.0
-
diff --git a/external/poky/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch b/external/poky/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch
deleted file mode 100644
index 93b8cc9c..00000000
--- a/external/poky/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?=
- <ngompa13@gmail.com>
-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 <alex.kanavin@gmail.com>
-
----
- 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
-
diff --git a/external/poky/meta/recipes-extended/libsolv/libsolv/0003-Fix-Dereference-of-null-pointer.patch b/external/poky/meta/recipes-extended/libsolv/libsolv/0003-Fix-Dereference-of-null-pointer.patch
deleted file mode 100644
index b10fd827..00000000
--- a/external/poky/meta/recipes-extended/libsolv/libsolv/0003-Fix-Dereference-of-null-pointer.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fcd9e3aba122a220af617a802c4f47bad4b51e64 Mon Sep 17 00:00:00 2001
-From: Jaroslav Rohel <jrohel@redhat.com>
-Date: Fri, 7 Dec 2018 07:05:10 +0100
-Subject: [PATCH] Fix: Dereference of null pointer
-Reply-To: muislam@microsoft.com
-CVE: CVE-2018-20532 CVE-2018-20533 CVE-2018-20534
-
-Upstream-Status: Backport
-
-Signed-off-by: Muminul Islam <muislam@microsoft.com>
-
-Cherry picked from  https://github.com/openSUSE/libsolv/pull/291/commits
-
----
- ext/repo_repomdxml.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/repo_repomdxml.c b/ext/repo_repomdxml.c
-index 760d481f..b2a5b8dd 100644
---- a/ext/repo_repomdxml.c
-+++ b/ext/repo_repomdxml.c
-@@ -181,7 +181,7 @@ startElement(struct solv_xmlparser *xmlp, int state, const char *name, const cha
-             while (value)
- 	      {
- 		char *p = strchr(value, ',');
--		if (*p)
-+		if (p)
- 		  *p++ = 0;
- 		if (*value)
- 		  repodata_add_poolstr_array(pd->data, SOLVID_META, REPOSITORY_UPDATES, value);
--- 
-2.23.0
-
diff --git a/external/poky/meta/recipes-extended/libsolv/libsolv/0004-Fix-Add-va_end-before-return.patch b/external/poky/meta/recipes-extended/libsolv/libsolv/0004-Fix-Add-va_end-before-return.patch
deleted file mode 100644
index fde19940..00000000
--- a/external/poky/meta/recipes-extended/libsolv/libsolv/0004-Fix-Add-va_end-before-return.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 58053b44c9ed043d48fa7dd595d213849b733f0f Mon Sep 17 00:00:00 2001
-From: Jaroslav Rohel <jrohel@redhat.com>
-Date: Tue, 11 Dec 2018 09:50:06 +0100
-Subject: [PATCH] Fix: Add va_end() before return
-Reply-To: muislam@microsoft.com
-
-The va_end() performs cleanup.
-If va_end() is not called before a function that calls va_start() returns,
-the behavior is undefined.
-
-CVE: CVE-2018-20532 CVE-2018-20533 CVE-2018-20534
-
-Upstream-Status: Backport
-
-Signed-off-by: Muminul Islam <muislam@microsoft.com>
-
-Cherry picked from  https://github.com/openSUSE/libsolv/pull/291/commits
----
- src/pool.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/pool.c b/src/pool.c
-index 60cc0f49..f03b43f9 100644
---- a/src/pool.c
-+++ b/src/pool.c
-@@ -1505,6 +1505,7 @@ pool_debug(Pool *pool, int type, const char *format, ...)
-         vprintf(format, args);
-       else
-         vfprintf(stderr, format, args);
-+      va_end(args);
-       return;
-     }
-   vsnprintf(buf, sizeof(buf), format, args);
--- 
-2.23.0
-
diff --git a/external/poky/meta/recipes-extended/libsolv/libsolv/0005-Fix-Memory-leaks.patch b/external/poky/meta/recipes-extended/libsolv/libsolv/0005-Fix-Memory-leaks.patch
deleted file mode 100644
index 85398a82..00000000
--- a/external/poky/meta/recipes-extended/libsolv/libsolv/0005-Fix-Memory-leaks.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 6c99f33252d8bf8ff3e49013b8ad78aacf71c5d8 Mon Sep 17 00:00:00 2001
-From: Jaroslav Rohel <jrohel@redhat.com>
-Date: Tue, 11 Dec 2018 10:14:04 +0100
-Subject: [PATCH] Fix: Memory leaks
-Reply-To: muislam@microsoft.com
-
-CVE: CVE-2018-20532 CVE-2018-20533 CVE-2018-20534
-
-Upstream-Status: Backport
-
-Signed-off-by: Muminul Islam <muislam@microsoft.com>
-
-Cherry picked from  https://github.com/openSUSE/libsolv/pull/291/commits
----
- ext/repo_rpmdb.c  | 16 ++++++++++++++++
- ext/testcase.c    |  4 ++++
- tools/repo2solv.c |  1 +
- 3 files changed, 21 insertions(+)
-
-diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c
-index 75bb6780..ff939978 100644
---- a/ext/repo_rpmdb.c
-+++ b/ext/repo_rpmdb.c
-@@ -1939,6 +1939,8 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags)
-   if (fread(lead, 96 + 16, 1, fp) != 1 || getu32(lead) != 0xedabeedb)
-     {
-       pool_error(pool, -1, "%s: not a rpm", rpm);
-+      solv_chksum_free(leadsigchksumh, NULL);
-+      solv_chksum_free(chksumh, NULL);
-       fclose(fp);
-       return 0;
-     }
-@@ -1951,12 +1953,16 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags)
-   if (lead[78] != 0 || lead[79] != 5)
-     {
-       pool_error(pool, -1, "%s: not a rpm v5 header", rpm);
-+      solv_chksum_free(leadsigchksumh, NULL);
-+      solv_chksum_free(chksumh, NULL);
-       fclose(fp);
-       return 0;
-     }
-   if (getu32(lead + 96) != 0x8eade801)
-     {
-       pool_error(pool, -1, "%s: bad signature header", rpm);
-+      solv_chksum_free(leadsigchksumh, NULL);
-+      solv_chksum_free(chksumh, NULL);
-       fclose(fp);
-       return 0;
-     }
-@@ -1965,6 +1971,8 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags)
-   if (sigcnt >= MAX_SIG_CNT || sigdsize >= MAX_SIG_DSIZE)
-     {
-       pool_error(pool, -1, "%s: bad signature header", rpm);
-+      solv_chksum_free(leadsigchksumh, NULL);
-+      solv_chksum_free(chksumh, NULL);
-       fclose(fp);
-       return 0;
-     }
-@@ -1975,6 +1983,8 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags)
-     {
-       if (!headfromfp(&state, rpm, fp, lead + 96, sigcnt, sigdsize, sigpad, chksumh, leadsigchksumh))
- 	{
-+      solv_chksum_free(leadsigchksumh, NULL);
-+      solv_chksum_free(chksumh, NULL);
- 	  fclose(fp);
- 	  return 0;
- 	}
-@@ -2014,6 +2024,8 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags)
- 	  if (fread(lead, l, 1, fp) != 1)
- 	    {
- 	      pool_error(pool, -1, "%s: unexpected EOF", rpm);
-+          solv_chksum_free(leadsigchksumh, NULL);
-+          solv_chksum_free(chksumh, NULL);
- 	      fclose(fp);
- 	      return 0;
- 	    }
-@@ -2034,6 +2046,7 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags)
-   if (fread(lead, 16, 1, fp) != 1)
-     {
-       pool_error(pool, -1, "%s: unexpected EOF", rpm);
-+      solv_chksum_free(chksumh, NULL);
-       fclose(fp);
-       return 0;
-     }
-@@ -2042,6 +2055,7 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags)
-   if (getu32(lead) != 0x8eade801)
-     {
-       pool_error(pool, -1, "%s: bad header", rpm);
-+      solv_chksum_free(chksumh, NULL);
-       fclose(fp);
-       return 0;
-     }
-@@ -2050,6 +2064,7 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags)
-   if (sigcnt >= MAX_HDR_CNT || sigdsize >= MAX_HDR_DSIZE)
-     {
-       pool_error(pool, -1, "%s: bad header", rpm);
-+      solv_chksum_free(chksumh, NULL);
-       fclose(fp);
-       return 0;
-     }
-@@ -2057,6 +2072,7 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags)
- 
-   if (!headfromfp(&state, rpm, fp, lead, sigcnt, sigdsize, 0, chksumh, 0))
-     {
-+      solv_chksum_free(chksumh, NULL);
-       fclose(fp);
-       return 0;
-     }
-diff --git a/ext/testcase.c b/ext/testcase.c
-index aa72a8d7..3901d90d 100644
---- a/ext/testcase.c
-+++ b/ext/testcase.c
-@@ -2348,6 +2348,7 @@ testcase_write_mangled(Solver *solv, const char *dir, int resultflags, const cha
- 	  if (fclose(fp))
- 	    {
- 	      pool_error(solv->pool, 0, "testcase_write: write error");
-+	      solv_free(result);
- 	      strqueue_free(&sq);
- 	      return 0;
- 	    }
-@@ -2360,12 +2361,14 @@ testcase_write_mangled(Solver *solv, const char *dir, int resultflags, const cha
-   if (!(fp = fopen(out, "w")))
-     {
-       pool_error(solv->pool, 0, "testcase_write: could not open '%s' for writing", out);
-+      solv_free(cmd);
-       strqueue_free(&sq);
-       return 0;
-     }
-   if (*cmd && fwrite(cmd, strlen(cmd), 1, fp) != 1)
-     {
-       pool_error(solv->pool, 0, "testcase_write: write error");
-+      solv_free(cmd);
-       strqueue_free(&sq);
-       fclose(fp);
-       return 0;
-@@ -2373,6 +2376,7 @@ testcase_write_mangled(Solver *solv, const char *dir, int resultflags, const cha
-   if (fclose(fp))
-     {
-       pool_error(solv->pool, 0, "testcase_write: write error");
-+      solv_free(cmd);
-       strqueue_free(&sq);
-       return 0;
-     }
-diff --git a/tools/repo2solv.c b/tools/repo2solv.c
-index e055e408..30a41f42 100644
---- a/tools/repo2solv.c
-+++ b/tools/repo2solv.c
-@@ -208,6 +208,7 @@ read_plaindir_repo(Repo *repo, const char *dir)
- 	repodata_set_location(data, p, 0, 0, bp[0] == '.' && bp[1] == '/' ? bp + 2 : bp);
-       solv_free(rpm);
-     }
-+  solv_free(buf);
-   fclose(fp);
-   while (waitpid(pid, &wstatus, 0) == -1)
-     {
--- 
-2.23.0
-
diff --git a/external/poky/meta/recipes-extended/libsolv/libsolv/0006-Fix-testsolv-segfault.patch b/external/poky/meta/recipes-extended/libsolv/libsolv/0006-Fix-testsolv-segfault.patch
deleted file mode 100644
index 559aefb1..00000000
--- a/external/poky/meta/recipes-extended/libsolv/libsolv/0006-Fix-testsolv-segfault.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 823bf65087a017d2f488f01e09ee284fa36f7446 Mon Sep 17 00:00:00 2001
-From: Jaroslav Rohel <jrohel@redhat.com>
-Date: Tue, 11 Dec 2018 10:22:09 +0100
-Subject: [PATCH] Fix: testsolv segfault
-Reply-To: muislam@microsoft.com
-
-ERROR: AddressSanitizer: SEGV on unknown address 0x000000000000 (pc 0x7fab0e11bf2b bp 0x7ffdfc044b70 sp 0x7ffdfc044a90 T0)
-0 0x7fab0e11bf2a in testcase_str2dep_complex /home/company/real_sanitize/libsolv-master/ext/testcase.c:577
-1 0x7fab0e11c80f in testcase_str2dep /home/company/real_sanitize/libsolv-master/ext/testcase.c:656
-2 0x7fab0e12e64a in testcase_read /home/company/real_sanitize/libsolv-master/ext/testcase.c:2952
-3 0x402aa5 in main /home/company/real_sanitize/libsolv-master/tools/testsolv.c:148
-4 0x7fab0d9d2a3f in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x20a3f)
-5 0x401bb8 in _start (/home/company/real_sanitize/libsolv-master/build/install/bin/testsolv+0x401bb8)
-
-CVE: CVE-2018-20532 CVE-2018-20533 CVE-2018-20534
-
-Upstream-Status: Backport
-
-Signed-off-by: Muminul Islam <muislam@microsoft.com>
-
-Cherry picked from  https://github.com/openSUSE/libsolv/pull/291/commits
----
- ext/testcase.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ext/testcase.c b/ext/testcase.c
-index 3901d90d..dd20de14 100644
---- a/ext/testcase.c
-+++ b/ext/testcase.c
-@@ -571,6 +571,8 @@ testcase_str2dep_complex(Pool *pool, const char **sp, int relop)
-   Id flags, id, id2, namespaceid = 0;
-   struct oplist *op;
- 
-+  if (!s)
-+    return 0;
-   while (*s == ' ' || *s == '\t')
-     s++;
-   if (!strncmp(s, "namespace:", 10))
--- 
-2.23.0
-
diff --git a/external/poky/meta/recipes-extended/libsolv/libsolv/0007-Fix-testsolv-segfaults.patch b/external/poky/meta/recipes-extended/libsolv/libsolv/0007-Fix-testsolv-segfaults.patch
deleted file mode 100644
index 5c13ce5e..00000000
--- a/external/poky/meta/recipes-extended/libsolv/libsolv/0007-Fix-testsolv-segfaults.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 43928ee565b9c4f69daa1875da66f92b2d5bf932 Mon Sep 17 00:00:00 2001
-From: Jaroslav Rohel <jrohel@redhat.com>
-Date: Tue, 11 Dec 2018 10:27:15 +0100
-Subject: [PATCH] Fix: testsolv segfaults
-Reply-To: muislam@microsoft.com
-
-ERROR: AddressSanitizer: SEGV on unknown address 0x0000000002f0 (pc 0x7f31501d3bd2 bp 0x7ffcfe4d4a50 sp 0x7ffcfe4d4a30 T0)
-0 0x7f31501d3bd1 in pool_whatprovides /home/company/real_sanitize/libsolv-master/src/pool.h:331
-1 0x7f31501d895e in testcase_str2solvid /home/company/real_sanitize/libsolv-master/ext/testcase.c:793
-2 0x7f31501e8388 in testcase_read /home/company/real_sanitize/libsolv-master/ext/testcase.c:2807
-3 0x402aa5 in main /home/company/real_sanitize/libsolv-master/tools/testsolv.c:148
-4 0x7f314fa8da3f in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x20a3f)
-5 0x401bb8 in _start (/home/company/real_sanitize/libsolv-master/build/install/bin/testsolv+0x401bb8)
-
-ERROR: AddressSanitizer: SEGV on unknown address 0x000000000000 (pc 0x7f5af9e7815f bp 0x7ffc4c843a40 sp 0x7ffc4c8436c0 T0)
-0 0x7f5af9e7815e in testcase_read /home/company/real_sanitize/libsolv-master/ext/testcase.c:2799
-1 0x402aa5 in main /home/company/real_sanitize/libsolv-master/tools/testsolv.c:148
-2 0x7f5af971da3f in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x20a3f)
-3 0x401bb8 in _start (/home/company/real_sanitize/libsolv-master/build/install/bin/testsolv+0x401bb8)
-
-CVE: CVE-2018-20532 CVE-2018-20533 CVE-2018-20534
-
-Upstream-Status: Backport
-
-Signed-off-by: Muminul Islam <muislam@microsoft.com>
-
-Cherry picked from  https://github.com/openSUSE/libsolv/pull/291/commits
----
- ext/testcase.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/testcase.c b/ext/testcase.c
-index dd20de14..83467fe2 100644
---- a/ext/testcase.c
-+++ b/ext/testcase.c
-@@ -2772,7 +2772,7 @@ testcase_read(Pool *pool, FILE *fp, const char *testcase, Queue *job, char **res
- 	{
- 	  int i = strlen(pieces[1]);
- 	  s = strchr(pieces[1], '(');
--	  if (!s && pieces[1][i - 1] != ')')
-+	  if (!s || pieces[1][i - 1] != ')')
- 	    {
- 	      pool_error(pool, 0, "testcase_read: bad namespace '%s'", pieces[1]);
- 	    }
--- 
-2.23.0
-
diff --git a/external/poky/meta/recipes-extended/libsolv/libsolv/0008-Fix-Be-sure-that-NONBLOCK-is-set.patch b/external/poky/meta/recipes-extended/libsolv/libsolv/0008-Fix-Be-sure-that-NONBLOCK-is-set.patch
deleted file mode 100644
index fdea9dbd..00000000
--- a/external/poky/meta/recipes-extended/libsolv/libsolv/0008-Fix-Be-sure-that-NONBLOCK-is-set.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ebb51f73491987435664ac14b79bebe16ffbdd5c Mon Sep 17 00:00:00 2001
-From: Jaroslav Rohel <jrohel@redhat.com>
-Date: Tue, 11 Dec 2018 12:40:42 +0100
-Subject: [PATCH] Fix: Be sure that NONBLOCK is set
-Reply-To: muislam@microsoft.com
-
-CVE: CVE-2018-20532 CVE-2018-20533 CVE-2018-20534
-
-Upstream-Status: Backport
-
-Signed-off-by: Muminul Islam <muislam@microsoft.com>
-
-Cherry picked from  https://github.com/openSUSE/libsolv/pull/291/commits
----
- examples/solv/fastestmirror.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/examples/solv/fastestmirror.c b/examples/solv/fastestmirror.c
-index d2ebd97a..0ee4e73b 100644
---- a/examples/solv/fastestmirror.c
-+++ b/examples/solv/fastestmirror.c
-@@ -68,7 +68,11 @@ findfastest(char **urls, int nurls)
- 	  socks[i] = socket(result->ai_family, result->ai_socktype, result->ai_protocol);
- 	  if (socks[i] >= 0)
- 	    {
--	      fcntl(socks[i], F_SETFL, O_NONBLOCK);
-+	      if (fcntl(socks[i], F_SETFL, O_NONBLOCK) == -1)
-+            {
-+		      close(socks[i]);
-+		      socks[i] = -1;
-+            }
- 	      if (connect(socks[i], result->ai_addr, result->ai_addrlen) == -1)
- 		{
- 		  if (errno != EINPROGRESS)
--- 
-2.23.0
-
diff --git a/external/poky/meta/recipes-extended/libsolv/libsolv/0009-Don-t-set-values-that-are-never-read.patch b/external/poky/meta/recipes-extended/libsolv/libsolv/0009-Don-t-set-values-that-are-never-read.patch
deleted file mode 100644
index 8b4a993d..00000000
--- a/external/poky/meta/recipes-extended/libsolv/libsolv/0009-Don-t-set-values-that-are-never-read.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From edf87c92cf59c2eed9c1e33c51a47163da15d90b Mon Sep 17 00:00:00 2001
-From: Jaroslav Rohel <jrohel@redhat.com>
-Date: Tue, 11 Dec 2018 12:58:34 +0100
-Subject: [PATCH] Don't set values that are never read
-Reply-To: muislam@microsoft.com
-
-CVE: CVE-2018-20532 CVE-2018-20533 CVE-2018-20534
-
-Upstream-Status: Backport
-
-Signed-off-by: Muminul Islam <muislam@microsoft.com>
-
-Cherry picked from  https://github.com/openSUSE/libsolv/pull/291/commits
----
- ext/pool_fileconflicts.c | 1 -
- ext/repo_appdata.c       | 2 +-
- ext/repo_comps.c         | 2 +-
- src/cleandeps.c          | 1 -
- src/dirpool.c            | 2 +-
- src/order.c              | 1 -
- src/repopage.c           | 1 -
- 7 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/ext/pool_fileconflicts.c b/ext/pool_fileconflicts.c
-index eaeb52b2..2fd3d540 100644
---- a/ext/pool_fileconflicts.c
-+++ b/ext/pool_fileconflicts.c
-@@ -590,7 +590,6 @@ findfileconflicts_alias_cb(void *cbdatav, const char *fn, struct filelistinfo *i
- 
-   if (!info->dirlen)
-     return;
--  dp = fn + info->dirlen;
-   if (info->diridx != cbdata->lastdiridx)
-     {
-       cbdata->lastdiridx = info->diridx;
-diff --git a/ext/repo_appdata.c b/ext/repo_appdata.c
-index 62faf2d8..69d46386 100644
---- a/ext/repo_appdata.c
-+++ b/ext/repo_appdata.c
-@@ -103,7 +103,7 @@ startElement(struct solv_xmlparser *xmlp, int state, const char *name, const cha
- {
-   struct parsedata *pd = xmlp->userdata;
-   Pool *pool = pd->pool;
--  Solvable *s = pd->solvable;
-+  Solvable *s;
-   const char *type;
- 
-   /* ignore all language tags */
-diff --git a/ext/repo_comps.c b/ext/repo_comps.c
-index 255ecb16..e59f8d12 100644
---- a/ext/repo_comps.c
-+++ b/ext/repo_comps.c
-@@ -107,7 +107,7 @@ startElement(struct solv_xmlparser *xmlp, int state, const char *name, const cha
- {
-   struct parsedata *pd = xmlp->userdata;
-   Pool *pool = pd->pool;
--  Solvable *s = pd->solvable;
-+  Solvable *s;
- 
-   switch(state)
-     {
-diff --git a/src/cleandeps.c b/src/cleandeps.c
-index 1da28f6e..b2fde317 100644
---- a/src/cleandeps.c
-+++ b/src/cleandeps.c
-@@ -748,7 +748,6 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded)
- 	    continue;
- 	  if (strncmp(pool_id2str(pool, s->name), "pattern:", 8) != 0)
- 	    continue;
--	  dp = s->repo->idarraydata + s->requires;
- 	  for (dp = s->repo->idarraydata + s->requires; *dp; dp++)
- 	    FOR_PROVIDES(p, pp, *dp)
- 	      if (pool->solvables[p].repo == installed)
-diff --git a/src/dirpool.c b/src/dirpool.c
-index afb26ea5..bed9435e 100644
---- a/src/dirpool.c
-+++ b/src/dirpool.c
-@@ -85,7 +85,7 @@ dirpool_make_dirtraverse(Dirpool *dp)
-     return;
-   dp->dirs = solv_extend_resize(dp->dirs, dp->ndirs, sizeof(Id), DIR_BLOCK);
-   dirtraverse = solv_calloc_block(dp->ndirs, sizeof(Id), DIR_BLOCK);
--  for (parent = 0, i = 0; i < dp->ndirs; i++)
-+  for (i = 0; i < dp->ndirs; i++)
-     {
-       if (dp->dirs[i] > 0)
- 	continue;
-diff --git a/src/order.c b/src/order.c
-index c92c3328..cfde40c9 100644
---- a/src/order.c
-+++ b/src/order.c
-@@ -1066,7 +1066,6 @@ transaction_order(Transaction *trans, int flags)
- #if 0
- printf("do %s [%d]\n", pool_solvid2str(pool, te->p), temedianr[i]);
- #endif
--      s = pool->solvables + te->p;
-       for (j = te->edges; od.invedgedata[j]; j++)
- 	{
- 	  struct _TransactionElement *te2 = od.tes + od.invedgedata[j];
-diff --git a/src/repopage.c b/src/repopage.c
-index 2b7a863b..85d53eb9 100644
---- a/src/repopage.c
-+++ b/src/repopage.c
-@@ -399,7 +399,6 @@ match_done:
- 	      litlen -= 32;
- 	    }
- 	}
--      litofs = 0;
-     }
-   return oo;
- }
--- 
-2.23.0
-