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

Accepting request 1138347 from Java:packages

Browse Source 
prepare build against apache-sshd 2.12+ that will have security fixes

OBS-URL: https://build.opensuse.org/request/show/1138347
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eclipse-jgit?expand=0&rev=16
This commit is contained in:
Ana Guerrero 2024-01-12 22:46:42 +00:00 committed by Git OBS Bridge
commit 0bb4316e0f
5 changed files with 100 additions and 86 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 @@
-------------------------------------------------------------------
Fri Jan 12 15:25:10 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* jgit-apache-sshd-2.7.0.patch -> jgit-apache-sshd.patch
+ rename patch and make it accept apache-ssd < 3.0.0
-------------------------------------------------------------------
Wed Oct 11 08:47:23 UTC 2023 - Fridrich Strba <fstrba@suse.com>

4
eclipse-jgit.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package eclipse-jgit
#
# Copyright (c) 2023 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
@ -34,7 +34,7 @@ Source0: https://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{gittag}.
Patch1: 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch
Patch2: jgit-shade.patch
Patch3: jgit-5.11.0-java8.patch
Patch4: jgit-apache-sshd-2.7.0.patch
Patch4: jgit-apache-sshd.patch
Patch5: jgit-jsch.patch
Patch6: jgit-CVE-2023-4759.patch
# For main build

