Compare commits
No commits in common. "f4d6ba1de57c4566d3b185ce058f36eac04bb7b305e37531b56d173f23054c67" and "2aa90e4c7a970f5ccce712651c345096a39d0200ccaf37f34a7f0c2200e8c040" have entirely different histories.
f4d6ba1de5
...
2aa90e4c7a
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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>
|
Mon Nov 4 21:23:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
|||||||
@ -38,6 +38,7 @@ 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
|
Patch7: jgit-bc-179.patch
|
||||||
|
Patch8: javax-servlet-api-4.patch
|
||||||
# For main build
|
# For main build
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: apache-commons-compress
|
BuildRequires: apache-commons-compress
|
||||||
@ -99,6 +100,7 @@ A pure Java implementation of the Git version control system.
|
|||||||
%patch -P 5 -p1
|
%patch -P 5 -p1
|
||||||
%patch -P 6 -p1
|
%patch -P 6 -p1
|
||||||
%patch -P 7 -p1
|
%patch -P 7 -p1
|
||||||
|
%patch -P 8 -p1
|
||||||
|
|
||||||
# Disable multithreaded build
|
# Disable multithreaded build
|
||||||
rm .mvn/maven.config
|
rm .mvn/maven.config
|
||||||
|
|||||||
78
javax-servlet-api-4.patch
Normal file
78
javax-servlet-api-4.patch
Normal 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)",
|
||||||
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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>
|
Mon Nov 4 21:23:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
|||||||
@ -38,6 +38,7 @@ 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
|
Patch7: jgit-bc-179.patch
|
||||||
|
Patch8: javax-servlet-api-4.patch
|
||||||
# For main build
|
# For main build
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -108,6 +109,7 @@ Group: Documentation/HTML
|
|||||||
%patch -P 5 -p1
|
%patch -P 5 -p1
|
||||||
%patch -P 6 -p1
|
%patch -P 6 -p1
|
||||||
%patch -P 7 -p1
|
%patch -P 7 -p1
|
||||||
|
%patch -P 8 -p1
|
||||||
|
|
||||||
# Disable multithreaded build
|
# Disable multithreaded build
|
||||||
rm .mvn/maven.config
|
rm .mvn/maven.config
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user