diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
20 files changed, 199 insertions, 239 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb index 0acd099956..79aaad9d85 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb @@ -16,6 +16,7 @@ global warming, discover sources of gravitational waves, and many other types \ of scientific and mathematical research." HOMEPAGE = "http://boinc.berkeley.edu/" +PNBLACKLIST[boinc-client] ?= "Needs porting to openssl 3.x" LICENSE = "LGPLv2+ & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc index cffa7f5dcd..a3d9bfdb70 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc @@ -6,7 +6,7 @@ programming language." SECTION = "devel" LICENSE = "PD" -SRC_URI = "ftp://ftp.invisible-island.net/byacc/byacc-${PV}.tgz \ +SRC_URI = "https://invisible-mirror.net/archives/byacc/byacc-${PV}.tgz \ file://byacc-open.patch \ file://0001-byacc-do-not-reorder-CC-and-CFLAGS.patch" diff --git a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb index 38efe6306d..60c5ab3815 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb @@ -10,6 +10,8 @@ its lifecycle. CFEngine takes systems from Build to Deploy, Manage and Audit." HOMEPAGE = "http://cfengine.com" +PNBLACKLIST[cfengine] ?= "Needs porting to openssl 3.x" + LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=233aa25e53983237cf0bd4c238af255f" diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch b/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch deleted file mode 100644 index 139d13f4cb..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 2dc0c7e4a3fa7ecc92ee5e22f1d8ee48c2b333a8 Mon Sep 17 00:00:00 2001 -From: Thomas Lee <debian@tomlee.co> -Date: Sun, 4 Nov 2018 22:59:09 +0000 -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 0000000..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 0000000..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 $(INSTALL_INCLUDE_PATH) - $(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters -@@ -178,6 +190,9 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) - $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH) - mkdir -p $(INSTALL_PKGCONF_PATH) - $(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH) -+ mkdir -p $(INSTALL_CMAKE_PATH) -+ $(INSTALL) $(CMAKECONFNAME) $(INSTALL_CMAKE_PATH) -+ $(INSTALL) $(CMAKEVERSNAME) $(INSTALL_CMAKE_PATH) - - 32bit: - @echo "" --- -2.27.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch b/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch deleted file mode 100644 index 1af5d26ac0..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d13b918a3ff8b0ebfd1e7b18b198b4b45841d720 Mon Sep 17 00:00:00 2001 -From: Andrea Galbusera <gizero@gmail.com> -Date: Fri, 31 Jul 2015 16:42:08 +0200 -Subject: [PATCH] Makefile: remove hardcoding of CC - -* upgrade previous patch to avoid wiping CFLAGS. This fixes build on arm -platforms which previously caused and issue due to -fPIC being lost - -Signed-off-by: Andrea Galbusera <gizero@gmail.com> ---- - Makefile | 5 ----- - 1 file changed, 5 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -35,12 +35,6 @@ define REDIS_TEST_CONFIG - endef - export REDIS_TEST_CONFIG - --# Fallback to gcc when $CC is not in $PATH. --CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') --CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') --OPTIMIZATION?=-O3 --WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings --DEBUG_FLAGS?= -g -ggdb - REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) - REAL_LDFLAGS=$(LDFLAGS) - diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb deleted file mode 100644 index ed81859190..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Minimalistic C client library for Redis" -HOMEPAGE = "http://github.com/redis/hiredis" -LICENSE = "BSD-3-Clause" -SECTION = "libs" -DEPENDS = "redis" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" -SRCREV = "685030652cd98c5414ce554ff5b356dfe8437870" -SRC_URI = "git://github.com/redis/hiredis;protocol=git \ - file://0001-Makefile-remove-hardcoding-of-CC.patch \ - file://0001-CMake-configuration-for-hiredis.patch" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig - -EXTRA_OEMAKE = "PREFIX=${prefix} LIBRARY_PATH=${baselib}" - -# By default INSTALL variable in Makefile is equal to 'cp -a', which preserves -# ownership and causes host-user-contamination QA issue. -# And PREFIX defaults to /usr/local. -do_install:prepend() { - export INSTALL='cp -r' -} diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb new file mode 100644 index 0000000000..93bda3372d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Minimalistic C client library for Redis" +HOMEPAGE = "http://github.com/redis/hiredis" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" +DEPENDS = "redis" + +SRC_URI = "git://github.com/redis/hiredis;protocol=git" +SRCREV = "b731283245f3183af527237166261ad0768ba7d4" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.8.0.bb index a16dbd4145..259187b0cd 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.8.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b" SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \ file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \ " -SRC_URI[sha256sum] = "c56b1d0f5d8efa2af3e38003770eab9165289aa87bd8f1627819c7f93f9433a3" +SRC_URI[sha256sum] = "12b7cce67b95b09f34873f46948e7f1cef9edd88682139e054b79ba165c53e49" UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.3.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.5.bb index b0c9849fad..08cfb136e5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.5.bb @@ -25,7 +25,7 @@ SRC_URI = " \ gitsm://github.com/ostreedev/ostree;branch=main \ file://run-ptest \ " -SRCREV = "38c14b374567f736533f7f515595208fe359819f" +SRCREV = "63bf5e606b24c7343bfe622bf6af2110ee6beabc" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.1.bb index 01233699a5..f0ae229414 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.1.bb @@ -1,11 +1,10 @@ DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" HOMEPAGE="https://github.com/taocpp/PEGTL" LICENSE="MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6a5195f720a8d436a4148e0cb8660400" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5b6701671289d12b7ffa69138832c006" -SRCREV = "47e878ad4fd72c91253c9d47b6f17e001ca2dfcf" -SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=2.x \ - " +SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=main" +SRCREV = "6d03c8decc22b4ddd51115e2170e0e82413c7104" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb index 4325c15c33..e456603c1c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb @@ -11,9 +11,8 @@ DEPENDS:append:libc-musl = " fts" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/pmem/pmdk.git" - -SRCREV = "1926ffb8f3f5f0617b3b3ed32029d437c272f187" +SRC_URI = "git://github.com/pmem/pmdk.git;branch=stable-1.11" +SRCREV = "5b21904a257eff47f2e87fcbf2de46111f03ddd8" inherit autotools-brokensep pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0002-jsauthority-port-to-mozjs-91.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0002-jsauthority-port-to-mozjs-91.patch new file mode 100644 index 0000000000..5b3660da2f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0002-jsauthority-port-to-mozjs-91.patch @@ -0,0 +1,38 @@ +From 4ce27b66bb07b72cb96d3d43a75108a5a6e7e156 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao <xry111@mengyan1223.wang> +Date: Tue, 10 Aug 2021 19:09:42 +0800 +Subject: [PATCH] jsauthority: port to mozjs-91 + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/92] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + configure.ac | 2 +- + meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d807086..5a7fc11 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -80,7 +80,7 @@ PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-unix-2.0 >= 2.30.0]) + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +-PKG_CHECK_MODULES(LIBJS, [mozjs-78]) ++PKG_CHECK_MODULES(LIBJS, [mozjs-91]) + + AC_SUBST(LIBJS_CFLAGS) + AC_SUBST(LIBJS_CXXFLAGS) +diff --git a/meson.build b/meson.build +index b3702be..733bbff 100644 +--- a/meson.build ++++ b/meson.build +@@ -126,7 +126,7 @@ expat_dep = dependency('expat') + assert(cc.has_header('expat.h', dependencies: expat_dep), 'Can\'t find expat.h. Please install expat.') + assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t find expat library. Please install expat.') + +-mozjs_dep = dependency('mozjs-78') ++mozjs_dep = dependency('mozjs-91') + + dbus_dep = dependency('dbus-1') + dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir]) #changed from sysconfdir with respect to commit#8eada3836465838 diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0003-jsauthority-ensure-to-call-JS_Init-and-JS_ShutDown-e.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0003-jsauthority-ensure-to-call-JS_Init-and-JS_ShutDown-e.patch new file mode 100644 index 0000000000..9e9755e44f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0003-jsauthority-ensure-to-call-JS_Init-and-JS_ShutDown-e.patch @@ -0,0 +1,63 @@ +From 7799441b9aa55324160deefbc65f9d918b8c94c1 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao <xry111@mengyan1223.wang> +Date: Tue, 10 Aug 2021 18:52:56 +0800 +Subject: [PATCH] jsauthority: ensure to call JS_Init() and JS_ShutDown() + exactly once + +Before this commit, we were calling JS_Init() in +polkit_backend_js_authority_class_init and never called JS_ShutDown. +This is actually a misusage of SpiderMonkey API. Quote from a comment +in js/Initialization.h (both mozjs-78 and mozjs-91): + + It is currently not possible to initialize SpiderMonkey multiple + times (that is, calling JS_Init/JSAPI methods/JS_ShutDown in that + order, then doing so again). + +This misusage does not cause severe issues with mozjs-78. However, when +we eventually port jsauthority to use mozjs-91, bad thing will happen: +see the test failure mentioned in #150. + +This commit is tested with both mozjs-78 and mozjs-91, all tests pass +with it. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/91] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + src/polkitbackend/polkitbackendjsauthority.cpp | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp +index 41d8d5c..38dc001 100644 +--- a/src/polkitbackend/polkitbackendjsauthority.cpp ++++ b/src/polkitbackend/polkitbackendjsauthority.cpp +@@ -75,6 +75,13 @@ + + /* ---------------------------------------------------------------------------------------------------- */ + ++static class JsInitHelperType ++{ ++public: ++ JsInitHelperType() { JS_Init(); } ++ ~JsInitHelperType() { JS_ShutDown(); } ++} JsInitHelper; ++ + struct _PolkitBackendJsAuthorityPrivate + { + gchar **rules_dirs; +@@ -589,7 +596,6 @@ polkit_backend_js_authority_finalize (GObject *object) + delete authority->priv->js_polkit; + + JS_DestroyContext (authority->priv->cx); +- /* JS_ShutDown (); */ + + G_OBJECT_CLASS (polkit_backend_js_authority_parent_class)->finalize (object); + } +@@ -665,8 +671,6 @@ polkit_backend_js_authority_class_init (PolkitBackendJsAuthorityClass *klass) + + + g_type_class_add_private (klass, sizeof (PolkitBackendJsAuthorityPrivate)); +- +- JS_Init (); + } + + /* ---------------------------------------------------------------------------------------------------- */ diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0003-make-netgroup-support-optional.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0003-make-netgroup-support-optional.patch index fd7251369e..1a268f2d0d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0003-make-netgroup-support-optional.patch +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0003-make-netgroup-support-optional.patch @@ -1,4 +1,4 @@ -From 21aa2747e8f0048759aab184b07dd6389666d5e6 Mon Sep 17 00:00:00 2001 +From 0c1debb380fee7f5b2bc62406e45856dc9c9e1a1 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 22 May 2019 13:18:55 -0700 Subject: [PATCH] make netgroup support optional @@ -17,20 +17,23 @@ Fixes bug 50145. Closes polkit/polkit#14. Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- configure.ac | 2 +- src/polkit/polkitidentity.c | 16 ++++++++++++++++ src/polkit/polkitunixnetgroup.c | 3 +++ .../polkitbackendinteractiveauthority.c | 14 ++++++++------ - src/polkitbackend/polkitbackendjsauthority.cpp | 2 ++ + src/polkitbackend/polkitbackendjsauthority.cpp | 3 +++ test/polkit/polkitidentitytest.c | 9 ++++++++- test/polkit/polkitunixnetgrouptest.c | 3 +++ .../test-polkitbackendjsauthority.c | 2 ++ - 8 files changed, 43 insertions(+), 8 deletions(-) + 8 files changed, 44 insertions(+), 8 deletions(-) +diff --git a/configure.ac b/configure.ac +index b625743..d807086 100644 --- a/configure.ac +++ b/configure.ac -@@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXP +@@ -100,7 +100,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) AC_SUBST(EXPAT_LIBS) @@ -39,9 +42,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> if test "x$GCC" = "xyes"; then LDFLAGS="-Wl,--as-needed $LDFLAGS" +diff --git a/src/polkit/polkitidentity.c b/src/polkit/polkitidentity.c +index 3aa1f7f..10e9c17 100644 --- a/src/polkit/polkitidentity.c +++ b/src/polkit/polkitidentity.c -@@ -182,7 +182,15 @@ polkit_identity_from_string (const gcha +@@ -182,7 +182,15 @@ polkit_identity_from_string (const gchar *str, } else if (g_str_has_prefix (str, "unix-netgroup:")) { @@ -57,7 +62,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> } if (identity == NULL && (error != NULL && *error == NULL)) -@@ -344,6 +352,13 @@ polkit_identity_new_for_gvariant (GVaria +@@ -344,6 +352,13 @@ polkit_identity_new_for_gvariant (GVariant *variant, GVariant *v; const char *name; @@ -71,7 +76,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> v = lookup_asv (details_gvariant, "name", G_VARIANT_TYPE_STRING, error); if (v == NULL) { -@@ -353,6 +368,7 @@ polkit_identity_new_for_gvariant (GVaria +@@ -353,6 +368,7 @@ polkit_identity_new_for_gvariant (GVariant *variant, name = g_variant_get_string (v, NULL); ret = polkit_unix_netgroup_new (name); g_variant_unref (v); @@ -79,9 +84,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> } else { +diff --git a/src/polkit/polkitunixnetgroup.c b/src/polkit/polkitunixnetgroup.c +index 8a2b369..83f8d4a 100644 --- a/src/polkit/polkitunixnetgroup.c +++ b/src/polkit/polkitunixnetgroup.c -@@ -194,6 +194,9 @@ polkit_unix_netgroup_set_name (PolkitUni +@@ -194,6 +194,9 @@ polkit_unix_netgroup_set_name (PolkitUnixNetgroup *group, PolkitIdentity * polkit_unix_netgroup_new (const gchar *name) { @@ -91,9 +98,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> g_return_val_if_fail (name != NULL, NULL); return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_NETGROUP, "name", name, +diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c +index 056d9a8..36c2f3d 100644 --- a/src/polkitbackend/polkitbackendinteractiveauthority.c +++ b/src/polkitbackend/polkitbackendinteractiveauthority.c -@@ -2233,25 +2233,26 @@ get_users_in_net_group (PolkitIdentity +@@ -2233,25 +2233,26 @@ get_users_in_net_group (PolkitIdentity *group, GList *ret; ret = NULL; @@ -126,7 +135,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> PolkitIdentity *user; GError *error = NULL; -@@ -2282,6 +2283,7 @@ get_users_in_net_group (PolkitIdentity +@@ -2282,6 +2283,7 @@ get_users_in_net_group (PolkitIdentity *group, out: endnetgrent (); @@ -134,9 +143,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> return ret; } +diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp +index ca17108..41d8d5c 100644 --- a/src/polkitbackend/polkitbackendjsauthority.cpp +++ b/src/polkitbackend/polkitbackendjsauthority.cpp -@@ -1502,6 +1502,7 @@ js_polkit_user_is_in_netgroup (JSContext +@@ -1520,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, JS::CallArgs args = JS::CallArgsFromVp (argc, vp); @@ -144,14 +155,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> JS::RootedString usrstr (authority->priv->cx); usrstr = args[0].toString(); user = JS_EncodeStringToUTF8 (cx, usrstr); -@@ -1519,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext +@@ -1535,6 +1536,8 @@ js_polkit_user_is_in_netgroup (JSContext *cx, + is_in_netgroup = true; + } - JS_free (cx, netgroup); - JS_free (cx, user); +#endif - ++ ret = true; + args.rval ().setBoolean (is_in_netgroup); +diff --git a/test/polkit/polkitidentitytest.c b/test/polkit/polkitidentitytest.c +index e91967b..e829aaa 100644 --- a/test/polkit/polkitidentitytest.c +++ b/test/polkit/polkitidentitytest.c @@ -19,6 +19,7 @@ @@ -162,7 +176,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #include "glib.h" #include <polkit/polkit.h> #include <polkit/polkitprivate.h> -@@ -145,11 +146,15 @@ struct ComparisonTestData comparison_tes +@@ -145,11 +146,15 @@ struct ComparisonTestData comparison_test_data [] = { {"unix-group:root", "unix-group:jane", FALSE}, {"unix-group:jane", "unix-group:jane", TRUE}, @@ -193,6 +207,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> add_comparison_tests (); +diff --git a/test/polkit/polkitunixnetgrouptest.c b/test/polkit/polkitunixnetgrouptest.c +index 3701ba1..e3352eb 100644 --- a/test/polkit/polkitunixnetgrouptest.c +++ b/test/polkit/polkitunixnetgrouptest.c @@ -19,6 +19,7 @@ @@ -213,6 +229,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> +#endif return g_test_run (); } +diff --git a/test/polkitbackend/test-polkitbackendjsauthority.c b/test/polkitbackend/test-polkitbackendjsauthority.c +index f97e0e0..fc52149 100644 --- a/test/polkitbackend/test-polkitbackendjsauthority.c +++ b/test/polkitbackend/test-polkitbackendjsauthority.c @@ -137,12 +137,14 @@ test_get_admin_identities (void) diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/CVE-2021-3560.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/CVE-2021-3560.patch deleted file mode 100644 index 76308ffdb9..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/CVE-2021-3560.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81 Mon Sep 17 00:00:00 2001 -From: Jan Rybar <jrybar@redhat.com> -Date: Wed, 2 Jun 2021 15:43:38 +0200 -Subject: [PATCH] GHSL-2021-074: authentication bypass vulnerability in polkit - -initial values returned if error caught - -CVE: CVE-2021-3560 - -Upstream-Status: Backport [https://gitlab.freedesktop.org/polkit/polkit/-/commit/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - src/polkit/polkitsystembusname.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c -index 8daa12c..8ed1363 100644 ---- a/src/polkit/polkitsystembusname.c -+++ b/src/polkit/polkitsystembusname.c -@@ -435,6 +435,9 @@ polkit_system_bus_name_get_creds_sync (PolkitSystemBusName *system_bus - while (!((data.retrieved_uid && data.retrieved_pid) || data.caught_error)) - g_main_context_iteration (tmp_context, TRUE); - -+ if (data.caught_error) -+ goto out; -+ - if (out_uid) - *out_uid = data.uid; - if (out_pid) --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb index 6408933ea3..a41b0fecad 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb @@ -25,10 +25,10 @@ PAM_SRC_URI = "file://polkit-1_pam.patch" SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://0003-make-netgroup-support-optional.patch \ - file://CVE-2021-3560.patch \ + file://0002-jsauthority-port-to-mozjs-91.patch \ + file://0003-jsauthority-ensure-to-call-JS_Init-and-JS_ShutDown-e.patch \ " -SRC_URI[md5sum] = "4b37258583393e83069a0e2e89c0162a" -SRC_URI[sha256sum] = "88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1" +SRC_URI[sha256sum] = "c8579fdb86e94295404211285fee0722ad04893f0213e571bd75c00972fd1f5c" EXTRA_OECONF = "--with-os-type=moblin \ --disable-man-pages \ diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.2.bb index 0870c6629d..2a6bb57ed7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.2.bb @@ -1,18 +1,21 @@ DESCRIPTION = "C++ client for Redis based on hiredis" HOMEPAGE = "https://github.com/sewenew/redis-plus-plus" SECTION = "libs" - -DEPENDS += "hiredis" -RDEPENDS:${PN} += "hiredis" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "8ac506e6eb0e5c5b2625785b67400bde705773a1" + SRC_URI = "git://github.com/sewenew/redis-plus-plus" +SRCREV = "e29c63db54653a660d7a0f556f670b7a6fce0a78" S = "${WORKDIR}/git" inherit cmake +DEPENDS += "hiredis" + +RDEPENDS:${PN} += "hiredis" + FILES_SOLIBSDEV = "" -FILES:${PN} += " ${libdir}/libredis++.so" +FILES:${PN} += " ${libdir}/libredis++.so*" + +INSANE_SKIP:${PN} += "dev-so" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.5.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.6.bb index 58d759b59d..87fade7e04 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.6.bb @@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "4b9a75709a1b74b3785e20a6c158cab94cf52298aa381eea947a678a60d551ae" +SRC_URI[sha256sum] = "5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch new file mode 100644 index 0000000000..85e49cca2d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch @@ -0,0 +1,24 @@ +From a5835dfe126bfe6ed0b8197c6578960835bf1fe8 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Sun, 3 Oct 2021 22:08:50 +0200 +Subject: [PATCH] configure.ac: add py 3.10 support + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4802f35..e0e468f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -93,7 +93,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb index d78d2770c6..86b894090e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb @@ -9,7 +9,9 @@ DEPENDS = "glib-2.0 python3" inherit autotools pkgconfig SRC_URI = "http://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-${PV}.tar.gz \ - file://python39.patch" + file://python39.patch \ + file://0001-configure.ac-add-py-3.10-support.patch \ + " SRC_URI[md5sum] = "7ba4ed4ef1f06ae96979751e096c2821" SRC_URI[sha256sum] = "c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0" |