164
jgit-apache-sshd-2.7.0.patch → jgit-apache-sshd.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.11.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.file.virtualfs;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.io;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.kex;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.session;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.signature;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.buffer;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.logging;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.threads;version="[2.7.0,2.11.0)",
+ org.apache.sshd.core;version="[2.7.0,2.11.0)",
+ org.apache.sshd.server;version="[2.7.0,2.11.0)",
+ org.apache.sshd.server.auth;version="[2.7.0,2.11.0)",
+ org.apache.sshd.server.auth.gss;version="[2.7.0,2.11.0)",
+ org.apache.sshd.server.auth.keyboard;version="[2.7.0,2.11.0)",
+ org.apache.sshd.server.auth.password;version="[2.7.0,2.11.0)",
+ org.apache.sshd.server.command;version="[2.7.0,2.11.0)",
+ org.apache.sshd.server.session;version="[2.7.0,2.11.0)",
+ org.apache.sshd.server.shell;version="[2.7.0,2.11.0)",
+ org.apache.sshd.server.subsystem;version="[2.7.0,2.11.0)",
+ org.apache.sshd.sftp;version="[2.7.0,2.11.0)",
+ org.apache.sshd.sftp.server;version="[2.7.0,2.11.0)",
+Import-Package: org.apache.sshd.common;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.file.virtualfs;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.io;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.kex;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.session;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.signature;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.buffer;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.logging;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.threads;version="[2.7.0,3.0.0)",
+ org.apache.sshd.core;version="[2.7.0,3.0.0)",
+ org.apache.sshd.server;version="[2.7.0,3.0.0)",
+ org.apache.sshd.server.auth;version="[2.7.0,3.0.0)",
+ org.apache.sshd.server.auth.gss;version="[2.7.0,3.0.0)",
+ org.apache.sshd.server.auth.keyboard;version="[2.7.0,3.0.0)",
+ org.apache.sshd.server.auth.password;version="[2.7.0,3.0.0)",
+ org.apache.sshd.server.command;version="[2.7.0,3.0.0)",
+ org.apache.sshd.server.session;version="[2.7.0,3.0.0)",
+ org.apache.sshd.server.shell;version="[2.7.0,3.0.0)",
+ org.apache.sshd.server.subsystem;version="[2.7.0,3.0.0)",
+ org.apache.sshd.sftp;version="[2.7.0,3.0.0)",
+ org.apache.sshd.sftp.server;version="[2.7.0,3.0.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.11.0)",
+ org.apache.sshd.client;version="[2.7.0,2.11.0)",
+ org.apache.sshd.client.auth;version="[2.7.0,2.11.0)",
+ org.apache.sshd.client.auth.keyboard;version="[2.7.0,2.11.0)",
+ org.apache.sshd.client.auth.password;version="[2.7.0,2.11.0)",
+ org.apache.sshd.client.auth.pubkey;version="[2.7.0,2.11.0)",
+ org.apache.sshd.client.channel;version="[2.7.0,2.11.0)",
+ org.apache.sshd.client.config.hosts;version="[2.7.0,2.11.0)",
+ org.apache.sshd.client.config.keys;version="[2.7.0,2.11.0)",
+ org.apache.sshd.client.future;version="[2.7.0,2.11.0)",
+ org.apache.sshd.client.keyverifier;version="[2.7.0,2.11.0)",
+ org.apache.sshd.client.session;version="[2.7.0,2.11.0)",
+ org.apache.sshd.client.session.forward;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.auth;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.channel;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.compression;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.config.keys.loader;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.digest;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.forward;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.future;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.io;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.kex;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.mac;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.random;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.session;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.session.helpers;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.signature;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.buffer;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.closeable;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.io;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.io.resource;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.logging;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.net;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,2.11.0)",
+ org.apache.sshd.core;version="[2.7.0,2.11.0)",
+ org.apache.sshd.server.auth;version="[2.7.0,2.11.0)",
+ org.apache.sshd.sftp;version="[2.7.0,2.11.0)",
+ org.apache.sshd.sftp.client;version="[2.7.0,2.11.0)",
+ org.apache.sshd.sftp.common;version="[2.7.0,2.11.0)",
+ org.apache.sshd.agent;version="[2.7.0,3.0.0)",
+ org.apache.sshd.client;version="[2.7.0,3.0.0)",
+ org.apache.sshd.client.auth;version="[2.7.0,3.0.0)",
+ org.apache.sshd.client.auth.keyboard;version="[2.7.0,3.0.0)",
+ org.apache.sshd.client.auth.password;version="[2.7.0,3.0.0)",
+ org.apache.sshd.client.auth.pubkey;version="[2.7.0,3.0.0)",
+ org.apache.sshd.client.channel;version="[2.7.0,3.0.0)",
+ org.apache.sshd.client.config.hosts;version="[2.7.0,3.0.0)",
+ org.apache.sshd.client.config.keys;version="[2.7.0,3.0.0)",
+ org.apache.sshd.client.future;version="[2.7.0,3.0.0)",
+ org.apache.sshd.client.keyverifier;version="[2.7.0,3.0.0)",
+ org.apache.sshd.client.session;version="[2.7.0,3.0.0)",
+ org.apache.sshd.client.session.forward;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.auth;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.channel;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.compression;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.config.keys.loader;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.digest;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.forward;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.future;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.io;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.kex;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.mac;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.random;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.session;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.session.helpers;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.signature;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.buffer;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.closeable;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.io;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.io.resource;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.logging;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.net;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,3.0.0)",
+ org.apache.sshd.core;version="[2.7.0,3.0.0)",
+ org.apache.sshd.server.auth;version="[2.7.0,3.0.0)",
+ org.apache.sshd.sftp;version="[2.7.0,3.0.0)",
+ org.apache.sshd.sftp.client;version="[2.7.0,3.0.0)",
+ org.apache.sshd.sftp.common;version="[2.7.0,3.0.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.11.0)",
+ org.apache.sshd.common;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.auth;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.session;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.net;version="[2.7.0,2.11.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,2.11.0)",
+ org.apache.sshd.core;version="[2.7.0,2.11.0)",
+ org.apache.sshd.server;version="[2.7.0,2.11.0)",
+ org.apache.sshd.server.forward;version="[2.7.0,2.11.0)",
+Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.auth;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.config.keys;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.helpers;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.keyprovider;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.session;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.net;version="[2.7.0,3.0.0)",
+ org.apache.sshd.common.util.security;version="[2.7.0,3.0.0)",
+ org.apache.sshd.core;version="[2.7.0,3.0.0)",
+ org.apache.sshd.server;version="[2.7.0,3.0.0)",
+ org.apache.sshd.server.forward;version="[2.7.0,3.0.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 @@
-------------------------------------------------------------------
Fri Jan 12 15:25:10 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* jgit-apache-sshd-2.7.0.patch -> jgit-apache-sshd.patch
+ rename patch and make it accept apache-ssd < 3.0.0
-------------------------------------------------------------------
Wed Oct 11 08:47:23 UTC 2023 - Fridrich Strba <fstrba@suse.com>

4
jgit.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package jgit
#
# Copyright (c) 2023 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
@ -34,7 +34,7 @@ Source0: https://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{gittag}.
Patch1: 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch
Patch2: jgit-shade.patch
Patch3: jgit-5.11.0-java8.patch
Patch4: jgit-apache-sshd-2.7.0.patch
Patch4: jgit-apache-sshd.patch
Patch5: jgit-jsch.patch
Patch6: jgit-CVE-2023-4759.patch
# For main build