hg: jdk7/tl/jdk: 3 new changesets

2011-02-11 Thread kelly . ohair
Changeset: 7bb09178ffc7
Author:ohair
Date:  2011-02-10 20:45 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/7bb09178ffc7

7012644: Regression: jdk/make/common/shared/Defs-windows.gmk has problems on 
cygwin
7018835: Debug build issues in jdk makefiles
Reviewed-by: ksrini

! make/common/shared/Defs-windows.gmk
! make/common/shared/Defs.gmk
! make/common/shared/Platform.gmk

Changeset: 05a0271173a6
Author:ohair
Date:  2011-02-10 20:48 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/05a0271173a6

Merge

- src/share/classes/java/io/TempFileHelper.java
- src/share/classes/java/nio/file/FileRef.java
- src/share/classes/java/nio/file/attribute/Attributes.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java
- src/share/demo/zipfs
- test/java/nio/file/Files/ContentType.java
- test/java/nio/file/Files/CreateFileTree.java
- test/java/nio/file/Files/ForceLoad.java
- test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector
- test/java/nio/file/Files/MaxDepth.java
- test/java/nio/file/Files/PrintFileTree.java
- test/java/nio/file/Files/SimpleFileTypeDetector.java
- test/java/nio/file/Files/SkipSiblings.java
- test/java/nio/file/Files/TerminateWalk.java
- test/java/nio/file/Files/WalkWithSecurity.java
- test/java/nio/file/Files/denyAll.policy
- test/java/nio/file/Files/grantAll.policy
- test/java/nio/file/Files/grantTopOnly.policy
- test/java/nio/file/Files/walk_file_tree.sh
- test/java/nio/file/Path/CheckPermissions.java
- test/java/nio/file/Path/CopyAndMove.java
- test/java/nio/file/Path/DeleteOnClose.java
- test/java/nio/file/Path/FileAttributes.java
- test/java/nio/file/Path/InterruptCopy.java
- test/java/nio/file/Path/Links.java
- test/java/nio/file/Path/PassThroughFileSystem.java
- test/java/nio/file/Path/SBC.java
- test/java/nio/file/Path/TemporaryFiles.java
- test/java/nio/file/Path/delete_on_close.sh
- test/java/nio/file/attribute/FileStoreAttributeView/Basic.java

Changeset: 1dc0c3021d13
Author:ohair
Date:  2011-02-11 01:45 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/1dc0c3021d13

Merge




Re: code review request: 7016698: test sun/security/krb5/runNameEquals.sh failed on Ubuntu

2011-02-11 Thread Valerie (Yu-Ching) Peng


Looks good to me.
Thanks,
Valerie

On 02/10/11 11:20 PM, Weijun Wang wrote:

Good. Suggestion #2:

http://cr.openjdk.java.net/~weijun/7016698/webrev.00/

Thanks
Max


On 02/11/2011 03:14 AM, Valerie (Yu-Ching) Peng wrote:

Max,

As long as the GSS library can be found, users don't care about the
default values for the "sun.security.jgss.lib" property since they don't
need to use it.

Once we add the new name to known libname list, i.e. "gssLibs", for
Linux, then this particular scenario would work.
If some other library name is desired, user can override w/ the existing
security property "sun.security.jgss.lib". I don't see the need to
support multiple libraries under that security property.

Is the CCC for changing the format of the security property so users can
specify multiple library names?
There is no default value for that security property since it's meant to
override what we have in place and I prefer to keep it this way for
simplicity.

So, my preference would be closer to your suggestion#2.

Thanks,
Valerie

On 02/09/11 05:47 PM, Weijun Wang wrote:

Hi Valerie

I just looked into to this bug, the reason is that the failed Ubuntu
has a libgssapi_krb5.so.2 but no libgssapi_krb5.so.

Turns out that a newly installed Ubuntu only has the GSS/krb5 runtime
installed, which include the .so.2 file. On the other hand, the .so
file (simply a symlink to the .so.2 file) is provided by the
libkrb5-dev package, normally not installed by end users. This is
similar to the JRE vs JDK difference.

I have 3 choices now:

1. Do not fix, and tell the user to add
-Dsun.security.jgss.lib=libgssapi_krb5.so.2

We still need to fix the test, probably add lines like

if [ -e /usr/lib/libgssapi_krb5.so ]; then

2. Add the new name to known libname list, we've already had 2:

gssLibs = new String[]{
"libgssapi.so",
"libgssapi_krb5.so",
+ "libgssapi_krb5.so.2",
};

3. Change the hardcoded names above to a security property also named
"sun.security.jgss.lib". We can provide different default values for
solaris and linux. This needs a CCC.

I prefer 3. Your suggestion?

Thanks
Max




 Original Message 
*Change Request ID*: 7016698
*Synopsis*: test sun/security/krb5/runNameEquals.sh failed on Ubuntu


=== *Description*

Testsuite name: regression
test
sun/security/krb5/runNameEquals.sh
failed :

command: shell runNameEquals.sh []
reason: Assumed action based on file name: run shell runNameEquals.sh
elapsed time (seconds): 0.587
--System.out:(4/73)--
Testing native provider
Native provider fails
Testing java provider
Done
--System.err:(9/630)--
Exception in thread "main" GSSException: Unsupported mechanism
requested: 1.2.840.113554.1.2.2
at sun.security.jgss.ProviderList.getMechFactory(ProviderList.java:204)
at sun.security.jgss.ProviderList.getMechFactory(ProviderList.java:171)
at
sun.security.jgss.GSSManagerImpl.getNameElement(GSSManagerImpl.java:201) 


