# HG changeset patch
# User Deepak Bhole <dbhole@redhat.com>
# Date 1330364726 18000
# Node ID ae17fd44280f1694c041efdecb91822006a6be00
# Parent  2f12ad1ba7a751fa361244dcafaebee972e7350b
PR885: IcedTea7 does not build scripting support

diff -r 2f12ad1ba7a7 -r ae17fd44280f ChangeLog
--- a/ChangeLog	Wed Feb 15 09:46:45 2012 +0000
+++ b/ChangeLog	Mon Feb 27 12:45:26 2012 -0500
@@ -1,3 +1,8 @@
+2012-02-24  Deepak Bhole <dbhole@redhat.com>
+
+	PR885: IcedTea7 does not build scripting support
+	* patches/rhino.patch: Added 'script' to list of modules built.
+
 2011-02-15  Andrew John Hughes  <ahughes@redhat.com>
 
 	* NEWS: Add section for 2.0.2.
diff -r 2f12ad1ba7a7 -r ae17fd44280f NEWS
--- a/NEWS	Wed Feb 15 09:46:45 2012 +0000
+++ b/NEWS	Mon Feb 27 12:45:26 2012 -0500
@@ -11,6 +11,8 @@
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
 New in release 2.0.2 (2012-XX-XX):
+* Bug fixes
+  - PR885: IcedTea7 does not build scripting support
 
 New in release 2.0.1 (2012-02-14):
 
diff -r 2f12ad1ba7a7 -r ae17fd44280f patches/rhino.patch
--- a/patches/rhino.patch	Wed Feb 15 09:46:45 2012 +0000
+++ b/patches/rhino.patch	Mon Feb 27 12:45:26 2012 -0500
@@ -1,6 +1,6 @@
-diff -Nru openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefile
---- openjdk.orig/jdk/make/com/sun/Makefile	2011-10-14 03:02:15.000000000 +0100
-+++ openjdk/jdk/make/com/sun/Makefile	2011-10-19 01:57:22.982499164 +0100
+diff -ur openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefile
+--- openjdk.orig/jdk/make/com/sun/Makefile	2012-02-14 09:01:44.000000000 -0500
++++ openjdk/jdk/make/com/sun/Makefile	2012-02-27 12:42:09.845060405 -0500
 @@ -31,13 +31,6 @@
  PRODUCT = sun
  include $(BUILDDIR)/common/Defs.gmk
@@ -15,9 +15,18 @@
  # jarsigner is part of JRE
  SUBDIRS = java security net/ssl jarsigner
  
-diff -Nru openjdk.orig/jdk/make/com/sun/script/Makefile openjdk/jdk/make/com/sun/script/Makefile
---- openjdk.orig/jdk/make/com/sun/script/Makefile	2011-10-14 03:02:15.000000000 +0100
-+++ openjdk/jdk/make/com/sun/script/Makefile	2011-10-19 01:57:22.994499353 +0100
+@@ -45,7 +38,7 @@
+ SUBDIRS_desktop    = image
+ SUBDIRS_enterprise = crypto/provider jndi \
+                      org rowset net/httpserver
+-SUBDIRS_misc       = $(SCRIPT_SUBDIR) tracing servicetag nio demo
++SUBDIRS_misc       = script tracing servicetag nio demo
+ 
+ # Omit mirror since it's built with the apt tool.
+ SUBDIRS_tools      = tools
+diff -ur openjdk.orig/jdk/make/com/sun/script/Makefile openjdk/jdk/make/com/sun/script/Makefile
+--- openjdk.orig/jdk/make/com/sun/script/Makefile	2012-02-14 09:01:44.000000000 -0500
++++ openjdk/jdk/make/com/sun/script/Makefile	2012-02-27 12:41:56.367278549 -0500
 @@ -31,6 +31,8 @@
  
  AUTO_FILES_JAVA_DIRS = com/sun/script
@@ -27,9 +36,9 @@
  #
  # Files that need to be copied
  #
