This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, master has been updated
via 40fd42eb67720ba050914115cbf85b01479e1f96 (commit)
from 0dbe3bbabed2d0a814bb91a0faeb400fcc096917 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 40fd42eb67720ba050914115cbf85b01479e1f96
Author: Benjamin Drung <[email protected]>
Date: Sat May 28 19:57:18 2011 +0200
Drop backported patches.
-----------------------------------------------------------------------
Summary of changes:
debian/patches/bp-build-with-ant-1.8.2.patch | 18 -----
.../bp-eclipse-help-webapps-xss-BZ661901.patch | 34 ---------
.../bp-osgi-allow-illegal-os-qualifier.patch | 23 ------
debian/patches/bp-osgi-ignore-root-CA.patch | 77 --------------------
debian/patches/bp-pdebuild-fixes.patch | 25 -------
debian/patches/pdebuild-workspace.patch | 70 ------------------
6 files changed, 0 insertions(+), 247 deletions(-)
diff --git a/debian/patches/bp-build-with-ant-1.8.2.patch
b/debian/patches/bp-build-with-ant-1.8.2.patch
deleted file mode 100644
index 4f09afe..0000000
--- a/debian/patches/bp-build-with-ant-1.8.2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Remove ant+trax and ant-nodeps that has been removed in ant
- 1.8.2.
-Origin: upstream
-
-diff --git a/nonosgidependencies.properties b/nonosgidependencies.properties
-index 2a28ce9..9ae7ec5 100644
---- a/nonosgidependencies.properties
-+++ b/nonosgidependencies.properties
-@@ -13,9 +13,7 @@
org.apache.ant_1.7.1.v20090120-1145/lib/ant-jdepend.jar=/usr/share/java/ant/ant-
-
org.apache.ant_1.7.1.v20090120-1145/lib/ant-jsch.jar=/usr/share/java/ant/ant-jsch.jar:/usr/share/java/ant-jsch.jar
-
org.apache.ant_1.7.1.v20090120-1145/lib/ant-junit.jar=/usr/share/java/ant/ant-junit.jar:/usr/share/java/ant-junit.jar
-
org.apache.ant_1.7.1.v20090120-1145/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar:/usr/share/java/ant-launcher.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-nodeps.jar=/usr/share/java/ant/ant-nodeps.jar:/usr/share/java/ant-nodeps.jar
-
org.apache.ant_1.7.1.v20090120-1145/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar
- org.junit_3.8.2.v20090203-1005/junit.jar=/usr/share/java/junit.jar
- org.junit4/junit.jar=/usr/share/java/junit4.jar
- org.apache.ant_1.7.1.v20090120-1145/bin/ant=/usr/share/ant/bin/ant
diff --git a/debian/patches/bp-eclipse-help-webapps-xss-BZ661901.patch
b/debian/patches/bp-eclipse-help-webapps-xss-BZ661901.patch
deleted file mode 100644
index ebe1665..0000000
--- a/debian/patches/bp-eclipse-help-webapps-xss-BZ661901.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Backported patch for fixing CVE-2010-4647.
-Origin: Fedora,
http://pkgs.fedoraproject.org/gitweb/?p=eclipse.git;a=commit;h=5c1617b
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=329582
-Bug-Debian: http://bugs.debian.org/611849
-Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=661901
-
-diff --git a/eclipse/plugins/org.eclipse.help.webapp/advanced/content.jsp
b/eclipse/plugins/org.eclipse.help.webapp/advanced/content.jsp
-index fc9998f..73712b4 100644
---- a/eclipse/plugins/org.eclipse.help.webapp/advanced/content.jsp
-+++ b/eclipse/plugins/org.eclipse.help.webapp/advanced/content.jsp
-@@ -46,7 +46,7 @@ FRAMESET {
-
-
- <frameset id="contentFrameset" rows="24,*" 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" noresize=0>
-+ <frame name="ContentToolbarFrame"
title="<%=ServletResources.getString("topicViewToolbar", request)%>"
src='<%="contentToolbar.jsp"+UrlUtil.htmlEncode(data.getQuery())%>'
marginwidth="0" marginheight="0" scrolling="no" frameborder="0" noresize=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" >
- </frameset>
-
-diff --git a/eclipse/plugins/org.eclipse.help.webapp/basic/index.jsp
b/eclipse/plugins/org.eclipse.help.webapp/basic/index.jsp
-index c405813..5639f62 100644
---- a/eclipse/plugins/org.eclipse.help.webapp/basic/index.jsp
-+++ b/eclipse/plugins/org.eclipse.help.webapp/basic/index.jsp
-@@ -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">
- </frameset>
-
- </html>
diff --git a/debian/patches/bp-osgi-allow-illegal-os-qualifier.patch
b/debian/patches/bp-osgi-allow-illegal-os-qualifier.patch
deleted file mode 100644
index 94f78be..0000000
--- a/debian/patches/bp-osgi-allow-illegal-os-qualifier.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Backport to allow illegal qualifiers in the OS version.
-Origin: upstream, https://bugs.eclipse.org/bugs/show_bug.cgi?id=305452
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=305452
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/600584
-
-diff --git
a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
-index f33e314..ff32d77 100644
----
a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
-+++
b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
-@@ -358,7 +358,12 @@ public class Framework implements EventDispatcher,
EventPublisher, Runnable {
- } catch (NoSuchElementException e) {
- // ignore, use the values parsed so far
- }
-- value = new Version(major, minor, micro,
qualifier).toString();
-+ try {
-+ value = new Version(major, minor,
micro, qualifier).toString();
-+ } catch (IllegalArgumentException e) {
-+ // must be an invalid qualifier; just
ignore it
-+ value = new Version(major, minor,
micro).toString();
-+ }
- properties.put(Constants.FRAMEWORK_OS_VERSION,
value);
- }
- }
diff --git a/debian/patches/bp-osgi-ignore-root-CA.patch
b/debian/patches/bp-osgi-ignore-root-CA.patch
deleted file mode 100644
index ec0d4e0..0000000
--- a/debian/patches/bp-osgi-ignore-root-CA.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Description: If the root CA in a signed jar is invalid, check the cacerts
- for an alternative/newer root CA.
- .
- This fixes the issue where signed jars has root CAs using MD2withRSA or
- other weak signatures that are now automatically rejected by e.g. OpenJDK.
-Author: Thomas Watson <[email protected]>
-Bug-Ubuntu: https://launchpad.net/bugs/655833
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=309059
-Applied-Upstream: yes
-
----
a/eclipse/plugins/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/service/security/KeyStoreTrustEngine.java
-+++
b/eclipse/plugins/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/service/security/KeyStoreTrustEngine.java
-@@ -101,27 +101,19 @@
-
- try {
- Certificate rootCert = null;
--
- KeyStore store = getKeyStore();
- for (int i = 0; i < certChain.length; i++) {
- if (certChain[i] instanceof X509Certificate) {
-- if (i == certChain.length - 1) { //this
is the last certificate in the chain
-+ if (i == certChain.length - 1) {
-+ // this is the last certificate
in the chain
-+ // determine if we have a valid
root
- X509Certificate cert =
(X509Certificate) certChain[i];
- if
(cert.getSubjectDN().equals(cert.getIssuerDN())) {
--
certChain[i].verify(certChain[i].getPublicKey());
-- rootCert =
certChain[i]; // this is a self-signed certificate
-+
cert.verify(cert.getPublicKey());
-+ rootCert = cert; //
this is a self-signed certificate
- } else {
- // try to find a
parent, we have an incomplete chain
-- synchronized (store) {
-- for
(Enumeration e = store.aliases(); e.hasMoreElements();) {
--
Certificate nextCert = store.getCertificate((String) e.nextElement());
-- if
(nextCert instanceof X509Certificate && ((X509Certificate)
nextCert).getSubjectDN().equals(cert.getIssuerDN())) {
--
cert.verify(nextCert.getPublicKey());
--
rootCert = nextCert;
--
break;
-- }
-- }
-- }
-+ return
findAlternativeRoot(cert, store);
- }
- } else {
- X509Certificate nextX509Cert =
(X509Certificate) certChain[i + 1];
-@@ -138,6 +130,10 @@
- if (alias != null)
- return
store.getCertificate(alias);
- }
-+ // if we have reached the end and the
last cert is not found to be a valid root CA
-+ // then we need to back off the root CA
and try to find an alternative
-+ if (certChain.length > 1 && i ==
certChain.length - 1 && certChain[i - 1] instanceof X509Certificate)
-+ return
findAlternativeRoot((X509Certificate) certChain[i - 1], store);
- }
- }
- } catch (KeyStoreException e) {
-@@ -149,6 +145,19 @@
- return null;
- }
-
-+ private Certificate findAlternativeRoot(X509Certificate cert, KeyStore
store) throws InvalidKeyException, KeyStoreException, NoSuchAlgorithmException,
NoSuchProviderException, SignatureException, CertificateException {
-+ synchronized (store) {
-+ for (Enumeration e = store.aliases();
e.hasMoreElements();) {
-+ Certificate nextCert =
store.getCertificate((String) e.nextElement());
-+ if (nextCert instanceof X509Certificate &&
((X509Certificate) nextCert).getSubjectDN().equals(cert.getIssuerDN())) {
-+ cert.verify(nextCert.getPublicKey());
-+ return nextCert;
-+ }
-+ }
-+ return null;
-+ }
-+ }
-+
- protected String doAddTrustAnchor(Certificate cert, String alias)
throws IOException, GeneralSecurityException {
- if (isReadOnly())
- throw new
IOException(SignedContentMessages.Default_Trust_Read_Only);
diff --git a/debian/patches/bp-pdebuild-fixes.patch
b/debian/patches/bp-pdebuild-fixes.patch
deleted file mode 100644
index 9d09998..0000000
--- a/debian/patches/bp-pdebuild-fixes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Backported fix for a poor comparison in pdebuild
-Origin: upstream
-
-diff --git a/patches/eclipse-pde.build-add-package-build.patch
b/patches/eclipse-pde.build-add-package-build.patch
-index d141306..9565aa9 100644
---- a/patches/eclipse-pde.build-add-package-build.patch
-+++ b/patches/eclipse-pde.build-add-package-build.patch
-@@ -66,7 +66,7 @@ diff -N templates/package-build/prepare-build-dir.sh
- + fi
- +
- + if [ "x$ERROR" != "xyes" ]; then
--+ if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ];
then
-++ if [ $TESTING != true ] || echo $PROJECTNAME | grep "org.eclipse"
>/dev/null 2>&1 ; then
- + echo " making symlink: $BUILDDIR/features/$PROJECTNAME ->
$PROJECTDIR"
- + ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
- + fi
-@@ -100,7 +100,7 @@ diff -N templates/package-build/prepare-build-dir.sh
- + fi
- +
- + if [ "x$ERROR" != "xyes" ]; then
--+ if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ];
then
-++ if [ $TESTING != true ] || echo $PROJECTNAME | grep "org.eclipse"
>/dev/null 2>&1 ; then
- + echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
- + ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
- + fi
diff --git a/debian/patches/pdebuild-workspace.patch
b/debian/patches/pdebuild-workspace.patch
deleted file mode 100644
index ecdc446..0000000
--- a/debian/patches/pdebuild-workspace.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: Make pde-build use the -data argument so it does not write
- to ~/workspace during auto-builds.
-Fowarded: yes
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=322271
-Bug-Debian: http://bugs.debian.org/592526
-Author: Niels Thykier <[email protected]>
-
-diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
-index bf9f039..0d528c3 100755
---- a/pdebuild/eclipse-pdebuild.sh
-+++ b/pdebuild/eclipse-pdebuild.sh
-@@ -123,6 +123,7 @@ sourceDir=$PWD
- buildDir=$PWD/build
- SDK=$buildDir/SDK
- homeDir=$buildDir/home
-+workspaceDir=$homeDir/workspace
- datadir=/usr/lib
- pdeBuildDir=$datadir/eclipse/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@
-
-@@ -195,6 +196,11 @@ if [ $dryRun -ne 1 ]; then
- mkdir -p $homeDir
- fi
-
-+echo "mkdir -p $workspaceDir"
-+if [ $dryRun -ne 1 ]; then
-+ mkdir -p $workspaceDir
-+fi
-+
- if [ -z $featureId ]; then
- findFeatureId
- fi
-@@ -265,7 +271,10 @@ echo "Starting build:"
-
- if [ $testing != true ]; then
- java -cp $SDK/startup.jar \
-+ -Duser.home=$homeDir \
-+ $vmArgs \
- org.eclipse.core.launcher.Main \
-+ -data $workspaceDir \
- -application org.eclipse.ant.core.antRunner \
- $debugPlatformArgs \
- -Dtype=feature \
-@@ -278,14 +287,14 @@ if [ $testing != true ]; then
- -Dtesting="$testing" \
- $additionalArgs \
- -f $pdeBuildDir/scripts/build.xml \
-- -vmargs \
-- -Duser.home=$homeDir \
-- $vmArgs
-
- else
- echo "\
- java -cp $SDK/startup.jar \
-+ -Duser.home=$homeDir \
-+ $vmArgs \
- org.eclipse.core.launcher.Main \
-+ -data $workspaceDir \
- -application org.eclipse.ant.core.antRunner \
- $debugPlatformArgs \
- -Dtype=feature \
-@@ -298,9 +307,6 @@ else
- -Dtesting="$testing" \
- $additionalArgs \
- -f $pdeBuildDir/scripts/build.xml \
-- -vmargs \
-- -Duser.home=$homeDir \
-- $vmArgs
- "
- fi
-
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
