diff --git a/eclipse-jgit.changes b/eclipse-jgit.changes index d3163c8..5944968 100644 --- a/eclipse-jgit.changes +++ b/eclipse-jgit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 4 21:23:22 UTC 2024 - Fridrich Strba + +- Added patch: + * jgit-bc-179.patch + + Allow building against bouncycastle 1.79 + ------------------------------------------------------------------- Thu May 23 14:19:57 UTC 2024 - Fridrich Strba diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index dd5620d..fb6ff19 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -37,6 +37,7 @@ Patch3: jgit-5.11.0-java8.patch Patch4: jgit-apache-sshd.patch Patch5: jgit-jsch.patch Patch6: jgit-CVE-2023-4759.patch +Patch7: jgit-bc-179.patch # For main build BuildRequires: ant BuildRequires: apache-commons-compress @@ -97,6 +98,7 @@ A pure Java implementation of the Git version control system. %patch -P 4 -p1 %patch -P 5 -p1 %patch -P 6 -p1 +%patch -P 7 -p1 # Disable multithreaded build rm .mvn/maven.config diff --git a/jgit-bc-179.patch b/jgit-bc-179.patch new file mode 100644 index 0000000..bcee80c --- /dev/null +++ b/jgit-bc-179.patch @@ -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 diff --git a/jgit.changes b/jgit.changes index d3163c8..5944968 100644 --- a/jgit.changes +++ b/jgit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 4 21:23:22 UTC 2024 - Fridrich Strba + +- Added patch: + * jgit-bc-179.patch + + Allow building against bouncycastle 1.79 + ------------------------------------------------------------------- Thu May 23 14:19:57 UTC 2024 - Fridrich Strba diff --git a/jgit.spec b/jgit.spec index b749b33..9fc5fc5 100644 --- a/jgit.spec +++ b/jgit.spec @@ -37,6 +37,7 @@ Patch3: jgit-5.11.0-java8.patch Patch4: jgit-apache-sshd.patch Patch5: jgit-jsch.patch Patch6: jgit-CVE-2023-4759.patch +Patch7: jgit-bc-179.patch # For main build BuildRequires: ant BuildRequires: fdupes @@ -106,6 +107,7 @@ Group: Documentation/HTML %patch -P 4 -p1 %patch -P 5 -p1 %patch -P 6 -p1 +%patch -P 7 -p1 # Disable multithreaded build rm .mvn/maven.config