rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

First take on 3.6.2.

This commit is contained in:
Alexander Kurtakov 2011-03-11 21:59:47 +02:00
parent 46a0008098
commit 9a3233a361
4 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -18,3 +18,5 @@ eclipse-build-0_6_1_RC2.tar.bz2
eclipse-build-0.6.1.tar.bz2
eclipse-build-0.6.2RC0.tar.bz2
eclipse-3.6.1-src.tar.bz2
/eclipse-3.6.2-src.tar.bz2
eclipse-build-bedb7791752e6bd2c954582489d43ece5229b49a.tar.bz2

25
eclipse-help-webapps-xss-BZ329582.patch
View File

@ -1,25 +0,0 @@
# Backport patch for upstream Eclipse BZ: 329582 (XSS attack)
--- plugins/org.eclipse.help.webapp/advanced/content.jsp.orig 2010-04-21 14:00:16.000000000 -0400
+++ plugins/org.eclipse.help.webapp/advanced/content.jsp 2010-12-10 09:41:14.642196217 -0500
@@ -45,7 +45,7 @@
</head>
<frameset id="contentFrameset" rows="<%=frameData.getContentAreaFrameSizes()%>" frameborder=0" framespacing="0" border="0" spacing="0">
- <frame name="ContentToolbarFrame" title="<%=ServletResources.getString("topicViewToolbar", request)%>" src='<%="contentToolbar.jsp"+data.getQuery()%>' marginwidth="0" marginheight="0" scrolling="no" frameborder="0" >
+ <frame name="ContentToolbarFrame" title="<%=ServletResources.getString("topicViewToolbar", request)%>" src='<%="contentToolbar.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' marginwidth="0" marginheight="0" scrolling="no" frameborder="0" >
<frame ACCESSKEY="K" name="ContentViewFrame" title="<%=ServletResources.getString("topicView", request)%>" src='<%=UrlUtil.htmlEncode(data.getContentURL())%>' marginwidth="10"<%=(data.isIE() && "6.0".compareTo(data.getIEVersion()) <=0)?"scrolling=\"yes\"":""%> marginheight="0" frameborder="0" >
<%
AbstractFrame[] frames = frameData.getFrames(AbstractFrame.BELOW_CONTENT);
--- plugins/org.eclipse.help.webapp/basic/index.jsp.orig 2010-04-21 14:00:17.000000000 -0400
+++ plugins/org.eclipse.help.webapp/basic/index.jsp 2010-12-10 09:42:58.516317455 -0500
@@ -29,8 +29,8 @@
<%
}
%>
- <frame name="TabsFrame" title="<%=ServletResources.getString("helpToolbarFrame", request)%>" src='<%="basic/tabs.jsp"+data.getQuery()%>' marginwidth="5" marginheight="5" scrolling="no">
- <frame name="HelpFrame" title="<%=ServletResources.getString("ignore", "HelpFrame", request)%>" src='<%="basic/help.jsp"+data.getQuery()%>' frameborder="no" marginwidth="0" marginheight="0" scrolling="no">
+ <frame name="TabsFrame" title="<%=ServletResources.getString("helpToolbarFrame", request)%>" src='<%="basic/tabs.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' marginwidth="5" marginheight="5" scrolling="no">
+ <frame name="HelpFrame" title="<%=ServletResources.getString("ignore", "HelpFrame", request)%>" src='<%="basic/help.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' frameborder="no" marginwidth="0" marginheight="0" scrolling="no">
<%
if(!("0".equals(data.getFooterHeight()))){
%>

28
eclipse.spec
View File

@ -6,7 +6,7 @@ Epoch: 1
%global eclipse_major 3
%global eclipse_minor 6
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%global eclipse_micro 1
%global eclipse_micro 2
%global initialize 1
%global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/3.6.x_Helios/
%global bootstrap 0
@ -27,11 +27,11 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 5%{?dist}
Release: 0.1%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
Source0: %{download_url}eclipse-build-0.6.2RC0.tar.bz2
Source0: %{download_url}eclipse-build-bedb7791752e6bd2c954582489d43ece5229b49a.tar.bz2
Source1: %{download_url}eclipse-%{version}-src.tar.bz2
Source2: eclipse.sh.in
Source17: efj.sh.in
@ -42,10 +42,6 @@ Patch0: remove-ant-trax.patch
# a particular API and a type it depends on so we don't want to compile that
# API
Patch1: eclipse-xpcom-h.patch
# Shell script portability patch: prepare-build-dir.sh
Patch2: prepare-build-dir.sh.patch
# Backport of security fix for BZ 661901
Patch3: eclipse-help-webapps-xss-BZ329582.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant ant-nodeps
@ -66,7 +62,7 @@ BuildRequires: desktop-file-utils
BuildRequires: java-devel >= 1.6.0
BuildRequires: java-javadoc
BuildRequires: libXt-devel
BuildRequires: xulrunner-devel >= 1.9.3
BuildRequires: xulrunner-devel
BuildRequires: webkitgtk-devel
%if !%{bootstrap}
@ -102,7 +98,7 @@ Group: Text Editors/Integrated Development Environments (IDE)
# %{_libdir}/java directory owned by jpackage-utils
Requires: jpackage-utils
Requires: gtk2
Requires: xulrunner >= 1.9.3
Requires: xulrunner
Requires: webkitgtk
Conflicts: mozilla
Provides: libswt3-gtk2 = 1:%{version}-%{release}
@ -190,7 +186,7 @@ Eclipse Plugin Development Environment. This package is required for
developing Eclipse plugins.
%prep
%setup -q -n eclipse-build-0.6.2
%setup -q -n eclipse-build-HEAD
cp %{SOURCE1} .
ant -DbuildArch=%{eclipse_arch} applyPatches
sed -i -e "s|org.apache.ant_1.7.1.v20100518-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar||g" nonosgidependencies.properties
@ -199,20 +195,11 @@ sed -i -e "s|tomcat5-jsp-2.0-api|tomcat6-jsp-2.1-api|g" dependencies.properties
pushd build/eclipse-%{version}-src
%patch0
pushd plugins/org.eclipse.swt
pushd Eclipse\ SWT\ PI/gtk/library
sed -i -e "s|-lwebkit-1.0|\`pkg-config --libs webkit-1.0\`|g" make_linux.mak
popd
pushd Eclipse\ SWT\ Mozilla/common/library/
%patch1
popd
popd
# Apply shell script portability
# patch to upstream prepare-build-dir.sh
%patch2
# Eclipse help XSS vulnerability
%patch3
# Use our system-installed javadocs, reference only what we built, and
# don't like to osgi.org docs (FIXME: maybe we should package them?)
sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
@ -614,6 +601,9 @@ fi
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
* Fri Mar 11 2011 Alexander Kurtakov <akurtako@redhat.com> 1:3.6.2-0.1
- First take on 3.6.2.
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

4
sources
View File

@ -1,2 +1,2 @@
306f8bf4ec2b0bf6f3f8329608cb15dd eclipse-3.6.1-src.tar.bz2
b9c0a8cdc46d43cd047e92c5d6e71f8c eclipse-build-0.6.2RC0.tar.bz2
eef922f52818ca428f8efce86025b19b eclipse-3.6.2-src.tar.bz2
186e2a2e18fbced44a64ec8fa16205f0 eclipse-build-bedb7791752e6bd2c954582489d43ece5229b49a.tar.bz2