From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 6 Mar 2024 15:42:18 +0000 (-0800)
Subject: nghttp2: upgrade 1.59.0 -> 1.60.0
X-Git-Tag: 2024-04-scarthgap~211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6b337c68fa27a359db6efbedf492ca0cb9d9234;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

nghttp2: upgrade 1.59.0 -> 1.60.0

Drop patch as issue addressed upstream.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch b/meta/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch
deleted file mode 100644
index e4db09638f8..00000000000
--- a/meta/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 73ec79432fc557a8be4f1500982b1c0f5fdf12a9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
-Date: Thu, 7 Nov 2019 09:58:52 +0000
-Subject: [PATCH] fetch-ocsp-response: use python3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [oe specific]
-Signed-off-by: André Draszik <git@andred.net>
----
- script/fetch-ocsp-response | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/script/fetch-ocsp-response b/script/fetch-ocsp-response
-index 0ff7461..185116b 100755
---- a/script/fetch-ocsp-response
-+++ b/script/fetch-ocsp-response
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- # nghttp2 - HTTP/2 C Library
--- 
-2.23.0.rc1
-
diff --git a/meta/recipes-support/nghttp2/nghttp2_1.59.0.bb b/meta/recipes-support/nghttp2/nghttp2_1.60.0.bb
similarity index 79%
rename from meta/recipes-support/nghttp2/nghttp2_1.59.0.bb
rename to meta/recipes-support/nghttp2/nghttp2_1.60.0.bb
index fa0013ca9c2..cf62c32d8b8 100644
--- a/meta/recipes-support/nghttp2/nghttp2_1.59.0.bb
+++ b/meta/recipes-support/nghttp2/nghttp2_1.60.0.bb
@@ -4,11 +4,8 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec"
 
-SRC_URI = "\
-    ${GITHUB_BASE_URI}/download/v${PV}/nghttp2-${PV}.tar.xz \
-    file://0001-fetch-ocsp-response-use-python3.patch \
-"
-SRC_URI[sha256sum] = "fdc9bd71f5cf8d3fdfb63066b89364c10eb2fdeab55f3c6755cd7917b2ec4ffb"
+SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/nghttp2-${PV}.tar.xz"
+SRC_URI[sha256sum] = "625d6c3da1d9ca4fd643a638256431ae68fd1901653b2a61a245eea7b261bf4e"
 
 inherit cmake manpages python3native github-releases
 PACKAGECONFIG[manpages] = ""