From 874dc83b185c15e369295ff7bec64d1b6e09a764 Mon Sep 17 00:00:00 2001 From: zhang_wenyu1 Date: Wed, 13 Nov 2024 17:43:38 +0800 Subject: [PATCH 1/2] qpdf: add qpdf_%.bbappend 1. add qpdf_%.bbappend Signed-off-by: zhang_wenyu --- .oebuild/manifest.yaml | 4 +++- .../recipes-printing/qpdf/qpdf_%.bbappend | 22 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 meta-openeuler/recipes-printing/qpdf/qpdf_%.bbappend diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index affd147d326..82424cc2f2c 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -2187,4 +2187,6 @@ manifest_list: hipico_hardware_driver: remote_url: https://gitee.com/hieuler-pico/hardware_driver.git version: fb6b8fb7ec1d0ebfcc6f94602990fe4faf6d4fac - + qpdf: + remote_url: https://gitee.com/src-openeuler/qpdf.git + version: e8d3792a2ac45cabefa6c9f61d77b99a80896f2e diff --git a/meta-openeuler/recipes-printing/qpdf/qpdf_%.bbappend b/meta-openeuler/recipes-printing/qpdf/qpdf_%.bbappend new file mode 100644 index 00000000000..0832f363aac --- /dev/null +++ b/meta-openeuler/recipes-printing/qpdf/qpdf_%.bbappend @@ -0,0 +1,22 @@ +# main bb file: yocto-meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.6.3.bb + +PV = "11.1.0" + +DEPENDS = "zlib jpeg gnutls" + +SRC_URI:remove = "${SOURCEFORGE_MIRROR}/qpdf/qpdf-${PV}.tar.gz \ + " +SRC_URI:prepend = "file://${BPN}-${PV}.tar.gz \ + " +SRC_URI[sha256sum] = "34a7cf3ac6e239510e9a20d7cbe10a4aff0f572c20e0a9bed0badb820a69e22d" + +inherit cmake pkgconfig gettext + +EXTRA_OECMAKE = ' \ + -DRANDOM_DEVICE="/dev/random" \ + -DBUILD_STATIC_LIBS=OFF \ + -DALLOW_CRYPTO_NATIVE=OFF \ + -DUSE_IMPLICIT_CRYPTO=OFF \ + -DREQUIRE_CRYPTO_GNUTLS=1 \ + -DUSE_IMPLICIT_CRYPTO=0 \ +' -- Gitee From 6db089faef1960d2c616e57ed772e1752fa3923f Mon Sep 17 00:00:00 2001 From: zhang_wenyu1 Date: Wed, 13 Nov 2024 19:04:15 +0800 Subject: [PATCH 2/2] nginx: add nginx_%.bbappend 1. add nginx_%.bbappend Signed-off-by: zhang_wenyu --- .oebuild/manifest.yaml | 3 +++ .../recipes-httpd/nginx/nginx_%.bbappend | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 meta-openeuler/recipes-httpd/nginx/nginx_%.bbappend diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index 82424cc2f2c..a4adb4a83ff 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -2190,3 +2190,6 @@ manifest_list: qpdf: remote_url: https://gitee.com/src-openeuler/qpdf.git version: e8d3792a2ac45cabefa6c9f61d77b99a80896f2e + nginx: + remote_url: https://gitee.com/src-openeuler/nginx.git + version: 2c11f8b82f0372a2e6518b5bebb676416e42bca7 diff --git a/meta-openeuler/recipes-httpd/nginx/nginx_%.bbappend b/meta-openeuler/recipes-httpd/nginx/nginx_%.bbappend new file mode 100644 index 00000000000..13ca4eeb4b2 --- /dev/null +++ b/meta-openeuler/recipes-httpd/nginx/nginx_%.bbappend @@ -0,0 +1,21 @@ +# main bb: yocto-meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc + +PV = "1.23.3" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=175abb631c799f54573dc481454c8632" + +SRC_URI:remove = " \ + http://nginx.org/download/nginx-${PV}.tar.gz \ + file://0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch \ + file://nginx-fix-pidfile.patch \ + file://CVE-2021-3618.patch \ + file://CVE-2022-41741-CVE-2022-41742.patch \ +" + +SRC_URI:prepend = " \ + file://nginx-${PV}.tar.gz \ + file://nginx-auto-cc-gcc.patch \ + file://nginx-1.12.1-logs-perm.patch \ + file://nginx-fix-pidfile.patch \ +" + -- Gitee