[OE-core] [PATCH] cmake: upgrade to v3.27.7
Changes: Update sha256sum for new version. Signed-off-by: Sudip Mukherjee --- .../cmake/{cmake-native_3.27.5.bb => cmake-native_3.27.7.bb}| 0 meta/recipes-devtools/cmake/cmake.inc | 2 +- .../recipes-devtools/cmake/{cmake_3.27.5.bb => cmake_3.27.7.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/cmake/{cmake-native_3.27.5.bb => cmake-native_3.27.7.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.27.5.bb => cmake_3.27.7.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.27.5.bb b/meta/recipes-devtools/cmake/cmake-native_3.27.7.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.27.5.bb rename to meta/recipes-devtools/cmake/cmake-native_3.27.7.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index ef4eec5ab1..ecb0e487df 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "5175e8fe1ca9b1dd09090130db7201968bcce1595971ff9e9998c2f0765004c9" +SRC_URI[sha256sum] = "08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake_3.27.5.bb b/meta/recipes-devtools/cmake/cmake_3.27.7.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.27.5.bb rename to meta/recipes-devtools/cmake/cmake_3.27.7.bb -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#188790): https://lists.openembedded.org/g/openembedded-core/message/188790 Mute This Topic: https://lists.openembedded.org/mt/101807518/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] openssh: upgrade to v9.4p1
Changes: Update sha256sum Remove backported patch Signed-off-by: Sudip Mukherjee --- ...401bdd77ca54be6867a154cc01e0d72612e0.patch | 994 -- .../{openssh_9.3p2.bb => openssh_9.4p1.bb}| 3 +- 2 files changed, 1 insertion(+), 996 deletions(-) delete mode 100644 meta/recipes-connectivity/openssh/openssh/7280401bdd77ca54be6867a154cc01e0d72612e0.patch rename meta/recipes-connectivity/openssh/{openssh_9.3p2.bb => openssh_9.4p1.bb} (98%) diff --git a/meta/recipes-connectivity/openssh/openssh/7280401bdd77ca54be6867a154cc01e0d72612e0.patch b/meta/recipes-connectivity/openssh/openssh/7280401bdd77ca54be6867a154cc01e0d72612e0.patch deleted file mode 100644 index 4c8aa085f3..00 --- a/meta/recipes-connectivity/openssh/openssh/7280401bdd77ca54be6867a154cc01e0d72612e0.patch +++ /dev/null @@ -1,994 +0,0 @@ -From 7280401bdd77ca54be6867a154cc01e0d72612e0 Mon Sep 17 00:00:00 2001 -From: Damien Miller -Date: Fri, 24 Mar 2023 13:56:25 +1100 -Subject: [PATCH] remove support for old libcrypto - -OpenSSH now requires LibreSSL 3.1.0 or greater or -OpenSSL 1.1.1 or greater - -with/ok dtucker@ - -Upstream-Status: Backport [https://github.com/openssh/openssh-portable/commit/7280401bdd77ca54be6867a154cc01e0d72612e0] -Comment: Hunks are refreshed. -Signed-off-by: Riyaz Khan - - .github/workflows/c-cpp.yml | 7 - - INSTALL | 8 +- - cipher-aes.c | 2 +- - configure.ac | 96 ++--- - openbsd-compat/libressl-api-compat.c | 556 +-- - openbsd-compat/openssl-compat.h | 151 +--- - 6 files changed, 40 insertions(+), 780 deletions(-) - -diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml -index 3d9aa22dba5..d299a32468d 100644 a/.github/workflows/c-cpp.yml -+++ b/.github/workflows/c-cpp.yml -@@ -47,9 +47,6 @@ jobs: - - { target: ubuntu-20.04, config: tcmalloc } - - { target: ubuntu-20.04, config: musl } - - { target: ubuntu-latest, config: libressl-master } -- - { target: ubuntu-latest, config: libressl-2.2.9 } -- - { target: ubuntu-latest, config: libressl-2.8.3 } -- - { target: ubuntu-latest, config: libressl-3.0.2 } - - { target: ubuntu-latest, config: libressl-3.2.6 } - - { target: ubuntu-latest, config: libressl-3.3.6 } - - { target: ubuntu-latest, config: libressl-3.4.3 } -@@ -58,10 +55,6 @@ jobs: - - { target: ubuntu-latest, config: libressl-3.7.0 } - - { target: ubuntu-latest, config: openssl-master } - - { target: ubuntu-latest, config: openssl-noec } -- - { target: ubuntu-latest, config: openssl-1.0.1 } -- - { target: ubuntu-latest, config: openssl-1.0.1u } -- - { target: ubuntu-latest, config: openssl-1.0.2u } -- - { target: ubuntu-latest, config: openssl-1.1.0h } - - { target: ubuntu-latest, config: openssl-1.1.1 } - - { target: ubuntu-latest, config: openssl-1.1.1k } - - { target: ubuntu-latest, config: openssl-1.1.1n } -diff --git a/INSTALL b/INSTALL -index 68b15e13190..f99d1e2a809 100644 a/INSTALL -+++ b/INSTALL -@@ -21,12 +21,8 @@ https://zlib.net/ - - libcrypto from either of LibreSSL or OpenSSL. Building without libcrypto - is supported but severely restricts the available ciphers and algorithms. -- - LibreSSL (https://www.libressl.org/) -- - OpenSSL (https://www.openssl.org) with any of the following versions: -- - 1.0.x >= 1.0.1 or 1.1.0 >= 1.1.0g or any 1.1.1 -- --Note that due to a bug in EVP_CipherInit OpenSSL 1.1 versions prior to --1.1.0g can't be used. -+ - LibreSSL (https://www.libressl.org/) 3.1.0 or greater -+ - OpenSSL (https://www.openssl.org) 1.1.1 or greater - - LibreSSL/OpenSSL should be compiled as a position-independent library - (i.e. -fPIC, eg by configuring OpenSSL as "./config [options] -fPIC" -diff --git a/cipher-aes.c b/cipher-aes.c -index 8b101727284..87c763353d8 100644 a/cipher-aes.c -+++ b/cipher-aes.c -@@ -69,7 +69,7 @@ ssh_rijndael_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, - - static int - ssh_rijndael_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, --LIBCRYPTO_EVP_INL_TYPE len) -+size_t len) - { - struct ssh_rijndael_ctx *c; - u_char buf[RIJNDAEL_BLOCKSIZE]; -diff --git a/configure.ac b/configure.ac -index 22fee70f604..1c0ccdf19c5 100644 a/configure.ac -+++ b/configure.ac -@@ -2802,42 +2802,40 @@ if test "x$openssl" = "xyes" ; then - #include - #define DATA "conftest.ssllibver" - ]], [[ -- FILE *fd; -- int rc; -+ FILE *f; - -- fd = fopen(DATA,"w"); -- if(fd == NULL) -+ if ((f = fopen(DATA, "w")) == NULL) - exit(1); --#ifndef OPENSSL_VERSION --# defin
[OE-core] [PATCH] dpkg: upgrade to v1.22.0
Changes: Use main branch Rebase patch Signed-off-by: Sudip Mukherjee --- ...pt-to-linux-wrs-kernel-version-which-has-characte.patch | 7 +++ .../dpkg/{dpkg_1.21.22.bb => dpkg_1.22.0.bb} | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) rename meta/recipes-devtools/dpkg/{dpkg_1.21.22.bb => dpkg_1.22.0.bb} (93%) diff --git a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch index 9fe0ca7600..ef5f7c3ec3 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch @@ -13,14 +13,14 @@ Upstream-Status: Inappropriate [embedded specific] 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c -index 453077fd9..f42ea2882 100644 +index 63a36f55c..81901bd5a 100644 --- a/lib/dpkg/parsehelp.c +++ b/lib/dpkg/parsehelp.c -@@ -243,14 +243,12 @@ parseversion(struct dpkg_version *rversion, const char *string, +@@ -275,14 +275,12 @@ parseversion(struct dpkg_version *rversion, const char *string, ptr = rversion->version; if (!*ptr) return dpkg_put_error(err, _("version number is empty")); -- if (*ptr && !c_isdigit(*ptr++)) +- if (!c_isdigit(*ptr++)) -return dpkg_put_warn(err, _("version number does not start with digit")); for (; *ptr; ptr++) { -if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:", *ptr) == NULL) @@ -32,7 +32,6 @@ index 453077fd9..f42ea2882 100644 +if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) return dpkg_put_warn(err, _("invalid character in revision number")); } - -- 2.11.0 diff --git a/meta/recipes-devtools/dpkg/dpkg_1.21.22.bb b/meta/recipes-devtools/dpkg/dpkg_1.22.0.bb similarity index 93% rename from meta/recipes-devtools/dpkg/dpkg_1.21.22.bb rename to meta/recipes-devtools/dpkg/dpkg_1.22.0.bb index 04bcc93321..7eaae9f22e 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.21.22.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.22.0.bb @@ -1,7 +1,7 @@ require dpkg.inc LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.21.x \ +SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main \ file://noman.patch \ file://remove-tar-no-timestamp.patch \ file://arch_pm.patch \ @@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.21. SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" -SRCREV = "48482e4f16467e05a08aa3b3b8048e08f0024609" +SRCREV = "744487c98a622b9b38c22c6ca330315af4a30a11" S = "${WORKDIR}/git" -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#187150): https://lists.openembedded.org/g/openembedded-core/message/187150 Mute This Topic: https://lists.openembedded.org/mt/101113059/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] cmake: upgrade to v3.27.4
Changes: Update cmcurl license checksum: change in copyright year. Update sha256sum for new version. Use cmake provided cppdap. Disable debugger. Signed-off-by: Sudip Mukherjee --- .../cmake/{cmake-native_3.26.4.bb => cmake-native_3.27.4.bb} | 3 ++- meta/recipes-devtools/cmake/cmake.inc | 2 +- .../cmake/{cmake_3.26.4.bb => cmake_3.27.4.bb} | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.26.4.bb => cmake-native_3.27.4.bb} (95%) rename meta/recipes-devtools/cmake/{cmake_3.26.4.bb => cmake_3.27.4.bb} (96%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.26.4.bb b/meta/recipes-devtools/cmake/cmake-native_3.27.4.bb similarity index 95% rename from meta/recipes-devtools/cmake/cmake-native_3.26.4.bb rename to meta/recipes-devtools/cmake/cmake-native_3.27.4.bb index 2177aa81a4..8c23bc214d 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.26.4.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.27.4.bb @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM:append = " \ file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \ file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \ file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \ -file://Utilities/cmcurl/COPYING;md5=190c514872597083303371684954f238 \ +file://Utilities/cmcurl/COPYING;md5=db8448a1e43eb2125f7740fc397db1f6 \ " B = "${WORKDIR}/build" @@ -28,6 +28,7 @@ CMAKE_EXTRACONF = "\ -DBUILD_CursesDialog=1 \ -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ +-DCMAKE_USE_SYSTEM_LIBRARY_CPPDAP=0 \ -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \ -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \ diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index f57a77c7bb..430f13f4e1 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208" +SRC_URI[sha256sum] = "0a905ca8635ca81aa152e123bdde7e54cbe764fdd9a70d62af44cad8b92967af" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake_3.26.4.bb b/meta/recipes-devtools/cmake/cmake_3.27.4.bb similarity index 96% rename from meta/recipes-devtools/cmake/cmake_3.26.4.bb rename to meta/recipes-devtools/cmake/cmake_3.27.4.bb index bb7ed83e30..183b2b75f4 100644 --- a/meta/recipes-devtools/cmake/cmake_3.26.4.bb +++ b/meta/recipes-devtools/cmake/cmake_3.27.4.bb @@ -38,11 +38,13 @@ EXTRA_OECMAKE=" \ -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \ -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ +-DCMAKE_USE_SYSTEM_LIBRARY_CPPDAP=0 \ -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \ -DKWSYS_CHAR_IS_SIGNED=1 \ -DBUILD_CursesDialog=0 \ -DKWSYS_LFS_WORKS=1 \ +-DCMake_ENABLE_DEBUGGER=0 \ " do_install:append:class-nativesdk() { -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#186765): https://lists.openembedded.org/g/openembedded-core/message/186765 Mute This Topic: https://lists.openembedded.org/mt/100977488/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] kea: upgrade to v2.4.0
Changes: Update license checksum: change in copyright year. Update sha256sum for new version. An additinal patch to fix the reproducible build failure which is still under discussion with upstream. Signed-off-by: Sudip Mukherjee --- ...1-kea-fix-reproducible-build-failure.patch | 61 +++ .../kea/{kea_2.2.0.bb => kea_2.4.0.bb}| 5 +- 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch rename meta/recipes-connectivity/kea/{kea_2.2.0.bb => kea_2.4.0.bb} (92%) diff --git a/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch b/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch new file mode 100644 index 00..ec49ccc897 --- /dev/null +++ b/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch @@ -0,0 +1,61 @@ +From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001 +From: Sudip Mukherjee +Date: Tue, 8 Aug 2023 19:03:13 +0100 +Subject: [PATCH] kea: fix reproducible build failure + +New version of Kea has started using path of build-dir instead of +src-dir which results in reproducible builds failure. +Use src-dir as is used in v2.2.0 + +Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/3007] + +Upstream has confirmed the patch will not be accepted but discussions +with upstream is still going on, we might have a proper solution later. + +Signed-off-by: Sudip Mukherjee +--- + src/bin/admin/kea-admin.in | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in +index 034a0ee..8ab11ab 100644 +--- a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in +@@ -51,14 +51,14 @@ dump_qry="" + if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then + . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh" + else +-. "@abs_top_builddir@/src/bin/admin/admin-utils.sh" ++. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" + fi + + # Find the installed kea-lfc if available. Fallback to sources otherwise. + if test -x "@sbindir@/kea-lfc"; then + kea_lfc="@sbindir@/kea-lfc" + else +-kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc" ++kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc" + fi + + # Prints out usage version. +@@ -355,7 +355,7 @@ mysql_upgrade() { + # Check if there are any files in it + num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) + if [ "$num_files" -eq 0 ]; then +- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql ++upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/mysql + + # Check if the scripts directory exists at all. + if [ ! -d ${upgrade_scripts_dir} ]; then +@@ -405,7 +405,7 @@ pgsql_upgrade() { + # Check if there are any files in it + num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) + if [ "$num_files" -eq 0 ]; then +- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql ++upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/pgsql + + # Check if the scripts directory exists at all. + if [ ! -d ${upgrade_scripts_dir} ]; then +-- +2.39.2 + diff --git a/meta/recipes-connectivity/kea/kea_2.2.0.bb b/meta/recipes-connectivity/kea/kea_2.4.0.bb similarity index 92% rename from meta/recipes-connectivity/kea/kea_2.2.0.bb rename to meta/recipes-connectivity/kea/kea_2.4.0.bb index 2c2e5a74dd..316468754e 100644 --- a/meta/recipes-connectivity/kea/kea_2.2.0.bb +++ b/meta/recipes-connectivity/kea/kea_2.4.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It HOMEPAGE = "http://kea.isc.org; SECTION = "connectivity" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=97ce14bdd2733f5b84ab5e29380d057d" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea061fa0188838072c4248c1318ec131" DEPENDS = "boost log4cplus openssl" @@ -17,8 +17,9 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://fix-multilib-conflict.patch \ file://fix_pid_keactrl.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ + file://0001-kea-fix-reproducible-build-failure.patch \ " -SRC_URI[sha256sum] = "da7d90ca62a772602dac6e77e507319038422895ad68eeb142f1487d67d531d2" +SRC_URI[sha256sum] = "3a33cd08dc3319ff544e6bbf2c0429042106f4051ebe115dc1bb2625c95003f7" inherit autotools systemd update-rc.d upstream-version-is-even -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You rec
[OE-core] [PATCH] kea: upgrade to v2.4.0
Changes: Update license checksum: change in copyright year. Update sha256sum for new version. An additinal patch to fix the reproducible build failure which is still under discussion with upstream. Signed-off-by: Sudip Mukherjee --- ...1-kea-fix-reproducible-build-failure.patch | 62 +++ .../kea/{kea_2.2.0.bb => kea_2.4.0.bb}| 5 +- 2 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch rename meta/recipes-connectivity/kea/{kea_2.2.0.bb => kea_2.4.0.bb} (92%) diff --git a/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch b/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch new file mode 100644 index 00..8a5bd00302 --- /dev/null +++ b/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch @@ -0,0 +1,62 @@ +From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001 +From: Sudip Mukherjee +Date: Tue, 8 Aug 2023 19:03:13 +0100 +Subject: [PATCH] kea: fix reproducible build failure + +New version of Kea has started using path of build-dir instead of +src-dir which results in reproducible builds failure. +Use src-dir as is used in v2.2.0 + +Upstream-Status: Pending +https://gitlab.isc.org/isc-projects/kea/-/issues/3007 + +Upstream has confirmed the patch will not be accepted but discussions +with upstream is still going on, we might have a proper solution later. + +Signed-off-by: Sudip Mukherjee +--- + src/bin/admin/kea-admin.in | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in +index 034a0ee..8ab11ab 100644 +--- a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in +@@ -51,14 +51,14 @@ dump_qry="" + if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then + . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh" + else +-. "@abs_top_builddir@/src/bin/admin/admin-utils.sh" ++. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" + fi + + # Find the installed kea-lfc if available. Fallback to sources otherwise. + if test -x "@sbindir@/kea-lfc"; then + kea_lfc="@sbindir@/kea-lfc" + else +-kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc" ++kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc" + fi + + # Prints out usage version. +@@ -355,7 +355,7 @@ mysql_upgrade() { + # Check if there are any files in it + num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) + if [ "$num_files" -eq 0 ]; then +- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql ++upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/mysql + + # Check if the scripts directory exists at all. + if [ ! -d ${upgrade_scripts_dir} ]; then +@@ -405,7 +405,7 @@ pgsql_upgrade() { + # Check if there are any files in it + num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) + if [ "$num_files" -eq 0 ]; then +- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql ++upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/pgsql + + # Check if the scripts directory exists at all. + if [ ! -d ${upgrade_scripts_dir} ]; then +-- +2.39.2 + diff --git a/meta/recipes-connectivity/kea/kea_2.2.0.bb b/meta/recipes-connectivity/kea/kea_2.4.0.bb similarity index 92% rename from meta/recipes-connectivity/kea/kea_2.2.0.bb rename to meta/recipes-connectivity/kea/kea_2.4.0.bb index 2c2e5a74dd..316468754e 100644 --- a/meta/recipes-connectivity/kea/kea_2.2.0.bb +++ b/meta/recipes-connectivity/kea/kea_2.4.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It HOMEPAGE = "http://kea.isc.org; SECTION = "connectivity" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=97ce14bdd2733f5b84ab5e29380d057d" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea061fa0188838072c4248c1318ec131" DEPENDS = "boost log4cplus openssl" @@ -17,8 +17,9 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://fix-multilib-conflict.patch \ file://fix_pid_keactrl.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ + file://0001-kea-fix-reproducible-build-failure.patch \ " -SRC_URI[sha256sum] = "da7d90ca62a772602dac6e77e507319038422895ad68eeb142f1487d67d531d2" +SRC_URI[sha256sum] = "3a33cd08dc3319ff544e6bbf2c0429042106f4051ebe115dc1bb2625c95003f7" inherit autotools systemd update-rc.d upstream-version-is-even -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive
Re: [OE-core] [PATCH v2] kea: upgrade to v2.5.0
On Wed, 9 Aug 2023 at 12:21, Alexander Kanavin wrote: > > On Wed, 9 Aug 2023 at 13:08, Sudip Mukherjee > wrote: > > There seems to be no way to submit a MR or patch. I have used another > > email (non-gmail) to register, but it did not allow me to fork and > > raise MR. So I have opened an issue - > > https://gitlab.isc.org/isc-projects/kea/-/issues/3007 > > https://gitlab.isc.org/isc-projects/kea/-/blob/master/CONTRIBUTING.md > explains how to do it. The key step is: > > "ask someone from the ISC team to give you permission to fork Kea (ask > @tomek, @vicky, @ondrej or @godfryd or basically anyone from the Kea > dev team)" > > I suppose they will do that once someone reads the issue, until then > you can refer to the ticket in oe-core submission (but pls roll back > to 2.4.x). v2.4 will also have the same problem. This change was introduced in v2.3, so anything v2.2+ will have the problem. Anyways, I will resubmit the upgrade patch here after upstream has resolved the problem. -- Regards Sudip -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#185698): https://lists.openembedded.org/g/openembedded-core/message/185698 Mute This Topic: https://lists.openembedded.org/mt/100639240/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2] kea: upgrade to v2.5.0
On Wed, 9 Aug 2023 at 11:22, Alexander Kanavin wrote: > > On Wed, 9 Aug 2023 at 12:05, Sudip Mukherjee > wrote: > > Yeah, I know and I always try to send any patches upstream first. > > But in this case there seems to be no way to do it. > > > > I have tried with https://gitlab.isc.org/isc-projects/kea/ but they > > are not allowing gmail > > or any non-corporate email address to register or login. Also tried to > > login via authenticating > > with gitlab/github but that also did not work. > > I just managed to log in with github authentication, so if you can try > from a different ISP, I'd appreciate. There seems to be no way to submit a MR or patch. I have used another email (non-gmail) to register, but it did not allow me to fork and raise MR. So I have opened an issue - https://gitlab.isc.org/isc-projects/kea/-/issues/3007 -- Regards Sudip -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#185696): https://lists.openembedded.org/g/openembedded-core/message/185696 Mute This Topic: https://lists.openembedded.org/mt/100639240/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2] kea: upgrade to v2.5.0
Hi Alex, On Wed, 9 Aug 2023 at 09:55, Alexander Kanavin wrote: > > On Wed, 9 Aug 2023 at 10:45, Sudip Mukherjee > wrote: > > .../kea/{kea_2.2.0.bb => kea_2.5.0.bb}| 5 +- > > 2.5.0 is a development series. The update should be to 2.4.x instead > which is stable. > https://kb.isc.org/docs/aa-00896#kea-updated-as-of-122022 > > Please always verify the latest version with 'devtool latest-version kea' > first. > > > +New version of Kea has started using path of build-dir instead of > > +src-dir which results in reproducible builds failure. > > +Use src-dir as is used in v2.2.0 > > + > > +Upstream-Status: Inappropriate [oe-core specific] > > Reproducibility fixes are always eligible for upstream submission, > please do so and include the link. Even if the patch is unsuitable for > direct upstream merge, at least it alerts maintainers to the problem. Yeah, I know and I always try to send any patches upstream first. But in this case there seems to be no way to do it. I have tried with https://gitlab.isc.org/isc-projects/kea/ but they are not allowing gmail or any non-corporate email address to register or login. Also tried to login via authenticating with gitlab/github but that also did not work. So, I have subscribed to kea-dev mailing list and reported there with the same patch. https://lists.isc.org/pipermail/kea-dev/2023-August/001010.html -- Regards Sudip -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#185694): https://lists.openembedded.org/g/openembedded-core/message/185694 Mute This Topic: https://lists.openembedded.org/mt/100639240/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] kea: upgrade to v2.5.0
Changes: Update license checksum: change in copyright year. Update sha256sum for new version. An additinal patch to fix the reproducible build failure. Signed-off-by: Sudip Mukherjee --- ...1-kea-fix-reproducible-build-failure.patch | 58 +++ .../kea/{kea_2.2.0.bb => kea_2.5.0.bb}| 5 +- 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch rename meta/recipes-connectivity/kea/{kea_2.2.0.bb => kea_2.5.0.bb} (92%) diff --git a/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch b/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch new file mode 100644 index 00..645b5a2de3 --- /dev/null +++ b/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch @@ -0,0 +1,58 @@ +From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001 +From: Sudip Mukherjee +Date: Tue, 8 Aug 2023 19:03:13 +0100 +Subject: [PATCH] kea: fix reproducible build failure + +New version of Kea has started using path of build-dir instead of +src-dir which results in reproducible builds failure. +Use src-dir as is used in v2.2.0 + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Sudip Mukherjee +--- + src/bin/admin/kea-admin.in | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in +index 034a0ee..8ab11ab 100644 +--- a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in +@@ -51,14 +51,14 @@ dump_qry="" + if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then + . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh" + else +-. "@abs_top_builddir@/src/bin/admin/admin-utils.sh" ++. "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" + fi + + # Find the installed kea-lfc if available. Fallback to sources otherwise. + if test -x "@sbindir@/kea-lfc"; then + kea_lfc="@sbindir@/kea-lfc" + else +-kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc" ++kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc" + fi + + # Prints out usage version. +@@ -355,7 +355,7 @@ mysql_upgrade() { + # Check if there are any files in it + num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) + if [ "$num_files" -eq 0 ]; then +- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql ++upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/mysql + + # Check if the scripts directory exists at all. + if [ ! -d ${upgrade_scripts_dir} ]; then +@@ -405,7 +405,7 @@ pgsql_upgrade() { + # Check if there are any files in it + num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) + if [ "$num_files" -eq 0 ]; then +- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql ++upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/pgsql + + # Check if the scripts directory exists at all. + if [ ! -d ${upgrade_scripts_dir} ]; then +-- +2.39.2 + diff --git a/meta/recipes-connectivity/kea/kea_2.2.0.bb b/meta/recipes-connectivity/kea/kea_2.5.0.bb similarity index 92% rename from meta/recipes-connectivity/kea/kea_2.2.0.bb rename to meta/recipes-connectivity/kea/kea_2.5.0.bb index 2c2e5a74dd..cf341b2f01 100644 --- a/meta/recipes-connectivity/kea/kea_2.2.0.bb +++ b/meta/recipes-connectivity/kea/kea_2.5.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It HOMEPAGE = "http://kea.isc.org; SECTION = "connectivity" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=97ce14bdd2733f5b84ab5e29380d057d" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea061fa0188838072c4248c1318ec131" DEPENDS = "boost log4cplus openssl" @@ -17,8 +17,9 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://fix-multilib-conflict.patch \ file://fix_pid_keactrl.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ + file://0001-kea-fix-reproducible-build-failure.patch \ " -SRC_URI[sha256sum] = "da7d90ca62a772602dac6e77e507319038422895ad68eeb142f1487d67d531d2" +SRC_URI[sha256sum] = "5b1553cd50928976925b82e5f7f2792f8e9e9244cad66820bc640fb3d50428f8" inherit autotools systemd update-rc.d upstream-version-is-even -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#185691): https://lists.openembedded.org/g/openembedded-core/message/185691 Mute This Topic: https://lists.openembedded.org/mt/100639240/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] bind: upgrade to v9.18.17
Changes: Update license checksum: only whitespace change. Update sha256sum for new version. Additional change: Do not use version with the foldername, which will result in less diffstat with future upgrades. Signed-off-by: Sudip Mukherjee --- .../0001-avoid-start-failure-with-bind-user.patch | 0 ...0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0 ...bind-ensure-searching-for-json-headers-searches-sysr.patch | 0 meta/recipes-connectivity/bind/{bind-9.18.16 => bind}/bind9 | 0 .../bind/{bind-9.18.16 => bind}/conf.patch| 0 .../bind/{bind-9.18.16 => bind}/generate-rndc-key.sh | 0 .../init.d-add-support-for-read-only-rootfs.patch | 0 .../make-etc-initd-bind-stop-work.patch | 0 .../bind/{bind-9.18.16 => bind}/named.service | 0 .../bind/{bind_9.18.16.bb => bind_9.18.17.bb} | 4 ++-- 10 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/bind/{bind-9.18.16 => bind}/0001-avoid-start-failure-with-bind-user.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.16 => bind}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.16 => bind}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.16 => bind}/bind9 (100%) rename meta/recipes-connectivity/bind/{bind-9.18.16 => bind}/conf.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.16 => bind}/generate-rndc-key.sh (100%) rename meta/recipes-connectivity/bind/{bind-9.18.16 => bind}/init.d-add-support-for-read-only-rootfs.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.16 => bind}/make-etc-initd-bind-stop-work.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.16 => bind}/named.service (100%) rename meta/recipes-connectivity/bind/{bind_9.18.16.bb => bind_9.18.17.bb} (96%) diff --git a/meta/recipes-connectivity/bind/bind-9.18.16/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind/0001-avoid-start-failure-with-bind-user.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.16/0001-avoid-start-failure-with-bind-user.patch rename to meta/recipes-connectivity/bind/bind/0001-avoid-start-failure-with-bind-user.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.16/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.16/0001-named-lwresd-V-and-start-log-hide-build-options.patch rename to meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.16/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.16/bind-ensure-searching-for-json-headers-searches-sysr.patch rename to meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.16/bind9 b/meta/recipes-connectivity/bind/bind/bind9 similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.16/bind9 rename to meta/recipes-connectivity/bind/bind/bind9 diff --git a/meta/recipes-connectivity/bind/bind-9.18.16/conf.patch b/meta/recipes-connectivity/bind/bind/conf.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.16/conf.patch rename to meta/recipes-connectivity/bind/bind/conf.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.16/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.16/generate-rndc-key.sh rename to meta/recipes-connectivity/bind/bind/generate-rndc-key.sh diff --git a/meta/recipes-connectivity/bind/bind-9.18.16/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.16/init.d-add-support-for-read-only-rootfs.patch rename to meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.16/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.16/make-etc-initd-bind-stop-work.patch rename to meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.
[OE-core] [PATCH] kea: upgrade to v2.5.0
Changes: Update license checksum: change in copyright year. Update sha256sum for new version. Signed-off-by: Sudip Mukherjee --- meta/recipes-connectivity/kea/{kea_2.2.0.bb => kea_2.5.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/kea/{kea_2.2.0.bb => kea_2.5.0.bb} (94%) diff --git a/meta/recipes-connectivity/kea/kea_2.2.0.bb b/meta/recipes-connectivity/kea/kea_2.5.0.bb similarity index 94% rename from meta/recipes-connectivity/kea/kea_2.2.0.bb rename to meta/recipes-connectivity/kea/kea_2.5.0.bb index 2c2e5a74dd..066e3ee301 100644 --- a/meta/recipes-connectivity/kea/kea_2.2.0.bb +++ b/meta/recipes-connectivity/kea/kea_2.5.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It HOMEPAGE = "http://kea.isc.org; SECTION = "connectivity" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=97ce14bdd2733f5b84ab5e29380d057d" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea061fa0188838072c4248c1318ec131" DEPENDS = "boost log4cplus openssl" @@ -18,7 +18,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://fix_pid_keactrl.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ " -SRC_URI[sha256sum] = "da7d90ca62a772602dac6e77e507319038422895ad68eeb142f1487d67d531d2" +SRC_URI[sha256sum] = "5b1553cd50928976925b82e5f7f2792f8e9e9244cad66820bc640fb3d50428f8" inherit autotools systemd update-rc.d upstream-version-is-even -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#185510): https://lists.openembedded.org/g/openembedded-core/message/185510 Mute This Topic: https://lists.openembedded.org/mt/100541947/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] libgit2: upgrade to v1.7.0
Signed-off-by: Sudip Mukherjee --- .../libgit2/{libgit2_1.6.4.bb => libgit2_1.7.0.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/libgit2/{libgit2_1.6.4.bb => libgit2_1.7.0.bb} (89%) diff --git a/meta/recipes-support/libgit2/libgit2_1.6.4.bb b/meta/recipes-support/libgit2/libgit2_1.7.0.bb similarity index 89% rename from meta/recipes-support/libgit2/libgit2_1.6.4.bb rename to meta/recipes-support/libgit2/libgit2_1.7.0.bb index ffe00d8653..15a91cfb27 100644 --- a/meta/recipes-support/libgit2/libgit2_1.6.4.bb +++ b/meta/recipes-support/libgit2/libgit2_1.7.0.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5bdf47bbc9a39dc6ce076d59e322dc17" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.6;protocol=https" -SRCREV = "e6325351ceee58cf56f58bdce61b38907805544f" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.7;protocol=https" +SRCREV = "3e2baa6d0bfb42f9016e24cba1733a6ae26a8ae6" S = "${WORKDIR}/git" -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#185457): https://lists.openembedded.org/g/openembedded-core/message/185457 Mute This Topic: https://lists.openembedded.org/mt/100521471/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] python3-pygments: upgrade to 2.15.1
On Wed, 5 Jul 2023 at 10:23, Sudip Mukherjee via lists.openembedded.org wrote: > > On Wed, 5 Jul 2023 at 08:45, Tim Orling wrote: > > > > > > > > On Tue, Jul 4, 2023 at 10:09 PM Sudip Mukherjee > > wrote: > >> > >> Upstream has removed setup.py and started using pyproject.toml > >> > >> Signed-off-by: Sudip Mukherjee > >> --- > >> ...ython3-pygments_2.14.0.bb => python3-pygments_2.15.1.bb} | 6 +- > >> 1 file changed, 5 insertions(+), 1 deletion(-) > >> rename meta/recipes-devtools/python/{python3-pygments_2.14.0.bb => > >> python3-pygments_2.15.1.bb} (76%) > >> > >> diff --git a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb > >> b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb > >> similarity index 76% > >> rename from meta/recipes-devtools/python/python3-pygments_2.14.0.bb > >> rename to meta/recipes-devtools/python/python3-pygments_2.15.1.bb > >> index 16769e9263..7e3b286f41 100644 > >> --- a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb > >> +++ b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb > >> @@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause" > >> LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592" > >> > >> inherit setuptools3 > > > > > > instead of setuptools3, inherit python_setuptools_build_meta > > Look at the build.backend variable in pyproject.toml for hints > > https://github.com/pygments/pygments/blob/master/pyproject.toml#L4 > > Thanks Tim. I was going through all the python*.bbclass to find a > suitable one but obviously I missed it. > Will update, test and send a v2. nm, I can see you have already sent a patch for this. -- Regards Sudip -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183879): https://lists.openembedded.org/g/openembedded-core/message/183879 Mute This Topic: https://lists.openembedded.org/mt/99953624/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] python3-pygments: upgrade to 2.15.1
On Wed, 5 Jul 2023 at 08:45, Tim Orling wrote: > > > > On Tue, Jul 4, 2023 at 10:09 PM Sudip Mukherjee > wrote: >> >> Upstream has removed setup.py and started using pyproject.toml >> >> Signed-off-by: Sudip Mukherjee >> --- >> ...ython3-pygments_2.14.0.bb => python3-pygments_2.15.1.bb} | 6 +- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> rename meta/recipes-devtools/python/{python3-pygments_2.14.0.bb => >> python3-pygments_2.15.1.bb} (76%) >> >> diff --git a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb >> b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb >> similarity index 76% >> rename from meta/recipes-devtools/python/python3-pygments_2.14.0.bb >> rename to meta/recipes-devtools/python/python3-pygments_2.15.1.bb >> index 16769e9263..7e3b286f41 100644 >> --- a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb >> +++ b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb >> @@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause" >> LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592" >> >> inherit setuptools3 > > > instead of setuptools3, inherit python_setuptools_build_meta > Look at the build.backend variable in pyproject.toml for hints > https://github.com/pygments/pygments/blob/master/pyproject.toml#L4 Thanks Tim. I was going through all the python*.bbclass to find a suitable one but obviously I missed it. Will update, test and send a v2. -- Regards Sudip -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183878): https://lists.openembedded.org/g/openembedded-core/message/183878 Mute This Topic: https://lists.openembedded.org/mt/99953624/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] python3-pygments: upgrade to 2.15.1
Upstream has removed setup.py and started using pyproject.toml Signed-off-by: Sudip Mukherjee --- ...ython3-pygments_2.14.0.bb => python3-pygments_2.15.1.bb} | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-pygments_2.14.0.bb => python3-pygments_2.15.1.bb} (76%) diff --git a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb similarity index 76% rename from meta/recipes-devtools/python/python3-pygments_2.14.0.bb rename to meta/recipes-devtools/python/python3-pygments_2.15.1.bb index 16769e9263..7e3b286f41 100644 --- a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb +++ b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592" inherit setuptools3 -SRC_URI[sha256sum] = "b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297" +SRC_URI[sha256sum] = "8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c" DEPENDS += "\ ${PYTHON_PN} \ @@ -15,5 +15,9 @@ PYPI_PACKAGE = "Pygments" inherit pypi +do_compile () { +python_pep517_do_compile +} + BBCLASSEXTEND = "native nativesdk" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183871): https://lists.openembedded.org/g/openembedded-core/message/183871 Mute This Topic: https://lists.openembedded.org/mt/99953624/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] libssh2: disable rpath to fix curl-native build
When curl is built with PACKAGECONFIG:append = " libssh2", the build fails with the error: gcc: error: unrecognized command-line option '-R' It was trying to set the rpath for libssh2. Signed-off-by: Sudip Mukherjee --- meta/recipes-support/libssh2/libssh2_1.11.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-support/libssh2/libssh2_1.11.0.bb b/meta/recipes-support/libssh2/libssh2_1.11.0.bb index 711bf937f5..edc25db1b1 100644 --- a/meta/recipes-support/libssh2/libssh2_1.11.0.bb +++ b/meta/recipes-support/libssh2/libssh2_1.11.0.bb @@ -18,6 +18,7 @@ inherit autotools pkgconfig ptest EXTRA_OECONF += "\ --with-libz \ --with-libz-prefix=${STAGING_LIBDIR} \ + --disable-rpath \ " DISABLE_STATIC = "" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183703): https://lists.openembedded.org/g/openembedded-core/message/183703 Mute This Topic: https://lists.openembedded.org/mt/99875373/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2] libssh2: Upgrade to v1.11.0
On Wed, 14 Jun 2023 at 16:47, Ross Burton wrote: > > On 14 Jun 2023, at 16:13, Sudip Mukherjee wrote: > > > > Hi Ross, > > > > On Wed, 14 Jun 2023 at 14:53, Ross Burton wrote: > >> > >> On 13 Jun 2023, at 21:52, Sudip Mukherjee via lists.openembedded.org > >> wrote: > >>> # only one of openssl and gcrypt could be set > >>> mkdir -p ${D}${PTEST_PATH}/docs > >>> cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/ > >>> } > >> > >> As you’ve clearly been looking at the tests, why does the ptest support > >> need the documentation? > > > > There is a test for manpage syntax "mansyntax.sh" which needs the > > generated man pages in the docs folder. > > compile_ptest_base will not fail, but actual tests will fail. > > This is where I start to say that we should be trimming the tests and only > running useful tests for integration purposes, not the complete upstream test > suite. Sure, and as confirmed over irc I will send a followup patch removing that test. -- Regards Sudip -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182826): https://lists.openembedded.org/g/openembedded-core/message/182826 Mute This Topic: https://lists.openembedded.org/mt/99514759/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2] libssh2: Upgrade to v1.11.0
Hi Ross, On Wed, 14 Jun 2023 at 14:53, Ross Burton wrote: > > On 13 Jun 2023, at 21:52, Sudip Mukherjee via lists.openembedded.org > wrote: > > # only one of openssl and gcrypt could be set > > PACKAGECONFIG ??= "openssl" > > @@ -41,9 +42,13 @@ do_install_ptest() { > > install -d ${D}${PTEST_PATH}/tests > > install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ > > cp -rf ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests/ > > - cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ > > - cp -rf ${S}/tests/ssh2.sh ${D}${PTEST_PATH}/tests/ > > - cp -rf ${S}/tests/etc ${D}${PTEST_PATH}/tests/ > > + cp -rf ${B}/tests/test_simple ${D}${PTEST_PATH}/tests/ > > + cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ > > + cp -rf ${S}/tests/test_sshd.test ${D}${PTEST_PATH}/tests/ > > + cp -rf ${S}/tests/openssh_server ${D}${PTEST_PATH}/tests/ > > + cp -rf ${S}/tests/key* ${D}${PTEST_PATH}/tests/ > > +# Makefile.inc required as test_sshd.test generates the list of test from > > this > > + cp -rf ${S}/tests/Makefile.inc ${D}${PTEST_PATH}/tests/ > > mkdir -p ${D}${PTEST_PATH}/docs > > cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/ > > } > > As you’ve clearly been looking at the tests, why does the ptest support need > the documentation? There is a test for manpage syntax "mansyntax.sh" which needs the generated man pages in the docs folder. compile_ptest_base will not fail, but actual tests will fail. -- Regards Sudip -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182816): https://lists.openembedded.org/g/openembedded-core/message/182816 Mute This Topic: https://lists.openembedded.org/mt/99514759/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] libssh2: Upgrade to v1.11.0
From: Sudip Mukherjee Changes: Update license checksum: change in copyright year. Remove patch fixed by upstream. Disable rpath, hardcoded rpath failed curl-native build. Adjust ptests. Remove --disable-static from OECONF Signed-off-by: Sudip Mukherjee --- v2: Remove --disable-static from OECONF. Only needed for poky as its using --disable-static and that fails ptest builds. .../libssh2/libssh2/fix-ssh2-test.patch | 23 --- .../recipes-support/libssh2/libssh2/run-ptest | 2 +- .../{libssh2_1.10.0.bb => libssh2_1.11.0.bb} | 17 +- 3 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch rename meta/recipes-support/libssh2/{libssh2_1.10.0.bb => libssh2_1.11.0.bb} (65%) diff --git a/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch b/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch deleted file mode 100644 index ee916c42d4..00 --- a/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -In 8.8 OpenSSH disabled sha1 rsa-sha keys out of the box, -so we need to re-enable them as a workaround for the test -suite until upstream updates the tests. - -See: https://github.com/libssh2/libssh2/issues/630 - -Upstream-Status: Backport [alternative fixes merged upstream] - -Patch taken from https://github.com/mirror-rpm/libssh2/commit/47f7114f7d0780f3075bad51a71881f45cc933c5 - a/tests/ssh2.sh -+++ b/tests/ssh2.sh -@@ -25,7 +25,8 @@ $SSHD -f /dev/null -h "$srcdir"/etc/host - -o 'Port 4711' \ - -o 'Protocol 2' \ - -o "AuthorizedKeysFile $srcdir/etc/user.pub" \ ---o 'UsePrivilegeSeparation no' \ -+-o 'HostKeyAlgorithms +ssh-rsa' \ -+-o 'PubkeyAcceptedAlgorithms +ssh-rsa' \ - -o 'StrictModes no' \ - -D \ - $libssh2_sshd_params & - diff --git a/meta/recipes-support/libssh2/libssh2/run-ptest b/meta/recipes-support/libssh2/libssh2/run-ptest index 5e7426f79d..ed87074fcd 100644 --- a/meta/recipes-support/libssh2/libssh2/run-ptest +++ b/meta/recipes-support/libssh2/libssh2/run-ptest @@ -2,7 +2,7 @@ ptestdir=$(dirname "$(readlink -f "$0")") cd tests -for test in simple mansyntax.sh ssh2.sh +for test in test_simple mansyntax.sh test_sshd.test do ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test done diff --git a/meta/recipes-support/libssh2/libssh2_1.10.0.bb b/meta/recipes-support/libssh2/libssh2_1.11.0.bb similarity index 65% rename from meta/recipes-support/libssh2/libssh2_1.10.0.bb rename to meta/recipes-support/libssh2/libssh2_1.11.0.bb index d5513373b0..eff2f043a5 100644 --- a/meta/recipes-support/libssh2/libssh2_1.10.0.bb +++ b/meta/recipes-support/libssh2/libssh2_1.11.0.bb @@ -5,21 +5,22 @@ SECTION = "libs" DEPENDS = "zlib" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=3e089ad0cf27edf1e7f261dfcd06acc7" +LIC_FILES_CHKSUM = "file://COPYING;md5=24a33237426720395ebb1dd1349ca225" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ - file://fix-ssh2-test.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51" +SRC_URI[sha256sum] = "3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461" inherit autotools pkgconfig ptest EXTRA_OECONF += "\ --with-libz \ --with-libz-prefix=${STAGING_LIBDIR} \ + --disable-rpath \ " +EXTRA_OECONF:remove = "--disable-static" # only one of openssl and gcrypt could be set PACKAGECONFIG ??= "openssl" @@ -41,9 +42,13 @@ do_install_ptest() { install -d ${D}${PTEST_PATH}/tests install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ cp -rf ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/tests/ssh2.sh ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/tests/etc ${D}${PTEST_PATH}/tests/ + cp -rf ${B}/tests/test_simple ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/test_sshd.test ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/openssh_server ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/key* ${D}${PTEST_PATH}/tests/ +# Makefile.inc required as test_sshd.test generates the list of test from this + cp -rf ${S}/tests/Makefile.inc ${D}${PTEST_PATH}/tests/ mkdir -p ${D}${PTEST_PATH}/docs cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/ } -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182724): https://lists.openembedded.org/g/openembedded-core
Re: [OE-core] [PATCH] libssh2: Upgrade to v1.11.0
On Wed, 7 Jun 2023 at 13:34, Alexandre Belloni wrote: > > Hello, > > this doesn't build: Thanks for testing. Surprisingly the failure is only with poky and builds fine with oe-core (which is where I tested). I am checking it now. -- Regards Sudip -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182639): https://lists.openembedded.org/g/openembedded-core/message/182639 Mute This Topic: https://lists.openembedded.org/mt/99295530/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] cmake: upgrade to v3.26.4
Signed-off-by: Sudip Mukherjee --- .../cmake/{cmake-native_3.26.3.bb => cmake-native_3.26.4.bb}| 0 meta/recipes-devtools/cmake/cmake.inc | 2 +- .../recipes-devtools/cmake/{cmake_3.26.3.bb => cmake_3.26.4.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/cmake/{cmake-native_3.26.3.bb => cmake-native_3.26.4.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.26.3.bb => cmake_3.26.4.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.26.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.26.4.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.26.3.bb rename to meta/recipes-devtools/cmake/cmake-native_3.26.4.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 2b6554690b..7788a5c45a 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "bbd8d39217509d163cb544a40d6428ac666ddc83e22905d3e52c925781f0f659" +SRC_URI[sha256sum] = "313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake_3.26.3.bb b/meta/recipes-devtools/cmake/cmake_3.26.4.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.26.3.bb rename to meta/recipes-devtools/cmake/cmake_3.26.4.bb -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182344): https://lists.openembedded.org/g/openembedded-core/message/182344 Mute This Topic: https://lists.openembedded.org/mt/99296552/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] libssh2: Upgrade to v1.11.0
Changes: Update license checksum: change in copyright year. Remove patch fixed by upstream. Disable rpath, hardcoded rpath failed curl-native build. Adjust ptests. Signed-off-by: Sudip Mukherjee --- .../libssh2/libssh2/fix-ssh2-test.patch | 23 --- .../recipes-support/libssh2/libssh2/run-ptest | 2 +- .../{libssh2_1.10.0.bb => libssh2_1.11.0.bb} | 16 - 3 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch rename meta/recipes-support/libssh2/{libssh2_1.10.0.bb => libssh2_1.11.0.bb} (67%) diff --git a/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch b/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch deleted file mode 100644 index ee916c42d4..00 --- a/meta/recipes-support/libssh2/libssh2/fix-ssh2-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -In 8.8 OpenSSH disabled sha1 rsa-sha keys out of the box, -so we need to re-enable them as a workaround for the test -suite until upstream updates the tests. - -See: https://github.com/libssh2/libssh2/issues/630 - -Upstream-Status: Backport [alternative fixes merged upstream] - -Patch taken from https://github.com/mirror-rpm/libssh2/commit/47f7114f7d0780f3075bad51a71881f45cc933c5 - a/tests/ssh2.sh -+++ b/tests/ssh2.sh -@@ -25,7 +25,8 @@ $SSHD -f /dev/null -h "$srcdir"/etc/host - -o 'Port 4711' \ - -o 'Protocol 2' \ - -o "AuthorizedKeysFile $srcdir/etc/user.pub" \ ---o 'UsePrivilegeSeparation no' \ -+-o 'HostKeyAlgorithms +ssh-rsa' \ -+-o 'PubkeyAcceptedAlgorithms +ssh-rsa' \ - -o 'StrictModes no' \ - -D \ - $libssh2_sshd_params & - diff --git a/meta/recipes-support/libssh2/libssh2/run-ptest b/meta/recipes-support/libssh2/libssh2/run-ptest index 5e7426f79d..ed87074fcd 100644 --- a/meta/recipes-support/libssh2/libssh2/run-ptest +++ b/meta/recipes-support/libssh2/libssh2/run-ptest @@ -2,7 +2,7 @@ ptestdir=$(dirname "$(readlink -f "$0")") cd tests -for test in simple mansyntax.sh ssh2.sh +for test in test_simple mansyntax.sh test_sshd.test do ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test done diff --git a/meta/recipes-support/libssh2/libssh2_1.10.0.bb b/meta/recipes-support/libssh2/libssh2_1.11.0.bb similarity index 67% rename from meta/recipes-support/libssh2/libssh2_1.10.0.bb rename to meta/recipes-support/libssh2/libssh2_1.11.0.bb index d5513373b0..31a3c0c90b 100644 --- a/meta/recipes-support/libssh2/libssh2_1.10.0.bb +++ b/meta/recipes-support/libssh2/libssh2_1.11.0.bb @@ -5,20 +5,20 @@ SECTION = "libs" DEPENDS = "zlib" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=3e089ad0cf27edf1e7f261dfcd06acc7" +LIC_FILES_CHKSUM = "file://COPYING;md5=24a33237426720395ebb1dd1349ca225" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ - file://fix-ssh2-test.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51" +SRC_URI[sha256sum] = "3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461" inherit autotools pkgconfig ptest EXTRA_OECONF += "\ --with-libz \ --with-libz-prefix=${STAGING_LIBDIR} \ + --disable-rpath \ " # only one of openssl and gcrypt could be set @@ -41,9 +41,13 @@ do_install_ptest() { install -d ${D}${PTEST_PATH}/tests install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ cp -rf ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/tests/ssh2.sh ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/tests/etc ${D}${PTEST_PATH}/tests/ + cp -rf ${B}/tests/test_simple ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/test_sshd.test ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/openssh_server ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/key* ${D}${PTEST_PATH}/tests/ +# Makefile.inc required as test_sshd.test generates the list of test from this + cp -rf ${S}/tests/Makefile.inc ${D}${PTEST_PATH}/tests/ mkdir -p ${D}${PTEST_PATH}/docs cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/ } -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182343): https://lists.openembedded.org/g/openembedded-core/message/182343 Mute This Topic: https://lists.openembedded.org/mt/99295530/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] dpkg: upgrade to v1.21.22
Signed-off-by: Sudip Mukherjee --- meta/recipes-devtools/dpkg/{dpkg_1.21.21.bb => dpkg_1.21.22.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/dpkg/{dpkg_1.21.21.bb => dpkg_1.21.22.bb} (95%) diff --git a/meta/recipes-devtools/dpkg/dpkg_1.21.21.bb b/meta/recipes-devtools/dpkg/dpkg_1.21.22.bb similarity index 95% rename from meta/recipes-devtools/dpkg/dpkg_1.21.21.bb rename to meta/recipes-devtools/dpkg/dpkg_1.21.22.bb index a19a96ef06..04bcc93321 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.21.21.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.21.22.bb @@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.21. SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" -SRCREV = "9ef736b7b3a5fa0d6e991e8475eb2e3151fec345" +SRCREV = "48482e4f16467e05a08aa3b3b8048e08f0024609" S = "${WORKDIR}/git" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182342): https://lists.openembedded.org/g/openembedded-core/message/182342 Mute This Topic: https://lists.openembedded.org/mt/99295465/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] apt: Upgrade to v2.6.1
Changes: Update sha256sum for new version Signed-off-by: Sudip Mukherjee --- meta/recipes-devtools/apt/{apt_2.6.0.bb => apt_2.6.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/apt/{apt_2.6.0.bb => apt_2.6.1.bb} (98%) diff --git a/meta/recipes-devtools/apt/apt_2.6.0.bb b/meta/recipes-devtools/apt/apt_2.6.1.bb similarity index 98% rename from meta/recipes-devtools/apt/apt_2.6.0.bb rename to meta/recipes-devtools/apt/apt_2.6.1.bb index b872be8371..fb4ff899d2 100644 --- a/meta/recipes-devtools/apt/apt_2.6.0.bb +++ b/meta/recipes-devtools/apt/apt_2.6.1.bb @@ -26,7 +26,7 @@ SRC_URI:append:class-nativesdk = " \ file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ " -SRC_URI[sha256sum] = "43467d1ca7de6c0955fd991925433e22fa66230870e5f66c4498675d01776c2a" +SRC_URI[sha256sum] = "86b888c901fa2e78f1bf52a2aaa2f400ff82a472b94ff0ac6631939ee68fa6fd" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # the package is taken from snapshots.debian.org; that source is static and goes stale -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181958): https://lists.openembedded.org/g/openembedded-core/message/181958 Mute This Topic: https://lists.openembedded.org/mt/99230339/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] rpm: upgrade to v4.18.1
Changes: Rebase patches for upstream changes. Remove patches not needed due to upstream changes. Add a new patch to fix build failure. Package egg-info file. Signed-off-by: Sudip Mukherjee --- ...olor-setting-for-mips64_n32-binaries.patch | 8 ++-- ...lib-rpm-as-the-installation-path-for.patch | 4 +- .../0001-Fix-compiler-error-on-clang.patch| 42 +++ ...o-not-build-manpages-requires-pandoc.patch | 23 -- meta/recipes-devtools/rpm/files/fifofix.patch | 22 -- .../rpm/{rpm_4.18.0.bb => rpm_4.18.1.bb} | 6 +-- 6 files changed, 51 insertions(+), 54 deletions(-) create mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-compiler-error-on-clang.patch delete mode 100644 meta/recipes-devtools/rpm/files/0001-docs-do-not-build-manpages-requires-pandoc.patch delete mode 100644 meta/recipes-devtools/rpm/files/fifofix.patch rename meta/recipes-devtools/rpm/{rpm_4.18.0.bb => rpm_4.18.1.bb} (97%) diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch index 9f5dde0720..f06058b1b7 100644 --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch @@ -15,7 +15,7 @@ Index: git/build/rpmfc.c === --- git.orig/build/rpmfc.c +++ git/build/rpmfc.c -@@ -645,6 +645,7 @@ exit: +@@ -646,6 +646,7 @@ exit: static const struct rpmfcTokens_s rpmfcTokens[] = { { "directory", RPMFC_INCLUDE }, @@ -23,16 +23,16 @@ Index: git/build/rpmfc.c { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, -@@ -1150,6 +1151,9 @@ static uint32_t getElfColor(const char * +@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) color = RPMFC_ELF32; break; } +if (ehdr.e_machine == EM_MIPS || ehdr.e_machine == EM_MIPS_RS3_LE) +if (ehdr.e_flags & EF_MIPS_ABI2) +color = RPMFC_ELFMIPSN32; - elf_end(elf); } - close(fd); + if (elf) + elf_end(elf); Index: git/rpmrc.in === --- git.orig/rpmrc.in diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch index 6f613d0a7d..ad54336bec 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch @@ -30,7 +30,7 @@ Index: git/macros.in === --- git.orig/macros.in +++ git/macros.in -@@ -911,7 +911,7 @@ package or when debugging this package.\ +@@ -930,7 +930,7 @@ package or when debugging this package.\ %_sharedstatedir %{_prefix}/com %_localstatedir %{_prefix}/var %_lib lib @@ -55,4 +55,4 @@ Index: git/rpm.am +rpmconfigdir = $(libdir)/rpm # Libtool version (current-revision-age) for all our libraries - rpm_version_info = 12:0:3 + rpm_version_info = 13:0:4 diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-compiler-error-on-clang.patch b/meta/recipes-devtools/rpm/files/0001-Fix-compiler-error-on-clang.patch new file mode 100644 index 00..fa5bc955ad --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-Fix-compiler-error-on-clang.patch @@ -0,0 +1,42 @@ +From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 +From: Florian Festi +Date: Thu, 16 Mar 2023 19:05:04 +0100 +Subject: [PATCH] Fix compiler error on clang + +Turns out variable declarations are not allowed after a label, even in +C99. And while some compilers don't seem to care others do. + +Moving the declaration of mayopen to the start of the function to avoid +this problem. + +Resolves: #2435 + +Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414] +--- + lib/fsm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/fsm.c b/lib/fsm.c +index 5671ac642..183293edb 100644 +--- a/lib/fsm.c b/lib/fsm.c +@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, + int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; + int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; + int firstlinkfile = -1; ++int mayopen = 0; + char *tid = NULL; + struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); + struct filedata_s *firstlink = NULL; +
[OE-core] [PATCH] libxi: upgrade to v1.8.1
Changes: Use xz: upstream has not released bz2. Update sha256sum for new version. Signed-off-by: Sudip Mukherjee --- .../xorg-lib/{libxi_1.8.bb => libxi_1.8.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{libxi_1.8.bb => libxi_1.8.1.bb} (85%) diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.8.bb b/meta/recipes-graphics/xorg-lib/libxi_1.8.1.bb similarity index 85% rename from meta/recipes-graphics/xorg-lib/libxi_1.8.bb rename to meta/recipes-graphics/xorg-lib/libxi_1.8.1.bb index a6cf9b3002..00bd46ef13 100644 --- a/meta/recipes-graphics/xorg-lib/libxi_1.8.bb +++ b/meta/recipes-graphics/xorg-lib/libxi_1.8.1.bb @@ -16,8 +16,8 @@ DEPENDS += "libxext xorgproto libxfixes" PE = "1" XORG_PN = "libXi" -XORG_EXT = "tar.bz2" +XORG_EXT = "tar.xz" -SRC_URI[sha256sum] = "2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00" +SRC_URI[sha256sum] = "89bfc0e814f288f784202e6e5f9b362b788ccecdeb078670145eacd8749656a7" BBCLASSEXTEND = "native nativesdk" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181502): https://lists.openembedded.org/g/openembedded-core/message/181502 Mute This Topic: https://lists.openembedded.org/mt/98956984/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] dhcpcd: upgrade to v10.0.1
Changes: Update license checksum: change in copyright year. Rebase patches for upstream changes. Remove upstream applied patches. Signed-off-by: Sudip Mukherjee --- .../{dhcpcd_9.4.1.bb => dhcpcd_10.0.1.bb} | 9 ++--- ...mprove-the-sitation-of-working-with-.patch | 4 +-- ...low-getrandom-sysctl-for-newer-glibc.patch | 30 ...x-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch | 34 --- ...sep-Allow-newfstatat-syscall-as-well.patch | 31 - 5 files changed, 5 insertions(+), 103 deletions(-) rename meta/recipes-connectivity/dhcpcd/{dhcpcd_9.4.1.bb => dhcpcd_10.0.1.bb} (83%) delete mode 100644 meta/recipes-connectivity/dhcpcd/files/0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch delete mode 100644 meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch delete mode 100644 meta/recipes-connectivity/dhcpcd/files/0002-privsep-Allow-newfstatat-syscall-as-well.patch diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.1.bb similarity index 83% rename from meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb rename to meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.1.bb index 21b2eebbd8..de007a6e6c 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.1.bb @@ -7,20 +7,17 @@ DESCRIPTION = "dhcpcd runs on your machine and silently configures your \ HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/; LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d148485768fe85b9f1072b186a7e9b4d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ba9c7e534853aaf3de76c905b2410ffd" -SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=dhcpcd-9 \ +SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=master \ file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ file://0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch \ - file://0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch \ - file://0002-privsep-Allow-newfstatat-syscall-as-well.patch \ - file://0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch \ file://dhcpcd.service \ file://dhcpcd@.service \ file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ " -SRCREV = "3c458fc7fa4146029a1e4f9e98cd7e7adf03081a" +SRCREV = "5d9bf80c26b4b7dc9d8aa175d96d5a24e75b4d48" S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep systemd useradd diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch b/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch index 6f90c88249..8d1ed6671a 100644 --- a/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch +++ b/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch @@ -27,7 +27,7 @@ Signed-off-by: Chen Qi 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/hooks/20-resolv.conf b/hooks/20-resolv.conf -index 504a6c53..eb6e5845 100644 +index 7c29e276..becc019f 100644 --- a/hooks/20-resolv.conf +++ b/hooks/20-resolv.conf @@ -11,8 +11,12 @@ nocarrier_roaming_dir="$state_dir/roaming" @@ -35,7 +35,7 @@ index 504a6c53..eb6e5845 100644 " : ${resolvconf:=resolvconf} +resolvconf_from_systemd=false - if type "$resolvconf" >/dev/null 2>&1; then + if command -v "$resolvconf" >/dev/null 2>&1; then have_resolvconf=true + if [ $(basename $(readlink -f $(which $resolvconf))) = resolvectl ]; then + resolvconf_from_systemd=true diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch deleted file mode 100644 index 68ab93416a..00 --- a/meta/recipes-connectivity/dhcpcd/files/0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c6cdf0aee71ab4126d36b045f02428ee3c6ec50b Mon Sep 17 00:00:00 2001 -From: Roy Marples -Date: Fri, 26 Aug 2022 09:08:36 +0100 -Subject: [PATCH 1/2] privsep: Allow getrandom sysctl for newer glibc - -Fixes #120 - -Upstream-Status: Backport [c6cdf0aee71ab4126d36b045f02428ee3c6ec50b] -Signed-off-by: Chen Qi - src/privsep-linux.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index b238644b..479a1d82 100644 a/src/privsep-linux.c -+++ b/src/privsep-linux.c -@@ -300,6 +300,9 @@ static struct sock_filter ps_seccomp_filter[] = { - #ifdef __NR_ge
[OE-core] [PATCH] xinput: upgrade to v1.6.4
Changes: Use xz: upstream has not released bz2. Update sha256sum and md5sum for new version. Signed-off-by: Sudip Mukherjee --- .../xorg-app/{xinput_1.6.3.bb => xinput_1.6.4.bb}| 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-app/{xinput_1.6.3.bb => xinput_1.6.4.bb} (64%) diff --git a/meta/recipes-graphics/xorg-app/xinput_1.6.3.bb b/meta/recipes-graphics/xorg-app/xinput_1.6.4.bb similarity index 64% rename from meta/recipes-graphics/xorg-app/xinput_1.6.3.bb rename to meta/recipes-graphics/xorg-app/xinput_1.6.4.bb index ff1f1c9148..f5e3f5da12 100644 --- a/meta/recipes-graphics/xorg-app/xinput_1.6.3.bb +++ b/meta/recipes-graphics/xorg-app/xinput_1.6.4.bb @@ -8,5 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=881525f89f99cad39c9832bcb72e6fa5" DEPENDS += " libxi libxrandr libxinerama" -SRC_URI[md5sum] = "ac6b7432726008b2f50eba82b0e2dbe4" -SRC_URI[sha256sum] = "35a281dd3b9b22ea85e39869bb7670ba78955d5fec17c6ef7165d61e5aeb66ed" +SRC_URI_EXT = "xz" +SRC_URI[md5sum] = "8e4d14823b7cbefe1581c398c6ab0035" +SRC_URI[sha256sum] = "ad04d00d656884d133110eeddc34e9c69e626ebebbbab04dc95791c2907057c8" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#180830): https://lists.openembedded.org/g/openembedded-core/message/180830 Mute This Topic: https://lists.openembedded.org/mt/98663454/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] xwininfo: upgrade to v1.1.6
Changes: Use xz: upstream has not released bz2. Update license checksum: change in copyright year. Update sha256sum and md5sum for new version. Signed-off-by: Sudip Mukherjee --- .../xorg-app/{xwininfo_1.1.5.bb => xwininfo_1.1.6.bb} | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) rename meta/recipes-graphics/xorg-app/{xwininfo_1.1.5.bb => xwininfo_1.1.6.bb} (56%) diff --git a/meta/recipes-graphics/xorg-app/xwininfo_1.1.5.bb b/meta/recipes-graphics/xorg-app/xwininfo_1.1.6.bb similarity index 56% rename from meta/recipes-graphics/xorg-app/xwininfo_1.1.5.bb rename to meta/recipes-graphics/xorg-app/xwininfo_1.1.6.bb index ec9f08268e..39ec76724c 100644 --- a/meta/recipes-graphics/xorg-app/xwininfo_1.1.5.bb +++ b/meta/recipes-graphics/xorg-app/xwininfo_1.1.6.bb @@ -6,10 +6,11 @@ DESCRIPTION = "Xwininfo is a utility for displaying information about \ windows. Information may include window position, size, color depth, \ and a number of other items." -LIC_FILES_CHKSUM = "file://COPYING;md5=78976cd3115f6faf615accc4e094d90e" +LIC_FILES_CHKSUM = "file://COPYING;md5=a1b9559d7b7997a6e9588012ebf8769a" DEPENDS += "libxext libxmu gettext-native" PE = "0" -SRC_URI[md5sum] = "26d46f7ef0588d3392da3ad5802be420" -SRC_URI[sha256sum] = "7a405441dfc47c744f5fcd1bc8a75abf8b5b1d85db7b88b370982365080e" +SRC_URI_EXT = "xz" +SRC_URI[md5sum] = "c91201bc1eb5e7b38933be8d0f7f16a8" +SRC_URI[sha256sum] = "3518897c17448df9ba99ad6d9bb1ca0f17bc0ed7c0fd61281b34ceed29a9253f" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#180795): https://lists.openembedded.org/g/openembedded-core/message/180795 Mute This Topic: https://lists.openembedded.org/mt/98658008/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] libxfixes: Upgrade to v6.0.1
Changes: Use tar.xz: upstream has not released bz2. Update license checksum: minor change in text. Update sha256sum for new version. Signed-off-by: Sudip Mukherjee --- .../xorg-lib/{libxfixes_6.0.0.bb => libxfixes_6.0.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-graphics/xorg-lib/{libxfixes_6.0.0.bb => libxfixes_6.0.1.bb} (71%) diff --git a/meta/recipes-graphics/xorg-lib/libxfixes_6.0.0.bb b/meta/recipes-graphics/xorg-lib/libxfixes_6.0.1.bb similarity index 71% rename from meta/recipes-graphics/xorg-lib/libxfixes_6.0.0.bb rename to meta/recipes-graphics/xorg-lib/libxfixes_6.0.1.bb index 018138f11d..28df7bb805 100644 --- a/meta/recipes-graphics/xorg-lib/libxfixes_6.0.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxfixes_6.0.1.bb @@ -6,16 +6,16 @@ provide the minimal server-side support necessary to eliminate problems \ caused by these workarounds." require xorg-lib-common.inc -SRC_URI[sha256sum] = "a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c" +SRC_URI[sha256sum] = "b695f93cd2499421ab02d22744458e650ccc88c1d4c8130d60200213abc02d58" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0" +LIC_FILES_CHKSUM = "file://COPYING;md5=a5a9755c8921cc7dc08a5cfe4267d0ff" DEPENDS += "virtual/libx11 xorgproto" PE = "1" XORG_PN = "libXfixes" -XORG_EXT = "tar.bz2" +XORG_EXT = "tar.xz" BBCLASSEXTEND = "native nativesdk" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#180769): https://lists.openembedded.org/g/openembedded-core/message/180769 Mute This Topic: https://lists.openembedded.org/mt/98647517/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] libxt: Upgrade to v1.3.0
Changes: Use .xz, upstream is not creating .bz2 anymore. Update license checksum: Change in copyright years. Update sha256sum for new version. Signed-off-by: Sudip Mukherjee --- .../xorg-lib/{libxt_1.2.1.bb => libxt_1.3.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-graphics/xorg-lib/{libxt_1.2.1.bb => libxt_1.3.0.bb} (83%) diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.2.1.bb b/meta/recipes-graphics/xorg-lib/libxt_1.3.0.bb similarity index 83% rename from meta/recipes-graphics/xorg-lib/libxt_1.2.1.bb rename to meta/recipes-graphics/xorg-lib/libxt_1.3.0.bb index f56e106ee1..1805dae772 100644 --- a/meta/recipes-graphics/xorg-lib/libxt_1.2.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxt_1.3.0.bb @@ -13,7 +13,7 @@ independent of any particular user interface policy or style." require xorg-lib-common.inc LICENSE = "MIT & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=73d55cea4d27ca1a09a5d23378b3ecf8" +LIC_FILES_CHKSUM = "file://COPYING;md5=d6e9ca2c4b2276625afe025b0a2a4d8c" DEPENDS += "util-linux libxcb libsm virtual/libx11 xorgproto libxdmcp" PROVIDES = "xt" @@ -21,11 +21,11 @@ PROVIDES = "xt" PE = "1" XORG_PN = "libXt" -XORG_EXT = "tar.bz2" +XORG_EXT = "tar.xz" SRC_URI += "file://libxt_fix_for_x32.patch" -SRC_URI[sha256sum] = "679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60" +SRC_URI[sha256sum] = "52820b3cdb827d08dc90bdfd1b0022a3ad8919b57a39808b12591973b331bf91" BBCLASSEXTEND = "native nativesdk" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#180743): https://lists.openembedded.org/g/openembedded-core/message/180743 Mute This Topic: https://lists.openembedded.org/mt/98641018/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] apt: Upgrade to v2.6.0
Changes: Rebase patches for upstream changes Remove upstream applied patches Update homepage Update sha256sum for new version Signed-off-by: Sudip Mukherjee --- ...e-documentation-directory-altogether.patch | 6 +- ...001-Remove-using-std-binary_function.patch | 8 +-- ...001-add-missing-cstdint-for-uint16_t.patch | 35 -- .../0001-cmake-Do-not-build-po-files.patch| 9 ++- ...me_t-and-suseconds_t-from-std-chrono.patch | 64 --- ...tive-helper-Undefine-_FORTIFY_SOURCE.patch | 27 .../apt/{apt_2.4.5.bb => apt_2.6.0.bb}| 7 +- 7 files changed, 13 insertions(+), 143 deletions(-) delete mode 100644 meta/recipes-devtools/apt/apt/0001-add-missing-cstdint-for-uint16_t.patch delete mode 100644 meta/recipes-devtools/apt/apt/0001-typecast-time_t-and-suseconds_t-from-std-chrono.patch delete mode 100644 meta/recipes-devtools/apt/apt/0002-interactive-helper-Undefine-_FORTIFY_SOURCE.patch rename meta/recipes-devtools/apt/{apt_2.4.5.bb => apt_2.6.0.bb} (92%) diff --git a/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch b/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch index 8b28ede8a8..5443ff6caa 100644 --- a/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch +++ b/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9745c13..7cfc9ee 100644 +index 668e2d762..62f441bfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -239,7 +239,7 @@ add_subdirectory(apt-pkg) - add_subdirectory(apt-private) +@@ -246,7 +246,7 @@ add_subdirectory(apt-private) + endif() add_subdirectory(cmdline) add_subdirectory(completions) -add_subdirectory(doc) diff --git a/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch b/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch index 3065210a04..15b036b90d 100644 --- a/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch +++ b/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc -index 87ce9153c..56fdc2246 100644 +index 0f6587281..0a253b12b 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -48,6 +48,11 @@ @@ -33,19 +33,19 @@ index 87ce9153c..56fdc2246 100644 bool SrcDone; time_t ContentsMTime; -- struct ContentsCompare : public binary_function +- struct ContentsCompare - { - inline bool operator() (const PackageMap ,const PackageMap ) - {return x.ContentsMTime < y.ContentsMTime;}; - }; - -- struct DBCompare : public binary_function +- struct DBCompare - { - inline bool operator() (const PackageMap ,const PackageMap ) - {return x.BinCacheDB < y.BinCacheDB;}; - }; - -- struct SrcDBCompare : public binary_function +- struct SrcDBCompare - { - inline bool operator() (const PackageMap ,const PackageMap ) - {return x.SrcCacheDB < y.SrcCacheDB;}; diff --git a/meta/recipes-devtools/apt/apt/0001-add-missing-cstdint-for-uint16_t.patch b/meta/recipes-devtools/apt/apt/0001-add-missing-cstdint-for-uint16_t.patch deleted file mode 100644 index 44aa8a5873..00 --- a/meta/recipes-devtools/apt/apt/0001-add-missing-cstdint-for-uint16_t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 960d10e89cf60d39998dae6fdcd4f0866b753a79 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 23 Jan 2023 12:31:35 -0800 -Subject: [PATCH] add missing for uint16_t - -This fixes build problems with gcc 13 snapshot [1] - -Fixes -| include/apt-pkg/pkgcache.h:257:23: warning: cast from 'char*' to 'const uint16_t*' {aka 'const short unsigned int*'} increases required alignment of target type [-Wcast-align] -| 257 | uint16_t len = *reinterpret_cast(name - sizeof(uint16_t)); -| | ^~ - -[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html - -Upstream-Status: Submitted [https://salsa.debian.org/apt-team/apt/-/merge_requests/276] -Signed-off-by: Khem Raj - apt-pkg/contrib/mmap.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc -index 642e20473..0568e1cd0 100644 a/apt-pkg/contrib/mmap.cc -+++ b/apt-pkg/contrib/mmap.cc -@@ -23,6 +23,7 @@ - #include - #include - -+#include - #include - #include - #include --- -2.39.1 - diff --git a/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch b/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch index 2837b7f1b3..036ce35963 100644 --- a/meta/recipes-d
[OE-core] [PATCH] cracklib: upgrade to v2.9.10
Remove a patch which has been applied upstream and rebase another patch on top of v2.9.10 Signed-off-by: Sudip Mukherjee --- ...port-dictionary-byte-order-dependent.patch | 28 +- ...aklib-fix-testnum-and-teststr-failed.patch | 53 --- .../{cracklib_2.9.8.bb => cracklib_2.9.10.bb} | 3 +- 3 files changed, 15 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch rename meta/recipes-extended/cracklib/{cracklib_2.9.8.bb => cracklib_2.9.10.bb} (87%) diff --git a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch index 8fb512a224..20572b55c4 100644 --- a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch +++ b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch @@ -26,7 +26,7 @@ Signed-off-by: Lei Maohui 1 file changed, 210 insertions(+), 4 deletions(-) diff --git a/lib/packlib.c b/lib/packlib.c -index 8acb7be..a9d8750 100644 +index 9396e1d..d0bb181 100644 --- a/lib/packlib.c +++ b/lib/packlib.c @@ -16,6 +16,12 @@ @@ -41,8 +41,8 @@ index 8acb7be..a9d8750 100644 +#include #include "packer.h" - static const char vers_id[] = "packlib.c : v2.3p2 Alec Muffett 18 May 1993"; -@@ -45,6 +51,185 @@ typedef struct + #define DEBUG 0 +@@ -43,6 +49,185 @@ typedef struct char data_get[NUMWORDS][MAXWORDLEN]; } PWDICT64; @@ -228,7 +228,7 @@ index 8acb7be..a9d8750 100644 static int _PWIsBroken64(FILE *ifp) -@@ -57,6 +242,7 @@ _PWIsBroken64(FILE *ifp) +@@ -55,6 +240,7 @@ _PWIsBroken64(FILE *ifp) return 0; } @@ -236,7 +236,7 @@ index 8acb7be..a9d8750 100644 return (pdesc64.header.pih_magic == PIH_MAGIC); } -@@ -149,7 +335,11 @@ PWOpen(prefix, mode) +@@ -147,7 +333,11 @@ PWOpen(prefix, mode) pdesc.header.pih_blocklen = NUMWORDS; pdesc.header.pih_numwords = 0; @@ -249,7 +249,7 @@ index 8acb7be..a9d8750 100644 } else { pdesc.flags &= ~PFOR_WRITE; -@@ -173,6 +363,7 @@ PWOpen(prefix, mode) +@@ -171,6 +361,7 @@ PWOpen(prefix, mode) return NULL; } @@ -257,7 +257,7 @@ index 8acb7be..a9d8750 100644 if ((pdesc.header.pih_magic == 0) || (pdesc.header.pih_numwords == 0)) { /* uh-oh. either a broken "64-bit" file or a garbage file. */ -@@ -195,6 +386,7 @@ PWOpen(prefix, mode) +@@ -193,6 +384,7 @@ PWOpen(prefix, mode) } return NULL; } @@ -265,7 +265,7 @@ index 8acb7be..a9d8750 100644 if (pdesc64.header.pih_magic != PIH_MAGIC) { /* nope, not "64-bit" after all */ -@@ -290,6 +482,7 @@ PWOpen(prefix, mode) +@@ -288,6 +480,7 @@ PWOpen(prefix, mode) { pdesc.flags &= ~PFOR_USEHWMS; } @@ -273,7 +273,7 @@ index 8acb7be..a9d8750 100644 for (i = 0; i < sizeof(pdesc.hwms) / sizeof(pdesc.hwms[0]); i++) { pdesc.hwms[i] = pdesc64.hwms[i]; -@@ -299,6 +492,7 @@ PWOpen(prefix, mode) +@@ -297,6 +490,7 @@ PWOpen(prefix, mode) { pdesc.flags &= ~PFOR_USEHWMS; } @@ -281,7 +281,7 @@ index 8acb7be..a9d8750 100644 #if DEBUG for (i=1; i<=0xff; i++) { -@@ -332,7 +526,11 @@ PWClose(pwp) +@@ -330,7 +524,11 @@ PWClose(pwp) return (-1); } @@ -294,7 +294,7 @@ index 8acb7be..a9d8750 100644 { fprintf(stderr, "index magic fwrite failed\n"); return (-1); -@@ -351,7 +549,12 @@ PWClose(pwp) +@@ -349,7 +547,12 @@ PWClose(pwp) printf("hwm[%02x] = %d\n", i, pwp->hwms[i]); #endif } @@ -308,7 +308,7 @@ index 8acb7be..a9d8750 100644 } } -@@ -405,7 +608,8 @@ PutPW(pwp, string) +@@ -403,7 +606,8 @@ PutPW(pwp, string) datum = (uint32_t) ftell(pwp->dfp); @@ -318,7 +318,7 @@ index 8acb7be..a9d8750 100644 fputs(pwp->data_put[0], pwp->dfp); putc(0, (FILE*) pwp->dfp); -@@ -464,6 +668,7 @@ GetPW(pwp, number) +@@ -462,6 +666,7 @@ GetPW(pwp, number) perror("(index fread failed)"); return NULL; } @@ -326,7 +326,7 @@ index 8acb7be..a9d8750 100644 datum = datum64; } else { if (fseek(pwp->ifp, sizeof(struct pi_header) + (thisblock * sizeof(uint32_t)), 0)) -@@ -477,6 +682,7 @@ GetPW(pwp, number) +@@ -475,6 +680,7 @@ GetPW(pwp, number) perror("(index fread failed)"); return NULL; } diff --git a/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-test
[OE-core] [PATCH] libgit2: upgrade to v1.6.3
Upgrade libgit2 to v1.6.3. The new version now has git_fs_path_basename_r() which is based on BSD-2-Clause. Signed-off-by: Sudip Mukherjee --- .../libgit2/{libgit2_1.5.1.bb => libgit2_1.6.3.bb}| 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-support/libgit2/{libgit2_1.5.1.bb => libgit2_1.6.3.bb} (69%) diff --git a/meta/recipes-support/libgit2/libgit2_1.5.1.bb b/meta/recipes-support/libgit2/libgit2_1.6.3.bb similarity index 69% rename from meta/recipes-support/libgit2/libgit2_1.5.1.bb rename to meta/recipes-support/libgit2/libgit2_1.6.3.bb index eb7b538ece..554e18e4da 100644 --- a/meta/recipes-support/libgit2/libgit2_1.5.1.bb +++ b/meta/recipes-support/libgit2/libgit2_1.6.3.bb @@ -1,12 +1,12 @@ SUMMARY = "the Git linkable library" HOMEPAGE = "http://libgit2.github.com/; -LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause & Zlib & ISC & LGPL-2.1-or-later & CC0-1.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=112e6bb421dea73cd41de09e777f2d2c" +LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause & Zlib & ISC & LGPL-2.1-or-later & CC0-1.0 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=5bdf47bbc9a39dc6ce076d59e322dc17" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.5;protocol=https" -SRCREV = "42e5db98b963ae503229c63e44e06e439df50e56" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.6;protocol=https" +SRCREV = "c058aa87dce4c67a3b86b3349beebd64b7bedcd3" S = "${WORKDIR}/git" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178992): https://lists.openembedded.org/g/openembedded-core/message/178992 Mute This Topic: https://lists.openembedded.org/mt/97810330/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] libgit2: update license information
Hi Ross, On Wed, 8 Mar 2023 at 13:35, Ross Burton wrote: > > On 2 Mar 2023, at 21:47, Sudip Mukherjee via lists.openembedded.org > wrote: > > > > The LICENSE did not have complete information. > > Some examples of missing license: > > > > Zlib: deps/zlib/ > > ISC: tests/clar/clar.c > > LGPL-2.1-or-later: src/libgit2/xdiff/xdiffi.c > > CC0-1.0: src/util/rand.c > > > > Signed-off-by: Sudip Mukherjee > > --- > > meta/recipes-support/libgit2/libgit2_1.5.1.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-support/libgit2/libgit2_1.5.1.bb > > b/meta/recipes-support/libgit2/libgit2_1.5.1.bb > > index 59866ce385..eb7b538ece 100644 > > --- a/meta/recipes-support/libgit2/libgit2_1.5.1.bb > > +++ b/meta/recipes-support/libgit2/libgit2_1.5.1.bb > > @@ -1,6 +1,6 @@ > > SUMMARY = "the Git linkable library" > > HOMEPAGE = "http://libgit2.github.com/; > > -LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause" > > +LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause & > > Zlib & ISC & LGPL-2.1-or-later & CC0-1.0" > > LIC_FILES_CHKSUM = "file://COPYING;md5=112e6bb421dea73cd41de09e777f2d2c” > > Can you also expand LIC_FILES_CHKSUM to cover these? They are already mentioned in the COPYING file which is in the "LIC_FILES_CHKSUM", I guess they were overlooked when libgit2 was last updated. Zlib: https://github.com/libgit2/libgit2/blob/maint/v1.5/COPYING#L366 ISC: https://github.com/libgit2/libgit2/blob/maint/v1.5/COPYING#L391 LGPL-2.1-or-later: https://github.com/libgit2/libgit2/blob/maint/v1.5/COPYING#L441 CC0-1.0: https://github.com/libgit2/libgit2/blob/maint/v1.5/COPYING#L1137 -- Regards Sudip -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178366): https://lists.openembedded.org/g/openembedded-core/message/178366 Mute This Topic: https://lists.openembedded.org/mt/97349650/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] libgit2: update license information
The LICENSE did not have complete information. Some examples of missing license: Zlib: deps/zlib/ ISC: tests/clar/clar.c LGPL-2.1-or-later: src/libgit2/xdiff/xdiffi.c CC0-1.0: src/util/rand.c Signed-off-by: Sudip Mukherjee --- meta/recipes-support/libgit2/libgit2_1.5.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libgit2/libgit2_1.5.1.bb b/meta/recipes-support/libgit2/libgit2_1.5.1.bb index 59866ce385..eb7b538ece 100644 --- a/meta/recipes-support/libgit2/libgit2_1.5.1.bb +++ b/meta/recipes-support/libgit2/libgit2_1.5.1.bb @@ -1,6 +1,6 @@ SUMMARY = "the Git linkable library" HOMEPAGE = "http://libgit2.github.com/; -LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause" +LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause & Zlib & ISC & LGPL-2.1-or-later & CC0-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=112e6bb421dea73cd41de09e777f2d2c" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#177968): https://lists.openembedded.org/g/openembedded-core/message/177968 Mute This Topic: https://lists.openembedded.org/mt/97349650/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-