packages/eclipse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync 22.09 branch for fix build error

Browse Source
This commit is contained in:
wk333 2022-10-28 16:55:30 +08:00
parent 7eb44fa0f6
commit b970fd7be2
3 changed files with 106 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
eclipse.spec
View File

@ -11,7 +11,7 @@
Name: eclipse
Epoch: 1
Version: 4.11
Release: 5
Release: 6
Summary: An open, extensible IDE
License: EPL-2.0
URL: http://www.eclipse.org/
@ -39,6 +39,9 @@ Patch31: org-eclipse-swt.patch
Patch32: BUILD-FAILED-with-compilation-failure-in-org-eclipse-test.patch
# https://git.eclipse.org/c/platform/eclipse.platform.ua.git/commit/?id=28aac2514656c669ffa16acb996c77def3d4a8d4
Patch33: CVE-2020-27225.patch
Patch34: fix-objectweb-asm-version-to-increase.patch
#Patch from: https://git.eclipse.org/c/platform/eclipse.platform.ui.git/commit/?id=3cf23b7d8b0fc4e57f18118cb6fc92a8e6de0490
Patch35: fixed-compilation-error.patch
ExcludeArch: s390 %{arm} %{ix86}
BuildRequires: maven-local tycho tycho-extras cbi-plugins maven-antrun-plugin
BuildRequires: maven-assembly-plugin maven-dependency-plugin maven-enforcer-plugin
@ -69,9 +72,9 @@ BuildRequires: lucene-analyzers-smartcn >= %{_lucene_version} junit >= 4.1
BuildRequires: apiguardian hamcrest sat4j objectweb-asm >= 7.0 sac batik >= 1.10
BuildRequires: batik-css >= 1.10 xmlgraphics-commons >= 2.2 xml-commons-apis atinject
BuildRequires: eclipse-ecf-core >= 3.14.4 eclipse-emf-core >= 1:2.16.0 eclipse-license2
BuildRequires: glassfish-annotation-api glassfish-el-api >= 3.0.1 glassfish-el >= 3.0.1
BuildRequires: glassfish-jsp-api >= 2.2.1 glassfish-jsp >= 2.2.5
BuildRequires: glassfish-servlet-api >= 3.1.0 httpcomponents-core httpcomponents-client jsoup
BuildRequires: glassfish-annotation-api glassfish-el-api > 3.0.1 glassfish-el > 3.0.1
BuildRequires: glassfish-jsp-api <= 2.3.3 glassfish-jsp <= 2.3.3
BuildRequires: glassfish-servlet-api <= 3.1.0 httpcomponents-core httpcomponents-client jsoup
BuildRequires: xz-java mockito >= 2.23.9 osgi(osgi.annotation)
%if ! %{bootstrap}
BuildRequires: eclipse-pde eclipse-egit eclipse-emf-runtime eclipse-jgit
@ -210,6 +213,8 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
pushd eclipse.platform.ua
%patch33 -p1
popd
%patch34 -p1
%patch35 -p1
rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py
%pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent
%pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent
@ -393,6 +398,7 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.
%mvn_package "org.eclipse.ui:org.eclipse.ui.{views.log,trace}" pde
%mvn_package "org.eclipse.sdk{,.feature}:" sdk
%mvn_package ":" __noinstall
sed -i 's/-O -g -Wall -fPIC/-O -g -Wall -fPIC -pie -Wl,-z,relro -Wl,-z,now -fstack-protector-strong/g' eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library/build.sh
%build
export CFLAGS="%{optflags}"
@ -576,7 +582,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
%{_eclipsedir}/features/org.eclipse.rcp_*
%{_eclipsedir}/plugins/com.ibm.icu_*
%{_eclipsedir}/plugins/com.jcraft.jsch_*
%{_eclipsedir}/plugins/com.sun.el.javax.el_*
%{_eclipsedir}/plugins/jakarta.el-api_*
%{_eclipsedir}/plugins/javax.*
%{_eclipsedir}/plugins/org.apache.*
%{_eclipsedir}/plugins/org.eclipse.ant.core_*
@ -752,6 +758,11 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
* Fri Oct 28 2022 wangkai <wangkai385@h-partners.com> - 1:4.11-6
- Fix objectweb.asm version limit
- Add security compile options pie, relro and -fstack-protector-strong
- Add glassfish-jsp and glassfish-servlet-api and glassfish-el-api version limit
* Thu Jul 14 2022 wangkai <wangkai385@h-partners.com> - 1:4.11-5
- Fix CVE-2020-27225

