From 94dc684bd3a634b5d268415656ea4439b90fc972e9fd2f4cb245d51d31d8b22b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 12 Jan 2024 12:55:07 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=55 --- eclipse-jgit.spec | 2 +- jgit-apache-sshd-2.7.0.patch | 164 +++++++++++++++++------------------ jgit.spec | 2 +- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index b9bc19b..d6aa867 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -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 diff --git a/jgit-apache-sshd-2.7.0.patch b/jgit-apache-sshd-2.7.0.patch index 8ccbc3f..008b701 100644 --- a/jgit-apache-sshd-2.7.0.patch +++ b/jgit-apache-sshd-2.7.0.patch @@ -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,2.13.0)", ++ org.apache.sshd.common.config.keys;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.file.virtualfs;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.helpers;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.io;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.kex;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.keyprovider;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.session;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.signature;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.buffer;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.logging;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.security;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.threads;version="[2.7.0,2.13.0)", ++ org.apache.sshd.core;version="[2.7.0,2.13.0)", ++ org.apache.sshd.server;version="[2.7.0,2.13.0)", ++ org.apache.sshd.server.auth;version="[2.7.0,2.13.0)", ++ org.apache.sshd.server.auth.gss;version="[2.7.0,2.13.0)", ++ org.apache.sshd.server.auth.keyboard;version="[2.7.0,2.13.0)", ++ org.apache.sshd.server.auth.password;version="[2.7.0,2.13.0)", ++ org.apache.sshd.server.command;version="[2.7.0,2.13.0)", ++ org.apache.sshd.server.session;version="[2.7.0,2.13.0)", ++ org.apache.sshd.server.shell;version="[2.7.0,2.13.0)", ++ org.apache.sshd.server.subsystem;version="[2.7.0,2.13.0)", ++ org.apache.sshd.sftp;version="[2.7.0,2.13.0)", ++ org.apache.sshd.sftp.server;version="[2.7.0,2.13.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,2.13.0)", ++ org.apache.sshd.client;version="[2.7.0,2.13.0)", ++ org.apache.sshd.client.auth;version="[2.7.0,2.13.0)", ++ org.apache.sshd.client.auth.keyboard;version="[2.7.0,2.13.0)", ++ org.apache.sshd.client.auth.password;version="[2.7.0,2.13.0)", ++ org.apache.sshd.client.auth.pubkey;version="[2.7.0,2.13.0)", ++ org.apache.sshd.client.channel;version="[2.7.0,2.13.0)", ++ org.apache.sshd.client.config.hosts;version="[2.7.0,2.13.0)", ++ org.apache.sshd.client.config.keys;version="[2.7.0,2.13.0)", ++ org.apache.sshd.client.future;version="[2.7.0,2.13.0)", ++ org.apache.sshd.client.keyverifier;version="[2.7.0,2.13.0)", ++ org.apache.sshd.client.session;version="[2.7.0,2.13.0)", ++ org.apache.sshd.client.session.forward;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.auth;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.channel;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.compression;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.config.keys;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.config.keys.loader;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.digest;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.forward;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.future;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.helpers;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.io;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.kex;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.keyprovider;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.mac;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.random;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.session;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.session.helpers;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.signature;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.buffer;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.closeable;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.io;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.io.resource;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.logging;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.net;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.security;version="[2.7.0,2.13.0)", ++ org.apache.sshd.core;version="[2.7.0,2.13.0)", ++ org.apache.sshd.server.auth;version="[2.7.0,2.13.0)", ++ org.apache.sshd.sftp;version="[2.7.0,2.13.0)", ++ org.apache.sshd.sftp.client;version="[2.7.0,2.13.0)", ++ org.apache.sshd.sftp.common;version="[2.7.0,2.13.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,2.13.0)", ++ org.apache.sshd.common;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.auth;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.config.keys;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.helpers;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.keyprovider;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.session;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.net;version="[2.7.0,2.13.0)", ++ org.apache.sshd.common.util.security;version="[2.7.0,2.13.0)", ++ org.apache.sshd.core;version="[2.7.0,2.13.0)", ++ org.apache.sshd.server;version="[2.7.0,2.13.0)", ++ org.apache.sshd.server.forward;version="[2.7.0,2.13.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)", diff --git a/jgit.spec b/jgit.spec index 94567e4..24657ef 100644 --- a/jgit.spec +++ b/jgit.spec @@ -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 From 635ac5e7837b81e2809af8643790a1172786043973de53873997ca58d998da44 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 12 Jan 2024 12:58:11 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=56 --- jgit-apache-sshd-2.7.0.patch | 164 +++++++++++++++++------------------ 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/jgit-apache-sshd-2.7.0.patch b/jgit-apache-sshd-2.7.0.patch index 008b701..51d0f97 100644 --- a/jgit-apache-sshd-2.7.0.patch +++ b/jgit-apache-sshd-2.7.0.patch @@ -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.13.0)", -+ org.apache.sshd.common.config.keys;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.file.virtualfs;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.helpers;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.io;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.kex;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.session;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.signature;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.buffer;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.logging;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.security;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.threads;version="[2.7.0,2.13.0)", -+ org.apache.sshd.core;version="[2.7.0,2.13.0)", -+ org.apache.sshd.server;version="[2.7.0,2.13.0)", -+ org.apache.sshd.server.auth;version="[2.7.0,2.13.0)", -+ org.apache.sshd.server.auth.gss;version="[2.7.0,2.13.0)", -+ org.apache.sshd.server.auth.keyboard;version="[2.7.0,2.13.0)", -+ org.apache.sshd.server.auth.password;version="[2.7.0,2.13.0)", -+ org.apache.sshd.server.command;version="[2.7.0,2.13.0)", -+ org.apache.sshd.server.session;version="[2.7.0,2.13.0)", -+ org.apache.sshd.server.shell;version="[2.7.0,2.13.0)", -+ org.apache.sshd.server.subsystem;version="[2.7.0,2.13.0)", -+ org.apache.sshd.sftp;version="[2.7.0,2.13.0)", -+ org.apache.sshd.sftp.server;version="[2.7.0,2.13.0)", ++Import-Package: org.apache.sshd.common", ++ org.apache.sshd.common.config.keys", ++ org.apache.sshd.common.file.virtualfs", ++ org.apache.sshd.common.helpers", ++ org.apache.sshd.common.io", ++ org.apache.sshd.common.kex", ++ org.apache.sshd.common.keyprovider", ++ org.apache.sshd.common.session", ++ org.apache.sshd.common.signature", ++ org.apache.sshd.common.util.buffer", ++ org.apache.sshd.common.util.logging", ++ org.apache.sshd.common.util.security", ++ org.apache.sshd.common.util.threads", ++ org.apache.sshd.core", ++ org.apache.sshd.server", ++ org.apache.sshd.server.auth", ++ org.apache.sshd.server.auth.gss", ++ org.apache.sshd.server.auth.keyboard", ++ org.apache.sshd.server.auth.password", ++ org.apache.sshd.server.command", ++ org.apache.sshd.server.session", ++ org.apache.sshd.server.shell", ++ org.apache.sshd.server.subsystem", ++ org.apache.sshd.sftp", ++ org.apache.sshd.sftp.server", 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.13.0)", -+ org.apache.sshd.client;version="[2.7.0,2.13.0)", -+ org.apache.sshd.client.auth;version="[2.7.0,2.13.0)", -+ org.apache.sshd.client.auth.keyboard;version="[2.7.0,2.13.0)", -+ org.apache.sshd.client.auth.password;version="[2.7.0,2.13.0)", -+ org.apache.sshd.client.auth.pubkey;version="[2.7.0,2.13.0)", -+ org.apache.sshd.client.channel;version="[2.7.0,2.13.0)", -+ org.apache.sshd.client.config.hosts;version="[2.7.0,2.13.0)", -+ org.apache.sshd.client.config.keys;version="[2.7.0,2.13.0)", -+ org.apache.sshd.client.future;version="[2.7.0,2.13.0)", -+ org.apache.sshd.client.keyverifier;version="[2.7.0,2.13.0)", -+ org.apache.sshd.client.session;version="[2.7.0,2.13.0)", -+ org.apache.sshd.client.session.forward;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.auth;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.channel;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.compression;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.config.keys;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.config.keys.loader;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.digest;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.forward;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.future;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.helpers;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.io;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.kex;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.mac;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.random;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.session;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.session.helpers;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.signature;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.buffer;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.closeable;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.io;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.io.resource;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.logging;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.net;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.security;version="[2.7.0,2.13.0)", -+ org.apache.sshd.core;version="[2.7.0,2.13.0)", -+ org.apache.sshd.server.auth;version="[2.7.0,2.13.0)", -+ org.apache.sshd.sftp;version="[2.7.0,2.13.0)", -+ org.apache.sshd.sftp.client;version="[2.7.0,2.13.0)", -+ org.apache.sshd.sftp.common;version="[2.7.0,2.13.0)", ++ org.apache.sshd.agent", ++ org.apache.sshd.client", ++ org.apache.sshd.client.auth", ++ org.apache.sshd.client.auth.keyboard", ++ org.apache.sshd.client.auth.password", ++ org.apache.sshd.client.auth.pubkey", ++ org.apache.sshd.client.channel", ++ org.apache.sshd.client.config.hosts", ++ org.apache.sshd.client.config.keys", ++ org.apache.sshd.client.future", ++ org.apache.sshd.client.keyverifier", ++ org.apache.sshd.client.session", ++ org.apache.sshd.client.session.forward", ++ org.apache.sshd.common", ++ org.apache.sshd.common.auth", ++ org.apache.sshd.common.channel", ++ org.apache.sshd.common.compression", ++ org.apache.sshd.common.config.keys", ++ org.apache.sshd.common.config.keys.loader", ++ org.apache.sshd.common.config.keys.loader.openssh.kdf", ++ org.apache.sshd.common.digest", ++ org.apache.sshd.common.forward", ++ org.apache.sshd.common.future", ++ org.apache.sshd.common.helpers", ++ org.apache.sshd.common.io", ++ org.apache.sshd.common.kex", ++ org.apache.sshd.common.keyprovider", ++ org.apache.sshd.common.mac", ++ org.apache.sshd.common.random", ++ org.apache.sshd.common.session", ++ org.apache.sshd.common.session.helpers", ++ org.apache.sshd.common.signature", ++ org.apache.sshd.common.util", ++ org.apache.sshd.common.util.buffer", ++ org.apache.sshd.common.util.closeable", ++ org.apache.sshd.common.util.io", ++ org.apache.sshd.common.util.io.resource", ++ org.apache.sshd.common.util.logging", ++ org.apache.sshd.common.util.net", ++ org.apache.sshd.common.util.security", ++ org.apache.sshd.core", ++ org.apache.sshd.server.auth", ++ org.apache.sshd.sftp", ++ org.apache.sshd.sftp.client", ++ org.apache.sshd.sftp.common", 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.13.0)", -+ org.apache.sshd.common;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.auth;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.config.keys;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.helpers;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.keyprovider;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.session;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.net;version="[2.7.0,2.13.0)", -+ org.apache.sshd.common.util.security;version="[2.7.0,2.13.0)", -+ org.apache.sshd.core;version="[2.7.0,2.13.0)", -+ org.apache.sshd.server;version="[2.7.0,2.13.0)", -+ org.apache.sshd.server.forward;version="[2.7.0,2.13.0)", ++Import-Package: org.apache.sshd.client.config.hosts", ++ org.apache.sshd.common", ++ org.apache.sshd.common.auth", ++ org.apache.sshd.common.config.keys", ++ org.apache.sshd.common.helpers", ++ org.apache.sshd.common.keyprovider", ++ org.apache.sshd.common.session", ++ org.apache.sshd.common.util.net", ++ org.apache.sshd.common.util.security", ++ org.apache.sshd.core", ++ org.apache.sshd.server", ++ org.apache.sshd.server.forward", 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)", From 2bba3b69cb427f960b6aa0c513d19f947fc367738740761b9c2e36c04ef1d3c3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 12 Jan 2024 13:59:10 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=57 --- jgit-apache-sshd-2.7.0.patch | 164 +++++++++++++++++------------------ 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/jgit-apache-sshd-2.7.0.patch b/jgit-apache-sshd-2.7.0.patch index 51d0f97..46df517 100644 --- a/jgit-apache-sshd-2.7.0.patch +++ b/jgit-apache-sshd-2.7.0.patch @@ -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", -+ org.apache.sshd.common.config.keys", -+ org.apache.sshd.common.file.virtualfs", -+ org.apache.sshd.common.helpers", -+ org.apache.sshd.common.io", -+ org.apache.sshd.common.kex", -+ org.apache.sshd.common.keyprovider", -+ org.apache.sshd.common.session", -+ org.apache.sshd.common.signature", -+ org.apache.sshd.common.util.buffer", -+ org.apache.sshd.common.util.logging", -+ org.apache.sshd.common.util.security", -+ org.apache.sshd.common.util.threads", -+ org.apache.sshd.core", -+ org.apache.sshd.server", -+ org.apache.sshd.server.auth", -+ org.apache.sshd.server.auth.gss", -+ org.apache.sshd.server.auth.keyboard", -+ org.apache.sshd.server.auth.password", -+ org.apache.sshd.server.command", -+ org.apache.sshd.server.session", -+ org.apache.sshd.server.shell", -+ org.apache.sshd.server.subsystem", -+ org.apache.sshd.sftp", -+ org.apache.sshd.sftp.server", ++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", -+ org.apache.sshd.client", -+ org.apache.sshd.client.auth", -+ org.apache.sshd.client.auth.keyboard", -+ org.apache.sshd.client.auth.password", -+ org.apache.sshd.client.auth.pubkey", -+ org.apache.sshd.client.channel", -+ org.apache.sshd.client.config.hosts", -+ org.apache.sshd.client.config.keys", -+ org.apache.sshd.client.future", -+ org.apache.sshd.client.keyverifier", -+ org.apache.sshd.client.session", -+ org.apache.sshd.client.session.forward", -+ org.apache.sshd.common", -+ org.apache.sshd.common.auth", -+ org.apache.sshd.common.channel", -+ org.apache.sshd.common.compression", -+ org.apache.sshd.common.config.keys", -+ org.apache.sshd.common.config.keys.loader", -+ org.apache.sshd.common.config.keys.loader.openssh.kdf", -+ org.apache.sshd.common.digest", -+ org.apache.sshd.common.forward", -+ org.apache.sshd.common.future", -+ org.apache.sshd.common.helpers", -+ org.apache.sshd.common.io", -+ org.apache.sshd.common.kex", -+ org.apache.sshd.common.keyprovider", -+ org.apache.sshd.common.mac", -+ org.apache.sshd.common.random", -+ org.apache.sshd.common.session", -+ org.apache.sshd.common.session.helpers", -+ org.apache.sshd.common.signature", -+ org.apache.sshd.common.util", -+ org.apache.sshd.common.util.buffer", -+ org.apache.sshd.common.util.closeable", -+ org.apache.sshd.common.util.io", -+ org.apache.sshd.common.util.io.resource", -+ org.apache.sshd.common.util.logging", -+ org.apache.sshd.common.util.net", -+ org.apache.sshd.common.util.security", -+ org.apache.sshd.core", -+ org.apache.sshd.server.auth", -+ org.apache.sshd.sftp", -+ org.apache.sshd.sftp.client", -+ org.apache.sshd.sftp.common", ++ 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", -+ org.apache.sshd.common", -+ org.apache.sshd.common.auth", -+ org.apache.sshd.common.config.keys", -+ org.apache.sshd.common.helpers", -+ org.apache.sshd.common.keyprovider", -+ org.apache.sshd.common.session", -+ org.apache.sshd.common.util.net", -+ org.apache.sshd.common.util.security", -+ org.apache.sshd.core", -+ org.apache.sshd.server", -+ org.apache.sshd.server.forward", ++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)", From ea777b069a3435f34b125adc907fc68ce8c86d7a6aa7db93fa2c925d6eb3fde8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 12 Jan 2024 15:28:17 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=58 --- eclipse-jgit.changes | 7 +++++++ eclipse-jgit.spec | 2 +- jgit-apache-sshd-2.7.0.patch => jgit-apache-sshd.patch | 0 jgit.changes | 7 +++++++ jgit.spec | 2 +- 5 files changed, 16 insertions(+), 2 deletions(-) rename jgit-apache-sshd-2.7.0.patch => jgit-apache-sshd.patch (100%) diff --git a/eclipse-jgit.changes b/eclipse-jgit.changes index 12951de..834463d 100644 --- a/eclipse-jgit.changes +++ b/eclipse-jgit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 12 15:25:10 UTC 2024 - Fridrich Strba + +- 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 diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index d6aa867..8c77336 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -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 diff --git a/jgit-apache-sshd-2.7.0.patch b/jgit-apache-sshd.patch similarity index 100% rename from jgit-apache-sshd-2.7.0.patch rename to jgit-apache-sshd.patch diff --git a/jgit.changes b/jgit.changes index 12951de..834463d 100644 --- a/jgit.changes +++ b/jgit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 12 15:25:10 UTC 2024 - Fridrich Strba + +- 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 diff --git a/jgit.spec b/jgit.spec index 24657ef..faad517 100644 --- a/jgit.spec +++ b/jgit.spec @@ -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