Date: Fri, 18 Jan 2013 04:28:39 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310581 - in head/java/openjdk7: . files Message-ID: <201301180428.r0I4SdA0043581@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Fri Jan 18 04:28:38 2013 New Revision: 310581 URL: http://svnweb.freebsd.org/changeset/ports/310581 Log: . Update to 7u11. Security: CVE-2013-0422 Added: head/java/openjdk7/files/patch-zzz-7u11 (contents, props changed) Deleted: head/java/openjdk7/files/patch-7u9 head/java/openjdk7/files/patch-make-java-java-genlocales.gmk Modified: head/java/openjdk7/Makefile head/java/openjdk7/files/patch-set (contents, props changed) Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Fri Jan 18 01:29:17 2013 (r310580) +++ head/java/openjdk7/Makefile Fri Jan 18 04:28:38 2013 (r310581) @@ -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 Modified: head/java/openjdk7/files/patch-set ============================================================================== --- head/java/openjdk7/files/patch-set Fri Jan 18 01:29:17 2013 (r310580) +++ head/java/openjdk7/files/patch-set Fri Jan 18 04:28:38 2013 (r310581) @@ -1,5 +1,5 @@ --- .hgtags 2012-08-10 09:07:00.000000000 -0700 -+++ .hgtags 2012-08-19 11:38:54.000000000 -0700 ++++ .hgtags 2013-01-16 08:57:46.000000000 -0800 @@ -123,6 +123,7 @@ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 @@ -8,15 +8,38 @@ 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04 -@@ -197,5 +198,4 @@ +@@ -197,5 +198,27 @@ 29f6fb1833eb2a696b95e8985126f2d70f511a82 jdk7u6-b21 31cdab09d719fe60876c7f3a472386c1455d93e2 jdk7u6-b22 d1c709f1196a73d1df10d04a221b10e30fd2eb48 jdk7u6-b23 -1ab3edf5061fdde3a6f6510373a92444445af710 jdk7u8-b01 -d7a94c8cbbbfadbd9e2f3e4737eb7deb572dedc9 jdk7u8-b02 +e4def733cc8c58e83b7cefa7edd89a3e2b793520 jdk7u6-b24 ++f5f546dba006778854e7a81141fc1b44acd257a4 jdk7u6-b30 ++43775eae8df6c874fb3631c86009505cf3821b1f jdk7u7-b10 ++a380c75873bfb578e605d4362edb18c08698cc3e jdk7u7-b30 ++d7f2b3949f9c9ff1115ea61c496d3cd4c62e2759 jdk7u7-b11 ++82c51e6a3bea0dd8feb1bd3033e847dbdc5d9f99 jdk7u7-b31 ++5ca487420f9c2cf6d39acf1e842d13bf8ef0ca07 jdk7u7-b01 ++dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u7-b02 ++bae912f95f2aa1d22dbc0ff62816b71861965cd6 jdk7u9-b03 ++0000000000000000000000000000000000000000 jdk7u7-b01 ++5ca487420f9c2cf6d39acf1e842d13bf8ef0ca07 jdk7u9-b01 ++0000000000000000000000000000000000000000 jdk7u7-b02 ++dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u9-b02 ++3159fbe20e2d9501007aae8ca3db58978d754561 jdk7u9-b04 ++d9c8fa0606fdfff242175ce904c525a6fc40d6e5 jdk7u9-b05 ++d934ce27cddbc9ba7236791f177872491204a41e jdk7u10-b10 ++5a5ee5b70d563d5817b6ec023d275e9b17256459 jdk7u10-b11 ++48b58c2d665c9a1d3598b981e46f87f9bcdd5b46 jdk7u10-b12 ++1b9618b61e29c09b92f83956c613acf36ccabb38 jdk7u10-b13 ++c50e1a044e4fcc1a94b79b42f3629beb07624010 jdk7u10-b14 ++137087461db28f935493940658f31be760098f00 jdk7u10-b15 ++c8a37a49fc90ae31b864544d6d4a9f6137d4995d jdk7u10-b16 ++494e838439db7f0f4e36f7dcfeba06d2bef78c8d jdk7u10-b17 ++dce9058d2151e6b5c84898c13cfd1521a627a296 jdk7u10-b18 --- corba/.hgtags 2012-08-10 09:09:50.000000000 -0700 -+++ corba/.hgtags 2012-08-19 11:44:59.000000000 -0700 ++++ corba/.hgtags 2013-01-16 08:57:47.000000000 -0800 @@ -123,6 +123,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 @@ -25,15 +48,38 @@ 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04 -@@ -197,5 +198,4 @@ +@@ -197,5 +198,27 @@ 353c15c4bc371f2f8258344c988d1403477cc140 jdk7u6-b21 793b80c0316fcafa18668bced26acb41af3be07d jdk7u6-b22 2a8376123fbb81bc4b2f643ff7cfaf7f87b21c35 jdk7u6-b23 -353c15c4bc371f2f8258344c988d1403477cc140 jdk7u8-b01 -d17ca8d088f7cc0dd42230472f534c8d1e415bcb jdk7u8-b02 +02512f61591f55d84458d1ea4ce84eecb7324f89 jdk7u6-b24 ++8b20875b3faa01ef56331045de88747df278eaeb jdk7u6-b30 ++d7fe6c13adf9e06d98c061449d171bc06c2ba0a3 jdk7u7-b10 ++496baf62d0550c704505b0ff6f390279f6a569e0 jdk7u7-b30 ++e57e4274a3575f278115cc8ef03c5bdf3c43a7ed jdk7u7-b11 ++06cbc4af754ea8f2e3b7d0b1701d1a69ce9d5075 jdk7u7-b31 ++8737f43e092ea52dd85dcf164736eea3b9b364e6 jdk7u7-b01 ++ec602836c4e173927911673d253bb8baa1e3d170 jdk7u7-b02 ++a163e56c6679d10dc64ec48f35e67c3a5942afba jdk7u9-b03 ++0000000000000000000000000000000000000000 jdk7u7-b01 ++8737f43e092ea52dd85dcf164736eea3b9b364e6 jdk7u9-b01 ++0000000000000000000000000000000000000000 jdk7u7-b02 ++ec602836c4e173927911673d253bb8baa1e3d170 jdk7u9-b02 ++268470f3f0d0d7e9b04c579c551571097f0b0305 jdk7u9-b04 ++a5dced409c4b7f940db80846f6efabac74523b0e jdk7u9-b05 ++ba68d4ad02c465a36344a34eba34491466ec17d4 jdk7u10-b10 ++a738921b001a92381bf355a2bb1ecd742ecee352 jdk7u10-b11 ++e52708ecb2c32b366c251e4083fbb37e22a425c3 jdk7u10-b12 ++5cd2ef642635a7d0a79a7c28343b2ddfd0e6aa4a jdk7u10-b13 ++2d53a2c7e4b989ceba356abfc8dc2129269a134f jdk7u10-b14 ++c488cd628db35eb09d8ef9e10ffd00c9a93d0778 jdk7u10-b15 ++64f09d7549d304fbfd3c29b4f148bf44e8e3e979 jdk7u10-b16 ++57c3355153d1624fd98618097c1a82ab3ffc66f8 jdk7u10-b17 ++f2a347637a55fa4de9542a8dcab72ad6fac44d2b jdk7u10-b18 --- get_source.sh 2012-08-10 09:07:01.000000000 -0700 -+++ get_source.sh 2012-08-19 11:38:54.000000000 -0700 ++++ get_source.sh 2013-01-15 23:01:23.000000000 -0800 @@ -1,7 +1,7 @@ #!/bin/sh @@ -53,7 +99,7 @@ # Update all existing repositories to the latest sources sh ./make/scripts/hgforest.sh pull -u --- hotspot/.hgtags 2012-08-10 09:20:36.000000000 -0700 -+++ hotspot/.hgtags 2012-08-19 12:11:03.000000000 -0700 ++++ hotspot/.hgtags 2013-01-16 09:04:00.000000000 -0800 @@ -182,6 +182,7 @@ 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147 @@ -62,26 +108,38 @@ 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02 -@@ -318,5 +319,4 @@ +@@ -318,5 +319,27 @@ 02a6c89432d724119565f9ba25672829b136fc5f jdk7u6-b21 a79d86eef6ac995a1fc35554f082f3a61abe9ae0 jdk7u6-b22 df57f6208cb76b4e8d1a0bd0eea3d2ad577cb79b jdk7u6-b23 -02a6c89432d724119565f9ba25672829b136fc5f jdk7u8-b01 -528502f930967f70c320472a002418f1e38029e0 jdk7u8-b02 +b03c2687fb16514652e79261ad68d2c601dcee62 jdk7u6-b24 ---- hotspot/agent/src/os/bsd/symtab.c 2012-08-10 09:21:04.000000000 -0700 -+++ hotspot/agent/src/os/bsd/symtab.c 2012-08-19 12:11:03.000000000 -0700 -@@ -94,7 +94,7 @@ - if (cursct->sh_type == SHT_SYMTAB || - cursct->sh_type == SHT_STRTAB || - cursct->sh_type == SHT_DYNSYM) { -- if ( (scn_cache[cnt].c_data = read_section_data(fd, &ehdr, cursct)) == NULL) { -+ if ((scn_cache[cnt].c_data = read_section_data(fd, &ehdr, cursct)) == NULL) { - goto quit; - } - } ++cffde29ea7cc8647f17002a4d0e94065dcd82839 jdk7u6-b30 ++f7933fecea9aa494e4032e17ff07e5fcec4b5961 jdk7u7-b10 ++eeef33dc4b40f9ba50c4c9b1ac61b30f0f2523bf jdk7u7-b30 ++f1551c70c7f598b7049bcc33e530fc738a81c7a4 jdk7u7-b11 ++6b9db7216dd4b7846faf372f19566a418c8e391f jdk7u7-b31 ++b66bb0e3224ff15259361a5b501bf8fa6b346113 jdk7u7-b01 ++ca6943c94e6075fc28353d52ac6ea52c80aef9bb jdk7u7-b02 ++e043d96d767d8ba4d74d53c477af8e07b78b6128 jdk7u9-b03 ++0000000000000000000000000000000000000000 jdk7u7-b01 ++b66bb0e3224ff15259361a5b501bf8fa6b346113 jdk7u9-b01 ++0000000000000000000000000000000000000000 jdk7u7-b02 ++ca6943c94e6075fc28353d52ac6ea52c80aef9bb jdk7u9-b02 ++ed42837374ac730ddaf2fd28814017c665634a8b jdk7u9-b04 ++da4aa289ac100017f850ed4d492e8054db6a1e28 jdk7u9-b05 ++d2e25680db9d4209b3f0f51e5c848284cedea508 jdk7u10-b10 ++d37fd995683ab5bc2d941648ce7bf8bd194732f2 jdk7u10-b11 ++f26f3d92e6d9ef7842b2d785f92439dbb15e670e jdk7u10-b12 ++58881c615a5179bcea69148d0b3eb47a1f1a7de8 jdk7u10-b13 ++cdbf4d442b56ece8ac521c65b59087682e5ae918 jdk7u10-b14 ++63e8b49b329e4b50547b13f5c732665bed535732 jdk7u10-b15 ++1cb34ef50bddc334c8538cf85d8612383debc74f jdk7u10-b16 ++5c154a591de987d515f5b102a988bcf96d439f53 jdk7u10-b17 ++78c7e1b4a006342230e04fbb73f637834207abef jdk7u10-b18 --- hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2012-08-10 09:21:14.000000000 -0700 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2012-08-19 12:11:03.000000000 -0700 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2013-01-16 09:04:00.000000000 -0800 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.remote.*; import sun.jvm.hotspot.debugger.windbg.*; @@ -91,7 +149,7 @@ import sun.jvm.hotspot.oops.*; import sun.jvm.hotspot.runtime.*; --- hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2012-08-10 09:21:38.000000000 -0700 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2012-08-19 12:11:03.000000000 -0700 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2013-01-16 09:04:00.000000000 -0800 @@ -35,6 +35,7 @@ import sun.jvm.hotspot.debugger.windbg.*; import sun.jvm.hotspot.debugger.linux.*; @@ -101,7 +159,7 @@ import sun.jvm.hotspot.livejvm.*; import sun.jvm.hotspot.memory.*; --- hotspot/make/bsd/Makefile 2012-08-10 09:22:55.000000000 -0700 -+++ hotspot/make/bsd/Makefile 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/make/bsd/Makefile 2013-01-16 09:04:00.000000000 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -132,7 +190,7 @@ # Synonyms for win32-like targets. compiler2: jvmg product --- hotspot/make/bsd/makefiles/buildtree.make 2012-08-10 09:22:57.000000000 -0700 -+++ hotspot/make/bsd/makefiles/buildtree.make 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/make/bsd/makefiles/buildtree.make 2013-01-16 09:04:00.000000000 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. @@ -167,7 +225,7 @@ .dbxrc: $(BUILDTREE_MAKE) @echo Creating $@ ... --- hotspot/make/bsd/makefiles/defs.make 2012-08-10 09:22:57.000000000 -0700 -+++ hotspot/make/bsd/makefiles/defs.make 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/make/bsd/makefiles/defs.make 2013-01-16 09:04:00.000000000 -0800 @@ -86,7 +86,7 @@ VM_PLATFORM = bsd_i486 HS_ARCH = x86 @@ -342,7 +400,7 @@ ADD_SA_BINARIES/ia64 = ADD_SA_BINARIES/arm = --- hotspot/make/bsd/makefiles/gcc.make 2012-08-10 09:22:57.000000000 -0700 -+++ hotspot/make/bsd/makefiles/gcc.make 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/make/bsd/makefiles/gcc.make 2013-01-16 09:04:00.000000000 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -400,7 +458,7 @@ + STRIP = strip +endif --- hotspot/make/bsd/makefiles/jsig.make 2012-08-10 09:22:58.000000000 -0700 -+++ hotspot/make/bsd/makefiles/jsig.make 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/make/bsd/makefiles/jsig.make 2013-01-16 09:04:00.000000000 -0800 @@ -36,9 +36,16 @@ LIBJSIG_G = lib$(JSIG_G).so endif @@ -454,7 +512,7 @@ .PHONY: install_jsig --- hotspot/make/bsd/makefiles/launcher.make 2012-08-10 09:22:58.000000000 -0700 -+++ hotspot/make/bsd/makefiles/launcher.make 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/make/bsd/makefiles/launcher.make 2013-01-16 09:04:00.000000000 -0800 @@ -50,7 +50,7 @@ LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) else @@ -465,7 +523,7 @@ # The gamma launcher runs the JDK from $JAVA_HOME, overriding the JVM with a # freshly built JVM at ./libjvm.{so|dylib}. This is accomplished by setting --- hotspot/make/bsd/makefiles/mapfile-vers-debug 2012-08-10 09:22:58.000000000 -0700 -+++ hotspot/make/bsd/makefiles/mapfile-vers-debug 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/make/bsd/makefiles/mapfile-vers-debug 2013-01-16 09:04:00.000000000 -0800 @@ -221,6 +221,7 @@ JVM_SetArrayElement; JVM_SetClassSigners; @@ -500,7 +558,7 @@ JVM_AccessVMBooleanFlag; JVM_AccessVMIntFlag; --- hotspot/make/bsd/makefiles/mapfile-vers-product 2012-08-10 09:22:58.000000000 -0700 -+++ hotspot/make/bsd/makefiles/mapfile-vers-product 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/make/bsd/makefiles/mapfile-vers-product 2013-01-16 09:04:00.000000000 -0800 @@ -221,6 +221,7 @@ JVM_SetArrayElement; JVM_SetClassSigners; @@ -535,7 +593,7 @@ jio_fprintf; jio_printf; --- hotspot/make/bsd/makefiles/ppc.make 2012-08-10 09:22:58.000000000 -0700 -+++ hotspot/make/bsd/makefiles/ppc.make 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/make/bsd/makefiles/ppc.make 2013-01-16 09:04:00.000000000 -0800 @@ -28,3 +28,6 @@ # Must also specify if CPU is big endian CFLAGS += -DVM_BIG_ENDIAN @@ -544,7 +602,7 @@ +ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1 +endif --- hotspot/make/bsd/makefiles/saproc.make 2012-08-10 09:22:59.000000000 -0700 -+++ hotspot/make/bsd/makefiles/saproc.make 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/make/bsd/makefiles/saproc.make 2013-01-16 09:04:00.000000000 -0800 @@ -36,6 +36,11 @@ LIBSAPROC_G = lib$(SAPROC_G).so endif @@ -602,7 +660,7 @@ fi --- hotspot/make/bsd/makefiles/vm.make 2012-08-10 09:22:59.000000000 -0700 -+++ hotspot/make/bsd/makefiles/vm.make 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/make/bsd/makefiles/vm.make 2013-01-16 09:04:00.000000000 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -709,8 +767,21 @@ $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done" #---------------------------------------------------------------------- +--- hotspot/make/hotspot_version 2012-08-10 09:23:01.000000000 -0700 ++++ hotspot/make/hotspot_version 2013-01-16 08:57:49.000000000 -0800 +@@ -34,8 +34,8 @@ + HOTSPOT_VM_COPYRIGHT=Copyright 2012 + + HS_MAJOR_VER=23 +-HS_MINOR_VER=2 +-HS_BUILD_NUMBER=09 ++HS_MINOR_VER=6 ++HS_BUILD_NUMBER=04 + + JDK_MAJOR_VER=1 + JDK_MINOR_VER=7 --- hotspot/make/solaris/makefiles/defs.make 2012-08-10 09:23:12.000000000 -0700 -+++ hotspot/make/solaris/makefiles/defs.make 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/make/solaris/makefiles/defs.make 2013-01-16 09:04:00.000000000 -0800 @@ -194,8 +194,8 @@ endif ifeq ($(ARCH_DATA_MODEL), 32) @@ -723,7 +794,7 @@ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) --- hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2012-08-10 09:23:56.000000000 -0700 -+++ hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2012-08-19 12:11:04.000000000 -0700 ++++ hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2013-01-16 09:04:00.000000000 -0800 @@ -71,7 +71,11 @@ define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); @@ -736,22 +807,139 @@ // GC Ergo Flags define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread ---- hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2012-08-10 09:24:15.000000000 -0700 -+++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2012-08-19 12:11:05.000000000 -0700 -@@ -212,7 +212,10 @@ - // (this is the default on linux, but not on mac os) - RESTARTABLE(::chown(initial_path, geteuid(), getegid()), res); - if (res == 0) { -- res = ::rename(initial_path, path); -+ RESTARTABLE(::chown(initial_path, geteuid(), getegid()), res); -+ if (res == 0) { -+ res = ::rename(initial_path, path); +--- hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp 2012-08-10 09:23:58.000000000 -0700 ++++ hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp 2013-01-16 08:57:49.000000000 -0800 +@@ -698,6 +698,17 @@ + if (arg_slots.is_constant() && arg_slots.as_constant() == 0) + return; + ++ // We have to insert at least one word, so bang the stack. ++ if (UseStackBanging) { ++ // Save G3_method_handle since bang_stack_with_offset uses it as a temp register ++ __ mov(G3_method_handle, temp_reg); ++ int frame_size = (arg_slots.is_constant() ? -1 * arg_slots.as_constant() * wordSize : 0); ++ if (frame_size <= 0) ++ frame_size = 256 * Interpreter::stackElementSize; // conservative ++ __ generate_stack_overflow_check(frame_size); ++ __ mov(temp_reg, G3_method_handle); ++ } ++ + assert_different_registers(argslot_reg, temp_reg, temp2_reg, temp3_reg, + (!arg_slots.is_register() ? Gargs : arg_slots.as_register())); + +@@ -1702,6 +1713,14 @@ + "copied argument(s) must fall within current frame"); + } + ++ if (UseStackBanging) { ++ // Save G3_method_handle since bang_stack_with_offset uses it as a temp register ++ __ mov(G3_method_handle, O3_scratch); ++ // Bang the stack before pushing args. ++ int frame_size = 256 * Interpreter::stackElementSize; // conservative ++ __ generate_stack_overflow_check(frame_size + sizeof(RicochetFrame)); ++ __ mov(O3_scratch, G3_method_handle); ++ } + // insert location is always the bottom of the argument list: + __ neg(O1_stack_move); + push_arg_slots(_masm, O0_argslot, O1_stack_move, O2_scratch, O3_scratch); +@@ -2118,6 +2137,18 @@ + // The return handler will further cut back the stack when it takes + // down the RF. Perhaps there is a way to streamline this further. + ++ if (UseStackBanging) { ++ // Save G3_method_handle since bang_stack_with_offset uses it as a temp register ++ __ mov(G3_method_handle, O4_scratch); ++ // Bang the stack before recursive call. ++ // Even if slots == 0, we are inside a RicochetFrame. ++ int frame_size = collect_count.is_constant() ? collect_count.as_constant() * wordSize : -1; ++ if (frame_size < 0) { ++ frame_size = 256 * Interpreter::stackElementSize; // conservative + } ++ __ generate_stack_overflow_check(frame_size + sizeof(RicochetFrame)); ++ __ mov(O4_scratch, G3_method_handle); ++ } + // State during recursive call: + // ... keep1 | dest | dest=42 | keep3 | RF... | collect | bounce_pc | + __ jump_to_method_handle_entry(G3_method_handle, O1_scratch); +--- hotspot/src/cpu/x86/vm/methodHandles_x86.cpp 2012-08-10 09:24:07.000000000 -0700 ++++ hotspot/src/cpu/x86/vm/methodHandles_x86.cpp 2013-01-16 08:57:49.000000000 -0800 +@@ -691,6 +691,14 @@ + if (VerifyMethodHandles) + verify_stack_move(_masm, arg_slots, -1); + ++ // We have to insert at least one word, so bang the stack. ++ if (UseStackBanging) { ++ int frame_size = (arg_slots.is_constant() ? -1 * arg_slots.as_constant() * wordSize : 0); ++ if (frame_size <= 0) ++ frame_size = 256 * Interpreter::stackElementSize; // conservative ++ __ generate_stack_overflow_check(frame_size); ++ } ++ + // Make space on the stack for the inserted argument(s). + // Then pull down everything shallower than rax_argslot. + // The stacked return address gets pulled down with everything else. +@@ -1769,6 +1777,11 @@ + "copied argument(s) must fall within current frame"); } - } - } + ++ if (UseStackBanging) { ++ // Bang the stack before pushing args. ++ int frame_size = 256 * Interpreter::stackElementSize; // conservative ++ __ generate_stack_overflow_check(frame_size + sizeof(RicochetFrame)); ++ } + // insert location is always the bottom of the argument list: + Address insert_location = __ argument_address(constant(0)); + int pre_arg_words = insert_location.disp() / wordSize; // return PC is pushed +@@ -2206,6 +2219,15 @@ + // The return handler will further cut back the stack when it takes + // down the RF. Perhaps there is a way to streamline this further. + ++ if (UseStackBanging) { ++ // Bang the stack before recursive call. ++ // Even if slots == 0, we are inside a RicochetFrame. ++ int frame_size = collect_count.is_constant() ? collect_count.as_constant() * wordSize : -1; ++ if (frame_size < 0) { ++ frame_size = 256 * Interpreter::stackElementSize; // conservative ++ } ++ __ generate_stack_overflow_check(frame_size + sizeof(RicochetFrame)); ++ } + // State during recursive call: + // ... keep1 | dest | dest=42 | keep3 | RF... | collect | bounce_pc | + __ jump_to_method_handle_entry(rcx_recv, rdx_temp); +@@ -2366,10 +2388,15 @@ + // case in a 32-bit version of the VM) we have to save 'rsi' + // on the stack because later on (at 'L_array_is_empty') 'rsi' + // will be overwritten. +- { if (rsi_temp == saved_last_sp) __ push(saved_last_sp); } ++ if (rsi_temp == saved_last_sp) { ++ __ push(saved_last_sp); ++ // Need to re-push return PC to keep it on stack top. ++ __ lea(saved_last_sp, ExternalAddress(SharedRuntime::ricochet_blob()->bounce_addr()).addr()); ++ __ push(saved_last_sp); ++ } + // Also prepare a handy macro which restores 'rsi' if required. + #define UNPUSH_RSI \ +- { if (rsi_temp == saved_last_sp) __ pop(saved_last_sp); } ++ { if (rsi_temp == saved_last_sp) { __ pop(saved_last_sp); __ pop(saved_last_sp); } } + + __ jmp(L_array_is_empty); + __ bind(L_skip); +@@ -2382,7 +2409,12 @@ + // called in the case of a null pointer exception will not be + // confused by the extra value on the stack (it expects the + // return pointer on top of the stack) +- { if (rsi_temp == saved_last_sp) __ push(saved_last_sp); } ++ if (rsi_temp == saved_last_sp) { ++ __ push(saved_last_sp); ++ // Need to re-push return PC to keep it on stack top. ++ __ lea(saved_last_sp, ExternalAddress(SharedRuntime::ricochet_blob()->bounce_addr()).addr()); ++ __ push(saved_last_sp); ++ } + + // Check the array type. + Register rbx_klass = rbx_temp; --- hotspot/src/os/bsd/vm/decoder_bsd.cpp 1969-12-31 16:00:00.000000000 -0800 -+++ hotspot/src/os/bsd/vm/decoder_bsd.cpp 2012-08-19 12:11:05.000000000 -0700 ++++ hotspot/src/os/bsd/vm/decoder_bsd.cpp 2013-01-16 09:04:00.000000000 -0800 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -800,7 +988,7 @@ +} + --- hotspot/src/os/bsd/vm/os_bsd.cpp 2012-08-10 09:24:18.000000000 -0700 -+++ hotspot/src/os/bsd/vm/os_bsd.cpp 2012-08-19 12:11:05.000000000 -0700 ++++ hotspot/src/os/bsd/vm/os_bsd.cpp 2013-01-16 09:04:00.000000000 -0800 @@ -2341,14 +2341,14 @@ } @@ -907,7 +1095,7 @@ void os::numa_make_global(char *addr, size_t bytes) { --- hotspot/src/os/bsd/vm/os_bsd.hpp 2012-08-10 09:24:18.000000000 -0700 -+++ hotspot/src/os/bsd/vm/os_bsd.hpp 2012-08-19 12:11:05.000000000 -0700 ++++ hotspot/src/os/bsd/vm/os_bsd.hpp 2013-01-16 09:04:00.000000000 -0800 @@ -103,6 +103,12 @@ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); @@ -922,7 +1110,7 @@ static void init_thread_fpu_state(); --- hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2012-08-10 09:24:18.000000000 -0700 -+++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2012-08-19 12:11:05.000000000 -0700 ++++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2013-01-16 09:04:00.000000000 -0800 @@ -31,10 +31,22 @@ # include "atomic_bsd_x86.inline.hpp" # include "orderAccess_bsd_x86.inline.hpp" @@ -947,7 +1135,7 @@ // System includes --- hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2012-08-10 09:24:18.000000000 -0700 -+++ hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2012-08-19 12:11:05.000000000 -0700 ++++ hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2013-01-16 09:04:00.000000000 -0800 @@ -34,11 +34,26 @@ # include "orderAccess_bsd_x86.inline.hpp" # include "prefetch_bsd_x86.inline.hpp" @@ -975,8 +1163,30 @@ // Contains inlined functions for class Thread and ThreadLocalStorage +--- hotspot/src/os/posix/vm/os_posix.cpp 2012-08-10 09:24:20.000000000 -0700 ++++ hotspot/src/os/posix/vm/os_posix.cpp 2013-01-16 09:04:00.000000000 -0800 +@@ -110,11 +110,19 @@ + if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); + else st->print("%d", rlim.rlim_cur); + ++#ifdef __OpenBSD__ ++ st->print(", DATA "); ++ getrlimit(RLIMIT_DATA, &rlim); ++ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); ++ else st->print("%uk", rlim.rlim_cur >> 10); ++ st->cr(); ++#else + st->print(", AS "); + getrlimit(RLIMIT_AS, &rlim); + if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); + else st->print("%uk", rlim.rlim_cur >> 10); + st->cr(); ++#endif + } + + void os::Posix::print_uname_info(outputStream* st) { --- hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2012-08-10 09:24:32.000000000 -0700 -+++ hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2012-08-19 12:11:05.000000000 -0700 ++++ hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2013-01-16 09:04:00.000000000 -0800 @@ -52,7 +52,7 @@ /* Posix Thread IDs */ \ /**********************/ \ @@ -987,7 +1197,7 @@ \ /* This must be the last entry, and must be present */ \ --- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2012-08-10 09:24:33.000000000 -0700 -+++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2012-08-19 12:11:05.000000000 -0700 ++++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2013-01-16 09:04:00.000000000 -0800 @@ -24,7 +24,7 @@ */ @@ -997,8 +1207,68 @@ # include <pthread_np.h> /* For pthread_attr_get_np */ #endif +--- hotspot/src/share/vm/compiler/compilerOracle.cpp 2012-08-10 09:26:19.000000000 -0700 ++++ hotspot/src/share/vm/compiler/compilerOracle.cpp 2013-01-16 08:57:49.000000000 -0800 +@@ -575,7 +575,7 @@ + char token[1024]; + int pos = 0; + int c = getc(stream); +- while(c != EOF) { ++ while(c != EOF && pos < (int)(sizeof(token)-1)) { + if (c == '\n') { + token[pos++] = '\0'; + parse_from_line(token); +@@ -596,7 +596,7 @@ + int pos = 0; + const char* sp = str; + int c = *sp++; +- while (c != '\0') { ++ while (c != '\0' && pos < (int)(sizeof(token)-1)) { + if (c == '\n') { + token[pos++] = '\0'; + parse_line(token); +--- hotspot/src/share/vm/opto/loopTransform.cpp 2012-08-10 09:27:38.000000000 -0700 ++++ hotspot/src/share/vm/opto/loopTransform.cpp 2013-01-16 08:57:50.000000000 -0800 +@@ -2733,6 +2733,8 @@ + result_mem = new (C, 1) ProjNode(call,TypeFunc::Memory); + _igvn.register_new_node_with_optimizer(result_mem); + ++/* Disable following optimization until proper fix (add missing checks). ++ + // If this fill is tightly coupled to an allocation and overwrites + // the whole body, allow it to take over the zeroing. + AllocateNode* alloc = AllocateNode::Ideal_allocation(base, this); +@@ -2756,6 +2758,7 @@ + #endif + } + } ++*/ + + // Redirect the old control and memory edges that are outside the loop. + Node* exit = head->loopexit()->proj_out(0); +--- hotspot/src/share/vm/runtime/arguments.cpp 2012-08-10 09:27:53.000000000 -0700 ++++ hotspot/src/share/vm/runtime/arguments.cpp 2013-01-16 09:04:00.000000000 -0800 +@@ -829,6 +829,9 @@ + } else { + jio_fprintf(defaultStream::error_stream(), "%s", locked_message_buf); + } ++ } else { ++ jio_fprintf(defaultStream::error_stream(), ++ "Unrecognized VM option '%s'\n", argname); + } + + // allow for commandline "commenting out" options like -XX:#+Verbose +@@ -857,7 +860,7 @@ + bool result = true; + + int c = getc(stream); +- while(c != EOF) { ++ while(c != EOF && pos < (int)(sizeof(token)-1)) { + if (in_white_space) { + if (in_comment) { + if (c == '\n') in_comment = false; --- hotspot/src/share/vm/runtime/atomic.cpp 2012-08-10 09:27:53.000000000 -0700 -+++ hotspot/src/share/vm/runtime/atomic.cpp 2012-08-19 12:11:07.000000000 -0700 ++++ hotspot/src/share/vm/runtime/atomic.cpp 2013-01-16 09:04:00.000000000 -0800 @@ -54,6 +54,12 @@ #ifdef TARGET_OS_ARCH_windows_x86 # include "atomic_windows_x86.inline.hpp" @@ -1013,7 +1283,7 @@ # include "atomic_linux_arm.inline.hpp" #endif --- hotspot/src/share/vm/runtime/os.hpp 2012-08-10 09:28:05.000000000 -0700 -+++ hotspot/src/share/vm/runtime/os.hpp 2012-08-19 12:11:07.000000000 -0700 ++++ hotspot/src/share/vm/runtime/os.hpp 2013-01-16 09:04:00.000000000 -0800 @@ -30,6 +30,9 @@ #include "runtime/extendedPC.hpp" #include "runtime/handles.hpp" @@ -1035,7 +1305,7 @@ #ifdef TARGET_OS_ARCH_linux_x86 # include "os_linux_x86.hpp" --- hotspot/test/compiler/5091921/Test7005594.sh 2012-08-10 09:28:58.000000000 -0700 -+++ hotspot/test/compiler/5091921/Test7005594.sh 2012-08-19 12:11:07.000000000 -0700 ++++ hotspot/test/compiler/5091921/Test7005594.sh 2013-01-16 09:04:00.000000000 -0800 @@ -71,6 +71,9 @@ # Windows/MKS MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'` @@ -1046,8 +1316,77 @@ else echo "Unable to determine amount of physical memory on the machine" fi +--- hotspot/test/compiler/7158807/Test7158807.java 1969-12-31 16:00:00.000000000 -0800 ++++ hotspot/test/compiler/7158807/Test7158807.java 2013-01-16 08:57:50.000000000 -0800 +@@ -0,0 +1,66 @@ ++/* ++ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ * ++ */ ++ ++/** ++ * @test ++ * @bug 7158807 ++ * @summary Revise stack management with volatile call sites ++ * @author Marc Schonefeld ++ * ++ * @run main/othervm -XX:CompileThreshold=100 -Xbatch -Xss248k Test7158807 ++ */ ++ ++import java.lang.invoke.MethodHandle; ++import java.lang.invoke.MethodType; ++import java.lang.invoke.VolatileCallSite; ++ ++public class Test7158807 { ++ /** ++ * @param args the command line arguments ++ */ ++ public static void main(String[] args) throws Throwable { ++ for (int i = 0; i < 25600; i++) { ++ MethodType mt = MethodType.methodType(java.lang.String.class); ++ System.out.println(mt); ++ MethodType mt3 = null; ++ try { ++ mt3 = MethodType.genericMethodType(i); ++ } catch (IllegalArgumentException e) { ++ System.out.println("Passed"); ++ System.exit(95); ++ } ++ System.out.println(i+":"); ++ try { ++ VolatileCallSite vcs = new VolatileCallSite(mt3); ++ System.out.println(vcs); ++ MethodHandle mh = vcs.dynamicInvoker(); ++ vcs.setTarget(mh); ++ // System.out.println(mh); ++ mh.invoke(mt, mh); ++ } catch (Throwable e) { ++ } ++ } ++ } ++} ++ --- hotspot/test/gc/6941923/test6941923.sh 2012-08-10 09:29:15.000000000 -0700 -+++ hotspot/test/gc/6941923/test6941923.sh 2012-08-19 12:11:08.000000000 -0700 ++++ hotspot/test/gc/6941923/test6941923.sh 2013-01-16 09:04:00.000000000 -0800 @@ -9,7 +9,7 @@ ## skip on windows OS=`uname -s` @@ -1058,7 +1397,7 @@ PS=":" FS="/" --- hotspot/test/runtime/7020373/Test7020373.sh 2012-08-10 09:29:17.000000000 -0700 -+++ hotspot/test/runtime/7020373/Test7020373.sh 2012-08-19 12:11:08.000000000 -0700 ++++ hotspot/test/runtime/7020373/Test7020373.sh 2013-01-16 09:04:00.000000000 -0800 @@ -32,7 +32,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1069,7 +1408,7 @@ PS=":" FS="/" --- hotspot/test/runtime/7110720/Test7110720.sh 2012-08-10 09:29:18.000000000 -0700 -+++ hotspot/test/runtime/7110720/Test7110720.sh 2012-08-19 12:11:08.000000000 -0700 ++++ hotspot/test/runtime/7110720/Test7110720.sh 2013-01-16 09:04:00.000000000 -0800 @@ -37,7 +37,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1079,8 +1418,1472 @@ FS="/" RM=/bin/rm CP=/bin/cp +--- hotspot/test/runtime/7158800/BadUtf8.java 2012-08-10 09:29:18.000000000 -0700 ++++ hotspot/test/runtime/7158800/BadUtf8.java 1969-12-31 16:00:00.000000000 -0800 +@@ -1,1254 +0,0 @@ +-/* +- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +- * +- * This code is free software; you can redistribute it and/or modify it +- * under the terms of the GNU General Public License version 2 only, as +- * published by the Free Software Foundation. +- * +- * This code is distributed in the hope that it will be useful, but WITHOUT +- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +- * version 2 for more details (a copy is included in the LICENSE file that +- * accompanied this code). +- * +- * You should have received a copy of the GNU General Public License version +- * 2 along with this work; if not, write to the Free Software Foundation, +- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +- * +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. +- */ +- +-/* +- * @test +- * @bug 7158800 +- * @summary Test that 1200 symbols that hash to the same value triggers +- * the symbol table alternate hashing mechanism. There isn't actually a +- * way to verify this. +- */ +-// +-// Generate large number of strings that hash to the same value +-// to slow down symbol table lookup. +- +-import java.io.BufferedOutputStream; +-import java.io.FileOutputStream; +- +-public class BadUtf8 { +-static String[] strings = { +- "EOcLKvbddZyPxYpb", +- "DncLKvbdPxmAGrqj", +- "DoCjjvbdpxoIHQdY", +- "EPCkKvbdqYoHfqEY", +- "DnbkKvbdezvYdiUX", +- "DnbjjvbdeEoRbXCj", +- "EObkKvbdbsCkUEKB", +- "EOcLKvbdnUtyjiqf", +- "DncLKvbdRWnDcMHc", +- "DoCkKvbdrSUkOLAm", +- "DncLKvbdfNFwGmJk", +- "EPDLKvbdvAdYroFI", +- "DoDLKvbdiGibyViu", +- "DncLKvbdYqNEhmFR", +- "DoCkKvbdEARhlzXX", +- "DncLKvbdSZjHsCvA", +- "DncKjvbdqTsgRqkU", +- "DnbjjvbdqAiFAXHd", +- "EPDKjvbdGcjvJaij", +- "DnbkKvbdwtldpxkn", +- "DoDKjvbdYkrETnMN", +- "EPCjjvbdbBWEfQQX", +- "EPCjjvbduMXwAtBX", +- "DncLKvbdbsCkTcia", +- "DoCjjvbdczYpYZRC", +- "EOcKjvbdFeiqmhsq", +- "DoCkKvbdKCicQibx", +- "EOcKjvbdZLrEUOLm", +- "DoCjjvbdaNKbStmH", +- "DoDKjvbdJbjDQjDY", +- "EPCkKvbdemFwGmKL", +- "EPDKjvbdZQleImEq", +- "DncKjvbdZjShPfbG", +- "DnbjjvbdqYnhHREY", +- "DoCkKvbdaRfDIUGL", +- "DoDKjvbdLrWlyuQz", +- "DnbjjvbdZisHofaf", +- "EObjjvbdhtydvrUb", +- "DnbjjvbdRotHKGEX", +- "EObjjvbdNeEThhkE", +- "EPCjjvbdZtJJZESn", +- "DoDKjvbdnPyxvLYb", +- "EPDKjvbdeEoRbWbj", +- "EOcLKvbdFxttaEXb", +- "EObjjvbddwystRez", +- "EPCjjvbdJpzEnenF", +- "DnbkKvbdTppntuIN", +- "EPCkKvbdTukpKUBR", +- "DnbkKvbdhlFEOUcZ", +- "EObkKvbdlhdUQuRa", +- "DnbjjvbdkClKqHUg", +- "EOcKjvbdqTtGqqkU", +- "DncKjvbdtkwvaUBX", +- "DoDKjvbdsQWOjCuf", +- "DncLKvbdEKIJuwjA", +- "DncKjvbdGLErcIMu", +- "EOcLKvbdNPwpumfs", +- "EObkKvbdnVUzLJrG", +- "DoCkKvbdcTDKsdKB", +- "DncKjvbdKRZdoFme", +- "EOcLKvbdemFvgNKL", +- "EPCkKvbdznopdblY", +- "EPDLKvbdOYPVzdOU", +- "DnbjjvbdsZlPsAhO", +- "DoDLKvbdKCjDRKDY", +- "DoCkKvbdhuZeXSVC", +- "EPDKjvbdOStVgEtp", +- "DncLKvbdvwMAvBWV", +- "EPDKjvbdBcoaWJlf", +- "EOcKjvbdZxdKODMS", +- "DoCjjvbdbsCkTcjB", +- "EOcLKvbdwWlAuaWV", +- "DnbjjvbdFejRnJUR", +- "DnbjjvbdmIdTqVSB", +- "DnbkKvbdqBIeAWhE", +- "DncKjvbdrMzJyMIJ", +- "DoCkKvbdZGvdAOsJ", +- "DncLKvbdjggLfFnL", +- "DoCjjvbdYqNFJMdq", +- "DoCkKvbdqZPHfqDx", +- "DncLKvbdOEdThiLE", +- "DoCkKvbdZirgpGaf", +- "EPDLKvbdziuQPdSt", +- "EObkKvbdKQyeOenF", +- "DoDLKvbduaDySndh", +- "DoCjjvbdVUNUGLvK", +- "DncKjvbdAMhYrvzY", +- "DnbkKvbdnQZxvKxb", +- "EPCjjvbdBhjakJFj", +- "DncLKvbdmfeYNNfy", +- "DoDLKvbdjlbLydfo", +- "DoDLKvbdpyPIGpcx", +- "EOcLKvbdnVUzLJqf", +- "DoCjjvbdmJETqVSB", +- "DoDLKvbdJTZAsMxM", +- "DoCkKvbdnQZxvLZC", +- "DoDKjvbdACqwizJQ", +- "DncKjvbdvBEZSoFI", +- "DncKjvbdGckVjCJj", +- "DncLKvbdiMFENtcZ", +- "Dnbjjvbdjuvmcaww", +- "DnbkKvbdZyEKNblS", +- "DoCjjvbduMYXBUBX", +- "DnbjjvbdFWYopNJe", +- "DoDKjvbdelfXGljL", +- "DnbjjvbdakLenmcA", +- "EPDKjvbdfILWRmpg", +- "EObjjvbdSLYeuHLT", +- "DoCjjvbdMfbolotk", +- "EPDLKvbdrRuKnKaN", +- "EOcKjvbdyzdnRhIh", +- "DoDLKvbdGAoRZJzm", +- "DoCjjvbdhlFDnUcZ", +- "EPDLKvbdmpZyVkYb", +- "DncKjvbdTpqPUuIN", +- "DncLKvbdHDjvJaij", +- "EPDLKvbdYlRcsmkm", +- "EPDLKvbdvlvAMdFN", +- "DncKjvbdIsZArmYM", +- "EOcLKvbdegjuqnQg", +- "EOcLKvbdZQmFJNFR", +- "DoCjjvbdZxdJmcMS", +- "EPCkKvbdlZTSTYgU", +- "DoDKjvbdqceJPnWB", +- "DncLKvbdVgwuxGxz", +- "DncKjvbdDnbkLXDE", +- "EPDLKvbdatbHYKsh", +- "DncKjvbdEzsqFLbi", +- "EPDLKvbdnVVZkKRf", +- "EOcKjvbdKeegbBQu", +- "EPCkKvbdKfGHaaRV", +- "EPDKjvbdmIctRVRa", +- "EPCjjvbdRMxBxnUz", +- "DnbjjvbdJYTbILpp", +- "EPCkKvbdTAEiHbPE", +- "EOcLKvbdfelZnGgA", +- "DoCjjvbdOStWGeUp", +- "EOcLKvbdemGXHNJk", +- "DoDKjvbdYTMAmUOx", +- "EPCkKvbdpyOhGpcx", +- "EPCkKvbdAMgxsWzY", +- "DnbjjvbdYkrETnMN", +- "EPDLKvbdUQqPUtgm", +- "DncKjvbdehKurNqH", +- "DoCjjvbdZMSETnLm", +- "DoDKjvbdIHGyyXwg", +- "EObjjvbdXGYzUAPT", +- "DoCjjvbdhbPCeWqR", +- "DoCkKvbdKNADzGuB", +- "DnbjjvbdFeirOJTq", +- "DncLKvbdaRecHtFk", +- "DnbkKvbdzoPpeClY", +- "EObkKvbdZRMeJMeR", +- "DnbjjvbdYfvdAPSi", +- "DncLKvbdJcKCqJcY", +- "EOcLKvbdqvokbhyR", +- "DoDLKvbdrRuLNjaN", +- "DoCjjvbdTlWPBWOi", +- "DoCkKvbdjvWnEBxX", +- "DoDLKvbdTkunaVoJ", +- "DoCkKvbdQZNAHTSK", +- "EObjjvbdqwPkbhyR", +- "EOcLKvbdNHDPlpUk", +- "DncLKvbdIHHZxxYH", +- "DncLKvbdtkxXAtAw", +- "DncLKvbdSCEFMJZL", +- "DnbjjvbdZQmEhldq", +- "DoCjjvbdNGbolotk", +- "DnbjjvbdnCKWwnmu", +- "DncLKvbdzHZMANEw", +- "DoDKjvbdmttykJrG", +- "DnbkKvbdlrZUzSci", +- "EPDKjvbdSKyGVHKs", +- "DoCjjvbdKVuGEFGi", +- "EPCjjvbdCIkBkIej", +- "DncLKvbdzHZMAMeX", +- "DnbkKvbdaSFbgsek", +- "DncLKvbdHDjujBij", +- "DoDKjvbdGZVUaDwb", +- "DnbjjvbdZnnJFEzK", +- "DoCkKvbdtcDUwWOo", +- "DoCkKvbdlBMoNALA", +- "EOcKjvbdNsUWHFUp", +- "DoDLKvbdVUNUFlVj", +- "DnbkKvbdhkdcnUcZ", +- "DncLKvbdLiBkqYAS", +- "EOcKjvbdzoPpdcLx", +- "EPDKjvbdijGIJmXr", +- "EOcKjvbdZisHofaf", +- "DoDLKvbdeOdrkUUS", +- "DoDLKvbdnPyxvKxb", +- "EPDKjvbdIxUBhMRQ", +- "DncLKvbdlhctRUqa", +- "DoDLKvbdmgFXlnGy", +- "DncKjvbdCJKbKiGK", +- "EOcLKvbddndrjtUS", +- "DnbjjvbdkDLjqGuH", +- "DncKjvbdmIcsptqa", +- "DoCkKvbdvvlAvBWV", +- "EObjjvbdjblLQftg", +- "DnbjjvbdCEQBWKMf", +- "DnbjjvbdBdPaVilf", +- "DoCkKvbdZxcjODLr", +- "DoCkKvbdEObjjwCd", +- "EPDKjvbdyTNhlqbH", +- "EPCkKvbdUMVoAvPJ", +- "DncKjvbdUxhUZjoO", +- "DncKjvbdqqtjmkAm", +- "DncKjvbdKfGICBRV", +- "EPCjjvbdVrOXaeLc", +- "EPDLKvbdwXLaWBWV", +- "EPCkKvbdjblKqHUg", +- "DnbjjvbduDCuWuoP", +- "EPDKjvbdNGbpMouL", +- "EObjjvbdBcoaVjNG", +- "DncLKvbdrWpMDIxq", +- "DncLKvbdhaoCdwRR", +- "DnbkKvbdFxtuBDwb", +- "DncKjvbdIjEAKPgE", +- "EOcLKvbduCbuXVoP", +- "DoDKjvbdZtIiZDsO", +- "DnbjjvbdEztRElCi", +- "DncLKvbdxmsHwsJD", +- "DnbjjvbdRbEElIxk", +- "DoDKjvbdWHwvXgYz", +- "EOcKjvbdQlwbYnUz", *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301180428.r0I4SdA0043581>