at sun.security.jgss.GSSNameImpl.getElement(GSSNameImpl.java:472)
at sun.security.jgss.GSSNameImpl.init(GSSNameImpl.java:201)
at sun.security.jgss.GSSNameImpl.(GSSNameImpl.java:170)
at sun.security.jgss.GSSManagerImpl.createName(GSSManagerImpl.java:137)
at Krb5NameEquals.main(Krb5NameEquals.java:53)
result: Failed. Execution failed: exit code 1

I did not see the failures on Suse or Solaris.

JDK/JRE tested: build 1.7.0-ea-b126
OS/architecture: Ubuntu
stt-robot@stt-89:~$ cat /etc/*release*
DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=10.04
DISTRIB_CODENAME=lucid
DISTRIB_DESCRIPTION="Ubuntu 10.04.1 LTS"


=== *Evaluation*
=
Debug message shows:

SunNativeGSS: [GSSLibStub_init] libName=libgssapi.so
SunNativeGSS: libgssapi.so: cannot open shared object file: No such
file or directory
SunNativeGSS: [GSSLibStub_init] libName=libgssapi_krb5.so
SunNativeGSS: libgssapi_krb5.so: cannot open shared object file: No
such file or directory

The problem is that there is no libgssapi_krb5.so:

$ ls -al /usr/lib/libgssap*
lrwxrwxrwx 1 root root 21 2011-01-27 12:23
/usr/lib/libgssapi_krb5.so.2 -> libgssapi_krb5.so.2.2
-rw-r--r-- 1 root root 191280 2010-12-08 19:22
/usr/lib/libgssapi_krb5.so.2.2

Is this normal on Linux systems? On my Ubuntu, there is an extra 
symlink:


$ l /usr/lib/libgssapi_krb5*
lrwxrwxrwx 1 root root 26 2010-12-10 09:04 /usr/lib/libgssapi_krb5.so
-> mit-krb5/libgssapi_krb5.so
lrwxrwxrwx 1 root root 21 2010-12-10 09:04
/usr/lib/libgssapi_krb5.so.2 -> libgssapi_krb5.so.2.2
-rw-r--r-- 1 root root 213784 2010-12-09 00:25
/usr/lib/libgssapi_krb5.so.2.2
$ cat /etc/*release*
DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=10.04
DISTRIB_CODENAME=lucid
DISTRIB_DESCRIPTION="Ubuntu 10.04.2 LTS"

*** (#1 of 1): 2011-02-09 09:04:49 GMT+00:00 weijun.w...@oracle.com

=== *Workaround*
=
Add system property -Dsun.security.jgss.lib=libgssapi_krb5.so.2

*** (#1 of 1): 2011-02-09 09:04:49 G

hg: jdk7/tl/jdk: 7007596: (zipfs) FileSystems.newFileSystem(FileRef...) always employs zipfs regardless the real Path type.

2011-02-11 Thread xueming . shen
Changeset: 8711aedb08f2
Author:sherman
Date:  2011-02-11 12:20 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/8711aedb08f2

7007596: (zipfs) FileSystems.newFileSystem(FileRef...) always employs zipfs 
regardless the real Path type.
Summary: updated newFileSystem() to throw UOE exception for non-zip/jar file
Reviewed-by: alanb

! src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java
! test/demo/zipfs/ZipFSTester.java
! test/demo/zipfs/basic.sh



hg: jdk7/tl/jdk: 6742654: Code insertion/replacement attacks against signed jars; ...

2011-02-11 Thread weijun . wang
Changeset: 8860e17db3bd
Author:weijun
Date:  2011-02-12 05:09 +0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/8860e17db3bd

6742654: Code insertion/replacement attacks against signed jars
6911041: JCK api/signaturetest tests fails for Mixed Code PIT builds (b91) for 
all trains
6921823: JarVerifier csdomain field not initialized
6921839: Update trusted.libraries list
Reviewed-by: dgu

! make/java/security/Makefile
! src/share/classes/java/util/jar/JarFile.java
! src/share/classes/java/util/jar/JarVerifier.java
! src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java
! src/share/classes/sun/misc/JarIndex.java
! src/share/classes/sun/misc/JavaUtilJarAccess.java
! src/share/classes/sun/security/util/SignatureFileVerifier.java



hg: jdk7/tl/jdk: 7016698: test sun/security/krb5/runNameEquals.sh failed on Ubuntu

2011-02-11 Thread weijun . wang
Changeset: de923c0ec3c4
Author:weijun
Date:  2011-02-12 07:30 +0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/de923c0ec3c4

7016698: test sun/security/krb5/runNameEquals.sh failed on Ubuntu
Reviewed-by: valeriep

! src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java



hg: jdk7/tl/langtools: 6505047: javax.lang.model.element.Element.getEnclosingElement() doesn't return null for type parameter

2011-02-11 Thread jonathan . gibbons
Changeset: bfeed79c70aa
Author:jjg
Date:  2011-02-11 17:10 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/bfeed79c70aa

6505047: javax.lang.model.element.Element.getEnclosingElement() doesn't return 
null for type parameter
Reviewed-by: darcy

+ test/tools/javac/processing/model/element/TestTypeParameter.java



hg: jdk7/tl/jdk: 6996192: Console.readPassword race: input echo off must be prior to writing prompt

2011-02-11 Thread xueming . shen
Changeset: 21a1e86dedc2
Author:sherman
Date:  2011-02-11 17:09 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/21a1e86dedc2

6996192: Console.readPassword race: input echo off must be prior to writing 
prompt
Summary: To turn off echo before prompt
Reviewed-by: alanb

! src/share/classes/java/io/Console.java