From defdca82c107f46e980c84bffb1b2c1263522fa0 Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Wed, 23 Jun 2021 16:18:49 -0700 Subject: Update to internal 0.57 Signed-off-by: Jason M. Bills --- ...001-Force-nbdkit-to-send-PATCH-as-upload-method.patch | 8 ++++---- .../nbdkit/nbdkit/0002-Add-support-for-ssl-config.patch | 16 ++++++++-------- .../meta-common/recipes-utilities/nbdkit/nbdkit_git.bb | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'meta-openbmc-mods/meta-common/recipes-utilities') diff --git a/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0001-Force-nbdkit-to-send-PATCH-as-upload-method.patch b/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0001-Force-nbdkit-to-send-PATCH-as-upload-method.patch index 83f015a76..dc7f7b924 100644 --- a/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0001-Force-nbdkit-to-send-PATCH-as-upload-method.patch +++ b/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0001-Force-nbdkit-to-send-PATCH-as-upload-method.patch @@ -23,7 +23,7 @@ diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c index 0ed3984..804ad78 100644 --- a/plugins/curl/curl.c +++ b/plugins/curl/curl.c -@@ -525,6 +525,7 @@ static int +@@ -787,6 +787,7 @@ static int curl_pwrite (void *handle, const void *buf, uint32_t count, uint64_t offset) { struct curl_handle *h = handle; @@ -31,10 +31,10 @@ index 0ed3984..804ad78 100644 CURLcode r; char range[128]; -@@ -535,15 +536,21 @@ curl_pwrite (void *handle, const void *buf, uint32_t count, uint64_t offset) +@@ -800,15 +801,21 @@ curl_pwrite (void *handle, const void *buf, uint32_t count, uint64_t offset) h->read_count = count; - curl_easy_setopt (h->c, CURLOPT_UPLOAD, 1); + curl_easy_setopt (h->c, CURLOPT_UPLOAD, 1L); + curl_easy_setopt (h->c, CURLOPT_CUSTOMREQUEST, "PATCH"); /* Make an HTTP range request. */ @@ -55,7 +55,7 @@ index 0ed3984..804ad78 100644 display_curl_error (h, r, "pwrite: curl_easy_perform"); return -1; } -@@ -554,6 +561,10 @@ curl_pwrite (void *handle, const void *buf, uint32_t count, uint64_t offset) +@@ -819,6 +826,10 @@ curl_pwrite (void *handle, const void *buf, uint32_t count, uint64_t offset) /* As far as I understand the cURL API, this should never happen. */ assert (h->read_count == 0); diff --git a/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0002-Add-support-for-ssl-config.patch b/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0002-Add-support-for-ssl-config.patch index c597cb3a4..cec2813e9 100644 --- a/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0002-Add-support-for-ssl-config.patch +++ b/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0002-Add-support-for-ssl-config.patch @@ -3,14 +3,14 @@ index 610511f7..92be4656 100644 --- a/plugins/curl/curl.c +++ b/plugins/curl/curl.c @@ -69,6 +69,8 @@ static const char *proxy = NULL; - static char *proxy_password = NULL; - static const char *proxy_user = NULL; - static bool sslverify = true; -+static const char *ssl_version = NULL; -+static const char *ssl_cipher_list = NULL; - static bool tcp_keepalive = false; - static bool tcp_nodelay = true; - static uint32_t timeout = 0; + char *proxy_password = NULL; + const char *proxy_user = NULL; + bool sslverify = true; ++const char *ssl_version = NULL; ++const char *ssl_cipher_list = NULL; + bool tcp_keepalive = false; + bool tcp_nodelay = true; + uint32_t timeout = 0; @@ -232,6 +234,12 @@ curl_config (const char *key, const char *value) sslverify = r; } diff --git a/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit_git.bb b/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit_git.bb index 01b3fc27e..89072b090 100644 --- a/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit_git.bb @@ -7,14 +7,14 @@ nbdkit is a toolkit for creating NBD servers." HOMEPAGE = "https://github.com/libguestfs/nbdkit" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4332a97808994cf2133a65b6c6f33eaf" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9dcc2d8acdde215fa4bd6ac12bb14f0" SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https" SRC_URI += "file://0001-Force-nbdkit-to-send-PATCH-as-upload-method.patch" SRC_URI += "file://0002-Add-support-for-ssl-config.patch" -PV = "1.17.5+git${SRCPV}" -SRCREV = "c8406880c6603bb617dae131dd0a8826c05869ca" +PV = "1.25.5+git${SRCPV}" +SRCREV = "c828c6d48ff6b69454cad98054a1920d03c4b4c7" S = "${WORKDIR}/git" -- cgit v1.2.3