[oe] [meta-oe][PATCH] hiredis: add cmake config file for pkgconfig
In order to be able to use pkgconfig and find_package in
cmake the file HiredisConfig.cmake need to be present
in sysroot. This commit adds a patch from Ubuntu/Debian
that fixes this. As build system for version 0.14 of Hiredis
is Makefile based this is not possible to upstream. In
later Hiredis the build system is CMake based and this is
fixed.
Signed-off-by: Peter Bergin
---
...0001-CMake-configuration-for-hiredis.patch | 117 ++
.../hiredis/hiredis_0.14.0.bb | 3 +-
2 files changed, 119 insertions(+), 1 deletion(-)
create mode 100644
meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch
diff --git
a/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch
b/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch
new file mode 100644
index 0..139d13f4c
--- /dev/null
+++
b/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch
@@ -0,0 +1,117 @@
+From 2dc0c7e4a3fa7ecc92ee5e22f1d8ee48c2b333a8 Mon Sep 17 00:00:00 2001
+From: Thomas Lee
+Date: Sun, 4 Nov 2018 22:59:09 +
+Subject: [PATCH] CMake configuration for hiredis
+
+Last-Update: 2018-09-26
+
+Upstream-Status: Backport [Ubuntu 20.04]
+---
+ HiredisConfig.cmake.in| 5 +
+ HiredisConfigVersion.cmake.in | 22 ++
+ Makefile | 17 -
+ 3 files changed, 43 insertions(+), 1 deletion(-)
+ create mode 100644 HiredisConfig.cmake.in
+ create mode 100644 HiredisConfigVersion.cmake.in
+
+diff --git a/HiredisConfig.cmake.in b/HiredisConfig.cmake.in
+new file mode 100644
+index 000..2cce290
+--- /dev/null
b/HiredisConfig.cmake.in
+@@ -0,0 +1,5 @@
++find_path(HIREDIS_INCLUDE_DIRS hiredis/hiredis.h HINTS "/usr/include")
++find_library(HIREDIS_LIB_HIREDIS NAMES hiredis HINTS "/usr/lib")
++
++set(HIREDIS_LIBRARIES ${HIREDIS_LIB_HIREDIS})
++
+diff --git a/HiredisConfigVersion.cmake.in b/HiredisConfigVersion.cmake.in
+new file mode 100644
+index 000..584144a
+--- /dev/null
b/HiredisConfigVersion.cmake.in
+@@ -0,0 +1,22 @@
++set(PACKAGE_VERSION "@HIREDIS_VERSION@")
++
++string(REPLACE "." ";" HIREDIS_VERSION_COMPONENTS ${PACKAGE_VERSION})
++string(REPLACE "." ";" REQUESTED_VERSION_COMPONENTS ${PACKAGE_FIND_VERSION})
++
++list(GET HIREDIS_VERSION_COMPONENTS 0 HIREDIS_VERSION_MAJOR)
++list(GET HIREDIS_VERSION_COMPONENTS 1 HIREDIS_VERSION_MINOR)
++
++list(GET REQUESTED_VERSION_COMPONENTS 0 REQUESTED_VERSION_MAJOR)
++list(GET REQUESTED_VERSION_COMPONENTS 1 REQUESTED_VERSION_MINOR)
++
++if(("${HIREDIS_VERSION_MAJOR}" EQUAL "${REQUESTED_VERSION_MAJOR}") AND
++(("${HIREDIS_VERSION_MINOR}" EQUAL "${REQUESTED_VERSION_MINOR}") OR
++ ("${HIREDIS_VERSION_MINOR}" GREATER "${REQUESTED_VERSION_MINOR}")))
++set(PACKAGE_VERSION_COMPATIBLE TRUE)
++if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
++set(PACKAGE_VERSION_EXACT TRUE)
++endif()
++else()
++set(PACKAGE_VERSION_COMPATIBLE FALSE)
++endif()
++
+diff --git a/Makefile b/Makefile
+index 339727f..43704cd 100644
+--- a/Makefile
b/Makefile
+@@ -8,6 +8,8 @@ EXAMPLES=hiredis-example hiredis-example-libevent
hiredis-example-libev hiredis-
+ TESTS=hiredis-test
+ LIBNAME=libhiredis
+ PKGCONFNAME=hiredis.pc
++CMAKECONFNAME=HiredisConfig.cmake
++CMAKEVERSNAME=HiredisConfigVersion.cmake
+
+ HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}')
+ HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}')
+@@ -19,9 +21,11 @@ PREFIX?=/usr/local
+ INCLUDE_PATH?=include/hiredis
+ LIBRARY_PATH?=lib
+ PKGCONF_PATH?=pkgconfig
++CMAKE_PATH?=cmake/Hiredis
+ INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
+ INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
+ INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH)
++INSTALL_CMAKE_PATH= $(INSTALL_LIBRARY_PATH)/$(CMAKE_PATH)
+
+ # redis-server configuration used for testing
+ REDIS_PORT=56379
+@@ -150,6 +154,7 @@ check: hiredis-test
+
+ clean:
+ rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME)
examples/hiredis-example* *.o *.gcda *.gcno *.gcov
++ rm -f $(CMAKECONFNAME) $(CMAKEVERSNAME)
+
+ dep:
+ $(CC) -MM *.c
+@@ -169,7 +174,14 @@ $(PKGCONFNAME): hiredis.h
+ @echo Libs: -L\$${libdir} -lhiredis >> $@
+ @echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
+
+-install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
++$(CMAKECONFNAME): $(CMAKECONFNAME).in
++ cp $(CMAKECONFNAME).in $(CMAKECONFNAME)
++
++$(CMAKEVERSNAME): $(CMAKEVERSNAME).in
++ sed -e
"s,@HIREDIS_VERSION@,$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH),g" \
++ $(CMAKEVERSNAME).in >$(CMAKEVERSNAME)
++
++install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) $(CMAKECONFNAME)
$(CMAKEVERSNAME)
+ mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters
$(INSTALL_LIBRARY_PATH)
+ $(INSTALL) hiredis.h async.h read.h sds.h
Re: [oe] dunfell merge request June 2
It should be upstream now sorry for delay, On Thu, Jun 10, 2021 at 9:27 PM akuster808 wrote: > > > > On 6/2/21 7:34 AM, Armin Kuster via lists.openembedded.org wrote: > > The following changes since commit 11eae114522a6befa06c7f4021a83bc016133543: > > > > linuxptp: Fix cross build (2021-05-14 10:03:51 -0700) > > > > are available in the Git repository at: > > > > https://git.openembedded.org/meta-openembedded dunfell-next > > > > for you to fetch changes up to c38d2a74f762a792046f3d3c377827b08aade513: > > Let me know if there are any issues with this merge request. I may have > missed a response. > > -armin > > > > dnsmasq: Add fixes for CVEs reported for dnsmasq (2021-05-29 11:41:45 > > -0700) > > > > > > Alexander Vickberg (1): > > hostapd: fix building with CONFIG_TLS=internal > > > > Mikko Rapeli (1): > > ebtables: use bitbake optimization levels > > > > Sana Kazi (1): > > dnsmasq: Add fixes for CVEs reported for dnsmasq > > > > akash.hadke (1): > > opencv: Add fix for CVE-2019-5063 and CVE-2019-5064 > > > > wangmy (8): > > exiv2: Fix CVE-2021-29457 > > exiv2: Fix CVE-2021-29458 > > exiv2: Fix CVE-2021-29463 > > exiv2: Fix CVE-2021-3482 > > exiv2: Fix CVE-2021-29464 > > exiv2: Fix CVE-2021-29470 > > exiv2: Fix CVE-2021-29473 > > libsdl: Fix CVE-2019-13616 > > > > .../ebtables/ebtables-2.0.10-4/ebtables_optimizations.patch | 19 + > > meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb| 1 + > > meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb | 7 +- > > .../recipes-support/dnsmasq/files/CVE-2020-25681.patch | 370 > > ++ > > .../recipes-support/dnsmasq/files/CVE-2020-25684.patch | 98 + > > .../recipes-support/dnsmasq/files/CVE-2020-25685-1.patch| 587 > > > > .../recipes-support/dnsmasq/files/CVE-2020-25685-2.patch| 175 > > + > > .../recipes-support/dnsmasq/files/CVE-2020-25686-1.patch| 332 > > > > .../recipes-support/dnsmasq/files/CVE-2020-25686-2.patch| 63 +++ > > .../hostapd/hostapd/0001-Prepare-for-CVE-2021-30004.patch.patch | 45 +++ > > meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb | 1 + > > .../recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch | 27 ++ > > meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb| 1 + > > meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch| 26 ++ > > meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch| 37 ++ > > meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch| 120 > > ++ > > meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch| 72 > > meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch| 32 ++ > > meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch| 21 + > > meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch | 54 +++ > > meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb | 9 +- > > .../opencv/opencv/CVE-2019-5063_and_2019-5064.patch | 78 > > meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 1 + > > 23 files changed, 2174 insertions(+), 2 deletions(-) > > create mode 100644 > > meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables_optimizations.patch > > create mode 100644 > > meta-networking/recipes-support/dnsmasq/files/CVE-2020-25681.patch > > create mode 100644 > > meta-networking/recipes-support/dnsmasq/files/CVE-2020-25684.patch > > create mode 100644 > > meta-networking/recipes-support/dnsmasq/files/CVE-2020-25685-1.patch > > create mode 100644 > > meta-networking/recipes-support/dnsmasq/files/CVE-2020-25685-2.patch > > create mode 100644 > > meta-networking/recipes-support/dnsmasq/files/CVE-2020-25686-1.patch > > create mode 100644 > > meta-networking/recipes-support/dnsmasq/files/CVE-2020-25686-2.patch > > create mode 100644 > > meta-oe/recipes-connectivity/hostapd/hostapd/0001-Prepare-for-CVE-2021-30004.patch.patch > > create mode 100644 > > meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch > > create mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch > > create mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch > > create mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch > > create mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch > > create mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch > > create mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch > > create mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch > > create mode 100644 > > meta-oe/recipes-support/opencv/opencv/CVE-2019-5063_and_2019-5064.patch > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You
[oe] [meta-oe] [PATCH] toybox: upgrade 0.8.4 -> 0.8.5
Signed-off-by: Zang Ruochen
---
.../recipes-core/toybox/{toybox_0.8.4.bb => toybox_0.8.5.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-core/toybox/{toybox_0.8.4.bb => toybox_0.8.5.bb} (97%)
diff --git a/meta-oe/recipes-core/toybox/toybox_0.8.4.bb
b/meta-oe/recipes-core/toybox/toybox_0.8.5.bb
similarity index 97%
rename from meta-oe/recipes-core/toybox/toybox_0.8.4.bb
rename to meta-oe/recipes-core/toybox/toybox_0.8.5.bb
index cc98b9ec07..90a0ad6c73 100644
--- a/meta-oe/recipes-core/toybox/toybox_0.8.4.bb
+++ b/meta-oe/recipes-core/toybox/toybox_0.8.5.bb
@@ -9,7 +9,7 @@ inherit cml1 update-alternatives
SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \
"
-SRC_URI[sha256sum] =
"cb2a565a8d30015d08d73628795dca51a85b99b149aeabbbecd9e8dbdbd8fddc"
+SRC_URI[sha256sum] =
"bfd230c187726347f7e31a1fc5841705871dfe4f3cbc6628f512b54e57360949"
SECTION = "base"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#91872):
https://lists.openembedded.org/g/openembedded-devel/message/91872
Mute This Topic: https://lists.openembedded.org/mt/83464567/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-initramfs][PATCH] klibc: Add clang's -rtlib to known options
Thanks, I'll plan to do more testing with clang/llvm.
BTW there is now klibc 2.0.9.
Cheers
Andrea
On Fri, Jun 11, 2021 at 4:42 AM Khem Raj wrote:
>
> This helps in ensuring that we always link klibc apps with libgcc as
> compiler-rt does not work for klibc due to missing libssp functions e.g.
> __stack_chk_guard and __stack_chk_guard which it expects in libc
>
> Signed-off-by: Khem Raj
> Cc: Andrea Adami
> ---
> .../klibc/files/klcc-cross-accept-clang-options.patch| 5 -
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git
> a/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch
>
> b/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch
> index 56905a5159..431c75e3af 100644
> ---
> a/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch
> +++
> b/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch
> @@ -5,7 +5,7 @@ Signed-off-by: Khem Raj
>
> --- a/klcc/klcc.in
> +++ b/klcc/klcc.in
> -@@ -207,6 +207,24 @@ while ( defined($a = shift(@ARGV)) ) {
> +@@ -207,6 +207,27 @@ while ( defined($a = shift(@ARGV)) ) {
> } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) {
> # Override gcc encoded sysroot
> push(@ccopt, $a);
> @@ -26,6 +26,9 @@ Signed-off-by: Khem Raj
> + push(@ccopt, $a);
> +} elsif ( $a =~ '--unwindlib=.*' ) {
> + # Allow clang options
> ++ push(@ccopt, $a);
> ++} elsif ( $a =~ '-rtlib=.*' ) {
> ++ # Allow clang options
> + push(@ccopt, $a);
> } else {
> die "$0: unknown option: $a\n";
> --
> 2.32.0
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#91871):
https://lists.openembedded.org/g/openembedded-devel/message/91871
Mute This Topic: https://lists.openembedded.org/mt/83460670/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] add CVE-2011-2411 to allowlist
This affects only on HP NonStop Server, so add it to allowlist.
Signed-off-by: Sekine Shigeki
---
meta-networking/recipes-connectivity/samba/samba_4.14.4.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.14.4.bb
b/meta-networking/recipes-connectivity/samba/samba_4.14.4.bb
index 2e0bdceab..0833a9146 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.14.4.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.14.4.bb
@@ -40,6 +40,10 @@ SRC_URI[sha256sum] =
"89af092a0b00f5354ed287f0aa37b8c2cf9ba2ce67ea6464192e2c1852
UPSTREAM_CHECK_REGEX = "samba\-(?P4\.14(\.\d+)+).tar.gz"
inherit systemd waf-samba cpan-base perlnative update-rc.d
+
+# CVE-2011-2411 is valnerble only on HP NonStop Servers.
+CVE_CHECK_WHITELIST += "CVE-2011-2411"
+
# remove default added RDEPENDS on perl
RDEPENDS_${PN}_remove = "perl"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#91870):
https://lists.openembedded.org/g/openembedded-devel/message/91870
Mute This Topic: https://lists.openembedded.org/mt/83464364/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] cyrus-sasl: add CVE-2020-8032 to allowlist
This affects only openSUSE, so add it to allowlist.
Signed-off-by: Yuichi Ito
---
.../recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb| 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb
b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb
index 33de8ca7e..c4b41ace8 100644
--- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb
+++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb
@@ -96,3 +96,6 @@ FILES_${PN}-dbg += "${libdir}/sasl2/.debug"
FILES_${PN}-staticdev += "${libdir}/sasl2/*.a"
INSANE_SKIP_${PN} += "dev-so"
+
+# CVE-2020-8032 affects only openSUSE
+CVE_CHECK_WHITELIST += "CVE-2020-8032"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#91869):
https://lists.openembedded.org/g/openembedded-devel/message/91869
Mute This Topic: https://lists.openembedded.org/mt/83464356/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe] [PATCH] protobuf: upgrade 3.17.0 -> 3.17.3
Signed-off-by: Zang Ruochen
---
.../protobuf/{protobuf_3.17.0.bb => protobuf_3.17.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-devtools/protobuf/{protobuf_3.17.0.bb =>
protobuf_3.17.3.bb} (98%)
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.17.0.bb
b/meta-oe/recipes-devtools/protobuf/protobuf_3.17.3.bb
similarity index 98%
rename from meta-oe/recipes-devtools/protobuf/protobuf_3.17.0.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_3.17.3.bb
index 81af2d50f9..6ad3bdb3bf 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_3.17.0.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.17.3.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
DEPENDS = "zlib"
DEPENDS_append_class-target = " protobuf-native"
-SRCREV = "652d99a8ee8aa6b801e11977951fbf444cfccc8f"
+SRCREV = "909a0f36a10075c4b4bc70fdee2c7e32dd612a72"
SRC_URI = "git://github.com/protocolbuffers/protobuf.git \
file://run-ptest \
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#91868):
https://lists.openembedded.org/g/openembedded-devel/message/91868
Mute This Topic: https://lists.openembedded.org/mt/83463754/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
