Sync from SUSE:SLFO:Main jsch-agent-proxy revision c2292706e9eea6876d4e80a52fd43c53

_service

@@ -0,0 +1,13 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/ymnk/jsch-agent-proxy.git</param>
+		<param name="revision">12c3d64fc2b0a4fd37659369edfdee26e48954e2</param>
+		<param name="versionformat">0.0.9</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>

jsch-agent-proxy.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Mar 13 07:30:27 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to 0.0.9
+  * Fixes:
+    + using JNA 4.1.0
+    + The usocket path for ssh-agent should be configurable
+- Fetch sources using source service, since the tag for this
+  version is missing in the git repository.
+
+-------------------------------------------------------------------
+Wed Mar 13 06:16:21 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Do not build the module svnkit-trilead-ssh2 that depends on
+  trilead-ssh2, since it is not strictly needed by anything in
+  our stack. This mitigates bsc#1218198, CVE-2023-48795.
+
 -------------------------------------------------------------------
 Sun Mar 20 15:18:34 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

jsch-agent-proxy.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package jsch-agent-proxy
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,21 @@
 
 
 Name:           jsch-agent-proxy
-Version:        0.0.7
+Version:        0.0.9
 Release:        0
 Summary:        Proxy to ssh-agent and Pageant in Java
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
 URL:            http://www.jcraft.com/jsch-agent-proxy/
-Source0:        https://github.com/ymnk/jsch-agent-proxy/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.xz
 Source1:        %{name}-%{version}-build.tar.xz
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  jna
 BuildRequires:  jna-contrib
 BuildRequires:  jsch
-BuildRequires:  trilead-ssh2
 BuildArch:      noarch
 
 %description
@@ -45,11 +44,6 @@ to other SSH2 implementations in Java.
 %package connector-factory
 Summary:        Connector factory for jsch-agent-proxy
 Group:          Development/Libraries/Java
-Requires:       mvn(com.jcraft:jsch.agentproxy.core) = %{version}
-Requires:       mvn(com.jcraft:jsch.agentproxy.pageant) = %{version}
-Requires:       mvn(com.jcraft:jsch.agentproxy.sshagent) = %{version}
-Requires:       mvn(com.jcraft:jsch.agentproxy.usocket-jna) = %{version}
-Requires:       mvn(com.jcraft:jsch.agentproxy.usocket-nc) = %{version}
 
 %description connector-factory
 %{summary}.
@@ -64,8 +58,6 @@ Group:          Development/Libraries/Java
 %package jsch
 Summary:        JSch connector for jsch-agent-proxy
 Group:          Development/Libraries/Java
-Requires:       mvn(com.jcraft:jsch)
-Requires:       mvn(com.jcraft:jsch.agentproxy.core) = %{version}
 
 %description jsch
 %{summary}.
@@ -73,9 +65,6 @@ Requires:       mvn(com.jcraft:jsch.agentproxy.core) = %{version}
 %package pageant
 Summary:        Pageant connector for jsch-agent-proxy
 Group:          Development/Libraries/Java
-Requires:       mvn(com.jcraft:jsch.agentproxy.core) = %{version}
-Requires:       mvn(net.java.dev.jna:jna)
-Requires:       mvn(net.java.dev.jna:platform)
 
 %description pageant
 %{summary}.
@@ -83,26 +72,13 @@ Requires:       mvn(net.java.dev.jna:platform)
 %package sshagent
 Summary:        ssh-agent connector for jsch-agent-proxy
 Group:          Development/Libraries/Java
-Requires:       mvn(com.jcraft:jsch.agentproxy.core) = %{version}
 
 %description sshagent
 %{summary}.
 
-%package svnkit-trilead-ssh2
-Summary:        trilead-ssh2 connector for jsch-agent-proxy
-Group:          Development/Libraries/Java
-Requires:       mvn(com.jcraft:jsch.agentproxy.core) = %{version}
-Requires:       mvn(com.trilead:trilead-ssh2)
-
-%description svnkit-trilead-ssh2
-%{summary}.
-
 %package usocket-jna
 Summary:        USocketFactory implementation using JNA
 Group:          Development/Libraries/Java
-Requires:       mvn(com.jcraft:jsch.agentproxy.core) = %{version}
-Requires:       mvn(net.java.dev.jna:jna)
-Requires:       mvn(net.java.dev.jna:platform)
 
 %description usocket-jna
 %{summary}.
@@ -117,7 +93,6 @@ Group:          Development/Libraries/Java
 %package        javadoc
 Summary:        API documentation for %{name}
 Group:          Documentation/HTML
-Requires:       mvn(com.jcraft:jsch.agentproxy.core) = %{version}
 
 %description    javadoc
 This package provides %{summary}.
@@ -131,30 +106,22 @@ This package provides %{summary}.
 %pom_xpath_remove pom:build/pom:extensions
 %pom_disable_module jsch-agent-proxy-sshj
 
-for package in connector-factory core jsch pageant sshagent \
-               svnkit-trilead-ssh2 usocket-jna usocket-nc; do
-    %pom_remove_parent %{name}-${package}
-    %pom_xpath_inject pom:project "
-                                <groupId>com.jcraft</groupId>
-                                <version>%{version}</version>" %{name}-${package}
-done
-
 %build
 mkdir lib
-build-jar-repository -s lib jna jna-platform jsch trilead-ssh2
+build-jar-repository -s lib jna jna-platform jsch
 
 %{ant} \
     -Dtest.skip=true \
     package javadoc
 
 %install
-install -dm 0755 %{buildroot}/usr/share/java
+install -dm 0755 %{buildroot}%{_javadir}
 install -dm 0755 %{buildroot}%{_mavenpomdir}
 
 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}/usr/share/java/jsch.agentproxy.${package}.jar
+    install -pm 0644 %{name}-${package}/target/jsch.agentproxy.${package}-%{version}.jar %{buildroot}%{_javadir}/jsch.agentproxy.${package}.jar
-    install -pm 0644 %{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}
 
     # javadoc
@@ -176,8 +143,6 @@ 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