Compare commits

..

No commits in common. "factory" and "factory" have entirely different histories.

3 changed files with 4 additions and 20 deletions

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

Binary file not shown.

View File

@ -1,9 +1,3 @@
-------------------------------------------------------------------
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> Wed Mar 13 07:30:27 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

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