diff options
| author |   Jan Brinkmann <luckyduck@gentoo.org> | 2005-02-01 13:01:10 +0000 |
|---|---|---|
| committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-02-01 13:01:10 +0000 |
| commit | 52173055558cc4dd9d29a95cb74281f0d767e53e (patch) | |
| tree | 1802fe389acc8fec84331368fe8f533c35491497 /dev-java/rhino | |
| parent | change slot to prepare parallel install of libchipcard 1 and 2 (diff) | |
| download | gentoo-2-52173055558cc4dd9d29a95cb74281f0d767e53e.tar.gz gentoo-2-52173055558cc4dd9d29a95cb74281f0d767e53e.tar.bz2 gentoo-2-52173055558cc4dd9d29a95cb74281f0d767e53e.zip | |
modified the recently added patch
(Portage version: 2.0.51-r15)
Diffstat (limited to 'dev-java/rhino')
| -rw-r--r-- | dev-java/rhino/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/rhino/files/1.5.5_jdk15.patch | 21 |
2 files changed, 14 insertions, 12 deletions
diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog index 07c94df4b365..23dcc508d954 100644 --- a/dev-java/rhino/ChangeLog +++ b/dev-java/rhino/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/rhino # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.27 2005/01/31 22:44:55 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.28 2005/02/01 13:01:10 luckyduck Exp $ + + 01 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> files/1.5.5_jdk15.patch: + modified the recently added patch 31 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +files/1.5.5_jdk15.patch, rhino-1.5.5-r1.ebuild: diff --git a/dev-java/rhino/files/1.5.5_jdk15.patch b/dev-java/rhino/files/1.5.5_jdk15.patch index e1cbccb4648b..0948921b4770 100644 --- a/dev-java/rhino/files/1.5.5_jdk15.patch +++ b/dev-java/rhino/files/1.5.5_jdk15.patch @@ -1,24 +1,23 @@ -diff -uprN toolsrc.orig/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java ---- toolsrc.orig/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2005-01-31 23:35:59.926932408 +0100 -+++ toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2005-01-31 23:42:08.121958256 +0100 -@@ -124,7 +124,8 @@ public class JavaPolicySecurity extends +diff -urpN rhino1_5R5.old/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java +--- rhino1_5R5.old/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2004-03-25 15:54:34.000000000 +0100 ++++ rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2005-02-01 13:58:26.521223264 +0100 +@@ -124,7 +124,7 @@ public class JavaPolicySecurity extends public JavaPolicySecurity() {
// To trigger error on jdk-1.1 with lazy load
- new CodeSource(null, null);
-+ java.security.CodeSigner[] foo = new java.security.CodeSigner[1];
-+ new CodeSource(null, foo);
++ new CodeSource(null, (java.security.cert.Certificate[])null);
}
protected void callProcessFileSecure(final Context cx,
-@@ -167,7 +168,9 @@ public class JavaPolicySecurity extends +@@ -167,8 +167,8 @@ public class JavaPolicySecurity extends }
private ProtectionDomain getUrlDomain(URL url) {
- CodeSource cs = new CodeSource(url, null);
-+ // dummy needed for jdk1.5
-+ java.security.CodeSigner[] foo = new java.security.CodeSigner[1];
-+ CodeSource cs = new CodeSource(url, foo);
- PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
+- PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
++ CodeSource cs = new CodeSource(url, (java.security.cert.Certificate[])null);
++ PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
return new ProtectionDomain(cs, pc);
}
+
|