已开启
CmakeLists: Fix multiple digit major version for OpenSSH #151
lihuanyu410621创建于 4月10日
CmakeLists: Fix multiple digit major version for OpenSSH #151
已开启
共 2 个文件变更+56-1
| @@ -0,0 +1,46 @@ | |||
| 1 | +From af10857aa3216f40c5c2e5d7116803fb03c166f9 Mon Sep 17 00:00:00 2001 | ||
| 2 | +From: Norbert Pocs <norbertpocs0@gmail.com> | ||
| 3 | +Date: Fri, 11 Apr 2025 09:04:40 +0200 | ||
| 4 | +Subject: [PATCH] CmakeLists: Fix multiple digit major version for OpenSSH | ||
| 5 | + | ||
| 6 | +Signed-off-by: Norbert Pocs <norbertpocs0@gmail.com> | ||
| 7 | +Reviewed-by: Jakub Jelen <jjelen@redhat.com> | ||
| 8 | +--- | ||
| 9 | + tests/CMakeLists.txt | 13 +++---------- | ||
| 10 | + 1 file changed, 3 insertions(+), 10 deletions(-) | ||
| 11 | + | ||
| 12 | +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | ||
| 13 | +index 8d4e94b69..e8b196b83 100644 | ||
| 14 | +--- a/tests/CMakeLists.txt | ||
| 15 | ++++ b/tests/CMakeLists.txt | ||
| 16 | + add_subdirectory(unittests) | ||
| 17 | + find_program(SSH_EXECUTABLE NAMES ssh) | ||
| 18 | + if (SSH_EXECUTABLE) | ||
| 19 | + execute_process(COMMAND ${SSH_EXECUTABLE} -V ERROR_VARIABLE OPENSSH_VERSION_STR) | ||
| 20 | +- string(REGEX REPLACE "^.*OpenSSH_([0-9]).[0-9].*$" "\\1" OPENSSH_VERSION_MAJOR "${OPENSSH_VERSION_STR}") | ||
| 21 | +- string(REGEX REPLACE "^.*OpenSSH_[0-9].([0-9]).*$" "\\1" OPENSSH_VERSION_MINOR "${OPENSSH_VERSION_STR}") | ||
| 22 | ++ string(REGEX REPLACE "^.*OpenSSH_([0-9]+).[0-9].*$" "\\1" OPENSSH_VERSION_MAJOR "${OPENSSH_VERSION_STR}") | ||
| 23 | ++ string(REGEX REPLACE "^.*OpenSSH_[0-9]+.([0-9]).*$" "\\1" OPENSSH_VERSION_MINOR "${OPENSSH_VERSION_STR}") | ||
| 24 | + set(OPENSSH_VERSION "${OPENSSH_VERSION_MAJOR}.${OPENSSH_VERSION_MINOR}") | ||
| 25 | ++ add_definitions(-DOPENSSH_VERSION_MAJOR=${OPENSSH_VERSION_MAJOR} -DOPENSSH_VERSION_MINOR=${OPENSSH_VERSION_MINOR}) | ||
| 26 | + if("${OPENSSH_VERSION}" VERSION_LESS "6.3") | ||
| 27 | + # ssh - Q was introduced in 6.3 | ||
| 28 | + message("Version less than 6.3, hardcoding cipher list") | ||
| 29 | + if (CLIENT_TESTING OR SERVER_TESTING) | ||
| 30 | + endif (NOT SOFTHSM_FOUND) | ||
| 31 | + endif (WITH_PKCS11_URI) | ||
| 32 | + | ||
| 33 | +- find_program(SSH_EXECUTABLE NAMES ssh) | ||
| 34 | +- if (SSH_EXECUTABLE) | ||
| 35 | +- execute_process(COMMAND ${SSH_EXECUTABLE} -V ERROR_VARIABLE OPENSSH_VERSION_STR) | ||
| 36 | +- string(REGEX REPLACE "^.*OpenSSH_([0-9]).[0-9].*$" "\\1" OPENSSH_VERSION_MAJOR "${OPENSSH_VERSION_STR}") | ||
| 37 | +- string(REGEX REPLACE "^.*OpenSSH_[0-9].([0-9]).*$" "\\1" OPENSSH_VERSION_MINOR "${OPENSSH_VERSION_STR}") | ||
| 38 | +- add_definitions(-DOPENSSH_VERSION_MAJOR=${OPENSSH_VERSION_MAJOR} -DOPENSSH_VERSION_MINOR=${OPENSSH_VERSION_MINOR}) | ||
| 39 | +- endif() | ||
| 40 | +- | ||
| 41 | + set(LOCAL_USER "nobody") | ||
| 42 | + set(LOCAL_UID "65533") | ||
| 43 | + find_program(ID_EXECUTABLE NAMES id) | ||
| 44 | +-- | ||
| 45 | +GitLab | ||
| 46 | + | ||
| @@ -1,6 +1,6 @@ | |||
| 1 | Name: libssh | 1 | Name: libssh |
| 2 | Version: 0.10.5 | 2 | Version: 0.10.5 |
| 3 | -Release: 10 | 3 | +Release: 11 |
| 4 | Summary: A library implementing the SSH protocol | 4 | Summary: A library implementing the SSH protocol |
| 5 | License: LGPLv2+ | 5 | License: LGPLv2+ |
| 6 | URL: http://www.libssh.org | 6 | URL: http://www.libssh.org |
| @@ -50,6 +50,8 @@ Patch38: backport-CVE-2026-0964-Reject-invalid-paths-received-through-scp | |||
| 50 | Patch39: backport-CVE-2025-14821-Fix-global-config-location-on-Windows.patch | 50 | Patch39: backport-CVE-2025-14821-Fix-global-config-location-on-Windows.patch |
| 51 | Patch40: backport-CVE-2026-3731-out-of-bound-read-from-sftp-extensions.patch | 51 | Patch40: backport-CVE-2026-3731-out-of-bound-read-from-sftp-extensions.patch |
| 52 | 52 | ||
| 53 | +Patch1000: Fix-multiple-digit-major-version-for-OpenSSH.patch | ||
| 54 | + | ||
| 53 | BuildRequires: cmake gcc-c++ gnupg2 openssl-devel pkgconfig zlib-devel | 55 | BuildRequires: cmake gcc-c++ gnupg2 openssl-devel pkgconfig zlib-devel |
| 54 | BuildRequires: krb5-devel libcmocka-devel openssh-clients openssh-server | 56 | BuildRequires: krb5-devel libcmocka-devel openssh-clients openssh-server |
| 55 | BuildRequires: nmap-ncat | 57 | BuildRequires: nmap-ncat |
| @@ -134,6 +136,13 @@ popd | |||
| 134 | %doc CHANGELOG README | 136 | %doc CHANGELOG README |
| 135 | 137 | ||
| 136 | %changelog | 138 | %changelog |
| 139 | +* Fri Apr 10 2026 Huanyu Li <lihuanyu@cqsoftware.com.cn> - 0.10.5-11 | ||
| 140 | +- Type:bugfix | ||
| 141 | +- Id:NA | ||
| 142 | +- SUG:NA | ||
| 143 | +- DESC:CmakeLists: Fix multiple digit major version for OpenSSH | ||
| 144 | + Backport from upstream commit af10857a | ||
| 145 | + | ||
| 137 | * Tue Mar 10 2026 zhaoheqi <zhaoheqi@xfusion.com> - 0.10.5-10 | 146 | * Tue Mar 10 2026 zhaoheqi <zhaoheqi@xfusion.com> - 0.10.5-10 |
| 138 | - Type:CVE | 147 | - Type:CVE |
| 139 | - Id:NA | 148 | - Id:NA |