65
fix-objectweb-asm-version-to-increase.patch Normal file
View File

@ -0,0 +1,65 @@
From 80c753b73258d29a51eead88e0aa6169e1560822 Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com>
Date: Tue, 14 Jun 2022 11:47:31 +0800
Subject: [PATCH] fix objectweb-asm version to increase
---
.../org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF | 4 ++--
.../apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF | 4 ++--
.../features/org.eclipse.help-feature/feature.xml | 3 +--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
index d8e329ec8..8fb77a70f 100644
--- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
+++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
@@ -22,9 +22,9 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jdt.core.tests.builder;bundle-version="[3.8.0,4.0.0)",
org.eclipse.jdt.core.tests.compiler;bundle-version="[3.8.0,4.0.0)",
org.eclipse.ant.core,
- org.objectweb.asm;bundle-version="[6.0.0,8.0.0)",
+ org.objectweb.asm;bundle-version="[6.0.0,10.0.0)",
org.eclipse.jface;bundle-version="3.8.0",
- org.objectweb.asm.tree;bundle-version="[6.0.0,8.0.0)"
+ org.objectweb.asm.tree;bundle-version="[6.0.0,10.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.pde.api.tools.anttasks.tests,
org.eclipse.pde.api.tools.apiusescan.tests,
diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF
index b3028afde..d593b9347 100644
--- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF
+++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF
@@ -14,12 +14,12 @@ Require-Bundle: org.eclipse.osgi;bundle-version="[3.4.0,4.0.0)",
org.eclipse.text;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.filebuffers;bundle-version="[3.4.0,4.0.0)",
org.eclipse.ant.core;bundle-version="[3.1.300,4.0.0)",
- org.objectweb.asm;bundle-version="[6.0.0,8.0.0)",
+ org.objectweb.asm;bundle-version="[6.0.0,10.0.0)",
org.eclipse.team.core;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)",
org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)",
- org.objectweb.asm.tree;bundle-version="[6.0.0,8.0.0)"
+ org.objectweb.asm.tree;bundle-version="[6.0.0,10.0.0)"
Export-Package: org.eclipse.pde.api.tools.internal;x-friends:="org.eclipse.pde.api.tools.tests,org.eclipse.pde.api.tools.ui,org.eclipse.pde.api.tools.generator",
org.eclipse.pde.api.tools.internal.builder;x-friends:="org.eclipse.pde.api.tools.ui,org.eclipse.pde.api.tools.tests",
org.eclipse.pde.api.tools.internal.comparator;x-friends:="org.eclipse.pde.api.tools.ui,org.eclipse.pde.api.tools.tests",
diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
index d834f93a4..3480b3ba6 100644
--- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
@@ -93,10 +93,9 @@
unpack="false"/>
<requires>
- <import plugin="javax.el-api" />
+ <import plugin="jakarta.el-api" />
<import plugin="javax.servlet-api" />
<import plugin="javax.servlet.jsp" />
- <import plugin="com.sun.el.javax.el" />
<import plugin="org.apache.commons.logging" />
<import plugin="org.glassfish.web.javax.servlet.jsp" />
<import plugin="org.apache.lucene.analyzers-common" />
--
2.27.0

25
fixed-compilation-error.patch Normal file
View File

@ -0,0 +1,25 @@
From 4403040e9ca286d234c3029e19453c0cb8f7d875 Mon Sep 17 00:00:00 2001
From: chen-jan <chen_aka_jan@163.com>
Date: Mon, 23 May 2022 06:50:59 +0000
Subject: [PATCH] test.patch
---
.../src/org/eclipse/jface/resource/ImageDescriptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java b/eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java
index afc0eb49d..4622f4e53 100644
--- a/eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java
+++ b/eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java
@@ -290,7 +290,7 @@ public abstract class ImageDescriptor extends DeviceResourceDescriptor {
* this fails.
*/
try {
- return new Image(device, this::getImageData);
+ return new Image(device, (ImageDataProvider) this::getImageData);
} catch (IllegalArgumentException | SWTException e) {
if (returnMissingImageOnError) {
try {
--
2.30.0