rpm/eclipse-jgit
SHA256
1
0
Fork 0
forked from pool/eclipse-jgit
Code Pull Requests Activity

Compare commits

merge into: rpm:factory
Branches Tags
rpm:factory pool:factory pool:devel
...
pull from: pool:factory
Branches Tags
pool:factory pool:devel rpm:factory

6 Commits
factory ... factory

Author SHA256 Message Date
Ana Guerrero
f56cb614fe Accepting request 1226464 from Java:packages 
Allow building against servlet api 4

OBS-URL: https://build.opensuse.org/request/show/1226464
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eclipse-jgit?expand=0&rev=22
 2024-11-26 19:56:19 +00:00
Fridrich Strba
2aa90e4c7a OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=74 2024-11-11 17:42:00 +00:00
Fridrich Strba
c6144e1960 OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=73 2024-11-11 17:24:58 +00:00
Ana Guerrero
9dcdefc93d Accepting request 1221259 from Java:packages 
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
 2024-11-05 14:41:12 +00:00
Fridrich Strba
f4d6ba1de5 OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=71 2024-11-04 21:24:42 +00:00
Fridrich Strba
51eea70172 OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=70 2024-11-04 21:19:18 +00:00
6 changed files with 130 additions and 0 deletions
Expand all files Collapse all files

14
eclipse-jgit.changes
View File

@@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 11 17:23:41 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* javax-servlet-api-4.patch
+ allow building with servlet-api 4.x
-------------------------------------------------------------------
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>

4
eclipse-jgit.spec
View File

@@ -37,6 +37,8 @@ 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
Patch8: javax-servlet-api-4.patch
# For main build
BuildRequires: ant
BuildRequires: apache-commons-compress
@@ -97,6 +99,8 @@ 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
%patch -P 8 -p1
# Disable multithreaded build
rm .mvn/maven.config

78
javax-servlet-api-4.patch Normal file
View File

@@ -0,0 +1,78 @@
--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF 2024-11-11 18:20:06.262665966 +0100
+++ jgit-5.11.0.202103091610-r/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF 2024-11-11 18:35:21.458767324 +0100
@@ -16,8 +16,8 @@
javax.servlet.http"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
- javax.servlet.http;version="[2.5.0,3.2.0)",
+Import-Package: javax.servlet;version="[2.5.0,4.0.2)",
+ javax.servlet.http;version="[2.5.0,4.0.2)",
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.internal.storage.dfs;version="[5.11.0,5.12.0)",
--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF 2024-11-11 18:20:06.265999321 +0100
+++ jgit-5.11.0.202103091610-r/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF 2024-11-11 18:35:21.458767324 +0100
@@ -7,8 +7,8 @@
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
- javax.servlet.http;version="[2.5.0,3.2.0)",
+Import-Package: javax.servlet;version="[2.5.0,4.0.2)",
+ javax.servlet.http;version="[2.5.0,4.0.2)",
org.apache.commons.codec;version="[1.6.0,2.0.0)",
org.apache.commons.codec.binary;version="[1.6.0,2.0.0)",
org.apache.http;version="[4.3.0,5.0.0)",
--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF 2024-11-11 18:20:06.265999321 +0100
+++ jgit-5.11.0.202103091610-r/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF 2024-11-11 18:35:21.458767324 +0100
@@ -8,8 +8,8 @@
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
- javax.servlet.http;version="[2.5.0,3.2.0)",
+Import-Package: javax.servlet;version="[2.5.0,4.0.2)",
+ javax.servlet.http;version="[2.5.0,4.0.2)",
org.apache.commons.logging;version="[1.1.1,2.0.0)",
org.eclipse.jetty.http;version="[9.4.5,10.0.0)",
org.eclipse.jetty.security;version="[9.4.5,10.0.0)",
--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF 2024-11-11 18:20:06.272666032 +0100
+++ jgit-5.11.0.202103091610-r/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF 2024-11-11 18:20:42.362906665 +0100
@@ -20,9 +20,9 @@
org.eclipse.jgit.lfs.lib"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.google.gson;version="[2.8.0,3.0.0)",
- javax.servlet;version="[3.1.0,4.0.0)",
- javax.servlet.annotation;version="[3.1.0,4.0.0)",
- javax.servlet.http;version="[3.1.0,4.0.0)",
+ javax.servlet;version="[3.1.0,4.0.2)",
+ javax.servlet.annotation;version="[3.1.0,4.0.2)",
+ javax.servlet.http;version="[3.1.0,4.0.2)",
org.apache.http;version="[4.3.0,5.0.0)",
org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)",
org.eclipse.jgit.internal;version="[5.11.0,5.12.0)",
--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF 2024-11-11 18:20:06.272666032 +0100
+++ jgit-5.11.0.202103091610-r/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF 2024-11-11 18:20:42.362906665 +0100
@@ -7,8 +7,8 @@
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
- javax.servlet.http;version="[3.1.0,4.0.0)",
+Import-Package: javax.servlet;version="[3.1.0,4.0.2)",
+ javax.servlet.http;version="[3.1.0,4.0.2)",
org.apache.http;version="[4.3.0,5.0.0)",
org.apache.http.client;version="[4.4.0,5.0.0)",
org.apache.http.client.methods;version="[4.4.0,5.0.0)",
--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF 2024-11-11 18:20:06.285999454 +0100
+++ jgit-5.11.0.202103091610-r/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF 2024-11-11 18:20:42.362906665 +0100
@@ -7,7 +7,7 @@
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
+Import-Package: javax.servlet;version="[3.1.0,4.0.2)",
org.apache.commons.logging;version="[1.2,2.0)",
org.eclipse.jetty.server;version="[9.4.5,10.0.0)",
org.eclipse.jetty.server.handler;version="[9.4.5,10.0.0)",

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

14
jgit.changes
View File

@@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Nov 11 17:23:41 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* javax-servlet-api-4.patch
+ allow building with servlet-api 4.x
-------------------------------------------------------------------
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>

4
jgit.spec
View File

@@ -37,6 +37,8 @@ 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
Patch8: javax-servlet-api-4.patch
# For main build
BuildRequires: ant
BuildRequires: fdupes
@@ -106,6 +108,8 @@ Group: Documentation/HTML
%patch -P 4 -p1
%patch -P 5 -p1
%patch -P 6 -p1
%patch -P 7 -p1
%patch -P 8 -p1
# Disable multithreaded build
rm .mvn/maven.config