mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-20 08:27:15 +00:00
. Update to 7u11.
Security: CVE-2013-0422
This commit is contained in:
Greg Lewis
parent
f8f8cbf167
commit
53c61a4f9d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=310581
@ -7,7 +7,6 @@
|
||||
|
||||
PORTNAME= openjdk
|
||||
PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
|
||||
http://download.java.net/jaxp/1.4.5/:jaxp \
|
||||
@ -41,8 +40,8 @@ DEBUG_DESC= Enable extra debugging info
|
||||
POLICY_DESC= Install the Unlimited Strength Policy Files
|
||||
TZUPDATE_DESC= Update the time zone data
|
||||
|
||||
PORT_MINOR_VERSION= 9
|
||||
PORT_BUILD_NUMBER= 05
|
||||
PORT_MINOR_VERSION= 11
|
||||
PORT_BUILD_NUMBER= 21
|
||||
JDK_MAJOR_VERSION= 7
|
||||
JDK_MINOR_VERSION= 6
|
||||
JDK_BUILD_NUMBER= 24
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,40 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- jdk/make/java/java/genlocales.gmk.orig 2012-05-03 04:15:03.000000000 -0700
|
||||
+++ jdk/make/java/java/genlocales.gmk 2012-06-15 23:06:56.000000000 -0700
|
||||
@@ -93,6 +93,26 @@
|
||||
|
||||
else
|
||||
|
||||
+ifeq ($(PLATFORM), bsd)
|
||||
+
|
||||
+$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
|
||||
+ @$(RM) $@.tmp.euro $@.tmp.noneuro;
|
||||
+ @$(prep-target)
|
||||
+ @$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\
|
||||
+'@g > $@.tmp.euro;
|
||||
+ @$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\
|
||||
+'@g >> $@.tmp.euro;
|
||||
+ @$(ECHO) $(NonEuro_Resources_properties) | $(SED) -e s@.properties@'\
|
||||
+'@g > $@.tmp.noneuro;
|
||||
+ @$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\
|
||||
+'@g >> $@.tmp.noneuro;
|
||||
+ NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
|
||||
+ $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
|
||||
+ $@.tmp.noneuro $< $@
|
||||
+ @$(RM) $@.tmp.euro $@.tmp.noneuro;
|
||||
+
|
||||
+else
|
||||
+
|
||||
$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
|
||||
@$(RM) $@.tmp.euro $@.tmp.noneuro;
|
||||
@$(prep-target)
|
||||
@@ -105,6 +125,8 @@
|
||||
$@.tmp.noneuro $< $@
|
||||
@$(RM) $@.tmp.euro $@.tmp.noneuro;
|
||||
endif
|
||||
+
|
||||
+endif
|
||||
|
||||
genlocales : $(LocaleDataMetaInfo_Dest)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
85
java/openjdk7/files/patch-zzz-7u11
Normal file
85
java/openjdk7/files/patch-zzz-7u11
Normal file
@ -0,0 +1,85 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User jrose
|
||||
# Date 1357874549 28800
|
||||
# Node ID ecc14534318c80dc7612c8b1d328a67849c5b07f
|
||||
# Parent 88c54f7a8c514b3df459cb086356387cd2c35d8a
|
||||
8004933: Improve MethodHandle interaction with libraries
|
||||
8006017: Improve lookup resolutions
|
||||
Reviewed-by: ahgross
|
||||
|
||||
--- jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java Tue Dec 04 17:28:38 2012 -0800
|
||||
+++ jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java Thu Jan 10 19:22:29 2013 -0800
|
||||
@@ -418,6 +418,21 @@ class MethodHandleNatives {
|
||||
return defc == sun.misc.Unsafe.class;
|
||||
case "lookup":
|
||||
return defc == java.lang.invoke.MethodHandles.class;
|
||||
+ case "findStatic":
|
||||
+ case "findVirtual":
|
||||
+ case "findConstructor":
|
||||
+ case "findSpecial":
|
||||
+ case "findGetter":
|
||||
+ case "findSetter":
|
||||
+ case "findStaticGetter":
|
||||
+ case "findStaticSetter":
|
||||
+ case "bind":
|
||||
+ case "unreflect":
|
||||
+ case "unreflectSpecial":
|
||||
+ case "unreflectConstructor":
|
||||
+ case "unreflectGetter":
|
||||
+ case "unreflectSetter":
|
||||
+ return defc == java.lang.invoke.MethodHandles.Lookup.class;
|
||||
case "invoke":
|
||||
return defc == java.lang.reflect.Method.class;
|
||||
case "get":
|
||||
--- jdk/src/share/classes/java/lang/invoke/MethodHandles.java Tue Dec 04 17:28:38 2012 -0800
|
||||
+++ jdk/src/share/classes/java/lang/invoke/MethodHandles.java Thu Jan 10 19:22:29 2013 -0800
|
||||
@@ -68,6 +68,10 @@ public class MethodHandles {
|
||||
*/
|
||||
public static Lookup lookup() {
|
||||
return new Lookup();
|
||||
+ }
|
||||
+ static {
|
||||
+ // FIXME in MR1: Core Reflection cannot be used to gain a Lookup to perform MH reflection
|
||||
+ Reflection.registerMethodsToFilter(MethodHandles.class, "lookup");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
# HG changeset patch
|
||||
# User jrose
|
||||
# Date 1357955621 28800
|
||||
# Node ID d9969a953f693f5760b1d2759f11a2cb222e4f20
|
||||
# Parent f9567d889266689d5b76f11a23584127848700bc
|
||||
8006125: Update MethodHandles library interactions
|
||||
Reviewed-by: mchung, jdn, ahgross
|
||||
|
||||
--- jdk/src/share/classes/java/lang/invoke/MethodHandles.java Fri Jan 11 09:00:00 2013 -0800
|
||||
+++ jdk/src/share/classes/java/lang/invoke/MethodHandles.java Fri Jan 11 17:53:41 2013 -0800
|
||||
@@ -68,10 +68,6 @@ public class MethodHandles {
|
||||
*/
|
||||
public static Lookup lookup() {
|
||||
return new Lookup();
|
||||
- }
|
||||
- static {
|
||||
- // FIXME in MR1: Core Reflection cannot be used to gain a Lookup to perform MH reflection
|
||||
- Reflection.registerMethodsToFilter(MethodHandles.class, "lookup");
|
||||
}
|
||||
|
||||
/**
|
||||
--- jdk/src/share/classes/sun/reflect/misc/MethodUtil.java Fri Jan 11 09:00:00 2013 -0800
|
||||
+++ jdk/src/share/classes/sun/reflect/misc/MethodUtil.java Fri Jan 11 17:53:41 2013 -0800
|
||||
@@ -256,6 +256,12 @@ public final class MethodUtil extends Se
|
||||
public static Object invoke(Method m, Object obj, Object[] params)
|
||||
throws InvocationTargetException, IllegalAccessException {
|
||||
if (m.getDeclaringClass().equals(AccessController.class) ||
|
||||
+ (m.getDeclaringClass().equals(java.lang.invoke.MethodHandles.class)
|
||||
+ && m.getName().equals("lookup")) ||
|
||||
+ (m.getDeclaringClass().equals(java.lang.invoke.MethodHandles.Lookup.class)
|
||||
+ && (m.getName().startsWith("find") ||
|
||||
+ m.getName().startsWith("bind") ||
|
||||
+ m.getName().startsWith("unreflect"))) ||
|
||||
m.getDeclaringClass().equals(Method.class))
|
||||
throw new InvocationTargetException(
|
||||
new UnsupportedOperationException("invocation not supported"));
|
||||
Loading…
Reference in New Issue
Block a user