!17 [sync] PR-13: Fix CVE-2023-35887

From: @openeuler-sync-bot 
Reviewed-by: @wk333 
Signed-off-by: @wk333
This commit is contained in:
openeuler-ci-bot 2024-01-12 00:50:35 +00:00 committed by Gitee
commit 97c8ac8cb4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 2345 additions and 4 deletions

2338
CVE-2023-35887.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +1,15 @@
Epoch: 1 Epoch: 1
Name: apache-sshd Name: apache-sshd
Version: 2.9.2 Version: 2.9.2
Release: 1 Release: 2
Summary: Apache SSHD Summary: Apache SSHD
License: ASL 2.0 and ISC License: ASL 2.0 and ISC
URL: http://mina.apache.org/sshd-project URL: http://mina.apache.org/sshd-project
Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd-%{version}-src.tar.gz Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd-%{version}-src.tar.gz
Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch
Patch1: apache-sshd-javadoc.patch Patch1: apache-sshd-javadoc.patch
# https://github.com/apache/mina-sshd/commit/c20739b43aab0f7bf2ccad982a6cb37b9d5a8a0b
Patch2: CVE-2023-35887.patch
BuildRequires: maven-local mvn(junit:junit) mvn(net.i2p.crypto:eddsa) mvn(org.apache.ant:ant) BuildRequires: maven-local mvn(junit:junit) mvn(net.i2p.crypto:eddsa) mvn(org.apache.ant:ant)
BuildRequires: mvn(org.apache:apache:pom:) mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache:apache:pom:) mvn(org.apache.felix:maven-bundle-plugin)
@ -32,9 +34,7 @@ Summary: API documentation for %{name}
This package provides %{name}. This package provides %{name}.
%prep %prep
%setup -q %autosetup -p1
%patch0 -p1
%patch1 -p1
rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix
%pom_remove_dep :spring-framework-bom %pom_remove_dep :spring-framework-bom
%pom_remove_dep :testcontainers-bom sshd-sftp sshd-core %pom_remove_dep :testcontainers-bom sshd-sftp sshd-core
@ -71,6 +71,9 @@ rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix
%license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt %license LICENSE.txt NOTICE.txt assembly/src/main/legal/licenses/jbcrypt.txt
%changelog %changelog
* Thu Jan 11 2024 yaoxin <yao_xin001@hoperun.com> - 1:2.9.2-2
- Fix CVE-2023-35887
* Mon Nov 21 2022 liangqifeng <liangqifeng@ncti-gba.cn> - 1:2.9.2-1 * Mon Nov 21 2022 liangqifeng <liangqifeng@ncti-gba.cn> - 1:2.9.2-1
- Fix CVE-2022-45047 - Fix CVE-2022-45047