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

Accepting request 1221259 from Java:packages

Browse Source 
fix build with newer bouncycastle

OBS-URL: https://build.opensuse.org/request/show/1221259
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eclipse-jgit?expand=0&rev=21
This commit is contained in:
Ana Guerrero 2024-11-05 14:41:12 +00:00 committed by Git OBS Bridge
commit 9dcdefc93d
5 changed files with 34 additions and 0 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 @@
-------------------------------------------------------------------
Mon Nov 4 21:23:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* jgit-bc-179.patch
+ Allow building against bouncycastle 1.79
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 23 14:19:57 UTC 2024 - Fridrich Strba <fstrba@suse.com> Thu May 23 14:19:57 UTC 2024 - Fridrich Strba <fstrba@suse.com>

2
eclipse-jgit.spec
View File

@ -37,6 +37,7 @@ Patch3: jgit-5.11.0-java8.patch
Patch4: jgit-apache-sshd.patch Patch4: jgit-apache-sshd.patch
Patch5: jgit-jsch.patch Patch5: jgit-jsch.patch
Patch6: jgit-CVE-2023-4759.patch Patch6: jgit-CVE-2023-4759.patch
Patch7: jgit-bc-179.patch
# For main build # For main build
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-compress BuildRequires: apache-commons-compress
@ -97,6 +98,7 @@ A pure Java implementation of the Git version control system.
%patch -P 4 -p1 %patch -P 4 -p1
%patch -P 5 -p1 %patch -P 5 -p1
%patch -P 6 -p1 %patch -P 6 -p1
%patch -P 7 -p1
# Disable multithreaded build # Disable multithreaded build
rm .mvn/maven.config rm .mvn/maven.config

16
jgit-bc-179.patch Normal file
View File

@ -0,0 +1,16 @@
--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java 2024-11-04 21:53:31.607619683 +0100
+++ jgit-5.11.0.202103091610-r/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java 2024-11-04 22:13:28.412238521 +0100
@@ -116,6 +116,12 @@
}
}
}
+
+ public byte[] recoverKeyData(int encAlgorithm, int aeadAlgorithm,
+ byte[] s2kKey, byte[] iv, int packetTag, int keyVersion,
+ byte[] keyData, byte[] pubkeyData) throws PGPException {
+ throw new PGPException("Unimplemented method");
+ }
};
}
}
\ No newline at end of file

7
jgit.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Nov 4 21:23:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* jgit-bc-179.patch
+ Allow building against bouncycastle 1.79
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 23 14:19:57 UTC 2024 - Fridrich Strba <fstrba@suse.com> Thu May 23 14:19:57 UTC 2024 - Fridrich Strba <fstrba@suse.com>

2
jgit.spec
View File

@ -37,6 +37,7 @@ Patch3: jgit-5.11.0-java8.patch
Patch4: jgit-apache-sshd.patch Patch4: jgit-apache-sshd.patch
Patch5: jgit-jsch.patch Patch5: jgit-jsch.patch
Patch6: jgit-CVE-2023-4759.patch Patch6: jgit-CVE-2023-4759.patch
Patch7: jgit-bc-179.patch
# For main build # For main build
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
@ -106,6 +107,7 @@ Group: Documentation/HTML
%patch -P 4 -p1 %patch -P 4 -p1
%patch -P 5 -p1 %patch -P 5 -p1
%patch -P 6 -p1 %patch -P 6 -p1
%patch -P 7 -p1
# Disable multithreaded build # Disable multithreaded build
rm .mvn/maven.config rm .mvn/maven.config