Control: tags -1 patch -- On Mon, Sep 19, 2022 at 03:58:29PM +0100, Sudip Mukherjee wrote: > Source: equinox-p2 > Version: 4.21-1 > Severity: important > X-Debbugs-Cc: sudipm.mukher...@gmail.com > > Dear Maintainer, > > The manifest file of equinox-p2 mentions that it needs bouncycastle > version="1.65.0" but in Debian we have bouncycastle 1.71 and as a result any > eclipse based application is not able to use equinox-p2 and it gives the > errors like: > > org.eclipse.equinox.p2.engine [130] > Unresolved requirement: Import-Package: org.bouncycastle.openpgp; > version="1.65.0" > > org.eclipse.equinox.p2.core [131] > Unresolved requirement: Import-Package: org.bouncycastle.bcpg; > version="1.65.0"
The attached patch is the minimum required to unblock eclipse-tracecompass. But Emmanuel Bourg did not agree so I am not doing an upload but keeping the patch here for record. Ref: https://lists.debian.org/debian-java/2022/09/msg00002.html -- Regards Sudip
diff -Nru equinox-p2-4.21/debian/changelog equinox-p2-4.21/debian/changelog --- equinox-p2-4.21/debian/changelog 2021-10-18 15:14:21.000000000 +0100 +++ equinox-p2-4.21/debian/changelog 2022-09-07 21:02:34.000000000 +0100 @@ -1,3 +1,10 @@ +equinox-p2 (4.21-1.1) UNRELEASED; urgency=medium + + * Team upload. + * Fix Manifest. (Closes: #1020299) + + -- Sudip Mukherjee <sudipm.mukher...@gmail.com> Wed, 07 Sep 2022 21:02:34 +0100 + equinox-p2 (4.21-1) unstable; urgency=medium * New upstream release diff -Nru equinox-p2-4.21/debian/patches/manifest.patch equinox-p2-4.21/debian/patches/manifest.patch --- equinox-p2-4.21/debian/patches/manifest.patch 1970-01-01 01:00:00.000000000 +0100 +++ equinox-p2-4.21/debian/patches/manifest.patch 2022-09-07 21:02:34.000000000 +0100 @@ -0,0 +1,73 @@ +Description: Fix Manifest + +Author: Sudip Mukherjee <sudipm.mukher...@gmail.com> + +--- + +Bug-Debian: https://bugs.debian.org/1020299 +Forwarded: no + +--- equinox-p2-4.21.orig/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF ++++ equinox-p2-4.21/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF +@@ -38,14 +38,14 @@ Require-Bundle: org.eclipse.equinox.comm + org.eclipse.equinox.p2.metadata, + org.tukaani.xz;bundle-version="1.3.0" + Import-Package: javax.xml.parsers, +- org.bouncycastle.bcpg;version="1.65.0", +- org.bouncycastle.jce.provider;version="1.65.1", +- org.bouncycastle.openpgp;version="1.65.0", +- org.bouncycastle.openpgp.bc;version="1.65.0", +- org.bouncycastle.openpgp.jcajce;version="1.65.0", +- org.bouncycastle.openpgp.operator;version="1.65.0", +- org.bouncycastle.openpgp.operator.bc;version="1.65.0", +- org.bouncycastle.openpgp.operator.jcajce;version="1.65.0", ++ org.bouncycastle.bcpg;version="1.71.0", ++ org.bouncycastle.jce.provider;version="1.71.0", ++ org.bouncycastle.openpgp;version="1.71.0", ++ org.bouncycastle.openpgp.bc;version="1.71.0", ++ org.bouncycastle.openpgp.jcajce;version="1.71.0", ++ org.bouncycastle.openpgp.operator;version="1.71.0", ++ org.bouncycastle.openpgp.operator.bc;version="1.71.0", ++ org.bouncycastle.openpgp.operator.jcajce;version="1.71.0", + org.eclipse.core.runtime.jobs, + org.eclipse.equinox.internal.p2.core.helpers, + org.eclipse.equinox.internal.p2.jarprocessor, +--- equinox-p2-4.21.orig/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF ++++ equinox-p2-4.21/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF +@@ -70,8 +70,8 @@ Require-Bundle: org.eclipse.equinox.comm + Bundle-RequiredExecutionEnvironment: JavaSE-11 + Bundle-ActivationPolicy: lazy + Service-Component: OSGI-INF/eventBus.xml, OSGI-INF/agentProvider.xml +-Import-Package: org.bouncycastle.bcpg;version="1.65.0", +- org.bouncycastle.openpgp;version="1.65.0", ++Import-Package: org.bouncycastle.bcpg;version="1.71.0", ++ org.bouncycastle.openpgp;version="1.71.0", + org.eclipse.osgi.framework.eventmgr;version="1.2.0", + org.eclipse.osgi.framework.log;version="1.0.0", + org.eclipse.osgi.service.debug;version="1.0.0", +--- equinox-p2-4.21.orig/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF ++++ equinox-p2-4.21/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF +@@ -26,7 +26,7 @@ Bundle-RequiredExecutionEnvironment: Jav + Bundle-ActivationPolicy: lazy + Service-Component: OSGI-INF/profileRegistry.xml, OSGI-INF/engine.xml + Import-Package: javax.xml.parsers, +- org.bouncycastle.openpgp;version="1.65.0", ++ org.bouncycastle.openpgp;version="1.71.0", + org.eclipse.core.internal.preferences, + org.eclipse.core.runtime.preferences, + org.eclipse.equinox.internal.p2.artifact.processors.pgp, +--- equinox-p2-4.21.orig/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF ++++ equinox-p2-4.21/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF +@@ -36,9 +36,9 @@ Require-Bundle: org.eclipse.ui;bundle-ve + org.eclipse.equinox.security.ui;bundle-version="[1.0.0,2.0.0)", + org.eclipse.e4.ui.dialogs;bundle-version="1.1.600" + Import-Package: javax.xml.parsers, +- org.bouncycastle.bcpg;version="1.65.0", +- org.bouncycastle.openpgp;version="1.65.0", +- org.bouncycastle.util;version="1.65.1", ++ org.bouncycastle.bcpg;version="1.71.0", ++ org.bouncycastle.openpgp;version="1.71.0", ++ org.bouncycastle.util;version="1.71.0", + org.eclipse.equinox.internal.p2.artifact.repository, + org.eclipse.equinox.internal.p2.core.helpers, + org.eclipse.equinox.internal.p2.director, diff -Nru equinox-p2-4.21/debian/patches/series equinox-p2-4.21/debian/patches/series --- equinox-p2-4.21/debian/patches/series 2021-10-18 11:05:00.000000000 +0100 +++ equinox-p2-4.21/debian/patches/series 2022-09-07 21:02:34.000000000 +0100 @@ -1 +1,2 @@ 01-build-ant-tasks.patch +manifest.patch