-diff -Nru openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
---- openjdk.orig/jdk/make/common/Release.gmk	2011-10-14 03:02:15.000000000 +0100
-+++ openjdk/jdk/make/common/Release.gmk	2011-10-19 01:57:22.994499353 +0100
+diff -ur openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
+--- openjdk.orig/jdk/make/common/Release.gmk	2012-02-14 09:01:44.000000000 -0500
++++ openjdk/jdk/make/common/Release.gmk	2012-02-27 12:41:56.367278549 -0500
 @@ -756,6 +756,7 @@
  	$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
  	$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
@@ -38,9 +47,9 @@
  	@# Generate meta-index to make boot and extension class loaders lazier
  	$(CD) $(JRE_IMAGE_DIR)/lib && \
  	    $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java	2011-10-14 03:02:15.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java	2011-10-19 01:57:22.994499353 +0100
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java	2012-02-14 09:01:44.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java	2012-02-27 12:41:56.368278531 -0500
 @@ -24,7 +24,7 @@
   */
  
@@ -50,9 +59,9 @@
  import javax.script.*;
  import java.util.*;
  
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java	2011-10-14 03:02:15.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java	2011-10-19 01:57:22.994499353 +0100
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java	2012-02-14 09:01:44.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java	2012-02-27 12:41:56.368278531 -0500
 @@ -26,7 +26,7 @@
  package com.sun.script.javascript;
  
@@ -62,9 +71,9 @@
  
  /**
   * This class implements Rhino-like JavaAdapter to help implement a Java
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java	2011-10-14 03:02:15.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java	2011-10-19 01:57:22.994499353 +0100
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java	2012-02-14 09:01:44.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java	2012-02-27 12:41:56.368278531 -0500
 @@ -25,7 +25,7 @@
  
  package com.sun.script.javascript;
@@ -74,9 +83,9 @@
  import java.util.*;
  
  /**
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java	2011-10-14 03:02:15.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java	2011-10-19 01:57:22.994499353 +0100
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java	2012-02-14 09:01:44.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java	2012-02-27 12:41:56.368278531 -0500
 @@ -26,7 +26,7 @@
  package com.sun.script.javascript;
  
@@ -86,9 +95,9 @@
  
  /**
   * This class prevents script access to certain sensitive classes.
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java	2011-10-14 03:02:15.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java	2011-10-19 01:57:22.994499353 +0100
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java	2012-02-14 09:01:44.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java	2012-02-27 12:41:56.368278531 -0500
 @@ -25,7 +25,7 @@
  
  package com.sun.script.javascript;
@@ -98,9 +107,9 @@
  
  /**
   * Represents compiled JavaScript code.
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java	2011-10-14 03:02:15.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java	2011-10-19 01:57:22.994499353 +0100
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java	2012-02-14 09:01:44.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java	2012-02-27 12:41:56.368278531 -0500
 @@ -26,7 +26,7 @@
  package com.sun.script.javascript;
  import javax.script.*;
@@ -110,9 +119,9 @@
  import com.sun.script.util.*;
  
  /**
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java	2011-10-14 03:02:15.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java	2011-10-19 01:57:22.994499353 +0100
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java	2012-02-14 09:01:44.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java	2012-02-27 12:41:56.368278531 -0500
 @@ -26,7 +26,7 @@
  package com.sun.script.javascript;
  import com.sun.script.util.*;
@@ -122,9 +131,9 @@
  import java.lang.reflect.Method;
  import java.io.*;
  import java.security.*;
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	2011-10-14 03:02:15.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	2011-10-19 01:57:37.454729539 +0100
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	2012-02-14 09:01:44.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	2012-02-27 12:41:56.368278531 -0500
 @@ -25,7 +25,7 @@
  
  package com.sun.script.javascript;
@@ -134,9 +143,9 @@
  import java.security.AccessControlContext;
  import javax.script.*;
  
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java	2011-10-14 03:02:15.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java	2011-10-19 01:57:22.994499353 +0100
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java	2012-02-14 09:01:44.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java	2012-02-27 12:41:56.368278531 -0500
 @@ -27,7 +27,7 @@
  
  import java.lang.reflect.*;