libgit2: upgrade 1.8.1 -> 1.8.2
PATCH 1/2 libgit2: upgrade 1.8.1 -> 1.8.2
Changelog (https://github.com/libgit2/libgit2/releases/tag/v1.8.2):
- This release reverts a const-correctness change introduced in v1.8.0 for the git_commit_create functions. We now retain the const-behavior for the commits arguments from prior to v1.8.0.
This change was meant to resolve compatibility issues with bindings and downstream users.
What's Changed
New features
- Introduce a stricter debugging allocator for testing by ethomson in #6811
Bug fixes
- Fix constness issue introduced in #6716 by ethomson in #6829
Build and CI improvements
- README: add experimental builds to ci table by ethomson in #6816
---
.../libgit2/{libgit2_1.8.1.bb => libgit2_1.8.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/libgit2/{libgit2_1.8.1.bb => libgit2_1.8.2.bb} (91%)meta/recipes-support/libgit2/libgit2_1.8.2.bb renamed from meta/recipes-support/libgit2/libgit2_1.8.1.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8eacfdc17c8f4d219e131a073973b97d" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https" -SRCREV = "36f7e21ad757a3dacc58cf7944329da6bc1d6e96" +SRCREV = "4ce872a0fd5f40fc4282befd9b72e9ddebd22d02" S = "${WORKDIR}/git"
Signature · 1 line
2.39.5
PATCH 2/2 libssh2: upgrade 1.11.0 -> 1.11.1
Patches '0001-disable-DSA-by-default.patch' and 'CVE-2023-48795.patch' were both dropped as they're included in version 1.11.1.
Changelog: https://github.com/libssh2/libssh2/releases/tag/libssh2-1.11.1
ptest results:
|root@qemux86-64:~# ptest-runner libssh2 |START: ptest-runner |2024-10-22T20:15 |BEGIN: /usr/lib/libssh2/ptest |PASS: mansyntax.sh |PASS: test_simple |PASS: test_sshd.test |DURATION: 3 |END: /usr/lib/libssh2/ptest |2024-10-22T20:15 |STOP: ptest-runner |TOTAL: 1 FAIL: 0
---
.../libssh2/0001-disable-DSA-by-default.patch | 173 -------
.../libssh2/libssh2/CVE-2023-48795.patch | 466 ------------------
.../{libssh2_1.11.0.bb => libssh2_1.11.1.bb} | 6 +-
3 files changed, 2 insertions(+), 643 deletions(-)
delete mode 100644 meta/recipes-support/libssh2/libssh2/0001-disable-DSA-by-default.patch
delete mode 100644 meta/recipes-support/libssh2/libssh2/CVE-2023-48795.patch
rename meta/recipes-support/libssh2/{libssh2_1.11.0.bb => libssh2_1.11.1.bb} (86%)meta/recipes-support/libssh2/libssh2/0001-disable-DSA-by-default.patch deleted +0 -173
@@ -1,173 +0,0 @@ -From 124ab98ed2f3ea6478dd04c7b6947720fef385d3 Mon Sep 17 00:00:00 2001 -From: Viktor Szakats <[email protected]> -Date: Tue, 30 Jul 2024 20:00:05 +0200 -Subject: [PATCH] disable DSA by default - -Also: -- add `LIBSSH2_DSA_ENABLE` to enable it explicitly. -- test the above option in CI. -- say 'deprecated' in docs and public header. -- disable DSA in the CI server config. - (OpenSSH 9.8 no longer builds with it by default) - https://www.openssh.com/txt/release-9.8 - Patch-by: Jose Quaresma -- disable more DSA code when not enabled. - -Fixes #1433 -Closes #1435 - -Upstream-Status: Backport [https://github.com/libssh2/libssh2/commit/b7ab0faa70567a789419798fe079f5678ad4e156] - -Signed-off-by: Jose Quaresma <[email protected]> ---- - docs/libssh2_knownhost_add.3 | 2 +- - docs/libssh2_knownhost_addc.3 | 2 +- - docs/libssh2_session_hostkey.3 | 2 +- - include/libssh2.h | 4 ++-- - src/hostkey.c | 4 ++++ - src/knownhost.c | 16 ++++++++++------ - tests/openssh_server/sshd_config | 2 +- - 7 files changed, 20 insertions(+), 12 deletions(-) - -diff --git a/docs/libssh2_knownhost_add.3 b/docs/libssh2_knownhost_add.3 -index d0af2b6d..2b529c2e 100644 ---- a/docs/libssh2_knownhost_add.3 -+++ b/docs/libssh2_knownhost_add.3 -@@ -50,7 +50,7 @@ LIBSSH2_KNOWNHOST_KEYENC_RAW or LIBSSH2_KNOWNHOST_KEYENC_BASE64. - - The key is using one of these algorithms: - LIBSSH2_KNOWNHOST_KEY_RSA1, LIBSSH2_KNOWNHOST_KEY_SSHRSA or --LIBSSH2_KNOWNHOST_KEY_SSHDSS. -+LIBSSH2_KNOWNHOST_KEY_SSHDSS (deprecated). - - \fIstore\fP should point to a pointer that gets filled in to point to the - known host data after the addition. NULL can be passed if you do not care about -diff --git a/docs/libssh2_knownhost_addc.3 b/docs/libssh2_knownhost_addc.3 -index 21367e11..f15f6ea9 100644 ---- a/docs/libssh2_knownhost_addc.3 -+++ b/docs/libssh2_knownhost_addc.3 -@@ -55,7 +55,7 @@ LIBSSH2_KNOWNHOST_KEYENC_RAW or LIBSSH2_KNOWNHOST_KEYENC_BASE64. - - The key is using one of these algorithms: - LIBSSH2_KNOWNHOST_KEY_RSA1, LIBSSH2_KNOWNHOST_KEY_SSHRSA or --LIBSSH2_KNOWNHOST_KEY_SSHDSS. -+LIBSSH2_KNOWNHOST_KEY_SSHDSS (deprecated). - - \fIstore\fP should point to a pointer that gets filled in to point to the - known host data after the addition. NULL can be passed if you do not care about -diff --git a/docs/libssh2_session_hostkey.3 b/docs/libssh2_session_hostkey.3 -index d57c7eab..0f0ee4c7 100644 ---- a/docs/libssh2_session_hostkey.3 -+++ b/docs/libssh2_session_hostkey.3 -@@ -14,7 +14,7 @@ Returns a pointer to the current host key, the value \fIlen\fP points to will - get the length of the key. - - The value \fItype\fP points to the type of hostkey which is one of: --LIBSSH2_HOSTKEY_TYPE_RSA, LIBSSH2_HOSTKEY_TYPE_DSS, or -+LIBSSH2_HOSTKEY_TYPE_RSA, LIBSSH2_HOSTKEY_TYPE_DSS (deprecated), or - LIBSSH2_HOSTKEY_TYPE_UNKNOWN. - - .SH RETURN VALUE -diff --git a/include/libssh2.h b/include/libssh2.h -index 97ac5898..4c1faa53 100644 ---- a/include/libssh2.h -+++ b/include/libssh2.h -@@ -470,7 +470,7 @@ typedef struct _LIBSSH2_POLLFD { - /* Hostkey Types */ - #define LIBSSH2_HOSTKEY_TYPE_UNKNOWN 0 - #define LIBSSH2_HOSTKEY_TYPE_RSA 1 --#define LIBSSH2_HOSTKEY_TYPE_DSS 2 -+#define LIBSSH2_HOSTKEY_TYPE_DSS 2 /* deprecated */ - #define LIBSSH2_HOSTKEY_TYPE_ECDSA_256 3 - #define LIBSSH2_HOSTKEY_TYPE_ECDSA_384 4 - #define LIBSSH2_HOSTKEY_TYPE_ECDSA_521 5 -@@ -1094,7 +1094,7 @@ libssh2_knownhost_init(LIBSSH2_SESSION *session); - #define LIBSSH2_KNOWNHOST_KEY_SHIFT 18 - #define LIBSSH2_KNOWNHOST_KEY_RSA1 (1<<18) - #define LIBSSH2_KNOWNHOST_KEY_SSHRSA (2<<18) --#define LIBSSH2_KNOWNHOST_KEY_SSHDSS (3<<18) -+#define LIBSSH2_KNOWNHOST_KEY_SSHDSS (3<<18) /* deprecated */ - #define LIBSSH2_KNOWNHOST_KEY_ECDSA_256 (4<<18) - #define LIBSSH2_KNOWNHOST_KEY_ECDSA_384 (5<<18) - #define LIBSSH2_KNOWNHOST_KEY_ECDSA_521 (6<<18) -diff --git a/src/hostkey.c b/src/hostkey.c -index f3823676..a5e07029 100644 ---- a/src/hostkey.c -+++ b/src/hostkey.c -@@ -1346,9 +1346,11 @@ static int hostkey_type(const unsigned char *hostkey, size_t len) - static const unsigned char rsa[] = { - 0, 0, 0, 0x07, 's', 's', 'h', '-', 'r', 's', 'a' - }; -+#if LIBSSH2_DSA - static const unsigned char dss[] = { - 0, 0, 0, 0x07, 's', 's', 'h', '-', 'd', 's', 's' - }; -+#endif - static const unsigned char ecdsa_256[] = { - 0, 0, 0, 0x13, 'e', 'c', 'd', 's', 'a', '-', 's', 'h', 'a', '2', '-', - 'n', 'i', 's', 't', 'p', '2', '5', '6' -@@ -1371,8 +1373,10 @@ static int hostkey_type(const unsigned char *hostkey, size_t len) - if(!memcmp(rsa, hostkey, 11)) - return LIBSSH2_HOSTKEY_TYPE_RSA; - -+#if LIBSSH2_DSA - if(!memcmp(dss, hostkey, 11)) - return LIBSSH2_HOSTKEY_TYPE_DSS; -+#endif - - if(len < 15) - return LIBSSH2_HOSTKEY_TYPE_UNKNOWN; -diff --git a/src/knownhost.c b/src/knownhost.c -index c2231180..afa96508 100644 ---- a/src/knownhost.c -+++ b/src/knownhost.c -@@ -773,18 +773,20 @@ static int hostline(LIBSSH2_KNOWNHOSTS *hosts, - } - key_type_len = key - key_type_name; - -- if(!strncmp(key_type_name, "ssh-dss", key_type_len)) -- key_type = LIBSSH2_KNOWNHOST_KEY_SSHDSS; -- else if(!strncmp(key_type_name, "ssh-rsa", key_type_len)) -- key_type = LIBSSH2_KNOWNHOST_KEY_SSHRSA; -+ if(!strncmp(key_type_name, "ssh-ed25519", key_type_len)) -+ key_type = LIBSSH2_KNOWNHOST_KEY_ED25519; - else if(!strncmp(key_type_name, "ecdsa-sha2-nistp256", key_type_len)) - key_type = LIBSSH2_KNOWNHOST_KEY_ECDSA_256; - else if(!strncmp(key_type_name, "ecdsa-sha2-nistp384", key_type_len)) - key_type = LIBSSH2_KNOWNHOST_KEY_ECDSA_384; - else if(!strncmp(key_type_name, "ecdsa-sha2-nistp521", key_type_len)) - key_type = LIBSSH2_KNOWNHOST_KEY_ECDSA_521; -- else if(!strncmp(key_type_name, "ssh-ed25519", key_type_len)) -- key_type = LIBSSH2_KNOWNHOST_KEY_ED25519; -+ else if(!strncmp(key_type_name, "ssh-rsa", key_type_len)) -+ key_type = LIBSSH2_KNOWNHOST_KEY_SSHRSA; -+#if LIBSSH2_DSA -+ else if(!strncmp(key_type_name, "ssh-dss", key_type_len)) -+ key_type = LIBSSH2_KNOWNHOST_KEY_SSHDSS; -+#endif - else - key_type = LIBSSH2_KNOWNHOST_KEY_UNKNOWN; - -@@ -1020,10 +1022,12 @@ knownhost_writeline(LIBSSH2_KNOWNHOSTS *hosts, - key_type_name = "ssh-rsa"; - key_type_len = 7; - break; -+#if LIBSSH2_DSA - case LIBSSH2_KNOWNHOST_KEY_SSHDSS: - key_type_name = "ssh-dss"; - key_type_len = 7; - break; -+#endif - case LIBSSH2_KNOWNHOST_KEY_ECDSA_256: - key_type_name = "ecdsa-sha2-nistp256"; - key_type_len = 19; -diff --git a/tests/openssh_server/sshd_config b/tests/openssh_server/sshd_config -index 1069566f..5cd2b898 100644 ---- a/tests/openssh_server/sshd_config -+++ b/tests/openssh_server/sshd_config -@@ -1,4 +1,4 @@ - HostKeyAlgorithms +ssh-rsa --PubkeyAcceptedKeyTypes +ssh-rsa,ssh-dss,[email protected] -+PubkeyAcceptedKeyTypes +ssh-rsa,[email protected] - MACs +hmac-sha1,hmac-sha1-96,hmac-sha2-256,hmac-sha2-512,hmac-md5,hmac-md5-96,[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected] - Ciphers +3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr,[email protected],[email protected],[email protected]
meta/recipes-support/libssh2/libssh2/CVE-2023-48795.patch deleted +0 -466
466 lines not on this page · raw message
meta/recipes-support/libssh2/libssh2_1.11.1.bb renamed from meta/recipes-support/libssh2/libssh2_1.11.0.bb +2 -4
@@ -5,15 +5,13 @@ SECTION = "libs" DEPENDS = "zlib" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=24a33237426720395ebb1dd1349ca225" +LIC_FILES_CHKSUM = "file://COPYING;md5=2fbf8f834408079bf1fcbadb9814b1bc" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ file://run-ptest \ - file://CVE-2023-48795.patch \ - file://0001-disable-DSA-by-default.patch \ " -SRC_URI[sha256sum] = "3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461" +SRC_URI[sha256sum] = "d9ec76cbe34db98eec3539fe2c899d26b0c837cb3eb466a56b0f109cabf658f7" inherit autotools pkgconfig ptest
Signature · 1 line
2.39.5
Patchtest results for [OE-core][PATCH 2/2] libssh2: upgrade 1.11.0 -> 1.11.1
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:
---
Testing patch /home/patchtest/share/mboxes/2-2-libssh2-upgrade-1.11.0---1.11.1.patch
FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)
SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)
---
Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!