diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
10 files changed, 63 insertions, 52 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb index db4f507b7c..daaff00395 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb @@ -13,6 +13,12 @@ SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=mast S = "${WORKDIR}/git" +CVE_CHECK_IGNORE += "\ + CVE-2017-5834 \ + CVE-2017-5835 \ + CVE-2017-5836 \ +" + do_install:append () { if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then chrpath -d ${D}${libdir}/python*/site-packages/plist/_plist.so diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.6.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb index 7fb6850134..237828dbfc 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb @@ -4,7 +4,7 @@ LICENSE="MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=dccf35ef30bf912bb07b01d469965293" SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x" -SRCREV = "464d866d8bbf4c8ddc5b67422d09b60ad3b918fc" +SRCREV = "cf639f7f4ee125f68e1ccfba8d99ebc0de57b9fe" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch deleted file mode 100644 index 9ce39f3f77..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch +++ /dev/null @@ -1,45 +0,0 @@ -From fbb13cdb0b3591616c3f77b6bc76e75af8906cda Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 19 Mar 2022 22:59:58 -0700 -Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs - -makes it portable across platforms e.g. ppc64/linux uses usr/lib64 for -system libs - -Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/pull/344] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4f28ee4..8150f5c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -239,10 +239,12 @@ if(REDIS_PLUS_PLUS_BUILD_TEST) - add_subdirectory(test) - endif() - -+include(GNUInstallDirs) -+ - install(TARGETS ${REDIS_PLUS_PLUS_TARGETS} - EXPORT redis++-targets -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION bin - INCLUDES DESTINATION include) - -@@ -284,7 +286,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/redis++.pc.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++.pc" @ONLY) - - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++.pc" -- DESTINATION "lib/pkgconfig") -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - - # All the Debian-specific cpack defines. - if(${CMAKE_VERSION} VERSION_GREATER 3.6) --- -2.35.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.3.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.5.bb index 575443f0e5..de19dca387 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.5.bb @@ -4,10 +4,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ - file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch \ - " -SRCREV = "389ffdf9e72035ea2096b03cda7f4a6809ae6363" +SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https" +SRCREV = "58084931ed1a056d91fe96da7b9ea81fa023560a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.4.bb index b188278e1c..993ff34b10 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.4.bb @@ -19,7 +19,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] = "5e57eafe7d4ac5ecb6a7d64d6b61db775616dbf903293b3fcc660716dbda5eeb" +SRC_URI[sha256sum] = "f0e65fda74c44a3dd4fa9d512d4d4d833dd0939c934e946a5c622a630d057f2f" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2202.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2206.0.bb index ebb8ecf9bd..a39de3acb5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2202.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2206.0.bb @@ -31,7 +31,7 @@ SRC_URI:append:libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[sha256sum] = "e41308a5a171939b3cbc246e9d4bd30be44e801521e04cd95d051fa3867d6738" +SRC_URI[sha256sum] = "a1377218b26c0767a7a3f67d166d5338af7c24b455d35ec99974e18e6845ba27" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-mk-make-config.sh-not-reveal-the-build-env.patch b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-mk-make-config.sh-not-reveal-the-build-env.patch new file mode 100644 index 0000000000..18ef6cae22 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-mk-make-config.sh-not-reveal-the-build-env.patch @@ -0,0 +1,43 @@ +From fa93dab6393527673e642f26b6ea2c4413dd3cfe Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 27 Jul 2022 13:40:12 +0800 +Subject: [PATCH] make-config.sh: hidden the build info + +Use the CC as placeholder to replace the real build information which +will be collected via src/mx/accmacvar.c and then added in the final +binary s-nail, so hidden the build info to avoid revealing the detailed +build info. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + mk/make-config.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mk/make-config.sh b/mk/make-config.sh +index 2d7c619..9146004 100644 +--- a/mk/make-config.sh ++++ b/mk/make-config.sh +@@ -3637,15 +3637,15 @@ LIBS=`squeeze_ws "${LIBS}"` + COMMLINE=`printf '%s\n' "${COMMLINE}" | ${sed} -e 's/.*--\(.*\)/\1/'` + COMMLINE=`squeeze_ws "${COMMLINE}"` + +-i=`printf '%s %s %s\n' "${CC}" "${CFLAGS}" "${i}"` ++i="CC" + printf '#define VAL_BUILD_CC "%s"\n' "$i" >> ${h} + i=`string_to_char_array "${i}"` + printf '#define VAL_BUILD_CC_ARRAY %s\n' "$i" >> ${h} +-i=`printf '%s %s %s\n' "${CC}" "${LDFLAGS}" "${LIBS}"` ++i="CC" + printf '#define VAL_BUILD_LD "%s"\n' "$i" >> ${h} + i=`string_to_char_array "${i}"` + printf '#define VAL_BUILD_LD_ARRAY %s\n' "$i" >> ${h} +-i=${COMMLINE} ++i="CC" + printf '#define VAL_BUILD_REST "%s"\n' "$i" >> ${h} + i=`string_to_char_array "${i}"` + printf '#define VAL_BUILD_REST_ARRAY %s\n' "$i" >> ${h} +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb b/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb index 6e004fc90b..bcdb1e4788 100644 --- a/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb +++ b/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb @@ -10,6 +10,7 @@ SRC_URI = "https://ftp.sdaoden.eu/${BP}.tar.xz \ file://0001-make.rc-set-VAL_MTA.patch \ file://0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch \ file://0001-su_INLINE-eh-no-give-up-share-detection.patch \ + file://0001-mk-make-config.sh-not-reveal-the-build-env.patch \ " SRC_URI[sha256sum] = "2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c" diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb index ecbfad394d..a59a5c41df 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb @@ -21,6 +21,10 @@ SRCREV = "a181e951376d49a82eef17920c8ebedec80b4823" S = "${WORKDIR}/git" +CVE_CHECK_IGNORE += "\ + CVE-2012-5638 \ +" + DEPENDS = "libaio util-linux" inherit setuptools3 useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index 7e00f150d3..4b9ae4758f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -32,6 +32,10 @@ SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30" SRC_URI[sha256sum] = "634a67b2f7ac3b386a79160eb44413d618e33e4e7fc74ae68b0240484af149dd" +CVE_CHECK_IGNORE += "\ + CVE-2012-3381 \ +" + inherit autotools inherit systemd |