[harknott 0/6] Patch review Nov 2nd

[harknott 0/6] Patch review Nov 2nd

[Armin Kuster]

Please have provie feedback by Thursday

The following changes since commit d378e4293d18e374f5d1494a88bfc3caee4d02df:

  postgresql: upgrade 13.3 -> 13.4 (2021-10-23 07:39:43 -0700)

are available in the Git repository at:

  git://git.openembedded.org/meta-openembedded-contrib stable/hardknott-nut
  http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/hardknott-nut

Armin Kuster (1):
  Apache: Several CVE fixes

Changqing Li (2):
  redis: fix sereval CVEs
  redis: upgrade 6.2.2 -> 6.2.6

Khem Raj (2):
  gst-shark: Define SRCREV_FORMAT
  android-tools: Define SRCREV_FORMAT

Richard Purdie (1):
  gattlib: Place pkgconfig file in correct package

 .../gstreamer-1.0/gst-shark_git.bb            |   2 +-
 .../gattlib/gattlib_git.bb                    |   2 +-
 .../android-tools/android-tools_5.1.1.r37.bb  |   1 +
 .../0001-src-Do-not-reset-FINAL_LIBS.patch    |  10 +-
 .../redis/redis/CVE-2021-32761.patch          | 257 ------------------
 .../redis/redis/fix-CVE-2021-29477.patch      |  35 ---
 .../redis/redis/fix-CVE-2021-29478.patch      |  42 ---
 .../redis/redis/fix-CVE-2021-32625.patch      |  61 -----
 .../redis/{redis_6.2.2.bb => redis_6.2.6.bb}  |   9 +-
 .../{apache2_2.4.49.bb => apache2_2.4.51.bb}  |   2 +-
 10 files changed, 10 insertions(+), 411 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/redis/redis/CVE-2021-32761.patch
 delete mode 100644 meta-oe/recipes-extended/redis/redis/fix-CVE-2021-29477.patch
 delete mode 100644 meta-oe/recipes-extended/redis/redis/fix-CVE-2021-29478.patch
 delete mode 100644 meta-oe/recipes-extended/redis/redis/fix-CVE-2021-32625.patch
 rename meta-oe/recipes-extended/redis/{redis_6.2.2.bb => redis_6.2.6.bb} (83%)
 rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.49.bb => apache2_2.4.51.bb} (99%)

-- 
2.25.1

[harknott 1/6] Apache: Several CVE fixes

[Armin Kuster]

From: Armin Kuster <akuster@mvista.com>

Source: Apache.org
MR: 113457, 113453
Type: Security Fix
Disposition: Backport from apache.org 2.4.51
ChangeID: 9d7b58f49487baff99bf8f101e53217425a2b81f
Description:

Bug fix only update. LTS version
https://httpd.apache.org/security/vulnerabilities_24.html

Fixes CVEs:
CVE-2021-42013
CVE-2021-41524
CVE-2021-41773

Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../apache2/{apache2_2.4.49.bb => apache2_2.4.51.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.49.bb => apache2_2.4.51.bb} (99%)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.49.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.51.bb
similarity index 99%
rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.49.bb
rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.51.bb
index 7e52d1db47..d6e736d31d 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.49.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.51.bb
@@ -26,7 +26,7 @@ SRC_URI_append_class-target = " \
            "
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
-SRC_URI[sha256sum] = "65b965d6890ea90d9706595e4b7b9365b5060bec8ea723449480b4769974133b"
+SRC_URI[sha256sum] = "20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4"
 
 S = "${WORKDIR}/httpd-${PV}"
 
-- 
2.25.1

[harknott 3/6] gattlib: Place pkgconfig file in correct package

[Armin Kuster]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

Fixes in OE-Core added some pkgconfig dependencies back and this flagged
that the .pc file was in ${PN}, not ${PN}-dev. Fix that.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
(cherry picked from commit ea4afdb6a846aecd1be5f81f989aee3dfc08cc60)
[fixup for hardknott context]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-connectivity/gattlib/gattlib_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
index d79dbed87a..f2da88aa26 100644
--- a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
+++ b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
@@ -29,4 +29,4 @@ EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF"
 inherit pkgconfig cmake
 
 FILES_${PN} = "${libdir}/*"
-FILES_${PN}-dev = "${includedir}/*"
+FILES_${PN}-dev = "${includedir}/* ${libdir}/pkgconfig"
-- 
2.25.1

[harknott 5/6] gst-shark: Define SRCREV_FORMAT

[Armin Kuster]

From: Khem Raj <raj.khem@gmail.com>

Since it uses multiple fetch URIs make it explicit to define SRCREV_FORMAT

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 196a12868190a707939673c5cd37ab91eafbf7e6)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-multimedia/gstreamer-1.0/gst-shark_git.bb           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb
index 94d05def3e..4ed89d45db 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb
+++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb
@@ -14,7 +14,7 @@ PV = "0.7.2"
 
 SRCREV_base = "50e3dbd3b131de2a39d3917576e8f834631ec46b"
 SRCREV_common = "88e512ca7197a45c4114f7fa993108f23245bf50"
-
+SRCREV_FORMAT = "base_common"
 SRC_URI = " \
     git://github.com/RidgeRun/gst-shark.git;protocol=https;branch=${SRCBRANCH};name=base \
     git://gitlab.freedesktop.org/gstreamer/common.git;protocol=https;destsuffix=git/common;name=common; \
-- 
2.25.1

[harknott 6/6] android-tools: Define SRCREV_FORMAT

[Armin Kuster]

From: Khem Raj <raj.khem@gmail.com>

Since it uses multiple fetch URIs make it explicit to define SRCREV_FORMAT

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit c5087606145d991e2555401eacee5175a89edf92)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index e8992346b0..deeb4e70b6 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -19,6 +19,7 @@ SRCREV_libhardware = "be55eb1f4d840c82ffaf7c47460df17ff5bc4d9b"
 SRCREV_libselinux = "07e9e1339ad1ba608acfba9dce2d0f474b252feb"
 SRCREV_build = "16e987def3d7d8f7d30805eb95cef69e52a87dbc"
 
+SRCREV_FORMAT = "core_extras_libhardware_libselinux_build"
 SRC_URI = " \
     git://${ANDROID_MIRROR}/platform/system/core;name=core;protocol=https;nobranch=1;destsuffix=git/system/core \
     git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras \
-- 
2.25.1