From 4c7e012637cf8bc7072cfe19c4c5fba4fe7a6861 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 6 Mar 2024 07:42:18 -0800 Subject: nghttp2: upgrade 1.59.0 -> 1.60.0 Drop patch as issue addressed upstream. (From OE-Core rev: b6b337c68fa27a359db6efbedf492ca0cb9d9234) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-fetch-ocsp-response-use-python3.patch | 27 ------------------- meta/recipes-support/nghttp2/nghttp2_1.59.0.bb | 31 ---------------------- meta/recipes-support/nghttp2/nghttp2_1.60.0.bb | 28 +++++++++++++++++++ 3 files changed, 28 insertions(+), 58 deletions(-) delete mode 100644 meta/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch delete mode 100644 meta/recipes-support/nghttp2/nghttp2_1.59.0.bb create mode 100644 meta/recipes-support/nghttp2/nghttp2_1.60.0.bb 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 e4db09638f..0000000000 --- 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?= -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 ---- - 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.59.0.bb deleted file mode 100644 index fa0013ca9c..0000000000 --- a/meta/recipes-support/nghttp2/nghttp2_1.59.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "HTTP/2 C Library and tools" -HOMEPAGE = "https://nghttp2.org/" -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" - -inherit cmake manpages python3native github-releases -PACKAGECONFIG[manpages] = "" - -# examples are never installed, and don't need to be built in the -# first place -EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF -DENABLE_PYTHON_BINDINGS=OFF" - -PACKAGES =+ "lib${BPN} ${PN}-proxy " - -RDEPENDS:${PN} = "${PN}-proxy (>= ${PV})" -RDEPENDS:${PN}:class-native = "" -RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell" - -ALLOW_EMPTY:${PN} = "1" -FILES:${PN} = "" -FILES:lib${BPN} = "${libdir}/*${SOLIBS}" -FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/nghttp2/nghttp2_1.60.0.bb b/meta/recipes-support/nghttp2/nghttp2_1.60.0.bb new file mode 100644 index 0000000000..cf62c32d8b --- /dev/null +++ b/meta/recipes-support/nghttp2/nghttp2_1.60.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "HTTP/2 C Library and tools" +HOMEPAGE = "https://nghttp2.org/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" + +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/nghttp2-${PV}.tar.xz" +SRC_URI[sha256sum] = "625d6c3da1d9ca4fd643a638256431ae68fd1901653b2a61a245eea7b261bf4e" + +inherit cmake manpages python3native github-releases +PACKAGECONFIG[manpages] = "" + +# examples are never installed, and don't need to be built in the +# first place +EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF -DENABLE_PYTHON_BINDINGS=OFF" + +PACKAGES =+ "lib${BPN} ${PN}-proxy " + +RDEPENDS:${PN} = "${PN}-proxy (>= ${PV})" +RDEPENDS:${PN}:class-native = "" +RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell" + +ALLOW_EMPTY:${PN} = "1" +FILES:${PN} = "" +FILES:lib${BPN} = "${libdir}/*${SOLIBS}" +FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf