From ab25b5d4e898427f8cfaf2e2d75d347c606a0f26 Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Tue, 21 Feb 2023 11:19:51 +0800 Subject: [PATCH] Sync 22.09 branch for fix build error (cherry picked from commit 2dbe594c73cbfeac0433d75279736f65f0464585) --- eclipse.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/eclipse.spec b/eclipse.spec index 2e3b70b..142335b 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -11,7 +11,7 @@ Name: eclipse Epoch: 1 Version: 4.11 -Release: 7 +Release: 8 Summary: An open, extensible IDE License: EPL-2.0 URL: http://www.eclipse.org/ @@ -77,9 +77,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 @@ -405,6 +405,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}" @@ -764,6 +765,10 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Tue Feb 21 2023 liyanan - 1:4.11-8 +- 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 - 1:4.11-7 - Fix CVE-2020-27225 -- Gitee