From fc621f3264848a1849e3206041c1360deb95ef0c Mon Sep 17 00:00:00 2001 From: gouhao Date: Fri, 15 Oct 2021 16:05:12 +0800 Subject: [PATCH] update jgit to 5.11 --- ...ct-classpath-is-set-for-the-jgit-com.patch | 6 +- 0002-Ensure-all-packages-are-exported.patch | 45 ---- ...dependency-on-javax.xml.bind-package.patch | 86 -------- jgit-5.4.0.201906121030-r.tar.xz | Bin 2037904 -> 0 bytes jgit.spec | 203 +++++++++++++----- jgit.yaml | 4 - 6 files changed, 157 insertions(+), 187 deletions(-) delete mode 100644 0002-Ensure-all-packages-are-exported.patch delete mode 100644 0003-Remove-dependency-on-javax.xml.bind-package.patch delete mode 100644 jgit-5.4.0.201906121030-r.tar.xz delete mode 100644 jgit.yaml diff --git a/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch b/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch index 5b98a88..bc3ea64 100644 --- a/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch +++ b/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch @@ -1,4 +1,4 @@ -From 5f1d7c576160b1682a5787018c1aa82b8cb0e747 Mon Sep 17 00:00:00 2001 +From d5b6a00810c9282d664b8c3e34fe212ae57f0806 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 7 Dec 2018 10:04:44 +0000 Subject: [PATCH 1/2] Ensure the correct classpath is set for the jgit command @@ -9,7 +9,7 @@ Subject: [PATCH 1/2] Ensure the correct classpath is set for the jgit command 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.pgm/jgit.sh b/org.eclipse.jgit.pgm/jgit.sh -index e263782..4086e37 100644 +index a369220..2dd26aa 100644 --- a/org.eclipse.jgit.pgm/jgit.sh +++ b/org.eclipse.jgit.pgm/jgit.sh @@ -60,7 +60,7 @@ esac @@ -22,5 +22,5 @@ index e263782..4086e37 100644 if [ -n "$JGIT_CLASSPATH" ] then -- -2.20.1 +2.26.2 diff --git a/0002-Ensure-all-packages-are-exported.patch b/0002-Ensure-all-packages-are-exported.patch deleted file mode 100644 index 7fd1416..0000000 --- a/0002-Ensure-all-packages-are-exported.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 77a7644525c260098740a6670bf389b3957b746a Mon Sep 17 00:00:00 2001 -From: Matthias Sohn -Date: Sun, 16 Jun 2019 02:30:10 +0200 -Subject: [PATCH 2/2] Ensure all packages are exported - -This wasn't the case for the bundles -- org.eclipse.jgit.ant -- org.eclipse.jgit.archive - -Change-Id: Ibefcc82174fe23a9c1afb765099957414ac3556b -Signed-off-by: Matthias Sohn --- - org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 4 ++-- - org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 3 ++- - 2 files changed, 4 insertions(+), 3 deletions(-) ---- - org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 4 ++-- - org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 3 ++- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF -index bb61635..7b24bf6 100644 ---- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF -+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF -@@ -9,5 +9,5 @@ Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[5.4.0,5.5.0)" - Bundle-Localization: plugin - Bundle-Vendor: %Provider-Name --Export-Package: org.eclipse.jgit.ant.tasks;version="5.4.0"; -- uses:="org.apache.tools.ant.types,org.apache.tools.ant" -+Export-Package: org.eclipse.jgit.ant, -+ org.eclipse.jgit.ant.tasks;version="5.4.0";uses:="org.apache.tools.ant.types,org.apache.tools.ant" -diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF -index 1fa5e8c..0eabf1f 100644 ---- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF -+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF -@@ -25,4 +25,5 @@ Export-Package: org.eclipse.jgit.archive;version="5.4.0"; - uses:="org.eclipse.jgit.lib, - org.eclipse.jgit.api, - org.apache.commons.compress.archivers, -- org.osgi.framework" -+ org.osgi.framework", -+ org.eclipse.jgit.archive.internal;x-internal:=true --- -2.20.1 - diff --git a/0003-Remove-dependency-on-javax.xml.bind-package.patch b/0003-Remove-dependency-on-javax.xml.bind-package.patch deleted file mode 100644 index f9672cc..0000000 --- a/0003-Remove-dependency-on-javax.xml.bind-package.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 0d1cc8f8d3adb99f75fce180d857077ada3a19ee Mon Sep 17 00:00:00 2001 -From: David Ostrovsky -Date: Mon, 17 Jun 2019 23:28:52 +0200 -Subject: [PATCH 3/3] Remove dependency on javax.xml.bind package - -Replace javax.xml.bind.DatatypeConverter, that is not available any -more in Java 11 and later with Hex utility from non optional Bouncy -Castle library. - -Bug: 540790 -Change-Id: I9903c00ecc1a434e9795b8ba9267f02628fdc0e9 -Signed-off-by: David Ostrovsky ---- - BUILD | 7 ------- - org.eclipse.jgit/BUILD | 4 ---- - .../src/org/eclipse/jgit/transport/WalkEncryption.java | 7 +++---- - 3 files changed, 3 insertions(+), 15 deletions(-) - -diff --git a/BUILD b/BUILD -index 5fea669..be6dd76 100644 ---- a/BUILD -+++ b/BUILD -@@ -1,12 +1,5 @@ - package(default_visibility = ["//visibility:public"]) - --config_setting( -- name = "jdk9", -- values = { -- "java_toolchain": "@bazel_tools//tools/jdk:toolchain_jdk9", -- }, --) -- - genrule( - name = "all", - testonly = 1, -diff --git a/org.eclipse.jgit/BUILD b/org.eclipse.jgit/BUILD -index b67bfac..814ecec 100644 ---- a/org.eclipse.jgit/BUILD -+++ b/org.eclipse.jgit/BUILD -@@ -14,10 +14,6 @@ RESOURCES = glob(["resources/**"]) - java_library( - name = "jgit", - srcs = SRCS, -- javacopts = select({ -- "//:jdk9": ["--add-modules=java.xml.bind"], -- "//conditions:default": [], -- }), - resource_strip_prefix = "org.eclipse.jgit/resources", - resources = RESOURCES, - deps = [ -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java -index b4248ee..7a973af 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java -@@ -66,8 +66,8 @@ - import javax.crypto.spec.PBEKeySpec; - import javax.crypto.spec.PBEParameterSpec; - import javax.crypto.spec.SecretKeySpec; --import javax.xml.bind.DatatypeConverter; - -+import org.bouncycastle.util.encoders.Hex; - import org.eclipse.jgit.internal.JGitText; - import org.eclipse.jgit.util.Base64; - -@@ -301,7 +301,7 @@ InputStream decrypt(InputStream in) throws IOException { - String DEFAULT_KEY_ALGO = JetS3tV2.ALGORITHM; - String DEFAULT_KEY_SIZE = Integer.toString(JetS3tV2.KEY_SIZE); - String DEFAULT_KEY_ITER = Integer.toString(JetS3tV2.ITERATIONS); -- String DEFAULT_KEY_SALT = DatatypeConverter.printHexBinary(JetS3tV2.SALT); -+ String DEFAULT_KEY_SALT = Hex.toHexString(JetS3tV2.SALT); - - String EMPTY = ""; //$NON-NLS-1$ - -@@ -377,8 +377,7 @@ static GeneralSecurityException securityError(String message) { - - final byte[] salt; - try { -- salt = DatatypeConverter -- .parseHexBinary(keySalt.replaceAll(REGEX_WS, EMPTY)); -+ salt = Hex.decode(keySalt.replaceAll(REGEX_WS, EMPTY)); - } catch (Exception e) { - throw securityError(X_KEY_SALT + EMPTY + keySalt); - } --- -2.20.1 - diff --git a/jgit-5.4.0.201906121030-r.tar.xz b/jgit-5.4.0.201906121030-r.tar.xz deleted file mode 100644 index 7aadcb5e932eae790f1c976727c3ae520d265e05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2037904 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