Accepting request 1219256 from Java:packages

Build again the svnkit-trilead-ssh2 module

OBS-URL: https://build.opensuse.org/request/show/1219256
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jsch-agent-proxy?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2024-10-31 15:08:52 +00:00 committed by Git OBS Bridge
commit 3fd360d2d7
3 changed files with 20 additions and 4 deletions

BIN
jsch-agent-proxy-0.0.9-build.tar.xz (Stored with Git LFS)

Binary file not shown.

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 30 04:56:32 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Re-add trilead-ssh2 dependency, since the bsc#1218198,
CVE-2023-48795 has been fixed
-------------------------------------------------------------------
Wed Mar 13 07:30:27 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -32,6 +32,7 @@ BuildRequires: javapackages-local >= 6
BuildRequires: jna
BuildRequires: jna-contrib
BuildRequires: jsch
BuildRequires: trilead-ssh2
BuildArch: noarch
%description
@ -76,6 +77,13 @@ Group: Development/Libraries/Java
%description sshagent
%{summary}.
%package svnkit-trilead-ssh2
Summary: trilead-ssh2 connector for jsch-agent-proxy
Group: Development/Libraries/Java
%description svnkit-trilead-ssh2
%{summary}.
%package usocket-jna
Summary: USocketFactory implementation using JNA
Group: Development/Libraries/Java
@ -108,7 +116,7 @@ This package provides %{summary}.
%build
mkdir lib
build-jar-repository -s lib jna jna-platform jsch
build-jar-repository -s lib jna jna-platform jsch trilead-ssh2
%{ant} \
-Dtest.skip=true \
@ -119,7 +127,7 @@ install -dm 0755 %{buildroot}%{_javadir}
install -dm 0755 %{buildroot}%{_mavenpomdir}
for package in connector-factory core jsch pageant sshagent \
usocket-jna usocket-nc; do
svnkit-trilead-ssh2 usocket-jna usocket-nc; do
install -pm 0644 %{name}-${package}/target/jsch.agentproxy.${package}-%{version}.jar %{buildroot}%{_javadir}/jsch.agentproxy.${package}.jar
%{mvn_install_pom} %{name}-${package}/pom.xml %{buildroot}%{_mavenpomdir}/jsch.agentproxy.${package}.pom
%add_maven_depmap jsch.agentproxy.${package}.pom jsch.agentproxy.${package}.jar -f ${package}
@ -143,6 +151,8 @@ done
%files sshagent -f .mfiles-sshagent
%files svnkit-trilead-ssh2 -f .mfiles-svnkit-trilead-ssh2
%files usocket-jna -f .mfiles-usocket-jna
%files usocket-nc -f .mfiles-usocket-nc