diff options
Diffstat (limited to 'meta-oe')
335 files changed, 1399 insertions, 889 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb index de4fa16426..75a206c6b8 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit setuptools3 -SRC_URI = "git://github.com/sivel/speedtest-cli.git" +SRC_URI = "git://github.com/sivel/speedtest-cli.git;branch=master;protocol=https" SRCREV = "c58ad3367bf27f4b4a4d5b1bca29ebd574731c5d" S = "${WORKDIR}/git" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb index 065243ccfe..f55247d9ed 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb @@ -21,7 +21,7 @@ SRCREV_inih = "4b10c654051a86556dfdb634c891b6c3224c4109" SRCREV_FORMAT = "rwmem_inih" SRC_URI = " \ - git://github.com/tomba/rwmem.git;protocol=https;name=rwmem \ + git://github.com/tomba/rwmem.git;protocol=https;name=rwmem;branch=master \ git://github.com/benhoyt/inih.git;protocol=https;name=inih;nobranch=1;destsuffix=git/ext/inih \ " diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index fcabf81327..ad71a75229 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -14,7 +14,7 @@ inherit scons dos2unix siteinfo python3native systemd useradd PV = "4.4.6" #v4.4.6 SRCREV = "72e66213c2c3eab37d9358d5e78ad7f5c1d0d0d7" -SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4 \ +SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ file://0001-Use-long-long-instead-of-int64_t.patch \ file://0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch \ diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.5.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.5.bb index b2f8db9c0c..eb5d4cfdc3 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.5.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.5.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" DEPENDS = "protobuf-native" -SRC_URI = "git://github.com/nanopb/nanopb.git" +SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https" SRCREV = "c9124132a604047d0ef97a09c0e99cd9bed2c818" S = "${WORKDIR}/git" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb index 35585d0690..08a45b5e5c 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ PV = "0.5.9+git${SRCPV}" SRCREV = "3a3d622d9bb74c44fa67bc20573751a207514134" -SRC_URI = "git://github.com/lcdproc/lcdproc \ +SRC_URI = "git://github.com/lcdproc/lcdproc;branch=master;protocol=https \ file://0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch \ file://0002-Include-limits.h-for-PATH_MAX-definition.patch \ file://0003-Fix-non-x86-platforms-on-musl.patch \ diff --git a/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.3.bb b/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.3.bb index 049cdeffc0..ff966512dd 100644 --- a/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.3.bb +++ b/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/tristanpenman/valijson" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=015106c62262b2383f6c72063f0998f2" -SRC_URI = "git://github.com/tristanpenman/valijson.git" +SRC_URI = "git://github.com/tristanpenman/valijson.git;branch=master;protocol=https" SRCREV = "7a52fc88cdffd6678c009ca2fad700151f7363c6" S = "${WORKDIR}/git" diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.6.bb b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.6.bb index 93e00e6e01..260587b8fe 100644 --- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.6.bb +++ b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://git.infradead.org/users/mchehab/rasdaemon.git" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc" -SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master \ +SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master;protocol=https \ file://0001-Fix-system-header-includes.patch \ file://rasdaemon.service \ file://init" diff --git a/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb b/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb index b21212a430..de2341da4c 100644 --- a/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb +++ b/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb @@ -9,7 +9,7 @@ SRCREV = "ad7e646700d14b81413297bda02fb7fe96613c3f" PV = "1.0+git${SRCPV}" -SRC_URI = "git://github.com/ssvb/cpuburn-arm.git \ +SRC_URI = "git://github.com/ssvb/cpuburn-arm.git;branch=master;protocol=https \ file://0001-cpuburn-a8.S-Remove-.func-.endfunc.patch \ file://0002-burn.S-Add.patch \ file://0003-burn.S-Remove-.func-.endfunc.patch \ diff --git a/meta-oe/recipes-benchmark/fio/fio_3.26.bb b/meta-oe/recipes-benchmark/fio/fio_3.26.bb index 6f2464e5ef..ef9e675269 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.26.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.26.bb @@ -23,7 +23,7 @@ PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" SRCREV = "267b164c372d57145880f365bab8d8a52bf8baa7" -SRC_URI = "git://git.kernel.dk/fio.git \ +SRC_URI = "git://git.kernel.dk/fio.git;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index f5e719a35a..160a314dd7 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -14,7 +14,7 @@ DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-n PV = "2021.02+${SRCPV}" SRC_URI = " \ - git://github.com/glmark2/glmark2.git;protocol=https \ + git://github.com/glmark2/glmark2.git;protocol=https;branch=master \ file://0001-fix-dispmanx-build.patch \ file://0002-run-dispmanx-fullscreen.patch \ " diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb index be75837beb..47bf4d5015 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb +++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb @@ -11,7 +11,7 @@ AUTHOR = "ESNET <info@es.net>, Lawrence Berkeley National Laboratory <websupport LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b7fb682e9941a49f1214dcd7441410d7" -SRC_URI = "git://github.com/esnet/iperf.git \ +SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ file://0001-configure.ac-check-for-CPP-prog.patch \ " diff --git a/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb b/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb index e813894316..60286c3249 100644 --- a/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb +++ b/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9a825c63897c53f487ef900598c31527" SRCREV = "b6b2ce5f9f87a09b14499cb00c600c601f022634" PV = "20110206+git${SRCPV}" -SRC_URI = "git://git.musl-libc.org/libc-bench \ +SRC_URI = "git://git.musl-libc.org/libc-bench;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index aa9eb02b34..446bb7c69d 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -12,7 +12,7 @@ PE = "1" SRCREV = "6b126a4d7da9490fa40fe7e1b962edcb939feddc" SRC_URI = " \ - git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \ + git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https;branch=master \ file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \ file://tests-Makefile-install-static-4G-edge-testcases.patch \ diff --git a/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb b/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb index a2966e99dd..d30ea5a01b 100644 --- a/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb +++ b/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ea9d559f985fb4834317d8ed6b9e58" SRCREV = "fb72e5e5f0879231f38e0e826a98a6ca2d1ca38e" -SRC_URI = "git://github.com/stressapptest/stressapptest \ +SRC_URI = "git://github.com/stressapptest/stressapptest;branch=master;protocol=https \ file://libcplusplus-compat.patch \ file://read_sysfs_for_cachesize.patch \ " diff --git a/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb b/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb index 0607da834b..025aacf251 100644 --- a/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb +++ b/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://main.c;endline=22;md5=879b9bbb60851454885b5fa47eb6b34 PV = "0.4.9+git${SRCPV}" SRCREV = "a2cf6d7e382e3aea1eb39173174d9fa28cad15f3" -SRC_URI = "git://github.com/ssvb/tinymembench.git \ +SRC_URI = "git://github.com/ssvb/tinymembench.git;branch=master;protocol=https \ file://0001-asm-Delete-.func-.endfunc-directives.patch \ " diff --git a/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb b/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb index 45203f029b..2edb7c396b 100644 --- a/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb +++ b/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb @@ -9,7 +9,7 @@ SECTION = "console/utils" DEPENDS = "" SRCREV = "61ed2f28b294b1ebeb767df8cb5fcd391709c8e2" -SRC_URI = "git://gitlab.com/pibox/con2fbmap.git;protocol=https" +SRC_URI = "git://gitlab.com/pibox/con2fbmap.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb index 88fcc0200f..589d62717c 100644 --- a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb +++ b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRCREV = "a2f0c39d5f21596bb9f5223e895c0ff210b265d0" # SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/cpufreq/cpufrequtils.git -SRC_URI = "git://github.com/emagii/cpufrequtils.git \ +SRC_URI = "git://github.com/emagii/cpufrequtils.git;branch=master;protocol=https \ file://0001-dont-unset-cflags.patch \ " diff --git a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb index b89fe6771c..e42adc6dc0 100644 --- a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb +++ b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb @@ -11,7 +11,7 @@ PV = "0.18+git${SRCPV}" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/grondo/edac-utils \ +SRC_URI = "git://github.com/grondo/edac-utils;branch=master;protocol=https \ file://make-init-script-be-able-to-automatically-load-EDAC-.patch \ file://add-restart-to-initscript.patch \ file://edac.service \ diff --git a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb index 43fc598154..1f27c9e436 100644 --- a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb +++ b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb @@ -7,7 +7,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE-APACHE;md5=7b486c2338d225a1405d979ed2c15ce8 \ file://COPYING;md5=daa868b8e1ae17d03228a1145b4060da" -SRC_URI = "git://github.com/teg/firmwared.git \ +SRC_URI = "git://github.com/teg/firmwared.git;branch=master;protocol=https \ file://firmwared.service" PV = "0+git${SRCPV}" diff --git a/meta-oe/recipes-bsp/ledmon/ledmon_git.bb b/meta-oe/recipes-bsp/ledmon/ledmon_git.bb index f9ae9aad9a..1a9cb18c5c 100644 --- a/meta-oe/recipes-bsp/ledmon/ledmon_git.bb +++ b/meta-oe/recipes-bsp/ledmon/ledmon_git.bb @@ -16,7 +16,7 @@ inherit autotools systemd SYSTEMD_SERVICE_${PN} = "ledmon.service" # 0.93 -SRC_URI = "git://github.com/intel/ledmon;branch=master \ +SRC_URI = "git://github.com/intel/ledmon;branch=master;protocol=https \ file://0002-include-sys-select.h-and-sys-types.h.patch \ file://0001-Don-t-build-with-Werror-to-fix-compile-error.patch \ " diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index 4ee96df98d..9ff005bbc9 100644 --- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -10,7 +10,7 @@ DEPENDS = " \ virtual/libiconv \ " -SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https \ +SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https;branch=master \ file://fancontrol.init \ file://sensord.init \ file://0001-Change-PIDFile-path-from-var-run-to-run.patch \ diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb index 2f5e25c299..e07c1b8362 100644 --- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" DEPENDS = "util-linux" PV .= "+git${SRCPV}" -SRC_URI = "git://github.com/linux-nvme/nvme-cli.git" +SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" SRCREV = "f0e9569df9289d6ee55ba2c23615cc7c73a9b088" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb index d79dbed87a..64595d59c1 100644 --- a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb @@ -9,7 +9,7 @@ DEPENDS += "glib-2.0-native" PV = "0.2+git${SRCPV}" -SRC_URI = "git://github.com/labapart/gattlib.git \ +SRC_URI = "git://github.com/labapart/gattlib.git;branch=master;protocol=https \ file://dbus-avoid-strange-chars-from-the-build-dir.patch \ file://0001-cmake-Use-GNUInstallDirs.patch \ " @@ -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" diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb index ccdc65ac6c..80d7582b25 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" DEPENDS = "ell" -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git;branch=master \ " SRCREV = "bde3e0f6e3364e9c884b6b93a944d8138345b8e5" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb index bcedd6297e..4d873d4d90 100644 --- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb +++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb @@ -9,7 +9,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/" DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt" SRCREV = "15f8652126664e3a4b980e5d1c039b9053ce8566" -SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https" +SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https;branch=master" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.7.bb b/meta-oe/recipes-connectivity/libndp/libndp_1.7.bb index 07a7a1d239..2537963dda 100644 --- a/meta-oe/recipes-connectivity/libndp/libndp_1.7.bb +++ b/meta-oe/recipes-connectivity/libndp/libndp_1.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://libndp.org/" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/jpirko/libndp \ +SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \ " # tag for v1.6 SRCREV = "96674e7d4f4d569c2c961e865cc16152dfab5f09" diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index e0d3bef3ca..7e94e6e26c 100644 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "zlib libsigc++-2.0 openssl cppunit" -SRC_URI = "git://github.com/rakshasa/libtorrent \ +SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https \ file://don-t-run-code-while-configuring-package.patch \ " SRCREV = "756f70010779927dc0691e1e722ed433d5d295e1" diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb index f9b503a2cd..bd237e4a54 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb +++ b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \ file://about.html;md5=e5662cbb5f8fd5c9faac526e4077898e \ " -SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http" +SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http;branch=master;protocol=https" SRCREV = "317fb008e1541838d1c29076d2bc5c3e4b6c4f53" diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb index 0cfd225cf8..d54733cb80 100644 --- a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb +++ b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/alanxz/rabbitmq-c" LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=6b7424f9db80cfb11fdd5c980b583f53" LICENSE = "MIT" -SRC_URI = "git://github.com/alanxz/rabbitmq-c.git" +SRC_URI = "git://github.com/alanxz/rabbitmq-c.git;branch=master;protocol=https" # v0.11.0-master SRCREV = "a64c08c68aff34d49a2ac152f04988cd921084f9" diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb index 331f978f86..41fb1ec826 100644 --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses" -SRC_URI = "git://github.com/rakshasa/rtorrent \ +SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https \ file://don-t-run-code-while-configuring-package.patch \ " # v0.9.8 diff --git a/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-oe/recipes-connectivity/transmission/transmission_git.bb index 57267a8de8..ea63cf4507 100644 --- a/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-oe/recipes-connectivity/transmission/transmission_git.bb @@ -8,7 +8,7 @@ DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" RDEPENDS_${PN}-web = "${PN}" SRC_URI = " \ - gitsm://github.com/transmission/transmission \ + gitsm://github.com/transmission/transmission;branch=master;protocol=https \ file://transmission-daemon \ " diff --git a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb index 3860fd8b99..2fef7d0832 100644 --- a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb +++ b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb @@ -11,7 +11,7 @@ inherit autotools pkgconfig gitpkgv systemd PKGV = "${GITPKGVTAG}" SRCREV = "79c8b38d1488a6b07e1e68f39d8caec3f1a45622" -SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https" +SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb index cb39f5a0e1..52818aac9f 100644 --- a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb +++ b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb @@ -9,7 +9,7 @@ SECTION = "test" S = "${WORKDIR}/git" SRCREV = "2da947374c8324f88a0e2155aeba4cf75464b0d8" -SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git \ +SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git;branch=master;protocol=https \ file://0001-Use-toolchain-from-environment-variables.patch \ file://0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch \ file://0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch \ diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix/0001-.F.-DEV-2077-fixed-reflected-XSS-issues.patch b/meta-oe/recipes-connectivity/zabbix/zabbix/0001-.F.-DEV-2077-fixed-reflected-XSS-issues.patch new file mode 100644 index 0000000000..1d32a9cfdd --- /dev/null +++ b/meta-oe/recipes-connectivity/zabbix/zabbix/0001-.F.-DEV-2077-fixed-reflected-XSS-issues.patch @@ -0,0 +1,93 @@ +From fe3e2c2deeef568ec7e961340487497e31eb1a81 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 13 Apr 2022 10:19:39 +0800 +Subject: [PATCH] ..F....... [DEV-2077] fixed reflected XSS issues + +Merge in ZBX/zabbix from feature/DEV-2077-5.4 to release/5.4 + +* commit '5986cdf2572acaaaac1fc113d6407d5f0cd00c35': + ..F....... [DEV-2077] fixed service actions #3 + ..F....... [DEV-2077] fixed service actions #2 + ..F....... [DEV-2077] reverted unnecessary changes + ..F....... [DEV-2077] reverted tests + ..F....... [DEV-2077] fixed service actions + ..F....... [DEV-2077] fixed reflected XSS issue in service configuration form + ..F....... [DEV-2077] fixed reflected XSS issues in uncheckTableRows function + ..F....... [DEV-2077] fixed reflected XSS issues in graph configuration + ..F....... [DEV-2077] fixed reflected XSS issues in action configuration + +Upstream_Status: Backport [https://git.zabbix.com/projects/ZBX/repos/zabbix/commits/05976188fcca518c029e1af9ed03fd331786d77d] +CVE: CVE-2022-24349,CVE-2022-24917,CVE-2022-24918,CVE-2022-24919 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + ui/actionconf.php | 2 +- + ui/graphs.php | 2 +- + ui/include/func.inc.php | 5 ++--- + ui/include/views/configuration.services.edit.php | 5 +++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/ui/actionconf.php b/ui/actionconf.php +index 5b67f72..8cda3fc 100644 +--- a/ui/actionconf.php ++++ b/ui/actionconf.php +@@ -37,7 +37,7 @@ $fields = [ + 'name' => [T_ZBX_STR, O_OPT, null, NOT_EMPTY, 'isset({add}) || isset({update})', + _('Name') + ], +- 'eventsource' => [T_ZBX_INT, O_OPT, null, ++ 'eventsource' => [T_ZBX_INT, O_OPT, P_SYS, + IN([EVENT_SOURCE_TRIGGERS, EVENT_SOURCE_DISCOVERY, + EVENT_SOURCE_AUTOREGISTRATION, EVENT_SOURCE_INTERNAL + ]), +diff --git a/ui/graphs.php b/ui/graphs.php +index 79bb195..1d10803 100644 +--- a/ui/graphs.php ++++ b/ui/graphs.php +@@ -43,7 +43,7 @@ $fields = [ + 'name' => [T_ZBX_STR, O_OPT, null, NOT_EMPTY, 'isset({add}) || isset({update})', _('Name')], + 'width' => [T_ZBX_INT, O_OPT, null, BETWEEN(20, 65535), 'isset({add}) || isset({update})', _('Width')], + 'height' => [T_ZBX_INT, O_OPT, null, BETWEEN(20, 65535), 'isset({add}) || isset({update})', _('Height')], +- 'graphtype' => [T_ZBX_INT, O_OPT, null, IN('0,1,2,3'), 'isset({add}) || isset({update})'], ++ 'graphtype' => [T_ZBX_INT, O_OPT, P_SYS, IN('0,1,2,3'), 'isset({add}) || isset({update})'], + 'show_3d' => [T_ZBX_INT, O_OPT, P_NZERO, IN('0,1'), null], + 'show_legend' => [T_ZBX_INT, O_OPT, P_NZERO, IN('0,1'), null], + 'ymin_type' => [T_ZBX_INT, O_OPT, null, IN('0,1,2'), null], +diff --git a/ui/include/func.inc.php b/ui/include/func.inc.php +index 359fdfb..43c1a41 100644 +--- a/ui/include/func.inc.php ++++ b/ui/include/func.inc.php +@@ -2175,11 +2175,10 @@ function uncheckTableRows($parentid = null, $keepids = []) { + if ($keepids) { + // If $keepids will not have same key as value, it will create mess, when new checkbox will be checked. + $keepids = array_combine($keepids, $keepids); +- +- insert_js('sessionStorage.setItem("'.$key.'", JSON.stringify('.json_encode($keepids).'))'); ++ insert_js('sessionStorage.setItem('.json_encode($key).', JSON.stringify('.json_encode($keepids).'));'); + } + else { +- insert_js('sessionStorage.removeItem("'.$key.'")'); ++ insert_js('sessionStorage.removeItem('.json_encode($key).');'); + } + } + +diff --git a/ui/include/views/configuration.services.edit.php b/ui/include/views/configuration.services.edit.php +index a12385b..625fba9 100644 +--- a/ui/include/views/configuration.services.edit.php ++++ b/ui/include/views/configuration.services.edit.php +@@ -141,9 +141,10 @@ foreach ($this->data['children'] as $child) { + !empty($child['trigger']) ? $child['trigger'] : '', + (new CCol( + (new CButton('remove', _('Remove'))) +- ->onClick('javascript: removeDependentChild(\''.$child['serviceid'].'\');') +- ->addClass(ZBX_STYLE_BTN_LINK) + ->removeId() ++ ->addClass(ZBX_STYLE_BTN_LINK) ++ ->setAttribute('data-serviceid', $child['serviceid']) ++ ->onClick('removeDependentChild(this.dataset.serviceid);') + ))->addClass(ZBX_STYLE_NOWRAP) + ]))->setId('children_'.$child['serviceid']) + ); +-- +2.25.1 + diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.6.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.6.bb index 37bb9a2820..c2b28a3fb8 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.6.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.6.bb @@ -26,6 +26,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = "https://cdn.zabbix.com/zabbix/sources/stable/5.2/${BPN}-${PV}.tar.gz \ file://0001-Fix-configure.ac.patch \ file://zabbix-agent.service \ + file://0001-.F.-DEV-2077-fixed-reflected-XSS-issues.patch \ " SRC_URI[md5sum] = "31dab3535a1fa212f5724902727f6d4d" diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb index 44e1e9164c..15921805fa 100644 --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb @@ -7,7 +7,7 @@ DEPENDS = "zeromq" SRCREV = "76bf169fd67b8e99c1b0e6490029d9cd5ef97666" PV = "4.7.1" -SRC_URI = "git://github.com/zeromq/cppzmq.git;branch=bugfix-4-7-1" +SRC_URI = "git://github.com/zeromq/cppzmq.git;branch=bugfix-4-7-1;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb index db4e591cb9..099564eb34 100644 --- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb +++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" FILEEXTRAPATHS_prepend = "${THISDIR}/files" -SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master" +SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=dbus-cxx-0.y;protocol=https" SRC_URI += "file://fix_build_musl.patch" SRCREV = "ea7f8e361d11dc7d41d9ae2c4128aed2cdadd84e" diff --git a/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch b/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch index 2c4ca057f2..1c2fc3813f 100644 --- a/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch +++ b/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch @@ -21,7 +21,7 @@ index 009e4fd..f3f0d80 100644 if (!dbus_conn) - return; -+ DBUS_HANDLER_RESULT_NOT_YET_HANDLED; ++ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; if (verbose) g_print ("New message from server: type='%d' path='%s' iface='%s'" diff --git a/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb b/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb index 42cd032c22..f40b48836a 100644 --- a/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb +++ b/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb @@ -6,7 +6,7 @@ SRCREV = "1226a0a1374628ff191f6d8a56000be5e53e7608" PV = "0.0.0+gitr${SRCPV}" PR = "r1.59" -SRC_URI = "git://github.com/alban/dbus-daemon-proxy \ +SRC_URI = "git://github.com/alban/dbus-daemon-proxy;branch=master;protocol=https \ file://0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-core/emlog/emlog.inc b/meta-oe/recipes-core/emlog/emlog.inc index 9a0f9ba928..948e18da4d 100644 --- a/meta-oe/recipes-core/emlog/emlog.inc +++ b/meta-oe/recipes-core/emlog/emlog.inc @@ -3,7 +3,7 @@ most recent (and only the most recent) output from a process" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=http" +SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=http;branch=master;protocol=https" SRCREV = "aee53e8dee862f35291242ba41b0ca88010f6c71" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-core/glfw/glfw_3.3.bb b/meta-oe/recipes-core/glfw/glfw_3.3.bb index 0fcf716c8e..c920cbd507 100644 --- a/meta-oe/recipes-core/glfw/glfw_3.3.bb +++ b/meta-oe/recipes-core/glfw/glfw_3.3.bb @@ -12,7 +12,7 @@ inherit pkgconfig cmake features_check PV .= "+git${SRCPV}" SRCREV = "781fbbadb0bccc749058177b1385c82da9ace880" -SRC_URI = "git://github.com/glfw/glfw.git" +SRC_URI = "git://github.com/glfw/glfw.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-core/libnfc/libnfc_git.bb b/meta-oe/recipes-core/libnfc/libnfc_git.bb index 9e602f193b..e2bf014b62 100644 --- a/meta-oe/recipes-core/libnfc/libnfc_git.bb +++ b/meta-oe/recipes-core/libnfc/libnfc_git.bb @@ -11,7 +11,7 @@ PV = "1.8.0+git${SRCPV}" S = "${WORKDIR}/git" SRCREV = "f02ff51449240102c27a97173dc495e8e7789046" -SRC_URI = "git://github.com/nfc-tools/libnfc.git" +SRC_URI = "git://github.com/nfc-tools/libnfc.git;branch=master;protocol=https" CFLAGS_append_libc-musl = " -D_GNU_SOURCE" DEPENDS = "libusb" diff --git a/meta-oe/recipes-core/mdbus2/mdbus2_git.bb b/meta-oe/recipes-core/mdbus2/mdbus2_git.bb index 71ab4d45a7..7f5cf822ef 100644 --- a/meta-oe/recipes-core/mdbus2/mdbus2_git.bb +++ b/meta-oe/recipes-core/mdbus2/mdbus2_git.bb @@ -6,7 +6,7 @@ DEPENDS = "readline" PV = "2.3.3+git${SRCPV}" -SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http \ +SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http;branch=master;protocol=https \ file://0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch \ " SRCREV = "28202692d0b441000f4ddb8f347f72d1355021aa" diff --git a/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb b/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb index 553003f7f7..163a74ebe3 100644 --- a/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb +++ b/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Implementation of rpmatch(3) for musl libc." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=81a81bf31abecc50c20862fc8a716329" -SRC_URI = "gitsm://github.com/pullmoll/musl-rpmatch.git;protocol=https" +SRC_URI = "gitsm://github.com/pullmoll/musl-rpmatch.git;protocol=https;branch=master" PV = "1.0+git${SRCPV}" SRCREV = "46267b154987d3e1f25d3a75423faa62bb5ee342" diff --git a/meta-oe/recipes-core/ndctl/ndctl_v69.bb b/meta-oe/recipes-core/ndctl/ndctl_v69.bb index 396da4bb32..beabd41dd9 100644 --- a/meta-oe/recipes-core/ndctl/ndctl_v69.bb +++ b/meta-oe/recipes-core/ndctl/ndctl_v69.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08" inherit autotools-brokensep pkgconfig bash-completion systemd SRCREV = "ea62d6d53bf6f806c4841e97a370201e18446860" -SRC_URI = "git://github.com/pmem/ndctl.git" +SRC_URI = "git://github.com/pmem/ndctl.git;branch=master;protocol=https" DEPENDS = "kmod udev json-c keyutils" diff --git a/meta-oe/recipes-core/opencl/ocl-icd_2.3.0.bb b/meta-oe/recipes-core/opencl/ocl-icd_2.3.0.bb index d94e4c2f0a..1746e21dbf 100644 --- a/meta-oe/recipes-core/opencl/ocl-icd_2.3.0.bb +++ b/meta-oe/recipes-core/opencl/ocl-icd_2.3.0.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Open Source alternative to vendor specific OpenCL ICD loaders." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=1238d5bccbb6bda30654e48dcc0a554b" -SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https" +SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https;branch=master" SRCREV = "59c098b6b1f97a339e3e5308499aee6538ecea40" diff --git a/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb index 0148c0c2e0..6622397740 100644 --- a/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb +++ b/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb @@ -1,7 +1,7 @@ SUMMARY = "OpenCL API C++ bindings" DESCRIPTION = "OpenCL API C++ bindings from Khronos" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=master" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" diff --git a/meta-oe/recipes-core/opencl/opencl-headers_git.bb b/meta-oe/recipes-core/opencl/opencl-headers_git.bb index 4a165001d4..f77bf46d24 100644 --- a/meta-oe/recipes-core/opencl/opencl-headers_git.bb +++ b/meta-oe/recipes-core/opencl/opencl-headers_git.bb @@ -7,7 +7,7 @@ SECTION = "base" S = "${WORKDIR}/git" # v2020.12.18 SRCREV = "c57ba81c460ee97b6b9d0b8d18faf5ba6883114b" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=master;protocol=https" do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb b/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb index b951dabce4..cd10129185 100644 --- a/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb +++ b/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb @@ -11,7 +11,7 @@ inherit pkgconfig cmake S = "${WORKDIR}/git" PV = "2020.12.18+git${SRCPV}" SRCREV = "1d5315c3ed30d026acb79a1aa53a276fc833ffa7" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=master;protocol=https" do_install () { install -d ${D}${bindir} diff --git a/meta-oe/recipes-core/plymouth/files/0001-systemd-switch-to-KillMode-mixed.patch b/meta-oe/recipes-core/plymouth/files/0001-systemd-switch-to-KillMode-mixed.patch new file mode 100644 index 0000000000..eb1c8db21c --- /dev/null +++ b/meta-oe/recipes-core/plymouth/files/0001-systemd-switch-to-KillMode-mixed.patch @@ -0,0 +1,43 @@ +From 9d0f8b2e7bc2d1d2b0900fcdf119bb9a2cc4f474 Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Tue, 25 Aug 2020 10:49:11 -0400 +Subject: [PATCH] systemd: switch to KillMode=mixed + +KillMode=none is deprecated, so we need to stop using it. + +For now, use `KillMode=mixed` and `IgnoreOnIsolate=true` instead. + +In the future, we should change plymouth to be able to exit and +start again without restarting the active animation, but that's +going to require some effort. + +https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/123 + +Upstream-Status: Backport [https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/9d0f8b2e7bc2d1d2b0900fcdf119bb9a2cc4f474] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + systemd-units/plymouth-start.service.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in +index 3d00cc6..830a62d 100644 +--- a/systemd-units/plymouth-start.service.in ++++ b/systemd-units/plymouth-start.service.in +@@ -6,11 +6,12 @@ After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd. + Before=systemd-ask-password-plymouth.service + ConditionKernelCommandLine=!plymouth.enable=0 + ConditionVirtualization=!container ++IgnoreOnIsolate=true + + [Service] + ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session + ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash + Type=forking + RemainAfterExit=yes +-KillMode=none ++KillMode=mixed + SendSIGKILL=no +-- +2.17.1 + diff --git a/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb b/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb index 11fb30d480..158c42f9f4 100644 --- a/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb +++ b/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb @@ -20,6 +20,7 @@ RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support" SRC_URI = " \ http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \ file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ + file://0001-systemd-switch-to-KillMode-mixed.patch \ " SRC_URI[md5sum] = "8a25d23f3ae732af300a56fa33cacff2" diff --git a/meta-oe/recipes-core/safec/safec_3.5.1.bb b/meta-oe/recipes-core/safec/safec_3.5.1.bb index 91d8fc65a0..29158094a1 100644 --- a/meta-oe/recipes-core/safec/safec_3.5.1.bb +++ b/meta-oe/recipes-core/safec/safec_3.5.1.bb @@ -9,7 +9,7 @@ inherit autotools pkgconfig S = "${WORKDIR}/git" # v08112019 SRCREV = "ad76c7b1dbd0403b0c9decf54164fcce271c590f" -SRC_URI = "git://github.com/rurban/safeclib.git \ +SRC_URI = "git://github.com/rurban/safeclib.git;branch=master;protocol=https \ " COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm|aarch64|mips).*-linux' diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Try-to-first-find-googletest-in-the-system-before-do.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Try-to-first-find-googletest-in-the-system-before-do.patch new file mode 100644 index 0000000000..89cb593e60 --- /dev/null +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Try-to-first-find-googletest-in-the-system-before-do.patch @@ -0,0 +1,96 @@ +From b073e1c2b9a8138da83300f598b9a56fc9762b4b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stanislav=20Angelovi=C4=8D?= <angelovic.s@gmail.com> +Date: Mon, 16 Nov 2020 17:05:36 +0100 +Subject: [PATCH] Try to first find googletest in the system before downloading + it (#125) + +Upstream-Status: Backport [d6fdaca] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +--- + tests/CMakeLists.txt | 62 ++++++++++++++++++++++++++++---------------- + 1 file changed, 40 insertions(+), 22 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 97f7c1a..7ecc327 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -2,26 +2,44 @@ + # DOWNLOAD AND BUILD OF GOOGLETEST + #------------------------------- + +-include(FetchContent) +- +-message("Fetching googletest...") +-FetchContent_Declare(googletest +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG master +- GIT_SHALLOW 1 +- UPDATE_COMMAND "") +- +-#FetchContent_MakeAvailable(googletest) # Not available in CMake 3.13 :-( Let's do it manually: +-FetchContent_GetProperties(googletest) +-if(NOT googletest_POPULATED) +- FetchContent_Populate(googletest) +- set(gtest_force_shared_crt ON CACHE INTERNAL "" FORCE) +- set(BUILD_GMOCK ON CACHE INTERNAL "" FORCE) +- set(INSTALL_GTEST OFF CACHE INTERNAL "" FORCE) +- set(BUILD_SHARED_LIBS_BAK ${BUILD_SHARED_LIBS}) +- set(BUILD_SHARED_LIBS OFF) +- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) +- set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_BAK}) ++set(GOOGLETEST_VERSION 1.10.0 CACHE STRING "Version of gmock to use") ++set(GOOGLETEST_GIT_REPO "https://github.com/google/googletest.git" CACHE STRING "A git repo to clone and build googletest from if gmock is not found in the system") ++ ++find_package(GTest ${GOOGLETEST_VERSION} CONFIG) ++if (NOT TARGET GTest::gmock) ++ # Try pkg-config if GTest was not found through CMake config ++ find_package(PkgConfig) ++ if (PkgConfig_FOUND) ++ pkg_check_modules(GMock IMPORTED_TARGET GLOBAL gmock>=${GOOGLETEST_VERSION}) ++ if(TARGET PkgConfig::GMock) ++ add_library(GTest::gmock ALIAS PkgConfig::GMock) ++ endif() ++ endif() ++ # GTest was not found in the system, build it on our own ++ if (NOT TARGET GTest::gmock) ++ include(FetchContent) ++ ++ message("Fetching googletest...") ++ FetchContent_Declare(googletest ++ GIT_REPOSITORY ${GOOGLETEST_GIT_REPO} ++ GIT_TAG release-${GOOGLETEST_VERSION} ++ GIT_SHALLOW 1 ++ UPDATE_COMMAND "") ++ ++ #FetchContent_MakeAvailable(googletest) # Not available in CMake 3.13 :-( Let's do it manually: ++ FetchContent_GetProperties(googletest) ++ if(NOT googletest_POPULATED) ++ FetchContent_Populate(googletest) ++ set(gtest_force_shared_crt ON CACHE INTERNAL "" FORCE) ++ set(BUILD_GMOCK ON CACHE INTERNAL "" FORCE) ++ set(INSTALL_GTEST OFF CACHE INTERNAL "" FORCE) ++ set(BUILD_SHARED_LIBS_BAK ${BUILD_SHARED_LIBS}) ++ set(BUILD_SHARED_LIBS OFF) ++ add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) ++ set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_BAK}) ++ add_library(GTest::gmock ALIAS gmock) ++ endif() ++ endif() + endif() + + #------------------------------- +@@ -87,11 +105,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + + add_executable(sdbus-c++-unit-tests ${UNITTESTS_SRCS}) + target_compile_definitions(sdbus-c++-unit-tests PRIVATE LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}) +-target_link_libraries(sdbus-c++-unit-tests sdbus-c++-objlib gmock gmock_main) ++target_link_libraries(sdbus-c++-unit-tests sdbus-c++-objlib GTest::gmock) + + add_executable(sdbus-c++-integration-tests ${INTEGRATIONTESTS_SRCS}) + target_compile_definitions(sdbus-c++-integration-tests PRIVATE LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}) +-target_link_libraries(sdbus-c++-integration-tests sdbus-c++ gmock gmock_main) ++target_link_libraries(sdbus-c++-integration-tests sdbus-c++ GTest::gmock) + + # Manual performance and stress tests + option(ENABLE_PERF_TESTS "Build and install manual performance tests (default OFF)" OFF) diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch new file mode 100644 index 0000000000..ae449791f1 --- /dev/null +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch @@ -0,0 +1,53 @@ +From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Mon, 12 Apr 2021 14:03:32 +0200 +Subject: [PATCH] meson: do not fail if rsync is not installed with meson + 0.57.2 + +https://github.com/mesonbuild/meson/issues/8641 + +Our CI started to fail. Even if the change is reverted in meson, +we need a quick workaround here. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + man/meson.build | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +diff --git a/man/meson.build b/man/meson.build +index 3cae8446cda..f9c4b83dc81 100644 +--- a/man/meson.build ++++ b/man/meson.build +@@ -184,17 +184,20 @@ html = custom_target( + depends : html_pages, + command : ['echo']) + +-run_target( +- 'doc-sync', +- depends : man_pages + html_pages, +- command : ['rsync', '-rlv', +- '--delete-excluded', +- '--include=man', +- '--include=*.html', +- '--exclude=*', +- '--omit-dir-times', +- meson.current_build_dir(), +- get_option('www-target')]) ++rsync = find_program('rsync', required : false) ++if rsync.found() ++ run_target( ++ 'doc-sync', ++ depends : man_pages + html_pages, ++ command : [rsync, '-rlv', ++ '--delete-excluded', ++ '--include=man', ++ '--include=*.html', ++ '--exclude=*', ++ '--omit-dir-times', ++ meson.current_build_dir(), ++ get_option('www-target')]) ++endif + + ############################################################ + diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb index 4b93087f4f..59d6f352c8 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb @@ -12,9 +12,10 @@ DEPENDS += "gperf-native gettext-native util-linux libcap" SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a" SRCBRANCH = "v243-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" - -SRC_URI += "file://static-libsystemd-pkgconfig.patch" +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ + file://static-libsystemd-pkgconfig.patch \ + file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ + " # patches needed by musl SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}" diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb index 98829765c2..a8bf43c874 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb @@ -12,13 +12,16 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-exte ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap" PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd" -PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${BPN}/tests,-DBUILD_TESTS=OFF" +PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${BPN}/tests,-DBUILD_TESTS=OFF,googletest gmock" DEPENDS += "expat" SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd" -SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master" -SRC_URI += "file://run-ptest" + +SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \ + file://0001-Try-to-first-find-googletest-in-the-system-before-do.patch \ + file://run-ptest \ +" EXTRA_OECMAKE = "-DBUILD_CODE_GEN=ON \ -DBUILD_DOC=ON \ diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.7.bb index 498f333810..700984010f 100644 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.7.bb @@ -17,8 +17,8 @@ DEPENDS = " \ " SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "504d1ab22cbc4d1a59a8d8c7ee5ed3bf" -SRC_URI[sha256sum] = "b296b7a21ea576c2b180611ccb19d06aec8dddaedf7c704b0c6a81210c25635f" +SRC_URI[md5sum] = "9c5952cebb836ee783b0b76c5380a964" +SRC_URI[sha256sum] = "61835132a5986217af17b8943013aa3fe6d47bdc1a07386343526765e2ce27a9" inherit autotools gettext pkgconfig diff --git a/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb b/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb index 9b1ba4f2ea..93218bab30 100644 --- a/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb +++ b/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=bc974d217b525ea216a336adb73e1220" SRCREV = "a92b1a54b003879322c044adf0ae3ea3e95e7348" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb index e76fba09c3..6286ae038e 100644 --- a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb +++ b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb @@ -7,7 +7,7 @@ DEPENDS = "libtool" S = "${WORKDIR}/git" SRCREV = "d41284525ec8960e9a828979cfe269012b7df8db" -SRC_URI = "git://github.com/smuellerDD/libkcapi.git \ +SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https \ file://0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch \ " diff --git a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb index a7365f193a..60e5bb682f 100644 --- a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb +++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.GPL;md5=8a71d0475d08eee76d8b6d0c6dbec543 \ file://COPYING.BSD;md5=66b7a37c3c10483c1fd86007726104d7 \ " -SRC_URI = "git://github.com/OpenSC/${BPN}.git" +SRC_URI = "git://github.com/OpenSC/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" # v1.27 diff --git a/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb b/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb index b597ef1ea8..bfc19ed150 100644 --- a/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb +++ b/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/google/leveldb" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" -SRC_URI = "git://github.com/google/${BPN}.git \ +SRC_URI = "git://github.com/google/${BPN}.git;branch=master;protocol=https \ file://run-ptest" SRCREV = "78b39d68c15ba020c0d60a3906fb66dbf1697595" diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.12.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.13.bb index 73b2a0980d..73b2a0980d 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.12.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.13.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 3ecb292560..4a7b3cac48 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -13,7 +13,6 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://configure.cmake-fix-valgrind.patch \ file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \ file://0001-disable-ucontext-on-musl.patch \ - file://c11_atomics.patch \ file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ file://0001-Fix-library-LZ4-lookup.patch \ @@ -25,7 +24,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ " SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "ab4f1ca69a30c5372e191a68e8b543a74168327680fb1f4067e8cc0a5582e4bd" +SRC_URI[sha256sum] = "16f008c66831130e9263b2601265d566ffc4e890d37bacecd4dcecebfd0d1c58" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch b/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch deleted file mode 100644 index 1c76ab3918..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 976468458d53d8bb71acf48ddfc852a60557acb9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <vicentiu@mariadb.org> -Date: Thu, 23 Jul 2020 00:02:21 -0700 -Subject: [PATCH] Link with libatomic to enable C11 atomics support - - Some architectures (mips) require libatomic to support proper - atomic operations. Check first if support is available without - linking, otherwise use the library. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - configure.cmake | 20 +++++++++++++++++++- - mysys/CMakeLists.txt | 4 ++++ - sql/CMakeLists.txt | 4 ++++ - 3 files changed, 27 insertions(+), 1 deletion(-) - -diff --git a/configure.cmake b/configure.cmake -index 4fc324a9..23a2ea91 100644 ---- a/configure.cmake -+++ b/configure.cmake -@@ -862,7 +862,25 @@ int main() - long long int *ptr= &var; - return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); - }" --HAVE_GCC_C11_ATOMICS) -+HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) -+IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) -+ SET(HAVE_GCC_C11_ATOMICS True) -+ELSE() -+ SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) -+ LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") -+ CHECK_CXX_SOURCE_COMPILES(" -+ int main() -+ { -+ long long int var= 1; -+ long long int *ptr= &var; -+ return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); -+ }" -+ HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ SET(HAVE_GCC_C11_ATOMICS True) -+ ENDIF() -+ SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES}) -+ENDIF() - - IF(WITH_VALGRIND) - SET(HAVE_valgrind 1) -diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt -index 6aab788f..91b9c393 100644 ---- a/mysys/CMakeLists.txt -+++ b/mysys/CMakeLists.txt -@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} - ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO}) - DTRACE_INSTRUMENT(mysys) - -+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ TARGET_LINK_LIBRARIES(mysys atomic) -+ENDIF() -+ - IF(HAVE_BFD_H) - TARGET_LINK_LIBRARIES(mysys bfd) - ENDIF(HAVE_BFD_H) -diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt -index b9cd418f..d42e5017 100644 ---- a/sql/CMakeLists.txt -+++ b/sql/CMakeLists.txt -@@ -222,6 +222,10 @@ ELSE() - SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) - ENDIF() - -+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ TARGET_LINK_LIBRARIES(sql atomic) -+ENDIF() -+ - IF(MSVC OR CMAKE_SYSTEM_NAME MATCHES AIX) - SET(libs_to_export_symbols sql mysys dbug strings) - # Create shared library of already compiled object --- -2.25.1 - diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.5.12.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.5.13.bb index 57d7736ea3..57d7736ea3 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb_10.5.12.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb_10.5.13.bb diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch b/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch index 0dc6ece6da..5c65e6185f 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch @@ -1,4 +1,4 @@ -From b06a228a5fd1589fc9bed654b3288b321fc21aa1 Mon Sep 17 00:00:00 2001 +From 0b60fe3c39b2f62f9867d955da82d9d20c42d028 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" <rjones@redhat.com> Date: Sun, 20 Nov 2016 15:04:52 +0000 Subject: [PATCH] Add support for RISC-V. @@ -9,9 +9,11 @@ extending the existing aarch64 macro works. src/include/storage/s_lock.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) +diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h +index 6b368a5..f7d3387 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h -@@ -316,11 +316,12 @@ tas(volatile slock_t *lock) +@@ -317,11 +317,12 @@ tas(volatile slock_t *lock) /* * On ARM and ARM64, we use __sync_lock_test_and_set(int *, int) if available. @@ -25,7 +27,7 @@ extending the existing aarch64 macro works. #ifdef HAVE_GCC__SYNC_INT32_TAS #define HAS_TEST_AND_SET -@@ -337,7 +338,7 @@ tas(volatile slock_t *lock) +@@ -338,7 +339,7 @@ tas(volatile slock_t *lock) #define S_UNLOCK(lock) __sync_lock_release(lock) #endif /* HAVE_GCC__SYNC_INT32_TAS */ @@ -33,4 +35,4 @@ extending the existing aarch64 macro works. +#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ - /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ + /* diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch b/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch index 45f283a02b..17ba04b664 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch @@ -1,4 +1,4 @@ -From 7177d8334a3c28ab0ec5c90e0656f43414929659 Mon Sep 17 00:00:00 2001 +From eba2c940afcd83521f591ccf6b49eca06908ea8e Mon Sep 17 00:00:00 2001 From: Yi Fan Yu <yifan.yu@windriver.com> Date: Fri, 5 Feb 2021 17:15:42 -0500 Subject: [PATCH] configure.in: bypass autoconf 2.69 version check @@ -12,11 +12,13 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> configure.in | 4 ---- 1 file changed, 4 deletions(-) +diff --git a/configure.in b/configure.in +index fb14dcc..a2b4a4f 100644 --- a/configure.in +++ b/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un +@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [13.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [13.5], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not @@ -25,3 +27,6 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> AC_COPYRIGHT([Copyright (c) 1996-2020, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) +-- +2.17.1 + diff --git a/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch b/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch new file mode 100644 index 0000000000..92a3dcc710 --- /dev/null +++ b/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch @@ -0,0 +1,38 @@ +Remove duplicate code for riscv + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/src/include/storage/s_lock.h ++++ b/src/include/storage/s_lock.h +@@ -341,30 +341,6 @@ tas(volatile slock_t *lock) + #endif /* HAVE_GCC__SYNC_INT32_TAS */ + #endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ + +- +-/* +- * RISC-V likewise uses __sync_lock_test_and_set(int *, int) if available. +- */ +-#if defined(__riscv) +-#ifdef HAVE_GCC__SYNC_INT32_TAS +-#define HAS_TEST_AND_SET +- +-#define TAS(lock) tas(lock) +- +-typedef int slock_t; +- +-static __inline__ int +-tas(volatile slock_t *lock) +-{ +- return __sync_lock_test_and_set(lock, 1); +-} +- +-#define S_UNLOCK(lock) __sync_lock_release(lock) +- +-#endif /* HAVE_GCC__SYNC_INT32_TAS */ +-#endif /* __riscv */ +- +- + /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ + #if defined(__s390__) || defined(__s390x__) + #define HAS_TEST_AND_SET diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_13.3.bb b/meta-oe/recipes-dbs/postgresql/postgresql_13.5.bb index 862dd61bd6..1588c30282 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql_13.3.bb +++ b/meta-oe/recipes-dbs/postgresql/postgresql_13.5.bb @@ -7,6 +7,7 @@ SRC_URI += "\ file://0001-Add-support-for-RISC-V.patch \ file://0001-Improve-reproducibility.patch \ file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \ + file://remove_duplicate.patch \ " -SRC_URI[sha256sum] = "3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1" +SRC_URI[sha256sum] = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3" diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_6.15.5.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_6.15.5.bb index acef05b015..f67f79ca57 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_6.15.5.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_6.15.5.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ SRCREV = "abd4b1ff1504ae2a7ed6e60bc9c9797b880c33a5" SRCBRANCH = "6.15.fb" -SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \ file://0001-cmake-Add-check-for-atomic-support.patch \ file://0001-cmake-Use-exported-target-for-bz2.patch \ file://0001-folly-Use-SYS_futex-for-syscall.patch \ diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch new file mode 100644 index 0000000000..c0fb0571f7 --- /dev/null +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch @@ -0,0 +1,82 @@ +From d3424201a73f29ab533121b1821a76e1b4313beb Mon Sep 17 00:00:00 2001 +From: Abseil Team <absl-team@google.com> +Date: Mon, 3 May 2021 07:37:39 -0700 +Subject: [PATCH] Export of internal Abseil changes + +-- +cf88f9cf40eab54c06bca7f20795352ec23bb583 by Derek Mauro <dmauro@google.com>: + +Fixes build with latest glibc +Fixes #952 + +PiperOrigin-RevId: 371693908 + +-- +99bcd0f4a747ce7a401e23c745adf34d0ec5131b by Samuel Benzaquen <sbenza@google.com>: + +Add support for std::string_view in StrFormat even when +absl::string_view != std::string_view. + +PiperOrigin-RevId: 371693633 + +-- +e35463572149a6c2d4a0d439b9300ce03fd6b96d by Abseil Team <absl-team@google.com>: + +Cmake builds should only install pkg-config when explicitly requested. + +PiperOrigin-RevId: 371403419 +GitOrigin-RevId: cf88f9cf40eab54c06bca7f20795352ec23bb583 +Change-Id: I4360a18c638a4d901ff44ab1e0a9d8f321c302ea +--- + absl/debugging/failure_signal_handler.cc | 3 ++- + absl/strings/internal/str_format/arg.h | 8 ++++++++ + absl/strings/internal/str_format/convert_test.cc | 3 +++ + 3 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc +index 5d13bdbb..2ed137b5 100644 +--- a/absl/debugging/failure_signal_handler.cc ++++ b/absl/debugging/failure_signal_handler.cc +@@ -135,7 +135,8 @@ static bool SetupAlternateStackOnce() { + #else + const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; + #endif +- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; ++ size_t stack_size = ++ (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask; + #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ + defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) + // Account for sanitizer instrumentation requiring additional stack space. +diff --git a/absl/strings/internal/str_format/arg.h b/absl/strings/internal/str_format/arg.h +index 3dbc1526..f9d89d12 100644 +--- a/absl/strings/internal/str_format/arg.h ++++ b/absl/strings/internal/str_format/arg.h +@@ -108,6 +108,14 @@ StringConvertResult FormatConvertImpl(const std::string& v, + StringConvertResult FormatConvertImpl(string_view v, + FormatConversionSpecImpl conv, + FormatSinkImpl* sink); ++#if defined(ABSL_HAVE_STD_STRING_VIEW) && !defined(ABSL_USES_STD_STRING_VIEW) ++inline StringConvertResult FormatConvertImpl(std::string_view v, ++ FormatConversionSpecImpl conv, ++ FormatSinkImpl* sink) { ++ return FormatConvertImpl(absl::string_view(v.data(), v.size()), conv, sink); ++} ++#endif // ABSL_HAVE_STD_STRING_VIEW && !ABSL_USES_STD_STRING_VIEW ++ + ArgConvertResult<FormatConversionCharSetUnion( + FormatConversionCharSetInternal::s, FormatConversionCharSetInternal::p)> + FormatConvertImpl(const char* v, const FormatConversionSpecImpl conv, +diff --git a/absl/strings/internal/str_format/convert_test.cc b/absl/strings/internal/str_format/convert_test.cc +index 634ee78b..cc789530 100644 +--- a/absl/strings/internal/str_format/convert_test.cc ++++ b/absl/strings/internal/str_format/convert_test.cc +@@ -215,6 +215,9 @@ TEST_F(FormatConvertTest, BasicString) { + TestStringConvert(static_cast<const char*>("hello")); + TestStringConvert(std::string("hello")); + TestStringConvert(string_view("hello")); ++#if defined(ABSL_HAVE_STD_STRING_VIEW) ++ TestStringConvert(std::string_view("hello")); ++#endif // ABSL_HAVE_STD_STRING_VIEW + } + + TEST_F(FormatConvertTest, NullString) { diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index 903b7b4b82..a49fe672e8 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -10,10 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" PV = "20200923+git${SRCPV}" SRCREV = "6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c" BRANCH = "lts_2020_09_23" -SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ +SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ file://0001-absl-always-use-asm-sgidefs.h.patch \ file://0002-Remove-maes-option-from-cross-compilation.patch \ file://abseil-ppc-fixes.patch \ + file://0001-Export-of-internal-Abseil-changes.patch \ " S = "${WORKDIR}/git" 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 \ diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb b/meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb index 826291a5e4..cca9c63824 100644 --- a/meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb +++ b/meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \ file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" SRCREV = "cae55f54c53449fd07f8a917dcd0874db2c15032" -SRC_URI = "git://github.com/${BPN}/${BPN}.git" +SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/boost-url/boost-url_git.bb b/meta-oe/recipes-devtools/boost-url/boost-url_git.bb index 107a4a8331..488ccfdb09 100644 --- a/meta-oe/recipes-devtools/boost-url/boost-url_git.bb +++ b/meta-oe/recipes-devtools/boost-url/boost-url_git.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/CPPAlliance/url.git;branch=develop" +SRC_URI = "git://github.com/CPPAlliance/url.git;branch=develop;protocol=https" SRCREV = "2c867fbe284ae532f1329b87a86ad3f8cd382867" diff --git a/meta-oe/recipes-devtools/bootchart/bootchart_git.bb b/meta-oe/recipes-devtools/bootchart/bootchart_git.bb index 2b75eaac9d..79754050d0 100644 --- a/meta-oe/recipes-devtools/bootchart/bootchart_git.bb +++ b/meta-oe/recipes-devtools/bootchart/bootchart_git.bb @@ -8,7 +8,7 @@ PV = "1.17" PR = "r1" PE = "1" -SRC_URI = "git://gitorious.org/meego-developer-tools/bootchart.git;protocol=https \ +SRC_URI = "git://gitorious.org/meego-developer-tools/bootchart.git;protocol=https;branch=master \ file://0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch \ file://0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch \ " diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index 81955f450d..1434e4fee6 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -28,11 +28,11 @@ SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac" SRCREV_lss = "fd00dbbd0c06a309c657d89e9430143b179ff6db" SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770" -SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main \ - git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest \ - git://github.com/protocolbuffers/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf \ +SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \ + git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest;branch=main;protocol=https \ + git://github.com/protocolbuffers/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \ git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=git/src/third_party/lss;name=lss \ - git://chromium.googlesource.com/external/gyp;protocol=https;destsuffix=git/src/tools/gyp;name=gyp \ + git://chromium.googlesource.com/external/gyp;protocol=https;destsuffix=git/src/tools/gyp;name=gyp;branch=master \ file://0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch \ file://0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch \ file://0001-Turn-off-sign-compare-for-musl-libc.patch \ diff --git a/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb b/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb index 54e9daee7b..9c263bc52e 100644 --- a/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb +++ b/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb @@ -5,7 +5,7 @@ SECTION = "console/tools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" -SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV} \ +SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https \ file://0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch;patchdir=../ \ " SRCREV = "57a4ca5af5a7f55b768a9d9d6655250bffb1257f" diff --git a/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb b/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb index 1a4e53d508..200f751669 100644 --- a/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb +++ b/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0" -SRC_URI = "git://github.com/DaveGamble/cJSON.git" +SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https" SRCREV = "d348621ca93571343a56862df7de4ff3bc9b5667" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb index 8c6cf7db20..996314a758 100644 --- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb +++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb @@ -10,7 +10,7 @@ SECTION = "base" PV = "0.5.1+git${SRCPV}" SRCREV = "f97d3da5c375ac2fc5a9173cdd36cb828915a2e1" LIC_FILES_CHKSUM = "file://LICENSE;md5=a0b24c1a8f9ad516a297d055b0294231" -SRC_URI = "git://github.com/concurrencykit/ck.git \ +SRC_URI = "git://github.com/concurrencykit/ck.git;branch=master;protocol=https \ file://cross.patch \ " diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index 887b2a4f3b..038664a6dc 100644 --- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master " +SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master;protocol=https" SRCREV = "6d3fab9b9559b6a483fe668e39c29126cdbb58d8" PV = "1.2" diff --git a/meta-oe/recipes-devtools/exprtk/exprtk_git.bb b/meta-oe/recipes-devtools/exprtk/exprtk_git.bb index 6930f31e96..df414959d5 100644 --- a/meta-oe/recipes-devtools/exprtk/exprtk_git.bb +++ b/meta-oe/recipes-devtools/exprtk/exprtk_git.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRCREV = "281c2ccc65b8f91c012ea3725ebcef406378a225" -SRC_URI = "git://github.com/ArashPartow/exprtk.git" +SRC_URI = "git://github.com/ArashPartow/exprtk.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb index bbc2a4a1d6..35116601d1 100644 --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "6df40a2471737b27271bdd9b900ab5f3aec746c7" -SRC_URI = "git://github.com/google/flatbuffers.git" +SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https" CVE_CHECK_WHITELIST += "CVE-2020-35864" diff --git a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb b/meta-oe/recipes-devtools/guider/guider_3.9.8.bb index 6277c41b48..d10221a6bd 100644 --- a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb +++ b/meta-oe/recipes-devtools/guider/guider_3.9.8.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" PV = "3.9.8+git${SRCPV}" -SRC_URI = "git://github.com/iipeace/${BPN}" +SRC_URI = "git://github.com/iipeace/${BPN};branch=master;protocol=https" SRCREV = "a502cd93b13235b7539557a91328de00b7c51bc3" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb index f2235afef3..fb9c9fae54 100644 --- a/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb +++ b/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "zlib boost libunwind elfutils" -SRC_URI = "git://github.com/KDE/heaptrack.git;protocol=https \ +SRC_URI = "git://github.com/KDE/heaptrack.git;protocol=https;branch=master \ file://0001-libheaptrack-Replace-__pid_t-with-pid_t.patch \ file://0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch \ file://0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch \ diff --git a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb index 7f6c34eb3d..4a8de5f3b0 100644 --- a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb +++ b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb @@ -2,7 +2,7 @@ SUMMARY = "JSON schema validator for JSON for Modern C++" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c441d022da1b1663c70181a32225d006" -SRC_URI = "git://github.com/pboettch/json-schema-validator" +SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=master;protocol=https" SRCREV = "27fc1d094503623dfe39365ba82581507524545c" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.4.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.4.bb index a02ff4a4da..051304db77 100644 --- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.4.bb +++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.4.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b" PE = "1" SRCREV = "9059f5cad030ba11d37818847443a53918c327b1" -SRC_URI = "git://github.com/open-source-parsers/jsoncpp" +SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb index 0ae39765f2..086b7a4aa1 100644 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb @@ -9,7 +9,7 @@ SECTION = "libs" DEPENDS = "curl jsoncpp libmicrohttpd hiredis" -SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp \ +SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp;branch=master;protocol=https \ file://0001-Fix-build-with-libmicrohttpd.patch \ " diff --git a/meta-oe/recipes-devtools/lapack/lapack_3.9.0.bb b/meta-oe/recipes-devtools/lapack/lapack_3.9.0.bb index 62d4df5e09..72f06ae44f 100644 --- a/meta-oe/recipes-devtools/lapack/lapack_3.9.0.bb +++ b/meta-oe/recipes-devtools/lapack/lapack_3.9.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=930f8aa500a47c7dab0f8efb5a1c9a40" DEPENDS = "libgfortran" SRCREV = "6acc99d5f39130be7cec00fb835606042101a970" -SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https" +SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https;branch=master" S = "${WORKDIR}/git" EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=ON " diff --git a/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb b/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb index b83e86a488..2dc3776e81 100644 --- a/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb +++ b/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb @@ -7,7 +7,7 @@ Cluster segmentation described in Annex #29 (UAX #29)." LICENSE = "Artistic-1.0 | GPLv1+" LIC_FILES_CHKSUM = "file://COPYING;md5=5b122a36d0f6dc55279a0ebc69f3c60b" -SRC_URI = "git://github.com/hatukanezumi/sombok.git;protocol=https \ +SRC_URI = "git://github.com/hatukanezumi/sombok.git;protocol=https;branch=master \ file://0001-configure.ac-fix-cross-compiling-issue.patch \ " diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-oe/recipes-devtools/libubox/libubox_git.bb index 7dbefa1152..18f26b009b 100644 --- a/meta-oe/recipes-devtools/libubox/libubox_git.bb +++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "\ " SRC_URI = "\ - git://git.openwrt.org/project/libubox.git \ + git://git.openwrt.org/project/libubox.git;branch=master \ file://0001-version-libraries.patch \ file://fix-libdir.patch \ file://0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch \ diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 17264cef5e..1887cf3afe 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -14,7 +14,7 @@ PV = "7.91+git${SRCPV}" SRCREV = "c22d359433b333937ee3d803450dc41998115685" DEPENDS = "elfutils" -SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http \ +SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http;protocol=https \ file://configure-allow-to-disable-selinux-support.patch \ file://0001-replace-readdir_r-with-readdir.patch \ file://0001-Use-correct-enum-type.patch \ diff --git a/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb b/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb index 1bee9fe0b9..83f6aa0f42 100644 --- a/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb +++ b/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7dd2aad04bb7ca212e69127ba8d58f9f" DEPENDS += "lua-native lua" -SRC_URI = "git://github.com/luaposix/luaposix.git;branch=release \ +SRC_URI = "git://github.com/luaposix/luaposix.git;branch=release;protocol=https \ file://0001-fix-avoid-race-condition-between-test-and-mkdir.patch \ " SRCREV = "8e4902ed81c922ed8f76a7ed85be1eaa3fd7e66d" diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb index 5224f32b03..907ca72555 100644 --- a/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb +++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ PV .= "+git${SRCPV}" -SRC_URI = "git://github.com/msgpack/msgpack-c \ +SRC_URI = "git://github.com/msgpack/msgpack-c;branch=master;protocol=https \ " # cpp-3.2.1 SRCREV = "8085ab8721090a447cf98bb802d1406ad7afe420" diff --git a/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-oe/recipes-devtools/musl/musl-nscd_git.bb index 6af7ab9cd8..ac2b5a266b 100644 --- a/meta-oe/recipes-devtools/musl/musl-nscd_git.bb +++ b/meta-oe/recipes-devtools/musl/musl-nscd_git.bb @@ -12,7 +12,7 @@ DEPENDS += "flex-native bison-native flex bison" PV = "1.0.2" SRCREV = "af581482a3e1059458f3c8b20a56f82807ca3bd4" -SRC_URI = "git://github.com/pikhq/musl-nscd \ +SRC_URI = "git://github.com/pikhq/musl-nscd;branch=master;protocol=https \ file://0001-Fix-build-under-GCC-fno-common.patch \ file://0001-configure-Check-for-flex-if-lex-is-not-found.patch \ file://0001-nsswitch.y-Replace-empty-bison-extension.patch \ diff --git a/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb b/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb index a97eb53c1d..62fdecf6ff 100644 --- a/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb +++ b/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=b67209a1e36b682a8226de19d265b1e0" -SRC_URI = "git://github.com/nlohmann/fifo_map.git" +SRC_URI = "git://github.com/nlohmann/fifo_map.git;branch=master;protocol=https" PV = "1.0.0+git${SRCPV}" diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.9.1.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.9.1.bb index 359324266d..423ce69c03 100644 --- a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.9.1.bb +++ b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.9.1.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=dd0607f896f392c8b7d0290a676efc24" -SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1 \ +SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1;protocol=https \ " SRCREV = "db78ac1d7716f56fc9f1b030b715f872f93964e4" diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 85add50b6c..8aabd0b382 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -5,10 +5,10 @@ DEPENDS = "libusb-compat libftdi" RDEPENDS_${PN} = "libusb1" SRC_URI = " \ - git://repo.or.cz/openocd.git;protocol=http;name=openocd \ - git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ - git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ - git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ + git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \ + git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ + git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl;branch=master \ + git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \ " SRCREV_FORMAT = "openocd" diff --git a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb index 107d5a8b72..84f6c3ce24 100644 --- a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb +++ b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" COMPATIBLE_HOST = "(x86_64|aarch64|arm)" SRCREV = "09724edb1783a98da2b7ae53c5aaa87493aabc9b" -SRC_URI = "git://github.com/billfarrow/pcimem.git " +SRC_URI = "git://github.com/billfarrow/pcimem.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/perl/ipc-run_20200505.0.bb b/meta-oe/recipes-devtools/perl/ipc-run_20200505.0.bb index 27dc358d15..bab1827ff6 100644 --- a/meta-oe/recipes-devtools/perl/ipc-run_20200505.0.bb +++ b/meta-oe/recipes-devtools/perl/ipc-run_20200505.0.bb @@ -9,7 +9,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=0ebd37caf53781e8b7223e6b99b63f4e" DEPENDS = "perl" -SRC_URI = "git://github.com/toddr/IPC-Run.git" +SRC_URI = "git://github.com/toddr/IPC-Run.git;branch=master;protocol=https" SRCREV = "af435a1635ef9e48a84adc3230099e7ecf20c79d" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb index 049dc665dd..760c0ad0a5 100644 --- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb +++ b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb @@ -15,7 +15,7 @@ DEPENDS += "libdev-checklib-perl-native libdbi-perl-native libmysqlclient" LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" SRCREV = "9b5b70ea372f49fe9bc9e592dae3870596d1e3d6" -SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https" +SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb b/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb index 4e7aeb1286..3c48cb22f7 100644 --- a/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb +++ b/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1171;endline=1176;md5=3be2cb8159d094 DEPENDS += "perl" -SRC_URI = "git://github.com/makamaka/JSON.git;protocol=https" +SRC_URI = "git://github.com/makamaka/JSON.git;protocol=https;branch=master" SRCREV = "ebbae181c5e311fa80ee4c6379b598c7a6400570" diff --git a/meta-oe/recipes-devtools/ply/ply_git.bb b/meta-oe/recipes-devtools/ply/ply_git.bb index b1327efebf..27e04d319c 100644 --- a/meta-oe/recipes-devtools/ply/ply_git.bb +++ b/meta-oe/recipes-devtools/ply/ply_git.bb @@ -7,7 +7,7 @@ DEPENDS += "bison-native" PV = "2.1.1+git${SRCPV}" -SRC_URI = "git://github.com/iovisor/ply" +SRC_URI = "git://github.com/iovisor/ply;branch=master;protocol=https" SRCREV = "e25c9134b856cc7ffe9f562ff95caf9487d16b59" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb index 9afcbbb7f5..f605d2c90d 100644 --- a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb +++ b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" PV = "20130209+git${SRCPV}" -SRC_URI = "git://github.com/anyc/pmtools.git \ +SRC_URI = "git://github.com/anyc/pmtools.git;branch=master;protocol=https \ file://pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch \ " SRCREV = "3ebe0e54c54061b4c627236cbe35d820de2e1168" diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb index 6fef0bed2c..ee84b4e049 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb @@ -14,7 +14,7 @@ DEPENDS = "protobuf-native protobuf" SRCREV = "f20a3fa131c275a0e795d99a28f94b4dbbb5af26" -SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \ +SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https \ file://0001-avoid-race-condition.patch \ " diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Lower-init-prio-for-extension-attributes.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Lower-init-prio-for-extension-attributes.patch new file mode 100644 index 0000000000..9f4fd71796 --- /dev/null +++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Lower-init-prio-for-extension-attributes.patch @@ -0,0 +1,81 @@ +From 00362d12edf1b7fde723b041a4569dc659e65ad1 Mon Sep 17 00:00:00 2001 +From: Jani Nurminen <jani.nurminen@windriver.com> +Date: Fri, 24 Sep 2021 09:56:11 +0200 +Subject: Lower init prio for extension attributes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Added PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY in +code generation for extension attributes. +It has lower prio than PROTOBUF_ATTRIBUTE_INIT_PRIORITY to +ensure that extension attributes are initialized after +other attribute. +This is needed in some applications to avoid segmentation fault. + +Reported by Karl-Herman Näslund. + +Signed-off-by: Jani Nurminen <jani.nurminen@windriver.com> + +Upstream-Status: Pending + +Signed-off-by: He Zhe <zhe.he@windriver.com> +--- + src/google/protobuf/compiler/cpp/cpp_extension.cc | 2 +- + src/google/protobuf/port_def.inc | 7 +++++++ + src/google/protobuf/port_undef.inc | 1 + + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/google/protobuf/compiler/cpp/cpp_extension.cc b/src/google/protobuf/compiler/cpp/cpp_extension.cc +index 3792db81a..cbec19d30 100644 +--- a/src/google/protobuf/compiler/cpp/cpp_extension.cc ++++ b/src/google/protobuf/compiler/cpp/cpp_extension.cc +@@ -174,7 +174,7 @@ void ExtensionGenerator::GenerateDefinition(io::Printer* printer) { + } + + format( +- "PROTOBUF_ATTRIBUTE_INIT_PRIORITY " ++ "PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY " + "::$proto_ns$::internal::ExtensionIdentifier< $extendee$,\n" + " ::$proto_ns$::internal::$type_traits$, $field_type$, $packed$ >\n" + " $scoped_name$($constant_name$, $1$);\n", +diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc +index ae9fef425..f1d203707 100644 +--- a/src/google/protobuf/port_def.inc ++++ b/src/google/protobuf/port_def.inc +@@ -154,6 +154,9 @@ + #ifdef PROTOBUF_ATTRIBUTE_INIT_PRIORITY + #error PROTOBUF_ATTRIBUTE_INIT_PRIORITY was previously defined + #endif ++#ifdef PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY ++#error PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY was previously defined ++#endif + #ifdef PROTOBUF_PRAGMA_INIT_SEG + #error PROTOBUF_PRAGMA_INIT_SEG was previously defined + #endif +@@ -596,6 +599,10 @@ + // Highest priority is 101. We use 102 to allow code that really wants to + // higher priority to still beat us. + #define PROTOBUF_ATTRIBUTE_INIT_PRIORITY __attribute__((init_priority((102)))) ++// Some embedded systems get a segmentation fault if extension attributes are ++// initialized with higher or equal priority as other attributes. This gives ++// extension attributes high priority, but lower than other attributes. ++#define PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY __attribute__((init_priority((103)))) + #else + #define PROTOBUF_ATTRIBUTE_INIT_PRIORITY + #endif +diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc +index daef09bc4..d0c613b55 100644 +--- a/src/google/protobuf/port_undef.inc ++++ b/src/google/protobuf/port_undef.inc +@@ -77,6 +77,7 @@ + #undef PROTOBUF_ATTRIBUTE_WEAK + #undef PROTOBUF_ATTRIBUTE_NO_DESTROY + #undef PROTOBUF_ATTRIBUTE_INIT_PRIORITY ++#undef PROTOBUF_EXTENSION_ATTRIBUTE_INIT_PRIORITY + #undef PROTOBUF_PRAGMA_INIT_SEG + + // Restore macro that may have been #undef'd in port_def.inc. +-- +2.17.1 + diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.15.2.bb b/meta-oe/recipes-devtools/protobuf/protobuf_3.15.2.bb index 0392f9339b..ac4e1ad84b 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.15.2.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.15.2.bb @@ -12,11 +12,12 @@ DEPENDS_append_class-target = " protobuf-native" SRCREV = "d7e943b8d2bc444a8c770644e73d090b486f8b37" -SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ +SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=master;protocol=https \ file://run-ptest \ file://0001-protobuf-fix-configure-error.patch \ file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ + file://0001-Lower-init-prio-for-extension-attributes.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index ac803294e0..eb495e3051 100644 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" -SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1" +SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1;protocol=https" SRCREV = "0ccdbf364c577803e2a751f5aededce935314313" diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb index 16eaf62f78..9e6dcc63ae 100644 --- a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb +++ b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = " \ - git://github.com/nsekhar/serialcheck.git \ + git://github.com/nsekhar/serialcheck.git;branch=master;protocol=https \ " SRCREV = "45eb2ffa5378396e85432872833890b0a1cba872" diff --git a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb index 4a27e4b2a5..9d07405560 100644 --- a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb +++ b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb @@ -8,7 +8,7 @@ inherit cmake DEPENDS += "sqlite3" SRCREV = "e8a9e9416f421303f4b8970caab26dadf8bae98b" -SRC_URI = "git://github.com/fnc12/sqlite_orm;protocol=https" +SRC_URI = "git://github.com/fnc12/sqlite_orm;protocol=https;branch=master" S = "${WORKDIR}/git" EXTRA_OECMAKE += "-DSqliteOrm_BuildTests=OFF" diff --git a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb index 6e2606be68..d7ad1a9512 100644 --- a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb +++ b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=c0de2c0aca56349dab98e97992316f7e \ file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8" SRCREV = "b96f0fc154feef531be76034bf6e38925636146f" -SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https" +SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb b/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb index 9ccf2d0bff..c60bef25e3 100644 --- a/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb +++ b/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb @@ -1,6 +1,6 @@ LICENSE = "GPLv2 & GPLv3 & BSD-3-Clause & LGPL-2.0 & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f9f2b9d61cb769a67c4cd079e1166de7" -SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https \ +SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https;branch=master \ file://0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch \ file://0002-Preserve-links-when-installing-libmetis.patch \ file://0003-Add-version-information-to-libmetis.patch \ diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb index a04fccca75..5d44e20b71 100644 --- a/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb +++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb @@ -12,7 +12,7 @@ inherit autotools PV .= "+git${SRCPV}" SRCREV = "d648bbffedef529220896283fb59e35531c13804" -SRC_URI = "git://github.com/namhyung/${BPN} \ +SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \ file://0001-aarch64-Fix-a-plthook-crash-on-aarch64-with-binutils.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb index aba6dfd885..d3aa6d2ea2 100644 --- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb +++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://xmlrpc-c.sourceforge.net/" LICENSE = "BSD & MIT" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" -SRC_URI = "git://github.com/mirror/xmlrpc-c.git \ +SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \ file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \ file://0002-fix-formatting-issues.patch \ file://0003-src-Makefile-Fix-Makefile-macro-error.patch \ diff --git a/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb b/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb index e112a5e30f..186f2c8ed0 100644 --- a/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb +++ b/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=da2e9aa80962d54e7c726f232a2bd1e8" # Use 1.0.12 tag SRCREV = "17b1790fb9c8abbb3c0f7e083864a6a014191d56" -SRC_URI = "git://github.com/lloyd/yajl;nobranch=1" +SRC_URI = "git://github.com/lloyd/yajl;nobranch=1;protocol=https" inherit cmake lib_package diff --git a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb index d9a5821cbb..cf8dbb183e 100644 --- a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb +++ b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://lloyd.github.com/yajl/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://COPYING;md5=39af6eb42999852bdd3ea00ad120a36d" -SRC_URI = "git://github.com/lloyd/yajl" +SRC_URI = "git://github.com/lloyd/yajl;branch=master;protocol=https" SRCREV = "a0ecdde0c042b9256170f2f8890dd9451a4240aa" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-oe/recipes-devtools/yasm/yasm_git.bb index cacdd74c4e..b5cd35ab3a 100644 --- a/meta-oe/recipes-devtools/yasm/yasm_git.bb +++ b/meta-oe/recipes-devtools/yasm/yasm_git.bb @@ -9,7 +9,7 @@ DEPENDS += "flex-native bison-native xmlto-native" PV = "1.3.0+git${SRCPV}" # v1.3.0 SRCREV = "ba463d3c26c0ece2e797b8d6381b161633b5971a" -SRC_URI = "git://github.com/yasm/yasm.git \ +SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \ file://0001-Do-not-use-AC_HEADER_STDC.patch \ " diff --git a/meta-oe/recipes-extended/beep/beep_1.4.9.bb b/meta-oe/recipes-extended/beep/beep_1.4.9.bb index 8d332b2faf..d426fc65a0 100644 --- a/meta-oe/recipes-extended/beep/beep_1.4.9.bb +++ b/meta-oe/recipes-extended/beep/beep_1.4.9.bb @@ -7,7 +7,7 @@ BUGTRACKER = "https://github.com/spkr-beep/beep/issues" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https \ +SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https;branch=master \ file://0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch \ " SRCREV = "8b85ddd09f73b9fd7caa5679298781a57af194ac" diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb index 0038ba74d2..6a9210a01d 100644 --- a/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb @@ -6,7 +6,7 @@ BUGTRACKER = "https://github.com/google/brotli/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b" -SRC_URI = "git://github.com/google/brotli.git \ +SRC_URI = "git://github.com/google/brotli.git;branch=master;protocol=https \ file://838.patch " # tag 1.0.9 SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71" diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb index 6c71d534be..388feb703b 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064" SECTION = "Development/Libraries" DEPENDS = "swig-native python3 sblim-cmpi-devel" -SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=http \ +SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=http;branch=master;protocol=https \ file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \ file://cmpi-bindings-0.9.5-python-lib-dir.patch \ diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb index a16e810be6..3d412c0c14 100644 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" DEPENDS = "zlib gzip-native json-c" -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ +SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https;branch=master \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ file://317.patch \ diff --git a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb index 7a6b0bf95d..28db39ac20 100644 --- a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb +++ b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb @@ -18,7 +18,7 @@ SRCREV = "42ebcec9dc2c99a1b3a4542787572045763ad196" PV = "0.6.3+git${SRCPV}" SRC_URI = "\ - git://github.com/docopt/docopt.cpp.git;protocol=https \ + git://github.com/docopt/docopt.cpp.git;protocol=https;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb b/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb index d88775f9d9..310081b822 100644 --- a/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb +++ b/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c" SRCREV = "89c1502b9d40b5cb4a844498b14d74ba1dd559bf" -SRC_URI = "git://github.com/Yelp/dumb-init" +SRC_URI = "git://github.com/Yelp/dumb-init;branch=master;protocol=https" S = "${WORKDIR}/git" EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'" diff --git a/meta-oe/recipes-extended/figlet/figlet_git.bb b/meta-oe/recipes-extended/figlet/figlet_git.bb index 4611646b9b..61b050aac6 100644 --- a/meta-oe/recipes-extended/figlet/figlet_git.bb +++ b/meta-oe/recipes-extended/figlet/figlet_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.figlet.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=1688bcd97b27704f1afcac7336409857" -SRC_URI = "git://github.com/cmatsuoka/figlet.git \ +SRC_URI = "git://github.com/cmatsuoka/figlet.git;branch=master;protocol=https \ file://0001-build-add-autotools-support-to-allow-easy-cross-comp.patch" SRCREV = "5bbcd7383a8c3a531299b216b0c734e1495c6db3" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb index b56b2271b1..6241421536 100644 --- a/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb +++ b/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" # v1.9.14 SRCREV = "4da3080ad4587860e5da73072d6ed54d0052938c" -SRC_URI = "git://github.com/jirka-h/haveged.git \ +SRC_URI = "git://github.com/jirka-h/haveged.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb b/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb index 3a7413d8a8..cd9025978f 100644 --- a/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb +++ b/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb @@ -6,7 +6,7 @@ DEPENDS = "ncurses" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "git://github.com/pixel/hexedit.git \ +SRC_URI = "git://github.com/pixel/hexedit.git;branch=master;protocol=https \ " SRCREV = "baf45a289360a39a05253949fb9d1b50e4668d8a" diff --git a/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb b/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb index 29f8de8d2f..cee1f342bd 100644 --- a/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb +++ b/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb @@ -6,7 +6,7 @@ DEPENDS = "redis" LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" SRCREV = "685030652cd98c5414ce554ff5b356dfe8437870" -SRC_URI = "git://github.com/redis/hiredis;protocol=git \ +SRC_URI = "git://github.com/redis/hiredis;protocol=https;branch=master \ file://0001-Makefile-remove-hardcoding-of-CC.patch" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/iotop/iotop_0.6.bb b/meta-oe/recipes-extended/iotop/iotop_0.6.bb index 3a597218db..19af46cb16 100644 --- a/meta-oe/recipes-extended/iotop/iotop_0.6.bb +++ b/meta-oe/recipes-extended/iotop/iotop_0.6.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" PV .= "+git${SRCPV}" SRCREV = "1bfb3bc70febb1ffb95146b6dcd65257228099a3" -SRC_URI = "git://repo.or.cz/iotop.git" +SRC_URI = "git://repo.or.cz/iotop.git;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb index b7899a11b6..2f4724a336 100644 --- a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb +++ b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb @@ -7,7 +7,7 @@ RDEPENDS_${BPN} = "openssl curl" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master \ +SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master;protocol=https \ file://0001-tweak-install-prefix.patch \ file://0002-fix-parallel-error.patch \ " diff --git a/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb index f2805a1b8d..caa13958dd 100644 --- a/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb +++ b/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" PV = "2.3.6+git${SRCPV}" -SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http" +SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http;branch=master;protocol=https" SRCREV = "bc1d4f6587a4a4829b5d55e3ca7ad584da6de545" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb index e6d5663f85..977aabf040 100644 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873" DEPENDS_append_class-target = " swig-native sblim-cmpi-devel python3" DEPENDS_append_class-native = " cmpi-bindings-native" -SRC_URI = "git://github.com/rnovacek/konkretcmpi.git \ +SRC_URI = "git://github.com/rnovacek/konkretcmpi.git;branch=master;protocol=https \ file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch \ file://0001-drop-including-rpath-cmake-module.patch \ " diff --git a/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb b/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb index 1f3cb97c13..c3778bb302 100644 --- a/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb +++ b/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=24b5b3feec63c4be0975e1fea5100440" DEPENDS += "libunwind" -SRC_URI = "git://github.com/ianlancetaylor/libbacktrace;protocol=https" +SRC_URI = "git://github.com/ianlancetaylor/libbacktrace;protocol=https;branch=master" PV = "1.0+git${SRCPV}" SRCREV = "4f57c999716847e45505b3df170150876b545088" diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_2.25.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_2.25.bb index 2c8fdc75ca..8cf48e41cc 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_2.25.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_2.25.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools gobject-introspection -SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch" +SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch;protocol=https" SRCREV = "c50869272b54bf4b4bc3825e8c3332a54678b43f" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb b/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb index 48be1fdac5..e90a5d0eb9 100644 --- a/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb +++ b/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb @@ -10,7 +10,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', ' DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" SRCREV = "29d82c80bcc62be2878a9ac080de7eb286c4beb9" -SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release \ +SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release;protocol=https \ file://0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch \ file://0001-Enhance-reproducibility.patch \ file://0001-Remove-buggy-test-confusing-host-and-target.patch \ diff --git a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb index b7c1958eef..e763a701e5 100644 --- a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb +++ b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb @@ -11,7 +11,7 @@ inherit autotools pkgconfig PV = "0.6.0" SRCREV = "1195abc2f4acc7b10175d570ec73549d0938c83e" -SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https \ +SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb index 6ef5b4f432..51514c2c42 100644 --- a/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb +++ b/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb @@ -9,7 +9,7 @@ DEPENDS = "libxml2 glib-2.0 swig python3" inherit autotools pkgconfig python3native python3targetconfig SRCREV = "c5a30e9267068436a75b5d00fcbf95cb9c1f4dcd" -SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https" +SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb index 343d0bc63f..f2b034f423 100644 --- a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb +++ b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb @@ -9,7 +9,7 @@ inherit autotools pkgconfig gitpkgv PKGV = "${GITPKGVTAG}" SRCREV = "ce98c346b7c1dc2a21faea4fd3f32c88e27ca2af" -SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https" +SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/libleak/libleak_git.bb b/meta-oe/recipes-extended/libleak/libleak_git.bb index 309553c909..7edf702e50 100644 --- a/meta-oe/recipes-extended/libleak/libleak_git.bb +++ b/meta-oe/recipes-extended/libleak/libleak_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=18;endline=21;md5=de4f705f12cdedb DEPENDS += "libbacktrace" -SRC_URI = "gitsm://github.com/WuBingzheng/libleak;protocol=https \ +SRC_URI = "gitsm://github.com/WuBingzheng/libleak;protocol=https;branch=master \ file://0001-respect-environment-variables.patch \ " diff --git a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb b/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb index 7fc5997983..bbfee1ff7a 100644 --- a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb +++ b/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" inherit cmake pkgconfig -SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https \ +SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https;branch=master \ file://0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch \ " SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81" diff --git a/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb b/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb index c9d259b1a0..29c35caf54 100644 --- a/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb +++ b/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb @@ -17,7 +17,7 @@ PV = "1.3+git${SRCPV}" SRCREV = "116219e215858f4af9370171d3ead63baca8fdb4" -SRC_URI = "git://github.com/thkukuk/libnss_nisplus \ +SRC_URI = "git://github.com/thkukuk/libnss_nisplus;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb b/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb index cd4019666d..dbe03fedef 100644 --- a/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb +++ b/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb @@ -11,7 +11,7 @@ inherit autotools pkgconfig # v1.0.5 SRCREV = "d08dbcf08b0da418bce9b5427dfd89522916322a" -SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=version_1 \ +SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=version_1;protocol=https \ file://0001-build-fix-configure-script-neglecting-re-enable-out-.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb b/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb index 4276c49173..24784f77a0 100644 --- a/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb +++ b/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb @@ -11,7 +11,7 @@ DEPENDS = "xmlrpc-c xmlrpc-c-native intltool-native \ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://github.com/abrt/libreport.git;protocol=https" +SRC_URI = "git://github.com/abrt/libreport.git;protocol=https;branch=master" SRC_URI += "file://0001-Makefile.am-remove-doc-and-apidoc.patch \ file://0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch \ file://0003-without-build-plugins.patch \ diff --git a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb index dd34c180a3..0278e55f3e 100644 --- a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb +++ b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRC_URI = "git://git.code.sf.net/p/libuio/code \ +SRC_URI = "git://git.code.sf.net/p/libuio/code;branch=master \ file://replace_inline_with_static-inline.patch \ file://0001-include-fcntl.h-for-O_RDWR-define.patch \ " diff --git a/meta-oe/recipes-extended/md5deep/md5deep_git.bb b/meta-oe/recipes-extended/md5deep/md5deep_git.bb index e8c6864c1f..cc31323c3f 100644 --- a/meta-oe/recipes-extended/md5deep/md5deep_git.bb +++ b/meta-oe/recipes-extended/md5deep/md5deep_git.bb @@ -9,7 +9,7 @@ PV = "4.4+git${SRCPV}" SRCREV = "877613493ff44807888ce1928129574be393cbb0" -SRC_URI = "git://github.com/jessek/hashdeep.git \ +SRC_URI = "git://github.com/jessek/hashdeep.git;branch=master;protocol=https \ file://wrong-variable-expansion.patch \ file://0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch \ " diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 68d83eb008..feb8945c8f 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -11,7 +11,7 @@ DEPENDS = "virtual/crypt expat flex python3 bison-native libxml2 nettle lz4" RDEPENDS_${PN} = "python3-core" SRCREV = "aa42957a2e227df41510047cece3cd606dc1cb6a" -SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ +SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;branch=master;protocol=https \ https://curl.haxx.se/download/curl-7.64.0.tar.bz2;name=curl;subdir=git/thirdparty \ https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz;name=libressl;subdir=git/thirdparty \ ${DEBIAN_MIRROR}/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz;name=ossp-uuid;subdir=git/thirdparty \ diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb index 9b3289f174..a3854b1750 100644 --- a/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=91e7de50a8d3cf01057f318d72460acd" SRCREV = "7786c7ded5c9ce7773890d0e3dc27632898fc6b1" PV = "2.2.0+git${SRCPV}" -SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http;branch=master;protocol=https \ file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \ file://0001-include-Declare-gVERSION-global-as-extern.patch \ " diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb index 9d5a2307e7..f635a9b138 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb @@ -17,7 +17,7 @@ REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "d8eba6cb6682b59d84ca1da67a523520b879ade6" -SRC_URI = "git://github.com/Openwsman/openwsman.git \ +SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=master;protocol=https \ file://libssl-is-required-if-eventint-supported.patch \ file://openwsmand.service \ file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ diff --git a/meta-oe/recipes-extended/ostree/ostree_2021.1.bb b/meta-oe/recipes-extended/ostree/ostree_2021.1.bb index 32aa842ff3..b7f084e6f3 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2021.1.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2021.1.bb @@ -22,7 +22,7 @@ DEPENDS = " \ PREMIRRORS = "" SRC_URI = " \ - gitsm://github.com/ostreedev/ostree;branch=main \ + gitsm://github.com/ostreedev/ostree;branch=main;protocol=https \ file://run-ptest \ " SRCREV = "e9e4b9112083228b8c385ad26924b6c4623f4179" diff --git a/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-oe/recipes-extended/p8platform/p8platform_git.bb index 0690d4ba3c..2e52caeffa 100644 --- a/meta-oe/recipes-extended/p8platform/p8platform_git.bb +++ b/meta-oe/recipes-extended/p8platform/p8platform_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://src/os.h;md5=752555fa94e82005d45fd201fee5bd33" PV = "2.1.0.1" -SRC_URI = "git://github.com/Pulse-Eight/platform.git \ +SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https \ file://0001-Make-resulting-cmake-config-relocatable.patch" SRCREV = "2d90f98620e25f47702c9e848380c0d93f29462b" diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb index 9838e75ef5..5c2af44c73 100644 --- a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb +++ b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb @@ -11,7 +11,7 @@ REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "e2145df09469bf84878e4729b4ecd814efb797d1" -SRC_URI = "git://github.com/PADL/pam_ccreds" +SRC_URI = "git://github.com/PADL/pam_ccreds;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb index 626b22fe48..5022300ba3 100644 --- a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb +++ b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb @@ -11,7 +11,7 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "84d7b260f1ae6857ae36e014c9a5968e8aa1cbe8" -SRC_URI = "git://github.com/rmbreak/pam_ldapdb \ +SRC_URI = "git://github.com/rmbreak/pam_ldapdb;branch=master;protocol=https \ file://0001-include-stdexcept-for-std-invalid_argument.patch \ " diff --git a/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb b/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb index 8bb89f418c..dd368e420b 100644 --- a/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb +++ b/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb @@ -11,7 +11,7 @@ DEPENDS_append_libc-musl = " fts" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/pmem/pmdk.git" +SRC_URI = "git://github.com/pmem/pmdk.git;branch=master;protocol=https" SRCREV = "1926ffb8f3f5f0617b3b3ed32029d437c272f187" diff --git a/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb b/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb index 5db38ac987..0d8b9ba1e0 100644 --- a/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb +++ b/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" PV = "0.0.1+git${SRCPV}" SRCREV = "45863e849b39c4921d6553e6d27e267a96ac7d77" -SRC_URI = "git://github.com/lib-cpp/${BPN}.git" +SRC_URI = "git://github.com/lib-cpp/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb index 8b7a8d06e3..e4346863bf 100644 --- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb +++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb @@ -8,7 +8,7 @@ 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" +SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch index b5c4133e31..43d86094d5 100644 --- a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch @@ -1,4 +1,4 @@ -From 97584e1eb78dc18599534b47b6670c20c63f5ee2 Mon Sep 17 00:00:00 2001 +From aff8b278bd36085036d302027bc215483ad7f32b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 10 Sep 2019 20:04:26 -0700 Subject: [PATCH] src: Do not reset FINAL_LIBS @@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index 7f7c625..c71dd3b 100644 +index 7a7168c..d0680e8 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -75,7 +75,7 @@ endif +@@ -91,7 +91,7 @@ endif FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) @@ -26,7 +26,7 @@ index 7f7c625..c71dd3b 100644 +FINAL_LIBS+=-lm DEBUG=-g -ggdb - # Linux ARM needs -latomic at linking time + # Linux ARM32 needs -latomic at linking time -- -2.23.0 +2.17.1 diff --git a/meta-oe/recipes-extended/redis/redis/CVE-2021-32761.patch b/meta-oe/recipes-extended/redis/redis/CVE-2021-32761.patch deleted file mode 100644 index 14992b789a..0000000000 --- a/meta-oe/recipes-extended/redis/redis/CVE-2021-32761.patch +++ /dev/null @@ -1,257 +0,0 @@ -From 835d15b5360e277e6f95529c4d8685946a977ddd Mon Sep 17 00:00:00 2001 -From: Huang Zhw <huang_zhw@126.com> -Date: Wed, 21 Jul 2021 21:25:19 +0800 -Subject: [PATCH 1/1] On 32 bit platform, the bit position of - GETBIT/SETBIT/BITFIELD/BITCOUNT,BITPOS may overflow (see CVE-2021-32761) - (#9191) - -GETBIT, SETBIT may access wrong address because of wrap. -BITCOUNT and BITPOS may return wrapped results. -BITFIELD may access the wrong address but also allocate insufficient memory and segfault (see CVE-2021-32761). - -This commit uses `uint64_t` or `long long` instead of `size_t`. -related https://github.com/redis/redis/pull/8096 - -At 32bit platform: -> setbit bit 4294967295 1 -(integer) 0 -> config set proto-max-bulk-len 536870913 -OK -> append bit "\xFF" -(integer) 536870913 -> getbit bit 4294967296 -(integer) 0 - -When the bit index is larger than 4294967295, size_t can't hold bit index. In the past, `proto-max-bulk-len` is limit to 536870912, so there is no problem. - -After this commit, bit position is stored in `uint64_t` or `long long`. So when `proto-max-bulk-len > 536870912`, 32bit platforms can still be correct. - -For 64bit platform, this problem still exists. The major reason is bit pos 8 times of byte pos. When proto-max-bulk-len is very larger, bit pos may overflow. -But at 64bit platform, we don't have so long string. So this bug may never happen. - -Additionally this commit add a test cost `512MB` memory which is tag as `large-memory`. Make freebsd ci and valgrind ci ignore this test. - -(cherry picked from commit 71d452876ebf8456afaadd6b3c27988abadd1148)d ---- - -CVE: CVE-2021-32761 - -Upstream-Status: Backport [835d15b5360e277e6f95529c4d8685946a977ddd] - https://github.com/redis/redis.git - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - ---- - .github/workflows/daily.yml | 6 +++--- - src/bitops.c | 32 ++++++++++++++++---------------- - src/server.h | 2 +- - tests/unit/bitops.tcl | 28 ++++++++++++++++++++++++++++ - 4 files changed, 48 insertions(+), 20 deletions(-) - -diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml -index 9e4630e29..432971a9d 100644 ---- a/.github/workflows/daily.yml -+++ b/.github/workflows/daily.yml -@@ -151,7 +151,7 @@ jobs: - run: | - sudo apt-get update - sudo apt-get install tcl8.6 valgrind -y -- ./runtest --valgrind --verbose --clients 1 --dump-logs -+ ./runtest --valgrind --verbose --clients 1 --tags -large-memory --dump-logs - - name: module api test - run: ./runtest-moduleapi --valgrind --no-latency --verbose --clients 1 - - name: unittest -@@ -171,7 +171,7 @@ jobs: - run: | - sudo apt-get update - sudo apt-get install tcl8.6 valgrind -y -- ./runtest --valgrind --verbose --clients 1 --dump-logs -+ ./runtest --valgrind --verbose --clients 1 --tags -large-memory --dump-logs - - name: module api test - run: ./runtest-moduleapi --valgrind --no-latency --verbose --clients 1 - -@@ -260,7 +260,7 @@ jobs: - prepare: pkg install -y bash gmake lang/tcl86 - run: > - gmake && -- ./runtest --accurate --verbose --no-latency --dump-logs && -+ ./runtest --accurate --verbose --no-latency --tags -large-memory --dump-logs && - MAKE=gmake ./runtest-moduleapi --verbose && - ./runtest-sentinel && - ./runtest-cluster -diff --git a/src/bitops.c b/src/bitops.c -index afd79ad88..f1c563a41 100644 ---- a/src/bitops.c -+++ b/src/bitops.c -@@ -37,8 +37,8 @@ - /* Count number of bits set in the binary array pointed by 's' and long - * 'count' bytes. The implementation of this function is required to - * work with an input string length up to 512 MB or more (server.proto_max_bulk_len) */ --size_t redisPopcount(void *s, long count) { -- size_t bits = 0; -+long long redisPopcount(void *s, long count) { -+ long long bits = 0; - unsigned char *p = s; - uint32_t *p4; - static const unsigned char bitsinbyte[256] = {0,1,1,2,1,2,2,3,1,2,2,3,2,3,3,4,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8}; -@@ -98,11 +98,11 @@ size_t redisPopcount(void *s, long count) { - * no zero bit is found, it returns count*8 assuming the string is zero - * padded on the right. However if 'bit' is 1 it is possible that there is - * not a single set bit in the bitmap. In this special case -1 is returned. */ --long redisBitpos(void *s, unsigned long count, int bit) { -+long long redisBitpos(void *s, unsigned long count, int bit) { - unsigned long *l; - unsigned char *c; - unsigned long skipval, word = 0, one; -- long pos = 0; /* Position of bit, to return to the caller. */ -+ long long pos = 0; /* Position of bit, to return to the caller. */ - unsigned long j; - int found; - -@@ -410,7 +410,7 @@ void printBits(unsigned char *p, unsigned long count) { - * If the 'hash' argument is true, and 'bits is positive, then the command - * will also parse bit offsets prefixed by "#". In such a case the offset - * is multiplied by 'bits'. This is useful for the BITFIELD command. */ --int getBitOffsetFromArgument(client *c, robj *o, size_t *offset, int hash, int bits) { -+int getBitOffsetFromArgument(client *c, robj *o, uint64_t *offset, int hash, int bits) { - long long loffset; - char *err = "bit offset is not an integer or out of range"; - char *p = o->ptr; -@@ -435,7 +435,7 @@ int getBitOffsetFromArgument(client *c, robj *o, size_t *offset, int hash, int b - return C_ERR; - } - -- *offset = (size_t)loffset; -+ *offset = loffset; - return C_OK; - } - -@@ -477,7 +477,7 @@ int getBitfieldTypeFromArgument(client *c, robj *o, int *sign, int *bits) { - * so that the 'maxbit' bit can be addressed. The object is finally - * returned. Otherwise if the key holds a wrong type NULL is returned and - * an error is sent to the client. */ --robj *lookupStringForBitCommand(client *c, size_t maxbit) { -+robj *lookupStringForBitCommand(client *c, uint64_t maxbit) { - size_t byte = maxbit >> 3; - robj *o = lookupKeyWrite(c->db,c->argv[1]); - if (checkType(c,o,OBJ_STRING)) return NULL; -@@ -527,7 +527,7 @@ unsigned char *getObjectReadOnlyString(robj *o, long *len, char *llbuf) { - void setbitCommand(client *c) { - robj *o; - char *err = "bit is not an integer or out of range"; -- size_t bitoffset; -+ uint64_t bitoffset; - ssize_t byte, bit; - int byteval, bitval; - long on; -@@ -566,7 +566,7 @@ void setbitCommand(client *c) { - void getbitCommand(client *c) { - robj *o; - char llbuf[32]; -- size_t bitoffset; -+ uint64_t bitoffset; - size_t byte, bit; - size_t bitval = 0; - -@@ -888,7 +888,7 @@ void bitposCommand(client *c) { - addReplyLongLong(c, -1); - } else { - long bytes = end-start+1; -- long pos = redisBitpos(p+start,bytes,bit); -+ long long pos = redisBitpos(p+start,bytes,bit); - - /* If we are looking for clear bits, and the user specified an exact - * range with start-end, we can't consider the right of the range as -@@ -897,11 +897,11 @@ void bitposCommand(client *c) { - * So if redisBitpos() returns the first bit outside the range, - * we return -1 to the caller, to mean, in the specified range there - * is not a single "0" bit. */ -- if (end_given && bit == 0 && pos == bytes*8) { -+ if (end_given && bit == 0 && pos == (long long)bytes<<3) { - addReplyLongLong(c,-1); - return; - } -- if (pos != -1) pos += start*8; /* Adjust for the bytes we skipped. */ -+ if (pos != -1) pos += (long long)start<<3; /* Adjust for the bytes we skipped. */ - addReplyLongLong(c,pos); - } - } -@@ -933,12 +933,12 @@ struct bitfieldOp { - * GET subcommand is allowed, other subcommands will return an error. */ - void bitfieldGeneric(client *c, int flags) { - robj *o; -- size_t bitoffset; -+ uint64_t bitoffset; - int j, numops = 0, changes = 0; - struct bitfieldOp *ops = NULL; /* Array of ops to execute at end. */ - int owtype = BFOVERFLOW_WRAP; /* Overflow type. */ - int readonly = 1; -- size_t highest_write_offset = 0; -+ uint64_t highest_write_offset = 0; - - for (j = 2; j < c->argc; j++) { - int remargs = c->argc-j-1; /* Remaining args other than current. */ -@@ -1128,9 +1128,9 @@ void bitfieldGeneric(client *c, int flags) { - * object boundaries. */ - memset(buf,0,9); - int i; -- size_t byte = thisop->offset >> 3; -+ uint64_t byte = thisop->offset >> 3; - for (i = 0; i < 9; i++) { -- if (src == NULL || i+byte >= (size_t)strlen) break; -+ if (src == NULL || i+byte >= (uint64_t)strlen) break; - buf[i] = src[i+byte]; - } - -diff --git a/src/server.h b/src/server.h -index 67541fe60..caf9df31c 100644 ---- a/src/server.h -+++ b/src/server.h -@@ -1795,7 +1795,7 @@ void getRandomHexChars(char *p, size_t len); - void getRandomBytes(unsigned char *p, size_t len); - uint64_t crc64(uint64_t crc, const unsigned char *s, uint64_t l); - void exitFromChild(int retcode); --size_t redisPopcount(void *s, long count); -+long long redisPopcount(void *s, long count); - int redisSetProcTitle(char *title); - int validateProcTitleTemplate(const char *template); - int redisCommunicateSystemd(const char *sd_notify_msg); -diff --git a/tests/unit/bitops.tcl b/tests/unit/bitops.tcl -index 926f38295..534832974 100644 ---- a/tests/unit/bitops.tcl -+++ b/tests/unit/bitops.tcl -@@ -349,3 +349,31 @@ start_server {tags {"bitops"}} { - } - } - } -+ -+start_server {tags {"bitops large-memory"}} { -+ test "BIT pos larger than UINT_MAX" { -+ set bytes [expr (1 << 29) + 1] -+ set bitpos [expr (1 << 32)] -+ set oldval [lindex [r config get proto-max-bulk-len] 1] -+ r config set proto-max-bulk-len $bytes -+ r setbit mykey $bitpos 1 -+ assert_equal $bytes [r strlen mykey] -+ assert_equal 1 [r getbit mykey $bitpos] -+ assert_equal [list 128 128 -1] [r bitfield mykey get u8 $bitpos set u8 $bitpos 255 get i8 $bitpos] -+ assert_equal $bitpos [r bitpos mykey 1] -+ assert_equal $bitpos [r bitpos mykey 1 [expr $bytes - 1]] -+ if {$::accurate} { -+ # set all bits to 1 -+ set mega [expr (1 << 23)] -+ set part [string repeat "\xFF" $mega] -+ for {set i 0} {$i < 64} {incr i} { -+ r setrange mykey [expr $i * $mega] $part -+ } -+ r setrange mykey [expr $bytes - 1] "\xFF" -+ assert_equal [expr $bitpos + 8] [r bitcount mykey] -+ assert_equal -1 [r bitpos mykey 0 0 [expr $bytes - 1]] -+ } -+ r config set proto-max-bulk-len $oldval -+ r del mykey -+ } {1} -+} --- -2.24.1 - diff --git a/meta-oe/recipes-extended/redis/redis/fix-CVE-2021-29477.patch b/meta-oe/recipes-extended/redis/redis/fix-CVE-2021-29477.patch deleted file mode 100644 index a5e5a1ba55..0000000000 --- a/meta-oe/recipes-extended/redis/redis/fix-CVE-2021-29477.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f0c5f920d0f88bd8aa376a2c05af4902789d1ef9 Mon Sep 17 00:00:00 2001 -From: Oran Agra <oran@redislabs.com> -Date: Mon, 3 May 2021 08:32:31 +0300 -Subject: [PATCH] Fix integer overflow in STRALGO LCS (CVE-2021-29477) - -An integer overflow bug in Redis version 6.0 or newer could be exploited using -the STRALGO LCS command to corrupt the heap and potentially result with remote -code execution. - -CVE: CVE-2021-29477 -Upstream-Status: Backport -[https://github.com/redis/redis/commit/f0c5f920d0f88bd8aa376a2c05af4902789d1ef9] - -Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com> - ---- - src/t_string.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/t_string.c b/src/t_string.c -index 9228c5ed0..db6f7042e 100644 ---- a/src/t_string.c -+++ b/src/t_string.c -@@ -805,7 +805,7 @@ void stralgoLCS(client *c) { - /* Setup an uint32_t array to store at LCS[i,j] the length of the - * LCS A0..i-1, B0..j-1. Note that we have a linear array here, so - * we index it as LCS[j+(blen+1)*j] */ -- uint32_t *lcs = zmalloc((alen+1)*(blen+1)*sizeof(uint32_t)); -+ uint32_t *lcs = zmalloc((size_t)(alen+1)*(blen+1)*sizeof(uint32_t)); - #define LCS(A,B) lcs[(B)+((A)*(blen+1))] - - /* Start building the LCS table. */ --- -2.32.0 - diff --git a/meta-oe/recipes-extended/redis/redis/fix-CVE-2021-29478.patch b/meta-oe/recipes-extended/redis/redis/fix-CVE-2021-29478.patch deleted file mode 100644 index ebbf6e1b94..0000000000 --- a/meta-oe/recipes-extended/redis/redis/fix-CVE-2021-29478.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 29900d4e6bccdf3691bedf0ea9a5d84863fa3592 Mon Sep 17 00:00:00 2001 -From: Oran Agra <oran@redislabs.com> -Date: Mon, 3 May 2021 08:27:22 +0300 -Subject: [PATCH] Fix integer overflow in intset (CVE-2021-29478) - -An integer overflow bug in Redis 6.2 could be exploited to corrupt the heap and -potentially result with remote code execution. - -The vulnerability involves changing the default set-max-intset-entries -configuration value, creating a large set key that consists of integer values -and using the COPY command to duplicate it. - -The integer overflow bug exists in all versions of Redis starting with 2.6, -where it could result with a corrupted RDB or DUMP payload, but not exploited -through COPY (which did not exist before 6.2). - -CVE: CVE-2021-29478 -Upstream-Status: Backport -[https://github.com/redis/redis/commit/29900d4e6bccdf3691bedf0ea9a5d84863fa3592] - -Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com> - ---- - src/intset.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/intset.c b/src/intset.c -index 1a64ecae8..9ba13898d 100644 ---- a/src/intset.c -+++ b/src/intset.c -@@ -281,7 +281,7 @@ uint32_t intsetLen(const intset *is) { - - /* Return intset blob size in bytes. */ - size_t intsetBlobLen(intset *is) { -- return sizeof(intset)+intrev32ifbe(is->length)*intrev32ifbe(is->encoding); -+ return sizeof(intset)+(size_t)intrev32ifbe(is->length)*intrev32ifbe(is->encoding); - } - - /* Validate the integrity of the data structure. --- -2.32.0 - diff --git a/meta-oe/recipes-extended/redis/redis/fix-CVE-2021-32625.patch b/meta-oe/recipes-extended/redis/redis/fix-CVE-2021-32625.patch deleted file mode 100644 index 6311a5db10..0000000000 --- a/meta-oe/recipes-extended/redis/redis/fix-CVE-2021-32625.patch +++ /dev/null @@ -1,61 +0,0 @@ -From e9a1438ac4c52aa68dfa2a8324b6419356842116 Mon Sep 17 00:00:00 2001 -From: Oran Agra <oran@redislabs.com> -Date: Tue, 1 Jun 2021 09:12:45 +0300 -Subject: [PATCH] Fix integer overflow in STRALGO LCS (CVE-2021-32625) (#9011) - -An integer overflow bug in Redis version 6.0 or newer can be exploited using the -STRALGO LCS command to corrupt the heap and potentially result with remote code -execution. This is a result of an incomplete fix by CVE-2021-29477. - -(cherry picked from commit 1ddecf1958924b178b76a31d989ef1e05af81964) - - -CVE: CVE-2021-32625 -Upstream-Status: Backport [e9a1438ac4c52aa68dfa2a8324b6419356842116] - -Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com> ---- - src/t_string.c | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/src/t_string.c b/src/t_string.c -index 490d5983a..587d3aeb8 100644 ---- a/src/t_string.c -+++ b/src/t_string.c -@@ -797,6 +797,12 @@ void stralgoLCS(client *c) { - goto cleanup; - } - -+ /* Detect string truncation or later overflows. */ -+ if (sdslen(a) >= UINT32_MAX-1 || sdslen(b) >= UINT32_MAX-1) { -+ addReplyError(c, "String too long for LCS"); -+ goto cleanup; -+ } -+ - /* Compute the LCS using the vanilla dynamic programming technique of - * building a table of LCS(x,y) substrings. */ - uint32_t alen = sdslen(a); -@@ -805,9 +811,19 @@ void stralgoLCS(client *c) { - /* Setup an uint32_t array to store at LCS[i,j] the length of the - * LCS A0..i-1, B0..j-1. Note that we have a linear array here, so - * we index it as LCS[j+(blen+1)*j] */ -- uint32_t *lcs = zmalloc((size_t)(alen+1)*(blen+1)*sizeof(uint32_t)); - #define LCS(A,B) lcs[(B)+((A)*(blen+1))] - -+ /* Try to allocate the LCS table, and abort on overflow or insufficient memory. */ -+ unsigned long long lcssize = (unsigned long long)(alen+1)*(blen+1); /* Can't overflow due to the size limits above. */ -+ unsigned long long lcsalloc = lcssize * sizeof(uint32_t); -+ uint32_t *lcs = NULL; -+ if (lcsalloc < SIZE_MAX && lcsalloc / lcssize == sizeof(uint32_t)) -+ lcs = ztrymalloc(lcsalloc); -+ if (!lcs) { -+ addReplyError(c, "Insufficient memory"); -+ goto cleanup; -+ } -+ - /* Start building the LCS table. */ - for (uint32_t i = 0; i <= alen; i++) { - for (uint32_t j = 0; j <= blen; j++) { --- -2.32.0 - diff --git a/meta-oe/recipes-extended/redis/redis_6.2.2.bb b/meta-oe/recipes-extended/redis/redis_6.2.6.bb index ad675e9e04..202fce16bb 100644 --- a/meta-oe/recipes-extended/redis/redis_6.2.2.bb +++ b/meta-oe/recipes-extended/redis/redis_6.2.6.bb @@ -16,12 +16,9 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://0001-src-Do-not-reset-FINAL_LIBS.patch \ file://GNU_SOURCE.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ - file://fix-CVE-2021-29477.patch \ - file://fix-CVE-2021-29478.patch \ - file://fix-CVE-2021-32625.patch \ - file://CVE-2021-32761.patch \ " -SRC_URI[sha256sum] = "7a260bb74860f1b88c3d5942bf8ba60ca59f121c6dce42d3017bed6add0b9535" + +SRC_URI[sha256sum] = "5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb index 5662e63474..914b12e7ca 100644 --- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb @@ -10,7 +10,7 @@ SRCREV = "56a83f4f52e6745cd4352f9ee008be3183a6dedf" PV = "1.7.2" SRC_URI = "\ - git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http; \ + git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb b/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb index 88ba9edaa1..24ad172674 100644 --- a/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb +++ b/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a958bb07122368f3e1d9b2efe07d231f" DEPENDS = "" -SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https" +SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https;branch=master" SRCREV = "0293afb3913f760c449348551cca4d2df59c1a00" diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb index e8b2e37212..3c64c244a9 100644 --- a/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb +++ b/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://../README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb2 PV .= "+git${SRCPV}" -SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ +SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \ file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch;patchdir=../ \ " SRCREV = "3a750fed849405c745dcb7b4ceb85f662c53d8d0" diff --git a/meta-oe/recipes-extended/sedutil/sedutil_git.bb b/meta-oe/recipes-extended/sedutil/sedutil_git.bb index 1e7a393193..8964f036ad 100644 --- a/meta-oe/recipes-extended/sedutil/sedutil_git.bb +++ b/meta-oe/recipes-extended/sedutil/sedutil_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://Common/LICENSE.txt;md5=d32239bcb673463ab874e80d47fae5 BASEPV = "1.15.1" PV = "${BASEPV}+git${SRCPV}" SRCREV = "358cc758948be788284d5faba46ccf4cc1813796" -SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git \ +SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git;branch=master;protocol=https \ file://0001-Fix-build-on-big-endian-architectures.patch \ file://0001-DtaAnnotatedDump-Add-typedef-name-to-the-union.patch \ " diff --git a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index eca8dfc7b7..a103bfd996 100644 --- a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931" SRCREV = "b31bce98d65f894aad6427bcf6f3f7822e261a59" PV = "1.0+git${SRCPV}" -SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https" +SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-oe/recipes-extended/socketcan/can-utils_git.bb index 78caa5be26..06c3182dba 100644 --- a/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61 DEPENDS = "libsocketcan" -SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git" +SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master" SRCREV = "eb66451df280f95a9a12e78b151b8d867e1b78ed" @@ -48,5 +48,5 @@ ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence" # busybox ip fails to configure can interfaces, so we need iproute2 to do so. # See details in http://www.armadeus.com/wiki/index.php?title=CAN_bus_Linux_driver. -RRECOMMENDS:${PN} += "iproute2" +RRECOMMENDS_${PN} += "iproute2" diff --git a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb index 8b13daea1c..ab72d473c5 100644 --- a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb +++ b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libsocketcan" SRCREV = "299dff7f5322bf0348dcdd60071958ebedf5f09d" -SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git \ +SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git;branch=master \ file://0001-canutils-candump-Add-error-frame-s-handling.patch \ " diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb index b7a7f6f471..27380ee19d 100644 --- a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb +++ b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38ad SRCREV = "077def398ad303043d73339112968e5112d8d7c8" -SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git" +SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-oe/recipes-extended/sysdig/sysdig_git.bb index f1b77070c1..de12cc23f0 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -19,7 +19,7 @@ JIT_powerpc = "" DEPENDS += "libb64 lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp tbb jq openssl elfutils protobuf protobuf-native jq-native" RDEPENDS_${PN} = "bash" -SRC_URI = "git://github.com/draios/sysdig.git;branch=dev \ +SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https \ file://0001-fix-build-with-LuaJIT-2.1-betas.patch \ file://aarch64.patch \ " diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index 637770af24..c9d9fb5729 100644 --- a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Transparent Inter-Process Communication protocol" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://tipclog/tipc.h;endline=35;md5=985b6ea8735818511d276c1b466cce98" -SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ +SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils;branch=master \ file://0001-include-sys-select.h-for-FD_-definitions.patch \ file://0002-replace-non-standard-uint-with-unsigned-int.patch \ file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \ diff --git a/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb b/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb index df534ddda4..6e0bf82612 100644 --- a/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb +++ b/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f7d9aab84ec6567139a4755c48d147fb" DEPENDS_append = " libevent libssh msgpack-c ncurses" SRC_URI = "\ - git://github.com/tmate-io/tmate.git;protocol=https \ + git://github.com/tmate-io/tmate.git;protocol=https;branch=master \ " SRCREV = "5e00bfa5e137e76c81888727712ced2b3fd99f5b" diff --git a/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb index 38ce4f5571..c62cef36d3 100644 --- a/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb +++ b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" # matches debian/0.5.0-1 tag SRCREV = "44a173195986d0d853316cb02a58785ded66c12b" PV = "0.5.0+git${SRCPV}" -SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian" +SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 6a7611f382..7643d13e25 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -10,7 +10,7 @@ DEPENDS = "libjpeg-turbo mraa" SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" PV = "2.0.0+git${SRCPV}" -SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http;branch=master;protocol=https \ file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \ file://0001-Use-stdint-types.patch \ file://0001-initialize-local-variables-before-use.patch \ diff --git a/meta-oe/recipes-extended/wipe/wipe_0.24.bb b/meta-oe/recipes-extended/wipe/wipe_0.24.bb index 831d514a4e..3ccc5afd5c 100644 --- a/meta-oe/recipes-extended/wipe/wipe_0.24.bb +++ b/meta-oe/recipes-extended/wipe/wipe_0.24.bb @@ -9,7 +9,7 @@ HOMEPAGE = "http://lambda-diode.com/software/wipe/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "git://github.com/berke/wipe.git;branch=master \ +SRC_URI = "git://github.com/berke/wipe.git;branch=master;protocol=https \ file://support-cross-compile-for-linux.patch \ file://makefile-add-ldflags.patch \ " diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb index 26a9004fb7..ccf8911440 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb @@ -22,7 +22,7 @@ DEPENDS += " \ " SRC_URI = " \ - git://github.com/wxWidgets/wxWidgets.git \ + git://github.com/wxWidgets/wxWidgets.git;branch=master;protocol=https \ file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ " PV = "3.1.4" diff --git a/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb b/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb index 7dde4182fb..1a77665e99 100644 --- a/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb +++ b/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb @@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRCREV = "876099f3c66033f3de11d79f63814766b1021dbe" -SRC_URI = "git://github.com/HardySimpson/zlog" +SRC_URI = "git://github.com/HardySimpson/zlog;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-gnome/libjcat/libjcat_0.1.6.bb b/meta-oe/recipes-gnome/libjcat/libjcat_0.1.6.bb index bbfba55a3d..591d4255f3 100644 --- a/meta-oe/recipes-gnome/libjcat/libjcat_0.1.6.bb +++ b/meta-oe/recipes-gnome/libjcat/libjcat_0.1.6.bb @@ -8,7 +8,7 @@ DEPENDS = "\ " SRC_URI = "\ - git://github.com/hughsie/libjcat.git \ + git://github.com/hughsie/libjcat.git;branch=master;protocol=https \ file://run-ptest \ " SRCREV = "c4f032468c56a5750e1e15b01fa31539b5c7ae51" diff --git a/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.0.bb b/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.0.bb index d677d2436f..524a04714e 100644 --- a/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.0.bb +++ b/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.0.bb @@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" SRC_URI = "\ - git://github.com/hughsie/libxmlb.git \ + git://github.com/hughsie/libxmlb.git;branch=master;protocol=https \ file://run-ptest \ " SRCREV = "8f2f28eda419dbe31cb1a9aa022f0ca9d30ecb6a" diff --git a/meta-oe/recipes-gnome/pyxdg/pyxdg_0.26.bb b/meta-oe/recipes-gnome/pyxdg/pyxdg_0.26.bb index a957c1d673..6fa31c58ff 100644 --- a/meta-oe/recipes-gnome/pyxdg/pyxdg_0.26.bb +++ b/meta-oe/recipes-gnome/pyxdg/pyxdg_0.26.bb @@ -5,7 +5,7 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" SRCREV = "7db14dcf4c4305c3859a2d9fcf9f5da2db328330" -SRC_URI = "git://anongit.freedesktop.org/xdg/pyxdg" +SRC_URI = "git://anongit.freedesktop.org/xdg/pyxdg;branch=master" inherit distutils3 diff --git a/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb b/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb index 32f0815921..2d13f26a3d 100644 --- a/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb +++ b/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb @@ -8,7 +8,7 @@ PV = "0.3" PR = "r1" SRCREV = "ef2e1a390e768e21e6a6268977580ee129a96633" -SRC_URI = "git://github.com/lucasdemarchi/dietsplash.git \ +SRC_URI = "git://github.com/lucasdemarchi/dietsplash.git;branch=master;protocol=https \ file://0001-configure.ac-Do-not-demand-linker-hash-style.patch \ " diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb index 007385101c..24f8e44d89 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ " -SRC_URI = "git://github.com/manatools/dnfdragora.git \ +SRC_URI = "git://github.com/manatools/dnfdragora.git;branch=master;protocol=https \ file://0001-disable-build-manpages.patch \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0001-To-fix-error-when-do_package.patch \ diff --git a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb index 419881d5ca..d6341e5b98 100644 --- a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb +++ b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a" SECTION = "console/utils" DEPENDS = "libpng zlib" -SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https" +SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https;branch=master" SRCREV = "f43ce6d5ce48fb01360eaa7c4a92c2573a1d02f8" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb index 1863f95f0f..8f65da2c1f 100644 --- a/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb +++ b/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb @@ -15,7 +15,7 @@ REQUIRED_DISTRO_FEATURES_append_class-target = " x11" # tag 20190801 SRCREV = "ac635b818e38ddb8e7e2e1057330a32b4e25476e" -SRC_URI = "git://github.com/${BPN}/${BPN}.git \ +SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \ file://0001-include-sys-select-on-non-glibc-platforms.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb b/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb index 3b01a216bd..d405cb8775 100644 --- a/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb +++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb @@ -32,7 +32,7 @@ DEPENDS = " \ " SRC_URI = " \ - git://github.com/fvwmorg/fvwm.git;protocol=https \ + git://github.com/fvwmorg/fvwm.git;protocol=https;branch=master \ file://0001-Fix-compilation-for-disabled-gnome.patch \ " diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb index c5a7c5bff8..a3f6ebfa32 100644 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://copying.txt;md5=462e4b97f73ef12f8171c3c546ce4e8d" SRC_URI = " \ - git://github.com/g-truc/glm;branch=master \ + git://github.com/g-truc/glm;branch=master;protocol=https \ file://0001-Silence-clang-warnings.patch \ file://glmConfig.cmake.in \ file://glmConfigVersion.cmake.in \ diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb b/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb index 8fe837b75c..cc57761bc4 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb @@ -74,6 +74,17 @@ do_install_append_class-nativesdk() { } FILES_${PN}_class-nativesdk += "${SDKPATHNATIVE}" +# create /usr/lib/graphviz/config6 +graphviz_sstate_postinst() { + mkdir -p ${SYSROOT_DESTDIR}${bindir} + dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN} + echo '#!/bin/sh' > $dest + echo '' >> $dest + echo 'dot -c' >> $dest + chmod 0755 $dest +} +SYSROOT_PREPROCESS_FUNCS_append_class-native = " graphviz_sstate_postinst" + PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo" FILES_${PN}-python += "${libdir}/python*/site-packages/ ${libdir}/graphviz/python/" diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb index b44b03ce8e..f0de4911da 100644 --- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb +++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb @@ -14,7 +14,7 @@ inherit autotools pkgconfig lib_package AUTO_LIBNAME_PKGS = "" -SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git;protocol=https" +SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git;protocol=https;branch=master" S = "${WORKDIR}/git" PACKAGECONFIG ??= "jpeg png zlib ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta-oe/recipes-graphics/jasper/jasper_2.0.26.bb b/meta-oe/recipes-graphics/jasper/jasper_2.0.26.bb index de28af8baf..42324055a0 100644 --- a/meta-oe/recipes-graphics/jasper/jasper_2.0.26.bb +++ b/meta-oe/recipes-graphics/jasper/jasper_2.0.26.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://jasper-software.github.io/jasper/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" -SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https" +SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https;branch=master" SRCREV = "5083b949f0caa5bc6257cd81162a33c15bf8a1d1" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb index 11bba430e7..9c242aa8a2 100644 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb @@ -44,7 +44,7 @@ FILES_libvncclient = "${libdir}/libvncclient.*" inherit cmake -SRC_URI = "git://github.com/LibVNC/libvncserver" +SRC_URI = "git://github.com/LibVNC/libvncserver;branch=master;protocol=https" SRCREV = "2aa20dad4c23c18948d3f63b33f9dfec1f837729" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb index fdf01618a2..096052d0ff 100644 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad0 file://../COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ " -SRC_URI = "git://github.com/libyui/libyui.git" +SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https" SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" diff --git a/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb b/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb index acab7d4568..5e7b42b361 100644 --- a/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb +++ b/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://../COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -SRC_URI = "git://github.com/libyui/libyui.git \ +SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \ file://0001-Fix-build-with-clang.patch \ file://0001-Use-relative-install-paths-for-CMake.patch \ " diff --git a/meta-oe/recipes-graphics/openbox/obconf_git.bb b/meta-oe/recipes-graphics/openbox/obconf_git.bb index 53c5898211..950b7a5699 100644 --- a/meta-oe/recipes-graphics/openbox/obconf_git.bb +++ b/meta-oe/recipes-graphics/openbox/obconf_git.bb @@ -13,7 +13,7 @@ PV = "2.0.4+git${SRCPV}" SRCREV = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39" SRC_URI = " \ - git://git.openbox.org/dana/obconf \ + git://git.openbox.org/dana/obconf;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2021-29338.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2021-29338.patch new file mode 100644 index 0000000000..a7c2bb4f38 --- /dev/null +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2021-29338.patch @@ -0,0 +1,78 @@ +Upstream-Status: Backport [https://github.com/uclouvain/openjpeg/pull/1395/commits/f0727df] +CVE: CVE-2021-29338 + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +From f0727df07c4d944d7d1c5002451cfbc9545d3288 Mon Sep 17 00:00:00 2001 +From: Brad Parham <brad.a.parham@intel.com> +Date: Wed, 12 Jan 2022 12:20:28 +0100 +Subject: [PATCH] Fix integer overflow in num_images + +Includes the fix for CVE-2021-29338 +Credit to @kaniini based on #1346 +Fixes #1338 +--- + src/bin/jp2/opj_compress.c | 4 ++-- + src/bin/jp2/opj_decompress.c | 5 ++--- + src/bin/jp2/opj_dump.c | 7 ++++--- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c +index 8c71d4536..1399d5277 100644 +--- a/src/bin/jp2/opj_compress.c ++++ b/src/bin/jp2/opj_compress.c +@@ -1959,9 +1959,9 @@ int main(int argc, char **argv) + num_images = get_num_images(img_fol.imgdirpath); + dirptr = (dircnt_t*)malloc(sizeof(dircnt_t)); + if (dirptr) { +- dirptr->filename_buf = (char*)malloc(num_images * OPJ_PATH_LEN * sizeof( ++ dirptr->filename_buf = (char*)calloc(num_images, OPJ_PATH_LEN * sizeof( + char)); /* Stores at max 10 image file names*/ +- dirptr->filename = (char**) malloc(num_images * sizeof(char*)); ++ dirptr->filename = (char**) calloc(num_images, sizeof(char*)); + if (!dirptr->filename_buf) { + ret = 0; + goto fin; +diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c +index fc0012b63..e1217f891 100644 +--- a/src/bin/jp2/opj_decompress.c ++++ b/src/bin/jp2/opj_decompress.c +@@ -1374,14 +1374,13 @@ int main(int argc, char **argv) + return EXIT_FAILURE; + } + /* Stores at max 10 image file names */ +- dirptr->filename_buf = (char*)malloc(sizeof(char) * +- (size_t)num_images * OPJ_PATH_LEN); ++ dirptr->filename_buf = calloc((size_t) num_images, sizeof(char) * OPJ_PATH_LEN); + if (!dirptr->filename_buf) { + failed = 1; + goto fin; + } + +- dirptr->filename = (char**) malloc((size_t)num_images * sizeof(char*)); ++ dirptr->filename = (char**) calloc((size_t) num_images, sizeof(char*)); + + if (!dirptr->filename) { + failed = 1; +diff --git a/src/bin/jp2/opj_dump.c b/src/bin/jp2/opj_dump.c +index 6111d2ab6..d2646f10e 100644 +--- a/src/bin/jp2/opj_dump.c ++++ b/src/bin/jp2/opj_dump.c +@@ -515,13 +515,14 @@ int main(int argc, char *argv[]) + if (!dirptr) { + return EXIT_FAILURE; + } +- dirptr->filename_buf = (char*)malloc((size_t)num_images * OPJ_PATH_LEN * sizeof( +- char)); /* Stores at max 10 image file names*/ ++ /* Stores at max 10 image file names*/ ++ dirptr->filename_buf = (char*) calloc((size_t) num_images, ++ OPJ_PATH_LEN * sizeof(char)); + if (!dirptr->filename_buf) { + free(dirptr); + return EXIT_FAILURE; + } +- dirptr->filename = (char**) malloc((size_t)num_images * sizeof(char*)); ++ dirptr->filename = (char**) calloc((size_t) num_images, sizeof(char*)); + + if (!dirptr->filename) { + goto fails; diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb index 62aa4b43db..43e1dd76aa 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb @@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" DEPENDS = "libpng tiff lcms zlib" SRC_URI = " \ - git://github.com/uclouvain/openjpeg.git \ + git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ file://0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch \ + file://CVE-2021-29338.patch \ " SRCREV = "37ac30ceff6640bbab502388c5e0fa0bff23f505" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb index 4c02cc55af..52723d7af1 100644 --- a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb +++ b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb @@ -1,7 +1,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4f59d6446bf2e004e80df1a0937129fa" -SRC_URI = "git://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git;protocol=https \ +SRC_URI = "git://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git;protocol=https;branch=master \ file://0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch \ " diff --git a/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb b/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb index 3eb23dc0fa..defaaeea79 100644 --- a/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb +++ b/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SRCREV = "715e29fd4cd71b6e452ae0f4e36d917b43122ce8" -SRC_URI = "git://github.com/fukuchi/libqrencode.git" +SRC_URI = "git://github.com/fukuchi/libqrencode.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb index 6ea632d064..b20e06a454 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=df7ea9e196efc7014c124747a0ef9772" SRCREV = "a56af589d94dc851809fd5344d0ae441da70c1f2" -SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \ +SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x;protocol=https \ file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ file://0001-Remove-glslang-pool_allocator-setAllocator.patch \ " diff --git a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb b/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb index b787972da6..bf0a5947b0 100644 --- a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb +++ b/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb @@ -6,7 +6,7 @@ SECTION = "graphics" S = "${WORKDIR}/git" SRCREV = "ed16b3e69985feaf565efbecea70a1cc2fca2a58" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git \ +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git;branch=master;protocol=https \ file://0001-Add-install-PHONY-target-in-Makefile.patch \ " diff --git a/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb index fd2973bc2b..f4e071c69f 100644 --- a/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb +++ b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "4767ea922bcc460e70b87b1d303ebdfed0897da8" -SRC_URI = "git://github.com/tesseract-ocr/tessdata.git" +SRC_URI = "git://github.com/tesseract-ocr/tessdata.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_4.1.1.bb b/meta-oe/recipes-graphics/tesseract/tesseract_4.1.1.bb index 3b5032f06d..49ad4513d1 100644 --- a/meta-oe/recipes-graphics/tesseract/tesseract_4.1.1.bb +++ b/meta-oe/recipes-graphics/tesseract/tesseract_4.1.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" BRANCH = "4.1" SRCREV = "f4ef2f2050f4c25b28bdbf0063b7d2eb30f41cf7" -SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=${BRANCH} \ +SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=${BRANCH};protocol=https \ file://0001-include-sys-time.h.patch \ " diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb index ce6c59bc39..8b0376a422 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb @@ -17,7 +17,7 @@ B = "${S}" SRCREV = "540bfc3278e396321124d4b18a798ac2bc18b6ca" -SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch \ +SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch;protocol=https \ file://0002-do-not-build-tests-sub-directory.patch \ file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb index 8dba7ee6fa..16ac65b1be 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb @@ -8,7 +8,7 @@ SRCREV = "21e6e2de1f0062f949fcc52d0b4559dfa3246e0e" PV = "0.1+gitr${SRCPV}" PR = "r3" -SRC_URI = "git://github.com/android/platform_frameworks_base.git;branch=master" +SRC_URI = "git://github.com/android/platform_frameworks_base.git;branch=master;protocol=https" S = "${WORKDIR}/git/data/fonts" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb index 0af0e91d68..7dde4cc661 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb @@ -8,7 +8,7 @@ LICENSE = "OFL-1.1" LIC_FILES_CHKSUM = "file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402" SRCREV = "d678f1b1807ea5602586279e90b5db6d62ed475e" -SRC_URI = "git://github.com/pravins/lohit.git;branch=master" +SRC_URI = "git://github.com/pravins/lohit.git;branch=master;protocol=https" DEPENDS = "fontforge-native" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb index e74f7a7f67..1a2f6cb4d2 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/googlefonts/noto-emoji" LICENSE = "OFL-1.1" LIC_FILES_CHKSUM = "file://fonts/LICENSE;md5=55719faa0112708e946b820b24b14097" -SRC_URI = "git://github.com/googlefonts/noto-emoji;protocol=https" +SRC_URI = "git://github.com/googlefonts/noto-emoji;protocol=https;branch=master" SRCREV = "833a43d03246a9325e748a2d783006454d76ff66" PACKAGES = "${PN}-color ${PN}-regular" diff --git a/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb b/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb index 7e22038f24..427882d32b 100644 --- a/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb +++ b/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb @@ -5,7 +5,7 @@ AUTHOR = "Ingo Bürk" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b25d2c4cca175f44120d1b8e67cb358d" -SRC_URI = "git://github.com/Airblader/unclutter-xfixes.git \ +SRC_URI = "git://github.com/Airblader/unclutter-xfixes.git;branch=master;protocol=https \ file://0001-build-use-autotools.patch" SRCREV = "10fd337bb77e4e93c3380f630a0555372778a948" diff --git a/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb b/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb index b6790a0855..de5aeb11a9 100644 --- a/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb +++ b/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=83af8811a28727a13f04132cc33b7f58" DEPENDS = "virtual/libx11 libxext xorgproto" SRCREV = "c3d1a9dbafdfe6144ff474d0d523dc01b068750f" -SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau" +SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index e64a935dda..6aee98c229 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "\ git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \ git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;branch=main \ - git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang \ - git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers \ - git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools \ + git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;branch=master \ + git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;branch=master \ + git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;branch=master \ https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ " diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb index 50ce9a59e0..9c9bac36b3 100644 --- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRCREV = "87cd0530f438372dda3c70bb491a6fd19f09acc2" PV .= "+git${SRCPV}" -SRC_URI = "git://github.com/LibVNC/x11vnc \ +SRC_URI = "git://github.com/LibVNC/x11vnc;branch=master;protocol=https \ file://starting-fix.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb index b436ef1e4a..3d60ed1310 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" DEPENDS += "virtual/libx11 libdrm xorgproto" SRCREV = "8bbdb2ae3bb8ef649999a8da33ddbe11a04763b8" -SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-armsoc" +SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-armsoc;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/yad/yad_6.0.bb b/meta-oe/recipes-graphics/yad/yad_6.0.bb index 3760a37d31..92a5c284b3 100644 --- a/meta-oe/recipes-graphics/yad/yad_6.0.bb +++ b/meta-oe/recipes-graphics/yad/yad_6.0.bb @@ -5,7 +5,7 @@ AUTHOR = "Victor Ananjevsky" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "git://github.com/v1cont/yad.git" +SRC_URI = "git://github.com/v1cont/yad.git;branch=master;protocol=https" SRCREV = "a5b1a7a3867bc7dffbbc539f586f301687b6ec02" inherit autotools gsettings features_check diff --git a/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb b/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb index 2eb19206d3..57232f8d5f 100644 --- a/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb +++ b/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb @@ -10,7 +10,7 @@ EXTRA_OEMAKE = "'CC=${CC}'" SRCREV = "468fe4c31e6c62c9bbb328b06ba71eaf7be0b76a" -SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git;protocol=git \ +SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git;protocol=git;branch=master \ file://0001-Makefile-Add-LDFLAGS-variable.patch \ " diff --git a/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb b/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb index e861ddb723..3a3920ae53 100644 --- a/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb +++ b/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb @@ -9,7 +9,7 @@ LICENSE = "Firmware-Broadcom-WIDCOMM" NO_GENERIC_LICENSE[Firmware-Broadcom-WIDCOMM] = "LICENSE.broadcom_bcm20702" LIC_FILES_CHKSUM = "file://LICENSE.broadcom_bcm20702;md5=c0d5ea0502b00df74173d0f8a48b619d" -SRC_URI = "git://github.com/winterheart/broadcom-bt-firmware.git" +SRC_URI = "git://github.com/winterheart/broadcom-bt-firmware.git;branch=master;protocol=https" SRCREV = "1af1116f73782951bd7bbe2139928e497c3a634b" PE = "1" diff --git a/meta-oe/recipes-kernel/crash/crash_7.3.0.bb b/meta-oe/recipes-kernel/crash/crash_7.3.0.bb index fcd4f2d616..b5204693df 100644 --- a/meta-oe/recipes-kernel/crash/crash_7.3.0.bb +++ b/meta-oe/recipes-kernel/crash/crash_7.3.0.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING3;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "zlib readline coreutils-native ncurses-native" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/crash-utility/${BPN}.git \ +SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=https \ ${GNU_MIRROR}/gdb/gdb-7.6.tar.gz;name=gdb;subdir=git \ file://7001force_define_architecture.patch \ file://7003cross_ranlib.patch \ diff --git a/meta-oe/recipes-kernel/kpatch/kpatch.inc b/meta-oe/recipes-kernel/kpatch/kpatch.inc index 1f70f72054..685be7d40c 100644 --- a/meta-oe/recipes-kernel/kpatch/kpatch.inc +++ b/meta-oe/recipes-kernel/kpatch/kpatch.inc @@ -3,7 +3,7 @@ DESCRIPTION = "kpatch is a Linux dynamic kernel patching infrastructure which al LICENSE = "GPLv2 & LGPLv2" DEPENDS = "elfutils bash" -SRC_URI = "git://github.com/dynup/kpatch.git;protocol=https \ +SRC_URI = "git://github.com/dynup/kpatch.git;protocol=https;branch=master \ file://0001-kpatch-build-add-cross-compilation-support.patch \ file://0002-kpatch-build-allow-overriding-of-distro-name.patch \ " diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_0.3.bb b/meta-oe/recipes-kernel/libbpf/libbpf_0.3.bb index 57e8376b5e..f08f5f25c6 100644 --- a/meta-oe/recipes-kernel/libbpf/libbpf_0.3.bb +++ b/meta-oe/recipes-kernel/libbpf/libbpf_0.3.bb @@ -12,7 +12,7 @@ DEPENDS = "zlib elfutils" do_compile[depends] += "virtual/kernel:do_shared_workdir" -SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https" +SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master" SRCREV = "051a4009f94d5633a8f734ca4235f0a78ee90469" # Backported from version 0.4 diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb index 4754651247..6f87db1779 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb @@ -24,7 +24,7 @@ PACKAGES =+ "${PN}-tools" FILES_${PN}-tools = "${bindir}/*.pl" SRC_URI = "\ - git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH} \ + git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH};protocol=https \ file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ " diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb index d381c83ae8..8188ae599d 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb @@ -13,7 +13,7 @@ SRCREV = "16a0d44f1725eaa93096eaa0e086f42ef4c2712c" PR .= "+git${SRCPV}" -SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https \ +SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \ file://minicoredumper.service \ file://minicoredumper.init \ " diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb index 4526eeed3f..ac4ccf7284 100644 --- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb +++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb @@ -6,7 +6,7 @@ LICENSE = "GPL-2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" -SRC_URI = "git://github.com/intel/pm-graph.git \ +SRC_URI = "git://github.com/intel/pm-graph.git;branch=master;protocol=https \ file://0001-Makefile-fix-multilib-build-failure.patch \ file://0001-sleepgraph.py-use-python3.patch \ file://0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch \ diff --git a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb index 6626302919..974cb1e93c 100644 --- a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb +++ b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb @@ -1,7 +1,7 @@ SUMMARY = "Test SPI devices" DESCRIPTION = "SPI testing utility using the spidev driver" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" PROVIDES = "virtual/spidev-test" inherit bash-completion kernelsrc kernel-arch diff --git a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index 3344821fa0..b9ee03425e 100644 --- a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb @@ -20,6 +20,8 @@ inherit cmake DEPENDS = "libcap file bzip2" RDEPENDS_dirsplit = "perl" +RDEPENDS_${PN}-dev = "" + PACKAGES =+ "dirsplit genisoimage icedax wodim" FILES_dirsplit = " \ diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb b/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb index 5fffe77c2d..e33a3f2574 100644 --- a/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb +++ b/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb @@ -11,7 +11,7 @@ DEPENDS_append_libc-musl = " libexecinfo" SRCREV = "de37569c926c5886768f892c019e3f0468615038" SRC_URI = " \ - git://github.com/linuxaudio/a2jmidid;protocol=https \ + git://github.com/linuxaudio/a2jmidid;protocol=https;branch=master \ file://riscv_ucontext.patch \ " diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb index d5288c7b71..2667482bd0 100644 --- a/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb +++ b/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1 readline" -SRC_URI = "git://github.com/jackaudio/jack2.git \ +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ " SRCREV = "9e23888b8def6527774889cf4ef6348fb78c7154" diff --git a/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb b/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb index 3454a5c270..f6c64212fe 100644 --- a/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb +++ b/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a42532a0684420bdb15556c3cdd49a75" DEPENDS = "enca fontconfig freetype libpng fribidi" -SRC_URI = "git://github.com/libass/libass.git" +SRC_URI = "git://github.com/libass/libass.git;branch=master;protocol=https" SRCREV = "73284b676b12b47e17af2ef1b430527299e10c17" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb index 171eef7b73..7e41bd7933 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=91f1cb870c1cc2d31351a4d2595441cb" SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7" SRC_URI = " \ - git://github.com/mpv-player/mpv;name=mpv \ + git://github.com/mpv-player/mpv;name=mpv;branch=master;protocol=https \ https://waf.io/waf-2.0.20;name=waf;subdir=git \ " SRC_URI[waf.sha256sum] = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f" diff --git a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb index a192d1a3bb..98542ffe61 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Yet Another V4L2 Test Application" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://git.ideasonboard.org/yavta.git \ +SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master \ file://0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch" SRCREV = "7e9f28bedc1ed3205fb5164f686aea96f27a0de2" diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb index 4a98ec17dd..d607bbebe8 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb +++ b/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb @@ -8,7 +8,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" SRCREV = "7ec7a33a081aeeb53fed1a8d87e4cbd189152527" -SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https \ +SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=master \ file://libvpx-configure-support-blank-prefix.patch \ " diff --git a/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb b/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb index 4ea6c8a295..8df94d91e2 100644 --- a/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb +++ b/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb @@ -4,7 +4,7 @@ SUMMARY = "Ace is a code editor written in JavaScript. This repository has only LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=794d11c5219c59c9efa2487c2b4066b2" -SRC_URI = "git://github.com/ajaxorg/ace-builds.git;protocol=https" +SRC_URI = "git://github.com/ajaxorg/ace-builds.git;protocol=https;branch=master" PV = "02.07.17+git${SRCPV}" SRCREV = "812e2c56aed246931a667f16c28b096e34597016" diff --git a/meta-oe/recipes-support/avro/avro-c_1.9.2.bb b/meta-oe/recipes-support/avro/avro-c_1.9.2.bb index 0642179fb3..e85f341f1f 100644 --- a/meta-oe/recipes-support/avro/avro-c_1.9.2.bb +++ b/meta-oe/recipes-support/avro/avro-c_1.9.2.bb @@ -9,7 +9,7 @@ DEPENDS = "jansson zlib xz" BRANCH = "branch-1.9" SRCREV = "bf20128ca6138a830b2ea13e0490f3df6b035639" -SRC_URI = "git://github.com/apache/avro;branch=${BRANCH} \ +SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ file://0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch;patchdir=../../ \ " diff --git a/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb b/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb index 407de21385..d7d0b9c154 100644 --- a/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb +++ b/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb @@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "file://README.QUICK;md5=81b447d779e278628c843aef92f088fa" DEPENDS = "libatomic-ops" SRCREV = "d3dede3ce4462cd82a15f161af797ca51654546a" -SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_0" +SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_0;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb b/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb index afcc1cc4b8..f115127e81 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" PV = "1.16.0+gitr${SRCPV}" SRC_URI = "\ - git://github.com/c-ares/c-ares.git \ + git://github.com/c-ares/c-ares.git;branch=main;protocol=https \ file://cmake-install-libcares.pc.patch \ file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ file://0001-CVE-2021-3672.patch \ diff --git a/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb b/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb index effab9de90..b5bdcd5b19 100644 --- a/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb +++ b/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb @@ -8,7 +8,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" -SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" +SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https;branch=master" SRCREV = "23bfa4ab481edbad82a69ee385fc58ce03b63084" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb index 7feba4a5a2..0d7c3e57b6 100644 --- a/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb +++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bb761279816b72be19d7ce646e4e2a14" DEPENDS = "libeigen glog" -SRC_URI = "git://github.com/ceres-solver/ceres-solver.git" +SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https" SRCREV = "399cda773035d99eaf1f4a129a666b3c4df9d1b1" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/cli11/cli11_1.9.1.bb b/meta-oe/recipes-support/cli11/cli11_1.9.1.bb index 5f022d78af..64628255e2 100644 --- a/meta-oe/recipes-support/cli11/cli11_1.9.1.bb +++ b/meta-oe/recipes-support/cli11/cli11_1.9.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733" SRCREV = "5cb3efabce007c3a0230e4cc2e27da491c646b6c" PV .= "+git${SRCPV}" -SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=v1" +SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=v1;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/cmark/cmark_git.bb b/meta-oe/recipes-support/cmark/cmark_git.bb index f74a39b500..4f07beb317 100644 --- a/meta-oe/recipes-support/cmark/cmark_git.bb +++ b/meta-oe/recipes-support/cmark/cmark_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/commonmark/cmark" LICENSE = "BSD-2-Clause & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" -SRC_URI = "git://github.com/commonmark/cmark.git" +SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https" SRCREV = "8daa6b1495124f0b67e6034130e12d7be83e38bd" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/consolation/consolation_0.0.8.bb b/meta-oe/recipes-support/consolation/consolation_0.0.8.bb index 90bd560c47..d611927320 100644 --- a/meta-oe/recipes-support/consolation/consolation_0.0.8.bb +++ b/meta-oe/recipes-support/consolation/consolation_0.0.8.bb @@ -14,7 +14,7 @@ DEPENDS = " \ udev \ " -SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git" +SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git;branch=master" SRCREV = "4581eaece6e49fa2b687efbdbe23b2de452e7902" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/daemonize/daemonize_git.bb b/meta-oe/recipes-support/daemonize/daemonize_git.bb index c76632781a..f46dec59fc 100644 --- a/meta-oe/recipes-support/daemonize/daemonize_git.bb +++ b/meta-oe/recipes-support/daemonize/daemonize_git.bb @@ -7,7 +7,7 @@ PV = "1.7.8" inherit autotools SRCREV = "18869a797dab12bf1c917ba3b4782fef484c407c" -SRC_URI = "git://github.com/bmc/daemonize.git \ +SRC_URI = "git://github.com/bmc/daemonize.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb index 9fcc278d35..cac2b4fd61 100644 --- a/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb +++ b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb @@ -4,7 +4,7 @@ DEPENDS = "libusb1" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" -SRC_URI = "git://github.com/bcl/digitemp" +SRC_URI = "git://github.com/bcl/digitemp;branch=master;protocol=https" SRCREV = "a162e63aad35358aab325388f3d5e88121606419" diff --git a/meta-oe/recipes-support/dstat/dstat_0.7.4.bb b/meta-oe/recipes-support/dstat/dstat_0.7.4.bb index a1076ccf94..18c3cdf82c 100644 --- a/meta-oe/recipes-support/dstat/dstat_0.7.4.bb +++ b/meta-oe/recipes-support/dstat/dstat_0.7.4.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS += "asciidoc-native xmlto-native" -SRC_URI = "git://github.com/dagwieers/dstat.git \ +SRC_URI = "git://github.com/dagwieers/dstat.git;branch=master;protocol=https \ file://0001-change-dstat-to-python3.patch \ " @@ -21,4 +21,4 @@ do_install() { oe_runmake 'DESTDIR=${D}' install } -RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell python3-six python3-unixadmin" +RDEPENDS_${PN} += "python3-core python3-misc python3-resource python3-shell python3-six python3-unixadmin" diff --git a/meta-oe/recipes-support/epeg/epeg_git.bb b/meta-oe/recipes-support/epeg/epeg_git.bb index 8ca574014b..bdffe4ba78 100644 --- a/meta-oe/recipes-support/epeg/epeg_git.bb +++ b/meta-oe/recipes-support/epeg/epeg_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7732a9290ea1e4b034fdc15cf49968d \ file://COPYING-PLAIN;md5=f59cacc08235a546b0c34a5422133035" DEPENDS = "jpeg libexif" -SRC_URI = "git://github.com/mattes/epeg.git" +SRC_URI = "git://github.com/mattes/epeg.git;branch=master;protocol=https" SRCREV = "9a175cd67eaa61fe45413d8da82da72936567047" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/fmt/fmt_7.1.3.bb b/meta-oe/recipes-support/fmt/fmt_7.1.3.bb index 9820b86470..47f3d75e28 100644 --- a/meta-oe/recipes-support/fmt/fmt_7.1.3.bb +++ b/meta-oe/recipes-support/fmt/fmt_7.1.3.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://fmt.dev" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b" -SRC_URI += "git://github.com/fmtlib/fmt" +SRC_URI += "git://github.com/fmtlib/fmt;branch=master;protocol=https" SRCREV = "7bdf0628b1276379886c7f6dda2cef2b3b374f0b" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb b/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb index 8890f6ce91..e37e71b322 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb @@ -14,7 +14,7 @@ PE = "1" PKGV = "${GITPKGVTAG}" SRCREV = "14c7f7aed7dd4e2454ee0cd81028b9f790885021" -SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0 \ +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ file://winpr-makecert-Build-with-install-RPATH.patch \ " diff --git a/meta-oe/recipes-support/function2/function2_4.1.0.bb b/meta-oe/recipes-support/function2/function2_4.1.0.bb index 56dc30acdc..d74cf19bd4 100644 --- a/meta-oe/recipes-support/function2/function2_4.1.0.bb +++ b/meta-oe/recipes-support/function2/function2_4.1.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRCREV = "3a0746bf5f601dfed05330aefcb6854354fce07d" PV .= "+git${SRCPV}" -SRC_URI += "gitsm://github.com/Naios/function2" +SRC_URI += "gitsm://github.com/Naios/function2;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch b/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch deleted file mode 100644 index 649b9b744f..0000000000 --- a/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8b111b2b4a4842179be66db68d84dda91a246032 Mon Sep 17 00:00:00 2001 -From: maryam ebrahimzadeh <maryam.ebr@student.sharif.edu> -Date: Mon, 19 Jul 2021 10:07:13 +0430 -Subject: [PATCH] fix read out-of-bands in reading tga header file - -CVE: CVE-2021-38115 -Upstream-Status: Backport [8b111b2b4a4842179be66db68d84dda91a246032] - -Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> ---- - src/gd_tga.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/gd_tga.c b/src/gd_tga.c -index cae9428..286febb 100644 ---- a/src/gd_tga.c -+++ b/src/gd_tga.c -@@ -191,7 +191,11 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga) - return -1; - } - -- gdGetBuf(tga->ident, tga->identsize, ctx); -+ -+ if (gdGetBuf(tga->ident, tga->identsize, ctx) != tga->identsize) { -+ gd_error("fail to read header ident"); -+ return -1; -+ } - } - - return 1; --- -2.25.1 - diff --git a/meta-oe/recipes-support/gd/gd_2.3.2.bb b/meta-oe/recipes-support/gd/gd_2.3.3.bb index 557b45dc49..630a5d6f94 100644 --- a/meta-oe/recipes-support/gd/gd_2.3.2.bb +++ b/meta-oe/recipes-support/gd/gd_2.3.3.bb @@ -9,15 +9,14 @@ HOMEPAGE = "http://libgd.github.io/" SECTION = "libs" LICENSE = "GD" -LIC_FILES_CHKSUM = "file://COPYING;md5=8e5bc8627b9494741c905d65238c66b7" +LIC_FILES_CHKSUM = "file://COPYING;md5=ace63adfdac78400fc30fa22ee9c1bb1" DEPENDS = "freetype libpng jpeg zlib tiff" -SRC_URI = "git://github.com/libgd/libgd.git;branch=master \ - file://0001-fix-read-out-of-bands-in-reading-tga-header-file.patch \ +SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1;protocol=https \ " -SRCREV = "2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e" +SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb index 6eea0c00ec..4379c2d9e1 100644 --- a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb +++ b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gflags/gflags" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" -SRC_URI = "git://github.com/gflags/gflags.git" +SRC_URI = "git://github.com/gflags/gflags.git;branch=master;protocol=https" SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/glog/glog_0.4.0.bb b/meta-oe/recipes-support/glog/glog_0.4.0.bb index 6b101ef676..ff18641375 100644 --- a/meta-oe/recipes-support/glog/glog_0.4.0.bb +++ b/meta-oe/recipes-support/glog/glog_0.4.0.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" SRC_URI = " \ - git://github.com/google/glog.git;nobranch=1 \ + git://github.com/google/glog.git;nobranch=1;protocol=https \ file://0001-Find-Libunwind-during-configure.patch \ file://libexecinfo.patch \ " diff --git a/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb b/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb index 146747eee1..ac46b5676c 100644 --- a/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb +++ b/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb @@ -13,7 +13,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=56a22a6e5bcce45e2c8ac184f81412b5" SRCREV = "0d6e3307bbdb8df4d56043d5f373eeeffe4cbef3" -SRC_URI = "git://git.sv.gnu.org/gnulib.git \ +SRC_URI = "git://git.sv.gnu.org/gnulib.git;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb b/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb index bf8cb90178..5fc982d768 100644 --- a/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb +++ b/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" DEPENDS_append_libc-musl = " libucontext" SRCREV = "f7c6fb6c8e99d6b1b725e5994373bcd19ffdf8fd" -SRC_URI = "git://github.com/gperftools/gperftools \ +SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https \ file://0001-Support-Atomic-ops-on-clang.patch \ file://0001-fix-build-with-musl-libc.patch \ file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb index 600b25df86..c4f0f19e84 100644 --- a/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-oe/recipes-support/gpm/gpm_git.bb @@ -13,7 +13,7 @@ SRCREV = "e82d1a653ca94aa4ed12441424da6ce780b1e530" DEPENDS = "ncurses bison-native" -SRC_URI = "git://github.com/telmich/gpm;protocol=git \ +SRC_URI = "git://github.com/telmich/gpm;protocol=https;branch=master \ file://init \ file://gpm.service.in \ " diff --git a/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-oe/recipes-support/hidapi/hidapi_git.bb index 76f5dc7624..02afab326e 100644 --- a/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-oe/recipes-support/hidapi/hidapi_git.bb @@ -10,7 +10,7 @@ DEPENDS = "libusb udev" inherit autotools pkgconfig -SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https \ +SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master \ file://0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch \ " PV = "0.10.1" diff --git a/meta-oe/recipes-support/htop/htop_3.0.5.bb b/meta-oe/recipes-support/htop/htop_3.0.5.bb index c757f7fb59..5328aff7c0 100644 --- a/meta-oe/recipes-support/htop/htop_3.0.5.bb +++ b/meta-oe/recipes-support/htop/htop_3.0.5.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891" DEPENDS = "ncurses" -SRC_URI = "git://github.com/htop-dev/htop.git \ +SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \ file://0001-Use-pkg-config.patch \ " SRCREV = "ce6d60e7def146c13d0b8bca4642e7401a0a8995" diff --git a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb index 3da67d1e3a..2e902ca4cb 100644 --- a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb +++ b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb @@ -135,7 +135,7 @@ RDEPENDS_${PN} = "hunspell" PV = "0.0.0+git${SRCPV}" SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee" -SRC_URI = "git://github.com/wooorm/dictionaries.git" +SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb b/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb index c2fb4fa05b..63d68ea06b 100644 --- a/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb +++ b/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ " SRCREV = "4ddd8ed5ca6484b930b111aec50c2750a6119a0f" -SRC_URI = "git://github.com/${BPN}/${BPN}.git" +SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_git.bb index 738c32d637..43972b6b59 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" PV = "0.346" SRCREV = "a2bff16032a68b089eeb169f09dea08094891c9c" -SRC_URI = "git://github.com/vcrhonek/${BPN}.git" +SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb index 986984d1ff..ac23630d01 100644 --- a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb +++ b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRCREV = "978b733462e41efd5db72bc9974cb3b0d1d5f6fa" PV = "1.5+git${SRCPV}" -SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https \ +SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https;branch=master \ file://fix-configure-option-parsing.patch \ file://avoid-obsolete-gnutls-apis.patch" diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index ac81fc75ab..985f3949b1 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -11,7 +11,7 @@ DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" BASE_PV := "${PV}" PV .= "_25" -SRC_URI = "git://github.com/ImageMagick/ImageMagick.git " +SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https" SRCREV = "8b4e00829eb84d4e7b4da11acf1f98f1e8166e5b" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/inih/libinih_git.bb b/meta-oe/recipes-support/inih/libinih_git.bb index 5beb292819..b2c0304a22 100644 --- a/meta-oe/recipes-support/inih/libinih_git.bb +++ b/meta-oe/recipes-support/inih/libinih_git.bb @@ -9,7 +9,7 @@ PR = "r3" # The github repository provides a cmake and pkg-config integration SRCREV = "c858aff8c31fa63ef4d1e0176c10e5928cde9a23" -SRC_URI = "git://github.com/OSSystems/inih.git \ +SRC_URI = "git://github.com/OSSystems/inih.git;branch=master;protocol=https \ file://0001-include-install-header-files-without-prefix-dir-inih.patch \ " diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.1.bb b/meta-oe/recipes-support/iniparser/iniparser_4.1.bb index f4b553a578..f3593fb5ff 100644 --- a/meta-oe/recipes-support/iniparser/iniparser_4.1.bb +++ b/meta-oe/recipes-support/iniparser/iniparser_4.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e02baf71c76e0650e667d7da133379ac" DEPENDS = "doxygen-native" -SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https \ +SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https;branch=master \ file://Add-CMake-support.patch" # tag 4.1 diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb index 8206590a86..258585d2ee 100644 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" SRCREV = "98e8dfa47eb6a6ba52e35de55d2de21b274a4af8" PV = "3.20.11.0" -SRC_URI = "git://github.com/rvoicilas/${BPN}" +SRC_URI = "git://github.com/rvoicilas/${BPN};branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb index 4cfb732932..d084a3b9b1 100644 --- a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb +++ b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "udev" SRCREV = "de6258940960443038b4c1651dfda3620075e870" -SRC_URI = "git://git.0pointer.de/libatasmart.git \ +SRC_URI = "git://git.0pointer.de/libatasmart.git;branch=master \ file://0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch \ " diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb index 0aaf188b61..3f6aeefffa 100644 --- a/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb +++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/git" B = "${S}" SRCREV = "732ee8d28492e4bc9b52c29bcb81a5c19388d002" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" +SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master;protocol=https" inherit gettext autotools python3native diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb index dc50509699..0a2240568a 100644 --- a/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb +++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb @@ -16,7 +16,7 @@ PROVIDES += "${PN}-dev" PV .= "+git${SRCPV}" SRCREV = "64f50dbd5cecdaba785217e2b0aeea3a4f1cdfab" -SRC_URI = "git://github.com/USCiLab/cereal.git" +SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb index 6237638d3d..7bb0a3b230 100644 --- a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb +++ b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE;md5=d8b4ca15d239dc1485ef495c8f1bcc72 \ " -SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https" +SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master" SRCREV = "5e4b350806d561473138ce7a982e8f6cf2e77733" DEPENDS = "librdkafka boost chrpath-replacement-native" diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb index 74b5e21e23..c6878577ef 100644 --- a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb +++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb @@ -8,7 +8,7 @@ DEPENDS = "libusb udev" PV = "1.0.0+git${SRCPV}" SRCREV = "655e2d544183d094f0e2d119c7e0c6206a0ddb3f" -SRC_URI = "git://github.com/cyrozap/${BPN}.git" +SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/libfann/libfann_git.bb b/meta-oe/recipes-support/libfann/libfann_git.bb index eae24461dc..5ab484d8a5 100644 --- a/meta-oe/recipes-support/libfann/libfann_git.bb +++ b/meta-oe/recipes-support/libfann/libfann_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f14599a2f089f6ff8c97e2baa4e3d575" inherit cmake SRCREV ?= "7ec1fc7e5bd734f1d3c89b095e630e83c86b9be1" -SRC_URI = "git://github.com/libfann/fann.git;branch=master \ +SRC_URI = "git://github.com/libfann/fann.git;branch=master;protocol=https \ " PV = "2.2.0+git${SRCPV}" diff --git a/meta-oe/recipes-support/libgusb/libgusb_0.3.5.bb b/meta-oe/recipes-support/libgusb/libgusb_0.3.5.bb index c4b0ff3723..2640c2562d 100644 --- a/meta-oe/recipes-support/libgusb/libgusb_0.3.5.bb +++ b/meta-oe/recipes-support/libgusb/libgusb_0.3.5.bb @@ -6,7 +6,7 @@ DEPENDS = "glib-2.0 libusb" inherit meson gobject-introspection gtk-doc gettext vala -SRC_URI = "git://github.com/hughsie/libgusb.git \ +SRC_URI = "git://github.com/hughsie/libgusb.git;branch=master;protocol=https \ " SRCREV = "1f712812327091c42c62b1ab1148d738d1a22b51" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/libharu/libharu_2.3.0.bb b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb index 8d30c1f7b1..1609071cde 100644 --- a/meta-oe/recipes-support/libharu/libharu_2.3.0.bb +++ b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb @@ -6,7 +6,7 @@ DESCRIPTION = "libHaru is a library for generating PDF files. \ LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://README;md5=3ee6bc1f64d9cc7907f44840c8e50cb1" -SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3 \ +SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3;protocol=https \ file://libharu-RELEASE_2_3_0_cmake.patch \ file://0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch \ " diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb index d7e4cc60a9..83c1c4360b 100644 --- a/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-oe/recipes-support/libiio/libiio_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" SRCREV = "565bf68eccfdbbf22cf5cb6d792e23de564665c7" PV = "0.21+git${SRCPV}" -SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https \ +SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=master \ file://0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" @@ -37,7 +37,10 @@ PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}" -RDEPENDS_${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold" +# Inheriting setuptools3 incorrectly adds the dependency on ${PYTHON_PN}-core +# to ${PN} instead of to ${PN}-${PYTHON_PN} where it belongs. +RDEPENDS_${PN}_remove = "${PYTHON_PN}-core" +RDEPENDS_${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-core ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold" FILES_${PN}-iiod = " \ ${sbindir}/iiod \ diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb index 590c4ebc28..fc0b1ee495 100644 --- a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb +++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b49da7df0ca479ef01ff7f2d799eabee" SRCREV = "50486af99b4f9b35522d7b3de40b6ce107505279" -SRC_URI += "git://github.com/LadislavSopko/mimetic/ \ +SRC_URI += "git://github.com/LadislavSopko/mimetic/;branch=master;protocol=https \ file://0001-libmimetic-Removing-test-directory-from-the-Makefile.patch \ file://0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch \ " diff --git a/meta-oe/recipes-support/libmxml/libmxml_3.1.bb b/meta-oe/recipes-support/libmxml/libmxml_3.1.bb index 4e77d6cc02..fd3369d8df 100644 --- a/meta-oe/recipes-support/libmxml/libmxml_3.1.bb +++ b/meta-oe/recipes-support/libmxml/libmxml_3.1.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" HOMEPAGE = "https://www.msweet.org/mxml/" BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues" -SRC_URI = "git://github.com/michaelrsweet/mxml.git" +SRC_URI = "git://github.com/michaelrsweet/mxml.git;branch=master;protocol=https" SRCREV = "e483e5fd8a33386fd46967681521bdd2da2b548f" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.11.bb b/meta-oe/recipes-support/libp11/libp11_0.4.11.bb index 1c5cc52bf4..aedb861b7f 100644 --- a/meta-oe/recipes-support/libp11/libp11_0.4.11.bb +++ b/meta-oe/recipes-support/libp11/libp11_0.4.11.bb @@ -9,7 +9,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" DEPENDS = "libtool openssl" -SRC_URI = "git://github.com/OpenSC/libp11.git" +SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https" SRCREV = "9ca6a71c890b5583c8af3b4900172626bca55e72" UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb b/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb index 5314f4a48a..8b653dd26a 100644 --- a/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb +++ b/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE;md5=2be8675acbfdac48935e73897af5f646 \ " -SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https \ +SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master \ file://0001_fix_absolute_path_usage.patch" SRCREV = "1a722553638bba85dbda5050455f7b9a5ef302de" diff --git a/meta-oe/recipes-support/librsync/librsync_2.3.2.bb b/meta-oe/recipes-support/librsync/librsync_2.3.2.bb index f1997136ac..d1fab12b77 100644 --- a/meta-oe/recipes-support/librsync/librsync_2.3.2.bb +++ b/meta-oe/recipes-support/librsync/librsync_2.3.2.bb @@ -4,7 +4,7 @@ AUTHOR = "Martin Pool, Andrew Tridgell, Donovan Baarda, Adam Schubert" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" -SRC_URI = "git://github.com/librsync/librsync.git" +SRC_URI = "git://github.com/librsync/librsync.git;branch=master;protocol=https" SRCREV = "42b636d2a65ab6914ea7cac50886da28192aaf9b" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb index 8b773aefa5..f6fc0e36b6 100644 --- a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb +++ b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=e0bfebea12a718922225ba987b2126a5" inherit autotools pkgconfig python3-dir SRCREV = "fd1ad6e7823fa76d8db0d3c5884faffa8ffddafb" -SRC_URI = "git://github.com/jackmitch/libsoc.git" +SRC_URI = "git://github.com/jackmitch/libsoc.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch new file mode 100644 index 0000000000..69276aba91 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch @@ -0,0 +1,101 @@ +From 06050e79655f0fa7d9daeda1fbd3a9a2c7736841 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 2 Dec 2021 15:08:25 +0800 +Subject: [PATCH] team_basic_test.py: switch to python3 + +Switch the script team_basic_test.py to python3 + +Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/63] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + scripts/team_basic_test.py | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py +index faabd18..0b64af2 100755 +--- a/scripts/team_basic_test.py ++++ b/scripts/team_basic_test.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + """ + Basic test. + +@@ -32,11 +32,11 @@ def usage(): + """ + Print usage of this app + """ +- print "Usage: team_basic_test.py [OPTION...]" +- print "" +- print " -h, --help print this message" +- print " -c, --loop-count=NUMBER number of loops (default 1)" +- print " -p, --port=NETDEV port device (can be defined multiple times)" ++ print("Usage: team_basic_test.py [OPTION...]") ++ print("") ++ print(" -h, --help print this message") ++ print(" -c, --loop-count=NUMBER number of loops (default 1)") ++ print(" -p, --port=NETDEV port device (can be defined multiple times)") + sys.exit() + + class CmdExecFailedException(Exception): +@@ -55,15 +55,15 @@ class CmdExecUnexpectedOutputException(Exception): + return "Command execution output unexpected: \"%s\" != \"%s\"" % (self.__output, self.__expected_output) + + def print_output(out_type, string): +- print("%s:\n" ++ print(("%s:\n" + "----------------------------\n" + "%s" +- "----------------------------" % (out_type, string)) ++ "----------------------------" % (out_type, string))) + + def cmd_exec(cmd, expected_output=None, cleaner=False): + cmd = cmd.rstrip(" ") + if not cleaner: +- print("# \"%s\"" % cmd) ++ print(("# \"%s\"" % cmd)) + subp = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + (data_stdout, data_stderr) = subp.communicate() +@@ -74,7 +74,7 @@ def cmd_exec(cmd, expected_output=None, cleaner=False): + if data_stderr: + print_output("Stderr", data_stderr) + raise CmdExecFailedException(subp.returncode) +- output = data_stdout.rstrip() ++ output = (data_stdout.rstrip()).decode() + if expected_output: + if output != expected_output: + raise CmdExecUnexpectedOutputException(output, expected_output) +@@ -166,7 +166,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + os.removedirs("/tmp/team_test/") + + def _run_one_loop(self, run_nr): +- print "RUN #%d" % (run_nr) ++ print("RUN #%d" % (run_nr)) + self._created_teams = [] + try: + for mode_name in self._team_modes: +@@ -176,7 +176,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + cmd_exec("modprobe -r team_mode_loadbalance team_mode_roundrobin team_mode_activebackup team_mode_broadcast team"); + + def run(self): +- for i in xrange(self._loop_count): ++ for i in range(self._loop_count): + self._run_one_loop(i + 1) + + def main(): +@@ -186,8 +186,8 @@ def main(): + "hc:p:", + ["help", "loop-count=", "port="] + ) +- except getopt.GetoptError, err: +- print str(err) ++ except getopt.GetoptError as err: ++ print(str(err)) + usage() + + btest = TeamBasicTest() +-- +2.17.1 + diff --git a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-use-python3-interpreter.patch b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-use-python3-interpreter.patch deleted file mode 100644 index e27e4f3291..0000000000 --- a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-use-python3-interpreter.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 571c141b434dff13494c6a3afe621f63a8e610e9 Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.z@gmail.com> -Date: Mon, 27 Jan 2020 14:29:34 +0000 -Subject: [PATCH] team_basic_test.py: use python3 interpreter - -Use python3 since python2 is EOL and has been removed from several -distributions. - -Upstream-Status: Pending - -Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> ---- - scripts/team_basic_test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py -index b05be9e..ad980e8 100755 ---- a/scripts/team_basic_test.py -+++ b/scripts/team_basic_test.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/env python3 - """ - Basic test. - --- -2.17.1 - diff --git a/meta-oe/recipes-support/libteam/libteam_1.31.bb b/meta-oe/recipes-support/libteam/libteam_1.31.bb index 149cfb8d23..764eb6fb74 100644 --- a/meta-oe/recipes-support/libteam/libteam_1.31.bb +++ b/meta-oe/recipes-support/libteam/libteam_1.31.bb @@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libnl libdaemon jansson" -SRC_URI = "git://github.com/jpirko/libteam \ +SRC_URI = "git://github.com/jpirko/libteam;branch=master;protocol=https \ file://0001-include-sys-select.h-for-fd_set-definition.patch \ file://0002-teamd-Re-adjust-include-header-order.patch \ file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ - file://0001-team_basic_test.py-use-python3-interpreter.patch \ + file://0001-team_basic_test.py-switch-to-python3.patch \ file://run-ptest \ " SRCREV = "3ee12c6d569977cf1cd30d0da77807a07aa77158" diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb index a2491cf9e6..2a33284b8a 100644 --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" -SRC_URI = "git://github.com/leethomason/tinyxml2.git" +SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https" SRCREV = "bf15233ad88390461f6ab0dbcf046cce643c5fcb" diff --git a/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb b/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb index 21fa478b6e..da2ad3ce4b 100644 --- a/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb +++ b/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb @@ -19,7 +19,7 @@ BBCLASSEXTEND = "native nativesdk" PE = "1" SRC_URI = " \ - git://github.com/libusb/libusb-compat-0.1.git;protocol=https \ + git://github.com/libusb/libusb-compat-0.1.git;protocol=https;branch=master \ file://0001-usb.h-Include-sys-types.h.patch \ " SRCREV = "4a27760ec5954ec8605e052a3207afbe0979eeef" diff --git a/meta-oe/recipes-support/libusbg/libusbg_git.bb b/meta-oe/recipes-support/libusbg/libusbg_git.bb index b1c4663525..9f21f8d757 100644 --- a/meta-oe/recipes-support/libusbg/libusbg_git.bb +++ b/meta-oe/recipes-support/libusbg/libusbg_git.bb @@ -8,7 +8,7 @@ inherit autotools update-alternatives PV = "0.1.0" SRCREV = "a826d136e0e8fa53815f1ba05893e6dd74208c15" -SRC_URI = "git://github.com/libusbg/libusbg.git \ +SRC_URI = "git://github.com/libusbg/libusbg.git;branch=master;protocol=https \ file://0001-Fix-out-of-tree-builds.patch \ " diff --git a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb index 48fc911434..eeed1c943f 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb +++ b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb @@ -11,7 +11,7 @@ PV = "0.2.0+git${SRCPV}" SRCREV = "45c14ef4d5d7ced0fbf984208de44ced6d5ed898" SRCBRANCH = "master" SRC_URI = " \ - git://github.com/libusbgx/libusbgx.git;branch=${SRCBRANCH} \ + git://github.com/libusbgx/libusbgx.git;branch=${SRCBRANCH};protocol=https \ file://gadget-start \ file://usbgx.initd \ file://usbgx.service \ diff --git a/meta-oe/recipes-support/libutempter/libutempter.bb b/meta-oe/recipes-support/libutempter/libutempter.bb index b8a700b7b7..d259f166d1 100644 --- a/meta-oe/recipes-support/libutempter/libutempter.bb +++ b/meta-oe/recipes-support/libutempter/libutempter.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SRCREV = "3ef74fff310f09e2601e241b9f042cd39d591018" PV = "1.1.6-alt2+git${SRCPV}" -SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git \ +SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git;branch=master \ file://0001-Fix-macro-error.patch \ file://0002-Proper-macro-path-generation.patch \ file://libutempter-remove-glibc-assumption.patch \ diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb index 4891fd187d..4e7e61426d 100644 --- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb +++ b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df PV = "4.1+git${SRCPV}" -SRC_URI = "git://github.com/Datera/lio-utils.git \ +SRC_URI = "git://github.com/Datera/lio-utils.git;branch=master;protocol=https \ file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \ " SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e" diff --git a/meta-oe/recipes-support/mcelog/mce-inject_git.bb b/meta-oe/recipes-support/mcelog/mce-inject_git.bb index cc33cbaf28..8241bd2342 100644 --- a/meta-oe/recipes-support/mcelog/mce-inject_git.bb +++ b/meta-oe/recipes-support/mcelog/mce-inject_git.bb @@ -4,7 +4,7 @@ software level into a running Linux kernel. This is intended for \ validation of the kernel machine check handler." SECTION = "System Environment/Base" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git" +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git;branch=master" SRCREV = "4cbe46321b4a81365ff3aafafe63967264dbfec5" diff --git a/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-oe/recipes-support/mcelog/mce-test_git.bb index 35fb944702..f245515216 100644 --- a/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/meta-oe/recipes-support/mcelog/mce-test_git.bb @@ -10,7 +10,7 @@ containment and recovery, ACPI/APEI support etc." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git \ +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git;branch=master \ file://makefile-remove-ldflags.patch \ file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \ " diff --git a/meta-oe/recipes-support/mcelog/mcelog_175.bb b/meta-oe/recipes-support/mcelog/mcelog_175.bb index ae810eff8e..91220bd34b 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_175.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_175.bb @@ -5,7 +5,7 @@ and should run on all Linux systems that need error handling." HOMEPAGE = "http://mcelog.org/" SECTION = "System Environment/Base" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;branch=master \ file://0001-test-avoid-the-pfa-test-hang.patch \ file://run-ptest \ " diff --git a/meta-oe/recipes-support/mg/mg_20210314.bb b/meta-oe/recipes-support/mg/mg_20210314.bb index 9275dd233d..594776e0d6 100644 --- a/meta-oe/recipes-support/mg/mg_20210314.bb +++ b/meta-oe/recipes-support/mg/mg_20210314.bb @@ -6,7 +6,7 @@ DEPENDS = "ncurses libbsd" SECTION = "console/editors" SRCREV = "598f7a028f01f85f0dee0e798753bccf93233add" -SRC_URI = "git://github.com/hboetes/mg \ +SRC_URI = "git://github.com/hboetes/mg;branch=master;protocol=https \ file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ " diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index 186f78b8f2..a43d7a1d46 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -29,7 +29,7 @@ DEPENDS = "libdevmapper \ LICENSE = "GPLv2" -SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ +SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=http;branch=master \ file://multipathd.oe \ file://multipath.conf.example \ file://0021-RH-fixup-udev-rules-for-redhat.patch \ diff --git a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb index f37ccde1cb..6cb53212a4 100644 --- a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb +++ b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e7fe20c9be97be5579e3ab5d92d3a218" SECTION = "libs" -SRC_URI = "git://github.com/projectNe10/Ne10.git \ +SRC_URI = "git://github.com/projectNe10/Ne10.git;branch=master;protocol=https \ file://0001-CMakeLists.txt-Remove-mthumb-interwork.patch \ file://0001-Dont-specify-march-explicitly.patch \ " diff --git a/meta-oe/recipes-support/nss/nss/0001-Bug-1735028-check-for-missing-signedData-field-r-kee.patch b/meta-oe/recipes-support/nss/nss/0001-Bug-1735028-check-for-missing-signedData-field-r-kee.patch new file mode 100644 index 0000000000..38b982b486 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/0001-Bug-1735028-check-for-missing-signedData-field-r-kee.patch @@ -0,0 +1,55 @@ +From 074e29e6724d443d3161ee2982ba7f017d3075dd Mon Sep 17 00:00:00 2001 +From: "John M. Schanck" <jschanck@mozilla.com> +Date: Mon, 11 Oct 2021 22:09:25 +0000 +Subject: [PATCH] Bug 1735028 - check for missing signedData field r=keeler + +Differential Revision: https://phabricator.services.mozilla.com/D128112 + +Upstream-Status: Backport [074e29e6724d443d3161ee2982ba7f017d3075dd] +CVE: CVE-2022-22747 +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + gtests/certdb_gtest/decode_certs_unittest.cc | 13 +++++++++++++ + lib/pkcs7/certread.c | 5 +++++ + 2 files changed, 18 insertions(+) + +diff --git a/nss/gtests/certdb_gtest/decode_certs_unittest.cc b/nss/gtests/certdb_gtest/decode_certs_unittest.cc +index 405194edc..3317ae8ee 100644 +--- a/nss/gtests/certdb_gtest/decode_certs_unittest.cc ++++ b/nss/gtests/certdb_gtest/decode_certs_unittest.cc +@@ -26,3 +26,16 @@ TEST_F(DecodeCertsTest, EmptyCertPackage) { + sizeof(emptyCertPackage))); + EXPECT_EQ(SEC_ERROR_BAD_DER, PR_GetError()); + } ++ ++TEST_F(DecodeCertsTest, EmptySignedData) { ++ // This represents a PKCS#7 ContentInfo of contentType ++ // 1.2.840.113549.1.7.2 (signedData) with missing content. ++ unsigned char emptySignedData[] = {0x30, 0x80, 0x06, 0x09, 0x2a, 0x86, ++ 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, ++ 0x02, 0x00, 0x00, 0x05, 0x00}; ++ ++ EXPECT_EQ(nullptr, ++ CERT_DecodeCertFromPackage(reinterpret_cast<char*>(emptySignedData), ++ sizeof(emptySignedData))); ++ EXPECT_EQ(SEC_ERROR_BAD_DER, PR_GetError()); ++} +diff --git a/nss/lib/pkcs7/certread.c b/nss/lib/pkcs7/certread.c +index 3091f9947..15094f2d7 100644 +--- a/nss/lib/pkcs7/certread.c ++++ b/nss/lib/pkcs7/certread.c +@@ -139,6 +139,11 @@ SEC_ReadPKCS7Certs(SECItem *pkcs7Item, CERTImportCertificateFunc f, void *arg) + goto done; + } + ++ if (contentInfo.content.signedData == NULL) { ++ PORT_SetError(SEC_ERROR_BAD_DER); ++ goto done; ++ } ++ + rv = SECSuccess; + + certs = contentInfo.content.signedData->certificates; +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nss/nss/0001-Bug-1737470-Ensure-DER-encoded-signatures-are-within.patch b/meta-oe/recipes-support/nss/nss/0001-Bug-1737470-Ensure-DER-encoded-signatures-are-within.patch new file mode 100644 index 0000000000..dff07de92f --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/0001-Bug-1737470-Ensure-DER-encoded-signatures-are-within.patch @@ -0,0 +1,297 @@ +From 7c6fb56c3bcafa96c0bc87350f0f9e85f002a254 Mon Sep 17 00:00:00 2001 +From: Dennis Jackson <djackson@mozilla.com> +Date: Mon, 22 Nov 2021 10:40:42 +0000 +Subject: [PATCH] Bug 1737470 - Ensure DER encoded signatures are within size + limits. r=jschanck,mt,bbeurdouche,rrelyea + +Differential Revision: https://phabricator.services.mozilla.com/D129514 + +--HG-- +branch : NSS_3_68_1_BRANCH + +Upstream-Status: Backport [7c6fb56c3bcafa96c0bc87350f0f9e85f002a254] +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + lib/cryptohi/secvfy.c | 192 ++++++++++++++++++++++++++---------------- + 1 file changed, 121 insertions(+), 71 deletions(-) + +diff --git a/nss/lib/cryptohi/secvfy.c b/nss/lib/cryptohi/secvfy.c +index 2540a544c..17545848c 100644 +--- a/nss/lib/cryptohi/secvfy.c ++++ b/nss/lib/cryptohi/secvfy.c +@@ -164,6 +164,37 @@ verifyPKCS1DigestInfo(const VFYContext *cx, const SECItem *digest) + PR_FALSE /*XXX: unsafeAllowMissingParameters*/); + } + ++static unsigned int ++checkedSignatureLen(const SECKEYPublicKey *pubk) ++{ ++ unsigned int sigLen = SECKEY_SignatureLen(pubk); ++ if (sigLen == 0) { ++ /* Error set by SECKEY_SignatureLen */ ++ return sigLen; ++ } ++ unsigned int maxSigLen; ++ switch (pubk->keyType) { ++ case rsaKey: ++ case rsaPssKey: ++ maxSigLen = (RSA_MAX_MODULUS_BITS + 7) / 8; ++ break; ++ case dsaKey: ++ maxSigLen = DSA_MAX_SIGNATURE_LEN; ++ break; ++ case ecKey: ++ maxSigLen = 2 * MAX_ECKEY_LEN; ++ break; ++ default: ++ PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG); ++ return 0; ++ } ++ if (sigLen > maxSigLen) { ++ PORT_SetError(SEC_ERROR_INVALID_KEY); ++ return 0; ++ } ++ return sigLen; ++} ++ + /* + * decode the ECDSA or DSA signature from it's DER wrapping. + * The unwrapped/raw signature is placed in the buffer pointed +@@ -174,38 +205,38 @@ decodeECorDSASignature(SECOidTag algid, const SECItem *sig, unsigned char *dsig, + unsigned int len) + { + SECItem *dsasig = NULL; /* also used for ECDSA */ +- SECStatus rv = SECSuccess; + +- if ((algid != SEC_OID_ANSIX9_DSA_SIGNATURE) && +- (algid != SEC_OID_ANSIX962_EC_PUBLIC_KEY)) { +- if (sig->len != len) { +- PORT_SetError(SEC_ERROR_BAD_DER); +- return SECFailure; ++ /* Safety: Ensure algId is as expected and that signature size is within maxmimums */ ++ if (algid == SEC_OID_ANSIX9_DSA_SIGNATURE) { ++ if (len > DSA_MAX_SIGNATURE_LEN) { ++ goto loser; + } +- +- PORT_Memcpy(dsig, sig->data, sig->len); +- return SECSuccess; +- } +- +- if (algid == SEC_OID_ANSIX962_EC_PUBLIC_KEY) { ++ } else if (algid == SEC_OID_ANSIX962_EC_PUBLIC_KEY) { + if (len > MAX_ECKEY_LEN * 2) { +- PORT_SetError(SEC_ERROR_BAD_DER); +- return SECFailure; ++ goto loser; + } +- } +- dsasig = DSAU_DecodeDerSigToLen((SECItem *)sig, len); +- +- if ((dsasig == NULL) || (dsasig->len != len)) { +- rv = SECFailure; + } else { +- PORT_Memcpy(dsig, dsasig->data, dsasig->len); ++ goto loser; + } + +- if (dsasig != NULL) ++ /* Decode and pad to length */ ++ dsasig = DSAU_DecodeDerSigToLen((SECItem *)sig, len); ++ if (dsasig == NULL) { ++ goto loser; ++ } ++ if (dsasig->len != len) { + SECITEM_FreeItem(dsasig, PR_TRUE); +- if (rv == SECFailure) +- PORT_SetError(SEC_ERROR_BAD_DER); +- return rv; ++ goto loser; ++ } ++ ++ PORT_Memcpy(dsig, dsasig->data, len); ++ SECITEM_FreeItem(dsasig, PR_TRUE); ++ ++ return SECSuccess; ++ ++loser: ++ PORT_SetError(SEC_ERROR_BAD_DER); ++ return SECFailure; + } + + const SEC_ASN1Template hashParameterTemplate[] = +@@ -281,7 +312,7 @@ SECStatus + sec_DecodeSigAlg(const SECKEYPublicKey *key, SECOidTag sigAlg, + const SECItem *param, SECOidTag *encalgp, SECOidTag *hashalg) + { +- int len; ++ unsigned int len; + PLArenaPool *arena; + SECStatus rv; + SECItem oid; +@@ -466,48 +497,52 @@ vfy_CreateContext(const SECKEYPublicKey *key, const SECItem *sig, + cx->pkcs1RSADigestInfo = NULL; + rv = SECSuccess; + if (sig) { +- switch (type) { +- case rsaKey: +- rv = recoverPKCS1DigestInfo(hashAlg, &cx->hashAlg, +- &cx->pkcs1RSADigestInfo, +- &cx->pkcs1RSADigestInfoLen, +- cx->key, +- sig, wincx); +- break; +- case rsaPssKey: +- sigLen = SECKEY_SignatureLen(key); +- if (sigLen == 0) { +- /* error set by SECKEY_SignatureLen */ +- rv = SECFailure; ++ rv = SECFailure; ++ if (type == rsaKey) { ++ rv = recoverPKCS1DigestInfo(hashAlg, &cx->hashAlg, ++ &cx->pkcs1RSADigestInfo, ++ &cx->pkcs1RSADigestInfoLen, ++ cx->key, ++ sig, wincx); ++ } else { ++ sigLen = checkedSignatureLen(key); ++ /* Check signature length is within limits */ ++ if (sigLen == 0) { ++ /* error set by checkedSignatureLen */ ++ rv = SECFailure; ++ goto loser; ++ } ++ if (sigLen > sizeof(cx->u)) { ++ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); ++ rv = SECFailure; ++ goto loser; ++ } ++ switch (type) { ++ case rsaPssKey: ++ if (sig->len != sigLen) { ++ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); ++ rv = SECFailure; ++ goto loser; ++ } ++ PORT_Memcpy(cx->u.buffer, sig->data, sigLen); ++ rv = SECSuccess; + break; +- } +- if (sig->len != sigLen) { +- PORT_SetError(SEC_ERROR_BAD_SIGNATURE); +- rv = SECFailure; ++ case ecKey: ++ case dsaKey: ++ /* decodeECorDSASignature will check sigLen == sig->len after padding */ ++ rv = decodeECorDSASignature(encAlg, sig, cx->u.buffer, sigLen); + break; +- } +- PORT_Memcpy(cx->u.buffer, sig->data, sigLen); +- break; +- case dsaKey: +- case ecKey: +- sigLen = SECKEY_SignatureLen(key); +- if (sigLen == 0) { +- /* error set by SECKEY_SignatureLen */ ++ default: ++ /* Unreachable */ + rv = SECFailure; +- break; +- } +- rv = decodeECorDSASignature(encAlg, sig, cx->u.buffer, sigLen); +- break; +- default: +- rv = SECFailure; +- PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG); +- break; ++ goto loser; ++ } ++ } ++ if (rv != SECSuccess) { ++ goto loser; + } + } + +- if (rv) +- goto loser; +- + /* check hash alg again, RSA may have changed it.*/ + if (HASH_GetHashTypeByOidTag(cx->hashAlg) == HASH_AlgNULL) { + /* error set by HASH_GetHashTypeByOidTag */ +@@ -650,11 +685,16 @@ VFY_EndWithSignature(VFYContext *cx, SECItem *sig) + switch (cx->key->keyType) { + case ecKey: + case dsaKey: +- dsasig.data = cx->u.buffer; +- dsasig.len = SECKEY_SignatureLen(cx->key); ++ dsasig.len = checkedSignatureLen(cx->key); + if (dsasig.len == 0) { + return SECFailure; + } ++ if (dsasig.len > sizeof(cx->u)) { ++ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); ++ return SECFailure; ++ } ++ dsasig.data = cx->u.buffer; ++ + if (sig) { + rv = decodeECorDSASignature(cx->encAlg, sig, dsasig.data, + dsasig.len); +@@ -686,8 +726,13 @@ VFY_EndWithSignature(VFYContext *cx, SECItem *sig) + } + + rsasig.data = cx->u.buffer; +- rsasig.len = SECKEY_SignatureLen(cx->key); ++ rsasig.len = checkedSignatureLen(cx->key); + if (rsasig.len == 0) { ++ /* Error set by checkedSignatureLen */ ++ return SECFailure; ++ } ++ if (rsasig.len > sizeof(cx->u)) { ++ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); + return SECFailure; + } + if (sig) { +@@ -749,7 +794,6 @@ vfy_VerifyDigest(const SECItem *digest, const SECKEYPublicKey *key, + SECStatus rv; + VFYContext *cx; + SECItem dsasig; /* also used for ECDSA */ +- + rv = SECFailure; + + cx = vfy_CreateContext(key, sig, encAlg, hashAlg, NULL, wincx); +@@ -757,19 +801,25 @@ vfy_VerifyDigest(const SECItem *digest, const SECKEYPublicKey *key, + switch (key->keyType) { + case rsaKey: + rv = verifyPKCS1DigestInfo(cx, digest); ++ /* Error (if any) set by verifyPKCS1DigestInfo */ + break; +- case dsaKey: + case ecKey: ++ case dsaKey: + dsasig.data = cx->u.buffer; +- dsasig.len = SECKEY_SignatureLen(cx->key); ++ dsasig.len = checkedSignatureLen(cx->key); + if (dsasig.len == 0) { ++ /* Error set by checkedSignatureLen */ ++ rv = SECFailure; + break; + } +- if (PK11_Verify(cx->key, &dsasig, (SECItem *)digest, cx->wincx) != +- SECSuccess) { ++ if (dsasig.len > sizeof(cx->u)) { ++ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); ++ rv = SECFailure; ++ break; ++ } ++ rv = PK11_Verify(cx->key, &dsasig, (SECItem *)digest, cx->wincx); ++ if (rv != SECSuccess) { + PORT_SetError(SEC_ERROR_BAD_SIGNATURE); +- } else { +- rv = SECSuccess; + } + break; + default: +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nss/nss_3.64.bb b/meta-oe/recipes-support/nss/nss_3.64.bb index 97193aff5c..d16aec65d8 100644 --- a/meta-oe/recipes-support/nss/nss_3.64.bb +++ b/meta-oe/recipes-support/nss/nss_3.64.bb @@ -32,6 +32,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://system-pkcs11.txt \ file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ + file://0001-Bug-1737470-Ensure-DER-encoded-signatures-are-within.patch \ + file://0001-Bug-1735028-check-for-missing-signedData-field-r-kee.patch \ " SRC_URI[sha256sum] = "d3175427172e9c3a6f1ebc74452cb791590f28191c6a1a443dbc0d87c9df1126" diff --git a/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb b/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb index 9fd88ced95..831b15a455 100644 --- a/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb +++ b/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/Oblomov/clinfo" LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fd8857f774dfb0eefe1e80c8f9240a7e" -SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https" +SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https;branch=master" SRCREV = "59d0daf898e48d76ccbb788acbba258fa0a8ba7c" diff --git a/meta-oe/recipes-support/opencv/ade_0.1.1f.bb b/meta-oe/recipes-support/opencv/ade_0.1.1f.bb index 3861802158..7e9bbc31c9 100644 --- a/meta-oe/recipes-support/opencv/ade_0.1.1f.bb +++ b/meta-oe/recipes-support/opencv/ade_0.1.1f.bb @@ -4,7 +4,7 @@ and processing framework. ADE Framework is suitable for \ organizing data flow processing and execution." HOMEPAGE = "https://github.com/opencv/ade" -SRC_URI = "git://github.com/opencv/ade.git \ +SRC_URI = "git://github.com/opencv/ade.git;branch=master;protocol=https \ file://0001-use-GNUInstallDirs-for-detecting-install-paths.patch \ " diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-oe/recipes-support/opencv/opencv_4.5.2.bb index 226bad5778..20df81ac77 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.5.2.bb @@ -38,13 +38,13 @@ IPP_FILENAME = "${@ipp_filename(d)}" IPP_MD5 = "${@ipp_md5sum(d)}" SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ - git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ - git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode \ +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \ + git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib;branch=master;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face;protocol=https \ + git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode;protocol=https \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ diff --git a/meta-oe/recipes-support/opensc/opensc_0.21.0.bb b/meta-oe/recipes-support/opensc/opensc_0.21.0.bb index 2fbf60c14a..509bacb0d4 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.21.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.21.0.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" #v0.21.0 SRCREV = "30180986a08cf71fe4af4b50251a8bb5b1ab95af" -SRC_URI = "git://github.com/OpenSC/OpenSC \ +SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https \ " DEPENDS = "virtual/libiconv openssl" diff --git a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb index bc82e49ead..6339f6dd5c 100644 --- a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb +++ b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" -SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https" +SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master" SRCREV = "34ac207adbba0d1a951b314c1676610a1d0bba01" diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_git.bb index 3d26b9364b..801300e707 100644 --- a/meta-oe/recipes-support/picocom/picocom_git.bb +++ b/meta-oe/recipes-support/picocom/picocom_git.bb @@ -9,7 +9,7 @@ PV = "${BASEPV}+git${SRCPV}" SRCREV = "90385aabe2b51f39fa130627d46b377569f82d4a" -SRC_URI = "git://github.com/npat-efault/picocom \ +SRC_URI = "git://github.com/npat-efault/picocom;branch=master;protocol=https \ file://0001-Fix-building-with-musl.patch \ " diff --git a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb index 3a437659e7..0e3e5ff733 100644 --- a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb +++ b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb @@ -7,7 +7,7 @@ DEPENDS = "pidgin json-glib glib-2.0" inherit pkgconfig -SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=git" +SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https" SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-oe/recipes-support/pidgin/icyque_git.bb index 0f32dc3a39..2905e16fcc 100644 --- a/meta-oe/recipes-support/pidgin/icyque_git.bb +++ b/meta-oe/recipes-support/pidgin/icyque_git.bb @@ -9,7 +9,7 @@ PV = "0.1+gitr${SRCPV}" inherit pkgconfig -SRC_URI = "git://github.com/EionRobb/icyque" +SRC_URI = "git://github.com/EionRobb/icyque;branch=master;protocol=https" SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb index 277d12057a..634b3e655a 100644 --- a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb +++ b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb @@ -7,7 +7,7 @@ DEPENDS = "pidgin json-glib glib-2.0 zlib" inherit pkgconfig -SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=git" +SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https" SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/poco/poco_1.10.1.bb b/meta-oe/recipes-support/poco/poco_1.10.1.bb index 48b31dd3f3..b672f65a0e 100644 --- a/meta-oe/recipes-support/poco/poco_1.10.1.bb +++ b/meta-oe/recipes-support/poco/poco_1.10.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" DEPENDS = "libpcre zlib" SRC_URI = " \ - git://github.com/pocoproject/poco.git;branch=poco-${PV} \ + git://github.com/pocoproject/poco.git;branch=poco-${PV};protocol=https \ file://0001-Add-support-of-arch-riscv32.patch \ file://run-ptest \ " diff --git a/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb index c8baa5d9ca..5b53587745 100644 --- a/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb +++ b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRCREV = "cb48b7ecf7079ceba7081c78d4e61e507b0e8d2d" -SRC_URI = "git://github.com/ago/pps-tools.git" +SRC_URI = "git://github.com/ago/pps-tools.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/re2/re2_2020.11.01.bb b/meta-oe/recipes-support/re2/re2_2020.11.01.bb index 7f6fcdb01b..467e7c667e 100644 --- a/meta-oe/recipes-support/re2/re2_2020.11.01.bb +++ b/meta-oe/recipes-support/re2/re2_2020.11.01.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" SRCREV = "166dbbeb3b0ab7e733b278e8f42a84f6882b8a25" -SRC_URI = "git://github.com/google/re2.git;branch=master" +SRC_URI = "git://github.com/google/re2.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index 33f5dccca2..6fe8aa76f2 100644 --- a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -25,7 +25,7 @@ RDEPENDS_${PN} = "rsync \ SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9" PV = "1.4.3+git${SRCPV}" -SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ +SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=https \ file://configure-fix-cmd_rsync.patch \ " diff --git a/meta-oe/recipes-support/sass/libsass_git.bb b/meta-oe/recipes-support/sass/libsass_git.bb index 9cba3a8901..ea4033dc64 100644 --- a/meta-oe/recipes-support/sass/libsass_git.bb +++ b/meta-oe/recipes-support/sass/libsass_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" inherit autotools -SRC_URI = "git://github.com/sass/libsass.git;branch=master" +SRC_URI = "git://github.com/sass/libsass.git;branch=master;protocol=https" SRCREV = "8d312a1c91bb7dd22883ebdfc829003f75a82396" PV = "3.6.4" diff --git a/meta-oe/recipes-support/sass/sassc_git.bb b/meta-oe/recipes-support/sass/sassc_git.bb index 3c7a55cc3d..985d519f93 100644 --- a/meta-oe/recipes-support/sass/sassc_git.bb +++ b/meta-oe/recipes-support/sass/sassc_git.bb @@ -6,7 +6,7 @@ DEPENDS = "libsass" inherit autotools pkgconfig -SRC_URI = "git://github.com/sass/sassc.git" +SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https" SRCREV = "46748216ba0b60545e814c07846ca10c9fefc5b6" S = "${WORKDIR}/git" PV = "3.6.1" diff --git a/meta-oe/recipes-support/satyr/satyr_0.37.bb b/meta-oe/recipes-support/satyr/satyr_0.37.bb index 4630eb0210..604d33b6e0 100644 --- a/meta-oe/recipes-support/satyr/satyr_0.37.bb +++ b/meta-oe/recipes-support/satyr/satyr_0.37.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2" inherit autotools-brokensep python3native pkgconfig -SRC_URI = "git://github.com/abrt/satyr.git \ +SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \ file://0002-fix-compile-failure-against-musl-C-library.patch \ " SRCREV = "4a7d0a31cdeee23bb13739f57926188a795bdf25" diff --git a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb index 7f59b3ecad..87d9c52903 100644 --- a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb +++ b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb @@ -6,7 +6,7 @@ SECTION = "console/network" SRCREV = "00dbec2636ae0385ad028587e20e446272ff97ec" PV = "1.1+gitr${SRCPV}" -SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https" +SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https;branch=master" S = "${WORKDIR}/git/tools/serial_forward" inherit autotools native diff --git a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb index 0ef829856c..dcad8f7104 100644 --- a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb +++ b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb @@ -6,7 +6,7 @@ SECTION = "console/devel" SRCREV = "07c6fdede0870edc37a8d51d033b6e7e29aa7c91" PV = "1.1+gitr${SRCPV}" -SRC_URI = "git://github.com/freesmartphone/cornucopia.git \ +SRC_URI = "git://github.com/freesmartphone/cornucopia.git;branch=master;protocol=https \ file://0001-serial_forward-Disable-default-static-linking.patch;striplevel=3 \ " S = "${WORKDIR}/git/tools/serial_forward" diff --git a/meta-oe/recipes-support/span-lite/span-lite_0.8.1.bb b/meta-oe/recipes-support/span-lite/span-lite_0.8.1.bb index 6956f5fe6e..d1b04b7108 100644 --- a/meta-oe/recipes-support/span-lite/span-lite_0.8.1.bb +++ b/meta-oe/recipes-support/span-lite/span-lite_0.8.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/martinmoene/span-lite" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI += "git://github.com/martinmoene/span-lite" +SRC_URI += "git://github.com/martinmoene/span-lite;branch=master;protocol=https" SRCREV = "937262f25fb702592cbc5c772111a73a5e3c1e07" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb b/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb index 67ec802cdd..cf75ade186 100644 --- a/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb +++ b/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRCREV = "de0dbfa3596a18cd70a4619b6a9766847a941276" -SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x; \ +SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x; \ file://0001-Enable-use-of-external-fmt-library.patch" DEPENDS += "fmt" diff --git a/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-oe/recipes-support/spitools/spitools_git.bb index cde26df498..352145c07b 100644 --- a/meta-oe/recipes-support/spitools/spitools_git.bb +++ b/meta-oe/recipes-support/spitools/spitools_git.bb @@ -10,7 +10,7 @@ SRCREV = "67937230d70ad87c23c7116a72df83577e309f6f" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=git" +SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=https;branch=master" inherit autotools diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 0e1d09492b..7334800304 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch @@ -38,7 +38,7 @@ index 0ccc2b9..7f08c0e 100644 -CONTROL_FILE=/var/run/syslog-ng.ctl -PID_FILE=/var/run/syslog-ng.pid +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist -+CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl ++CONTROL_FILE=@LOCALSTATEDIR@/run/syslog-ng/syslog-ng.ctl +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid OTHER_OPTIONS="--enable-core" -- diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb index 3f82734acd..5bcbea4600 100644 --- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb @@ -7,7 +7,7 @@ SECTION = "devel" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/jthornber/thin-provisioning-tools;branch=main \ +SRC_URI = "git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ file://0001-do-not-strip-pdata_tools-at-do_install.patch \ file://use-sh-on-path.patch \ " diff --git a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb index aba485e1a4..4dddd54c5f 100644 --- a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb +++ b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://main.c;start_line=5;end_line=16;md5=9ae4bf20caf291afa # 0.2 version SRCREV = "8586d617aed19fc75f5ae1e07270752c1b2f9a30" -SRC_URI = "git://github.com/OSSystems/toscoterm.git" +SRC_URI = "git://github.com/OSSystems/toscoterm.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/udisks/udisks2_2.9.2.bb b/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb index f9e1274380..a25860fd92 100644 --- a/meta-oe/recipes-support/udisks/udisks2_2.9.2.bb +++ b/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb @@ -17,8 +17,8 @@ DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" RDEPENDS_${PN} = "acl" -SRC_URI = "git://github.com/storaged-project/udisks.git;branch=master" -SRCREV = "da6d9480fefeb0ffdf8a84626b5096827d8d7030" +SRC_URI = "git://github.com/storaged-project/udisks.git;branch=2.9.x-branch;protocol=https" +SRCREV = "001c486e6d099ed33e2de4f5c73c03e3ee180f81" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" diff --git a/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb b/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb index 7970ca3c49..484a45a686 100644 --- a/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb +++ b/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRCREV = "1b52efddbd68b4395df3ac9cd10eeb984af22439" -SRC_URI = "git://github.com/mvp/${BPN}" +SRC_URI = "git://github.com/mvp/${BPN};branch=master;protocol=https" S = "${WORKDIR}/git" # uhubctl gets its program version from "git describe". As we use the source diff --git a/meta-oe/recipes-support/uthash/uthash_2.3.0.bb b/meta-oe/recipes-support/uthash/uthash_2.3.0.bb index ca8a3c0bb1..082e948a6d 100644 --- a/meta-oe/recipes-support/uthash/uthash_2.3.0.bb +++ b/meta-oe/recipes-support/uthash/uthash_2.3.0.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=736712b5904dd42f8678df7172bc5f2b" SRCREV = "e493aa90a2833b4655927598f169c31cfcdf7861" SRC_URI = "\ - git://github.com/troydhanson/${BPN}.git \ + git://github.com/troydhanson/${BPN}.git;branch=master;protocol=https \ file://run-ptest \ " diff --git a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb index a5a881d1fe..d06f6702f7 100644 --- a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" inherit autotools -SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http \ +SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http;branch=master \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ " SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24" diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb index ca74d911f8..12231f6a90 100644 --- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -9,7 +9,7 @@ DEPENDS += "mtdev utouch-evemu" inherit autotools pkgconfig -SRC_URI = "git://bitmath.org/git/frame.git;protocol=http \ +SRC_URI = "git://bitmath.org/git/frame.git;protocol=http;branch=master \ file://remove-man-page-creation.patch \ file://0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ diff --git a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb index 04d1f3fc7f..b4322ab3de 100644 --- a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb @@ -9,7 +9,7 @@ inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "git://bitmath.org/git/mtview.git;protocol=http" +SRC_URI = "git://bitmath.org/git/mtview.git;protocol=http;branch=master" SRCREV = "ad437c38dc111cf3990a03abf14efe1b5d89604b" DEPENDS += "mtdev utouch-frame utouch-evemu libx11" diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb index 79a5ac5c4e..673fc5899b 100644 --- a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb +++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea" DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'openssl boost zlib', '', d)} " -SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ +SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https;branch=master \ file://0001-cmake-Use-GNUInstallDirs.patch \ file://855.patch \ file://857.patch \ diff --git a/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb b/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb index d100030f9b..c161781989 100644 --- a/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb +++ b/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb @@ -7,7 +7,7 @@ SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRC_URI = "git://github.com/jmacd/xdelta.git;branch=release3_1_apl" +SRC_URI = "git://github.com/jmacd/xdelta.git;branch=release3_1_apl;protocol=https" SRCREV = "4b4aed71a959fe11852e45242bb6524be85d3709" S = "${WORKDIR}/git/xdelta3" diff --git a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb index 481e7303b3..1ba4a32ba6 100644 --- a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb +++ b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb @@ -10,7 +10,7 @@ DEPENDS = "virtual/libx11 xserver-xorg xrdp nasm-native" inherit features_check REQUIRED_DISTRO_FEATURES = "x11 pam" -SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git" +SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git;branch=master;protocol=https" SRCREV = "c122544f184d4031bbae1ad80fbab554c34a9427" diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.15.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.15.bb index 039ba1a763..db73fb11f8 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.15.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.15.bb @@ -10,7 +10,7 @@ DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" REQUIRED_DISTRO_FEATURES = "x11 pam" -SRC_URI = "git://github.com/neutrinolabs/xrdp.git;branch=devel \ +SRC_URI = "git://github.com/neutrinolabs/xrdp.git;branch=devel;protocol=https \ file://xrdp.sysconfig \ file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ file://0001-Fix-the-compile-error.patch \ diff --git a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb index 9d359d6244..e38303781d 100644 --- a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb +++ b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c" # yaml-cpp releases are stored as archive files in github. # download the exact revision of release -SRC_URI = "git://github.com/jbeder/yaml-cpp.git" +SRC_URI = "git://github.com/jbeder/yaml-cpp.git;branch=master;protocol=https" SRCREV = "9a3624205e8774953ef18f57067b3426c1c5ada6" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-oe/recipes-support/zbar/zbar_git.bb index a33aa2c960..18f746292b 100644 --- a/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-oe/recipes-support/zbar/zbar_git.bb @@ -9,7 +9,7 @@ SECTION = "graphics" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef" -SRC_URI = "git://github.com/mchehab/zbar.git;branch=master \ +SRC_URI = "git://github.com/mchehab/zbar.git;branch=master;protocol=https \ file://0001-qt-Create-subdir-in-Makefile.patch \ file://0002-zbarcam-Create-subdir-in-Makefile.patch \ " diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb b/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb index ab7b71ef7e..db1228e4a1 100644 --- a/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb +++ b/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb @@ -4,7 +4,7 @@ AUTHOR = "Jonathan Dieter" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f" -SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https" +SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=master" SRCREV = "fe3e3af49fd30b68c21a9fcaac340ad8e7f91055" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-test/bats/bats_1.3.0.bb b/meta-oe/recipes-test/bats/bats_1.3.0.bb index 8190a5e3a5..0d09cb4d5b 100644 --- a/meta-oe/recipes-test/bats/bats_1.3.0.bb +++ b/meta-oe/recipes-test/bats/bats_1.3.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/bats-core/bats-core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2970203aedf9e829edb96a137a4fe81b" -SRC_URI = "git://github.com/bats-core/bats-core.git \ +SRC_URI = "git://github.com/bats-core/bats-core.git;branch=master;protocol=https \ " # v1.3.0 SRCREV = "9086c47854652f2731861b40385689c85f12103f" diff --git a/meta-oe/recipes-test/catch2/catch2_2.13.4.bb b/meta-oe/recipes-test/catch2/catch2_2.13.4.bb index 21004726a2..45f7ad8c7d 100644 --- a/meta-oe/recipes-test/catch2/catch2_2.13.4.bb +++ b/meta-oe/recipes-test/catch2/catch2_2.13.4.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/catchorg/Catch2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x" +SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x;protocol=https" SRCREV = "de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb b/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb index e4afa43e97..833c5a6c59 100644 --- a/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb +++ b/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "a4fc3dd7705c277e3a57432895e9852ea105dac9" PV .= "+git${SRCPV}" -SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git \ +SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;branch=master \ file://run-ptest \ " diff --git a/meta-oe/recipes-test/evtest/evtest_1.34.bb b/meta-oe/recipes-test/evtest/evtest_1.34.bb index a3a23c8951..eb6a34f301 100644 --- a/meta-oe/recipes-test/evtest/evtest_1.34.bb +++ b/meta-oe/recipes-test/evtest/evtest_1.34.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libxml2" SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69" -SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https \ +SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https;branch=master \ file://add_missing_limits_h_include.patch \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ " diff --git a/meta-oe/recipes-test/fbtest/fb-test_git.bb b/meta-oe/recipes-test/fbtest/fb-test_git.bb index 6a9d4b2787..2992135726 100644 --- a/meta-oe/recipes-test/fbtest/fb-test_git.bb +++ b/meta-oe/recipes-test/fbtest/fb-test_git.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" SRCREV = "063ec650960c2d79ac51f5c5f026cb05343a33e2" -SRC_URI = "git://github.com/prpplague/fb-test-app.git" +SRC_URI = "git://github.com/prpplague/fb-test-app.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-oe/recipes-test/googletest/googletest_git.bb index 354e7de337..35fe1bed00 100644 --- a/meta-oe/recipes-test/googletest/googletest_git.bb +++ b/meta-oe/recipes-test/googletest/googletest_git.bb @@ -11,7 +11,7 @@ PROVIDES += "gmock gtest" S = "${WORKDIR}/git" SRCREV = "703bd9caab50b139428cea1aaff9974ebee5742e" -SRC_URI = "git://github.com/google/googletest.git" +SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https" inherit cmake |