pool/eclipse-jgit
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1036206 from Java:packages

Browse Source 
Allow building against apache-sshd until/including 2.9.x

OBS-URL: https://build.opensuse.org/request/show/1036206
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eclipse-jgit?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2022-11-16 14:44:11 +00:00 committed by Git OBS Bridge
commit 2968071793
3 changed files with 96 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eclipse-jgit.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 16 11:24:53 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* jgit-apache-sshd-2.7.0.patch
+ Allow building against apache-sshd 2.8.x and 2.9.x
-------------------------------------------------------------------
Tue Mar 29 14:06:34 UTC 2022 - Fridrich Strba <fstrba@suse.com>

164
jgit-apache-sshd-2.7.0.patch
View File

@ -30,31 +30,31 @@ diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.junit.ssh/META-INF/MANI
- org.apache.sshd.server.subsystem;version="[2.6.0,2.7.0)",
- org.apache.sshd.sftp;version="[2.6.0,2.7.0)",
- org.apache.sshd.sftp.server;version="[2.6.0,2.7.0)",
+Import-Package: org.apache.sshd.common;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.file.virtualfs;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.io;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.kex;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.session;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.signature;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.buffer;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.logging;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.threads;version="[2.7.0,2.8.0)",
+ org.apache.sshd.core;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.auth;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.auth.gss;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.auth.keyboard;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.auth.password;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.command;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.session;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.shell;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.subsystem;version="[2.7.0,2.8.0)",
+ org.apache.sshd.sftp;version="[2.7.0,2.8.0)",
+ org.apache.sshd.sftp.server;version="[2.7.0,2.8.0)",
+Import-Package: org.apache.sshd.common;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.file.virtualfs;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.io;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.kex;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.session;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.signature;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.buffer;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.logging;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.threads;version="[2.7.0,2.10.0)",
+ org.apache.sshd.core;version="[2.7.0,2.10.0)",
+ org.apache.sshd.server;version="[2.7.0,2.10.0)",
+ org.apache.sshd.server.auth;version="[2.7.0,2.10.0)",
+ org.apache.sshd.server.auth.gss;version="[2.7.0,2.10.0)",
+ org.apache.sshd.server.auth.keyboard;version="[2.7.0,2.10.0)",
+ org.apache.sshd.server.auth.password;version="[2.7.0,2.10.0)",
+ org.apache.sshd.server.command;version="[2.7.0,2.10.0)",
+ org.apache.sshd.server.session;version="[2.7.0,2.10.0)",
+ org.apache.sshd.server.shell;version="[2.7.0,2.10.0)",
+ org.apache.sshd.server.subsystem;version="[2.7.0,2.10.0)",
+ org.apache.sshd.sftp;version="[2.7.0,2.10.0)",
+ org.apache.sshd.sftp.server;version="[2.7.0,2.10.0)",
org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)",
org.eclipse.jgit.api;version="[5.11.0,5.12.0)",
org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)",
@ -110,51 +110,51 @@ diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache/META-INF/MAN
- org.apache.sshd.sftp;version="[2.6.0,2.7.0)",
- org.apache.sshd.sftp.client;version="[2.6.0,2.7.0)",
- org.apache.sshd.sftp.common;version="[2.6.0,2.7.0)",
+ org.apache.sshd.agent;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.auth;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.auth.keyboard;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.auth.password;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.auth.pubkey;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.channel;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.config.keys;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.future;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.keyverifier;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.session;version="[2.7.0,2.8.0)",
+ org.apache.sshd.client.session.forward;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.auth;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.channel;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.compression;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.config.keys.loader;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.digest;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.forward;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.future;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.io;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.kex;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.mac;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.random;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.session;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.session.helpers;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.signature;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.buffer;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.closeable;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.io;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.io.resource;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.logging;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.net;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)",
+ org.apache.sshd.core;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.auth;version="[2.7.0,2.8.0)",
+ org.apache.sshd.sftp;version="[2.7.0,2.8.0)",
+ org.apache.sshd.sftp.client;version="[2.7.0,2.8.0)",
+ org.apache.sshd.sftp.common;version="[2.7.0,2.8.0)",
+ org.apache.sshd.agent;version="[2.7.0,2.10.0)",
+ org.apache.sshd.client;version="[2.7.0,2.10.0)",
+ org.apache.sshd.client.auth;version="[2.7.0,2.10.0)",
+ org.apache.sshd.client.auth.keyboard;version="[2.7.0,2.10.0)",
+ org.apache.sshd.client.auth.password;version="[2.7.0,2.10.0)",
+ org.apache.sshd.client.auth.pubkey;version="[2.7.0,2.10.0)",
+ org.apache.sshd.client.channel;version="[2.7.0,2.10.0)",
+ org.apache.sshd.client.config.hosts;version="[2.7.0,2.10.0)",
+ org.apache.sshd.client.config.keys;version="[2.7.0,2.10.0)",
+ org.apache.sshd.client.future;version="[2.7.0,2.10.0)",
+ org.apache.sshd.client.keyverifier;version="[2.7.0,2.10.0)",
+ org.apache.sshd.client.session;version="[2.7.0,2.10.0)",
+ org.apache.sshd.client.session.forward;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.auth;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.channel;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.compression;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.config.keys.loader;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.digest;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.forward;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.future;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.io;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.kex;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.mac;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.random;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.session;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.session.helpers;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.signature;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.buffer;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.closeable;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.io;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.io.resource;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.logging;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.net;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,2.10.0)",
+ org.apache.sshd.core;version="[2.7.0,2.10.0)",
+ org.apache.sshd.server.auth;version="[2.7.0,2.10.0)",
+ org.apache.sshd.sftp;version="[2.7.0,2.10.0)",
+ org.apache.sshd.sftp.client;version="[2.7.0,2.10.0)",
+ org.apache.sshd.sftp.common;version="[2.7.0,2.10.0)",
org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)",
org.eclipse.jgit.errors;version="[5.11.0,5.12.0)",
org.eclipse.jgit.fnmatch;version="[5.11.0,5.12.0)",
@ -216,18 +216,18 @@ diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache.test/META-IN
- org.apache.sshd.core;version="[2.6.0,2.7.0)",
- org.apache.sshd.server;version="[2.6.0,2.7.0)",
- org.apache.sshd.server.forward;version="[2.6.0,2.7.0)",
+Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.auth;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.session;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.net;version="[2.7.0,2.8.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)",
+ org.apache.sshd.core;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server;version="[2.7.0,2.8.0)",
+ org.apache.sshd.server.forward;version="[2.7.0,2.8.0)",
+Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.auth;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.session;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.net;version="[2.7.0,2.10.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,2.10.0)",
+ org.apache.sshd.core;version="[2.7.0,2.10.0)",
+ org.apache.sshd.server;version="[2.7.0,2.10.0)",
+ org.apache.sshd.server.forward;version="[2.7.0,2.10.0)",
org.eclipse.jgit.api;version="[5.11.0,5.12.0)",
org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)",
org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.11.0,5.12.0)",

7
jgit.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 16 11:24:53 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* jgit-apache-sshd-2.7.0.patch
+ Allow building against apache-sshd 2.8.x and 2.9.x
-------------------------------------------------------------------
Fri Jul 30 12:24:56 UTC 2021 - Fridrich Strba <fstrba@suse.com>