From aazores at redhat.com Thu Jan 1 18:13:58 2015 From: aazores at redhat.com (Andrew Azores) Date: Thu, 1 Jan 2015 13:13:58 -0500 (EST) Subject: [rfc][icedtea-web] PolicyEditor gains a real parser In-Reply-To: References: <549DB266.8050304@redhat.com> Message-ID: <683356188.1653238.1420136038380.JavaMail.zimbra@redhat.com> Hi, I agree that the format is an odd one. It would be nice if the policies could instead use some other well-known format, although one (probably fairly minor) advantage of the existing policy file format over an XML format is simply that the current format is probably much more human-friendly when trying to read and evaluate the file manually, with a standard text editor. Nonetheless, dual support for the existing format as well as some other standardized format would be a very nice feature. Although not so much in the Java spirit as XML, and perhaps not as widely supported in the ecosystem, perhaps other formats to consider might include YAML or JSON, simply for their readability? What do you think of that? Anyway, even once a format is selected, it will take some work to make this functional. It isn't just PolicyEditor and policytool that need to be "brought up to speed" with a new format, but also java.security.Policy at least, and other related classes. But I do like this idea and would like to explore further. Thanks, Andrew ----- Original Message ----- > On 12/26/2014 at 08:09 PM Andrew Azores wrote: > > Hi all, > > > > Long time no see! > > > > I started this patch several months ago, but my school work became far > > too heavy and I had to put off any further work to finish off this > > patch. Today I've managed to finish it to a point that I think it's > > worth submitting for review. > > > > It's a big, long patch, so review will probably take quite some time, > > and may be difficult at times. I know I've appeared to be completely > > gone for many weeks, but I have actually been checking on my emails > > fairly often, just haven't had time to reply to any patch reviews. But > > right now I should have at least a few weeks before school really picks > > back up again. > > > > The gist of this patch is basically that I discovered that policytool's > > parser is actually available to use without any dirty reflection hacks > > or anything like that, but it's hidden away and not really documented, > > and is marked as an internal API. But it's open and so I think the worst > > case scenario if it's removed later is that we just fork and maintain an > > older copy. It's much easier and IMHO smarter than writing a whole new > > parser from scratch to duplicate the one that policytool uses, anyhow. > > This patch just rips out the old, crappy code that used horrible regex > > to try to parse policy files, and plops in the policytool parser > > instead. Anything else pretty much comes down to reconciling the > > existing PolicyEditor code and structures with the new ones that the > > parser gives and expects. > > > > Nice side effect: all policyeditor tests now pass, even the tricky > > comments handling ones ;) > > Although I have not reviewed the patch, I have to admit it is a good idea for > PolicyEditor and policytool to share the same configuration file and Format > (and parser code). > However, I have always found policytool's file format very odd and doll to > parse. In some sense it is quite "proprietary", except for conforming to > ASCII. > So, even though it is simple text it is not based on any other standard like > SGML or XML. It is not even based on Java's "all-purpose" properties file > format. I do not know if there is any need for this or how many people may be > affected, but would you like to give it some thought developing a XML (with > schema) or properties file format for policytool's and PolcyEditor's purpose? > This new file format and parser could be added as an extension to policytool > and PolicyEditor in the future. There is no need to drop support for > policytool's current file format, but there certainly is still room for > improvement. What do you think? > > Jacob > From andy.johnson at verizon.net Sat Jan 3 13:32:07 2015 From: andy.johnson at verizon.net (Andrew Johnson) Date: Sat, 03 Jan 2015 07:32:07 -0600 (CST) Subject: OpenJDK 8 and Shark Message-ID: <30940278.1800605.1420291927389.JavaMail.root@vznit170132.mailsrvcs.net> An HTML attachment was scrubbed... URL: From aph at redhat.com Mon Jan 5 11:08:55 2015 From: aph at redhat.com (Andrew Haley) Date: Mon, 05 Jan 2015 11:08:55 +0000 Subject: OpenJDK 8 and Shark In-Reply-To: <30940278.1800605.1420291927389.JavaMail.root@vznit170132.mailsrvcs.net> References: <30940278.1800605.1420291927389.JavaMail.root@vznit170132.mailsrvcs.net> Message-ID: <54AA70C7.9010303@redhat.com> On 03/01/15 13:32, Andrew Johnson wrote: > Has anyone tried to do a Shark build recently from the OpenJDK-8 sources (or one > of the associated ports)? It appears to be broken on several levels: > > 1) llvmHeaders.h needs to include the llvm/IR path for several of the headers. > I'm not sure when they moved from the top-level llvm include directory to > llvm/IR, but the top level directory is where llvmHeaders.h assumes that they are. > > 2) What was the last version of LLVM that anyone used to build Shark? The > latest gcc compiler complains about "#elif _MSC_VER" not being defined in the > llvm 3.4 headers. Changing it to "#elif defined(_MSC_VER)" solves the problem. > > 3) There are still compilation errors when trying to build Shark that aren't > present when building Zero, so obviously Zero is being built on a regular basis > and Shark is not. > > I a mostly interested in building Shark for doing some experiments. I am > assuming that Hotspot will out-perform Shark, but it would be useful getting > some figures to prove it. You'll have to fix it, I'm afraid. We discovered that LLVM was so unstable that even minor point releases would break Shark, and LLVM's JIT interface was substantially redesigned. If its JIT interface is now stable it'd be nice to fix Shark so that it's a viable OpenJDK target again. Andrew. From jkang at redhat.com Mon Jan 5 16:19:21 2015 From: jkang at redhat.com (Jie Kang) Date: Mon, 5 Jan 2015 11:19:21 -0500 (EST) Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <673798097.2635060.1420473432133.JavaMail.zimbra@redhat.com> Message-ID: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> Hello, This patch slightly modifies JNLPRuntime's online detection function to always perform the check, even if it has been called before. Previously, if the boolean onlineDetected wasn't null, the check would be skipped. This caused a bug when downloading multiple resources. For each resource being downloaded, we perform the detection check. For two consecutive resources: If for the first resource, we detected offline, the boolean onlineDetected would be set to false. Then for the second resource, the detection check would be skipped, even if that resource was able to be connected to. This would result in the second resource being unable to be downloaded, even though it definitely could and should be. The patch fixes this. Thoughts? Regards, -- Jie Kang -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-online-detect-1.patch Type: text/x-patch Size: 552 bytes Desc: not available URL: From jkang at redhat.com Mon Jan 5 19:49:10 2015 From: jkang at redhat.com (Jie Kang) Date: Mon, 5 Jan 2015 14:49:10 -0500 (EST) Subject: [rfc][icedtea-web] Allow cache directory to be changed during runtime In-Reply-To: <919646490.2772921.1420486603447.JavaMail.zimbra@redhat.com> Message-ID: <923849450.2779734.1420487350270.JavaMail.zimbra@redhat.com> Hello, This patch consolidates the cacheDir instance to a single place and allows us to change it during run-time. It also modifies a unit test to use this new feature. This feature is aimed mainly at unit tests that need the cache, but do not want to modify the icedtea-web's user cache. Thoughts? Okay to push? Regards, -- Jie Kang -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-change-cache-location.patch Type: text/x-patch Size: 6237 bytes Desc: not available URL: From jkang at redhat.com Mon Jan 5 20:19:51 2015 From: jkang at redhat.com (Jie Kang) Date: Mon, 5 Jan 2015 15:19:51 -0500 (EST) Subject: [rfc][icedtea-web] Use temporary cache in PluginBridge unit tests In-Reply-To: <2004210338.2762895.1420485556492.JavaMail.zimbra@redhat.com> Message-ID: <650651845.2801136.1420489191729.JavaMail.zimbra@redhat.com> Hello, Some changes to PluginBridge caused a few of the unit tests in PluginBridgeTest to create entries in the cache. This patch adds a setup and teardown to the class in order to use a temporary cache location as opposed to the user's cache. This patch relies on the 'Allow cache directory to be changed during runtime' patch: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030291.html Thoughts? Regards, -- Jie Kang -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-pluginbridge-temp-cache-1.patch Type: text/x-patch Size: 2247 bytes Desc: not available URL: From gitne at gmx.de Mon Jan 5 20:59:50 2015 From: gitne at gmx.de (Jacob Wisor) Date: Mon, 5 Jan 2015 21:59:50 +0100 Subject: [rfc][icedtea-web] PolicyEditor gains a real parser In-Reply-To: <683356188.1653238.1420136038380.JavaMail.zimbra@redhat.com> References: <549DB266.8050304@redhat.com> , <683356188.1653238.1420136038380.JavaMail.zimbra@redhat.com> Message-ID: On 01/01/2015 at 07:13 PM Andrew Azores wrote: > Hi, > > I agree that the format is an odd one. It would be nice if the policies could > instead use some other well-known format, although one (probably fairly > minor) advantage of the existing policy file format over an XML format is > simply that the current format is probably much more human-friendly when > trying to read and evaluate the file manually, with a standard text editor. > Nonetheless, dual support for the existing format as well as some other > standardized format would be a very nice feature. Although not so much in the > Java spirit as XML, and perhaps not as widely supported in the ecosystem, > perhaps other formats to consider might include YAML or JSON, simply for their > readability? What do you think of that? AFAIK YAML has not been standardized, although it is colloquially called a superset of JSON. JSON is good but its main purpose and strength lies in converting or /serializing/ run-time *objects* into human-readable text for *transmission*. Transmission is not actually key here. policytool and PolicyEditor are storing *static* configuration *data* which may be subject to parsing by external tools and/or need to be easily readable by human beings. Static data calls for a document format. And, this is exactly what XML has been originally designed for: documents. Unfortunatelly, many people and even software architects did not get this point or have forgotten about it. Instead, they just jumped onto a buzz word which indeed could or can offer stuctured, human-readable, interoperable and standardized data, but you have to design your XML schema for it. Just because XML may - when designing XML schmas correctly - be human-readable too, it does not mean that it should be used for every use-case which should require human-readability at some point in the future. The main reason for XML loosing momentum and gaining somewhat negative sentiments among developers especially during the last few years is because XML has been abusively repurposed by many people. Sometimes not so much by technical people but by management people who requested to have their products XML built in, no matter the cost or merrit. There was a time where every commercial product of significance or that wanted to become significant had to /speak/ XML. I am just telling this in order to help you clear any confusing thoughts or things you may have heard about how bad XML might be. Anyway, I would advise not to use JSON for the purpose of policytool and PolicyEditor and go for XML. Another important feature of XML as a static data document format is that it convays implcit semantics. JSON does not do that. JSON simply transmits data without neccessarily implying semantics. And finally, XML documents can or should be defined by a schema. Schemas are great because they help to validate XML documents as well as describe the semantics of data. Again, afaik JSON does not offer anything similar except for simple syntax checking. You cannot write a correct JSON object from scratch just by looking at a batch of JSON objects and comparing them. However, you can do this with XML documents, even more so when you have a schema at hand. > Anyway, even once a format is selected, it will take some work to make this > functional. It isn't just PolicyEditor and policytool that need to be > "brought up to speed" with a new format, but also java.security.Policy at > least, and other related classes. But I do like this idea and would like to > explore further. Yep, it is definitely going to require some significant amount of work but I think it could be worth it. Thank you for at least considering it and putting some thought into it. :-) Jacob > ----- Original Message ----- > > On 12/26/2014 at 08:09 PM Andrew Azores wrote: > > > Hi all, > > > > > > Long time no see! > > > > > > I started this patch several months ago, but my school work became far > > > too heavy and I had to put off any further work to finish off this > > > patch. Today I've managed to finish it to a point that I think it's > > > worth submitting for review. > > > > > > It's a big, long patch, so review will probably take quite some time, > > > and may be difficult at times. I know I've appeared to be completely > > > gone for many weeks, but I have actually been checking on my emails > > > fairly often, just haven't had time to reply to any patch reviews. But > > > right now I should have at least a few weeks before school really picks > > > back up again. > > > > > > The gist of this patch is basically that I discovered that policytool's > > > parser is actually available to use without any dirty reflection hacks > > > or anything like that, but it's hidden away and not really documented, > > > and is marked as an internal API. But it's open and so I think the worst > > > case scenario if it's removed later is that we just fork and maintain an > > > older copy. It's much easier and IMHO smarter than writing a whole new > > > parser from scratch to duplicate the one that policytool uses, anyhow. > > > This patch just rips out the old, crappy code that used horrible regex > > > to try to parse policy files, and plops in the policytool parser > > > instead. Anything else pretty much comes down to reconciling the > > > existing PolicyEditor code and structures with the new ones that the > > > parser gives and expects. > > > > > > Nice side effect: all policyeditor tests now pass, even the tricky > > > comments handling ones ;) > > > > Although I have not reviewed the patch, I have to admit it is a good idea for > > PolicyEditor and policytool to share the same configuration file and Format > > (and parser code). > > However, I have always found policytool's file format very odd and doll to > > parse. In some sense it is quite "proprietary", except for conforming to > > ASCII. > > So, even though it is simple text it is not based on any other standard like > > SGML or XML. It is not even based on Java's "all-purpose" properties file > > format. I do not know if there is any need for this or how many people may be > > affected, but would you like to give it some thought developing a XML (with > > schema) or properties file format for policytool's and PolcyEditor's purpose? > > This new file format and parser could be added as an extension to policytool > > and PolicyEditor in the future. There is no need to drop support for > > policytool's current file format, but there certainly is still room for > > improvement. What do you think? > > > > Jacob From ldracz at redhat.com Mon Jan 5 21:12:42 2015 From: ldracz at redhat.com (Lukasz Dracz) Date: Mon, 5 Jan 2015 16:12:42 -0500 (EST) Subject: [rfc][icedtea-web] PolicyEditor uses OptionParser In-Reply-To: <431800931.2818345.1420491564290.JavaMail.zimbra@redhat.com> Message-ID: <1990186751.2825116.1420492362138.JavaMail.zimbra@redhat.com> Hello, This patch changes PolicyEditor to use OptionParser to parse its arguments. I have noticed that Andrew's PolicyEditor gains a real parser patch removes the codebase tag as an option. This patch does not at the moment, but I can follow if that is what is determined to be wanted. Thoughts ? Thank you, Lukasz Dracz -------------- next part -------------- A non-text attachment was scrubbed... Name: policyeditor-uses-optionparser.patch Type: text/x-patch Size: 6286 bytes Desc: not available URL: From jkang at redhat.com Mon Jan 5 21:27:56 2015 From: jkang at redhat.com (Jie Kang) Date: Mon, 5 Jan 2015 16:27:56 -0500 (EST) Subject: [rfc][icedtea-web] PolicyEditor gains a real parser In-Reply-To: <549DB266.8050304@redhat.com> References: <549DB266.8050304@redhat.com> Message-ID: <634432449.2830218.1420493276156.JavaMail.zimbra@redhat.com> Hello, Long time no see :D After reading over the patch a few times, I don't have any major concerns with the code. I haven't noticed any bugs while user-testing as well. Great work! One suggestion below and a question: diff --git a/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java b/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java new file mode 100644 --- /dev/null +++ b/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java @@ -0,0 +1,113 @@ [...] + @Override + public int hashCode() { + int result = keyStoreUrl.hashCode(); + result = 31 * result + keyStoreType.hashCode(); + result = 31 * result + keyStoreProvider.hashCode(); + result = 31 * result + keyStorePasswordUrl.hashCode(); + return result; + } I'd suggest replacing this code with usage of the Objects.hash() : http://docs.oracle.com/javase/7/docs/api/java/util/Objects.html#hash(java.lang.Object...) It performs a extremely similar algorithm as the above but has the advantage of looking nicer. One of the answers in this thread shows what code it ends up running: http://stackoverflow.com/questions/13785353/equals-and-hashcode-is-objects-hash-method-broken diff --git a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java @@ -63,39 +63,16 @@ [...] +import javax.swing.*; Is this package import intended? I think individual imports would be preferable (http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style) Everything else is fine to me. Regards, ----- Original Message ----- > Hi all, > > Long time no see! > > I started this patch several months ago, but my school work became far > too heavy and I had to put off any further work to finish off this > patch. Today I've managed to finish it to a point that I think it's > worth submitting for review. > > It's a big, long patch, so review will probably take quite some time, > and may be difficult at times. I know I've appeared to be completely > gone for many weeks, but I have actually been checking on my emails > fairly often, just haven't had time to reply to any patch reviews. But > right now I should have at least a few weeks before school really picks > back up again. > > The gist of this patch is basically that I discovered that policytool's > parser is actually available to use without any dirty reflection hacks > or anything like that, but it's hidden away and not really documented, > and is marked as an internal API. But it's open and so I think the worst > case scenario if it's removed later is that we just fork and maintain an > older copy. It's much easier and IMHO smarter than writing a whole new > parser from scratch to duplicate the one that policytool uses, anyhow. > This patch just rips out the old, crappy code that used horrible regex > to try to parse policy files, and plops in the policytool parser > instead. Anything else pretty much comes down to reconciling the > existing PolicyEditor code and structures with the new ones that the > parser gives and expects. > > Nice side effect: all policyeditor tests now pass, even the tricky > comments handling ones ;) > > Thanks, > -- > Andrew Azores > -- Jie Kang From gitne at gmx.de Tue Jan 6 12:25:25 2015 From: gitne at gmx.de (Jacob Wisor) Date: Tue, 6 Jan 2015 13:25:25 +0100 Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> Message-ID: On 01/05/2015 at 05:19 PM Jie Kang wrote: > Hello, > > This patch slightly modifies JNLPRuntime's online detection function to > always perform the check, even if it has been called before. > > Previously, if the boolean onlineDetected wasn't null, the check would be > skipped. This caused a bug when downloading multiple resources. > > For each resource being downloaded, we perform the detection check. For two > consecutive resources: If for the first resource, we detected offline, the > boolean onlineDetected would be set to false. Then for the second resource, > the detection check would be skipped, even if that resource was able to be > connected to. This would result in the second resource being unable to be > downloaded, even though it definitely could and should be. The patch fixes > this. > > Thoughts? Although I did not test it, seems to be working as advertised. While looking at the code, I was wondering why JNLPRuntime.onlineDetected was a Boolean object instead of a primitive. And, apart from that, the whole offline detection mechanism seems overly complex and unreliable to me. I am also not really convinced that public static void detectOnline(URL location) { if (onlineDetected != null) { return; } try { if (location.getProtocol().equals("file")) { return; } //Checks the offline/online status of the system. InetAddress.getByName(location.getHost()); } catch (UnknownHostException ue) { [?] is the best or most reliable way in J2SE to test for the online/offline status of a system. Do systems having no DNS server configured or which is unreachable properly resolve their name? And, even if they do, does this really actually prove them being online? Now, I was considering a few different options to reliably detecting a system's online/offline status. Initially, I was thinking about pinging the default gateway. However, hosts with public IPs may have their public IP as the default gateway configured. So, the most reliable way I came up with is to send an echo broadcast (on the local subnet) request. Of course, this does not prove the system being connected to the /public/ internet. But this is not neccessary either because JNLP applications may be (which they often are) served on an intranet only. So, would you mind investigating this further? Regards, Jacob From jkang at redhat.com Tue Jan 6 16:14:41 2015 From: jkang at redhat.com (Jie Kang) Date: Tue, 6 Jan 2015 11:14:41 -0500 (EST) Subject: [rfc][icedtea-web] PolicyEditor uses OptionParser In-Reply-To: <1990186751.2825116.1420492362138.JavaMail.zimbra@redhat.com> References: <1990186751.2825116.1420492362138.JavaMail.zimbra@redhat.com> Message-ID: <1882290830.3284389.1420560881139.JavaMail.zimbra@redhat.com> Hello, Patch looks fine to me. In terms of aazore's changes, I'd leave them out of this patch. Whichever one goes in second will deal with the conflicts appropriately and it won't be too much work. Regards, ----- Original Message ----- > Hello, > > This patch changes PolicyEditor to use OptionParser to parse its arguments. > I have noticed that Andrew's PolicyEditor gains a real parser patch removes > the codebase tag as an option. This patch does not at the moment, but I can > follow if that is what is determined to be wanted. > > Thoughts ? > > Thank you, > Lukasz Dracz > -- Jie Kang OpenJDK Team - Software Engineering Intern From gitne at gmx.de Tue Jan 6 20:19:10 2015 From: gitne at gmx.de (Jacob Wisor) Date: Tue, 6 Jan 2015 21:19:10 +0100 Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com>, Message-ID: On 01/06/2015 at 01:25 PM Jacob Wisor wrote: > On 01/05/2015 at 05:19 PM Jie Kang wrote: > > Hello, > > > > This patch slightly modifies JNLPRuntime's online detection function to > > always perform the check, even if it has been called before. > > > > Previously, if the boolean onlineDetected wasn't null, the check would be > > skipped. This caused a bug when downloading multiple resources. > > > > For each resource being downloaded, we perform the detection check. For two > > consecutive resources: If for the first resource, we detected offline, the > > boolean onlineDetected would be set to false. Then for the second resource, > > the detection check would be skipped, even if that resource was able to be > > connected to. This would result in the second resource being unable to be > > downloaded, even though it definitely could and should be. The patch fixes > > this. > > > > Thoughts? > > Although I did not test it, seems to be working as advertised. > > While looking at the code, I was wondering why JNLPRuntime.onlineDetected was > a Boolean object instead of a primitive. And, apart from that, the whole > offline detection mechanism seems overly complex and unreliable to me. > I am also not really convinced that > > public static void detectOnline(URL location) { > if (onlineDetected != null) { > return; > } > try { > if (location.getProtocol().equals("file")) { > return; > } > //Checks the offline/online status of the system. > InetAddress.getByName(location.getHost()); > } catch (UnknownHostException ue) { [?] > > is the best or most reliable way in J2SE to test for the online/offline status > of a system. Do systems having no DNS server configured or which is unreachable > properly resolve their name? And, even if they do, does this really actually > prove them being online? > > Now, I was considering a few different options to reliably detecting a system's > online/offline status. Initially, I was thinking about pinging the default > gateway. However, hosts with public IPs may have their public IP as the default > gateway configured. So, the most reliable way I came up with is to send an echo > broadcast (on the local subnet) request. Of course, this does not prove the > system being connected to the /public/ internet. But this is not neccessary > either because JNLP applications may be (which they often are) served on an > intranet only. So, would you mind investigating this further? Oh, I forgot: I am sure we do not want to make a DNS request for every resource we need to download, even when subsequent DNS resolution requests are pulled from the local DNS cache. So, although this patch fixes the bug, it is very inefficient and impractical because it induces an avoidable performance penalty. In other words, the online detection *logic* itself needs to be fixed. @Jie Kang: Thank you for spotting this bug. Regards, Jacob From neugens at redhat.com Wed Jan 7 12:04:13 2015 From: neugens at redhat.com (Mario Torre) Date: Wed, 07 Jan 2015 13:04:13 +0100 Subject: OpenJDK 8 and Shark In-Reply-To: <54AA70C7.9010303@redhat.com> References: <30940278.1800605.1420291927389.JavaMail.root@vznit170132.mailsrvcs.net> <54AA70C7.9010303@redhat.com> Message-ID: <1420632253.29471.3.camel@nirvana.localdomain> On Mon, 2015-01-05 at 11:08 +0000, Andrew Haley wrote: > > > > 2) What was the last version of LLVM that anyone used to build > Shark? The > > latest gcc compiler complains about "#elif _MSC_VER" not being > defined in the > > llvm 3.4 headers. Changing it to "#elif defined(_MSC_VER)" solves > the problem. I think I pushed a patch to address this on JDK9, I remember it was backported to 8 also, so Shark on 9 should buildable with llvm 3.4 and 3.2. I think the patch was here: I'm CC'ing Severin that took over most of my work there, maybe he knows something more. Cheers, Mario From neugens at redhat.com Wed Jan 7 12:08:34 2015 From: neugens at redhat.com (Mario Torre) Date: Wed, 07 Jan 2015 13:08:34 +0100 Subject: OpenJDK 8 and Shark In-Reply-To: <54AA70C7.9010303@redhat.com> References: <30940278.1800605.1420291927389.JavaMail.root@vznit170132.mailsrvcs.net> <54AA70C7.9010303@redhat.com> Message-ID: <1420632514.29471.5.camel@nirvana.localdomain> On Mon, 2015-01-05 at 11:08 +0000, Andrew Haley wrote: > > > > 2) What was the last version of LLVM that anyone used to build > Shark? The > > latest gcc compiler complains about "#elif _MSC_VER" not being > defined in the > > llvm 3.4 headers. Changing it to "#elif defined(_MSC_VER)" solves > the problem. I think I pushed a patch to address this on JDK9, I remember it was backported to 8 also, so Shark on 8 and 9 "should" be buildable with llvm 3.4 and 3.2. I think the patch was here (IIRC): http://cr.openjdk.java.net/~neugens/zero-2014-02-24/webrev.03/ I'm CC'ing Severin that took over most of my work there, maybe he knows something more. It's possible something changed in the JDK so that this patch is not valid anymore, unfortunately as Andrew says LLVM is too much of a moving target to keep up with it, but any patches are welcomed! Cheers, Mario From sgehwolf at redhat.com Wed Jan 7 13:11:33 2015 From: sgehwolf at redhat.com (Severin Gehwolf) Date: Wed, 07 Jan 2015 14:11:33 +0100 Subject: OpenJDK 8 and Shark In-Reply-To: <1420632514.29471.5.camel@nirvana.localdomain> References: <30940278.1800605.1420291927389.JavaMail.root@vznit170132.mailsrvcs.net> <54AA70C7.9010303@redhat.com> <1420632514.29471.5.camel@nirvana.localdomain> Message-ID: <1420636293.3528.19.camel@redhat.com> Hi, cc'ing Roman as he might know what llvm version works/worked for shark pending some additional fixes. On Wed, 2015-01-07 at 13:08 +0100, Mario Torre wrote: > On Mon, 2015-01-05 at 11:08 +0000, Andrew Haley wrote: > > > > > > 2) What was the last version of LLVM that anyone used to build > > Shark? The > > > latest gcc compiler complains about "#elif _MSC_VER" not being > > defined in the > > > llvm 3.4 headers. Changing it to "#elif defined(_MSC_VER)" solves > > the problem. > > I think I pushed a patch to address this on JDK9, I remember it was > backported to 8 also, so Shark on 8 and 9 "should" be buildable with > llvm 3.4 and 3.2. > > I think the patch was here (IIRC): > > http://cr.openjdk.java.net/~neugens/zero-2014-02-24/webrev.03/ > > I'm CC'ing Severin that took over most of my work there, maybe he knows > something more. Sorry, this does not ring a bell for me. The last time I've built shark was a while ago (> 6 months back) and I think I've used llvm 3.4. I may have used the above patches, not sure. Last I recall was that shark debug builds were terribly broken. Shark release builds somewhat worked, after you got it to compile but still had many bugs. I've tried on x86_64 only. > It's possible something changed in the JDK so that this patch is not > valid anymore, unfortunately as Andrew says LLVM is too much of a moving > target to keep up with it, but any patches are welcomed! Speaking of Zero alone I know that upstream OpenJDK changes have been breaking the zero variant build a couple of times. Thus, I would not be surprised if shark is broken in a similar way. In general, I try to fix Zero compile issues as soon as they get noticed via: http://builder.classpath.org/jenkins/job/OpenJDK9_hscomp_Zero/ Cheers, Severin From rkennke at redhat.com Wed Jan 7 13:25:07 2015 From: rkennke at redhat.com (Roman Kennke) Date: Wed, 07 Jan 2015 14:25:07 +0100 Subject: OpenJDK 8 and Shark In-Reply-To: <1420636293.3528.19.camel@redhat.com> References: <30940278.1800605.1420291927389.JavaMail.root@vznit170132.mailsrvcs.net> <54AA70C7.9010303@redhat.com> <1420632514.29471.5.camel@nirvana.localdomain> <1420636293.3528.19.camel@redhat.com> Message-ID: <1420637107.6838.4.camel@localhost> Hi, > > > > 2) What was the last version of LLVM that anyone used to build > > > Shark? The > > > > latest gcc compiler complains about "#elif _MSC_VER" not being > > > defined in the > > > > llvm 3.4 headers. Changing it to "#elif defined(_MSC_VER)" solves > > > the problem. > > > > I think I pushed a patch to address this on JDK9, I remember it was > > backported to 8 also, so Shark on 8 and 9 "should" be buildable with > > llvm 3.4 and 3.2. > > > > I think the patch was here (IIRC): > > > > http://cr.openjdk.java.net/~neugens/zero-2014-02-24/webrev.03/ > > > > I'm CC'ing Severin that took over most of my work there, maybe he knows > > something more. > > Sorry, this does not ring a bell for me. The last time I've built shark > was a while ago (> 6 months back) and I think I've used llvm 3.4. I may > have used the above patches, not sure. Last I recall was that shark > debug builds were terribly broken. Shark release builds somewhat worked, > after you got it to compile but still had many bugs. I've tried on > x86_64 only. 3.4 works, 3.4.2 (latest 3.4) only works with some changes that I did over christmas :-) I'll push them upstream asap. 3.5 currently doesn't work, but I'll address this soon. > > It's possible something changed in the JDK so that this patch is not > > valid anymore, unfortunately as Andrew says LLVM is too much of a moving > > target to keep up with it, but any patches are welcomed! > > Speaking of Zero alone I know that upstream OpenJDK changes have been > breaking the zero variant build a couple of times. Thus, I would not be > surprised if shark is broken in a similar way. In general, I try to fix > Zero compile issues as soon as they get noticed via: > http://builder.classpath.org/jenkins/job/OpenJDK9_hscomp_Zero/ We need that for Shark too :-) I have got Shark to work fairly well on X86. I'm currently trying on Arm. I will push my changes to JDK9 upstream. From there, we could look to backport them to 8u if desired. Roman From 3b5hkp at nottheoilrig.com Sun Jan 11 21:05:36 2015 From: 3b5hkp at nottheoilrig.com (Jack Bates) Date: Sun, 11 Jan 2015 13:05:36 -0800 Subject: NoSuchMethodError: Matcher.quoteReplacement Message-ID: <54B2E5A0.8020504@nottheoilrig.com> I get the following error when I try to build 2.5.3: [...] /home/nottheoilrig/icedtea-2.5.3/generated.build/com/sun/corba/se/impl/logging/UtilSystemException.java An exception has occurred in the compiler (1.7.0_71_bootstrap). Please file a bug at the Java Developer Connection (http://java.sun.com/webapps/bugreport) after checking the Bug Parade for duplicates. Include your program and the following diagnostic in your report. Thank you. java.lang.NoSuchMethodError: method java.util.regex.Matcher.quoteReplacement with signature (Ljava.lang.String;)Ljava.lang.String; was not found. [...] Any idea how to resolve it? Can I provide any additional details? I downloaded the IcedTea 2.5.3 archive, ran ./configure and make. The following are lines from my config.log, are they helpful? [...] configure:11304: checking if java.util.regex.Matcher.quoteReplacement is missing configure:11354: result: yes [...] configure:11820: checking if the VM supports 1.7 bytecode javac: invalid source release: 7 Usage: javac use -help for a list of possible options configure:11850: result: no configure:11866: checking whether to disable the use of bootstrap tools for bootstrapping configure:11890: result: yes [...] From gitne at gmx.de Mon Jan 12 20:09:36 2015 From: gitne at gmx.de (gitne at gmx.de) Date: Mon, 12 Jan 2015 21:09:36 +0100 Subject: NoSuchMethodError: Matcher.quoteReplacement In-Reply-To: <54B2E5A0.8020504@nottheoilrig.com> References: <54B2E5A0.8020504@nottheoilrig.com> Message-ID: On 01/11/2015 at 10:05 PM Jack Bates wrote: > I get the following error when I try to build 2.5.3: > > [...] > /home/nottheoilrig/icedtea-2.5.3/generated.build/com/sun/corba/se/impl/logging/UtilSystemException.java > An exception has occurred in the compiler (1.7.0_71_bootstrap). Please > file a bug at the Java Developer Connection > (http://java.sun.com/webapps/bugreport) after checking the Bug Parade > for duplicates. Include your program and the following diagnostic in > your report. Thank you. > java.lang.NoSuchMethodError: method > java.util.regex.Matcher.quoteReplacement with signature > (Ljava.lang.String;)Ljava.lang.String; was not found. This looks very odd. Did you compile the JDK yourself? What distro and/or JDK version are you using? > [...] > > Any idea how to resolve it? > Can I provide any additional details? > I downloaded the IcedTea 2.5.3 archive, > ran ./configure and make. > > The following are lines from my config.log, > are they helpful? > > [...] > configure:11304: checking if java.util.regex.Matcher.quoteReplacement is > missing > configure:11354: result: yes > [...] > configure:11820: checking if the VM supports 1.7 bytecode > javac: invalid source release: 7 Something really strange is going on with your compiler. Since it is supposed to be JDK 1.7 it should also support Java Langauage Specification version 7. Please check your JDK installation and/or paths and environment variable for proper JAR file resolution. > Usage: javac > use -help for a list of possible options > configure:11850: result: no > configure:11866: checking whether to disable the use of bootstrap tools > for bootstrapping > configure:11890: result: yes > [...] Jacob From gnu.andrew at redhat.com Tue Jan 13 01:28:50 2015 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Mon, 12 Jan 2015 20:28:50 -0500 (EST) Subject: NoSuchMethodError: Matcher.quoteReplacement In-Reply-To: <54B2E5A0.8020504@nottheoilrig.com> References: <54B2E5A0.8020504@nottheoilrig.com> Message-ID: <1934335812.6553316.1421112530438.JavaMail.zimbra@redhat.com> ----- Original Message ----- > I get the following error when I try to build 2.5.3: > > [...] > /home/nottheoilrig/icedtea-2.5.3/generated.build/com/sun/corba/se/impl/logging/UtilSystemException.java > An exception has occurred in the compiler (1.7.0_71_bootstrap). Please > file a bug at the Java Developer Connection > (http://java.sun.com/webapps/bugreport) after checking the Bug Parade > for duplicates. Include your program and the following diagnostic in > your report. Thank you. > java.lang.NoSuchMethodError: method > java.util.regex.Matcher.quoteReplacement with signature > (Ljava.lang.String;)Ljava.lang.String; was not found. > [...] > > Any idea how to resolve it? > Can I provide any additional details? > I downloaded the IcedTea 2.5.3 archive, > ran ./configure and make. > > The following are lines from my config.log, > are they helpful? > > [...] > configure:11304: checking if java.util.regex.Matcher.quoteReplacement is > missing > configure:11354: result: yes > [...] > configure:11820: checking if the VM supports 1.7 bytecode > javac: invalid source release: 7 > Usage: javac > use -help for a list of possible options > configure:11850: result: no > configure:11866: checking whether to disable the use of bootstrap tools > for bootstrapping > configure:11890: result: yes > [...] > It's difficult to say much without the full config.log and build log. Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From 3b5hkp at nottheoilrig.com Tue Jan 13 03:54:51 2015 From: 3b5hkp at nottheoilrig.com (Jack Bates) Date: Mon, 12 Jan 2015 19:54:51 -0800 Subject: NoSuchMethodError: Matcher.quoteReplacement In-Reply-To: References: <54B2E5A0.8020504@nottheoilrig.com> Message-ID: <54B4970B.3000605@nottheoilrig.com> On 12/01/15 12:09 PM, gitne at gmx.de wrote: > On 01/11/2015 at 10:05 PM Jack Bates wrote: >> I get the following error when I try to build 2.5.3: >> >> [...] >> /home/nottheoilrig/icedtea-2.5.3/generated.build/com/sun/corba/se/impl/logging/UtilSystemException.java >> An exception has occurred in the compiler (1.7.0_71_bootstrap). Please >> file a bug at the Java Developer Connection >> (http://java.sun.com/webapps/bugreport) after checking the Bug Parade >> for duplicates. Include your program and the following diagnostic in >> your report. Thank you. >> java.lang.NoSuchMethodError: method >> java.util.regex.Matcher.quoteReplacement with signature >> (Ljava.lang.String;)Ljava.lang.String; was not found. > > This looks very odd. Did you compile the JDK yourself? What distro and/or JDK > version are you using? > >> [...] >> >> Any idea how to resolve it? >> Can I provide any additional details? >> I downloaded the IcedTea 2.5.3 archive, >> ran ./configure and make. >> >> The following are lines from my config.log, >> are they helpful? >> >> [...] >> configure:11304: checking if java.util.regex.Matcher.quoteReplacement is >> missing >> configure:11354: result: yes >> [...] >> configure:11820: checking if the VM supports 1.7 bytecode >> javac: invalid source release: 7 > > Something really strange is going on with your compiler. Since it is supposed > to be JDK 1.7 it should also support Java Langauage Specification version 7. > Please check your JDK installation and/or paths and environment variable for > proper JAR file resolution. The error occurs when I try to build IcedTea 2.5.3, however I think the build runs javac that's already on my system? which is from this package: https://packages.debian.org/squeeze/openjdk-6-jdk i.e. JDK 1.6? Does that make any more sense? $ javac -version javac 1.6.0_31 From 3b5hkp at nottheoilrig.com Tue Jan 13 03:55:11 2015 From: 3b5hkp at nottheoilrig.com (Jack Bates) Date: Mon, 12 Jan 2015 19:55:11 -0800 Subject: NoSuchMethodError: Matcher.quoteReplacement In-Reply-To: <1934335812.6553316.1421112530438.JavaMail.zimbra@redhat.com> References: <54B2E5A0.8020504@nottheoilrig.com> <1934335812.6553316.1421112530438.JavaMail.zimbra@redhat.com> Message-ID: <54B4971F.8090405@nottheoilrig.com> On 12/01/15 05:28 PM, Andrew Hughes wrote: > ----- Original Message ----- >> I get the following error when I try to build 2.5.3: >> >> [...] >> /home/nottheoilrig/icedtea-2.5.3/generated.build/com/sun/corba/se/impl/logging/UtilSystemException.java >> An exception has occurred in the compiler (1.7.0_71_bootstrap). Please >> file a bug at the Java Developer Connection >> (http://java.sun.com/webapps/bugreport) after checking the Bug Parade >> for duplicates. Include your program and the following diagnostic in >> your report. Thank you. >> java.lang.NoSuchMethodError: method >> java.util.regex.Matcher.quoteReplacement with signature >> (Ljava.lang.String;)Ljava.lang.String; was not found. >> [...] >> >> Any idea how to resolve it? >> Can I provide any additional details? >> I downloaded the IcedTea 2.5.3 archive, >> ran ./configure and make. >> >> The following are lines from my config.log, >> are they helpful? >> >> [...] >> configure:11304: checking if java.util.regex.Matcher.quoteReplacement is >> missing >> configure:11354: result: yes >> [...] >> configure:11820: checking if the VM supports 1.7 bytecode >> javac: invalid source release: 7 >> Usage: javac >> use -help for a list of possible options >> configure:11850: result: no >> configure:11866: checking whether to disable the use of bootstrap tools >> for bootstrapping >> configure:11890: result: yes >> [...] > > It's difficult to say much without the full config.log and build log. Thank you, here is the config.log: http://nottheoilrig.com/java/201501120/config.log and here is the build log: http://nottheoilrig.com/java/201501120/screenlog Can I provide any additional details? From ptisnovs at icedtea.classpath.org Tue Jan 13 09:58:27 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 13 Jan 2015 09:58:27 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltBufferedImageOp. Message-ID: changeset 4a00f37c40e7 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=4a00f37c40e7 author: Pavel Tisnovsky date: Tue Jan 13 11:00:16 2015 +0100 Ten new tests added into BitBltBufferedImageOp. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBufferedImageOp.java | 160 ++++++++++++++++++ 2 files changed, 165 insertions(+), 0 deletions(-) diffs (182 lines): diff -r d1075e6b9291 -r 4a00f37c40e7 ChangeLog --- a/ChangeLog Mon Jan 12 10:13:56 2015 +0100 +++ b/ChangeLog Tue Jan 13 11:00:16 2015 +0100 @@ -1,3 +1,8 @@ +2015-01-13 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: + Ten new tests added into BitBltBufferedImageOp. + 2015-01-12 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r d1075e6b9291 -r 4a00f37c40e7 src/org/gfxtest/testsuites/BitBltBufferedImageOp.java --- a/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Mon Jan 12 10:13:56 2015 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Tue Jan 13 11:00:16 2015 +0100 @@ -6531,6 +6531,166 @@ } /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture3TypeIntARGB_Pre(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture3Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture3TypeUshort555RGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture3Image(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture3TypeUshort565RGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture3Image(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_USHORT_GRAY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture3TypeUshortGray(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture3Image(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4Type3ByteBGR(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4Type4ByteABGR(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_PRE}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4Type4ByteABGR_Pre(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4TypeByteBinary(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4TypeByteIndexed(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4TypeByteGray(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, rasterOp); + } + + /** * Entry point to the test suite. * * @param args not used in this case From bugzilla-daemon at icedtea.classpath.org Tue Jan 13 10:08:12 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Jan 2015 10:08:12 +0000 Subject: [Bug 2034] [IcedTea8] --enable-jamvm builds broken, missing JVM_GetTemporaryDirectory impl. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2034 --- Comment #3 from Xerxes R?nby --- Created attachment 1243 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1243&action=edit commit-112c353-jamvm-OpenJDK_JVM_GetTemporaryDirectory.patch The attached JamVM patch fixes the build. The patch has been sent to jamvm-general mailinglist for review: http://sourceforge.net/p/jamvm/mailman/message/33225720/ -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gnu.andrew at redhat.com Tue Jan 13 16:45:41 2015 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 13 Jan 2015 11:45:41 -0500 (EST) Subject: NoSuchMethodError: Matcher.quoteReplacement In-Reply-To: <54B4971F.8090405@nottheoilrig.com> References: <54B2E5A0.8020504@nottheoilrig.com> <1934335812.6553316.1421112530438.JavaMail.zimbra@redhat.com> <54B4971F.8090405@nottheoilrig.com> Message-ID: <92690351.7038806.1421167541587.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 12/01/15 05:28 PM, Andrew Hughes wrote: > > ----- Original Message ----- > >> I get the following error when I try to build 2.5.3: > >> > >> [...] > >> /home/nottheoilrig/icedtea-2.5.3/generated.build/com/sun/corba/se/impl/logging/UtilSystemException.java > >> An exception has occurred in the compiler (1.7.0_71_bootstrap). Please > >> file a bug at the Java Developer Connection > >> (http://java.sun.com/webapps/bugreport) after checking the Bug Parade > >> for duplicates. Include your program and the following diagnostic in > >> your report. Thank you. > >> java.lang.NoSuchMethodError: method > >> java.util.regex.Matcher.quoteReplacement with signature > >> (Ljava.lang.String;)Ljava.lang.String; was not found. > >> [...] > >> > >> Any idea how to resolve it? > >> Can I provide any additional details? > >> I downloaded the IcedTea 2.5.3 archive, > >> ran ./configure and make. > >> > >> The following are lines from my config.log, > >> are they helpful? > >> > >> [...] > >> configure:11304: checking if java.util.regex.Matcher.quoteReplacement is > >> missing > >> configure:11354: result: yes > >> [...] > >> configure:11820: checking if the VM supports 1.7 bytecode > >> javac: invalid source release: 7 > >> Usage: javac > >> use -help for a list of possible options > >> configure:11850: result: no > >> configure:11866: checking whether to disable the use of bootstrap tools > >> for bootstrapping > >> configure:11890: result: yes > >> [...] > > > > It's difficult to say much without the full config.log and build log. > > Thank you, > > here is the config.log: > http://nottheoilrig.com/java/201501120/config.log > > and here is the build log: > http://nottheoilrig.com/java/201501120/screenlog > > Can I provide any additional details? > This is sufficient, thanks. The main problem is your setup is just too old. It's about time this machine was upgraded to wheezy, as squeeze is obsolete. Moreover, wheezy already includes a build of 2.5.3 which will save you the trouble: https://packages.debian.org/wheezy/openjdk-7-jdk The actual problem is a bit convoluted. From the logs, I can see that a very old version of gcj, 4.4, is being used to bootstrap the build. This is why many features are found to be missing when your bootstrap JDK is tested during configure. The quoteReplacement method is missing in gcj 4.4, and there is a test to work around this in configure; if you look for the rt-class-files part of the build log, you will see it builds openjdk-boot/jdk/src/share/classes/java/util/regex/Matcher.java before the OpenJDK build begins, so a version with quoteReplacement is available. All would be fine, thanks to this fix, but your javac (provided by gcj) is too old to build Java 1.7 source code so the use of it to build is disabled. It instead tries to use the javac it just built and fails because it needs the missing method. I think it may be possible to fix this by running javac with the patched runtime on the bootclasspath. However, it's difficult to know without testing and changing that may break builds with other JDKs. We test builds with gcj the most, but not a version this old. If you have https://packages.debian.org/squeeze/openjdk-6-jdk installed, then you could try building with --with-jdk-home=/usr/lib/jvm/java-6-openjdk to use that instead. However, I strongly recommend that you just upgrade this system as the version of OpenJDK 6 is also outdated (1.13.5 is the latest) and there are likely to be further missing system dependencies later in the build that may cause problems, or lead to an incomplete JDK (for example, NIO2 is likely to be incomplete without certain system calls being present). Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From bugzilla-daemon at icedtea.classpath.org Wed Jan 14 00:32:31 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 14 Jan 2015 00:32:31 +0000 Subject: [Bug 2153] Unaligned memory access issue on armv5 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2153 mpadilla2 at gmail.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from mpadilla2 at gmail.com --- Fixed with gcc patch: https://github.com/archlinuxarm/PKGBUILDs/blob/master/core/gcc/0001-ARMv5-disable-LDRD-STRD.patch -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 14 12:03:53 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 14 Jan 2015 12:03:53 +0000 Subject: [Bug 2175] New: A fatal error has been detected by the Java Runtime Environment SIGSEGV Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2175 Bug ID: 2175 Summary: A fatal error has been detected by the Java Runtime Environment SIGSEGV Product: IcedTea Version: 6-hg Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: ricardobarbi at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 1244 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1244&action=edit log create by jvm I use a java jar to run my aplication in background mode. Sundendly the applicaton broken and close the JVM. I need to restart de JVM and restart the jar file. After this, it runs normally. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From aph at redhat.com Wed Jan 14 18:33:46 2015 From: aph at redhat.com (Andrew Haley) Date: Wed, 14 Jan 2015 18:33:46 +0000 Subject: [7u communication] 7u80 Timeline In-Reply-To: References: <54A28DF7.6090605@oracle.com> Message-ID: <54B6B68A.4000200@redhat.com> On 12/30/2014 10:36 PM, Martin Buchholz wrote: > When Oracle stopped working on openjdk6 update releases, our friends > on distro-pkg-dev volunteered to take over maintenance. Perhaps there > needs to be a staged handoff for openjdk7 as well? That sounds right. I think we'll need to do the same thing in this case. Andrew. From ptisnovs at icedtea.classpath.org Thu Jan 15 08:42:37 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 15 Jan 2015 08:42:37 +0000 Subject: /hg/gfx-test: 2 new changesets Message-ID: changeset 0111de5926ea in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=0111de5926ea author: Pavel Tisnovsky date: Thu Jan 15 09:43:48 2015 +0100 Another ten new tests added into BitBltBufferedImageOp. changeset 6987b53e04f4 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=6987b53e04f4 author: Pavel Tisnovsky date: Thu Jan 15 09:44:26 2015 +0100 Eight helper methods added into BitBltUsingBgColor. diffstat: ChangeLog | 10 + src/org/gfxtest/testsuites/BitBltBufferedImageOp.java | 160 ++++++++++++++++++ src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 136 +++++++++++++++ 3 files changed, 306 insertions(+), 0 deletions(-) diffs (333 lines): diff -r 4a00f37c40e7 -r 6987b53e04f4 ChangeLog --- a/ChangeLog Tue Jan 13 11:00:16 2015 +0100 +++ b/ChangeLog Thu Jan 15 09:44:26 2015 +0100 @@ -1,3 +1,13 @@ +2015-01-15 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Eight helper methods added into BitBltUsingBgColor. + +2015-01-14 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: + Another ten new tests added into BitBltBufferedImageOp. + 2015-01-13 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: diff -r 4a00f37c40e7 -r 6987b53e04f4 src/org/gfxtest/testsuites/BitBltBufferedImageOp.java --- a/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Tue Jan 13 11:00:16 2015 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Thu Jan 15 09:44:26 2015 +0100 @@ -6691,6 +6691,166 @@ } /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4TypeIntBGR(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_INT_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4TypeIntRGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_INT_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4TypeIntARGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4TypeIntARGB_Pre(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4TypeUshort555RGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4TypeUshort565RGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_USHORT_GRAY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture4TypeUshortGray(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture4Image(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5Type3ByteBGR(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5Type4ByteABGR(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_PRE}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5Type4ByteABGR_Pre(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, rasterOp); + } + + /** * Entry point to the test suite. * * @param args not used in this case diff -r 4a00f37c40e7 -r 6987b53e04f4 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Tue Jan 13 11:00:16 2015 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Jan 15 09:44:26 2015 +0100 @@ -2071,6 +2071,142 @@ } /** + * Test basic BitBlt operation for horizontal color stripes buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltHorizontalColorStripesBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithHorizontalColorStripesImage(image, graphics2d, BufferedImage.TYPE_INT_BGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for horizontal color stripes buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltHorizontalColorStripesBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithHorizontalColorStripesImage(image, graphics2d, BufferedImage.TYPE_INT_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for horizontal color stripes buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltHorizontalColorStripesBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithHorizontalColorStripesImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, backgroundColor); + } + + /** + * Test basic BitBlt operation for horizontal color stripes buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltHorizontalColorStripesBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithHorizontalColorStripesImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, backgroundColor); + } + + /** + * Test basic BitBlt operation for horizontal color stripes buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltHorizontalColorStripesBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithHorizontalColorStripesImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, backgroundColor); + } + + /** + * Test basic BitBlt operation for horizontal color stripes buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltHorizontalColorStripesBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithHorizontalColorStripesImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for horizontal color stripes buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltHorizontalColorStripesBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithHorizontalColorStripesImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for horizontal color stripes buffered image with type {@link BufferedImage#TYPE_USHORT_GRAY}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltHorizontalColorStripesBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithHorizontalColorStripesImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, backgroundColor); + } + + /** * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR_Pre. * Background color is set to Color.black. * From jkang at redhat.com Thu Jan 15 16:32:30 2015 From: jkang at redhat.com (Jie Kang) Date: Thu, 15 Jan 2015 11:32:30 -0500 (EST) Subject: [rfc][icedtea-web] Add unit tests for CacheUtil class In-Reply-To: <521809000.7391470.1421339329261.JavaMail.zimbra@redhat.com> Message-ID: <1444625884.7394119.1421339550356.JavaMail.zimbra@redhat.com> Hello, The patch adds a set of basic unit tests to CacheUtil to make sure they work as intended. They don't cover many edge cases at the moment and are mainly for developer's to read and gain an understanding of the CacheUtil class quicker. Edge cases will be added in the future. As well, there is one KnownToFail test for CacheUtil.cleanCache : This is due to an implementation error that causes entries marked for deletion to never be deleted in certain circumstances. This will be fixed in a subsequent patch. Okay to push? Regards, -- Jie Kang OpenJDK Team - Software Engineering Intern -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-cacheutil-tests-1.patch Type: text/x-patch Size: 7123 bytes Desc: not available URL: From aazores at redhat.com Thu Jan 15 18:16:57 2015 From: aazores at redhat.com (Andrew Azores) Date: Thu, 15 Jan 2015 13:16:57 -0500 Subject: [rfc][icedtea-web] Allow cache directory to be changed during runtime In-Reply-To: <923849450.2779734.1420487350270.JavaMail.zimbra@redhat.com> References: <923849450.2779734.1420487350270.JavaMail.zimbra@redhat.com> Message-ID: <54B80419.5050805@redhat.com> On 01/05/2015 02:49 PM, Jie Kang wrote: > Hello, > > This patch consolidates the cacheDir instance to a single place and allows us to change it during run-time. It also modifies a unit test to use this new feature. This feature is aimed mainly at unit tests that need the cache, but do not want to modify the icedtea-web's user cache. > > Thoughts? Okay to push? > > > Regards, > I think this looks generally ok. Maybe as a separate enhancement changeset, but since you're working in here anyway, could you look at doing some refactoring to store the cache directory as something better than a String? As a File, or using Java 7's nio2 stuff, a Path maybe? Thanks, -- Andrew Azores From aazores at redhat.com Thu Jan 15 18:18:25 2015 From: aazores at redhat.com (Andrew Azores) Date: Thu, 15 Jan 2015 13:18:25 -0500 Subject: [rfc][icedtea-web] Use temporary cache in PluginBridge unit tests In-Reply-To: <650651845.2801136.1420489191729.JavaMail.zimbra@redhat.com> References: <650651845.2801136.1420489191729.JavaMail.zimbra@redhat.com> Message-ID: <54B80471.6030104@redhat.com> On 01/05/2015 03:19 PM, Jie Kang wrote: > Hello, > > Some changes to PluginBridge caused a few of the unit tests in PluginBridgeTest to create entries in the cache. This patch adds a setup and teardown to the class in order to use a temporary cache location as opposed to the user's cache. > > This patch relies on the 'Allow cache directory to be changed during runtime' patch: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030291.html > > Thoughts? > > > Regards, > Assuming the parent patch is OK'd through, I think this is also okay to go. Maybe just rename "cacheDir" to something that indicates that it's the original user cache dir, not just some other cache dir. Thanks, -- Andrew Azores From aazores at redhat.com Thu Jan 15 18:20:14 2015 From: aazores at redhat.com (Andrew Azores) Date: Thu, 15 Jan 2015 13:20:14 -0500 Subject: [rfc][icedtea-web] PolicyEditor uses OptionParser In-Reply-To: <1882290830.3284389.1420560881139.JavaMail.zimbra@redhat.com> References: <1990186751.2825116.1420492362138.JavaMail.zimbra@redhat.com> <1882290830.3284389.1420560881139.JavaMail.zimbra@redhat.com> Message-ID: <54B804DE.1070505@redhat.com> On 01/06/2015 11:14 AM, Jie Kang wrote: > Hello, > > Patch looks fine to me. In terms of aazore's changes, I'd leave them out of this patch. Whichever one goes in second will deal with the conflicts appropriately and it won't be too much work. > > > Regards, > > ----- Original Message ----- >> Hello, >> >> This patch changes PolicyEditor to use OptionParser to parse its arguments. >> I have noticed that Andrew's PolicyEditor gains a real parser patch removes >> the codebase tag as an option. This patch does not at the moment, but I can >> follow if that is what is determined to be wanted. >> >> Thoughts ? >> >> Thank you, >> Lukasz Dracz >> > Agreed, leave it to the second one to go in (probably my parser stuff) to remove the option, don't do it now. Looks good to me. Thanks, -- Andrew Azores From aazores at redhat.com Thu Jan 15 18:37:39 2015 From: aazores at redhat.com (Andrew Azores) Date: Thu, 15 Jan 2015 13:37:39 -0500 Subject: [rfc][icedtea-web] PolicyEditor gains a real parser In-Reply-To: <634432449.2830218.1420493276156.JavaMail.zimbra@redhat.com> References: <549DB266.8050304@redhat.com> <634432449.2830218.1420493276156.JavaMail.zimbra@redhat.com> Message-ID: <54B808F3.4080500@redhat.com> On 01/05/2015 04:27 PM, Jie Kang wrote: > Hello, > > Long time no see :D > > After reading over the patch a few times, I don't have any major concerns with the code. I haven't noticed any bugs while user-testing as well. Great work! > > > One suggestion below and a question: > > diff --git a/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java b/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java > new file mode 100644 > --- /dev/null > +++ b/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java > @@ -0,0 +1,113 @@ > [...] > + @Override > + public int hashCode() { > + int result = keyStoreUrl.hashCode(); > + result = 31 * result + keyStoreType.hashCode(); > + result = 31 * result + keyStoreProvider.hashCode(); > + result = 31 * result + keyStorePasswordUrl.hashCode(); > + return result; > + } > > I'd suggest replacing this code with usage of the Objects.hash() : http://docs.oracle.com/javase/7/docs/api/java/util/Objects.html#hash(java.lang.Object...) > > It performs a extremely similar algorithm as the above but has the advantage of looking nicer. One of the answers in this thread shows what code it ends up running: http://stackoverflow.com/questions/13785353/equals-and-hashcode-is-objects-hash-method-broken > Nice catch. I'd gotten used to using Apache HashCodeBuilder and when that wasn't available here, I just let my IDE generate it for me ;) > > diff --git a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > @@ -63,39 +63,16 @@ > [...] > +import javax.swing.*; > > Is this package import intended? I think individual imports would be preferable (http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style) > > > Everything else is fine to me. Oops... I blame my IDE again! That was definitely not intentional. > > > > Regards, > > ----- Original Message ----- >> Hi all, >> >> Long time no see! >> >> I started this patch several months ago, but my school work became far >> too heavy and I had to put off any further work to finish off this >> patch. Today I've managed to finish it to a point that I think it's >> worth submitting for review. >> >> It's a big, long patch, so review will probably take quite some time, >> and may be difficult at times. I know I've appeared to be completely >> gone for many weeks, but I have actually been checking on my emails >> fairly often, just haven't had time to reply to any patch reviews. But >> right now I should have at least a few weeks before school really picks >> back up again. >> >> The gist of this patch is basically that I discovered that policytool's >> parser is actually available to use without any dirty reflection hacks >> or anything like that, but it's hidden away and not really documented, >> and is marked as an internal API. But it's open and so I think the worst >> case scenario if it's removed later is that we just fork and maintain an >> older copy. It's much easier and IMHO smarter than writing a whole new >> parser from scratch to duplicate the one that policytool uses, anyhow. >> This patch just rips out the old, crappy code that used horrible regex >> to try to parse policy files, and plops in the policytool parser >> instead. Anything else pretty much comes down to reconciling the >> existing PolicyEditor code and structures with the new ones that the >> parser gives and expects. >> >> Nice side effect: all policyeditor tests now pass, even the tricky >> comments handling ones ;) >> >> Thanks, >> -- >> Andrew Azores >> > New patch attached that addresses your two nits, and nothing else. Thanks, -- Andrew Azores -------------- next part -------------- A non-text attachment was scrubbed... Name: policyeditor-real-parser-2.patch Type: text/x-patch Size: 183226 bytes Desc: not available URL: From jkang at redhat.com Thu Jan 15 18:51:24 2015 From: jkang at redhat.com (Jie Kang) Date: Thu, 15 Jan 2015 13:51:24 -0500 (EST) Subject: [rfc][icedtea-web] PolicyEditor gains a real parser In-Reply-To: <54B808F3.4080500@redhat.com> References: <549DB266.8050304@redhat.com> <634432449.2830218.1420493276156.JavaMail.zimbra@redhat.com> <54B808F3.4080500@redhat.com> Message-ID: <566986650.7463391.1421347884410.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 01/05/2015 04:27 PM, Jie Kang wrote: > > Hello, > > > > Long time no see :D > > > > After reading over the patch a few times, I don't have any major concerns > > with the code. I haven't noticed any bugs while user-testing as well. > > Great work! > > > > > > One suggestion below and a question: > > > > diff --git > > a/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java > > b/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java > > new file mode 100644 > > --- /dev/null > > +++ b/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java > > @@ -0,0 +1,113 @@ > > [...] > > + @Override > > + public int hashCode() { > > + int result = keyStoreUrl.hashCode(); > > + result = 31 * result + keyStoreType.hashCode(); > > + result = 31 * result + keyStoreProvider.hashCode(); > > + result = 31 * result + keyStorePasswordUrl.hashCode(); > > + return result; > > + } > > > > I'd suggest replacing this code with usage of the Objects.hash() : > > http://docs.oracle.com/javase/7/docs/api/java/util/Objects.html#hash(java.lang.Object...) > > > > It performs a extremely similar algorithm as the above but has the > > advantage of looking nicer. One of the answers in this thread shows what > > code it ends up running: > > http://stackoverflow.com/questions/13785353/equals-and-hashcode-is-objects-hash-method-broken > > > > Nice catch. I'd gotten used to using Apache HashCodeBuilder and when > that wasn't available here, I just let my IDE generate it for me ;) > > > > > diff --git > > a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > > b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > > --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > > +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java > > @@ -63,39 +63,16 @@ > > [...] > > +import javax.swing.*; > > > > Is this package import intended? I think individual imports would be > > preferable (http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style) > > > > > > Everything else is fine to me. > > Oops... I blame my IDE again! That was definitely not intentional. > > > > > > > > > Regards, > > > > ----- Original Message ----- > >> Hi all, > >> > >> Long time no see! > >> > >> I started this patch several months ago, but my school work became far > >> too heavy and I had to put off any further work to finish off this > >> patch. Today I've managed to finish it to a point that I think it's > >> worth submitting for review. > >> > >> It's a big, long patch, so review will probably take quite some time, > >> and may be difficult at times. I know I've appeared to be completely > >> gone for many weeks, but I have actually been checking on my emails > >> fairly often, just haven't had time to reply to any patch reviews. But > >> right now I should have at least a few weeks before school really picks > >> back up again. > >> > >> The gist of this patch is basically that I discovered that policytool's > >> parser is actually available to use without any dirty reflection hacks > >> or anything like that, but it's hidden away and not really documented, > >> and is marked as an internal API. But it's open and so I think the worst > >> case scenario if it's removed later is that we just fork and maintain an > >> older copy. It's much easier and IMHO smarter than writing a whole new > >> parser from scratch to duplicate the one that policytool uses, anyhow. > >> This patch just rips out the old, crappy code that used horrible regex > >> to try to parse policy files, and plops in the policytool parser > >> instead. Anything else pretty much comes down to reconciling the > >> existing PolicyEditor code and structures with the new ones that the > >> parser gives and expects. > >> > >> Nice side effect: all policyeditor tests now pass, even the tricky > >> comments handling ones ;) > >> > >> Thanks, > >> -- > >> Andrew Azores > >> > > > > New patch attached that addresses your two nits, and nothing else. Hey, Looks good to me. +1. Up to you if you'd like another set of eyes before pushing. Heads up if you're not aware: jvanek and ldracz are both on PTO till this coming Monday Jan 19th. Regards, > > Thanks, > -- > Andrew Azores > -- Jie Kang OpenJDK Team - Software Engineering Intern From aazores at redhat.com Thu Jan 15 18:54:05 2015 From: aazores at redhat.com (Andrew Azores) Date: Thu, 15 Jan 2015 13:54:05 -0500 Subject: [rfc][icedtea-web] PolicyEditor gains a real parser In-Reply-To: <566986650.7463391.1421347884410.JavaMail.zimbra@redhat.com> References: <549DB266.8050304@redhat.com> <634432449.2830218.1420493276156.JavaMail.zimbra@redhat.com> <54B808F3.4080500@redhat.com> <566986650.7463391.1421347884410.JavaMail.zimbra@redhat.com> Message-ID: <54B80CCD.4090401@redhat.com> On 01/15/2015 01:51 PM, Jie Kang wrote: > > > ----- Original Message ----- >> On 01/05/2015 04:27 PM, Jie Kang wrote: >>> Hello, >>> >>> Long time no see :D >>> >>> After reading over the patch a few times, I don't have any major concerns >>> with the code. I haven't noticed any bugs while user-testing as well. >>> Great work! >>> >>> >>> One suggestion below and a question: >>> >>> diff --git >>> a/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java >>> b/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java >>> new file mode 100644 >>> --- /dev/null >>> +++ b/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java >>> @@ -0,0 +1,113 @@ >>> [...] >>> + @Override >>> + public int hashCode() { >>> + int result = keyStoreUrl.hashCode(); >>> + result = 31 * result + keyStoreType.hashCode(); >>> + result = 31 * result + keyStoreProvider.hashCode(); >>> + result = 31 * result + keyStorePasswordUrl.hashCode(); >>> + return result; >>> + } >>> >>> I'd suggest replacing this code with usage of the Objects.hash() : >>> http://docs.oracle.com/javase/7/docs/api/java/util/Objects.html#hash(java.lang.Object...) >>> >>> It performs a extremely similar algorithm as the above but has the >>> advantage of looking nicer. One of the answers in this thread shows what >>> code it ends up running: >>> http://stackoverflow.com/questions/13785353/equals-and-hashcode-is-objects-hash-method-broken >>> >> >> Nice catch. I'd gotten used to using Apache HashCodeBuilder and when >> that wasn't available here, I just let my IDE generate it for me ;) >> >>> >>> diff --git >>> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>> @@ -63,39 +63,16 @@ >>> [...] >>> +import javax.swing.*; >>> >>> Is this package import intended? I think individual imports would be >>> preferable (http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style) >>> >>> >>> Everything else is fine to me. >> >> Oops... I blame my IDE again! That was definitely not intentional. >> >>> >>> >>> >>> Regards, >>> >>> ----- Original Message ----- >>>> Hi all, >>>> >>>> Long time no see! >>>> >>>> I started this patch several months ago, but my school work became far >>>> too heavy and I had to put off any further work to finish off this >>>> patch. Today I've managed to finish it to a point that I think it's >>>> worth submitting for review. >>>> >>>> It's a big, long patch, so review will probably take quite some time, >>>> and may be difficult at times. I know I've appeared to be completely >>>> gone for many weeks, but I have actually been checking on my emails >>>> fairly often, just haven't had time to reply to any patch reviews. But >>>> right now I should have at least a few weeks before school really picks >>>> back up again. >>>> >>>> The gist of this patch is basically that I discovered that policytool's >>>> parser is actually available to use without any dirty reflection hacks >>>> or anything like that, but it's hidden away and not really documented, >>>> and is marked as an internal API. But it's open and so I think the worst >>>> case scenario if it's removed later is that we just fork and maintain an >>>> older copy. It's much easier and IMHO smarter than writing a whole new >>>> parser from scratch to duplicate the one that policytool uses, anyhow. >>>> This patch just rips out the old, crappy code that used horrible regex >>>> to try to parse policy files, and plops in the policytool parser >>>> instead. Anything else pretty much comes down to reconciling the >>>> existing PolicyEditor code and structures with the new ones that the >>>> parser gives and expects. >>>> >>>> Nice side effect: all policyeditor tests now pass, even the tricky >>>> comments handling ones ;) >>>> >>>> Thanks, >>>> -- >>>> Andrew Azores >>>> >>> >> >> New patch attached that addresses your two nits, and nothing else. > > Hey, > > Looks good to me. +1. Up to you if you'd like another set of eyes before pushing. Heads up if you're not aware: jvanek and ldracz are both on PTO till this coming Monday Jan 19th. > > > Regards, > >> >> Thanks, >> -- >> Andrew Azores >> > Okay, thanks for the notice. I think I will wait for another pair of eyes on this before pushing - really don't want to accidentally break PolicyEditor :) -- Andrew Azores From jkang at redhat.com Thu Jan 15 19:17:53 2015 From: jkang at redhat.com (Jie Kang) Date: Thu, 15 Jan 2015 14:17:53 -0500 (EST) Subject: [rfc][icedtea-web] Use File for cache directory instead of String In-Reply-To: <970145140.7475281.1421349022209.JavaMail.zimbra@redhat.com> Message-ID: <856376568.7481817.1421349473251.JavaMail.zimbra@redhat.com> Hello, This patch changes the type of cacheDir from String to File. This patch is a changeset on top of the patch "Allow cache directory to be changed during runtime" discussed here[1]. Both patches have been attached for convenience. [1] http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030316.html Patch order: HEAD -->> itw-change-cache-location -->> itw-cache-string-to-file How does it look? Regards, -- Jie Kang OpenJDK Team - Software Engineering Intern -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-change-cache-location-1.patch Type: text/x-patch Size: 6237 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-cache-string-to-file-1.patch Type: text/x-patch Size: 7331 bytes Desc: not available URL: From emilio-10 at live.com Fri Jan 16 03:30:54 2015 From: emilio-10 at live.com (Emilio K) Date: Thu, 15 Jan 2015 22:30:54 -0500 Subject: Interested in helping out. Message-ID: Hi, I'm at third year CS student at university, and I was wondering if there was anything I could help with. I'm looking to improve my skills with Java and Linux, and just coding in general. Also, I'm just looking to gain some more experience, since I will be applying for internships very soon. This is my first time doing something like ever, I haven't really done much coding on my own besides school assignments and what not. But, anything you guys have that I might be able to help with, I'll be happy to try! Thanks! -------------- next part -------------- An HTML attachment was scrubbed... URL: From ptisnovs at icedtea.classpath.org Fri Jan 16 09:28:30 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 16 Jan 2015 09:28:30 +0000 Subject: /hg/gfx-test: Another ten new tests added into BitBltBufferedIma... Message-ID: changeset 95af23d07ea6 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=95af23d07ea6 author: Pavel Tisnovsky date: Fri Jan 16 10:30:20 2015 +0100 Another ten new tests added into BitBltBufferedImageOp. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBufferedImageOp.java | 160 ++++++++++++++++++ 2 files changed, 165 insertions(+), 0 deletions(-) diffs (182 lines): diff -r 6987b53e04f4 -r 95af23d07ea6 ChangeLog --- a/ChangeLog Thu Jan 15 09:44:26 2015 +0100 +++ b/ChangeLog Fri Jan 16 10:30:20 2015 +0100 @@ -1,3 +1,8 @@ +2015-01-16 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: + Another ten new tests added into BitBltBufferedImageOp. + 2015-01-15 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 6987b53e04f4 -r 95af23d07ea6 src/org/gfxtest/testsuites/BitBltBufferedImageOp.java --- a/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Thu Jan 15 09:44:26 2015 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Fri Jan 16 10:30:20 2015 +0100 @@ -6851,6 +6851,166 @@ } /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5TypeByteBinary(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5TypeByteIndexed(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5TypeByteGray(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5TypeIntBGR(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_INT_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5TypeIntRGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_INT_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5TypeIntARGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5TypeIntARGB_Pre(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5TypeUshort555RGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5TypeUshort565RGB(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_USHORT_GRAY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture5TypeUshortGray(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, rasterOp); + } + + /** * Entry point to the test suite. * * @param args not used in this case From gitne at gmx.de Fri Jan 16 14:29:55 2015 From: gitne at gmx.de (Jacob Wisor) Date: Fri, 16 Jan 2015 15:29:55 +0100 Subject: [rfc][icedtea-web] Use File for cache directory instead of String In-Reply-To: <856376568.7481817.1421349473251.JavaMail.zimbra@redhat.com> References: <856376568.7481817.1421349473251.JavaMail.zimbra@redhat.com> Message-ID: Hello there! On 01/15/2015 at 08:17 PM Jie Kang wrote: > Hello, > > This patch changes the type of cacheDir from String to File. > > This patch is a changeset on top of the patch "Allow cache directory to be > changed during runtime" discussed here[1]. Both patches have been attached for > convenience. > > [1] > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030316.html > > Patch order: HEAD -->> itw-change-cache-location -->> > itw-cache-string-to-file > > > How does it look? A few things: > diff --git a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > --- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > +++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > [?] > @@ -80,11 +80,11 @@ > > private CacheLRUWrapper() { > String setCachePath = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR); > - String cacheDir = new File(setCachePath != null ? setCachePath : System.getProperty("java.io.tmpdir")).getPath(); > + File cacheDir = new File(setCachePath != null ? setCachePath : System.getProperty("java.io.tmpdir")); > setupCacheDir(cacheDir); > } > > - private void setupCacheDir(String cacheDir) { > + private void setupCacheDir(File cacheDir) { > this.cacheDir = cacheDir; > cacheOrder = new PropertiesFile( > new File(cacheDir + File.separator + CACHE_INDEX_FILE_NAME)); Warning! "cacheDir + File.separator + CACHE_INDEX_FILE_NAME" evaluates to "cacheDir.toString() + File.separator + CACHE_INDEX_FILE_NAME". You should carefully check other locations where CacheLRUWrapper.cacheDir might evaluate to File.toString() instead of File.getPath(). Or, where rather File.toPath() should be used. > @@ -152,7 +152,7 @@ > > // 2. check path format - does the path look correct? > if (path != null) { > - if (path.indexOf(cacheDir) < 0) { > + if (path.indexOf(cacheDir.getPath()) < 0) { > it.remove(); > modified = true; > } Is this piece of code still required after CacheLRUWrapper.cacheDir has been changed to java.io.File? java.io.File already does proper system specific path syntax checking internally upon construction. > @@ -206,7 +206,7 @@ > } > > private String getIdForCacheFolder(String folder) { > - int len = cacheDir.length(); > + int len = cacheDir.getPath().length(); > int index = folder.indexOf(File.separatorChar, len + 1); > return folder.substring(len + 1, index); > } Err, I do not want to sound like a smart ass but this whole ID collocation in a file path scheme looks bogous and error prone to me. Warning! folder.length() may be smaller than cacheDir.length() + 1! So, getting the ID by analyzing a File object's String path instead of using File.toPath() since JDK?1.7 is probably not the safest thing to do. > [?] > diff --git a/netx/net/sourceforge/jnlp/cache/CacheUtil.java > b/netx/net/sourceforge/jnlp/cache/CacheUtil.java > --- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java > +++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java > [?] > @@ -319,7 +319,7 @@ > * Get the path to file minus the cache directory and indexed folder. > */ > private static String pathToURLPath(String path) { > - int len = lruHandler.getCacheDir().length(); > + int len = lruHandler.getCacheDir().getPath().length(); > int index = path.indexOf(File.separatorChar, len + 1); > return path.substring(index); > } Again, this is probably not the safest thing to do since we have java.nio.file.Path since JDK 1.7 at our disposal. Beware though that java.nio.file.Path is a system dependent representation of a path. If you really want to be system independent you probably gonna have to stick to URIs. However, only URIs having the "file:" scheme should be or rather must be allowed for cached resources in order to prevent malicious code from loading supposedly cached resources from arbitrary network locations. > @@ -332,7 +332,7 @@ > String path = filePath; > String tempPath = ""; > > - String cacheDir = lruHandler.getCacheDir(); > + String cacheDir = lruHandler.getCacheDir().getPath(); > > while(path.startsWith(cacheDir) && !path.equals(cacheDir)){ > tempPath = new File(path).getParent(); Same goes here for parsing path Strings. Strangely, the last line seems to be doing it the safe way, yet does not use the even safer way by calling File.getParentFile(). > @@ -567,7 +567,7 @@ > * rStr first becomes: /0/http/www.example.com/subdir/a.jar > * then rstr becomes: /home/user1/.icedtea/cache/0 > */ > - String rStr = file.getPath().substring(lruHandler.getCacheDir().length()); > + String rStr = file.getPath().substring(lruHandler.getCacheDir().getPath().length()); > rStr = lruHandler.getCacheDir() + rStr.substring(0, rStr.indexOf(File.separatorChar, 1)); > long len = file.length(); This is very difficult to read and understand. Besides, there are multiple unneccessary calls to CacheLRUWrapper.getCacheDir() and multiple assignments to rStr. > [?] > public class CacheLRUWrapperTest { > > private static final CacheLRUWrapper clw = CacheLRUWrapper.getInstance(); > - private static String cacheDirBackup; > + private static File cacheDirBackup; > private static PropertiesFile cacheOrderBackup; > // does no DeploymentConfiguration exist for this file name? > private static final String cacheIndexFileName = CacheLRUWrapper.CACHE_INDEX_FILE_NAME + "_testing"; > @@ -72,7 +72,7 @@ > static public void setupJNLPRuntimeConfig() { > cacheDirBackup = clw.cacheDir; > cacheOrderBackup = clw.cacheOrder; > - clw.cacheDir=System.getProperty("java.io.tmpdir"); > + clw.cacheDir = new File(System.getProperty("java.io.tmpdir")); > clw.cacheOrder = new PropertiesFile( new File(clw.cacheDir + File.separator + cacheIndexFileName)); Watch it here! clw.cacheDir + File.separator + cacheIndexFileName evaluates to clw.cacheDir.toString() + File.separator + cacheIndexFileName What you probably have meant was clw.cacheDir.getPath() + File.separator + cacheIndexFileName > [?] > diff --git > a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > --- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > @@ -445,8 +445,6 @@ > Assert.assertTrue(u.getQuery().contains("version-id=1.0")); > } > > - private static String cacheDir; > - > @BeforeClass > public static void setupDownloadServer() throws IOException { > File dir = new File(System.getProperty("java.io.tmpdir"), > "itw-down"); > @@ -456,8 +454,8 @@ > downloadServer = > ServerAccess.getIndependentInstance(dir.getAbsolutePath(), > ServerAccess.findFreePort()); > redirectErrBack(); > > - String tempCache = System.getProperty("java.io.tmpdir") + > File.separator + "tempcache"; > - CacheUtil.setCacheDir(tempCache); > + File tempCacheDir = new File(System.getProperty("java.io.tmpdir") + > File.separator + "tempcache"); > + CacheUtil.setCacheDir(tempCacheDir); > } > > @AfterClass > @@ -465,7 +463,8 @@ > downloadServer.stop(); > > CacheUtil.clearCache(); > - CacheUtil.setCacheDir(JNLPRuntime.getConfiguration().getProperty(Dep > loymentConfiguration.KEY_USER_CACHE_DIR)); > + File defaultCacheDir = new > File(JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_U > SER_CACHE_DIR)); > + CacheUtil.setCacheDir(defaultCacheDir); I am bit confused here. CacheUtil.setCacheDir(File) does not seem to exist. Regards Jacob From bugzilla-daemon at icedtea.classpath.org Fri Jan 16 15:46:04 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 16 Jan 2015 15:46:04 +0000 Subject: [Bug 2176] New: LibreOffice Base crashes when enter a quote while changing a query Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2176 Bug ID: 2176 Summary: LibreOffice Base crashes when enter a quote while changing a query Product: IcedTea Version: 6-hg Hardware: x86_64 OS: Linux Status: NEW Severity: minor Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: christian at bardak.ws CC: unassigned at icedtea.classpath.org Created attachment 1245 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1245&action=edit Logfile Hi, it's my first Bug Report and I hope I am doing everything right for you to help me. I am able to reproduce the error. The error occurs when I enter a quote while changing a query in LibreOffice Base. Here is the query I want to change: SELECT "Monat", "s"."Typ", "Betrag" FROM ( SELECT "Monat", "Typ", "Betrag" FROM "vb_EKY" UNION ALL SELECT "Monat", "Typ", "Betrag" FROM "vb_GMBS" UNION ALL SELECT "Monat", "Typ", "Betrag" FROM "vb_KG" UNION ALL SELECT "Monat", "Typ", "Betrag" FROM "vb_RB1" UNION ALL SELECT "Monat", "Typ", "Betrag" FROM "vb_RBSG" UNION ALL SELECT "Monat", "Typ", "Betrag" FROM "vb_Schule" UNION ALL SELECT "Monat", "Typ", "Betrag" FROM "vb_WW" UNION ALL SELECT "Monat", "Typ", "Betrag" FROM "vb_KdU" ) AS "a", "Stammdaten" AS "s" WHERE "a"."Typ" = "s"."ID" ORDER BY "Monat", "a"."Typ" Now I want to add a new field in the select list an begin to write (see second row): SELECT "Monat", "s"."Typ", "Betrag" FROM ( SELECT CONCAT(""Monat", "Typ", "Betrag" FROM "vb_EKY" UNION ALL SELECT "Monat", "Typ", "Betrag" FROM "vb_GMBS" UNION ALL ... Then Basse crashes while typing the quote. When opening Base from the terminal I get this errormessage: christian at christian-laptop:~$ libreoffice --base # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007f0134f3112c, pid=17103, tid=139643213387968 # # JRE version: 6.0_33-b33 # Java VM: OpenJDK 64-Bit Server VM (23.25-b01 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea6 1.13.5 # Distribution: Debian GNU/Linux 7.6 (wheezy), package 6b33-1.13.5-2~deb7u1 # Problematic frame: # C [libsvtlo.so+0x1c912c] svtools::QueryDeleteDlg_Impl::QueryDeleteDlg_Impl(Window*, String const&)+0xa2c # # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again # # An error report file with more information is saved as: # /home/christian/hs_err_pid17103.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # [error occurred during error reporting , id 0xb] christian at christian-laptop:~$ ulimit unlimited So I hope you could help me somehow. Greetings Christian -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jan 16 20:34:47 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 16 Jan 2015 20:34:47 +0000 Subject: [Bug 2176] LibreOffice Base crashes when enter a quote while changing a query In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2176 Christian Bardak changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |MOVED --- Comment #1 from Christian Bardak --- Hello, the Error seems to be the same like Bug 927223 - [abrt] libreoffice-core-3.6.5.2-5.fc18: raise: MultiLineEditSyntaxHighlight::DoBracketHilight killed by signal 6 (SIGABRT) see: https://bugzilla.redhat.com/show_bug.cgi?id=927223 If there is a blank row above the row that was edit, then the error occurs. When I delete the blank row, it is no problem to add an quote or apostroph. So I think the error is in Libreoffice-base. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Sun Jan 18 16:37:22 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 18 Jan 2015 16:37:22 +0000 Subject: [Bug 2176] LibreOffice Base crashes when enter a quote while changing a query In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2176 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|6-hg |6-1.13.5 Resolution|MOVED |INVALID --- Comment #2 from Andrew John Hughes --- Yes, the original crash shows a failure in LibreOffice native code. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Jan 19 03:23:16 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 19 Jan 2015 03:23:16 +0000 Subject: [Bug 2177] New: [IcedTea6] Backport 8028623 so servicability agent works with apps using non-ASCII characters Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2177 Bug ID: 2177 Summary: [IcedTea6] Backport 8028623 so servicability agent works with apps using non-ASCII characters Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org Clone of PR2112 for IcedTea 1.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Jan 19 03:23:53 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 19 Jan 2015 03:23:53 +0000 Subject: [Bug 2177] [IcedTea6] Backport 8028623 so servicability agent works with apps using non-ASCII characters In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2177 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |6-1.13.6 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ptisnovs at icedtea.classpath.org Mon Jan 19 09:24:25 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 19 Jan 2015 09:24:25 +0000 Subject: /hg/gfx-test: Ten helper methods added into BitBltUsingBgColor. Message-ID: changeset dee350b3660a in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=dee350b3660a author: Pavel Tisnovsky date: Mon Jan 19 10:26:17 2015 +0100 Ten helper methods added into BitBltUsingBgColor. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 170 +++++++++++++++++++++ 2 files changed, 175 insertions(+), 0 deletions(-) diffs (192 lines): diff -r 95af23d07ea6 -r dee350b3660a ChangeLog --- a/ChangeLog Fri Jan 16 10:30:20 2015 +0100 +++ b/ChangeLog Mon Jan 19 10:26:17 2015 +0100 @@ -1,3 +1,8 @@ +2015-01-19 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Ten helper methods added into BitBltUsingBgColor. + 2015-01-16 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: diff -r 95af23d07ea6 -r dee350b3660a src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Fri Jan 16 10:30:20 2015 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Mon Jan 19 10:26:17 2015 +0100 @@ -2207,6 +2207,176 @@ } /** + * Test basic BitBlt operation for horizontal color stripes buffered image with type {@link BufferedImage#TYPE_CUSTOM}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltHorizontalColorStripesBufferedImageTypeCustom(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithHorizontalColorStripesImage(image, graphics2d, BufferedImage.TYPE_CUSTOM, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_PRE}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageType4ByteABGR_Pre(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_INT_BGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_INT_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, backgroundColor); + } + + /** * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR_Pre. * Background color is set to Color.black. * From bugzilla-daemon at icedtea.classpath.org Mon Jan 19 16:01:30 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 19 Jan 2015 16:01:30 +0000 Subject: [Bug 2178] New: Icedtea 1.5 no longer allows to permanently accept applets (always prompted to run yes/no) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2178 Bug ID: 2178 Summary: Icedtea 1.5 no longer allows to permanently accept applets (always prompted to run yes/no) Product: IcedTea-Web Version: 1.5 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P5 Component: Plugin Assignee: jvanek at redhat.com Reporter: domenico.alessi at ericsson.com CC: unassigned at icedtea.classpath.org When visiting sites to run applets using JDK 1.7 and icedtea 7 version 1.5 I am always asked if I want to run the applet. There is now option to allow and remember. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Jan 19 16:02:10 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 19 Jan 2015 16:02:10 +0000 Subject: [Bug 2178] Icedtea 1.5 no longer allows to permanently accept applets (always prompted to run yes/no) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2178 DA changed: What |Removed |Added ---------------------------------------------------------------------------- Priority|P5 |P3 CC| |domenico.alessi at ericsson.co | |m Target Milestone|--- |1.5.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jkang at redhat.com Mon Jan 19 16:55:10 2015 From: jkang at redhat.com (Jie Kang) Date: Mon, 19 Jan 2015 11:55:10 -0500 (EST) Subject: [rfc][icedtea-web] Use File for cache directory instead of String In-Reply-To: References: <856376568.7481817.1421349473251.JavaMail.zimbra@redhat.com> Message-ID: <270001418.8700694.1421686510220.JavaMail.zimbra@redhat.com> ----- Original Message ----- > Hello there! > > On 01/15/2015 at 08:17 PM Jie Kang wrote: > > Hello, > > > > This patch changes the type of cacheDir from String to File. > > > > This patch is a changeset on top of the patch "Allow cache directory to be > > changed during runtime" discussed here[1]. Both patches have been attached > > for > > convenience. > > > > [1] > > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030316.html > > > > Patch order: HEAD -->> itw-change-cache-location -->> > > itw-cache-string-to-file > > > > > > How does it look? > > A few things: > > > diff --git a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > > b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > > --- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > > +++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > > [?] > > @@ -80,11 +80,11 @@ > > > > private CacheLRUWrapper() { > > String setCachePath = > > JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR); > > - String cacheDir = new File(setCachePath != null ? setCachePath : > > System.getProperty("java.io.tmpdir")).getPath(); > > + File cacheDir = new File(setCachePath != null ? setCachePath : > > System.getProperty("java.io.tmpdir")); > > setupCacheDir(cacheDir); > > } > > > > - private void setupCacheDir(String cacheDir) { > > + private void setupCacheDir(File cacheDir) { > > this.cacheDir = cacheDir; > > cacheOrder = new PropertiesFile( > > new File(cacheDir + File.separator + > > CACHE_INDEX_FILE_NAME)); > > Warning! "cacheDir + File.separator + CACHE_INDEX_FILE_NAME" evaluates to > "cacheDir.toString() + File.separator + CACHE_INDEX_FILE_NAME". > You should carefully check other locations where CacheLRUWrapper.cacheDir > might > evaluate to File.toString() instead of File.getPath(). Or, where rather > File.toPath() should be used. File.toString() == File.getPath() [1]. But I have added .getPath() to all locations where it is unclear to be more explicit. [1] http://docs.oracle.com/javase/7/docs/api/java/io/File.html#toString() > > > @@ -152,7 +152,7 @@ > > > > // 2. check path format - does the path look correct? > > if (path != null) { > > - if (path.indexOf(cacheDir) < 0) { > > + if (path.indexOf(cacheDir.getPath()) < 0) { > > it.remove(); > > modified = true; > > } > > Is this piece of code still required after CacheLRUWrapper.cacheDir has been > changed to java.io.File? java.io.File already does proper system specific > path > syntax checking internally upon construction. Yes it's still required. This code has nothing to do with 'proper system specific path syntax checking'. It is validating all the entries in the LRU file to make sure they seem sane. In this case, it is making sure the entry in the LRU is actually in the cache directory. Whether or not this is the 'best' way to do this is up for debate, but it isn't in the scope of this patch. > > > @@ -206,7 +206,7 @@ > > } > > > > private String getIdForCacheFolder(String folder) { > > - int len = cacheDir.length(); > > + int len = cacheDir.getPath().length(); > > int index = folder.indexOf(File.separatorChar, len + 1); > > return folder.substring(len + 1, index); > > } > > Err, I do not want to sound like a smart ass but this whole ID collocation in > a > file path scheme looks bogous and error prone to me. > Warning! folder.length() may be smaller than cacheDir.length() + 1! So, > getting > the ID by analyzing a File object's String path instead of using > File.toPath() > since JDK?1.7 is probably not the safest thing to do. > > > [?] > > diff --git a/netx/net/sourceforge/jnlp/cache/CacheUtil.java > > b/netx/net/sourceforge/jnlp/cache/CacheUtil.java > > --- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java > > +++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java > > [?] > > @@ -319,7 +319,7 @@ > > * Get the path to file minus the cache directory and indexed folder. > > */ > > private static String pathToURLPath(String path) { > > - int len = lruHandler.getCacheDir().length(); > > + int len = lruHandler.getCacheDir().getPath().length(); > > int index = path.indexOf(File.separatorChar, len + 1); > > return path.substring(index); > > } > > Again, this is probably not the safest thing to do since we have > java.nio.file.Path since JDK 1.7 at our disposal. Beware though that > java.nio.file.Path is a system dependent representation of a path. If you > really want to be system independent you probably gonna have to stick to > URIs. > However, only URIs having the "file:" scheme should be or rather must be > allowed for cached resources in order to prevent malicious code from loading > supposedly cached resources from arbitrary network locations. > > > @@ -332,7 +332,7 @@ > > String path = filePath; > > String tempPath = ""; > > > > - String cacheDir = lruHandler.getCacheDir(); > > + String cacheDir = lruHandler.getCacheDir().getPath(); > > > > while(path.startsWith(cacheDir) && !path.equals(cacheDir)){ > > tempPath = new File(path).getParent(); > > Same goes here for parsing path Strings. Strangely, the last line seems to be > doing it the safe way, yet does not use the even safer way by calling > File.getParentFile(). > > > @@ -567,7 +567,7 @@ > > * rStr first becomes: > > /0/http/www.example.com/subdir/a.jar > > * then rstr becomes: /home/user1/.icedtea/cache/0 > > */ > > - String rStr = > > file.getPath().substring(lruHandler.getCacheDir().length()); > > + String rStr = > > file.getPath().substring(lruHandler.getCacheDir().getPath().length()); > > rStr = lruHandler.getCacheDir() + rStr.substring(0, > > rStr.indexOf(File.separatorChar, 1)); > > long len = file.length(); > > This is very difficult to read and understand. Besides, there are multiple > unneccessary calls to CacheLRUWrapper.getCacheDir() and multiple assignments > to > rStr. The three comments above have been noted, however they aren't in the scope of this patch. At the moment the caching code makes a huge number of assumptions on the correctness of the cache on the file-system. This is obviously a bad idea but surprisingly has led to only a few bugs, afaik. Work can be done in this area and your comments are reasonable, but the changes will definitely not be in this patch. > > > [?] > > public class CacheLRUWrapperTest { > > > > private static final CacheLRUWrapper clw = > > CacheLRUWrapper.getInstance(); > > - private static String cacheDirBackup; > > + private static File cacheDirBackup; > > private static PropertiesFile cacheOrderBackup; > > // does no DeploymentConfiguration exist for this file name? > > private static final String cacheIndexFileName = > > CacheLRUWrapper.CACHE_INDEX_FILE_NAME + "_testing"; > > @@ -72,7 +72,7 @@ > > static public void setupJNLPRuntimeConfig() { > > cacheDirBackup = clw.cacheDir; > > cacheOrderBackup = clw.cacheOrder; > > - clw.cacheDir=System.getProperty("java.io.tmpdir"); > > + clw.cacheDir = new File(System.getProperty("java.io.tmpdir")); > > clw.cacheOrder = new PropertiesFile( new File(clw.cacheDir + > > File.separator + cacheIndexFileName)); > > Watch it here! > > clw.cacheDir + File.separator + cacheIndexFileName > > evaluates to > > clw.cacheDir.toString() + File.separator + cacheIndexFileName > > What you probably have meant was > > clw.cacheDir.getPath() + File.separator + cacheIndexFileName > > > [?] > > diff --git > > a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > > b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > > --- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > > +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > > @@ -445,8 +445,6 @@ > > Assert.assertTrue(u.getQuery().contains("version-id=1.0")); > > } > > > > - private static String cacheDir; > > - > > @BeforeClass > > public static void setupDownloadServer() throws IOException { > > File dir = new File(System.getProperty("java.io.tmpdir"), > > "itw-down"); > > @@ -456,8 +454,8 @@ > > downloadServer = > > ServerAccess.getIndependentInstance(dir.getAbsolutePath(), > > ServerAccess.findFreePort()); > > redirectErrBack(); > > > > - String tempCache = System.getProperty("java.io.tmpdir") + > > File.separator + "tempcache"; > > - CacheUtil.setCacheDir(tempCache); > > + File tempCacheDir = new File(System.getProperty("java.io.tmpdir") > > + > > File.separator + "tempcache"); > > + CacheUtil.setCacheDir(tempCacheDir); > > } > > > > @AfterClass > > @@ -465,7 +463,8 @@ > > downloadServer.stop(); > > > > CacheUtil.clearCache(); > > - > > CacheUtil.setCacheDir(JNLPRuntime.getConfiguration().getProperty(Dep > > loymentConfiguration.KEY_USER_CACHE_DIR)); > > + File defaultCacheDir = new > > File(JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_U > > SER_CACHE_DIR)); > > + CacheUtil.setCacheDir(defaultCacheDir); > > I am bit confused here. CacheUtil.setCacheDir(File) does not seem to exist. I am confused too since it exists for me in 'itw-cache-string-to-file-1.patch'. @@ -622,11 +622,11 @@ } } - protected static void setCacheDir(String cacheDir) { + protected static void setCacheDir(File cacheDir) { lruHandler.setCacheDir(cacheDir); } Attached is an updated patch that replaces all the uses of File.toString() with File.getPath(). Good catch with that one as it's more explicit now. How does it look? Regards, > > Regards > > Jacob > -- Jie Kang OpenJDK Team - Software Engineering Intern -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-cache-string-to-file-2.patch Type: text/x-patch Size: 8009 bytes Desc: not available URL: From andrew at icedtea.classpath.org Mon Jan 19 17:53:05 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 19 Jan 2015 17:53:05 +0000 Subject: /hg/icedtea6-hg: 3 new changesets Message-ID: changeset 199332d3ed53 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=199332d3ed53 author: Andrew John Hughes date: Wed Nov 12 23:58:13 2014 +0000 PR2083: Add support for building Zero on AArch64 2014-11-12 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch. * NEWS: Updated. * patches/pr2083-aarch64_zero.patch: Add HotSpot support for building Zero on AArch64. changeset d6a1b5eb846b in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d6a1b5eb846b author: Andrew John Hughes date: Wed Dec 24 18:48:30 2014 +0000 Merge changeset ccfb83ff9e78 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ccfb83ff9e78 author: Andrew John Hughes date: Mon Jan 19 17:52:30 2015 +0000 Sync with upstream OpenJDK 6 repository. Upstream changes: - OJ43: Backport JAX_WS-945; Socket backlog may be limiting lwhs performance - S6364329: jstat displays "invalid argument count" with usage - S6507067: TimeZone country/area message error - S6585666: Spanish language names not compliant with CLDR - S6608572: Currency change for Malta and Cyprus - S6610748: Dateformat - AM-PM indicator in Finnish appears to be from English - S6627549: ISO 3166 code addition: Saint Barthelemy and Saint Martin - S6645271: Wrong date format for Croatian (hr) locale - S6646611: Incorrect spelling of month name in locale for Belarusian language ("be", "BY") - S6647452: Remove obfuscation, framework and provider self-verification checking - S6716626: Integrate contributed language and country names for NL - S6786276: Locale.getISOCountries() still contains country code "CS" - S6868106: Ukrainian currency has wrong format - S6870908: reopen bug 4244752: month names in Estonian should be lowercase - S6873931: New Turkish currency since 2009 - S6910489: Slovenia Locale, wrong firstDayOfWeek number - S6914413: abbreviation name for November is not correct in be_BY - S6916787: Ukrainian currency name needs to be fixed - S6919624: minimalDaysInFirstWeek ressource for hungarian is wrong - S6931564: Incorrect display name of Locale for south africa - S6938454: 2 new testcases for bug: Unable to determine generic type in program that compiles under Java 6 - S6938454: Unable to determine generic type in program that compiles under Java 6 - S7019267: Currency Display Names are not localized into pt_BR. - S7020583: Some currency names are missing in some locales - S7020960: CurrencyNames_sr_RS.properties is missing. - S7025837: fix plural currency display names in sr_Latn_(BA|ME|RS).properties - S7028073: The currency symbol for Peru is wrong - S7036905: [de] dem - the german mark display name is incorrect - S7066203: Update currency data to the latest ISO 4217 standard - S7077119: remove past transition dates from CurrencyData.properties file - S7085757: Currency Data: ISO 4217 Amendment 152 - S7122142: (ann) Race condition between isAnnotationPresent and getAnnotations - S7161796: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror - S7171028: dots are missed in the datetime for Slovanian - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations - S7189611: Venezuela current Currency should be Bs.F. - S7195759: ISO 4217 Amendment 154 - S7201205: Add Makefile configuration option to build with unlimited crypto in OpenJDK. - S8005232: (JEP-149) Class Instance size reduction - S8006748: getISO3Country() returns wrong value - S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale - S8021121: ISO 4217 Amendment Number 156 - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws java.lang.IllegalStateException: unexpected condition - S8027695: There should be a space before % sign in Swedish locale - S8055222: Currency update needed for ISO 4217 Amendment #159 2015-01-19 Andrew John Hughes * patches/clean-crypto.patch: Removed; replaced by inclusion of UNLIMITED_CRYPTO=true solution upstream. * patches/openjdk/7122142-annotation_race_condition.patch, * patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch: Remove patches included upstream. * Makefile.am: (ICEDTEA_PATCHES): Remove above patches. (ICEDTEA_ENV): Set UNLIMITED_CRYPTO=true. * NEWS: Updated. * patches/openjdk/4963723-implement_sha-224.patch: Regenerated following backport of 6647452 upstream. * patches/openjdk/7044060-support_nsa_suite_b.patch: Likewise. * patches/openjdk/7106773-512_bits_rsa.patch: Likewise. * patches/openjdk/8006935-long_keys_in_hmac_prf.patch: Likewise. * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch: Likewise. * patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch: Likewise. 2015-01-05 Andrew John Hughes * patches/ecj/pr64174.patch: Drop the Lithuanian changeover date now, as it's in the past. 2014-12-04 Andrew John Hughes * Makefile.am: (ICEDTEA_ECJ_PATCHES): Add workaround for bug in parsing end-of-year dates (Classpath PR64174). * acinclude.m4: (IT_PR64174_CHECK): Detect if the boot JDK suffers from PR64174 and apply the patch if so. * configure.ac: Call IT_PR64174_CHECK. * patches/ecj/pr64174.patch: Drop the Latvian Euro changeover date, which is in the past anyway, and move Lithuania's two hours forward so it enters 2015 and avoids the bug. diffstat: ChangeLog | 54 + Makefile.am | 17 +- NEWS | 49 +- acinclude.m4 | 46 + configure.ac | 3 + patches/clean-crypto.patch | 1099 ----- patches/ecj/pr64174.patch | 21 + patches/openjdk/4963723-implement_sha-224.patch | 289 +- patches/openjdk/7044060-support_nsa_suite_b.patch | 125 +- patches/openjdk/7106773-512_bits_rsa.patch | 2 +- patches/openjdk/7122142-annotation_race_condition.patch | 1955 ---------- patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch | 40 - patches/openjdk/8006935-long_keys_in_hmac_prf.patch | 2 +- patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch | 7 - patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch | 2 +- patches/pr2083-aarch64_zero.patch | 88 + 16 files changed, 466 insertions(+), 3333 deletions(-) diffs (truncated from 4703 to 500 lines): diff -r cd81722f010d -r ccfb83ff9e78 ChangeLog --- a/ChangeLog Fri Oct 24 02:51:29 2014 +0100 +++ b/ChangeLog Mon Jan 19 17:52:30 2015 +0000 @@ -1,3 +1,57 @@ +2015-01-19 Andrew John Hughes + + * patches/clean-crypto.patch: Removed; replaced by + inclusion of UNLIMITED_CRYPTO=true solution upstream. + * patches/openjdk/7122142-annotation_race_condition.patch, + * patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch: + Remove patches included upstream. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + (ICEDTEA_ENV): Set UNLIMITED_CRYPTO=true. + * NEWS: Updated. + * patches/openjdk/4963723-implement_sha-224.patch: + Regenerated following backport of 6647452 upstream. + * patches/openjdk/7044060-support_nsa_suite_b.patch: + Likewise. + * patches/openjdk/7106773-512_bits_rsa.patch: Likewise. + * patches/openjdk/8006935-long_keys_in_hmac_prf.patch: Likewise. + * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch: + Likewise. + * patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch: + Likewise. + +2015-01-05 Andrew John Hughes + + * patches/ecj/pr64174.patch: Drop the Lithuanian + changeover date now, as it's in the past. + +2014-12-04 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_ECJ_PATCHES): Add workaround for bug + in parsing end-of-year dates (Classpath PR64174). + * acinclude.m4: + (IT_PR64174_CHECK): Detect if the boot JDK suffers + from PR64174 and apply the patch if so. + * configure.ac: Call IT_PR64174_CHECK. + * patches/ecj/pr64174.patch: Drop the Latvian + Euro changeover date, which is in the past anyway, + and move Lithuania's two hours forward so it enters + 2015 and avoids the bug. + +2014-11-12 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. + * NEWS: Updated. + * patches/pr2083-aarch64_zero.patch: + Add HotSpot support for building Zero on AArch64. + +2014-10-24 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b34. + 2014-10-23 Andrew John Hughes * Makefile.am: diff -r cd81722f010d -r ccfb83ff9e78 Makefile.am --- a/Makefile.am Fri Oct 24 02:51:29 2014 +0100 +++ b/Makefile.am Mon Jan 19 17:52:30 2015 +0000 @@ -2,7 +2,7 @@ OPENJDK_DATE = 14_oct_2014 OPENJDK_SHA256SUM = cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293 -OPENJDK_VERSION = b33 +OPENJDK_VERSION = b34 OPENJDK_URL = https://java.net/downloads/openjdk6/ CACAO_VERSION = 68fe50ac34ec @@ -345,7 +345,6 @@ patches/nomotif-mtoolkit.patch \ patches/alt-jar.patch \ patches/jdk-use-ssize_t.patch \ - patches/clean-crypto.patch \ patches/arch.patch \ patches/lc_ctype.patch \ patches/xjc.patch \ @@ -625,9 +624,8 @@ patches/openjdk/7106773-512_bits_rsa.patch \ patches/pr1904-icedtea_and_distro_versioning.patch \ patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch \ - patches/openjdk/7122142-annotation_race_condition.patch \ - patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch \ - patches/openjdk/8000897-use_corresponding_digest_length.patch + patches/openjdk/8000897-use_corresponding_digest_length.patch \ + patches/pr2083-aarch64_zero.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -747,6 +745,12 @@ ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch endif +# If date parsing bug is present, drop Lithuania and Latvia EUR transition +# dates as they are already in the past anyway. +if CP64174 +ICEDTEA_ECJ_PATCHES += patches/ecj/pr64174.patch +endif + ICEDTEA_ECJ_PATCHES += $(DISTRIBUTION_ECJ_PATCHES) # OpenJDK build environment. @@ -821,7 +825,8 @@ STATIC_CXX="false" \ BUILD_GCC=gcc$(GCC_SUFFIX) \ BUILD_CXX=g++$(GCC_SUFFIX) \ - COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" + COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \ + UNLIMITED_CRYPTO="true" if ENABLE_CACAO ICEDTEA_ENV += \ diff -r cd81722f010d -r ccfb83ff9e78 NEWS --- a/NEWS Fri Oct 24 02:51:29 2014 +0100 +++ b/NEWS Mon Jan 19 17:52:30 2015 +0000 @@ -14,20 +14,65 @@ New in release 1.14.0 (201X-XX-XX): +* Import of OpenJDK6 b34 + - OJ43: Backport JAX_WS-945; Socket backlog may be limiting lwhs performance + - S6364329: jstat displays "invalid argument count" with usage + - S6507067: TimeZone country/area message error + - S6585666: Spanish language names not compliant with CLDR + - S6608572: Currency change for Malta and Cyprus + - S6610748: Dateformat - AM-PM indicator in Finnish appears to be from English + - S6627549: ISO 3166 code addition: Saint Barthelemy and Saint Martin + - S6645271: Wrong date format for Croatian (hr) locale + - S6646611: Incorrect spelling of month name in locale for Belarusian language ("be", "BY") + - S6647452: Remove obfuscation, framework and provider self-verification checking + - S6716626: Integrate contributed language and country names for NL + - S6786276: Locale.getISOCountries() still contains country code "CS" + - S6868106: Ukrainian currency has wrong format + - S6870908: reopen bug 4244752: month names in Estonian should be lowercase + - S6873931: New Turkish currency since 2009 + - S6910489: Slovenia Locale, wrong firstDayOfWeek number + - S6914413: abbreviation name for November is not correct in be_BY + - S6916787: Ukrainian currency name needs to be fixed + - S6919624: minimalDaysInFirstWeek ressource for hungarian is wrong + - S6931564: Incorrect display name of Locale for south africa + - S6938454: 2 new testcases for bug: Unable to determine generic type in program that compiles under Java 6 + - S6938454: Unable to determine generic type in program that compiles under Java 6 + - S7019267: Currency Display Names are not localized into pt_BR. + - S7020583: Some currency names are missing in some locales + - S7020960: CurrencyNames_sr_RS.properties is missing. + - S7025837: fix plural currency display names in sr_Latn_(BA|ME|RS).properties + - S7028073: The currency symbol for Peru is wrong + - S7036905: [de] dem - the german mark display name is incorrect + - S7066203: Update currency data to the latest ISO 4217 standard + - S7077119: remove past transition dates from CurrencyData.properties file + - S7085757: Currency Data: ISO 4217 Amendment 152 + - S7122142, RH1151372: (ann) Race condition between isAnnotationPresent and getAnnotations + - S7161796, RH1151372: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror + - S7171028: dots are missed in the datetime for Slovanian + - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations + - S7189611: Venezuela current Currency should be Bs.F. + - S7195759: ISO 4217 Amendment 154 + - S7201205: Add Makefile configuration option to build with unlimited crypto in OpenJDK. + - S8005232: (JEP-149) Class Instance size reduction + - S8006748: getISO3Country() returns wrong value + - S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale + - S8021121: ISO 4217 Amendment Number 156 + - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws java.lang.IllegalStateException: unexpected condition + - S8027695: There should be a space before % sign in Swedish locale + - S8055222: Currency update needed for ISO 4217 Amendment #159 * Backports - S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init - S6727719: Performance of TextLayout.getBounds() - S6745225: Memory leak while drawing Attributed String - S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space. - - S7122142, RH1151372: (ann) Race condition between isAnnotationPresent and getAnnotations - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages - - S7161796, RH1151372: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror - S8000897, RH1155012: VM crash in CompileBroker - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory() - S8026887: Make issues due to failed large pages allocations easier to debug * Bug fixes - PR1886: IcedTea does not checksum supplied tarballs - PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop + - PR2083: Add support for building Zero on AArch64 New in release 1.13.5 (2014-10-14): diff -r cd81722f010d -r ccfb83ff9e78 acinclude.m4 --- a/acinclude.m4 Fri Oct 24 02:51:29 2014 +0100 +++ b/acinclude.m4 Mon Jan 19 17:52:30 2015 +0000 @@ -2317,3 +2317,49 @@ AC_MSG_RESULT([$enable_werror]) AM_CONDITIONAL([ENABLE_WERROR], test x"${enable_werror}" = "xyes") ]) + +AC_DEFUN_ONCE([IT_PR64174_CHECK],[ +AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK]) +AC_CACHE_CHECK([if java.text.SimpleDateFormat exhibits Classpath bug 64174], it_cv_cp64174, [ + CLASS=Test.java + BYTECODE=$(echo $CLASS|sed 's#\.java##') + mkdir tmp.$$ + cd tmp.$$ + cat << \EOF > $CLASS +[/* [#]line __oline__ "configure" */ +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Locale; +import java.util.TimeZone; + +public class Test +{ + public static void main(String[] args) + throws ParseException + { + SimpleDateFormat format; + + format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US); + format.setTimeZone(TimeZone.getTimeZone("GMT")); + format.setLenient(false); + System.out.println(format.parse("2014-12-31-22-00-00")); + } +}] +EOF + if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_cp64174=no; + else + it_cv_cp64174=yes; + fi + else + it_cv_cp64174=yes; + fi + rm -f $CLASS *.class + cd .. + rmdir tmp.$$ + ]) +AM_CONDITIONAL([CP64174], test x"${it_cv_cp64174}" = "xyes") +AC_PROVIDE([$0])dnl +]) diff -r cd81722f010d -r ccfb83ff9e78 configure.ac --- a/configure.ac Fri Oct 24 02:51:29 2014 +0100 +++ b/configure.ac Mon Jan 19 17:52:30 2015 +0000 @@ -167,6 +167,9 @@ IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Throwable.class],["Something went wrong","",new Throwable()]) IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Integer.TYPE,Throwable.class],["Something went wrong","",666,new Throwable()]) +dnl Check whether the JDK can parse the dates used in the currency file +IT_PR64174_CHECK + # Use xvfb-run if found to run gui tests (check-jdk). AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], []) AC_SUBST(XVFB_RUN_CMD) diff -r cd81722f010d -r ccfb83ff9e78 patches/clean-crypto.patch --- a/patches/clean-crypto.patch Fri Oct 24 02:51:29 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1099 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/javax/crypto/Makefile openjdk/jdk/make/javax/crypto/Makefile ---- openjdk.orig/jdk/make/javax/crypto/Makefile 2010-05-26 09:32:35.000000000 +0100 -+++ openjdk/jdk/make/javax/crypto/Makefile 2010-05-26 13:53:03.000000000 +0100 -@@ -155,7 +155,8 @@ - # - - ifdef OPENJDK --all: build-jar install-jar build-policy install-limited -+# We don't need any policy files. -+all: build-jar install-jar - else # OPENJDK - ifeq ($(strip $(FILES_java)),) - all: -diff -Nru openjdk.orig/jdk/src/share/classes/javax/crypto/Cipher.java openjdk/jdk/src/share/classes/javax/crypto/Cipher.java ---- openjdk.orig/jdk/src/share/classes/javax/crypto/Cipher.java 2010-05-26 09:32:39.000000000 +0100 -+++ openjdk/jdk/src/share/classes/javax/crypto/Cipher.java 2010-05-26 13:53:03.000000000 +0100 -@@ -144,12 +144,6 @@ - // The transformation - private String transformation; - -- // Crypto permission representing the maximum allowable cryptographic -- // strength that this Cipher object can be used for. (The cryptographic -- // strength is a function of the keysize and algorithm parameters encoded -- // in the crypto permission.) -- private CryptoPermission cryptoPerm; -- - // The exemption mechanism that needs to be enforced - private ExemptionMechanism exmech; - -@@ -190,16 +184,9 @@ - protected Cipher(CipherSpi cipherSpi, - Provider provider, - String transformation) { -- // See bug 4341369 & 4334690 for more info. -- // If the caller is trusted, then okey. -- // Otherwise throw a NullPointerException. -- if (!JceSecurityManager.INSTANCE.isCallerTrusted()) { -- throw new NullPointerException(); -- } - this.spi = cipherSpi; - this.provider = provider; - this.transformation = transformation; -- this.cryptoPerm = CryptoAllPermission.INSTANCE; - this.lock = null; - } - -@@ -212,7 +199,6 @@ - Cipher(CipherSpi cipherSpi, String transformation) { - this.spi = cipherSpi; - this.transformation = transformation; -- this.cryptoPerm = CryptoAllPermission.INSTANCE; - this.lock = null; - } - -@@ -442,9 +428,6 @@ - Exception failure = null; - while (t.hasNext()) { - Service s = (Service)t.next(); -- if (JceSecurity.canUseProvider(s.getProvider()) == false) { -- continue; -- } - Transform tr = getTransform(s, transforms); - if (tr == null) { - // should never happen -@@ -570,7 +553,6 @@ - } - Exception failure = null; - List transforms = getTransforms(transformation); -- boolean providerChecked = false; - String paddingError = null; - for (Iterator t = transforms.iterator(); t.hasNext();) { - Transform tr = (Transform)t.next(); -@@ -578,19 +560,6 @@ - if (s == null) { - continue; - } -- if (providerChecked == false) { -- // for compatibility, first do the lookup and then verify -- // the provider. this makes the difference between a NSAE -- // and a SecurityException if the -- // provider does not support the algorithm. -- Exception ve = JceSecurity.getVerificationResult(provider); -- if (ve != null) { -- String msg = "JCE cannot authenticate the provider " -- + provider.getName(); -- throw new SecurityException(msg, ve); -- } -- providerChecked = true; -- } - if (tr.supportsMode(s) == S_NO) { - continue; - } -@@ -603,7 +572,6 @@ - tr.setModePadding(spi); - Cipher cipher = new Cipher(spi, transformation); - cipher.provider = s.getProvider(); -- cipher.initCryptoPermission(); - return cipher; - } catch (Exception e) { - failure = e; -@@ -622,22 +590,6 @@ - ("No such algorithm: " + transformation, failure); - } - -- // If the requested crypto service is export-controlled, -- // determine the maximum allowable keysize. -- private void initCryptoPermission() throws NoSuchAlgorithmException { -- if (JceSecurity.isRestricted() == false) { -- cryptoPerm = CryptoAllPermission.INSTANCE; -- exmech = null; -- return; -- } -- cryptoPerm = getConfiguredPermission(transformation); -- // Instantiate the exemption mechanism (if required) -- String exmechName = cryptoPerm.getExemptionMechanism(); -- if (exmechName != null) { -- exmech = ExemptionMechanism.getInstance(exmechName); -- } -- } -- - // max number of debug warnings to print from chooseFirstProvider() - private static int warnCount = 10; - -@@ -679,9 +631,6 @@ - s = (Service)serviceIterator.next(); - thisSpi = null; - } -- if (JceSecurity.canUseProvider(s.getProvider()) == false) { -- continue; -- } - Transform tr = getTransform(s, transforms); - if (tr == null) { - // should never happen -@@ -699,7 +648,6 @@ - thisSpi = (CipherSpi)obj; - } - tr.setModePadding(thisSpi); -- initCryptoPermission(); - spi = thisSpi; - provider = s.getProvider(); - // not needed any more -@@ -731,19 +679,15 @@ - InvalidAlgorithmParameterException { - switch (type) { - case I_KEY: -- checkCryptoPerm(thisSpi, key); - thisSpi.engineInit(opmode, key, random); - break; - case I_PARAMSPEC: -- checkCryptoPerm(thisSpi, key, paramSpec); - thisSpi.engineInit(opmode, key, paramSpec, random); - break; - case I_PARAMS: -- checkCryptoPerm(thisSpi, key, params); - thisSpi.engineInit(opmode, key, params, random); - break; - case I_CERT: -- checkCryptoPerm(thisSpi, key); - thisSpi.engineInit(opmode, key, random); - break; - default: -@@ -777,9 +721,6 @@ - if (s.supportsParameter(key) == false) { - continue; - } -- if (JceSecurity.canUseProvider(s.getProvider()) == false) { -- continue; -- } - Transform tr = getTransform(s, transforms); - if (tr == null) { - // should never happen -@@ -793,7 +734,6 @@ - thisSpi = (CipherSpi)s.newInstance(null); - } - tr.setModePadding(thisSpi); -- initCryptoPermission(); - implInit(thisSpi, initType, opmode, key, paramSpec, - params, random); - provider = s.getProvider(); -@@ -939,107 +879,6 @@ - return exmech; - } - -- // -- // Crypto permission check code below -- // -- private void checkCryptoPerm(CipherSpi checkSpi, Key key) -- throws InvalidKeyException { -- if (cryptoPerm == CryptoAllPermission.INSTANCE) { -- return; -- } -- // Check if key size and default parameters are within legal limits -- AlgorithmParameterSpec params; -- try { -- params = getAlgorithmParameterSpec(checkSpi.engineGetParameters()); -- } catch (InvalidParameterSpecException ipse) { -- throw new InvalidKeyException -- ("Unsupported default algorithm parameters"); -- } -- if (!passCryptoPermCheck(checkSpi, key, params)) { -- throw new InvalidKeyException( -- "Illegal key size or default parameters"); -- } -- } -- -- private void checkCryptoPerm(CipherSpi checkSpi, Key key, -- AlgorithmParameterSpec params) throws InvalidKeyException, -- InvalidAlgorithmParameterException { -- if (cryptoPerm == CryptoAllPermission.INSTANCE) { -- return; -- } -- // Determine keysize and check if it is within legal limits -- if (!passCryptoPermCheck(checkSpi, key, null)) { -- throw new InvalidKeyException("Illegal key size"); -- } -- if ((params != null) && (!passCryptoPermCheck(checkSpi, key, params))) { -- throw new InvalidAlgorithmParameterException("Illegal parameters"); -- } -- } -- -- private void checkCryptoPerm(CipherSpi checkSpi, Key key, -- AlgorithmParameters params) -- throws InvalidKeyException, InvalidAlgorithmParameterException { -- if (cryptoPerm == CryptoAllPermission.INSTANCE) { -- return; -- } -- // Convert the specified parameters into specs and then delegate. -- AlgorithmParameterSpec pSpec; -- try { -- pSpec = getAlgorithmParameterSpec(params); -- } catch (InvalidParameterSpecException ipse) { -- throw new InvalidAlgorithmParameterException -- ("Failed to retrieve algorithm parameter specification"); -- } -- checkCryptoPerm(checkSpi, key, pSpec); -- } -- -- private boolean passCryptoPermCheck(CipherSpi checkSpi, Key key, -- AlgorithmParameterSpec params) -- throws InvalidKeyException { -- String em = cryptoPerm.getExemptionMechanism(); -- int keySize = checkSpi.engineGetKeySize(key); -- // Use the "algorithm" component of the cipher From andrew at icedtea.classpath.org Tue Jan 20 05:40:34 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 20 Jan 2015 05:40:34 +0000 Subject: /hg/icedtea6: 4 new changesets Message-ID: changeset be55ad609ddc in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=be55ad609ddc author: Andrew John Hughes date: Tue Jan 20 05:14:21 2015 +0000 PR1831: Drop version requirement for LCMS 2 2014-06-10 Andrew John Hughes PR1831: Drop version requirement for LCMS 2 * INSTALL: Document lcms2 requirement. * NEWS: Updated. * acinclude.m4: (IT_CHECK_FOR_LCMS): Drop 2.5 requirement. changeset 92941f2c41f4 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=92941f2c41f4 author: Andrew John Hughes date: Tue Jan 20 05:24:23 2015 +0000 PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library 2014-06-10 Andrew John Hughes PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library * Makefile.am: (ICEDTEA_PATCHES): Add new patch when PKCS11+NSS or SunEC+NSS are enabled, so that the NSS set of curves are announced via SSL. * NEWS: Updated. * patches/rh1022017.patch: Reduce number of curves announced over SSL to just those supported by NSS. changeset 2506d10f6b3a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2506d10f6b3a author: Andrew John Hughes date: Tue Jan 20 05:29:10 2015 +0000 PR2062: Unset OS before running OpenJDK build 2015-01-06 Andrew John Hughes PR2062: Unset OS before running OpenJDK build * Makefile.am: (ICEDTEA_UNSET): Introduce variable to store unsetting of environment variables. (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and JDK_HOME to ICEDTEA_UNSET. (icedtea): Unset variables prior to running $(MAKE). (icedtea-debug): Likewise. (icedtea-ecj): Likewise. * NEWS: Updated. changeset b34e892816ca in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b34e892816ca author: Andrew John Hughes date: Tue Jan 20 05:40:11 2015 +0000 PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS 2014-12-05 Andrew John Hughes PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS * fsg.sh: Moved to... * Makefile.am: (EXTRA_DIST): Remove fsg.sh, now generated by configure. (extract-openjdk): Fix path to new generated fsg.sh and mark as executable * NEWS: Updated. * configure.ac: Add fsg.sh to AC_CONFIG_FILES. * fsg.sh.in: ... here and added application of PR2125 patch. * patches/pr2125.patch: Patch to remove curves unsupported by NSS. diffstat: ChangeLog | 53 +++++ INSTALL | 1 + Makefile.am | 21 +- NEWS | 4 + acinclude.m4 | 4 +- configure.ac | 2 +- fsg.sh | 91 -------- fsg.sh.in | 94 +++++++++ patches/pr2125.patch | 486 ++++++++++++++++++++++++++++++++++++++++++++++++ patches/rh1022017.patch | 44 ++++ 10 files changed, 698 insertions(+), 102 deletions(-) diffs (truncated from 927 to 500 lines): diff -r 199332d3ed53 -r b34e892816ca ChangeLog --- a/ChangeLog Wed Nov 12 23:58:13 2014 +0000 +++ b/ChangeLog Tue Jan 20 05:40:11 2015 +0000 @@ -1,3 +1,56 @@ +2014-12-05 Andrew John Hughes + + PR2125: Synchronise elliptic curves in + sun.security.ec.NamedCurve with those listed by NSS + * fsg.sh: Moved to... + * Makefile.am: + (EXTRA_DIST): Remove fsg.sh, now generated + by configure. + (extract-openjdk): Fix path to new generated + fsg.sh and mark as executable + * NEWS: Updated. + * configure.ac: Add fsg.sh to AC_CONFIG_FILES. + * fsg.sh.in: ... here and added application + of PR2125 patch. + * patches/pr2125.patch: Patch to remove curves + unsupported by NSS. + +2015-01-06 Andrew John Hughes + + PR2062: Unset OS before running OpenJDK build + * Makefile.am: + (ICEDTEA_UNSET): Introduce variable to + store unsetting of environment variables. + (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and + JDK_HOME to ICEDTEA_UNSET. + (icedtea): Unset variables prior to running + $(MAKE). + (icedtea-debug): Likewise. + (icedtea-ecj): Likewise. + * NEWS: Updated. + +2014-06-10 Andrew John Hughes + + PR1832, RH1022017: Report elliptic curves + supported by NSS, not the SunEC library + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch when + PKCS11+NSS is enabled, so + that the NSS set of curves are announced + via SSL. + * NEWS: Updated. + * patches/rh1022017.patch: + Reduce number of curves announced over SSL + to just those supported by NSS. + +2014-06-10 Andrew John Hughes + + PR1831: Drop version requirement for LCMS 2 + * INSTALL: Document lcms2 requirement. + * NEWS: Updated. + * acinclude.m4: + (IT_CHECK_FOR_LCMS): Drop 2.5 requirement. + 2014-11-12 Andrew John Hughes * Makefile.am: diff -r 199332d3ed53 -r b34e892816ca INSTALL --- a/INSTALL Wed Nov 12 23:58:13 2014 +0000 +++ b/INSTALL Tue Jan 20 05:40:11 2015 +0000 @@ -36,6 +36,7 @@ pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java) LLVM 2.5 or later (for --enable-shark) systemtap-sdl-devel >= 0.9.5 (for --enable-systemtap, Java method tracing requires systemtap >= 0.9.9) +lcms2-devel (for --enable-lcms2 and --enable-system-lcms) See ./configure --help if you need to override the defaults. diff -r 199332d3ed53 -r b34e892816ca Makefile.am --- a/Makefile.am Wed Nov 12 23:58:13 2014 +0000 +++ b/Makefile.am Tue Jan 20 05:40:11 2015 +0000 @@ -667,6 +667,7 @@ endif if ENABLE_NSS +ICEDTEA_PATCHES += patches/rh1022017.patch NSS_PATCHES = patches/nss-config.patch else NSS_PATCHES = patches/nss-not-enabled-config.patch @@ -779,6 +780,12 @@ WERROR_STATUS=false endif +ICEDTEA_UNSET = \ + JAVAC= \ + JAVA_HOME= \ + JDK_HOME= \ + OS= + ICEDTEA_ENV = \ ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \ ANT="$(ANT)" \ @@ -809,9 +816,6 @@ FT2_LIB="$(FREETYPE2_LIBS)" \ ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ - JAVAC="" \ - JAVA_HOME="" \ - JDK_HOME="" \ ANT_RESPECT_JAVA_HOME="TRUE" \ DISTRIBUTION_ID="$(DIST_ID)" \ DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ @@ -942,7 +946,7 @@ contrib arm_port \ overlays \ jconsole.desktop policytool.desktop \ - $(JTREG_SRCS) HACKING pulseaudio fsg.sh \ + $(JTREG_SRCS) HACKING pulseaudio \ hotspot.map \ autogen.sh \ tapset/hotspot.stp.in \ @@ -1227,7 +1231,8 @@ mkdir openjdk ; \ $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \ chmod -R ug+w openjdk ; \ - sh $(abs_top_srcdir)/fsg.sh ; \ + chmod +x $(builddir)/fsg.sh ; \ + sh $(builddir)/fsg.sh ; \ fi endif endif @@ -1665,7 +1670,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ stamps/jamvm.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV) \ -C openjdk \ $(ICEDTEA_BUILD_TARGET) @@ -1696,7 +1701,7 @@ stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ stamps/jamvm.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV) \ -C openjdk \ $(ICEDTEA_DEBUG_BUILD_TARGET) @@ -2080,7 +2085,7 @@ stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ $(OPENJDK_ECJ_TREE) stamps/jamvm.stamp stamps/cacao.stamp \ stamps/rewrite-rhino.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV_ECJ) \ -C openjdk-ecj/ \ $(ICEDTEA_BUILD_TARGET) diff -r 199332d3ed53 -r b34e892816ca NEWS --- a/NEWS Wed Nov 12 23:58:13 2014 +0000 +++ b/NEWS Tue Jan 20 05:40:11 2015 +0000 @@ -26,9 +26,13 @@ - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory() - S8026887: Make issues due to failed large pages allocations easier to debug * Bug fixes + - PR1831: Drop version requirement for LCMS 2 + - PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library - PR1886: IcedTea does not checksum supplied tarballs - PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop + - PR2062: Unset OS before running OpenJDK build - PR2083: Add support for building Zero on AArch64 + - PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS New in release 1.13.5 (2014-10-14): diff -r 199332d3ed53 -r b34e892816ca acinclude.m4 --- a/acinclude.m4 Wed Nov 12 23:58:13 2014 +0000 +++ b/acinclude.m4 Tue Jan 20 05:40:11 2015 +0000 @@ -1554,10 +1554,10 @@ AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS}) if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then dnl Check for LCMS2 headers and libraries. - PKG_CHECK_MODULES(LCMS2, lcms2 >= 2.5,[LCMS2_FOUND=yes],[LCMS2_FOUND=no]) + PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no]) if test "x${LCMS2_FOUND}" = xno then - AC_MSG_ERROR([Could not find LCMS >= 2.5; install it or build with --disable-system-lcms to use the in-tree copy.]) + AC_MSG_ERROR([Could not find LCMS 2; install it or build with --disable-system-lcms to use the in-tree copy.]) fi AC_SUBST(LCMS2_CFLAGS) AC_SUBST(LCMS2_LIBS) diff -r 199332d3ed53 -r b34e892816ca configure.ac --- a/configure.ac Wed Nov 12 23:58:13 2014 +0000 +++ b/configure.ac Tue Jan 20 05:40:11 2015 +0000 @@ -2,7 +2,7 @@ AC_CANONICAL_HOST AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile fsg.sh]) # Older automake doesn't generate these correctly abs_top_builddir=`pwd -P` diff -r 199332d3ed53 -r b34e892816ca fsg.sh --- a/fsg.sh Wed Nov 12 23:58:13 2014 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -#!/bin/sh - -echo "Further liberating OpenJDK..." - -# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x) -# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x) - -# PR146/S6713083 -# Remove binaries -rm -f \ - openjdk/jdk/test/sun/management/windows/revokeall.exe \ - openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \ - openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \ - openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher - -rm -f \ - openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \ - openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \ - openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \ - openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \ - openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \ - openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \ - openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \ - openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \ - openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \ - openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so - -rm -f \ - openjdk/jdk/test/java/util/Locale/data/deflocale.exe \ - openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \ - openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \ - openjdk/jdk/test/java/util/Locale/data/deflocale.sh \ - openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \ - openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \ - openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \ - -# Remove test sources with questionable license headers. -rm -f \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \ - openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \ - openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \ - openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \ - openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \ - openjdk/jdk/test/java/util/Locale/LocaleTest.java \ - openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \ - openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \ - openjdk/jdk/test/sun/text/resources/LocaleDataTest.java - -# Remove J2DBench sources, some of which have questionable license -# headers. -rm -rf \ - openjdk/jdk/src/share/demo/java2d/J2DBench - -# BEGIN Debian/Ubuntu additions - -# binary files -rm -f \ - openjdk/jdk/test/sun/net/idn/*.spp - -# END Debian/Ubuntu additions - -# Remove man page for proprietary javaws -rm -f openjdk/jdk/src/linux/doc/man/javaws.1 \ - openjdk/jdk/src/linux/doc/man/ja/javaws.1 \ - openjdk/jdk/src/solaris/doc/sun/man/man1/javaws.1 \ - openjdk/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 diff -r 199332d3ed53 -r b34e892816ca fsg.sh.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fsg.sh.in Tue Jan 20 05:40:11 2015 +0000 @@ -0,0 +1,94 @@ +#!/bin/sh + +echo "Further liberating OpenJDK..." + +# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x) +# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x) + +# PR146/S6713083 +# Remove binaries +rm -f \ + openjdk/jdk/test/sun/management/windows/revokeall.exe \ + openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \ + openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \ + openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher + +rm -f \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \ + openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so + +rm -f \ + openjdk/jdk/test/java/util/Locale/data/deflocale.exe \ + openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \ + openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \ + openjdk/jdk/test/java/util/Locale/data/deflocale.sh \ + openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \ + openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \ + openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \ + +# Remove test sources with questionable license headers. +rm -f \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \ + openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \ + openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \ + openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \ + openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \ + openjdk/jdk/test/java/util/Locale/LocaleTest.java \ + openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \ + openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \ + openjdk/jdk/test/sun/text/resources/LocaleDataTest.java + +# Remove J2DBench sources, some of which have questionable license +# headers. +rm -rf \ + openjdk/jdk/src/share/demo/java2d/J2DBench + +# BEGIN Debian/Ubuntu additions + +# binary files +rm -f \ + openjdk/jdk/test/sun/net/idn/*.spp + +# END Debian/Ubuntu additions + +# Remove man page for proprietary javaws +rm -f openjdk/jdk/src/linux/doc/man/javaws.1 \ + openjdk/jdk/src/linux/doc/man/ja/javaws.1 \ + openjdk/jdk/src/solaris/doc/sun/man/man1/javaws.1 \ + openjdk/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 + +echo "Syncing EC list with NSS" +patch -Np0 < @abs_top_srcdir@/patches/pr2125.patch diff -r 199332d3ed53 -r b34e892816ca patches/pr2125.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/pr2125.patch Tue Jan 20 05:40:11 2015 +0000 @@ -0,0 +1,486 @@ +diff -r 9665966de2e7 src/share/classes/sun/security/ec/NamedCurve.java +--- openjdk/jdk/src/share/classes/sun/security/ec/NamedCurve.java Fri Dec 05 02:53:29 2014 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/ec/NamedCurve.java Fri Dec 05 02:58:18 2014 +0000 +@@ -162,114 +162,6 @@ + + static { + /* SEC2 prime curves */ +- add("secp112r1", "1.3.132.0.6", P, +- "DB7C2ABF62E35E668076BEAD208B", +- "DB7C2ABF62E35E668076BEAD2088", +- "659EF8BA043916EEDE8911702B22", +- "09487239995A5EE76B55F9C2F098", +- "A89CE5AF8724C0A23E0E0FF77500", +- "DB7C2ABF62E35E7628DFAC6561C5", +- 1); +- +- add("secp112r2", "1.3.132.0.7", P, +- "DB7C2ABF62E35E668076BEAD208B", +- "6127C24C05F38A0AAAF65C0EF02C", +- "51DEF1815DB5ED74FCC34C85D709", +- "4BA30AB5E892B4E1649DD0928643", +- "adcd46f5882e3747def36e956e97", +- "36DF0AAFD8B8D7597CA10520D04B", +- 4); +- +- add("secp128r1", "1.3.132.0.28", P, +- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF", +- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC", +- "E87579C11079F43DD824993C2CEE5ED3", +- "161FF7528B899B2D0C28607CA52C5B86", +- "CF5AC8395BAFEB13C02DA292DDED7A83", +- "FFFFFFFE0000000075A30D1B9038A115", +- 1); +- +- add("secp128r2", "1.3.132.0.29", P, +- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF", +- "D6031998D1B3BBFEBF59CC9BBFF9AEE1", +- "5EEEFCA380D02919DC2C6558BB6D8A5D", +- "7B6AA5D85E572983E6FB32A7CDEBC140", +- "27B6916A894D3AEE7106FE805FC34B44", +- "3FFFFFFF7FFFFFFFBE0024720613B5A3", +- 4); +- +- add("secp160k1", "1.3.132.0.9", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", +- "0000000000000000000000000000000000000000", +- "0000000000000000000000000000000000000007", +- "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB", +- "938CF935318FDCED6BC28286531733C3F03C4FEE", +- "0100000000000000000001B8FA16DFAB9ACA16B6B3", +- 1); +- +- add("secp160r1", "1.3.132.0.8", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC", +- "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45", +- "4A96B5688EF573284664698968C38BB913CBFC82", +- "23A628553168947D59DCC912042351377AC5FB32", +- "0100000000000000000001F4C8F927AED3CA752257", +- 1); +- +- add("secp160r2", "1.3.132.0.30", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70", +- "B4E134D3FB59EB8BAB57274904664D5AF50388BA", +- "52DCB034293A117E1F4FF11B30F7199D3144CE6D", +- "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E", +- "0100000000000000000000351EE786A818F3A1A16B", +- 1); +- +- add("secp192k1", "1.3.132.0.31", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37", +- "000000000000000000000000000000000000000000000000", +- "000000000000000000000000000000000000000000000003", +- "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D", +- "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D", +- "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D", +- 1); +- +- add("secp192r1 [NIST P-192, X9.62 prime192v1]", "1.2.840.10045.3.1.1", PD, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC", +- "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1", +- "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012", +- "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811", +- "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831", +- 1); +- +- add("secp224k1", "1.3.132.0.32", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D", +- "00000000000000000000000000000000000000000000000000000000", +- "00000000000000000000000000000000000000000000000000000005", +- "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C", +- "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5", +- "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7", +- 1); +- +- add("secp224r1 [NIST P-224]", "1.3.132.0.33", PD, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE", +- "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4", +- "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21", +- "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", +- 1); +- +- add("secp256k1", "1.3.132.0.10", P, From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 05:40:46 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 05:40:46 +0000 Subject: [Bug 1831] [IcedTea6] Drop version requirement for LCMS 2 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1831 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=be55ad609ddc author: Andrew John Hughes date: Tue Jan 20 05:14:21 2015 +0000 PR1831: Drop version requirement for LCMS 2 2014-06-10 Andrew John Hughes PR1831: Drop version requirement for LCMS 2 * INSTALL: Document lcms2 requirement. * NEWS: Updated. * acinclude.m4: (IT_CHECK_FOR_LCMS): Drop 2.5 requirement. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 05:40:54 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 05:40:54 +0000 Subject: [Bug 1832] [IcedTea6] Report elliptic curves supported by NSS, not the SunEC library In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1832 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=92941f2c41f4 author: Andrew John Hughes date: Tue Jan 20 05:24:23 2015 +0000 PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library 2014-06-10 Andrew John Hughes PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library * Makefile.am: (ICEDTEA_PATCHES): Add new patch when PKCS11+NSS or SunEC+NSS are enabled, so that the NSS set of curves are announced via SSL. * NEWS: Updated. * patches/rh1022017.patch: Reduce number of curves announced over SSL to just those supported by NSS. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 05:40:59 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 05:40:59 +0000 Subject: [Bug 2062] [IcedTea6] Unset OS before running OpenJDK build In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2062 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=2506d10f6b3a author: Andrew John Hughes date: Tue Jan 20 05:29:10 2015 +0000 PR2062: Unset OS before running OpenJDK build 2015-01-06 Andrew John Hughes PR2062: Unset OS before running OpenJDK build * Makefile.am: (ICEDTEA_UNSET): Introduce variable to store unsetting of environment variables. (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and JDK_HOME to ICEDTEA_UNSET. (icedtea): Unset variables prior to running $(MAKE). (icedtea-debug): Likewise. (icedtea-ecj): Likewise. * NEWS: Updated. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 05:41:05 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 05:41:05 +0000 Subject: [Bug 2125] [IcedTea6] Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2125 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=b34e892816ca author: Andrew John Hughes date: Tue Jan 20 05:40:11 2015 +0000 PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS 2014-12-05 Andrew John Hughes PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS * fsg.sh: Moved to... * Makefile.am: (EXTRA_DIST): Remove fsg.sh, now generated by configure. (extract-openjdk): Fix path to new generated fsg.sh and mark as executable * NEWS: Updated. * configure.ac: Add fsg.sh to AC_CONFIG_FILES. * fsg.sh.in: ... here and added application of PR2125 patch. * patches/pr2125.patch: Patch to remove curves unsupported by NSS. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Tue Jan 20 06:02:14 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 20 Jan 2015 06:02:14 +0000 Subject: /hg/release/icedtea6-1.13: 4 new changesets Message-ID: changeset 72e1b748868f in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=72e1b748868f author: Andrew John Hughes date: Tue Jan 20 05:57:38 2015 +0000 PR1831: Drop version requirement for LCMS 2 2014-06-10 Andrew John Hughes PR1831: Drop version requirement for LCMS 2 * INSTALL: Document lcms2 requirement. * NEWS: Updated. * acinclude.m4: (IT_CHECK_FOR_LCMS): Drop 2.5 requirement. changeset 62e04f490bb4 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=62e04f490bb4 author: Andrew John Hughes date: Tue Jan 20 05:59:10 2015 +0000 PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library 2014-06-10 Andrew John Hughes PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library * Makefile.am: (ICEDTEA_PATCHES): Add new patch when PKCS11+NSS or SunEC+NSS are enabled, so that the NSS set of curves are announced via SSL. * NEWS: Updated. * patches/rh1022017.patch: Reduce number of curves announced over SSL to just those supported by NSS. changeset 0f903bacbe64 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=0f903bacbe64 author: Andrew John Hughes date: Tue Jan 20 05:59:48 2015 +0000 PR2062: Unset OS before running OpenJDK build 2015-01-06 Andrew John Hughes PR2062: Unset OS before running OpenJDK build * Makefile.am: (ICEDTEA_UNSET): Introduce variable to store unsetting of environment variables. (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and JDK_HOME to ICEDTEA_UNSET. (icedtea): Unset variables prior to running $(MAKE). (icedtea-debug): Likewise. (icedtea-ecj): Likewise. * NEWS: Updated. changeset 72968bfeb778 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=72968bfeb778 author: Andrew John Hughes date: Tue Jan 20 06:01:55 2015 +0000 PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS 2014-12-05 Andrew John Hughes PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS * fsg.sh: Moved to... * Makefile.am: (EXTRA_DIST): Remove fsg.sh, now generated by configure. (extract-openjdk): Fix path to new generated fsg.sh and mark as executable * NEWS: Updated. * configure.ac: Add fsg.sh to AC_CONFIG_FILES. * fsg.sh.in: ... here and added application of PR2125 patch. * patches/pr2125.patch: Patch to remove curves unsupported by NSS. diffstat: ChangeLog | 53 +++++ INSTALL | 1 + Makefile.am | 21 +- NEWS | 4 + acinclude.m4 | 4 +- configure.ac | 2 +- fsg.sh | 91 -------- fsg.sh.in | 94 +++++++++ patches/pr2125.patch | 486 ++++++++++++++++++++++++++++++++++++++++++++++++ patches/rh1022017.patch | 44 ++++ 10 files changed, 698 insertions(+), 102 deletions(-) diffs (truncated from 925 to 500 lines): diff -r 766bf00e3bf2 -r 72968bfeb778 ChangeLog --- a/ChangeLog Fri Oct 24 18:45:33 2014 +0100 +++ b/ChangeLog Tue Jan 20 06:01:55 2015 +0000 @@ -1,3 +1,56 @@ +2014-12-05 Andrew John Hughes + + PR2125: Synchronise elliptic curves in + sun.security.ec.NamedCurve with those listed by NSS + * fsg.sh: Moved to... + * Makefile.am: + (EXTRA_DIST): Remove fsg.sh, now generated + by configure. + (extract-openjdk): Fix path to new generated + fsg.sh and mark as executable + * NEWS: Updated. + * configure.ac: Add fsg.sh to AC_CONFIG_FILES. + * fsg.sh.in: ... here and added application + of PR2125 patch. + * patches/pr2125.patch: Patch to remove curves + unsupported by NSS. + +2015-01-06 Andrew John Hughes + + PR2062: Unset OS before running OpenJDK build + * Makefile.am: + (ICEDTEA_UNSET): Introduce variable to + store unsetting of environment variables. + (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and + JDK_HOME to ICEDTEA_UNSET. + (icedtea): Unset variables prior to running + $(MAKE). + (icedtea-debug): Likewise. + (icedtea-ecj): Likewise. + * NEWS: Updated. + +2014-06-10 Andrew John Hughes + + PR1832, RH1022017: Report elliptic curves + supported by NSS, not the SunEC library + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch when + PKCS11+NSS is enabled, so + that the NSS set of curves are announced + via SSL. + * NEWS: Updated. + * patches/rh1022017.patch: + Reduce number of curves announced over SSL + to just those supported by NSS. + +2014-06-10 Andrew John Hughes + + PR1831: Drop version requirement for LCMS 2 + * INSTALL: Document lcms2 requirement. + * NEWS: Updated. + * acinclude.m4: + (IT_CHECK_FOR_LCMS): Drop 2.5 requirement. + 2014-10-24 Andrew John Hughes * Makefile.am, diff -r 766bf00e3bf2 -r 72968bfeb778 INSTALL --- a/INSTALL Fri Oct 24 18:45:33 2014 +0100 +++ b/INSTALL Tue Jan 20 06:01:55 2015 +0000 @@ -36,6 +36,7 @@ pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java) LLVM 2.5 or later (for --enable-shark) systemtap-sdl-devel >= 0.9.5 (for --enable-systemtap, Java method tracing requires systemtap >= 0.9.9) +lcms2-devel (for --enable-lcms2 and --enable-system-lcms) See ./configure --help if you need to override the defaults. diff -r 766bf00e3bf2 -r 72968bfeb778 Makefile.am --- a/Makefile.am Fri Oct 24 18:45:33 2014 +0100 +++ b/Makefile.am Tue Jan 20 06:01:55 2015 +0000 @@ -659,6 +659,7 @@ endif if ENABLE_NSS +ICEDTEA_PATCHES += patches/rh1022017.patch NSS_PATCHES = patches/nss-config.patch else NSS_PATCHES = patches/nss-not-enabled-config.patch @@ -771,6 +772,12 @@ WERROR_STATUS=false endif +ICEDTEA_UNSET = \ + JAVAC= \ + JAVA_HOME= \ + JDK_HOME= \ + OS= + ICEDTEA_ENV = \ ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \ ANT="$(ANT)" \ @@ -801,9 +808,6 @@ FT2_LIB="$(FREETYPE2_LIBS)" \ ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ - JAVAC="" \ - JAVA_HOME="" \ - JDK_HOME="" \ ANT_RESPECT_JAVA_HOME="TRUE" \ DISTRIBUTION_ID="$(DIST_ID)" \ DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ @@ -934,7 +938,7 @@ contrib arm_port \ overlays \ jconsole.desktop policytool.desktop \ - $(JTREG_SRCS) HACKING pulseaudio fsg.sh \ + $(JTREG_SRCS) HACKING pulseaudio \ hotspot.map \ autogen.sh \ tapset/hotspot.stp.in \ @@ -1219,7 +1223,8 @@ mkdir openjdk ; \ $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \ chmod -R ug+w openjdk ; \ - sh $(abs_top_srcdir)/fsg.sh ; \ + chmod +x $(builddir)/fsg.sh ; \ + sh $(builddir)/fsg.sh ; \ fi endif endif @@ -1657,7 +1662,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ stamps/jamvm.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV) \ -C openjdk \ $(ICEDTEA_BUILD_TARGET) @@ -1688,7 +1693,7 @@ stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ stamps/jamvm.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV) \ -C openjdk \ $(ICEDTEA_DEBUG_BUILD_TARGET) @@ -2059,7 +2064,7 @@ stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ $(OPENJDK_ECJ_TREE) stamps/jamvm.stamp stamps/cacao.stamp \ stamps/rewrite-rhino.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV_ECJ) \ -C openjdk-ecj/ \ $(ICEDTEA_BUILD_TARGET) diff -r 766bf00e3bf2 -r 72968bfeb778 NEWS --- a/NEWS Fri Oct 24 18:45:33 2014 +0100 +++ b/NEWS Tue Jan 20 06:01:55 2015 +0000 @@ -19,7 +19,11 @@ - S7161796, RH1151372: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror - S8000897, RH1155012: VM crash in CompileBroker * Bug fixes + - PR1831: Drop version requirement for LCMS 2 + - PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library - PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop + - PR2062: Unset OS before running OpenJDK build + - PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS New in release 1.13.5 (2014-10-14): diff -r 766bf00e3bf2 -r 72968bfeb778 acinclude.m4 --- a/acinclude.m4 Fri Oct 24 18:45:33 2014 +0100 +++ b/acinclude.m4 Tue Jan 20 06:01:55 2015 +0000 @@ -1554,10 +1554,10 @@ AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS}) if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then dnl Check for LCMS2 headers and libraries. - PKG_CHECK_MODULES(LCMS2, lcms2 >= 2.5,[LCMS2_FOUND=yes],[LCMS2_FOUND=no]) + PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no]) if test "x${LCMS2_FOUND}" = xno then - AC_MSG_ERROR([Could not find LCMS >= 2.5; install it or build with --disable-system-lcms to use the in-tree copy.]) + AC_MSG_ERROR([Could not find LCMS 2; install it or build with --disable-system-lcms to use the in-tree copy.]) fi AC_SUBST(LCMS2_CFLAGS) AC_SUBST(LCMS2_LIBS) diff -r 766bf00e3bf2 -r 72968bfeb778 configure.ac --- a/configure.ac Fri Oct 24 18:45:33 2014 +0100 +++ b/configure.ac Tue Jan 20 06:01:55 2015 +0000 @@ -2,7 +2,7 @@ AC_CANONICAL_HOST AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile fsg.sh]) # Older automake doesn't generate these correctly abs_top_builddir=`pwd -P` diff -r 766bf00e3bf2 -r 72968bfeb778 fsg.sh --- a/fsg.sh Fri Oct 24 18:45:33 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -#!/bin/sh - -echo "Further liberating OpenJDK..." - -# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x) -# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x) - -# PR146/S6713083 -# Remove binaries -rm -f \ - openjdk/jdk/test/sun/management/windows/revokeall.exe \ - openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \ - openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \ - openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher - -rm -f \ - openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \ - openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \ - openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \ - openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \ - openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \ - openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \ - openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \ - openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \ - openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \ - openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so - -rm -f \ - openjdk/jdk/test/java/util/Locale/data/deflocale.exe \ - openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \ - openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \ - openjdk/jdk/test/java/util/Locale/data/deflocale.sh \ - openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \ - openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \ - openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \ - -# Remove test sources with questionable license headers. -rm -f \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \ - openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \ - openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \ - openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \ - openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \ - openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \ - openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \ - openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \ - openjdk/jdk/test/java/util/Locale/LocaleTest.java \ - openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \ - openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \ - openjdk/jdk/test/sun/text/resources/LocaleDataTest.java - -# Remove J2DBench sources, some of which have questionable license -# headers. -rm -rf \ - openjdk/jdk/src/share/demo/java2d/J2DBench - -# BEGIN Debian/Ubuntu additions - -# binary files -rm -f \ - openjdk/jdk/test/sun/net/idn/*.spp - -# END Debian/Ubuntu additions - -# Remove man page for proprietary javaws -rm -f openjdk/jdk/src/linux/doc/man/javaws.1 \ - openjdk/jdk/src/linux/doc/man/ja/javaws.1 \ - openjdk/jdk/src/solaris/doc/sun/man/man1/javaws.1 \ - openjdk/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 diff -r 766bf00e3bf2 -r 72968bfeb778 fsg.sh.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fsg.sh.in Tue Jan 20 06:01:55 2015 +0000 @@ -0,0 +1,94 @@ +#!/bin/sh + +echo "Further liberating OpenJDK..." + +# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x) +# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x) + +# PR146/S6713083 +# Remove binaries +rm -f \ + openjdk/jdk/test/sun/management/windows/revokeall.exe \ + openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \ + openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \ + openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher + +rm -f \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \ + openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \ + openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \ + openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so + +rm -f \ + openjdk/jdk/test/java/util/Locale/data/deflocale.exe \ + openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \ + openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \ + openjdk/jdk/test/java/util/Locale/data/deflocale.sh \ + openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \ + openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \ + openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \ + +# Remove test sources with questionable license headers. +rm -f \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \ + openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \ + openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \ + openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \ + openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \ + openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \ + openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \ + openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \ + openjdk/jdk/test/java/util/Locale/LocaleTest.java \ + openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \ + openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \ + openjdk/jdk/test/sun/text/resources/LocaleDataTest.java + +# Remove J2DBench sources, some of which have questionable license +# headers. +rm -rf \ + openjdk/jdk/src/share/demo/java2d/J2DBench + +# BEGIN Debian/Ubuntu additions + +# binary files +rm -f \ + openjdk/jdk/test/sun/net/idn/*.spp + +# END Debian/Ubuntu additions + +# Remove man page for proprietary javaws +rm -f openjdk/jdk/src/linux/doc/man/javaws.1 \ + openjdk/jdk/src/linux/doc/man/ja/javaws.1 \ + openjdk/jdk/src/solaris/doc/sun/man/man1/javaws.1 \ + openjdk/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 + +echo "Syncing EC list with NSS" +patch -Np0 < @abs_top_srcdir@/patches/pr2125.patch diff -r 766bf00e3bf2 -r 72968bfeb778 patches/pr2125.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/pr2125.patch Tue Jan 20 06:01:55 2015 +0000 @@ -0,0 +1,486 @@ +diff -r 9665966de2e7 src/share/classes/sun/security/ec/NamedCurve.java +--- openjdk/jdk/src/share/classes/sun/security/ec/NamedCurve.java Fri Dec 05 02:53:29 2014 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/ec/NamedCurve.java Fri Dec 05 02:58:18 2014 +0000 +@@ -162,114 +162,6 @@ + + static { + /* SEC2 prime curves */ +- add("secp112r1", "1.3.132.0.6", P, +- "DB7C2ABF62E35E668076BEAD208B", +- "DB7C2ABF62E35E668076BEAD2088", +- "659EF8BA043916EEDE8911702B22", +- "09487239995A5EE76B55F9C2F098", +- "A89CE5AF8724C0A23E0E0FF77500", +- "DB7C2ABF62E35E7628DFAC6561C5", +- 1); +- +- add("secp112r2", "1.3.132.0.7", P, +- "DB7C2ABF62E35E668076BEAD208B", +- "6127C24C05F38A0AAAF65C0EF02C", +- "51DEF1815DB5ED74FCC34C85D709", +- "4BA30AB5E892B4E1649DD0928643", +- "adcd46f5882e3747def36e956e97", +- "36DF0AAFD8B8D7597CA10520D04B", +- 4); +- +- add("secp128r1", "1.3.132.0.28", P, +- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF", +- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC", +- "E87579C11079F43DD824993C2CEE5ED3", +- "161FF7528B899B2D0C28607CA52C5B86", +- "CF5AC8395BAFEB13C02DA292DDED7A83", +- "FFFFFFFE0000000075A30D1B9038A115", +- 1); +- +- add("secp128r2", "1.3.132.0.29", P, +- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF", +- "D6031998D1B3BBFEBF59CC9BBFF9AEE1", +- "5EEEFCA380D02919DC2C6558BB6D8A5D", +- "7B6AA5D85E572983E6FB32A7CDEBC140", +- "27B6916A894D3AEE7106FE805FC34B44", +- "3FFFFFFF7FFFFFFFBE0024720613B5A3", +- 4); +- +- add("secp160k1", "1.3.132.0.9", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", +- "0000000000000000000000000000000000000000", +- "0000000000000000000000000000000000000007", +- "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB", +- "938CF935318FDCED6BC28286531733C3F03C4FEE", +- "0100000000000000000001B8FA16DFAB9ACA16B6B3", +- 1); +- +- add("secp160r1", "1.3.132.0.8", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC", +- "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45", +- "4A96B5688EF573284664698968C38BB913CBFC82", +- "23A628553168947D59DCC912042351377AC5FB32", +- "0100000000000000000001F4C8F927AED3CA752257", +- 1); +- +- add("secp160r2", "1.3.132.0.30", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70", +- "B4E134D3FB59EB8BAB57274904664D5AF50388BA", +- "52DCB034293A117E1F4FF11B30F7199D3144CE6D", +- "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E", +- "0100000000000000000000351EE786A818F3A1A16B", +- 1); +- +- add("secp192k1", "1.3.132.0.31", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37", +- "000000000000000000000000000000000000000000000000", +- "000000000000000000000000000000000000000000000003", +- "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D", +- "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D", +- "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D", +- 1); +- +- add("secp192r1 [NIST P-192, X9.62 prime192v1]", "1.2.840.10045.3.1.1", PD, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC", +- "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1", +- "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012", +- "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811", +- "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831", +- 1); +- +- add("secp224k1", "1.3.132.0.32", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D", +- "00000000000000000000000000000000000000000000000000000000", +- "00000000000000000000000000000000000000000000000000000005", +- "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C", +- "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5", +- "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7", +- 1); +- +- add("secp224r1 [NIST P-224]", "1.3.132.0.33", PD, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE", +- "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4", +- "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21", +- "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34", +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", +- 1); +- +- add("secp256k1", "1.3.132.0.10", P, +- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F", +- "0000000000000000000000000000000000000000000000000000000000000000", From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 06:02:20 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 06:02:20 +0000 Subject: [Bug 1831] [IcedTea6] Drop version requirement for LCMS 2 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1831 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=72e1b748868f author: Andrew John Hughes date: Tue Jan 20 05:57:38 2015 +0000 PR1831: Drop version requirement for LCMS 2 2014-06-10 Andrew John Hughes PR1831: Drop version requirement for LCMS 2 * INSTALL: Document lcms2 requirement. * NEWS: Updated. * acinclude.m4: (IT_CHECK_FOR_LCMS): Drop 2.5 requirement. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 06:02:25 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 06:02:25 +0000 Subject: [Bug 1832] [IcedTea6] Report elliptic curves supported by NSS, not the SunEC library In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1832 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=62e04f490bb4 author: Andrew John Hughes date: Tue Jan 20 05:59:10 2015 +0000 PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library 2014-06-10 Andrew John Hughes PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library * Makefile.am: (ICEDTEA_PATCHES): Add new patch when PKCS11+NSS or SunEC+NSS are enabled, so that the NSS set of curves are announced via SSL. * NEWS: Updated. * patches/rh1022017.patch: Reduce number of curves announced over SSL to just those supported by NSS. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 06:02:30 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 06:02:30 +0000 Subject: [Bug 2062] [IcedTea6] Unset OS before running OpenJDK build In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2062 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=0f903bacbe64 author: Andrew John Hughes date: Tue Jan 20 05:59:48 2015 +0000 PR2062: Unset OS before running OpenJDK build 2015-01-06 Andrew John Hughes PR2062: Unset OS before running OpenJDK build * Makefile.am: (ICEDTEA_UNSET): Introduce variable to store unsetting of environment variables. (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and JDK_HOME to ICEDTEA_UNSET. (icedtea): Unset variables prior to running $(MAKE). (icedtea-debug): Likewise. (icedtea-ecj): Likewise. * NEWS: Updated. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 06:02:35 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 06:02:35 +0000 Subject: [Bug 2125] [IcedTea6] Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2125 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=72968bfeb778 author: Andrew John Hughes date: Tue Jan 20 06:01:55 2015 +0000 PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS 2014-12-05 Andrew John Hughes PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS * fsg.sh: Moved to... * Makefile.am: (EXTRA_DIST): Remove fsg.sh, now generated by configure. (extract-openjdk): Fix path to new generated fsg.sh and mark as executable * NEWS: Updated. * configure.ac: Add fsg.sh to AC_CONFIG_FILES. * fsg.sh.in: ... here and added application of PR2125 patch. * patches/pr2125.patch: Patch to remove curves unsupported by NSS. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 06:44:10 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 06:44:10 +0000 Subject: [Bug 2125] [IcedTea6] Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2125 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 06:45:03 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 06:45:03 +0000 Subject: [Bug 2062] [IcedTea6] Unset OS before running OpenJDK build In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2062 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 06:45:15 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 06:45:15 +0000 Subject: [Bug 1832] [IcedTea6] Report elliptic curves supported by NSS, not the SunEC library In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1832 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 06:45:28 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 06:45:28 +0000 Subject: [Bug 1831] [IcedTea6] Drop version requirement for LCMS 2 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1831 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 08:11:43 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 08:11:43 +0000 Subject: [Bug 2179] New: [IcedTea6] Avoid x86 workaround when running Zero rather than a JIT Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2179 Bug ID: 2179 Summary: [IcedTea6] Avoid x86 workaround when running Zero rather than a JIT Product: IcedTea Version: 6-hg Hardware: x86 OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org Clone of PR1868 for 1.x -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 08:12:10 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 08:12:10 +0000 Subject: [Bug 2179] [IcedTea6] Avoid x86 workaround when running Zero rather than a JIT In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2179 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |6-1.13.6 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ptisnovs at icedtea.classpath.org Tue Jan 20 09:59:11 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 20 Jan 2015 09:59:11 +0000 Subject: /hg/gfx-test: Another ten new tests added into BitBltBufferedIma... Message-ID: changeset 9c7ff72ab5d8 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=9c7ff72ab5d8 author: Pavel Tisnovsky date: Tue Jan 20 11:01:02 2015 +0100 Another ten new tests added into BitBltBufferedImageOp. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBufferedImageOp.java | 165 ++++++++++++++++++ 2 files changed, 170 insertions(+), 0 deletions(-) diffs (187 lines): diff -r dee350b3660a -r 9c7ff72ab5d8 ChangeLog --- a/ChangeLog Mon Jan 19 10:26:17 2015 +0100 +++ b/ChangeLog Tue Jan 20 11:01:02 2015 +0100 @@ -1,3 +1,8 @@ +2015-01-20 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: + Another ten new tests added into BitBltBufferedImageOp. + 2015-01-19 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r dee350b3660a -r 9c7ff72ab5d8 src/org/gfxtest/testsuites/BitBltBufferedImageOp.java --- a/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Mon Jan 19 10:26:17 2015 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Tue Jan 20 11:01:02 2015 +0100 @@ -7011,6 +7011,171 @@ } /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6Type3ByteBGR(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6Type4ByteABGR(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_PRE}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6Type4ByteABGR_Pre(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6TypeByteBinary(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6TypeByteIndexed(TestImage image, Graphics2D graphics2d, BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6TypeByteGray(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6TypeIntBGR(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_INT_BGR, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6TypeIntRGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_INT_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6TypeIntARGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6TypeIntARGB_Pre(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE, rasterOp); + } + + /** * Entry point to the test suite. * * @param args not used in this case From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 11:16:02 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 11:16:02 +0000 Subject: [Bug 2180] New: [IcedTea6] Old autotools dislike $(builddir)/fsg.sh Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2180 Bug ID: 2180 Summary: [IcedTea6] Old autotools dislike $(builddir)/fsg.sh Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org set -e ; \ if ! test -d openjdk ; \ then \ mkdir openjdk ; \ /bin/tar xf openjdk-6-src-b34-20_jan_2015.tar.xz -C openjdk; \ chmod -R ug+w openjdk ; \ chmod +x /fsg.sh ; \ sh /fsg.sh ; \ fi chmod: cannot access `/fsg.sh': No such file or directory make: *** [stamps/extract-openjdk.stamp] Error 1 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 18:58:36 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 18:58:36 +0000 Subject: [Bug 2181] New: [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2181 Bug ID: 2181 Summary: [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 Product: IcedTea Version: 6-1.13.6 Hardware: x86_64 OS: Linux Status: NEW Severity: enhancement Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org 29633 ../../../src/share/demo/jvmti/hprof/hprof_check.c: In function 'check_tags': 29634 ../../../src/share/demo/jvmti/hprof/hprof_check.c:951:17: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 29709 ../../../src/share/demo/jvmti/hprof/hprof_io.c: In function 'io_write_sites_header': 29710 ../../../src/share/demo/jvmti/hprof/hprof_io.c:809:9: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 29789 ../../../src/share/demo/jvmti/hprof/hprof_listener.c: In function 'listener_loop_function': 29790 ../../../src/share/demo/jvmti/hprof/hprof_listener.c:260:17: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 29796 ../../../src/share/demo/jvmti/hprof/hprof_init.c: In function 'cbExceptionCatch': 29797 ../../../src/share/demo/jvmti/hprof/hprof_listener.c:290:17: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 37944 ../../../../src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c: In function 'mlib_ImageLookUp_Bit_U8_4': 37945 ../../../../src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c:622:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] ...plus 5 more warnings suppressed Looks the same as PR1808 http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1808 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 19:04:04 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 19:04:04 +0000 Subject: [Bug 2181] [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2181 Andrew Haley changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aph at redhat.com --- Comment #1 from Andrew Haley --- That's a really nasty bug. Is this only for demos? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 19:12:25 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 19:12:25 +0000 Subject: [Bug 2181] [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2181 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |6-1.13.7 --- Comment #2 from Andrew John Hughes --- Not all: ../../../../src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 19:13:03 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 19:13:03 +0000 Subject: [Bug 2181] [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2181 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|enhancement |normal -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 19:23:23 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 19:23:23 +0000 Subject: [Bug 2181] [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2181 --- Comment #3 from Andrew Haley --- OK, so this is potentially a nasty crasher. We need this fixed in 6, then. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Tue Jan 20 21:40:29 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 20 Jan 2015 21:40:29 +0000 Subject: /hg/release/icedtea6-1.13: 9 new changesets Message-ID: changeset cf2ebfda5911 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=cf2ebfda5911 author: Andrew John Hughes date: Fri Oct 24 02:53:21 2014 +0100 Bump to next version, b34. 2014-10-24 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Bump to next release, b34. changeset b491474e2be9 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=b491474e2be9 author: Andrew John Hughes date: Tue Jan 20 06:10:12 2015 +0000 Sync with upstream OpenJDK 6 repository. Upstream changes: - OJ43: Backport JAX_WS-945; Socket backlog may be limiting lwhs performance - S6364329: jstat displays "invalid argument count" with usage - S6507067: TimeZone country/area message error - S6585666: Spanish language names not compliant with CLDR - S6608572: Currency change for Malta and Cyprus - S6610748: Dateformat - AM-PM indicator in Finnish appears to be from English - S6627549: ISO 3166 code addition: Saint Barthelemy and Saint Martin - S6645271: Wrong date format for Croatian (hr) locale - S6646611: Incorrect spelling of month name in locale for Belarusian language ("be", "BY") - S6647452: Remove obfuscation, framework and provider self-verification checking - S6716626: Integrate contributed language and country names for NL - S6786276: Locale.getISOCountries() still contains country code "CS" - S6868106: Ukrainian currency has wrong format - S6870908: reopen bug 4244752: month names in Estonian should be lowercase - S6873931: New Turkish currency since 2009 - S6910489: Slovenia Locale, wrong firstDayOfWeek number - S6914413: abbreviation name for November is not correct in be_BY - S6916787: Ukrainian currency name needs to be fixed - S6919624: minimalDaysInFirstWeek ressource for hungarian is wrong - S6931564: Incorrect display name of Locale for south africa - S6938454: 2 new testcases for bug: Unable to determine generic type in program that compiles under Java 6 - S6938454: Unable to determine generic type in program that compiles under Java 6 - S7019267: Currency Display Names are not localized into pt_BR. - S7020583: Some currency names are missing in some locales - S7020960: CurrencyNames_sr_RS.properties is missing. - S7025837: fix plural currency display names in sr_Latn_(BA|ME|RS).properties - S7028073: The currency symbol for Peru is wrong - S7036905: [de] dem - the german mark display name is incorrect - S7066203: Update currency data to the latest ISO 4217 standard - S7077119: remove past transition dates from CurrencyData.properties file - S7085757: Currency Data: ISO 4217 Amendment 152 - S7122142: (ann) Race condition between isAnnotationPresent and getAnnotations - S7161796: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror - S7171028: dots are missed in the datetime for Slovanian - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations - S7189611: Venezuela current Currency should be Bs.F. - S7195759: ISO 4217 Amendment 154 - S7201205: Add Makefile configuration option to build with unlimited crypto in OpenJDK. - S8005232: (JEP-149) Class Instance size reduction - S8006748: getISO3Country() returns wrong value - S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale - S8021121: ISO 4217 Amendment Number 156 - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws java.lang.IllegalStateException: unexpected condition - S8027695: There should be a space before % sign in Swedish locale - S8055222: Currency update needed for ISO 4217 Amendment #159 2015-01-19 Andrew John Hughes * patches/clean-crypto.patch: Removed; replaced by inclusion of UNLIMITED_CRYPTO=true solution upstream. * patches/openjdk/7122142-annotation_race_condition.patch, * patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch: Remove patches included upstream. * Makefile.am: (ICEDTEA_PATCHES): Remove above patches. (ICEDTEA_ENV): Set UNLIMITED_CRYPTO=true. * NEWS: Updated. * patches/openjdk/4963723-implement_sha-224.patch: Regenerated following backport of 6647452 upstream. * patches/openjdk/7044060-support_nsa_suite_b.patch: Likewise. * patches/openjdk/7106773-512_bits_rsa.patch: Likewise. * patches/openjdk/8006935-long_keys_in_hmac_prf.patch: Likewise. * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch: Likewise. * patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch: Likewise. 2015-01-05 Andrew John Hughes * patches/ecj/pr64174.patch: Drop the Lithuanian changeover date now, as it's in the past. 2014-12-04 Andrew John Hughes * Makefile.am: (ICEDTEA_ECJ_PATCHES): Add workaround for bug in parsing end-of-year dates (Classpath PR64174). * acinclude.m4: (IT_PR64174_CHECK): Detect if the boot JDK suffers from PR64174 and apply the patch if so. * configure.ac: Call IT_PR64174_CHECK. * patches/ecj/pr64174.patch: Drop the Latvian Euro changeover date, which is in the past anyway, and move Lithuania's two hours forward so it enters 2015 and avoids the bug. changeset 5cec14c8f8c7 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=5cec14c8f8c7 author: Andrew John Hughes date: Tue Jan 20 04:38:55 2015 +0000 Bring in 2015/01/20 security update. Upstream changes: - OJ44: Add missing TimeZone test cases included in OpenJDK 7 revision 0. - OJ45: Fix copyright headers on imported files - OJ46: Fix lost Classpath exception - OJ47: Remove @Override annotation on interfaces added by 2015/01/20 security fixes. - OJ48: Fix substitution error. - S4873188: Support TLS 1.1 - S6461635: [TESTBUG] BasicTests.sh test fails intermittently - S6541350: TimeZone display names localization - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec - S6578647: Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication() - S6587676: Krb5LoginModule failure if useTicketCache=true on Vista - S6631048: Problem when writing on output stream of HttpURLConnection - S6641309: Wrong Cookie separator used in HttpURLConnection - S6641312: Fix krb5 codes indentation problems - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems - S6659779: HttpURLConnections logger should log tunnel requests - S6670362: HTTP/SPNEGO should work across realms - S6706974: Add krb5 test infrastructure - S6720866: Slow performance using HttpURLConnection for upload - S6726695: HttpURLConnection shoul support 'Expect: 100-contimue' headers for PUT - S6729881: Compiler warning in networking native code - S6761072: new krb5 tests fail on multiple platforms - S6765491: Krb5LoginModule a little too restrictive, and the doc is not clear. - S6776102: sun/util/resources/TimeZone/Bug6317929.java test failed against 6u12b01 and passed against 6u11b03 - S6792180: Enhance to reject weak algorithms or conform to crypto recommendations - S6811297: Add more logging to HTTP protocol handler - S6821191: Timezone display name localization - S6822460: support self-issued certificate - S6830658: Changeset 67e5d3e41b5b breaks the fastdebug build in NativeCreds.c - S6835668: Use of /usr/include/linux/ files creates a dependence on kernel-headers - S6855297: Windows build breaks after 6811297 - S6856856: NPE in HTTP protocol handler logging - S6868106: Ukrainian currency has wrong format - S6870908: reopen bug 4244752: month names in Estonian should be lowercase - S6873931: New Turkish currency since 2009 - S6882594: Remove static dependancy on NTLM authentication - S6899503: Security code issue using Verisign root certificate - S6910489: Slovenia Locale, wrong firstDayOfWeek number - S6911104: Tests do not work with CYGWIN: tools, sun/tools, and com/sun/tools - S6914413: abbreviation name for November is not correct in be_BY - S6925851: Localize JRE into pt_BR - S6931566: NetworkInterface is not working when interface name is more than 15 characters long - S6945604: wrong error message in CardImpl.java - S6962617: Testcase changes, cleanup of problem list for jdk_tools targets - S6964714: NetworkInterface getInetAddresses enumerates IPv6 addresses if java.net.preferIPvStack property set - S6967937: Scope id no longer being set after 6931566 - S6972374: NetworkInterface.getNetworkInterfaces throws "java.net.SocketException" on Solaris zone - S6976117: SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets without TLSv1.1 enabled - S6977550: (tz) Support tzdata2010l - S6996686: (tz) Support tzdata2010o - S7001720: copyright templates not rebranded - S7017800: (tz) Support tzdata2011b - S7022269: clean up fscanf usage in Linux networking native code - S7027387: (tz) Support tzdata2011d - S7033174: (tz) Support tzdata2011e - S7035073: Add missing timezones to TimeZoneNames_pt_BR.java - S7035555: 4/4 attach/BasicTests.sh needs another tweak for Cygwin - S7036025: java.security.AccessControlException when creating JFileChooser in signed applet - S7039469: (tz) Support tzdata2011g - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true - S7079012: test/java/net/NetworkInterface/NetParamsTest.java fails with SocketException getting mac address - S7090843: (tz) Support tzdata2011j - S7103108: (tz) Support tzdata2011l - S7103405: Correct display names for Pacific/Apia timezone - S7104126: Insert openjdk copyright header back into TZdata files - S7153184: NullPointerException when calling SSLEngineImpl.getSupportedCipherSuites - S7158483: (tz) Support tzdata2012c - S7174244: NPE in Krb5ProxyImpl.getServerKeys() - S7198570: (tz) Support tzdata2012f - S7199066: Typo in method name - S8002225: (tz) Support tzdata2012i - S8009987: (tz) Support tzdata2013b - S8014469: (tz) Support tzdata2013c - S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE - S8015570: Use long comparison in Rule.getRules(). - S8020054: (tz) Support tzdata2013d - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address - S8023956: Provide a work-around to broken Linux 32 bit "Exec Shield" using CS for NX emulation (crashing with SI_KERNEL) - S8025051: Update resource files for TimeZone display names - S8025255: (tz) Support tzdata2013g - S8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing - S8027359: XML parser returns incorrect parsing results - S8027370: Support tzdata2013h - S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings - S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions - S8029153: [TESTBUG] test/compiler/7141637/SpreadNullArg.java fails because it expects NullPointerException - S8029318: Native Windows ccache still reads DES tickets - S8030822: (tz) Support tzdata2013i - S8031046: Native Windows ccache might still get unsupported ticket - S8032788: ImageIcon constructor throws an NPE and hangs when passed a null String parameter - S8032909: XSLT string-length returns incorrect length when string includes complementary chars - S8035613: With active Securitymanager JAXBContext.newInstance fails - S8037012: (tz) Support tzdata2014a - S8038306: (tz) Support tzdata2014b - S8040617: [macosx] Large JTable cell results in a OutOfMemoryException - S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser - S8043012: (tz) Support tzdata2014c - S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX - S8046656: Update protocol support - S8047125: (ref) More phantom object references - S8047130: Fewer escapes from escape analysis - S8048035: Ensure proper proxy protocols - S8049250: Need a flag to invert the Card.disconnect(reset) argument - S8049253: Better GC validation - S8049343: (tz) Support tzdata2014g - S8050485: super() in a try block in a ctor causes VerifyError - S8050807: Better performing performance data handling - S8051012: Regression in verifier for method call from inside of a branch - S8051614: smartcardio TCK tests fail due to lack of 'reset' permission - S8054367: More references for endpoints - S8055304: More boxing for DirectoryComboBoxModel - S8055309: RMI needs better transportation considerations - S8055479: TLAB stability - S8055489: Better substitution formats - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure - S8056264: Multicast support improvements - S8056276: Fontmanager feature improvements - S8057555: Less cryptic cipher suite management - S8058715: stability issues when being launched as an embedded JVM via JNI - S8058982: Better verification of an exceptional invokespecial - S8059206: (tz) Support tzdata2014i - S8059485: Resolve parsing ambiguity - S8060474: Resolve more parsing ambiguity - S8061210: Issues in TLS - S8061826: Part of JDK-8060474 should be reverted - S8062561: Test bug8055304 fails if file system default directory has read access - S8062807: Exporting RMI objects fails when run under restrictive SecurityManager - S8064560: (tz) Support tzdata2014j 2015-01-19 Andrew John Hughes * patches/openjdk/6541350-tz_display_names_l10n.patch, * patches/openjdk/6706974-krb5_test_infrastructure.patch, * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch, * patches/openjdk/6821191-tz_display_names_l10n.patch, * patches/openjdk/6925851-pt_br.patch, * patches/openjdk/6977550-tzdata2010l.patch, * patches/openjdk/6996686-tzdata2010o.patch, * patches/openjdk/7017800-tzdata2011b.patch, * patches/openjdk/7027387-tzdata2011d.patch, * patches/openjdk/7033174-tzdata2011e.patch, * patches/openjdk/7035073-missing_pt_br_timezones.patch, * patches/openjdk/7039469-tzdata2011g.patch, * patches/openjdk/7090843-tzdata2011j.patch, * patches/openjdk/7103108-tzdata2011l.patch, * patches/openjdk/7103405-correct_display_names.patch, * patches/openjdk/7104126-headers_tzdata.patch, * patches/openjdk/7158483-tzdata2012c.patch, * patches/openjdk/7198570-tzdata2012f.patch, * patches/openjdk/8002225-tzdata2012i.patch, * patches/openjdk/8009987-tzdata2013b.patch, * patches/openjdk/8014469-tzdata2013c.patch, * patches/openjdk/8020054-tzdata2013d.patch, * patches/openjdk/8025255-tzdata2013g.patch: Remove patches included upstream. * Makefile.am: (ICEDTEA_PATCHES): Remove above patches. * NEWS: Updated. * patches/hotspot/hs23/remove_jsr292_tests.patch: Regenerated. * patches/hotspot/hs23/type_fixes.patch: Remove threadLocalAllocBuffer.cpp hunk which is no longer applicable. changeset 58418f99312a in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=58418f99312a author: Andrew John Hughes date: Tue Jan 20 06:16:12 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. changeset a8b7dd6d4d51 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=a8b7dd6d4d51 author: Andrew John Hughes date: Tue Jan 20 06:41:59 2015 +0000 Update to b34 tarball. 2015-01-19 Andrew John Hughes * Makefile.am: (OPENJDK_DATE): Bump to security update release date; 20th of January, 2015. (OPENJDK_SHA256SUM): Update for b34 tarball. changeset f0c900038574 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=f0c900038574 author: Andrew John Hughes date: Tue Jan 20 06:46:55 2015 +0000 Prepare for 1.13.6 release. 2015-01-19 Andrew John Hughes * NEWS: Set release date to 20th of January, 2015 for 1.13.6. * configure.ac: Bump to 1.13.6. changeset ff4779d28676 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=ff4779d28676 author: Andrew John Hughes date: Tue Jan 20 08:21:36 2015 +0000 Update tarball to include x86 build fix and backport workaround for Zero from IcedTea 2.x. PR2179: Avoid x86 workaround when running Zero rather than a JIT Upstream changes: - OJ49: Fix placement of 8023956 fix. 2015-01-19 Andrew John Hughes * Makefile.am: (OPENJDK_SHA256SUM): Update for new b34 tarball. (ICEDTEA_PATCHES): Add fix for PR2179. * NEWS: Updated. * patches/pr2179-avoid_x86_workaround_on_zero.patch: Don't apply 8023956 when building Zero on x86. changeset 668899e5ab89 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=668899e5ab89 author: Andrew John Hughes date: Tue Jan 20 09:11:26 2015 +0000 Fix another build failure on x86. Upstream changes: - OJ50: Fix reference to missing pd_attempt_reserve_memory_at 2015-01-19 Andrew John Hughes * Makefile.am: (OPENJDK_SHA256SUM): Update for new b34 tarball. * NEWS: Updated. changeset 15e9801d9167 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=15e9801d9167 author: Andrew John Hughes date: Tue Jan 20 11:35:12 2015 +0000 PR2180: Old autotools dislike $(builddir)/fsg.sh 2015-01-19 Andrew John Hughes * Makefile.am: (extract-openjdk): Use abs_top_builddir instead of builddir to please older versions of autotools. No need to set fsg.sh executable either as we run it via sh. * NEWS: Updated. diffstat: ChangeLog | 136 + Makefile.am | 53 +- NEWS | 165 +- acinclude.m4 | 46 + configure.ac | 5 +- patches/clean-crypto.patch | 1099 -- patches/ecj/pr64174.patch | 21 + patches/hotspot/hs23/remove_jsr292_tests.patch | 35 +- patches/hotspot/hs23/type_fixes.patch | 96 +- patches/openjdk/4963723-implement_sha-224.patch | 289 +- patches/openjdk/6541350-tz_display_names_l10n.patch | 300 - patches/openjdk/6706974-krb5_test_infrastructure.patch | 2090 ----- patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch | 94 - patches/openjdk/6821191-tz_display_names_l10n.patch | 125 - patches/openjdk/6925851-pt_br.patch | 3651 --------- patches/openjdk/6977550-tzdata2010l.patch | 1208 --- patches/openjdk/6996686-tzdata2010o.patch | 93 - patches/openjdk/7017800-tzdata2011b.patch | 265 - patches/openjdk/7027387-tzdata2011d.patch | 522 - patches/openjdk/7033174-tzdata2011e.patch | 117 - patches/openjdk/7035073-missing_pt_br_timezones.patch | 1644 ---- patches/openjdk/7039469-tzdata2011g.patch | 116 - patches/openjdk/7044060-support_nsa_suite_b.patch | 125 +- patches/openjdk/7090843-tzdata2011j.patch | 1281 --- patches/openjdk/7103108-tzdata2011l.patch | 1660 ---- patches/openjdk/7103405-correct_display_names.patch | 130 - patches/openjdk/7104126-headers_tzdata.patch | 530 - patches/openjdk/7106773-512_bits_rsa.patch | 2 +- patches/openjdk/7122142-annotation_race_condition.patch | 1955 ---- patches/openjdk/7158483-tzdata2012c.patch | 1482 --- patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch | 40 - patches/openjdk/7198570-tzdata2012f.patch | 841 -- patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch | 29 + patches/openjdk/8000897-use_corresponding_digest_length.patch | 29 - patches/openjdk/8002225-tzdata2012i.patch | 261 - patches/openjdk/8006935-long_keys_in_hmac_prf.patch | 2 +- patches/openjdk/8009987-tzdata2013b.patch | 2275 ----- patches/openjdk/8014469-tzdata2013c.patch | 276 - patches/openjdk/8020054-tzdata2013d.patch | 314 - patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch | 80 + patches/openjdk/8025255-tzdata2013g.patch | 3976 ---------- patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch | 106 + patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch | 36 + patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch | 7 - patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch | 2 +- patches/pr2070-type_punning_warnings.patch | 36 + patches/pr2082-s390_type_fixes.patch | 20 + patches/pr2096-4096-bit_dh.patch | 120 + patches/pr2179-avoid_x86_workaround_on_zero.patch | 33 + 49 files changed, 1099 insertions(+), 26719 deletions(-) diffs (truncated from 29002 to 500 lines): diff -r 72968bfeb778 -r 15e9801d9167 ChangeLog --- a/ChangeLog Tue Jan 20 06:01:55 2015 +0000 +++ b/ChangeLog Tue Jan 20 11:35:12 2015 +0000 @@ -1,3 +1,139 @@ +2015-01-19 Andrew John Hughes + + * Makefile.am: + (extract-openjdk): Use abs_top_builddir + instead of builddir to please older + versions of autotools. No need to set + fsg.sh executable either as we run it + via sh. + * NEWS: Updated. + +2015-01-19 Andrew John Hughes + + * Makefile.am: + (OPENJDK_SHA256SUM): Update for new b34 tarball. + * NEWS: Updated. + +2015-01-19 Andrew John Hughes + + * Makefile.am: + (OPENJDK_SHA256SUM): Update for new b34 tarball. + (ICEDTEA_PATCHES): Add fix for PR2179. + * NEWS: Updated. + * patches/pr2179-avoid_x86_workaround_on_zero.patch: + Don't apply 8023956 when building Zero on x86. + +2015-01-19 Andrew John Hughes + + * NEWS: Set release date to 20th of January, + 2015 for 1.13.6. + * configure.ac: Bump to 1.13.6. + +2015-01-19 Andrew John Hughes + + * Makefile.am: + (OPENJDK_DATE): Bump to security update release date; + 20th of January, 2015. + (OPENJDK_SHA256SUM): Update for b34 tarball. + +2015-01-19 Andrew John Hughes + + * patches/openjdk/8000897-use_corresponding_digest_length.patch: + Moved to... + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated. + * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: + ...here. + * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, + * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, + * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, + * patches/pr2070-type_punning_warnings.patch, + * patches/pr2082-s390_type_fixes.patch, + * patches/pr2096-4096-bit_dh.patch: + New backports from IcedTea 2.x. + +2015-01-19 Andrew John Hughes + + * patches/openjdk/6541350-tz_display_names_l10n.patch, + * patches/openjdk/6706974-krb5_test_infrastructure.patch, + * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch, + * patches/openjdk/6821191-tz_display_names_l10n.patch, + * patches/openjdk/6925851-pt_br.patch, + * patches/openjdk/6977550-tzdata2010l.patch, + * patches/openjdk/6996686-tzdata2010o.patch, + * patches/openjdk/7017800-tzdata2011b.patch, + * patches/openjdk/7027387-tzdata2011d.patch, + * patches/openjdk/7033174-tzdata2011e.patch, + * patches/openjdk/7035073-missing_pt_br_timezones.patch, + * patches/openjdk/7039469-tzdata2011g.patch, + * patches/openjdk/7090843-tzdata2011j.patch, + * patches/openjdk/7103108-tzdata2011l.patch, + * patches/openjdk/7103405-correct_display_names.patch, + * patches/openjdk/7104126-headers_tzdata.patch, + * patches/openjdk/7158483-tzdata2012c.patch, + * patches/openjdk/7198570-tzdata2012f.patch, + * patches/openjdk/8002225-tzdata2012i.patch, + * patches/openjdk/8009987-tzdata2013b.patch, + * patches/openjdk/8014469-tzdata2013c.patch, + * patches/openjdk/8020054-tzdata2013d.patch, + * patches/openjdk/8025255-tzdata2013g.patch: + Remove patches included upstream. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + * NEWS: Updated. + * patches/hotspot/hs23/remove_jsr292_tests.patch: + Regenerated. + * patches/hotspot/hs23/type_fixes.patch: + Remove threadLocalAllocBuffer.cpp hunk which is + no longer applicable. + +2015-01-19 Andrew John Hughes + + * patches/clean-crypto.patch: Removed; replaced by + inclusion of UNLIMITED_CRYPTO=true solution upstream. + * patches/openjdk/7122142-annotation_race_condition.patch, + * patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch: + Remove patches included upstream. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + (ICEDTEA_ENV): Set UNLIMITED_CRYPTO=true. + * NEWS: Updated. + * patches/openjdk/4963723-implement_sha-224.patch: + Regenerated following backport of 6647452 upstream. + * patches/openjdk/7044060-support_nsa_suite_b.patch: + Likewise. + * patches/openjdk/7106773-512_bits_rsa.patch: Likewise. + * patches/openjdk/8006935-long_keys_in_hmac_prf.patch: Likewise. + * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch: + Likewise. + * patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch: + Likewise. + +2015-01-05 Andrew John Hughes + + * patches/ecj/pr64174.patch: Drop the Lithuanian + changeover date now, as it's in the past. + +2014-12-04 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_ECJ_PATCHES): Add workaround for bug + in parsing end-of-year dates (Classpath PR64174). + * acinclude.m4: + (IT_PR64174_CHECK): Detect if the boot JDK suffers + from PR64174 and apply the patch if so. + * configure.ac: Call IT_PR64174_CHECK. + * patches/ecj/pr64174.patch: Drop the Latvian + Euro changeover date, which is in the past anyway, + and move Lithuania's two hours forward so it enters + 2015 and avoids the bug. + +2014-10-24 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b34. + 2014-12-05 Andrew John Hughes PR2125: Synchronise elliptic curves in diff -r 72968bfeb778 -r 15e9801d9167 Makefile.am --- a/Makefile.am Tue Jan 20 06:01:55 2015 +0000 +++ b/Makefile.am Tue Jan 20 11:35:12 2015 +0000 @@ -1,8 +1,8 @@ # Dependencies -OPENJDK_DATE = 14_oct_2014 -OPENJDK_SHA256SUM = cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293 -OPENJDK_VERSION = b33 +OPENJDK_DATE = 20_jan_2015 +OPENJDK_SHA256SUM = 13d1b4e1e152b6f9ad81b5558d6c7c0d3315a9e9494e49e515229722e2ee4e51 +OPENJDK_VERSION = b34 OPENJDK_URL = https://java.net/downloads/openjdk6/ CACAO_VERSION = 68fe50ac34ec @@ -345,7 +345,6 @@ patches/nomotif-mtoolkit.patch \ patches/alt-jar.patch \ patches/jdk-use-ssize_t.patch \ - patches/clean-crypto.patch \ patches/arch.patch \ patches/lc_ctype.patch \ patches/xjc.patch \ @@ -454,9 +453,7 @@ patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ - patches/openjdk/6706974-krb5_test_infrastructure.patch \ patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \ - patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \ patches/ScriptEngineManager-doc.patch \ patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \ patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch \ @@ -507,24 +504,6 @@ patches/openjdk/8014427-raster_regression.patch \ patches/openjdk/8014676-javadebugger_space_in_paths.patch \ patches/openjdk/8014968-OCSP_timeout_default.patch \ - patches/openjdk/6541350-tz_display_names_l10n.patch \ - patches/openjdk/6821191-tz_display_names_l10n.patch \ - patches/openjdk/6925851-pt_br.patch \ - patches/openjdk/6977550-tzdata2010l.patch \ - patches/openjdk/6996686-tzdata2010o.patch \ - patches/openjdk/7017800-tzdata2011b.patch \ - patches/openjdk/7027387-tzdata2011d.patch \ - patches/openjdk/7033174-tzdata2011e.patch \ - patches/openjdk/7035073-missing_pt_br_timezones.patch \ - patches/openjdk/7039469-tzdata2011g.patch \ - patches/openjdk/7090843-tzdata2011j.patch \ - patches/openjdk/7103108-tzdata2011l.patch \ - patches/openjdk/7104126-headers_tzdata.patch \ - patches/openjdk/7103405-correct_display_names.patch \ - patches/openjdk/7158483-tzdata2012c.patch \ - patches/openjdk/7198570-tzdata2012f.patch \ - patches/openjdk/8002225-tzdata2012i.patch \ - patches/openjdk/8009987-tzdata2013b.patch \ patches/openjdk/6636370-appcontext_simplification.patch \ patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \ patches/sparc-ptracefix.patch \ @@ -545,8 +524,6 @@ patches/print_lsb_release.patch \ patches/alternative_krb5_cache.patch \ patches/alternative_krb5_cache_fixup.patch \ - patches/openjdk/8014469-tzdata2013c.patch \ - patches/openjdk/8020054-tzdata2013d.patch \ patches/imageiojpeg_sync.patch \ patches/openjdk/8005194-scale_memory_leak.patch \ patches/openjdk/6563752-ss12_support.patch \ @@ -600,7 +577,6 @@ patches/hotspot/hs23/arm-hsdis.patch \ patches/openjdk/7025066-embedded_build.patch \ patches/s390_casts.patch \ - patches/openjdk/8025255-tzdata2013g.patch \ patches/d729448-32_bit_alignment.patch \ patches/windows-awt.patch \ patches/windows-jdk-sizecalc.patch \ @@ -618,9 +594,14 @@ patches/openjdk/7106773-512_bits_rsa.patch \ patches/pr1904-icedtea_and_distro_versioning.patch \ patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch \ - patches/openjdk/7122142-annotation_race_condition.patch \ - patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch \ - patches/openjdk/8000897-use_corresponding_digest_length.patch + patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch \ + patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch \ + patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch \ + patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch \ + patches/pr2070-type_punning_warnings.patch \ + patches/pr2082-s390_type_fixes.patch \ + patches/pr2096-4096-bit_dh.patch \ + patches/pr2179-avoid_x86_workaround_on_zero.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -741,6 +722,12 @@ ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch endif +# If date parsing bug is present, drop Lithuania and Latvia EUR transition +# dates as they are already in the past anyway. +if CP64174 +ICEDTEA_ECJ_PATCHES += patches/ecj/pr64174.patch +endif + ICEDTEA_ECJ_PATCHES += $(DISTRIBUTION_ECJ_PATCHES) # OpenJDK build environment. @@ -818,7 +805,8 @@ STATIC_CXX="false" \ BUILD_GCC=gcc$(GCC_SUFFIX) \ BUILD_CXX=g++$(GCC_SUFFIX) \ - COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" + COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \ + UNLIMITED_CRYPTO="true" if ENABLE_CACAO ICEDTEA_ENV += \ @@ -1223,8 +1211,7 @@ mkdir openjdk ; \ $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \ chmod -R ug+w openjdk ; \ - chmod +x $(builddir)/fsg.sh ; \ - sh $(builddir)/fsg.sh ; \ + sh $(abs_top_builddir)/fsg.sh ; \ fi endif endif diff -r 72968bfeb778 -r 15e9801d9167 NEWS --- a/NEWS Tue Jan 20 06:01:55 2015 +0000 +++ b/NEWS Tue Jan 20 11:35:12 2015 +0000 @@ -12,18 +12,173 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.13.6 (2015-01-XX): - +New in release 1.13.6 (2015-01-20): + +* Security fixes + - S8046656: Update protocol support + - S8047125, CVE-2015-0395: (ref) More phantom object references + - S8047130: Fewer escapes from escape analysis + - S8048035, CVE-2015-0400: Ensure proper proxy protocols + - S8049253: Better GC validation + - S8050807, CVE-2015-0383: Better performing performance data handling + - S8054367, CVE-2015-0412: More references for endpoints + - S8055304, CVE-2015-0407: More boxing for DirectoryComboBoxModel + - S8055309, CVE-2015-0408: RMI needs better transportation considerations + - S8055479: TLAB stability + - S8055489, CVE-2014-6585: Better substitution formats + - S8056264, CVE-2014-6587: Multicast support improvements + - S8056276, CVE-2014-6591: Fontmanager feature improvements + - S8057555, CVE-2014-6593: Less cryptic cipher suite management + - S8058982, CVE-2014-6601: Better verification of an exceptional invokespecial + - S8059485, CVE-2015-0410: Resolve parsing ambiguity + - S8061210, CVE-2014-3566: Issues in TLS +* Import of OpenJDK6 b34 + - OJ43: Backport JAX_WS-945; Socket backlog may be limiting lwhs performance + - OJ44: Add missing TimeZone test cases included in OpenJDK 7 revision 0. + - OJ45: Fix copyright headers on imported files + - OJ46: Fix lost Classpath exception + - OJ47: Remove @Override annotation on interfaces added by 2015/01/20 security fixes. + - OJ48: Fix substitution error. + - OJ49: Fix placement of 8023956 fix. + - OJ50: Fix reference to missing pd_attempt_reserve_memory_at + - S4873188: Support TLS 1.1 + - S6364329: jstat displays "invalid argument count" with usage + - S6461635: [TESTBUG] BasicTests.sh test fails intermittently + - S6507067: TimeZone country/area message error + - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec + - S6578647: Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication() + - S6585666: Spanish language names not compliant with CLDR + - S6587676: Krb5LoginModule failure if useTicketCache=true on Vista + - S6608572: Currency change for Malta and Cyprus + - S6610748: Dateformat - AM-PM indicator in Finnish appears to be from English + - S6627549: ISO 3166 code addition: Saint Barthelemy and Saint Martin + - S6631048: Problem when writing on output stream of HttpURLConnection + - S6641309: Wrong Cookie separator used in HttpURLConnection + - S6641312: Fix krb5 codes indentation problems + - S6645271: Wrong date format for Croatian (hr) locale + - S6646611: Incorrect spelling of month name in locale for Belarusian language ("be", "BY") + - S6647452: Remove obfuscation, framework and provider self-verification checking + - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems + - S6659779: HttpURLConnections logger should log tunnel requests + - S6670362: HTTP/SPNEGO should work across realms + - S6716626: Integrate contributed language and country names for NL + - S6720866: Slow performance using HttpURLConnection for upload + - S6726695: HttpURLConnection shoul support 'Expect: 100-continue' headers for PUT + - S6729881: Compiler warning in networking native code + - S6765491: Krb5LoginModule a little too restrictive, and the doc is not clear. + - S6776102: sun/util/resources/TimeZone/Bug6317929.java test failed against 6u12b01 and passed against 6u11b03 + - S6786276: Locale.getISOCountries() still contains country code "CS" + - S6792180: Enhance to reject weak algorithms or conform to crypto recommendations + - S6811297: Add more logging to HTTP protocol handler + - S6822460: support self-issued certificate + - S6830658: Changeset 67e5d3e41b5b breaks the fastdebug build in NativeCreds.c + - S6835668: Use of /usr/include/linux/ files creates a dependence on kernel-headers + - S6855297: Windows build breaks after 6811297 + - S6856856: NPE in HTTP protocol handler logging + - S6868106: Ukrainian currency has wrong format + - S6870908: reopen bug 4244752: month names in Estonian should be lowercase + - S6873931: New Turkish currency since 2009 + - S6882594: Remove static dependancy on NTLM authentication + - S6899503: Security code issue using Verisign root certificate + - S6910489: Slovenia Locale, wrong firstDayOfWeek number + - S6911104: Tests do not work with CYGWIN: tools, sun/tools, and com/sun/tools + - S6914413: abbreviation name for November is not correct in be_BY + - S6916787: Ukrainian currency name needs to be fixed + - S6919624: minimalDaysInFirstWeek ressource for hungarian is wrong + - S6931564: Incorrect display name of Locale for south africa + - S6931566: NetworkInterface is not working when interface name is more than 15 characters long + - S6938454: 2 new testcases for bug: Unable to determine generic type in program that compiles under Java 6 + - S6938454: Unable to determine generic type in program that compiles under Java 6 + - S6945604: wrong error message in CardImpl.java + - S6962617: Testcase changes, cleanup of problem list for jdk_tools targets + - S6964714: NetworkInterface getInetAddresses enumerates IPv6 addresses if java.net.preferIPvStack property set + - S6967937: Scope id no longer being set after 6931566 + - S6972374: NetworkInterface.getNetworkInterfaces throws "java.net.SocketException" on Solaris zone + - S6976117: SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets without TLSv1.1 enabled + - S7001720: copyright templates not rebranded + - S7019267: Currency Display Names are not localized into pt_BR. + - S7020583: Some currency names are missing in some locales + - S7020960: CurrencyNames_sr_RS.properties is missing. + - S7022269: clean up fscanf usage in Linux networking native code + - S7025837: fix plural currency display names in sr_Latn_(BA|ME|RS).properties + - S7028073: The currency symbol for Peru is wrong + - S7035555: 4/4 attach/BasicTests.sh needs another tweak for Cygwin + - S7036025: java.security.AccessControlException when creating JFileChooser in signed applet + - S7036905: [de] dem - the german mark display name is incorrect + - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true + - S7066203: Update currency data to the latest ISO 4217 standard + - S7077119: remove past transition dates from CurrencyData.properties file + - S7085757: Currency Data: ISO 4217 Amendment 152 + - S7122142, RH1151372: (ann) Race condition between isAnnotationPresent and getAnnotations + - S7153184: NullPointerException when calling SSLEngineImpl.getSupportedCipherSuites + - S7161796, RH1151372: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror + - S7171028: dots are missed in the datetime for Slovanian + - S7174244: NPE in Krb5ProxyImpl.getServerKeys() + - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations + - S7189611: Venezuela current Currency should be Bs.F. + - S7195759: ISO 4217 Amendment 154 + - S7199066: Typo in method name + - S7201205: Add Makefile configuration option to build with unlimited crypto in OpenJDK. + - S8005232: (JEP-149) Class Instance size reduction + - S8006748: getISO3Country() returns wrong value + - S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale + - S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE + - S8015570: Use long comparison in Rule.getRules(). + - S8021121: ISO 4217 Amendment Number 156 + - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address + - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws java.lang.IllegalStateException: unexpected condition + - S8023956: Provide a work-around to broken Linux 32 bit "Exec Shield" using CS for NX emulation (crashing with SI_KERNEL) + - S8025051: Update resource files for TimeZone display names + - S8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing + - S8027359: XML parser returns incorrect parsing results + - S8027370: Support tzdata2013h + - S8027695: There should be a space before % sign in Swedish locale + - S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings + - S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions + - S8029153: [TESTBUG] test/compiler/7141637/SpreadNullArg.java fails because it expects NullPointerException + - S8029318: Native Windows ccache still reads DES tickets + - S8030822: (tz) Support tzdata2013i + - S8031046: Native Windows ccache might still get unsupported ticket + - S8032788: ImageIcon constructor throws an NPE and hangs when passed a null String parameter + - S8032909: XSLT string-length returns incorrect length when string includes complementary chars + - S8035613: With active Securitymanager JAXBContext.newInstance fails + - S8037012: (tz) Support tzdata2014a + - S8038306: (tz) Support tzdata2014b + - S8040617: [macosx] Large JTable cell results in a OutOfMemoryException + - S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser + - S8043012: (tz) Support tzdata2014c + - S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX + - S8049250: Need a flag to invert the Card.disconnect(reset) argument + - S8049343: (tz) Support tzdata2014g + - S8050485: super() in a try block in a ctor causes VerifyError + - S8051012: Regression in verifier for method call from inside of a branch + - S8051614: smartcardio TCK tests fail due to lack of 'reset' permission + - S8054367: More references for endpoints + - S8055222: Currency update needed for ISO 4217 Amendment #159 + - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure + - S8058715: stability issues when being launched as an embedded JVM via JNI + - S8059206: (tz) Support tzdata2014i + - S8060474: Resolve more parsing ambiguity + - S8061826: Part of JDK-8060474 should be reverted + - S8062561: Test bug8055304 fails if file system default directory has read access + - S8062807: Exporting RMI objects fails when run under restrictive SecurityManager + - S8064560: (tz) Support tzdata2014j * Backports - - S7122142, RH1151372: (ann) Race condition between isAnnotationPresent and getAnnotations - - S7161796, RH1151372: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror - - S8000897, RH1155012: VM crash in CompileBroker + - S8000897, PR2173, RH1155012: VM crash in CompileBroker + - S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object + - S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. + - S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge * Bug fixes - PR1831: Drop version requirement for LCMS 2 - PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library - PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop - PR2062: Unset OS before running OpenJDK build + - PR2070: Type-punning warnings still evident on RHEL 5 + - PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). + - PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure - PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS + - PR2179: Avoid x86 workaround when running Zero rather than a JIT + - PR2180: Old autotools dislike $(builddir)/fsg.sh New in release 1.13.5 (2014-10-14): diff -r 72968bfeb778 -r 15e9801d9167 acinclude.m4 --- a/acinclude.m4 Tue Jan 20 06:01:55 2015 +0000 +++ b/acinclude.m4 Tue Jan 20 11:35:12 2015 +0000 @@ -2317,3 +2317,49 @@ AC_MSG_RESULT([$enable_werror]) AM_CONDITIONAL([ENABLE_WERROR], test x"${enable_werror}" = "xyes") ]) + +AC_DEFUN_ONCE([IT_PR64174_CHECK],[ +AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK]) +AC_CACHE_CHECK([if java.text.SimpleDateFormat exhibits Classpath bug 64174], it_cv_cp64174, [ + CLASS=Test.java + BYTECODE=$(echo $CLASS|sed 's#\.java##') + mkdir tmp.$$ + cd tmp.$$ + cat << \EOF > $CLASS +[/* [#]line __oline__ "configure" */ +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Locale; +import java.util.TimeZone; + +public class Test +{ + public static void main(String[] args) + throws ParseException + { + SimpleDateFormat format; + + format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US); + format.setTimeZone(TimeZone.getTimeZone("GMT")); + format.setLenient(false); + System.out.println(format.parse("2014-12-31-22-00-00")); + } +}] +EOF + if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_cp64174=no; + else + it_cv_cp64174=yes; + fi + else + it_cv_cp64174=yes; + fi + rm -f $CLASS *.class + cd .. + rmdir tmp.$$ From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 21:40:45 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 21:40:45 +0000 Subject: [Bug 2177] [IcedTea6] Backport 8028623 so servicability agent works with apps using non-ASCII characters In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2177 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=58418f99312a author: Andrew John Hughes date: Tue Jan 20 06:16:12 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 21:40:50 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 21:40:50 +0000 Subject: [Bug 2082] [IcedTea6] Build fails on s390 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2082 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=58418f99312a author: Andrew John Hughes date: Tue Jan 20 06:16:12 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 21:40:53 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 21:40:53 +0000 Subject: [Bug 2096] [IcedTea6] 2048-bit DH upper bound too small for Fedora infrastructure In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2096 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=58418f99312a author: Andrew John Hughes date: Tue Jan 20 06:16:12 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 21:40:55 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 21:40:55 +0000 Subject: [Bug 2070] [IcedTea6] Type-punning warnings still evident on RHEL 5 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2070 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=58418f99312a author: Andrew John Hughes date: Tue Jan 20 06:16:12 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 21:40:59 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 21:40:59 +0000 Subject: [Bug 2173] [IcedTea6] Backport "8000897: VM crash in CompileBroker" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2173 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=58418f99312a author: Andrew John Hughes date: Tue Jan 20 06:16:12 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 21:41:02 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 21:41:02 +0000 Subject: [Bug 2174] [IcedTea6] Backport "8020190: Wrong argument passed to setupFTContext" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2174 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=58418f99312a author: Andrew John Hughes date: Tue Jan 20 06:16:12 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 21:41:07 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 21:41:07 +0000 Subject: [Bug 2179] [IcedTea6] Avoid x86 workaround when running Zero rather than a JIT In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2179 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=ff4779d28676 author: Andrew John Hughes date: Tue Jan 20 08:21:36 2015 +0000 Update tarball to include x86 build fix and backport workaround for Zero from IcedTea 2.x. PR2179: Avoid x86 workaround when running Zero rather than a JIT Upstream changes: - OJ49: Fix placement of 8023956 fix. 2015-01-19 Andrew John Hughes * Makefile.am: (OPENJDK_SHA256SUM): Update for new b34 tarball. (ICEDTEA_PATCHES): Add fix for PR2179. * NEWS: Updated. * patches/pr2179-avoid_x86_workaround_on_zero.patch: Don't apply 8023956 when building Zero on x86. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 21:41:12 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 21:41:12 +0000 Subject: [Bug 2180] [IcedTea6] Old autotools dislike $(builddir)/fsg.sh In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2180 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=15e9801d9167 author: Andrew John Hughes date: Tue Jan 20 11:35:12 2015 +0000 PR2180: Old autotools dislike $(builddir)/fsg.sh 2015-01-19 Andrew John Hughes * Makefile.am: (extract-openjdk): Use abs_top_builddir instead of builddir to please older versions of autotools. No need to set fsg.sh executable either as we run it via sh. * NEWS: Updated. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 20 22:26:19 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 20 Jan 2015 22:26:19 +0000 Subject: [Bug 2181] [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2181 --- Comment #4 from Andrew John Hughes --- That's why I opened this bug. It's too late to go in this update, but we'll fix it in the April one. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitne at gmx.de Wed Jan 21 00:10:54 2015 From: gitne at gmx.de (Jacob Wisor) Date: Wed, 21 Jan 2015 01:10:54 +0100 Subject: [rfc][icedtea-web] Use File for cache directory instead of String In-Reply-To: <270001418.8700694.1421686510220.JavaMail.zimbra@redhat.com> References: <856376568.7481817.1421349473251.JavaMail.zimbra@redhat.com> , <270001418.8700694.1421686510220.JavaMail.zimbra@redhat.com> Message-ID: On 01/19/2015 at 05:55 PM Jie Kang wrote: > > ----- Original Message ----- > > Hello there! > > > > On 01/15/2015 at 08:17 PM Jie Kang wrote: > > > Hello, > > > > > > This patch changes the type of cacheDir from String to File. > > > > > > This patch is a changeset on top of the patch "Allow cache directory to be > > > changed during runtime" discussed here[1]. Both patches have been attached > > > for > > > convenience. > > > > > > [1] > > > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030316.html > > > > > > Patch order: HEAD -->> itw-change-cache-location -->> > > > itw-cache-string-to-file > > > > > > > > > How does it look? > > > > A few things: > > > > > diff --git a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > > > b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > > > --- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > > > +++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > > > [?] > > > @@ -80,11 +80,11 @@ > > > > > > private CacheLRUWrapper() { > > > String setCachePath = > > > JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR); > > > - String cacheDir = new File(setCachePath != null ? setCachePath : > > > System.getProperty("java.io.tmpdir")).getPath(); > > > + File cacheDir = new File(setCachePath != null ? setCachePath : > > > System.getProperty("java.io.tmpdir")); > > > setupCacheDir(cacheDir); > > > } > > > > > > - private void setupCacheDir(String cacheDir) { > > > + private void setupCacheDir(File cacheDir) { > > > this.cacheDir = cacheDir; > > > cacheOrder = new PropertiesFile( > > > new File(cacheDir + File.separator + > > > CACHE_INDEX_FILE_NAME)); > > > > Warning! "cacheDir + File.separator + CACHE_INDEX_FILE_NAME" evaluates to > > "cacheDir.toString() + File.separator + CACHE_INDEX_FILE_NAME". > > You should carefully check other locations where CacheLRUWrapper.cacheDir > > might > > evaluate to File.toString() instead of File.getPath(). Or, where rather > > File.toPath() should be used. > > > File.toString() == File.getPath() [1]. But I have added .getPath() to all locations where it is unclear to be more explicit. > > [1] http://docs.oracle.com/javase/7/docs/api/java/io/File.html#toString() > > > > > > @@ -152,7 +152,7 @@ > > > > > > // 2. check path format - does the path look correct? > > > if (path != null) { > > > - if (path.indexOf(cacheDir) < 0) { > > > + if (path.indexOf(cacheDir.getPath()) < 0) { > > > it.remove(); > > > modified = true; > > > } > > > > Is this piece of code still required after CacheLRUWrapper.cacheDir has been > > changed to java.io.File? java.io.File already does proper system specific > > path > > syntax checking internally upon construction. > > Yes it's still required. This code has nothing to do with 'proper system > specific path syntax checking'. It is validating all the entries in the LRU > file to make sure they seem sane. In this case, it is making sure the entry in > the LRU is actually in the cache directory. > > Whether or not this is the 'best' way to do this is up for debate, but it isn't > in the scope of this patch. I disagree, this is actually exactly the scope of this patch. By "objectifying" the raw path strings there is a natural impetus for making use of the opertaions defined for File objects. Otherwise, there would be little sane reason to change the existing code. Simply changing a variable's datatype in order to constantly convert back to the previously declared datatype during runtime to perform string operations is a zero sum game regarding all aspects, espacially performance, code readability, maintainability, correctness, and robustness. Obviously, performance is not the main aspect which is going to benefit most from this change, nor should be the motivation behind it. Hence, the existing algorithms dealing with this variable should be adapted to the new datatype. Because again, otherwise this change does not make any sense. > > > @@ -206,7 +206,7 @@ > > > } > > > > > > private String getIdForCacheFolder(String folder) { > > > - int len = cacheDir.length(); > > > + int len = cacheDir.getPath().length(); > > > int index = folder.indexOf(File.separatorChar, len + 1); > > > return folder.substring(len + 1, index); > > > } > > > > Err, I do not want to sound like a smart ass but this whole ID collocation in > > a > > file path scheme looks bogous and error prone to me. > > Warning! folder.length() may be smaller than cacheDir.length() + 1! So, > > getting > > the ID by analyzing a File object's String path instead of using > > File.toPath() > > since JDK?1.7 is probably not the safest thing to do. > > > > > [?] > > > diff --git a/netx/net/sourceforge/jnlp/cache/CacheUtil.java > > > b/netx/net/sourceforge/jnlp/cache/CacheUtil.java > > > --- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java > > > +++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java > > > [?] > > > @@ -319,7 +319,7 @@ > > > * Get the path to file minus the cache directory and indexed folder. > > > */ > > > private static String pathToURLPath(String path) { > > > - int len = lruHandler.getCacheDir().length(); > > > + int len = lruHandler.getCacheDir().getPath().length(); > > > int index = path.indexOf(File.separatorChar, len + 1); > > > return path.substring(index); > > > } > > > > Again, this is probably not the safest thing to do since we have > > java.nio.file.Path since JDK 1.7 at our disposal. Beware though that > > java.nio.file.Path is a system dependent representation of a path. If you > > really want to be system independent you probably gonna have to stick to > > URIs. > > However, only URIs having the "file:" scheme should be or rather must be > > allowed for cached resources in order to prevent malicious code from loading > > supposedly cached resources from arbitrary network locations. > > > > > @@ -332,7 +332,7 @@ > > > String path = filePath; > > > String tempPath = ""; > > > > > > - String cacheDir = lruHandler.getCacheDir(); > > > + String cacheDir = lruHandler.getCacheDir().getPath(); > > > > > > while(path.startsWith(cacheDir) && !path.equals(cacheDir)){ > > > tempPath = new File(path).getParent(); > > > > Same goes here for parsing path Strings. Strangely, the last line seems to be > > doing it the safe way, yet does not use the even safer way by calling > > File.getParentFile(). > > > > > @@ -567,7 +567,7 @@ > > > * rStr first becomes: > > > /0/http/www.example.com/subdir/a.jar > > > * then rstr becomes: /home/user1/.icedtea/cache/0 > > > */ > > > - String rStr = > > > file.getPath().substring(lruHandler.getCacheDir().length()); > > > + String rStr = > > > file.getPath().substring(lruHandler.getCacheDir().getPath().length()); > > > rStr = lruHandler.getCacheDir() + rStr.substring(0, > > > rStr.indexOf(File.separatorChar, 1)); > > > long len = file.length(); > > > > This is very difficult to read and understand. Besides, there are multiple > > unneccessary calls to CacheLRUWrapper.getCacheDir() and multiple assignments > > to rStr. > > > The three comments above have been noted, however they aren't in the scope of > this patch. > > At the moment the caching code makes a huge number of assumptions on the > correctness of the cache on the file-system. This is obviously a bad idea but > surprisingly has led to only a few bugs, afaik. Work can be done in this area > and your comments are reasonable, but the changes will definitely not be in > this patch. Yep, it also makes hefty assumptions on proper pathname strings, and the absolute location they point to. So, the code /does/ require more attention than just changing a variable's datatype. > > > [?] > > > public class CacheLRUWrapperTest { > > > > > > private static final CacheLRUWrapper clw = > > > CacheLRUWrapper.getInstance(); > > > - private static String cacheDirBackup; > > > + private static File cacheDirBackup; > > > private static PropertiesFile cacheOrderBackup; > > > // does no DeploymentConfiguration exist for this file name? > > > private static final String cacheIndexFileName = > > > CacheLRUWrapper.CACHE_INDEX_FILE_NAME + "_testing"; > > > @@ -72,7 +72,7 @@ > > > static public void setupJNLPRuntimeConfig() { > > > cacheDirBackup = clw.cacheDir; > > > cacheOrderBackup = clw.cacheOrder; > > > - clw.cacheDir=System.getProperty("java.io.tmpdir"); > > > + clw.cacheDir = new File(System.getProperty("java.io.tmpdir")); > > > clw.cacheOrder = new PropertiesFile( new File(clw.cacheDir + > > > File.separator + cacheIndexFileName)); > > > > Watch it here! > > > > clw.cacheDir + File.separator + cacheIndexFileName > > > > evaluates to > > > > clw.cacheDir.toString() + File.separator + cacheIndexFileName > > > > What you probably have meant was > > > > clw.cacheDir.getPath() + File.separator + cacheIndexFileName > > > > > [?] > > > diff --git > > > a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > > > b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > > > --- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > > > +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > > > @@ -445,8 +445,6 @@ > > > Assert.assertTrue(u.getQuery().contains("version-id=1.0")); > > > } > > > > > > - private static String cacheDir; > > > - > > > @BeforeClass > > > public static void setupDownloadServer() throws IOException { > > > File dir = new File(System.getProperty("java.io.tmpdir"), > > > "itw-down"); > > > @@ -456,8 +454,8 @@ > > > downloadServer = > > > ServerAccess.getIndependentInstance(dir.getAbsolutePath(), > > > ServerAccess.findFreePort()); > > > redirectErrBack(); > > > > > > - String tempCache = System.getProperty("java.io.tmpdir") + > > > File.separator + "tempcache"; > > > - CacheUtil.setCacheDir(tempCache); > > > + File tempCacheDir = new File(System.getProperty("java.io.tmpdir") > > > + > > > File.separator + "tempcache"); > > > + CacheUtil.setCacheDir(tempCacheDir); > > > } > > > > > > @AfterClass > > > @@ -465,7 +463,8 @@ > > > downloadServer.stop(); > > > > > > CacheUtil.clearCache(); > > > - > > > CacheUtil.setCacheDir(JNLPRuntime.getConfiguration().getProperty(Dep > > > loymentConfiguration.KEY_USER_CACHE_DIR)); > > > + File defaultCacheDir = new > > > File(JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_U > > > SER_CACHE_DIR)); > > > + CacheUtil.setCacheDir(defaultCacheDir); > > > > I am bit confused here. CacheUtil.setCacheDir(File) does not seem to exist. > > I am confused too since it exists for me in 'itw-cache-string-to-file-1.patch'. > > @@ -622,11 +622,11 @@ > } > } > > - protected static void setCacheDir(String cacheDir) { > + protected static void setCacheDir(File cacheDir) { > lruHandler.setCacheDir(cacheDir); > } > > > > Attached is an updated patch that replaces all the uses of File.toString() with > File.getPath(). Good catch with that one as it's more explicit now. > > How does it look? I think it looks okay. Have you run any synthetic and real world tests? Regards, Jacob From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 01:20:12 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 01:20:12 +0000 Subject: [Bug 2182] New: [IcedTea6] 6911104 reintroduces test fragment removed in existing 6964018 backport Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2182 Bug ID: 2182 Summary: [IcedTea6] 6911104 reintroduces test fragment removed in existing 6964018 backport Product: IcedTea Version: 6-1.13.6 Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org gnu_andrew: the 6911104 patch in jdk6 adds a duplicate CYGWIN entry in test/sun/tools/common/CommonSetup.sh -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 01:20:48 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 01:20:48 +0000 Subject: [Bug 2182] [IcedTea6] 6911104 reintroduces test fragment removed in existing 6964018 backport In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2182 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |omajid at redhat.com Target Milestone|--- |6-1.13.7 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 01:34:23 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 01:34:23 +0000 Subject: [Bug 2183] New: [IcedTea6] Complete backport of 7031830, accidentally included in 4873188 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2183 Bug ID: 2183 Summary: [IcedTea6] Complete backport of 7031830, accidentally included in 4873188 Product: IcedTea Version: 6-1.13.6 Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org quick question about that: the jdk7 version of the patch does not include this bit: 'int arrayOffset = bb.arrayOffset();' The backport of 4873188 accidentally included a hunk from 7031830 which is present in the IcedTea 2.5.x sources for the same file. The patch is worth having, so rather than reverting, we should include the remaining hunk (same change to another method in the same file) and test case as well. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 01:35:01 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 01:35:01 +0000 Subject: [Bug 2183] [IcedTea6] Complete backport of 7031830, accidentally included in 4873188 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2183 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |omajid at redhat.com Target Milestone|--- |6-1.13.7 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Wed Jan 21 03:54:17 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Jan 2015 03:54:17 +0000 Subject: /hg/release/icedtea7-2.5: 2 new changesets Message-ID: changeset e4cedb2051e9 in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=e4cedb2051e9 author: Andrew John Hughes date: Tue Jan 06 20:32:24 2015 +0000 Add reference to Gentoo bug for currency date issue. 2015-01-06 Andrew John Hughes * NEWS: Add reference to Gentoo bug for currency date issue. changeset 5ecf54fa7dcd in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=5ecf54fa7dcd author: Andrew John Hughes date: Wed Jan 21 03:46:59 2015 +0000 Bump to icedtea-2.5.4. S6461635: [TESTBUG] BasicTests.sh test fails intermittently S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true S7183753: [TEST] Some colon in the diff for this test S8025051: Update resource files for TimeZone display names S8031046: Native Windows ccache might still get unsupported ticket S8040617: [macosx] Large JTable cell results in a OutOfMemoryException S8041572: [macosx] huge native memory leak in AWTWindow.m S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser S8043610: Sorting columns in JFileChooser fails with AppContext NPE S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX S8046656: Update protocol support S8047125, CVE-2015-0395: (ref) More phantom object references S8047130: Fewer escapes from escape analysis S8048035, CVE-2015-0400: Ensure proper proxy protocols S8049250: Need a flag to invert the Card.disconnect(reset) argument S8049253: Better GC validation S8049343: (tz) Support tzdata2014g S8049758: Increment minor version of HSx for 7u75 and initialize the build number S8050807, CVE-2015-0383: Better performing performance data handling S8051359: JPopupMenu creation in headless mode with JDK9b23 causes NPE S8051614: smartcardio TCK tests fail due to lack of 'reset' permission S8054367, CVE-2015-0412: More references for endpoints S8055304, CVE-2015-0407: More boxing for DirectoryComboBoxModel S8055309, CVE-2015-0408: RMI needs better transportation considerations S8055479: TLAB stability S8055489, CVE-2014-6585: Better substitution formats S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure S8056264, CVE-2014-6587: Multicast support improvements S8056276, CVE-2014-6591: Fontmanager feature improvements S8057555, CVE-2014-6593: Less cryptic cipher suite management S8058715: stability issues when being launched as an embedded JVM via JNI S8058982, CVE-2014-6601: Better verification of an exceptional invokespecial S8059206: (tz) Support tzdata2014i S8059485, CVE-2015-0410: Resolve parsing ambiguity S8060474: Resolve more parsing ambiguity S8061210, CVE-2014-3566: Issues in TLS S8061685: Increment hsx 24.75 build to b02 for 7u75-b06 S8061785: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge S8061826: Part of JDK-8060474 should be reverted S8062561: Test bug8055304 fails if file system default directory has read access S8062807: Exporting RMI objects fails when run under restrictive SecurityManager S8064300: Increment hsx 24.75 build to b03 for 7u75-b06 S8064560: (tz) Support tzdata2014j S8065608: 7u75 l10n resource file translation update S8065787: Increment hsx 24.75 build to b04 for 7u75-b10 S8066747: Backing out Japanese translation change in awt_ja.properties 2015-01-20 Andrew John Hughes * Makefile.am: (JDK_UPDATE_VERSION): Bump to 75. (BUILD_VERSION): Bump to b13. (CORBA_CHANGESET): Update to icedtea-2.5.4. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.5.4. * hotspot.map.in: Update to icedtea-2.5.4. * patches/boot/ecj-diamond.patch: Regenerated. Add new cases introduced in sun.security.ssl.ProtocolVersion and sun.security.ssl.SSLContextImpl * patches/boot/ecj-trywithresources.patch: Add new case in sun.security.krb5.internal.ccache.FileCredentialsCache. Change is taken from the OpenJDK 6 version of the file. diffstat: ChangeLog | 36 + Makefile.am | 28 +- NEWS | 49 +- configure.ac | 2 +- hotspot.map.in | 2 +- patches/boot/ecj-diamond.patch | 1181 +++++++++++++++--------------- patches/boot/ecj-trywithresources.patch | 84 ++ 7 files changed, 785 insertions(+), 597 deletions(-) diffs (truncated from 3469 to 500 lines): diff -r 854c59d6cfd5 -r 5ecf54fa7dcd ChangeLog --- a/ChangeLog Tue Jan 06 18:28:08 2015 +0000 +++ b/ChangeLog Wed Jan 21 03:46:59 2015 +0000 @@ -1,3 +1,39 @@ +2015-01-20 Andrew John Hughes + + * Makefile.am: + (JDK_UPDATE_VERSION): Bump to 75. + (BUILD_VERSION): Bump to b13. + (CORBA_CHANGESET): Update to icedtea-2.5.4. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Updated. + * configure.ac: Bump to 2.5.4. + * hotspot.map.in: Update to icedtea-2.5.4. + * patches/boot/ecj-diamond.patch: + Regenerated. Add new cases introduced in + sun.security.ssl.ProtocolVersion and + sun.security.ssl.SSLContextImpl + * patches/boot/ecj-trywithresources.patch: + Add new case in + sun.security.krb5.internal.ccache.FileCredentialsCache. + Change is taken from the OpenJDK 6 version of + the file. + +2015-01-06 Andrew John Hughes + + * NEWS: + Add reference to Gentoo bug for currency + date issue. + 2015-01-05 Andrew John Hughes * Makefile.am: diff -r 854c59d6cfd5 -r 5ecf54fa7dcd Makefile.am --- a/Makefile.am Tue Jan 06 18:28:08 2015 +0000 +++ b/Makefile.am Wed Jan 21 03:46:59 2015 +0000 @@ -1,22 +1,22 @@ # Dependencies -JDK_UPDATE_VERSION = 71 -BUILD_VERSION = b14 +JDK_UPDATE_VERSION = 75 +BUILD_VERSION = b13 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = b894abb26bbf -JAXP_CHANGESET = 95795ef2016e -JAXWS_CHANGESET = c604500818da -JDK_CHANGESET = 4a7c0da7e219 -LANGTOOLS_CHANGESET = 412a4f8c67e8 -OPENJDK_CHANGESET = 1bcd6e8a9bc0 +CORBA_CHANGESET = 3c9f523bf96e +JAXP_CHANGESET = ca26767d3375 +JAXWS_CHANGESET = 9a6c90336922 +JDK_CHANGESET = 1e6db4f8b0f3 +LANGTOOLS_CHANGESET = 960cdffa8b3f +OPENJDK_CHANGESET = 6cf2880aab5e -CORBA_SHA256SUM = 186b1b89345d6bd55bedf4f0fe698b5d0b01dbd80fc09991390acc22eb2e4b60 -JAXP_SHA256SUM = 08aed5ef796520bebebd8de66000fd4541390f061c663ac4b7134ffd8ca62360 -JAXWS_SHA256SUM = 0ef87b304ecc345a49367280be4b172b4b3ea7616f6f3a9f34a7dd84b88781d4 -JDK_SHA256SUM = 16d8ed6f93b15c516d76b1f92e5284957eb47a05d11a319d17eb312ac0231ad2 -LANGTOOLS_SHA256SUM = c78ca45bfb184c855532e41bc55939bdc221110ef2dca08f86593f80ef8fa4c8 -OPENJDK_SHA256SUM = 6c6865742d6196cab82db424698d1f42b010cc33c0bb3dc9c2fbf6926e32a6aa +CORBA_SHA256SUM = 7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b +JAXP_SHA256SUM = 84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3 +JAXWS_SHA256SUM = 4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b +JDK_SHA256SUM = e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09 +LANGTOOLS_SHA256SUM = 4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a +OPENJDK_SHA256SUM = 88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1 DROP_URL = http://icedtea.classpath.org/download/drops diff -r 854c59d6cfd5 -r 5ecf54fa7dcd NEWS --- a/NEWS Tue Jan 06 18:28:08 2015 +0000 +++ b/NEWS Wed Jan 21 03:46:59 2015 +0000 @@ -14,11 +14,32 @@ New in release 2.5.4 (2015-01-XX): +* Security fixes + - S8046656: Update protocol support + - S8047125, CVE-2015-0395: (ref) More phantom object references + - S8047130: Fewer escapes from escape analysis + - S8048035, CVE-2015-0400: Ensure proper proxy protocols + - S8049253: Better GC validation + - S8050807, CVE-2015-0383: Better performing performance data handling + - S8054367, CVE-2015-0412: More references for endpoints + - S8055304, CVE-2015-0407: More boxing for DirectoryComboBoxModel + - S8055309, CVE-2015-0408: RMI needs better transportation considerations + - S8055479: TLAB stability + - S8055489, CVE-2014-6585: Better substitution formats + - S8056264, CVE-2014-6587: Multicast support improvements + - S8056276, CVE-2014-6591: Fontmanager feature improvements + - S8057555, CVE-2014-6593: Less cryptic cipher suite management + - S8058982, CVE-2014-6601: Better verification of an exceptional invokespecial + - S8059485, CVE-2015-0410: Resolve parsing ambiguity + - S8061210, CVE-2014-3566: Issues in TLS * Backports + - S6461635: [TESTBUG] BasicTests.sh test fails intermittently - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems - S7028073: The currency symbol for Peru is wrong - - S7077119, PR2165: remove past transition dates from CurrencyData.properties file + - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true + - S7183753: [TEST] Some colon in the diff for this test + - S7077119, PR2165, G534118: remove past transition dates from CurrencyData.properties file - S7085757: Currency Data: ISO 4217 Amendment 152 - S7169142: CookieHandler does not work with localhost - S7172012, PR2067: Make test-in-build an option (Queens) @@ -34,12 +55,14 @@ - S8021121: ISO 4217 Amendment Number 156 - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws java.lang.IllegalStateException: unexpected condition + - S8025051: Update resource files for TimeZone display names - S8026792: HOTSPOT: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated. - S8027359: XML parser returns incorrect parsing results - S8028623, PR2112, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. - S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings - S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions - S8029153: [TESTBUG] test/compiler/7141637/SpreadNullArg.java fails because it expects NullPointerException + - S8031046: Native Windows ccache might still get unsupported ticket - S8031502: JSR292: IncompatibleClassChangeError in LambdaForm for CharSequence.toString() method handle type converter - S8032078: [macosx] CPlatformWindow.setWindowState throws RuntimeException, if windowState=ICONIFIED|MAXIMIZED_BOTH - S8032669: Mouse release not being delivered to Swing component in 7u45 @@ -48,12 +71,36 @@ - S8034200: Test java/net/CookieHandler/LocalHostCookie.java fails after fix of JDK-7169142 - S8036863: Update jdk7 testlibrary to match jdk8 in hotspot - S8040168: Set hotspot version to hs24.66 and build to b01 for 7u66 + - S8040617: [macosx] Large JTable cell results in a OutOfMemoryException - S8041132: Increment hsx 24.66 build to b02 for 7u66-b09 - S8041408: Increment hsx 24.55 build to b04 for 7u55-b34 + - S8041572: [macosx] huge native memory leak in AWTWindow.m + - S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser + - S8043610: Sorting columns in JFileChooser fails with AppContext NPE - S8044603: Increment minor version of HSx for 7u71 and initialize the build number + - S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX + - S8049250: Need a flag to invert the Card.disconnect(reset) argument + - S8049343: (tz) Support tzdata2014g + - S8049758: Increment minor version of HSx for 7u75 and initialize the build number - S8050485: super() in a try block in a ctor causes VerifyError + - S8051359: JPopupMenu creation in headless mode with JDK9b23 causes NPE + - S8051614: smartcardio TCK tests fail due to lack of 'reset' permission - S8055222: Currency update needed for ISO 4217 Amendment #159 + - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure - S8057184: JCK8's api/javax_swing/JDesktopPane/descriptions.html#getset failed with GTKLookAndFeel on Linux and Solaris + - S8058715: stability issues when being launched as an embedded JVM via JNI + - S8059206: (tz) Support tzdata2014i + - S8060474: Resolve more parsing ambiguity + - S8061685: Increment hsx 24.75 build to b02 for 7u75-b06 + - S8061785: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge + - S8061826: Part of JDK-8060474 should be reverted + - S8062561: Test bug8055304 fails if file system default directory has read access + - S8062807: Exporting RMI objects fails when run under restrictive SecurityManager + - S8064300: Increment hsx 24.75 build to b03 for 7u75-b06 + - S8064560: (tz) Support tzdata2014j + - S8065608: 7u75 l10n resource file translation update + - S8065787: Increment hsx 24.75 build to b04 for 7u75-b10 + - S8066747: Backing out Japanese translation change in awt_ja.properties - S8067364, PR2145, RH114622: Printing to Postscript doesn't support dieresis * Bug fixes - PR2069: Type-punning warnings still evident on RHEL 5 diff -r 854c59d6cfd5 -r 5ecf54fa7dcd configure.ac --- a/configure.ac Tue Jan 06 18:28:08 2015 +0000 +++ b/configure.ac Wed Jan 21 03:46:59 2015 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.5.4pre03], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.5.4], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile]) diff -r 854c59d6cfd5 -r 5ecf54fa7dcd hotspot.map.in --- a/hotspot.map.in Tue Jan 06 18:28:08 2015 +0000 +++ b/hotspot.map.in Wed Jan 21 03:46:59 2015 +0000 @@ -1,3 +1,3 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 606de1136fd1 8a386eb729b2d241ad01eb6f8dade087d5c452f854f1eaac29c0cf6822896963 +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 6144ca9b6a72 4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34 aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 116bc9da35de b9e7f67079184310450c9b461b492f340aa7824c27079b430c8f25b58b327ec5 diff -r 854c59d6cfd5 -r 5ecf54fa7dcd patches/boot/ecj-diamond.patch --- a/patches/boot/ecj-diamond.patch Tue Jan 06 18:28:08 2015 +0000 +++ b/patches/boot/ecj-diamond.patch Wed Jan 21 03:46:59 2015 +0000 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-09-22 15:44:05.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-10-02 00:02:10.026873309 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-01-06 19:04:18.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-01-21 02:12:45.332175203 +0000 @@ -58,7 +58,7 @@ private CorbaConnection conn; @@ -11,8 +11,8 @@ public static synchronized void cleanCache( ORB orb ) { synchronized (iorMapLock) { diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-09-22 15:44:05.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-10-02 00:02:10.026873309 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-01-06 19:04:18.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-01-21 02:12:45.332175203 +0000 @@ -1315,7 +1315,7 @@ protected void shutdownServants(boolean wait_for_completion) { Set oaset; @@ -23,8 +23,8 @@ for (ObjectAdapterFactory oaf : oaset) diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-09-22 15:44:05.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-10-02 00:02:10.026873309 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-01-06 19:04:18.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-01-21 02:12:45.336175251 +0000 @@ -108,7 +108,7 @@ private ThreadGroup threadGroup; @@ -44,8 +44,8 @@ for (WorkerThread wt : copy) { diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-10-01 23:57:16.438813920 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-10-02 00:02:10.026873309 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2015-01-21 02:08:09.636875446 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2015-01-21 02:12:45.336175251 +0000 @@ -297,8 +297,8 @@ // private final static class EncodingInfos { @@ -67,8 +67,8 @@ final String javaName = (String) keys.nextElement(); final String[] mimes = parseMimeTypes(props.getProperty(javaName)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-10-02 00:02:10.026873309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2015-01-21 02:12:45.336175251 +0000 @@ -63,9 +63,10 @@ */ public final class DocumentHandler extends DefaultHandler { @@ -84,8 +84,8 @@ private Reference loader; private ExceptionListener listener; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-10-02 00:02:10.026873309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2015-01-21 02:12:45.336175251 +0000 @@ -46,7 +46,7 @@ */ public final class TypeResolver { @@ -105,8 +105,8 @@ CACHE.put(actual, map); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-10-02 00:02:10.026873309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2015-01-21 02:12:45.336175251 +0000 @@ -45,7 +45,7 @@ private final Kind keyKind; // a reference kind for the cache keys private final Kind valueKind; // a reference kind for the cache values @@ -153,8 +153,8 @@ }; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-10-02 00:02:10.026873309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2015-01-21 02:12:45.336175251 +0000 @@ -104,9 +104,9 @@ return this.def.compareTo(that.def); } @@ -226,8 +226,8 @@ for (int i = 0; i < layout.length(); i++) { if (layout.charAt(i++) != '[') diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-10-01 23:57:16.470814364 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-01-21 02:08:09.668875834 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-01-21 02:12:45.336175251 +0000 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -290,8 +290,8 @@ return true; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-10-01 23:57:16.354812760 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2015-01-21 02:08:09.544874329 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2015-01-21 02:12:45.336175251 +0000 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -302,8 +302,8 @@ InnerClass ic = new InnerClass(readClassRef(), diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2015-01-21 02:12:45.336175251 +0000 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -340,8 +340,8 @@ if (popset.add(values[i])) popvals.add(values[i]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2015-01-21 02:12:45.336175251 +0000 @@ -402,7 +402,7 @@ private static Map codeMap; @@ -352,8 +352,8 @@ Coding x1 = codeMap.get(x0); if (x1 == null) codeMap.put(x0, x1 = x0); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2015-01-21 02:12:45.336175251 +0000 @@ -921,7 +921,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -382,8 +382,8 @@ Entry e = work.previous(); work.remove(); // pop stack diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-10-01 23:57:16.470814364 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-01-21 02:08:09.668875834 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-01-21 02:12:45.336175251 +0000 @@ -61,7 +61,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -421,8 +421,8 @@ for (String optline : options.split("\n")) { String[] words = optline.split("\\p{Space}+"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2015-01-21 02:12:45.336175251 +0000 @@ -45,7 +45,7 @@ private final ArrayList flist; @@ -433,8 +433,8 @@ for (int i = 0 ; i < capacity ; i++) { flist.add(null); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-10-01 23:57:16.354812760 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2015-01-21 02:08:09.544874329 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2015-01-21 02:12:45.340175299 +0000 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map attrDefs; @@ -590,8 +590,8 @@ // Add to the end of ths list: if (!fileSet.contains(cls.file)) diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-10-01 23:57:16.470814364 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2015-01-21 02:08:09.672875883 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2015-01-21 02:12:45.340175299 +0000 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -705,8 +705,8 @@ ClassEntry thisClass = curClass.thisClass; ClassEntry superClass = curClass.superClass; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-10-01 23:57:16.470814364 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2015-01-21 02:08:09.672875883 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2015-01-21 02:12:45.340175299 +0000 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -762,8 +762,8 @@ for (Class cls : pkg.classes) { if (!cls.hasInnerClasses()) continue; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2015-01-21 02:12:45.340175299 +0000 @@ -183,8 +183,8 @@ final Map attrDefs; final Map attrCommands; @@ -794,8 +794,8 @@ for (JarEntry je : Collections.list(jf.entries())) { InFile inFile = new InFile(jf, je); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2015-01-21 02:12:45.340175299 +0000 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -806,8 +806,8 @@ maxForDebug += fillp; int min = Integer.MIN_VALUE; // farthest from the center diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-10-01 23:57:16.470814364 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2015-01-21 02:08:09.672875883 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2015-01-21 02:12:45.340175299 +0000 @@ -48,8 +48,8 @@ */ @@ -838,8 +838,8 @@ while (res.remove(null)); return res; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2015-01-21 02:12:45.340175299 +0000 @@ -58,12 +58,12 @@ private final Map memberEntries; @@ -860,8 +860,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-10-01 23:57:16.474814420 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-10-02 00:02:10.030873364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2015-01-21 02:08:09.672875883 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2015-01-21 02:12:45.340175299 +0000 @@ -233,7 +233,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); @@ -872,8 +872,8 @@ String name = file.nameString; JarEntry je = new JarEntry(Utils.getJarEntryName(name)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-10-01 23:57:16.474814420 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-10-02 00:02:10.034873421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2015-01-21 02:08:09.672875883 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2015-01-21 02:12:45.340175299 +0000 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -884,8 +884,8 @@ // convenience methods to access the TL globals static TLGlobals getTLGlobals() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2014-10-02 00:02:10.034873421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2015-01-21 02:12:45.340175299 +0000 @@ -56,7 +56,7 @@ // principal in the delegated subject // @@ -896,8 +896,8 @@ final String pname = p.getClass().getName() + "." + p.getName(); permissions.add(new SubjectDelegationPermission(pname)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-10-02 00:02:10.034873421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2015-01-21 02:12:45.340175299 +0000 @@ -54,7 +54,7 @@ * Contains event dispatcher per thread group. */ @@ -908,8 +908,8 @@ /** * Constructs a new AbstractLine. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2014-10-02 00:02:10.034873421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2015-01-21 02:12:45.340175299 +0000 @@ -102,7 +102,7 @@ && !SoundbankReader.class.equals(serviceClass) && !MidiFileWriter.class.equals(serviceClass) @@ -920,8 +920,8 @@ providers = JSSecurityManager.getProviders(serviceClass); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2014-10-01 14:55:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2014-10-02 00:02:10.034873421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2015-01-08 20:19:49.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2015-01-21 02:12:45.340175299 +0000 @@ -59,7 +59,7 @@ * dispatcher instance with a factory in EventDispatcher */ @@ -932,8 +932,8 @@ /** From andrew at icedtea.classpath.org Wed Jan 21 04:12:39 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Jan 2015 04:12:39 +0000 Subject: /hg/release/icedtea7-forest-2.5: Added tag icedtea-2.5.4 for cha... Message-ID: changeset eb552778b244 in /hg/release/icedtea7-forest-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5?cmd=changeset;node=eb552778b244 author: andrew date: Wed Jan 21 03:56:43 2015 +0000 Added tag icedtea-2.5.4 for changeset 6cf2880aab5e diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 6cf2880aab5e -r eb552778b244 .hgtags --- a/.hgtags Tue Jan 06 19:04:22 2015 +0000 +++ b/.hgtags Wed Jan 21 03:56:43 2015 +0000 @@ -531,3 +531,4 @@ 39495d637282db1073b99f20f5924203f8c47e16 icedtea-2.5.4pre01 f94395c841f46f8ffbf41b14e07cb90c15a55579 icedtea-2.5.4pre02 1bcd6e8a9bc04fbc31b37de6856ad50d08cb96b9 icedtea-2.5.4pre03 +6cf2880aab5eefd45f18fab1786fdd0a0256fc6b icedtea-2.5.4 From andrew at icedtea.classpath.org Wed Jan 21 04:12:47 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Jan 2015 04:12:47 +0000 Subject: /hg/release/icedtea7-forest-2.5/corba: Added tag icedtea-2.5.4 f... Message-ID: changeset 6bc4ff2d0e9b in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=6bc4ff2d0e9b author: andrew date: Wed Jan 21 03:56:39 2015 +0000 Added tag icedtea-2.5.4 for changeset 3c9f523bf96e diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 3c9f523bf96e -r 6bc4ff2d0e9b .hgtags --- a/.hgtags Tue Jan 06 19:04:18 2015 +0000 +++ b/.hgtags Wed Jan 21 03:56:39 2015 +0000 @@ -533,3 +533,4 @@ 3b13d5123ab280705c27c9e025fd6ecca8a09f58 icedtea-2.5.4pre01 946d8c68cc64055e0a7bcbceecb499e193328c2c icedtea-2.5.4pre02 b894abb26bbf730bf048809e61647886a05235c2 icedtea-2.5.4pre03 +3c9f523bf96e91b4d1782fc4b82d3a44a5fa5b1e icedtea-2.5.4 From andrew at icedtea.classpath.org Wed Jan 21 04:12:55 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Jan 2015 04:12:55 +0000 Subject: /hg/release/icedtea7-forest-2.5/jaxp: Added tag icedtea-2.5.4 fo... Message-ID: changeset 4809b329ad87 in /hg/release/icedtea7-forest-2.5/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=4809b329ad87 author: andrew date: Wed Jan 21 03:56:40 2015 +0000 Added tag icedtea-2.5.4 for changeset ca26767d3375 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r ca26767d3375 -r 4809b329ad87 .hgtags --- a/.hgtags Tue Jan 06 19:04:19 2015 +0000 +++ b/.hgtags Wed Jan 21 03:56:40 2015 +0000 @@ -534,3 +534,4 @@ d5fcf3403d56ec90868f44e6a07e14f9628e1132 icedtea-2.5.4pre01 bd7f82f68cf1733bc70f3b8eaf0a618b87d16171 icedtea-2.5.4pre02 95795ef2016e32978b6cf76d52942d4c3f9a7fed icedtea-2.5.4pre03 +ca26767d3375a7870ca942236c33653dbb7ceacc icedtea-2.5.4 From andrew at icedtea.classpath.org Wed Jan 21 04:13:03 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Jan 2015 04:13:03 +0000 Subject: /hg/release/icedtea7-forest-2.5/jaxws: 2 new changesets Message-ID: changeset 9a6c90336922 in /hg/release/icedtea7-forest-2.5/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=9a6c90336922 author: aefimov date: Wed Oct 29 21:13:34 2014 +0300 8054367: More references for endpoints Reviewed-by: mkos changeset 08890e0ea782 in /hg/release/icedtea7-forest-2.5/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=08890e0ea782 author: andrew date: Wed Jan 21 03:56:41 2015 +0000 Added tag icedtea-2.5.4 for changeset 9a6c90336922 diffstat: .hgtags | 1 + src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java | 26 ++-- src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java | 25 ++-- src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java | 55 ++++++---- src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java | 25 ++-- src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java | 25 ++-- src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java | 25 ++-- src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java | 25 ++-- src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java | 25 ++-- src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java | 19 +-- 10 files changed, 118 insertions(+), 133 deletions(-) diffs (484 lines): diff -r 6c7e076df50d -r 08890e0ea782 .hgtags --- a/.hgtags Tue Jan 06 19:04:19 2015 +0000 +++ b/.hgtags Wed Jan 21 03:56:41 2015 +0000 @@ -533,3 +533,4 @@ ac4697fab02d744e30ad60898813aadba1ad9ba0 icedtea-2.5.4pre01 686552a98cae5fef622eb2a0e5fbe84bec3c11ca icedtea-2.5.4pre02 c604500818dadbf3258d5881132c8e325a575d04 icedtea-2.5.4pre03 +9a6c9033692216a43475e64c476bc4fda2a8e3d2 icedtea-2.5.4 diff -r 6c7e076df50d -r 08890e0ea782 src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java Tue Jan 06 19:04:19 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java Wed Jan 21 03:56:41 2015 +0000 @@ -54,17 +54,21 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction() { + @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +76,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e); diff -r 6c7e076df50d -r 08890e0ea782 src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java Tue Jan 06 19:04:19 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java Wed Jan 21 03:56:41 2015 +0000 @@ -54,17 +54,20 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction() { @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +75,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e); diff -r 6c7e076df50d -r 08890e0ea782 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java Tue Jan 06 19:04:19 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java Wed Jan 21 03:56:41 2015 +0000 @@ -40,6 +40,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; @@ -194,8 +196,15 @@ static { - QName[] qnames = (System.getProperty(MAP_ANYURI_TO_URI) == null) ? new QName[] { - createXS("string"), + String MAP_ANYURI_TO_URI_VALUE = AccessController.doPrivileged( + new PrivilegedAction() { + @Override + public String run() { + return System.getProperty(MAP_ANYURI_TO_URI); + } + } + ); + QName[] qnames = (MAP_ANYURI_TO_URI_VALUE == null) ? new QName[] { createXS("string"), createXS("anySimpleType"), createXS("normalizedString"), createXS("anyURI"), @@ -307,7 +316,7 @@ return v.toExternalForm(); } }); - if (System.getProperty(MAP_ANYURI_TO_URI) == null) { + if (MAP_ANYURI_TO_URI_VALUE == null) { secondaryList.add( new StringImpl(URI.class, createXS("string")) { public URI parse(CharSequence text) throws SAXException { @@ -771,17 +780,18 @@ } }); primaryList.add( - new StringImpl(BigDecimal.class, - createXS("decimal") + new StringImpl(BigDecimal.class, + createXS("decimal") ) { - public BigDecimal parse(CharSequence text) { - return DatatypeConverterImpl._parseDecimal(text.toString()); + public BigDecimal parse(CharSequence text) { + return DatatypeConverterImpl._parseDecimal(text.toString()); + } + + public String print(BigDecimal v) { + return DatatypeConverterImpl._printDecimal(v); + } } - - public String print(BigDecimal v) { - return DatatypeConverterImpl._printDecimal(v); - } - }); + ); primaryList.add( new StringImpl(QName.class, createXS("QName") @@ -809,7 +819,7 @@ w.getNamespaceContext().declareNamespace(v.getNamespaceURI(),v.getPrefix(),false); } }); - if (System.getProperty(MAP_ANYURI_TO_URI) != null) { + if (MAP_ANYURI_TO_URI_VALUE != null) { primaryList.add( new StringImpl(URI.class, createXS("anyURI")) { public URI parse(CharSequence text) throws SAXException { @@ -827,16 +837,17 @@ }); } primaryList.add( - new StringImpl(Duration.class, createXS("duration")) { - public String print(Duration duration) { - return duration.toString(); + new StringImpl(Duration.class, createXS("duration")) { + public String print(Duration duration) { + return duration.toString(); + } + + public Duration parse(CharSequence lexical) { + TODO.checkSpec("JSR222 Issue #42"); + return DatatypeConverterImpl.getDatatypeFactory().newDuration(lexical.toString()); + } } - - public Duration parse(CharSequence lexical) { - TODO.checkSpec("JSR222 Issue #42"); - return DatatypeConverterImpl.getDatatypeFactory().newDuration(lexical.toString()); - } - }); + ); primaryList.add( new StringImpl(Void.class) { // 'void' binding isn't defined by the spec, but when the JAX-RPC processes user-defined diff -r 6c7e076df50d -r 08890e0ea782 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java Tue Jan 06 19:04:19 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java Wed Jan 21 03:56:41 2015 +0000 @@ -54,17 +54,20 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction() { @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +75,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e); diff -r 6c7e076df50d -r 08890e0ea782 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java Tue Jan 06 19:04:19 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java Wed Jan 21 03:56:41 2015 +0000 @@ -54,17 +54,20 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction() { @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +75,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e); diff -r 6c7e076df50d -r 08890e0ea782 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java Tue Jan 06 19:04:19 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java Wed Jan 21 03:56:41 2015 +0000 @@ -54,17 +54,20 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction() { @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +75,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e); diff -r 6c7e076df50d -r 08890e0ea782 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java Tue Jan 06 19:04:19 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java Wed Jan 21 03:56:41 2015 +0000 @@ -54,17 +54,20 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction() { @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +75,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e); diff -r 6c7e076df50d -r 08890e0ea782 src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java Tue Jan 06 19:04:19 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java Wed Jan 21 03:56:41 2015 +0000 @@ -54,17 +54,20 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction() { @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +75,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e); diff -r 6c7e076df50d -r 08890e0ea782 src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java Tue Jan 06 19:04:19 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java Wed Jan 21 03:56:41 2015 +0000 @@ -139,19 +139,12 @@ } public EndpointReference readEndpointReference(final Source eprInfoset) { - // EPR constructors are private, so we need privilege escalation. - // this unmarshalling can only access instances of a fixed, known set of classes, - // so doing that shouldn't introduce security vulnerability. - return AccessController.doPrivileged(new PrivilegedAction() { - public EndpointReference run() { - try { - Unmarshaller unmarshaller = eprjc.get().createUnmarshaller(); - return (EndpointReference) unmarshaller.unmarshal(eprInfoset); - } catch (JAXBException e) { - throw new WebServiceException("Error creating Marshaller or marshalling.", e); - } - } - }); + try { + Unmarshaller unmarshaller = eprjc.get().createUnmarshaller(); + return (EndpointReference) unmarshaller.unmarshal(eprInfoset); + } catch (JAXBException e) { + throw new WebServiceException("Error creating Marshaller or marshalling.", e); + } } public T getPort(EndpointReference endpointReference, Class clazz, WebServiceFeature... webServiceFeatures) { From andrew at icedtea.classpath.org Wed Jan 21 04:13:11 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Jan 2015 04:13:11 +0000 Subject: /hg/release/icedtea7-forest-2.5/langtools: 2 new changesets Message-ID: changeset 960cdffa8b3f in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=960cdffa8b3f author: mfang date: Mon Nov 24 10:03:13 2014 -0800 8065608: 7u75 l10n resource file translation update Reviewed-by: yhuang changeset adae6ab04f7b in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=adae6ab04f7b author: andrew date: Wed Jan 21 03:56:43 2015 +0000 Added tag icedtea-2.5.4 for changeset 960cdffa8b3f diffstat: .hgtags | 1 + src/share/classes/com/sun/tools/javac/resources/javac_ja.properties | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (20 lines): diff -r 9e97f4fa0f2b -r adae6ab04f7b .hgtags --- a/.hgtags Tue Jan 06 19:04:21 2015 +0000 +++ b/.hgtags Wed Jan 21 03:56:43 2015 +0000 @@ -533,3 +533,4 @@ 6bbb3de3efa5e79df741020a9f55fc5386c0c727 icedtea-2.5.4pre01 622e6cf4c032ece5d1b553dbf4f36f404cfc8122 icedtea-2.5.4pre02 412a4f8c67e8ab5c84e168e5d392a8944c89898c icedtea-2.5.4pre03 +960cdffa8b3faca9c0d2dafe9359321c485f502e icedtea-2.5.4 diff -r 9e97f4fa0f2b -r adae6ab04f7b src/share/classes/com/sun/tools/javac/resources/javac_ja.properties --- a/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Tue Jan 06 19:04:21 2015 +0000 +++ b/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Wed Jan 21 03:56:43 2015 +0000 @@ -37,7 +37,7 @@ javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u4ED8\u52A0\u3059\u308B javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B -javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B +javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B javac.opt.processorpath=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B javac.opt.processor=\u5B9F\u884C\u3059\u308B\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306E\u540D\u524D\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u691C\u51FA\u51E6\u7406\u3092\u30D0\u30A4\u30D1\u30B9 javac.opt.proc.none.only=\u6CE8\u91C8\u51E6\u7406\u3084\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\u3002 From andrew at icedtea.classpath.org Wed Jan 21 04:13:22 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Jan 2015 04:13:22 +0000 Subject: /hg/release/icedtea7-forest-2.5/hotspot: 13 new changesets Message-ID: changeset 12c7d3944bb6 in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=12c7d3944bb6 author: poonam date: Fri Oct 17 05:51:08 2014 -0700 8047125: (ref) More phantom object references Reviewed-by: jmasa, kbarrett Contributed-by: kim.barrett at oracle.com changeset 3c5355b468a0 in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=3c5355b468a0 author: poonam date: Mon Aug 11 19:02:28 2014 -0700 8047130: Fewer escapes from escape analysis Summary: Treat max_stack attribute as an int in bytecode escape analyzer Reviewed-by: iveresov changeset 0f7af2e46b61 in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=0f7af2e46b61 author: aeriksso date: Fri Sep 12 15:56:27 2014 +0200 8049253: Better GC validation Summary: Also reviewed by: boris.molodenkov at oracle.com Reviewed-by: dcubed, minqi, mschoene Contributed-by: yasuenag at gmail.com, bengt.rutisson at oracle.com changeset d731f3984292 in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=d731f3984292 author: asaha date: Wed Jul 09 12:01:32 2014 -0700 8049758: Increment minor version of HSx for 7u75 and initialize the build number Reviewed-by: jcoomes changeset b83580de233e in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=b83580de233e author: aeriksso date: Mon Nov 17 15:51:46 2014 -0500 8050807: Better performing performance data handling Reviewed-by: gthornbr changeset d9dbb06edf08 in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=d9dbb06edf08 author: vkempik date: Thu Jan 08 17:49:53 2015 +0000 8055479: TLAB stability Reviewed-by: mgerdin changeset 1802c808abae in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=1802c808abae author: dbuck date: Thu Nov 06 04:57:28 2014 -0800 8058715: stability issues when being launched as an embedded JVM via JNI Summary: Use mmap call without MAP_FIXED so we avoid corrupting already allocated memory Reviewed-by: coleenp, dsimms changeset 78963a06df5a in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=78963a06df5a author: hseigel date: Thu Jan 08 18:25:28 2015 +0000 8058982: Better verification of an exceptional invokespecial Reviewed-by: acorn, ahgross, coleenp changeset 94b076895e5d in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=94b076895e5d author: asaha date: Tue Oct 21 11:39:21 2014 -0700 8061685: Increment hsx 24.75 build to b02 for 7u75-b06 Reviewed-by: jcoomes changeset 2b280bce222a in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=2b280bce222a author: kevinw date: Mon Nov 24 09:52:43 2014 -0800 8061785: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge Reviewed-by: poonam changeset a286445262bc in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=a286445262bc author: asaha date: Thu Nov 06 22:25:21 2014 -0800 8064300: Increment hsx 24.75 build to b03 for 7u75-b06 Reviewed-by: jcoomes changeset 6144ca9b6a72 in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=6144ca9b6a72 author: asaha date: Mon Nov 24 09:22:38 2014 -0800 8065787: Increment hsx 24.75 build to b04 for 7u75-b10 Reviewed-by: jcoomes changeset 5c948ad57906 in /hg/release/icedtea7-forest-2.5/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=5c948ad57906 author: andrew date: Wed Jan 21 03:56:44 2015 +0000 Added tag icedtea-2.5.4 for changeset 6144ca9b6a72 diffstat: .hgtags | 1 + make/hotspot_version | 8 +- src/os/bsd/vm/perfMemory_bsd.cpp | 343 ++++++++- src/os/linux/vm/perfMemory_linux.cpp | 330 +++++++- src/os/solaris/vm/perfMemory_solaris.cpp | 331 ++++++++- src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 4 +- src/share/vm/ci/bcEscapeAnalyzer.cpp | 4 +- src/share/vm/classfile/systemDictionary.cpp | 3 +- src/share/vm/classfile/systemDictionary.hpp | 1 + src/share/vm/classfile/verifier.cpp | 77 +- src/share/vm/classfile/verifier.hpp | 9 +- src/share/vm/classfile/vmSymbols.hpp | 1 + src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 8 +- src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp | 4 + src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp | 3 +- src/share/vm/memory/referenceProcessor.cpp | 24 + src/share/vm/memory/referenceProcessor.hpp | 3 +- src/share/vm/memory/referenceType.hpp | 3 +- src/share/vm/memory/threadLocalAllocBuffer.cpp | 11 +- src/share/vm/memory/threadLocalAllocBuffer.hpp | 2 +- src/share/vm/prims/jni.cpp | 2 + src/share/vm/runtime/vmStructs.cpp | 1 + src/share/vm/utilities/defaultStream.hpp | 2 + src/share/vm/utilities/ostream.cpp | 226 ++++-- src/share/vm/utilities/ostream.hpp | 4 + src/share/vm/utilities/vmError.cpp | 7 +- test/serviceability/sa/jmap-hashcode/Test8028623.java | 6 +- 27 files changed, 1104 insertions(+), 314 deletions(-) diffs (truncated from 2229 to 500 lines): diff -r f2f41ea76fe9 -r 5c948ad57906 .hgtags --- a/.hgtags Tue Jan 06 19:04:23 2015 +0000 +++ b/.hgtags Wed Jan 21 03:56:44 2015 +0000 @@ -753,3 +753,4 @@ cc04abb12fea2f1f010f501ce8c1ef5d683667aa icedtea-2.5.4pre01 7a4b0596c5395b5836faee96923b83444cc8a266 icedtea-2.5.4pre02 606de1136fd1eee950092d6beb14d0b03e8d408e icedtea-2.5.4pre03 +6144ca9b6a72e11575ea5e16751180645d8fbd5d icedtea-2.5.4 diff -r f2f41ea76fe9 -r 5c948ad57906 make/hotspot_version --- a/make/hotspot_version Tue Jan 06 19:04:23 2015 +0000 +++ b/make/hotspot_version Wed Jan 21 03:56:44 2015 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2015, 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 @@ -31,11 +31,11 @@ # # Don't put quotes (fail windows build). -HOTSPOT_VM_COPYRIGHT=Copyright 2014 +HOTSPOT_VM_COPYRIGHT=Copyright 2015 HS_MAJOR_VER=24 -HS_MINOR_VER=71 -HS_BUILD_NUMBER=01 +HS_MINOR_VER=75 +HS_BUILD_NUMBER=04 JDK_MAJOR_VER=1 JDK_MINOR_VER=7 diff -r f2f41ea76fe9 -r 5c948ad57906 src/os/bsd/vm/perfMemory_bsd.cpp --- a/src/os/bsd/vm/perfMemory_bsd.cpp Tue Jan 06 19:04:23 2015 +0000 +++ b/src/os/bsd/vm/perfMemory_bsd.cpp Wed Jan 21 03:56:44 2015 +0000 @@ -197,7 +197,38 @@ } -// check if the given path is considered a secure directory for +// Check if the given statbuf is considered a secure directory for +// the backing store files. Returns true if the directory is considered +// a secure location. Returns false if the statbuf is a symbolic link or +// if an error occurred. +// +static bool is_statbuf_secure(struct stat *statp) { + if (S_ISLNK(statp->st_mode) || !S_ISDIR(statp->st_mode)) { + // The path represents a link or some non-directory file type, + // which is not what we expected. Declare it insecure. + // + return false; + } + // We have an existing directory, check if the permissions are safe. + // + if ((statp->st_mode & (S_IWGRP|S_IWOTH)) != 0) { + // The directory is open for writing and could be subjected + // to a symlink or a hard link attack. Declare it insecure. + // + return false; + } + // See if the uid of the directory matches the effective uid of the process. + // + if (statp->st_uid != geteuid()) { + // The directory was not created by this user, declare it insecure. + // + return false; + } + return true; +} + + +// Check if the given path is considered a secure directory for // the backing store files. Returns true if the directory exists // and is considered a secure location. Returns false if the path // is a symbolic link or if an error occurred. @@ -211,27 +242,185 @@ return false; } - // the path exists, now check it's mode - if (S_ISLNK(statbuf.st_mode) || !S_ISDIR(statbuf.st_mode)) { - // the path represents a link or some non-directory file type, - // which is not what we expected. declare it insecure. - // + // The path exists, see if it is secure. + return is_statbuf_secure(&statbuf); +} + + +// Check if the given directory file descriptor is considered a secure +// directory for the backing store files. Returns true if the directory +// exists and is considered a secure location. Returns false if the path +// is a symbolic link or if an error occurred. +// +static bool is_dirfd_secure(int dir_fd) { + struct stat statbuf; + int result = 0; + + RESTARTABLE(::fstat(dir_fd, &statbuf), result); + if (result == OS_ERR) { return false; } - else { - // we have an existing directory, check if the permissions are safe. - // - if ((statbuf.st_mode & (S_IWGRP|S_IWOTH)) != 0) { - // the directory is open for writing and could be subjected - // to a symlnk attack. declare it insecure. - // - return false; + + // The path exists, now check its mode. + return is_statbuf_secure(&statbuf); +} + + +// Check to make sure fd1 and fd2 are referencing the same file system object. +// +static bool is_same_fsobject(int fd1, int fd2) { + struct stat statbuf1; + struct stat statbuf2; + int result = 0; + + RESTARTABLE(::fstat(fd1, &statbuf1), result); + if (result == OS_ERR) { + return false; + } + RESTARTABLE(::fstat(fd2, &statbuf2), result); + if (result == OS_ERR) { + return false; + } + + if ((statbuf1.st_ino == statbuf2.st_ino) && + (statbuf1.st_dev == statbuf2.st_dev)) { + return true; + } else { + return false; + } +} + + +// Open the directory of the given path and validate it. +// Return a DIR * of the open directory. +// +static DIR *open_directory_secure(const char* dirname) { + // Open the directory using open() so that it can be verified + // to be secure by calling is_dirfd_secure(), opendir() and then check + // to see if they are the same file system object. This method does not + // introduce a window of opportunity for the directory to be attacked that + // calling opendir() and is_directory_secure() does. + int result; + DIR *dirp = NULL; + RESTARTABLE(::open(dirname, O_RDONLY|O_NOFOLLOW), result); + if (result == OS_ERR) { + // Directory doesn't exist or is a symlink, so there is nothing to cleanup. + if (PrintMiscellaneous && Verbose) { + if (errno == ELOOP) { + warning("directory %s is a symlink and is not secure\n", dirname); + } else { + warning("could not open directory %s: %s\n", dirname, strerror(errno)); + } } + return dirp; + } + int fd = result; + + // Determine if the open directory is secure. + if (!is_dirfd_secure(fd)) { + // The directory is not a secure directory. + os::close(fd); + return dirp; + } + + // Open the directory. + dirp = ::opendir(dirname); + if (dirp == NULL) { + // The directory doesn't exist, close fd and return. + os::close(fd); + return dirp; + } + + // Check to make sure fd and dirp are referencing the same file system object. + if (!is_same_fsobject(fd, dirfd(dirp))) { + // The directory is not secure. + os::close(fd); + os::closedir(dirp); + dirp = NULL; + return dirp; + } + + // Close initial open now that we know directory is secure + os::close(fd); + + return dirp; +} + +// NOTE: The code below uses fchdir(), open() and unlink() because +// fdopendir(), openat() and unlinkat() are not supported on all +// versions. Once the support for fdopendir(), openat() and unlinkat() +// is available on all supported versions the code can be changed +// to use these functions. + +// Open the directory of the given path, validate it and set the +// current working directory to it. +// Return a DIR * of the open directory and the saved cwd fd. +// +static DIR *open_directory_secure_cwd(const char* dirname, int *saved_cwd_fd) { + + // Open the directory. + DIR* dirp = open_directory_secure(dirname); + if (dirp == NULL) { + // Directory doesn't exist or is insecure, so there is nothing to cleanup. + return dirp; + } + int fd = dirfd(dirp); + + // Open a fd to the cwd and save it off. + int result; + RESTARTABLE(::open(".", O_RDONLY), result); + if (result == OS_ERR) { + *saved_cwd_fd = -1; + } else { + *saved_cwd_fd = result; + } + + // Set the current directory to dirname by using the fd of the directory. + result = fchdir(fd); + + return dirp; +} + +// Close the directory and restore the current working directory. +// +static void close_directory_secure_cwd(DIR* dirp, int saved_cwd_fd) { + + int result; + // If we have a saved cwd change back to it and close the fd. + if (saved_cwd_fd != -1) { + result = fchdir(saved_cwd_fd); + ::close(saved_cwd_fd); + } + + // Close the directory. + os::closedir(dirp); +} + +// Check if the given file descriptor is considered a secure. +// +static bool is_file_secure(int fd, const char *filename) { + + int result; + struct stat statbuf; + + // Determine if the file is secure. + RESTARTABLE(::fstat(fd, &statbuf), result); + if (result == OS_ERR) { + if (PrintMiscellaneous && Verbose) { + warning("fstat failed on %s: %s\n", filename, strerror(errno)); + } + return false; + } + if (statbuf.st_nlink > 1) { + // A file with multiple links is not expected. + if (PrintMiscellaneous && Verbose) { + warning("file %s has multiple links\n", filename); + } + return false; } return true; } - // return the user name for the given user id // // the caller is expected to free the allocated memory. @@ -317,9 +506,11 @@ const char* tmpdirname = os::get_temp_directory(); + // open the temp directory DIR* tmpdirp = os::opendir(tmpdirname); if (tmpdirp == NULL) { + // Cannot open the directory to get the user name, return. return NULL; } @@ -344,25 +535,14 @@ strcat(usrdir_name, "/"); strcat(usrdir_name, dentry->d_name); - DIR* subdirp = os::opendir(usrdir_name); + // open the user directory + DIR* subdirp = open_directory_secure(usrdir_name); if (subdirp == NULL) { FREE_C_HEAP_ARRAY(char, usrdir_name, mtInternal); continue; } - // Since we don't create the backing store files in directories - // pointed to by symbolic links, we also don't follow them when - // looking for the files. We check for a symbolic link after the - // call to opendir in order to eliminate a small window where the - // symlink can be exploited. - // - if (!is_directory_secure(usrdir_name)) { - FREE_C_HEAP_ARRAY(char, usrdir_name, mtInternal); - os::closedir(subdirp); - continue; - } - struct dirent* udentry; char* udbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(usrdir_name), mtInternal); errno = 0; @@ -465,26 +645,6 @@ } -// remove file -// -// this method removes the file with the given file name in the -// named directory. -// -static void remove_file(const char* dirname, const char* filename) { - - size_t nbytes = strlen(dirname) + strlen(filename) + 2; - char* path = NEW_C_HEAP_ARRAY(char, nbytes, mtInternal); - - strcpy(path, dirname); - strcat(path, "/"); - strcat(path, filename); - - remove_file(path); - - FREE_C_HEAP_ARRAY(char, path, mtInternal); -} - - // cleanup stale shared memory resources // // This method attempts to remove all stale shared memory files in @@ -496,16 +656,11 @@ // static void cleanup_sharedmem_resources(const char* dirname) { - // open the user temp directory - DIR* dirp = os::opendir(dirname); - + int saved_cwd_fd; + // open the directory and set the current working directory to it + DIR* dirp = open_directory_secure_cwd(dirname, &saved_cwd_fd); if (dirp == NULL) { - // directory doesn't exist, so there is nothing to cleanup - return; - } - - if (!is_directory_secure(dirname)) { - // the directory is not a secure directory + // directory doesn't exist or is insecure, so there is nothing to cleanup return; } @@ -519,6 +674,7 @@ // struct dirent* entry; char* dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(dirname), mtInternal); + errno = 0; while ((entry = os::readdir(dirp, (struct dirent *)dbuf)) != NULL) { @@ -529,7 +685,7 @@ if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) { // attempt to remove all unexpected files, except "." and ".." - remove_file(dirname, entry->d_name); + unlink(entry->d_name); } errno = 0; @@ -552,11 +708,14 @@ if ((pid == os::current_process_id()) || (kill(pid, 0) == OS_ERR && (errno == ESRCH || errno == EPERM))) { - remove_file(dirname, entry->d_name); + unlink(entry->d_name); } errno = 0; } - os::closedir(dirp); + + // close the directory and reset the current working directory + close_directory_secure_cwd(dirp, saved_cwd_fd); + FREE_C_HEAP_ARRAY(char, dbuf, mtInternal); } @@ -613,19 +772,54 @@ return -1; } + int saved_cwd_fd; + // open the directory and set the current working directory to it + DIR* dirp = open_directory_secure_cwd(dirname, &saved_cwd_fd); + if (dirp == NULL) { + // Directory doesn't exist or is insecure, so cannot create shared + // memory file. + return -1; + } + + // Open the filename in the current directory. + // Cannot use O_TRUNC here; truncation of an existing file has to happen + // after the is_file_secure() check below. int result; - - RESTARTABLE(::open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IREAD|S_IWRITE), result); + RESTARTABLE(::open(filename, O_RDWR|O_CREAT|O_NOFOLLOW, S_IREAD|S_IWRITE), result); if (result == OS_ERR) { if (PrintMiscellaneous && Verbose) { - warning("could not create file %s: %s\n", filename, strerror(errno)); + if (errno == ELOOP) { + warning("file %s is a symlink and is not secure\n", filename); + } else { + warning("could not create file %s: %s\n", filename, strerror(errno)); + } } + // close the directory and reset the current working directory + close_directory_secure_cwd(dirp, saved_cwd_fd); + return -1; } + // close the directory and reset the current working directory + close_directory_secure_cwd(dirp, saved_cwd_fd); // save the file descriptor int fd = result; + // check to see if the file is secure + if (!is_file_secure(fd, filename)) { + ::close(fd); + return -1; + } + + // truncate the file to get rid of any existing data + RESTARTABLE(::ftruncate(fd, (off_t)0), result); + if (result == OS_ERR) { + if (PrintMiscellaneous && Verbose) { + warning("could not truncate shared memory file: %s\n", strerror(errno)); + } + ::close(fd); + return -1; + } // set the file size RESTARTABLE(::ftruncate(fd, (off_t)size), result); if (result == OS_ERR) { @@ -683,8 +877,15 @@ THROW_MSG_0(vmSymbols::java_io_IOException(), strerror(errno)); } } + int fd = result; - return result; + // check to see if the file is secure + if (!is_file_secure(fd, filename)) { + ::close(fd); + return -1; + } + + return fd; } // create a named shared memory region. returns the address of the @@ -716,13 +917,21 @@ char* dirname = get_user_tmp_dir(user_name); char* filename = get_sharedmem_filename(dirname, vmid); + // get the short filename + char* short_filename = strrchr(filename, '/'); + if (short_filename == NULL) { + short_filename = filename; + } else { + short_filename++; + } + // cleanup any stale shared memory files cleanup_sharedmem_resources(dirname); assert(((size > 0) && (size % os::vm_page_size() == 0)), "unexpected PerfMemory region size"); - fd = create_sharedmem_resources(dirname, filename, size); + fd = create_sharedmem_resources(dirname, short_filename, size); FREE_C_HEAP_ARRAY(char, user_name, mtInternal); FREE_C_HEAP_ARRAY(char, dirname, mtInternal); @@ -839,12 +1048,12 @@ // constructs for the file and the shared memory mapping. if (mode == PerfMemory::PERF_MODE_RO) { mmap_prot = PROT_READ; From andrew at icedtea.classpath.org Wed Jan 21 04:13:43 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Jan 2015 04:13:43 +0000 Subject: /hg/release/icedtea7-forest-2.5/jdk: 35 new changesets Message-ID: changeset 7d15ddd8bd9f in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=7d15ddd8bd9f author: aeriksso date: Thu Jan 08 16:03:14 2015 +0000 6461635: [TESTBUG] BasicTests.sh test fails intermittently Summary: Transform dummy class instead of BigInteger to avoid complication by -Xshare. Ported from script to java. Reviewed-by: sla, alanb Contributed-by: mattias.tobiasson at oracle.com changeset f69c1bc93346 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=f69c1bc93346 author: dsamersoff date: Thu Aug 09 17:42:55 2012 +0400 7183753: [TEST] Some colon in the diff for this test Summary: Reference output file contains extra colon Reviewed-by: sspitsyn, mgronlun changeset 17146fc9b4ad in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=17146fc9b4ad author: mbankal date: Wed Aug 06 04:26:22 2014 -0700 8031046: Native Windows ccache might still get unsupported ticket Reviewed-by: weijun, coffeys changeset 40a75335aff3 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=40a75335aff3 author: bae date: Tue Aug 26 15:53:05 2014 +0100 8040617: [macosx] Large JTable cell results in a OutOfMemoryException Reviewed-by: serb, prr changeset 1c2be49fb61d in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=1c2be49fb61d author: mcherkas date: Wed Oct 29 23:33:38 2014 +0400 8041572: [macosx] huge native memory leak in AWTWindow.m Reviewed-by: pchelko, serb changeset 43245d9c82e1 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=43245d9c82e1 author: dmarkov date: Wed Aug 06 12:42:25 2014 +0400 8041990: [macosx] Language specific keys does not work in applets when opened outside the browser Reviewed-by: alexsch, serb changeset 5a81dcf28686 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=5a81dcf28686 author: aivanov date: Sat Aug 23 01:15:40 2014 +0400 8043610: Sorting columns in JFileChooser fails with AppContext NPE Reviewed-by: anthony, alexsch changeset 8483a9bfbb00 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=8483a9bfbb00 author: igerasim date: Mon Sep 01 12:13:32 2014 +0400 8046656: Update protocol support Reviewed-by: mullan, wetmore Contributed-by: jamil.nimeh at oracle.com changeset 1974f0e56589 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=1974f0e56589 author: robm date: Tue Oct 21 15:33:45 2014 +0100 8048035: Ensure proper proxy protocols Reviewed-by: michaelm, coffeys changeset 1ebbaf572262 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=1ebbaf572262 author: aefimov date: Sun Jul 13 22:42:00 2014 +0400 8025051: Update resource files for TimeZone display names Reviewed-by: okutsu, mfang changeset 6ff1ecbfb772 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=6ff1ecbfb772 author: aefimov date: Fri Sep 12 14:23:54 2014 +0400 8049343: (tz) Support tzdata2014g Reviewed-by: mfang, okutsu changeset d06ba1cf0380 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=d06ba1cf0380 author: dmarkov date: Wed Sep 17 12:59:08 2014 +0400 8051359: JPopupMenu creation in headless mode with JDK9b23 causes NPE Reviewed-by: serb, pchelko changeset 653bbb472023 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=653bbb472023 author: igerasim date: Thu May 29 01:50:50 2014 +0400 7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true Reviewed-by: valeriep changeset 3585d301d447 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=3585d301d447 author: igerasim date: Tue Jul 15 02:26:55 2014 +0400 8049250: Need a flag to invert the Card.disconnect(reset) argument Reviewed-by: valeriep changeset 0f310ccb55ce in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=0f310ccb55ce author: igerasim date: Fri Aug 08 15:06:39 2014 +0400 8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX Reviewed-by: mullan, valeriep changeset ab77e9e01607 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=ab77e9e01607 author: coffeys date: Wed Jul 23 20:14:02 2014 +0100 8051614: smartcardio TCK tests fail due to lack of 'reset' permission Reviewed-by: valeriep changeset e47e8b161311 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=e47e8b161311 author: alexsch date: Wed Sep 24 13:32:29 2014 +0400 8055304: More boxing for DirectoryComboBoxModel Reviewed-by: serb, prr, skoivu changeset 862de6440369 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=862de6440369 author: igerasim date: Thu Oct 16 22:49:04 2014 +0400 8055309: RMI needs better transportation considerations Reviewed-by: alanb, skoivu, msheppar changeset b49cb68f819c in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=b49cb68f819c author: bae date: Wed Oct 08 11:05:31 2014 +0400 8055489: Better substitution formats Reviewed-by: prr changeset 80041a1f79cf in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=80041a1f79cf author: aivanov date: Thu Sep 04 19:16:55 2014 +0400 8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure Reviewed-by: pchelko, alexsch changeset 3d853fbf7999 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=3d853fbf7999 author: robm date: Tue Oct 07 13:23:30 2014 +0100 8056264: Multicast support improvements Summary: avoid passing a null ifname string to GetStringUTFChars native fn calls within a NetworkInterface method call flows Reviewed-by: msheppar, coffeys changeset d771092f8068 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=d771092f8068 author: bae date: Tue Oct 07 12:12:52 2014 +0400 8056276: Fontmanager feature improvements Reviewed-by: prr changeset a43df294f811 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=a43df294f811 author: igerasim date: Wed Oct 08 10:43:46 2014 +0400 8057555: Less cryptic cipher suite management Reviewed-by: xuelei Contributed-by: jamil.j.nimeh at oracle.com changeset 09c014e10e70 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=09c014e10e70 author: aefimov date: Wed Nov 05 13:01:23 2014 +0300 8059206: (tz) Support tzdata2014i Reviewed-by: okutsu changeset 7bbc5241a4cd in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=7bbc5241a4cd author: igerasim date: Mon Oct 13 10:19:35 2014 +0400 8059485: Resolve parsing ambiguity Reviewed-by: mullan, vinnie changeset b007a96ec99f in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=b007a96ec99f author: igerasim date: Wed Oct 22 10:23:55 2014 +0400 8060474: Resolve more parsing ambiguity Reviewed-by: mullan, ahgross Contributed-by: weijun.wang at oracle.com changeset 9c653aa22bef in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=9c653aa22bef author: igerasim date: Tue Nov 04 22:22:17 2014 +0300 8061210: Issues in TLS Reviewed-by: xuelei, wetmore, coffeys changeset 25b01228ee78 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=25b01228ee78 author: igerasim date: Thu Oct 23 12:35:02 2014 +0400 8061826: Part of JDK-8060474 should be reverted Reviewed-by: mullan, ahgross Contributed-by: weijun.wang at oracle.com changeset bc20879cdcc9 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=bc20879cdcc9 author: alexsch date: Wed Nov 05 16:00:40 2014 +0400 8062561: Test bug8055304 fails if file system default directory has read access Reviewed-by: serb changeset 8f6f747b4945 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=8f6f747b4945 author: igerasim date: Mon Nov 17 20:20:20 2014 +0300 8062807: Exporting RMI objects fails when run under restrictive SecurityManager Reviewed-by: smarks changeset 24a8200d581e in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=24a8200d581e author: aefimov date: Tue Nov 25 17:04:11 2014 +0300 8064560: (tz) Support tzdata2014j Reviewed-by: okutsu changeset be2b9a86e1c4 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=be2b9a86e1c4 author: mfang date: Mon Nov 24 10:03:57 2014 -0800 8065608: 7u75 l10n resource file translation update Reviewed-by: yhuang changeset 563c5fce9ed1 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=563c5fce9ed1 author: mfang date: Mon Dec 08 08:54:59 2014 -0800 8066747: Backing out Japanese translation change in awt_ja.properties Reviewed-by: yhuang changeset 1e6db4f8b0f3 in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=1e6db4f8b0f3 author: andrew date: Thu Jan 08 20:19:49 2015 +0000 Bump to icedtea-2.5.4 changeset e445e197507e in /hg/release/icedtea7-forest-2.5/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=e445e197507e author: andrew date: Wed Jan 21 03:56:42 2015 +0000 Added tag icedtea-2.5.4 for changeset 1e6db4f8b0f3 diffstat: .hgtags | 1 + make/jdk_generic_profile.sh | 2 +- make/sun/javazic/tzdata/VERSION | 10 +- make/sun/javazic/tzdata/africa | 803 ++--- make/sun/javazic/tzdata/antarctica | 134 +- make/sun/javazic/tzdata/asia | 1065 ++++--- make/sun/javazic/tzdata/australasia | 984 +++--- make/sun/javazic/tzdata/backward | 9 +- make/sun/javazic/tzdata/etcetera | 3 +- make/sun/javazic/tzdata/europe | 1379 ++++++--- make/sun/javazic/tzdata/factory | 1 - make/sun/javazic/tzdata/iso3166.tab | 12 +- make/sun/javazic/tzdata/leapseconds | 8 +- make/sun/javazic/tzdata/northamerica | 744 ++-- make/sun/javazic/tzdata/pacificnew | 1 - make/sun/javazic/tzdata/southamerica | 498 +-- make/sun/javazic/tzdata/systemv | 1 - make/sun/javazic/tzdata/zone.tab | 72 +- src/macosx/native/sun/awt/AWTWindow.m | 9 +- src/share/classes/com/sun/java/swing/SwingUtilities3.java | 6 +- src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java | 13 +- src/share/classes/com/sun/jndi/ldap/BerDecoder.java | 3 + src/share/classes/java/awt/Component.java | 2 +- src/share/classes/java/awt/EventQueue.java | 5 + src/share/classes/java/awt/event/InputMethodEvent.java | 34 +- src/share/classes/java/net/MulticastSocket.java | 4 +- src/share/classes/javax/swing/JComponent.java | 8 +- src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java | 13 +- src/share/classes/sun/awt/AWTAccessor.java | 5 + src/share/classes/sun/awt/SunToolkit.java | 12 +- src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java | 6 +- src/share/classes/sun/launcher/resources/launcher_de.properties | 4 +- src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java | 13 + src/share/classes/sun/rmi/transport/Transport.java | 35 +- src/share/classes/sun/rmi/transport/tcp/TCPTransport.java | 21 +- src/share/classes/sun/security/jgss/GSSHeader.java | 3 + src/share/classes/sun/security/jgss/GSSNameImpl.java | 4 + src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java | 3 + src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java | 16 +- src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java | 78 +- src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java | 24 +- src/share/classes/sun/security/smartcardio/CardImpl.java | 38 +- src/share/classes/sun/security/ssl/ClientHandshaker.java | 7 + src/share/classes/sun/security/ssl/Handshaker.java | 104 +- src/share/classes/sun/security/ssl/ProtocolVersion.java | 27 + src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java | 8 + src/share/classes/sun/security/ssl/SSLContextImpl.java | 196 +- src/share/classes/sun/security/ssl/SSLEngineImpl.java | 36 +- src/share/classes/sun/security/ssl/SSLSocketImpl.java | 38 +- src/share/classes/sun/security/ssl/ServerHandshaker.java | 7 + src/share/classes/sun/security/util/DerIndefLenConverter.java | 21 +- src/share/classes/sun/security/util/DerInputStream.java | 4 + src/share/classes/sun/swing/FilePane.java | 4 + src/share/classes/sun/swing/WindowsPlacesBar.java | 6 +- src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java | 13 +- src/share/classes/sun/tools/jconsole/resources/messages_ja.properties | 2 +- src/share/classes/sun/util/resources/TimeZoneNames.java | 85 +- src/share/classes/sun/util/resources/TimeZoneNames_de.java | 83 +- src/share/classes/sun/util/resources/TimeZoneNames_es.java | 93 +- src/share/classes/sun/util/resources/TimeZoneNames_fr.java | 83 +- src/share/classes/sun/util/resources/TimeZoneNames_it.java | 83 +- src/share/classes/sun/util/resources/TimeZoneNames_ja.java | 83 +- src/share/classes/sun/util/resources/TimeZoneNames_ko.java | 83 +- src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java | 83 +- src/share/classes/sun/util/resources/TimeZoneNames_sv.java | 83 +- src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java | 83 +- src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java | 83 +- src/share/lib/security/java.security-linux | 11 +- src/share/lib/security/java.security-macosx | 11 +- src/share/lib/security/java.security-solaris | 11 +- src/share/lib/security/java.security-windows | 11 +- src/share/native/sun/font/layout/ContextualSubstSubtables.cpp | 4 +- src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp | 3 + src/share/native/sun/font/layout/Features.cpp | 3 + src/share/native/sun/font/layout/LETableReference.h | 7 +- src/share/native/sun/font/layout/LigatureSubstSubtables.cpp | 3 + src/share/native/sun/font/layout/MultipleSubstSubtables.cpp | 2 + src/solaris/native/java/net/NetworkInterface.c | 28 +- src/solaris/native/java/net/PlainDatagramSocketImpl.c | 19 +- src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java | 55 +- src/windows/native/sun/security/krb5/NativeCreds.c | 19 +- test/ProblemList.txt | 3 - test/com/sun/tools/attach/AgentSetup.sh | 45 - test/com/sun/tools/attach/Application.java | 22 +- test/com/sun/tools/attach/ApplicationSetup.sh | 83 - test/com/sun/tools/attach/BasicTests.java | 345 +- test/com/sun/tools/attach/BasicTests.sh | 86 - test/com/sun/tools/attach/CommonSetup.sh | 81 - test/com/sun/tools/attach/PermissionTest.java | 130 +- test/com/sun/tools/attach/PermissionTests.sh | 72 - test/com/sun/tools/attach/ProviderTest.java | 104 +- test/com/sun/tools/attach/ProviderTests.sh | 51 - test/com/sun/tools/attach/RedefineAgent.java | 6 +- test/com/sun/tools/attach/RedefineDummy.java | 31 + test/com/sun/tools/attach/RunnerUtil.java | 180 + test/java/awt/im/8041990/bug8041990.java | 120 + test/javax/swing/JComponent/8043610/bug8043610.java | 122 + test/sun/java2d/OpenGL/DrawHugeImageTest.java | 108 + test/sun/security/ec/TestEC.java | 6 +- test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java | 5 + test/sun/security/smartcardio/TestAll.java | 1 + test/sun/security/smartcardio/TestDirect.java | 48 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java | 5 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/DelegatedTaskWrongException.java | 5 +- test/sun/security/ssl/javax/net/ssl/NewAPIs/testEnabledProtocols.java | 4 + test/sun/security/ssl/sanity/interop/CipherTest.java | 4 + test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java | 6 + test/sun/tools/jcmd/help_help.out | 2 +- test/sun/util/resources/TimeZone/Bug6317929.java | 10 +- 109 files changed, 5230 insertions(+), 4126 deletions(-) diffs (truncated from 18477 to 500 lines): diff -r 89d488d3bae9 -r e445e197507e .hgtags --- a/.hgtags Tue Jan 06 19:04:20 2015 +0000 +++ b/.hgtags Wed Jan 21 03:56:42 2015 +0000 @@ -517,3 +517,4 @@ c25a41237d27836a3bf01be344f7dc2fbc8f4bea icedtea-2.5.4pre01 cc61d8104f31598a00c2b0208c45ca1c52b0762b icedtea-2.5.4pre02 4a7c0da7e219ed2d1df27608388951b3dcdff57b icedtea-2.5.4pre03 +1e6db4f8b0f3c654be5d87504122bf776a066ef8 icedtea-2.5.4 diff -r 89d488d3bae9 -r e445e197507e make/jdk_generic_profile.sh --- a/make/jdk_generic_profile.sh Tue Jan 06 19:04:20 2015 +0000 +++ b/make/jdk_generic_profile.sh Wed Jan 21 03:56:42 2015 +0000 @@ -625,7 +625,7 @@ # IcedTea versioning export ICEDTEA_NAME="IcedTea" -export PACKAGE_VERSION="2.5.4pre03" +export PACKAGE_VERSION="2.5.4" export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}" echo "Building ${DERIVATIVE_ID}" diff -r 89d488d3bae9 -r e445e197507e make/sun/javazic/tzdata/VERSION --- a/make/sun/javazic/tzdata/VERSION Tue Jan 06 19:04:20 2015 +0000 +++ b/make/sun/javazic/tzdata/VERSION Wed Jan 21 03:56:42 2015 +0000 @@ -1,24 +1,24 @@ # # 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. Oracle designates this # particular file as subject to the "Classpath" exception as provided # by Oracle in the LICENSE file that accompanied this code. -# +# # 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. # -tzdata2014c +tzdata2014j diff -r 89d488d3bae9 -r e445e197507e make/sun/javazic/tzdata/africa --- a/make/sun/javazic/tzdata/africa Tue Jan 06 19:04:20 2015 +0000 +++ b/make/sun/javazic/tzdata/africa Wed Jan 21 03:56:42 2015 +0000 @@ -21,36 +21,35 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -#
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
-# This data is by no means authoritative; if you think you know better,
+# This file is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
-# tz at iana.org for general use in the future).
+# tz at iana.org for general use in the future).  For more, please see
+# the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2013-02-21):
+# From Paul Eggert (2014-10-31):
 #
-# A good source for time zone historical data outside the U.S. is
+# Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
 # San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
 #
 # Gwillim Law writes that a good source
 # for recent time zone data is the International Air Transport
 # Association's Standard Schedules Information Manual (IATA SSIM),
 # published semiannually.  Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# of the IATA's data after 1990.  Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
 #
 # Another source occasionally used is Edward W. Whitman, World Time Differences,
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
 # I found in the UCLA library.
 #
 # For data circa 1899, a common source is:
-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
-# .
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
+# http://www.jstor.org/stable/1774359
 #
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
@@ -58,13 +57,13 @@
 # Previous editions of this database used WAT, CAT, SAT, and EAT
 # for +0:00 through +3:00, respectively,
 # but Mark R V Murray reports that
-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
-# `WAT' is probably the best name for +1:00, as the common phrase for
-# the area that includes Nigeria is ``West Africa''.
-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
+# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
+# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
+# 'WAT' is probably the best name for +1:00, as the common phrase for
+# the area that includes Nigeria is "West Africa".
+# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
 #
-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
+# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
 # I'd guess that this was because people needed _some_ name for -1:00,
 # and at the time, far west Africa was the only major land area in -1:00.
 # This usage is now obsolete, as the last use of -1:00 on the African
@@ -77,7 +76,7 @@
 #	 2:00	SAST	South Africa Standard Time
 # and Murray suggests the following abbreviation:
 #	 1:00	WAT	West Africa Time
-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
+# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
 # for times before 1976, but this is the best I can think of
 # until we get more information.
 #
@@ -88,7 +87,6 @@
 #	 3:00	CAST	Central Africa Summer Time (no longer used)
 #	 3:00	SAST	South Africa Summer Time (no longer used)
 #	 3:00	EAT	East Africa Time
-#	 4:00	EAST	East Africa Summer Time (no longer used)
 
 # Algeria
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -117,9 +115,9 @@
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15 0:01
-			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
-			0:00	Algeria	WE%sT	1940 Feb 25 2:00
+Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15  0:01
+			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
+			0:00	Algeria	WE%sT	1940 Feb 25  2:00
 			1:00	Algeria	CE%sT	1946 Oct  7
 			0:00	-	WET	1956 Jan 29
 			1:00	-	CET	1963 Apr 14
@@ -129,92 +127,71 @@
 			1:00	-	CET
 
 # Angola
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Luanda	0:52:56	-	LMT	1892
-			0:52:04	-	AOT	1911 May 26 # Angola Time
-			1:00	-	WAT
-
 # Benin
-# Whitman says they switched to 1:00 in 1946, not 1934;
-# go with Shanks & Pottenger.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Porto-Novo	0:10:28	-	LMT	1912
-			0:00	-	GMT	1934 Feb 26
-			1:00	-	WAT
+# See Africa/Lagos.
 
 # Botswana
-# From Paul Eggert (2013-02-21):
-# Milne says they were regulated by the Cape Town Signal in 1899;
-# assume they switched to 2:00 when Cape Town did.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Gaborone	1:43:40 -	LMT	1885
-			1:30	-	SAST	1903 Mar
-			2:00	-	CAT	1943 Sep 19 2:00
-			2:00	1:00	CAST	1944 Mar 19 2:00
-			2:00	-	CAT
+# See Africa/Maputo.
 
 # Burkina Faso
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Burundi
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Bujumbura	1:57:28	-	LMT	1890
-			2:00	-	CAT
+# See Africa/Maputo.
 
 # Cameroon
-# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Douala	0:38:48	-	LMT	1912
-			1:00	-	WAT
+# See Africa/Lagos.
 
 # Cape Verde
+#
+# Shanks gives 1907 for the transition to CVT.
+# Perhaps the 1911-05-26 Portuguese decree
+# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
+# merely made it official?
+#
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907			# Praia
+Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907        # Praia
 			-2:00	-	CVT	1942 Sep
 			-2:00	1:00	CVST	1945 Oct 15
-			-2:00	-	CVT	1975 Nov 25 2:00
+			-2:00	-	CVT	1975 Nov 25  2:00
 			-1:00	-	CVT
 
 # Central African Republic
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Bangui	1:14:20	-	LMT	1912
-			1:00	-	WAT
+# See Africa/Lagos.
 
 # Chad
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
+Zone	Africa/Ndjamena	1:00:12 -	LMT	1912        # N'Djamena
 			1:00	-	WAT	1979 Oct 14
 			1:00	1:00	WAST	1980 Mar  8
 			1:00	-	WAT
 
 # Comoros
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul   # Moroni, Gran Comoro
-			3:00	-	EAT
+# See Africa/Nairobi.
 
-# Democratic Republic of Congo
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov 9
-			1:00	-	WAT
-Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
-			2:00	-	CAT
+# Democratic Republic of the Congo
+# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
 
 # Republic of the Congo
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Brazzaville	1:01:08 -	LMT	1912
-			1:00	-	WAT
+# See Africa/Lagos.
 
-# Cote D'Ivoire
+# C??te d'Ivoire / Ivory Coast
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	GMT
+Link Africa/Abidjan Africa/Bamako	# Mali
+Link Africa/Abidjan Africa/Banjul	# Gambia
+Link Africa/Abidjan Africa/Conakry	# Guinea
+Link Africa/Abidjan Africa/Dakar	# Senegal
+Link Africa/Abidjan Africa/Freetown	# Sierra Leone
+Link Africa/Abidjan Africa/Lome		# Togo
+Link Africa/Abidjan Africa/Nouakchott	# Mauritania
+Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
+Link Africa/Abidjan Africa/Sao_Tome	# S??o Tom?? and Pr??ncipe
+Link Africa/Abidjan Atlantic/St_Helena	# St Helena
 
 # Djibouti
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul
-			3:00	-	EAT
+# See Africa/Nairobi.
 
 ###############################################################################
 
@@ -254,30 +231,26 @@
 # Egyptians would approve the cancellation."
 #
 # Egypt to cancel daylight saving time
-# 
 # http://www.almasryalyoum.com/en/node/407168
-# 
 # or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
-# 
 Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
-Rule	Egypt	1995	2005	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	1995	2005	-	Sep	lastThu	24:00	0	-
 # From Steffen Thorsen (2006-09-19):
 # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
 # Egypt will turn back clocks by one hour at the midnight of Thursday
 # after observing the daylight saving time since May.
 # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule	Egypt	2006	only	-	Sep	21	23:00s	0	-
+Rule	Egypt	2006	only	-	Sep	21	24:00	0	-
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# From Jesper N??rgaard Welen (2007-08-15): [The following agree:]
 # http://www.nentjes.info/Bill/bill5.htm
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
-Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s	0	-
+Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	0	-
 # From Abdelrahman Hassan (2007-09-06):
 # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
 # than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -311,15 +284,9 @@
 #
 # timeanddate[2] and another site I've found[3] also support that.
 #
-# [1] 
-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# 
-# [2] 
-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# 
-# [3] 
-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
-# 
+# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
+# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
+# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
 
 # From Arthur David Olson (2009-04-20):
 # In 2009 (and for the next several years), Ramadan ends before the fourth
@@ -329,14 +296,10 @@
 # From Steffen Thorsen (2009-08-11):
 # We have been able to confirm the August change with the Egyptian Cabinet
 # Information and Decision Support Center:
-# 
 # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
-# 
 #
 # The Middle East News Agency
-# 
 # http://www.mena.org.eg/index.aspx
-# 
 # also reports "Egypt starts winter time on August 21"
 # today in article numbered "71, 11/08/2009 12:25 GMT."
 # Only the title above is available without a subscription to their service,
@@ -344,67 +307,93 @@
 # (at least today).
 
 # From Alexander Krivenyshev (2010-07-20):
-# According to News from Egypt -  Al-Masry Al-Youm Egypt's cabinet has
+# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
 # decided that Daylight Saving Time will not be used in Egypt during
 # Ramadan.
 #
 # Arabic translation:
-# "Clocks to go back during Ramadan--and then forward again"
-# 
+# "Clocks to go back during Ramadan - and then forward again"
 # http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
-# 
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
-# 
 
 # From Ahmad El-Dardiry (2014-05-07):
 # Egypt is to change back to Daylight system on May 15
 # http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
 
-# From Gunther Vermier (2015-05-13):
+# From Gunther Vermier (2014-05-13):
 # our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
 
-# From Paul Eggert (2014-05-13):
+# From Imed Chihi (2014-06-04):
+# We have finally "located" a precise official reference about the DST changes
+# in Egypt.  The Ministers Cabinet decision is explained at
+# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
+# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
+# translates into: "With regard to daylight saving time, it is scheduled to
+# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
+# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
+# and re-established again at the end of the month of Ramadan, at twelve
+# o'clock on the evening of Thursday, 31 JUL 2014."  This statement has been
+# reproduced by other (more accessible) sites[, e.g.,]...
+# http://elgornal.net/news/news.aspx?id=4699258
+
+# From Paul Eggert (2014-06-04):
 # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
 # the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption.  The AP story says
-# DST will not be observed during Ramadan.  There is no information about when
-# DST will end.  See:
+# above) says DST had no affect on electricity consumption.  There is
+# no information about when DST will end this fall.  See:
 # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
 #
-# For now, guess that later transitions will use 2010's rules, and that
-# Egypt will agree with Morocco (see below) about the date Ramadan starts and
-# ends, though (unlike Morocco) it will switch at 00:00 standard time.  In
-# Egypt the spring-forward transitions are removed for 2020-2022, when the
-# guessed spring-forward date falls during the estimated Ramadan, and all
-# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
-# outside the guessed daylight-saving time.  Ramadan intrudes on the guessed
-# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
-
-Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
-Rule	Egypt	2009	only	-	Aug	20	23:00s	0	-
-Rule	Egypt	2010	only	-	Aug	11	0:00	0	-
-Rule	Egypt	2010	only	-	Sep	10	0:00	1:00	S
-Rule	Egypt	2010	only	-	Sep	lastThu	23:00s	0	-
+# For now, guess that later spring and fall transitions will use
+# 2010's rules, and guess that Egypt will switch to standard time at
+# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
+# first Friday after Ramadan.  To implement this,
+# transition dates for 2015 through 2037 were determined by running
+# the following program under GNU Emacs 24.3, with the results integrated
+# by hand into the table below.  Ramadan again intrudes on the guessed
+# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
+# (let ((islamic-year 1436))
+#   (while (< islamic-year 1460)
+#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
+#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
+#           (friday 5))
+#       (while (/= friday (mod a 7))
+#         (setq a (1- a)))
+#       (while (/= friday (mod b 7))
+#         (setq b (1+ b)))
+#       (setq a (1- a))
+#       (setq b (1- b))
+#       (setq a (calendar-gregorian-from-absolute a))
+#       (setq b (calendar-gregorian-from-absolute b))
+#       (insert
+#        (format
+#         (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
+#                 "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n")
+#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+#     (setq islamic-year (+ 1 islamic-year))))
+Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
+Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
+Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
+Rule	Egypt	2010	only	-	Sep	 9	24:00	1:00	S
+Rule	Egypt	2010	only	-	Sep	lastThu	24:00	0	-
 Rule	Egypt	2014	only	-	May	15	24:00	1:00	S
-Rule	Egypt	2014	only	-	Jun	29	 0:00s	0	-
-Rule	Egypt	2014	only	-	Jul	29	 0:00s	1:00	S
-Rule	Egypt	2014	max	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	2014	only	-	Jun	26	24:00	0	-
+Rule	Egypt	2014	only	-	Jul	31	24:00	1:00	S
+Rule	Egypt	2014	max	-	Sep	lastThu	24:00	0	-
 Rule	Egypt	2015	2019	-	Apr	lastFri	 0:00s	1:00	S
-Rule	Egypt	2015	only	-	Jun	18	 0:00s	0	-
-Rule	Egypt	2015	only	-	Jul	18	 0:00s	1:00	S
-Rule	Egypt	2016	only	-	Jun	 7	 0:00s	0	-
-Rule	Egypt	2016	only	-	Jul	 7	 0:00s	1:00	S
-Rule	Egypt	2017	only	-	May	27	 0:00s	0	-
-Rule	Egypt	2017	only	-	Jun	26	 0:00s	1:00	S
-Rule	Egypt	2018	only	-	May	16	 0:00s	0	-
-Rule	Egypt	2018	only	-	Jun	15	 0:00s	1:00	S
-Rule	Egypt	2019	only	-	May	 6	 0:00s	0	-
-Rule	Egypt	2019	only	-	Jun	 5	 0:00s	1:00	S
-Rule	Egypt	2020	only	-	May	24	 0:00s	1:00	S
-Rule	Egypt	2021	only	-	May	13	 0:00s	1:00	S
-Rule	Egypt	2022	only	-	May	 3	 0:00s	1:00	S
+Rule	Egypt	2015	only	-	Jun	11	24:00	0	-
+Rule	Egypt	2015	only	-	Jul	23	24:00	1:00	S
+Rule	Egypt	2016	only	-	Jun	 2	24:00	0	-
+Rule	Egypt	2016	only	-	Jul	 7	24:00	1:00	S
+Rule	Egypt	2017	only	-	May	25	24:00	0	-
+Rule	Egypt	2017	only	-	Jun	29	24:00	1:00	S
+Rule	Egypt	2018	only	-	May	10	24:00	0	-
+Rule	Egypt	2018	only	-	Jun	14	24:00	1:00	S
+Rule	Egypt	2019	only	-	May	 2	24:00	0	-
+Rule	Egypt	2019	only	-	Jun	 6	24:00	1:00	S
+Rule	Egypt	2020	only	-	May	28	24:00	1:00	S
+Rule	Egypt	2021	only	-	May	13	24:00	1:00	S
+Rule	Egypt	2022	only	-	May	 5	24:00	1:00	S
 Rule	Egypt	2023	max	-	Apr	lastFri	 0:00s	1:00	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -412,60 +401,44 @@
 			2:00	Egypt	EE%sT
 
 # Equatorial Guinea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Malabo	0:35:08 -	LMT	1912
-			0:00	-	GMT	1963 Dec 15
-			1:00	-	WAT
+# See Africa/Lagos.
 
 # Eritrea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Asmara	2:35:32 -	LMT	1870
-			2:35:32	-	AMT	1890	      # Asmara Mean Time
-			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
-			3:00	-	EAT
-
 # Ethiopia

From andrew at icedtea.classpath.org  Wed Jan 21 04:25:17 2015
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 21 Jan 2015 04:25:17 +0000
Subject: /hg/icedtea7-forest/hotspot: 8 new changesets
Message-ID: 

changeset 5ca83a8a4886 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=5ca83a8a4886
author: poonam
date: Fri Oct 17 05:51:08 2014 -0700

	8047125: (ref) More phantom object references
	Reviewed-by: jmasa, kbarrett
	Contributed-by: kim.barrett at oracle.com


changeset 03217824fd6b in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=03217824fd6b
author: poonam
date: Mon Aug 11 19:02:28 2014 -0700

	8047130: Fewer escapes from escape analysis
	Summary: Treat max_stack attribute as an int in bytecode escape analyzer
	Reviewed-by: iveresov


changeset da18c40ccc1b in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=da18c40ccc1b
author: aeriksso
date: Fri Jan 09 16:55:09 2015 +0000

	8049253: Better GC validation
	Summary: Also reviewed by: boris.molodenkov at oracle.com
	Reviewed-by: dcubed, minqi, mschoene
	Contributed-by: yasuenag at gmail.com, bengt.rutisson at oracle.com


changeset b1c72437b0bd in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=b1c72437b0bd
author: aeriksso
date: Mon Nov 17 15:51:46 2014 -0500

	8050807: Better performing performance data handling
	Reviewed-by: gthornbr


changeset 9859bd7c25db in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=9859bd7c25db
author: vkempik
date: Thu Jan 08 17:49:53 2015 +0000

	8055479: TLAB stability
	Reviewed-by: mgerdin


changeset 7501509656b4 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=7501509656b4
author: dbuck
date: Thu Nov 06 04:57:28 2014 -0800

	8058715: stability issues when being launched as an embedded JVM via JNI
	Summary: Use mmap call without MAP_FIXED so we avoid corrupting already allocated memory
	Reviewed-by: coleenp, dsimms


changeset 6147bb7aed52 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=6147bb7aed52
author: hseigel
date: Mon Oct 20 16:30:51 2014 -0400

	8058982: Better verification of an exceptional invokespecial
	Reviewed-by: acorn, ahgross, coleenp
	Contributed-by: harold.seigel at oracle.com


changeset 4d25046abb67 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=4d25046abb67
author: kevinw
date: Fri Jan 09 17:00:02 2015 +0000

	8061785: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge
	Reviewed-by: poonam


diffstat:

 src/os/bsd/vm/perfMemory_bsd.cpp                                                     |  343 ++++++++-
 src/os/linux/vm/perfMemory_linux.cpp                                                 |  330 +++++++-
 src/os/solaris/vm/perfMemory_solaris.cpp                                             |  331 ++++++++-
 src/os_cpu/linux_x86/vm/os_linux_x86.cpp                                             |    4 +-
 src/share/vm/ci/bcEscapeAnalyzer.cpp                                                 |    4 +-
 src/share/vm/classfile/systemDictionary.cpp                                          |    3 +-
 src/share/vm/classfile/systemDictionary.hpp                                          |    1 +
 src/share/vm/classfile/verifier.cpp                                                  |   75 +-
 src/share/vm/classfile/verifier.hpp                                                  |    9 +-
 src/share/vm/classfile/vmSymbols.hpp                                                 |    1 +
 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp |    8 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp |    4 +
 src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp                           |    3 +-
 src/share/vm/memory/referenceProcessor.cpp                                           |   24 +
 src/share/vm/memory/referenceProcessor.hpp                                           |    3 +-
 src/share/vm/memory/referenceType.hpp                                                |    3 +-
 src/share/vm/memory/threadLocalAllocBuffer.cpp                                       |   11 +-
 src/share/vm/memory/threadLocalAllocBuffer.hpp                                       |    2 +-
 src/share/vm/runtime/vmStructs.cpp                                                   |    1 +
 src/share/vm/utilities/defaultStream.hpp                                             |    2 +
 src/share/vm/utilities/ostream.cpp                                                   |  273 ++++---
 src/share/vm/utilities/vmError.cpp                                                   |    7 +-
 test/serviceability/sa/jmap-hashcode/Test8028623.java                                |    4 +-
 23 files changed, 1091 insertions(+), 355 deletions(-)

diffs (truncated from 2206 to 500 lines):

diff -r 0a377d9c35cd -r 4d25046abb67 src/os/bsd/vm/perfMemory_bsd.cpp
--- a/src/os/bsd/vm/perfMemory_bsd.cpp	Fri Jan 09 10:05:00 2015 +0000
+++ b/src/os/bsd/vm/perfMemory_bsd.cpp	Fri Jan 09 17:00:02 2015 +0000
@@ -197,7 +197,38 @@
 }
 
 
-// check if the given path is considered a secure directory for
+// Check if the given statbuf is considered a secure directory for
+// the backing store files. Returns true if the directory is considered
+// a secure location. Returns false if the statbuf is a symbolic link or
+// if an error occurred.
+//
+static bool is_statbuf_secure(struct stat *statp) {
+  if (S_ISLNK(statp->st_mode) || !S_ISDIR(statp->st_mode)) {
+    // The path represents a link or some non-directory file type,
+    // which is not what we expected. Declare it insecure.
+    //
+    return false;
+  }
+  // We have an existing directory, check if the permissions are safe.
+  //
+  if ((statp->st_mode & (S_IWGRP|S_IWOTH)) != 0) {
+    // The directory is open for writing and could be subjected
+    // to a symlink or a hard link attack. Declare it insecure.
+    //
+    return false;
+  }
+  // See if the uid of the directory matches the effective uid of the process.
+  //
+  if (statp->st_uid != geteuid()) {
+    // The directory was not created by this user, declare it insecure.
+    //
+    return false;
+  }
+  return true;
+}
+
+
+// Check if the given path is considered a secure directory for
 // the backing store files. Returns true if the directory exists
 // and is considered a secure location. Returns false if the path
 // is a symbolic link or if an error occurred.
@@ -211,27 +242,185 @@
     return false;
   }
 
-  // the path exists, now check it's mode
-  if (S_ISLNK(statbuf.st_mode) || !S_ISDIR(statbuf.st_mode)) {
-    // the path represents a link or some non-directory file type,
-    // which is not what we expected. declare it insecure.
-    //
+  // The path exists, see if it is secure.
+  return is_statbuf_secure(&statbuf);
+}
+
+
+// Check if the given directory file descriptor is considered a secure
+// directory for the backing store files. Returns true if the directory
+// exists and is considered a secure location. Returns false if the path
+// is a symbolic link or if an error occurred.
+//
+static bool is_dirfd_secure(int dir_fd) {
+  struct stat statbuf;
+  int result = 0;
+
+  RESTARTABLE(::fstat(dir_fd, &statbuf), result);
+  if (result == OS_ERR) {
     return false;
   }
-  else {
-    // we have an existing directory, check if the permissions are safe.
-    //
-    if ((statbuf.st_mode & (S_IWGRP|S_IWOTH)) != 0) {
-      // the directory is open for writing and could be subjected
-      // to a symlnk attack. declare it insecure.
-      //
-      return false;
+
+  // The path exists, now check its mode.
+  return is_statbuf_secure(&statbuf);
+}
+
+
+// Check to make sure fd1 and fd2 are referencing the same file system object.
+//
+static bool is_same_fsobject(int fd1, int fd2) {
+  struct stat statbuf1;
+  struct stat statbuf2;
+  int result = 0;
+
+  RESTARTABLE(::fstat(fd1, &statbuf1), result);
+  if (result == OS_ERR) {
+    return false;
+  }
+  RESTARTABLE(::fstat(fd2, &statbuf2), result);
+  if (result == OS_ERR) {
+    return false;
+  }
+
+  if ((statbuf1.st_ino == statbuf2.st_ino) &&
+      (statbuf1.st_dev == statbuf2.st_dev)) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+
+// Open the directory of the given path and validate it.
+// Return a DIR * of the open directory.
+//
+static DIR *open_directory_secure(const char* dirname) {
+  // Open the directory using open() so that it can be verified
+  // to be secure by calling is_dirfd_secure(), opendir() and then check
+  // to see if they are the same file system object.  This method does not
+  // introduce a window of opportunity for the directory to be attacked that
+  // calling opendir() and is_directory_secure() does.
+  int result;
+  DIR *dirp = NULL;
+  RESTARTABLE(::open(dirname, O_RDONLY|O_NOFOLLOW), result);
+  if (result == OS_ERR) {
+    // Directory doesn't exist or is a symlink, so there is nothing to cleanup.
+    if (PrintMiscellaneous && Verbose) {
+      if (errno == ELOOP) {
+        warning("directory %s is a symlink and is not secure\n", dirname);
+      } else {
+        warning("could not open directory %s: %s\n", dirname, strerror(errno));
+      }
     }
+    return dirp;
+  }
+  int fd = result;
+
+  // Determine if the open directory is secure.
+  if (!is_dirfd_secure(fd)) {
+    // The directory is not a secure directory.
+    os::close(fd);
+    return dirp;
+  }
+
+  // Open the directory.
+  dirp = ::opendir(dirname);
+  if (dirp == NULL) {
+    // The directory doesn't exist, close fd and return.
+    os::close(fd);
+    return dirp;
+  }
+
+  // Check to make sure fd and dirp are referencing the same file system object.
+  if (!is_same_fsobject(fd, dirfd(dirp))) {
+    // The directory is not secure.
+    os::close(fd);
+    os::closedir(dirp);
+    dirp = NULL;
+    return dirp;
+  }
+
+  // Close initial open now that we know directory is secure
+  os::close(fd);
+
+  return dirp;
+}
+
+// NOTE: The code below uses fchdir(), open() and unlink() because
+// fdopendir(), openat() and unlinkat() are not supported on all
+// versions.  Once the support for fdopendir(), openat() and unlinkat()
+// is available on all supported versions the code can be changed
+// to use these functions.
+
+// Open the directory of the given path, validate it and set the
+// current working directory to it.
+// Return a DIR * of the open directory and the saved cwd fd.
+//
+static DIR *open_directory_secure_cwd(const char* dirname, int *saved_cwd_fd) {
+
+  // Open the directory.
+  DIR* dirp = open_directory_secure(dirname);
+  if (dirp == NULL) {
+    // Directory doesn't exist or is insecure, so there is nothing to cleanup.
+    return dirp;
+  }
+  int fd = dirfd(dirp);
+
+  // Open a fd to the cwd and save it off.
+  int result;
+  RESTARTABLE(::open(".", O_RDONLY), result);
+  if (result == OS_ERR) {
+    *saved_cwd_fd = -1;
+  } else {
+    *saved_cwd_fd = result;
+  }
+
+  // Set the current directory to dirname by using the fd of the directory.
+  result = fchdir(fd);
+
+  return dirp;
+}
+
+// Close the directory and restore the current working directory.
+//
+static void close_directory_secure_cwd(DIR* dirp, int saved_cwd_fd) {
+
+  int result;
+  // If we have a saved cwd change back to it and close the fd.
+  if (saved_cwd_fd != -1) {
+    result = fchdir(saved_cwd_fd);
+    ::close(saved_cwd_fd);
+  }
+
+  // Close the directory.
+  os::closedir(dirp);
+}
+
+// Check if the given file descriptor is considered a secure.
+//
+static bool is_file_secure(int fd, const char *filename) {
+
+  int result;
+  struct stat statbuf;
+
+  // Determine if the file is secure.
+  RESTARTABLE(::fstat(fd, &statbuf), result);
+  if (result == OS_ERR) {
+    if (PrintMiscellaneous && Verbose) {
+      warning("fstat failed on %s: %s\n", filename, strerror(errno));
+    }
+    return false;
+  }
+  if (statbuf.st_nlink > 1) {
+    // A file with multiple links is not expected.
+    if (PrintMiscellaneous && Verbose) {
+      warning("file %s has multiple links\n", filename);
+    }
+    return false;
   }
   return true;
 }
 
-
 // return the user name for the given user id
 //
 // the caller is expected to free the allocated memory.
@@ -317,9 +506,11 @@
 
   const char* tmpdirname = os::get_temp_directory();
 
+  // open the temp directory
   DIR* tmpdirp = os::opendir(tmpdirname);
 
   if (tmpdirp == NULL) {
+    // Cannot open the directory to get the user name, return.
     return NULL;
   }
 
@@ -344,25 +535,14 @@
     strcat(usrdir_name, "/");
     strcat(usrdir_name, dentry->d_name);
 
-    DIR* subdirp = os::opendir(usrdir_name);
+    // open the user directory
+    DIR* subdirp = open_directory_secure(usrdir_name);
 
     if (subdirp == NULL) {
       FREE_C_HEAP_ARRAY(char, usrdir_name, mtInternal);
       continue;
     }
 
-    // Since we don't create the backing store files in directories
-    // pointed to by symbolic links, we also don't follow them when
-    // looking for the files. We check for a symbolic link after the
-    // call to opendir in order to eliminate a small window where the
-    // symlink can be exploited.
-    //
-    if (!is_directory_secure(usrdir_name)) {
-      FREE_C_HEAP_ARRAY(char, usrdir_name, mtInternal);
-      os::closedir(subdirp);
-      continue;
-    }
-
     struct dirent* udentry;
     char* udbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(usrdir_name), mtInternal);
     errno = 0;
@@ -465,26 +645,6 @@
 }
 
 
-// remove file
-//
-// this method removes the file with the given file name in the
-// named directory.
-//
-static void remove_file(const char* dirname, const char* filename) {
-
-  size_t nbytes = strlen(dirname) + strlen(filename) + 2;
-  char* path = NEW_C_HEAP_ARRAY(char, nbytes, mtInternal);
-
-  strcpy(path, dirname);
-  strcat(path, "/");
-  strcat(path, filename);
-
-  remove_file(path);
-
-  FREE_C_HEAP_ARRAY(char, path, mtInternal);
-}
-
-
 // cleanup stale shared memory resources
 //
 // This method attempts to remove all stale shared memory files in
@@ -496,16 +656,11 @@
 //
 static void cleanup_sharedmem_resources(const char* dirname) {
 
-  // open the user temp directory
-  DIR* dirp = os::opendir(dirname);
-
+  int saved_cwd_fd;
+  // open the directory and set the current working directory to it
+  DIR* dirp = open_directory_secure_cwd(dirname, &saved_cwd_fd);
   if (dirp == NULL) {
-    // directory doesn't exist, so there is nothing to cleanup
-    return;
-  }
-
-  if (!is_directory_secure(dirname)) {
-    // the directory is not a secure directory
+    // directory doesn't exist or is insecure, so there is nothing to cleanup
     return;
   }
 
@@ -519,6 +674,7 @@
   //
   struct dirent* entry;
   char* dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(dirname), mtInternal);
+
   errno = 0;
   while ((entry = os::readdir(dirp, (struct dirent *)dbuf)) != NULL) {
 
@@ -529,7 +685,7 @@
       if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) {
 
         // attempt to remove all unexpected files, except "." and ".."
-        remove_file(dirname, entry->d_name);
+        unlink(entry->d_name);
       }
 
       errno = 0;
@@ -552,11 +708,14 @@
     if ((pid == os::current_process_id()) ||
         (kill(pid, 0) == OS_ERR && (errno == ESRCH || errno == EPERM))) {
 
-        remove_file(dirname, entry->d_name);
+        unlink(entry->d_name);
     }
     errno = 0;
   }
-  os::closedir(dirp);
+
+  // close the directory and reset the current working directory
+  close_directory_secure_cwd(dirp, saved_cwd_fd);
+
   FREE_C_HEAP_ARRAY(char, dbuf, mtInternal);
 }
 
@@ -613,19 +772,54 @@
     return -1;
   }
 
+  int saved_cwd_fd;
+  // open the directory and set the current working directory to it
+  DIR* dirp = open_directory_secure_cwd(dirname, &saved_cwd_fd);
+  if (dirp == NULL) {
+    // Directory doesn't exist or is insecure, so cannot create shared
+    // memory file.
+    return -1;
+  }
+
+  // Open the filename in the current directory.
+  // Cannot use O_TRUNC here; truncation of an existing file has to happen
+  // after the is_file_secure() check below.
   int result;
-
-  RESTARTABLE(::open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IREAD|S_IWRITE), result);
+  RESTARTABLE(::open(filename, O_RDWR|O_CREAT|O_NOFOLLOW, S_IREAD|S_IWRITE), result);
   if (result == OS_ERR) {
     if (PrintMiscellaneous && Verbose) {
-      warning("could not create file %s: %s\n", filename, strerror(errno));
+      if (errno == ELOOP) {
+        warning("file %s is a symlink and is not secure\n", filename);
+      } else {
+        warning("could not create file %s: %s\n", filename, strerror(errno));
+      }
     }
+    // close the directory and reset the current working directory
+    close_directory_secure_cwd(dirp, saved_cwd_fd);
+
     return -1;
   }
+  // close the directory and reset the current working directory
+  close_directory_secure_cwd(dirp, saved_cwd_fd);
 
   // save the file descriptor
   int fd = result;
 
+  // check to see if the file is secure
+  if (!is_file_secure(fd, filename)) {
+    ::close(fd);
+    return -1;
+  }
+
+  // truncate the file to get rid of any existing data
+  RESTARTABLE(::ftruncate(fd, (off_t)0), result);
+  if (result == OS_ERR) {
+    if (PrintMiscellaneous && Verbose) {
+      warning("could not truncate shared memory file: %s\n", strerror(errno));
+    }
+    ::close(fd);
+    return -1;
+  }
   // set the file size
   RESTARTABLE(::ftruncate(fd, (off_t)size), result);
   if (result == OS_ERR) {
@@ -683,8 +877,15 @@
       THROW_MSG_0(vmSymbols::java_io_IOException(), strerror(errno));
     }
   }
+  int fd = result;
 
-  return result;
+  // check to see if the file is secure
+  if (!is_file_secure(fd, filename)) {
+    ::close(fd);
+    return -1;
+  }
+
+  return fd;
 }
 
 // create a named shared memory region. returns the address of the
@@ -716,13 +917,21 @@
   char* dirname = get_user_tmp_dir(user_name);
   char* filename = get_sharedmem_filename(dirname, vmid);
 
+  // get the short filename
+  char* short_filename = strrchr(filename, '/');
+  if (short_filename == NULL) {
+    short_filename = filename;
+  } else {
+    short_filename++;
+  }
+
   // cleanup any stale shared memory files
   cleanup_sharedmem_resources(dirname);
 
   assert(((size > 0) && (size % os::vm_page_size() == 0)),
          "unexpected PerfMemory region size");
 
-  fd = create_sharedmem_resources(dirname, filename, size);
+  fd = create_sharedmem_resources(dirname, short_filename, size);
 
   FREE_C_HEAP_ARRAY(char, user_name, mtInternal);
   FREE_C_HEAP_ARRAY(char, dirname, mtInternal);
@@ -839,12 +1048,12 @@
   // constructs for the file and the shared memory mapping.
   if (mode == PerfMemory::PERF_MODE_RO) {
     mmap_prot = PROT_READ;
-    file_flags = O_RDONLY;
+    file_flags = O_RDONLY | O_NOFOLLOW;
   }
   else if (mode == PerfMemory::PERF_MODE_RW) {
 #ifdef LATER
     mmap_prot = PROT_READ | PROT_WRITE;
-    file_flags = O_RDWR;
+    file_flags = O_RDWR | O_NOFOLLOW;
 #else
     THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
               "Unsupported access mode");
diff -r 0a377d9c35cd -r 4d25046abb67 src/os/linux/vm/perfMemory_linux.cpp
--- a/src/os/linux/vm/perfMemory_linux.cpp	Fri Jan 09 10:05:00 2015 +0000
+++ b/src/os/linux/vm/perfMemory_linux.cpp	Fri Jan 09 17:00:02 2015 +0000
@@ -197,7 +197,38 @@
 }
 
 
-// check if the given path is considered a secure directory for
+// Check if the given statbuf is considered a secure directory for
+// the backing store files. Returns true if the directory is considered
+// a secure location. Returns false if the statbuf is a symbolic link or
+// if an error occurred.
+//
+static bool is_statbuf_secure(struct stat *statp) {
+  if (S_ISLNK(statp->st_mode) || !S_ISDIR(statp->st_mode)) {
+    // The path represents a link or some non-directory file type,
+    // which is not what we expected. Declare it insecure.
+    //
+    return false;
+  }
+  // We have an existing directory, check if the permissions are safe.
+  //

From jvanek at redhat.com  Wed Jan 21 09:28:01 2015
From: jvanek at redhat.com (Jiri Vanek)
Date: Wed, 21 Jan 2015 10:28:01 +0100
Subject: [rfc][icedtea-web] Check online detection even if checked before
In-Reply-To: 
References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com>,
	
	
Message-ID: <54BF7121.4070103@redhat.com>

On 01/06/2015 09:19 PM, Jacob Wisor wrote:
> On 01/06/2015 at 01:25 PM Jacob Wisor wrote:
>> On 01/05/2015 at 05:19 PM Jie Kang wrote:
>>> Hello,
>>>
>>> This patch slightly modifies JNLPRuntime's online detection function to
>>> always perform the check, even if it has been called before.

As Jacob is mentioning, this really is causing performance overkill.
>>>
>>> Previously, if the boolean onlineDetected wasn't null, the check would be
>>> skipped. This caused a bug when downloading multiple resources.

The idea of the check was, that first resource to be downloaded, is mostly the most crucial - jnlp, 
jnlpHref, mainclass, jar with main class... So this one have to be downlaoded - if it is not, then 
we can assume the network inaccessible.
>>>
>>> For each resource being downloaded, we perform the detection check. For two
>>> consecutive resources: If for the first resource, we detected offline, the
>>> boolean onlineDetected would be set to false. Then for the second resource,
>>> the detection check would be skipped, even if that resource was able to be
>>> connected to. This would result in the second resource being unable to be
>>> downloaded, even though it definitely could and should be. The patch fixes
>>> this.

Do you have some example of this behavior causing any real issues?
Maybe just sync the method or otherwise ensure that while isOnline is null, only one download can be 
done?

>>>
>>> Thoughts?
>>
>> Although I did not test it, seems to be working as advertised.
>>
>> While looking at the code, I was wondering why JNLPRuntime.onlineDetected was
>> a Boolean object instead of a primitive. And, apart from that, the whole
>> offline detection mechanism seems overly complex and unreliable to me.
>> I am also not really convinced that
>>
>>      public static void detectOnline(URL location) {
>>          if (onlineDetected != null) {
>>              return;
>>          }
>>          try {
>>              if (location.getProtocol().equals("file")) {
>>                  return;
>>              }
>>              //Checks the offline/online status of the system.
>>              InetAddress.getByName(location.getHost());
>>          } catch (UnknownHostException ue) { [?]
>>
>> is the best or most reliable way in J2SE to test for the online/offline status
>> of a system. Do systems having no DNS server configured or which is unreachable
>> properly resolve their name? And, even if they do, does this really actually
>> prove them being online?
>>
>> Now, I was considering a few different options to reliably detecting a system's
>> online/offline status. Initially, I was thinking about pinging the default
>> gateway. However, hosts with public IPs may have their public IP as the default
>> gateway configured. So, the most reliable way I came up with is to send an echo
>> broadcast (on the local subnet) request. Of course, this does not prove the
>> system being connected to the /public/ internet. But this is not neccessary
>> either because JNLP applications may be (which they often are) served on an
>> intranet only. So, would you mind investigating this further?

Before doing this  looks-really-stupid  InetAddress.getByName(location.getHost()); i was elaborating 
on this, and have nnot found a generic way how to veryfi online status from java.
>
> Oh, I forgot: I am sure we do not want to make a DNS request for every resource
> we need to download, even when subsequent DNS resolution requests are pulled

yah, to much correct.
> from the local DNS cache. So, although this patch fixes the bug, it is very
> inefficient and impractical because it induces an avoidable performance penalty.
> In other words, the online detection *logic* itself needs to be fixed.
>
> @Jie Kang:
> Thank you for spotting this bug.
>

Is it really an bug? It actually eliminates the benefits of offline environment.

 >>> consecutive resources: If for the first resource, we detected offline, the
 >>> boolean onlineDetected would be set to false. Then for the second resource,
 >>> the detection check would be skipped, even if that resource was able to be
 >>> connected to. This would result in the second resource being unable to be
 >>> downloaded, even though it definitely could and should be. The patch fixes
 >>> this.

Thinking about it - how it is possible that first resource could not be downloaded, but second can 
be, and how it is possible that first one can be missed, while second one not?


Maybe before deciding that environment i onnline/offline - we may try to download two or three 
resources?


J.







From jvanek at redhat.com  Wed Jan 21 09:36:30 2015
From: jvanek at redhat.com (Jiri Vanek)
Date: Wed, 21 Jan 2015 10:36:30 +0100
Subject: [rfc][icedtea-web] Add quotes to Docs paths in Makefile
In-Reply-To: <1067237056.761922.1419346501879.JavaMail.zimbra@redhat.com>
References: <1067237056.761922.1419346501879.JavaMail.zimbra@redhat.com>
Message-ID: <54BF731E.9000506@redhat.com>

Well I'm author of this patch... Seeing Jie posted it, it may be probably  considered to be reviwed 
when Jie was writing this email.

Anyway  good to go from my side (and as jie posted it, probakly also from his side)


J.
On 12/23/2014 03:55 PM, Jie Kang wrote:
> Hello,
>
> As requested by jvanek: here is the patch for HEAD to add quotes to the Doc paths in Makefile.
>
> This is to prevent the error in building encountered below [1]
>
> Okay to push?
>
>
> Regards,
>
>
> [1]
>
> mkdir -p /home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/icedtea-web-docs/1.6pre
> (fedora-0.1.pre01.fc21-x86_64) ; \
> HTML_DOCS_TARGET_DIR=/home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/icedtea-web-docs/1.6pre
> (fedora-0.1.pre01.fc21-x86_64)/html  ; \
> PLAIN_DOCS_TARGET_DIR=/home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/icedtea-web-docs/1.6pre
> (fedora-0.1.pre01.fc21-x86_64)/plain ; \
> MAN_DOCS_TARGET_DIR=/home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/icedtea-web-docs/1.6pre
> (fedora-0.1.pre01.fc21-x86_64)/man  ; \
> mkdir $HTML_DOCS_TARGET_DIR ; \
> mkdir $PLAIN_DOCS_TARGET_DIR ; \
> mkdir $MAN_DOCS_TARGET_DIR ; \
> HTML_DOCS_INDEX=$HTML_DOCS_TARGET_DIR/index.html ; \
> TP_COMMAND="/home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/bootstrap/jdk1.6.0/bin/java -cp
> /home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/netx.build
> net.sourceforge.jnlp.util.docprovider.TextsProvider" ; \
> TP_TAIL="false 1.6pre (fedora-0.1.pre01.fc21-x86_64)" ; \
> LANG_BACKUP=$LANG ; \
> echo "IcedTea-Web 1.6pre (fedora-0.1.pre01.fc21-x86_64)" >
> $HTML_DOCS_INDEX ; \
> echo "

IcedTea-Web 1.6pre (fedora-0.1.pre01.fc21-x86_64) docs:

" >> $HTML_DOCS_INDEX ; \ > for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \ > ID=`echo "$LANG_ID" | head -c 2` ; \ > ENCOD=`echo "$LANG_ID" | tail -c 6` ; \ > export LANG=$LANG_ID; \ > mkdir $HTML_DOCS_TARGET_DIR/$ID ; \ > echo "
  • $LANG_ID
  • " >> $HTML_DOCS_INDEX ; \ > $TP_COMMAND html $HTML_DOCS_TARGET_DIR/$ID false $TP_TAIL ; \ > mkdir $PLAIN_DOCS_TARGET_DIR/$ID ; \ > $TP_COMMAND plain $PLAIN_DOCS_TARGET_DIR/$ID 160 false $TP_TAIL; \ > if [ $ID == "en" ] ; then \ > MAN_DESC=$MAN_DOCS_TARGET_DIR/man1 ; \ > else \ > MAN_DESC=$MAN_DOCS_TARGET_DIR/$ID/man1 ; \ > fi ; \ > mkdir -p $MAN_DESC ; \ > $TP_COMMAND man $ENCOD $MAN_DESC $TP_TAIL ; \ > $TP_COMMAND htmlIntro > /home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/netx.build/net/sourceforge/jnlp/resources/about_$ID.html > $TP_TAIL; \ > done ; \ > export LANG=$LANG_BACKUP ; \ > echo "" >> $HTML_DOCS_INDEX ; \ > touch stamps/generate-docs.stamp > if test "xnetscape sun/applet" != x; then \ > mkdir -p /home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/liveconnect && \ > /home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/bootstrap/jdk1.6.0/bin/javac -g -encoding utf-8 > -source 7 -target 7 \ > -d /home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/liveconnect \ > -bootclasspath > /home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/netx.build:/home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/bootstrap/jdk1.6.0/jre/lib/rt.jar:/home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/bootstrap/jdk1.6.0/jre/lib/jsse.jar:/usr/share/java/js.jar:/home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/bootstrap/jdk1.6.0/jre/lib/resources.jar > \ > -classpath /usr/share/java/tagsoup.jar \ > -sourcepath /home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/plugin/icedteanp/java \ > @liveconnect-source-files.txt ; \ > fi > /bin/sh: -c: line 0: syntax error near unexpected token `(' > /bin/sh: -c: line 0: `mkdir -p > /home/jvanek/rpmbuild/BUILD/icedtea-web-1.6pre/icedtea-web-docs/1.6pre > (fedora-0.1.pre01.fc21-x86_64) ; \' > Makefile:1079: recipe for target 'stamps/generate-docs.stamp' failed > make: *** [stamps/generate-docs.stamp] Error 1 > make: *** Waiting for unfinished jobs.... > From jvanek at redhat.com Wed Jan 21 09:50:04 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 21 Jan 2015 10:50:04 +0100 Subject: [rfc][icedtea-web] Refactor initialize/download out of ResourceTracker and add tests In-Reply-To: <702263835.1654371.1419970643675.JavaMail.zimbra@redhat.com> References: <702263835.1654371.1419970643675.JavaMail.zimbra@redhat.com> Message-ID: <54BF764C.5080601@redhat.com> On 12/30/2014 09:17 PM, Jie Kang wrote: > Hello, > > The attached patch moves the download/initialize runnable into a separate class named ResourceDownloader. The tests applicable to the new ResourceDownloader have also been moved from ResourceTrackerTest to ResourceDownloaderTest. > > As well a number of tests have been added to ResourceDownloaderTest in order to ensure the capabilities of the downloader are maintained. > Yup. Looks good. Please follow Lukas' nits in separate changeset. Not as part of the refactoring. Thank you both! J. > > New tests of note: > > testDownloadResource > testDownloadPackGzResource > testDownloadVersionedResource > testDownloadVersionedPackGzResource > testDownloadLocalResourceFails > testDownloadNotExistingResourceFails > > There are two cases that I will add in a separate patch: > > 1 : test redownloading using new setting in TinyHttpdImpl > 2 : test download of gzip file (not packgz) > > These both need extra work in code outside of ResourceDownloader > > > How does it look? > > > Regards, > From jvanek at redhat.com Wed Jan 21 09:52:07 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 21 Jan 2015 10:52:07 +0100 Subject: [rfc][icedtea-web] Add unit tests for CacheUtil class In-Reply-To: <1444625884.7394119.1421339550356.JavaMail.zimbra@redhat.com> References: <1444625884.7394119.1421339550356.JavaMail.zimbra@redhat.com> Message-ID: <54BF76C7.50903@redhat.com> On 01/15/2015 05:32 PM, Jie Kang wrote: > Hello, > > The patch adds a set of basic unit tests to CacheUtil to make sure they work as intended. They don't cover many edge cases at the moment and are mainly for developer's to read and gain an understanding of the CacheUtil class quicker. Edge cases will be added in the future. > > As well, there is one KnownToFail test for CacheUtil.cleanCache : This is due to an implementation error that causes entries marked for deletion to never be deleted in certain circumstances. This will be fixed in a subsequent patch. > > Okay to push? yes. From jvanek at redhat.com Wed Jan 21 10:00:28 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 21 Jan 2015 11:00:28 +0100 Subject: [rfc][icedtea-web] Allow cache directory to be changed during runtime In-Reply-To: <54B80419.5050805@redhat.com> References: <923849450.2779734.1420487350270.JavaMail.zimbra@redhat.com> <54B80419.5050805@redhat.com> Message-ID: <54BF78BC.3020902@redhat.com> On 01/15/2015 07:16 PM, Andrew Azores wrote: > On 01/05/2015 02:49 PM, Jie Kang wrote: >> Hello, >> >> This patch consolidates the cacheDir instance to a single place and allows us to change it during >> run-time. It also modifies a unit test to use this new feature. This feature is aimed mainly at >> unit tests that need the cache, but do not want to modify the icedtea-web's user cache. >> >> Thoughts? Okay to push? I'm wondering why it is needed at all. JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR); is the place where you can set the dir. For unittest you may force refelction to do the job. if the chnage of the property isnot enough. What I would rather see is, to get rid of all the static stuff in CacheLRUWrapper and have possibility to create in instance. This instance will be also much more testable. But maybe it is overkill. J. >> >> >> Regards, >> > > I think this looks generally ok. Maybe as a separate enhancement changeset, but since you're working > in here anyway, could you look at doing some refactoring to store the cache directory as something > better than a String? As a File, or using Java 7's nio2 stuff, a Path maybe? On one side - yes, on the other - why? What operations are mainly done on the "string" string ops or file ops - I have not checked code, but seems like concate is most often :) But yes - it is directory, so file or path is probably better then string. Please, do this refactoring as separate changset anyway. J. From jvanek at redhat.com Wed Jan 21 10:03:52 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 21 Jan 2015 11:03:52 +0100 Subject: [rfc][icedtea-web] PolicyEditor uses OptionParser In-Reply-To: <54B804DE.1070505@redhat.com> References: <1990186751.2825116.1420492362138.JavaMail.zimbra@redhat.com> <1882290830.3284389.1420560881139.JavaMail.zimbra@redhat.com> <54B804DE.1070505@redhat.com> Message-ID: <54BF7988.90605@redhat.com> On 01/15/2015 07:20 PM, Andrew Azores wrote: > On 01/06/2015 11:14 AM, Jie Kang wrote: >> Hello, >> >> Patch looks fine to me. In terms of aazore's changes, I'd leave them out of this patch. Whichever >> one goes in second will deal with the conflicts appropriately and it won't be too much work. >> >> >> Regards, >> >> ----- Original Message ----- >>> Hello, >>> >>> This patch changes PolicyEditor to use OptionParser to parse its arguments. >>> I have noticed that Andrew's PolicyEditor gains a real parser patch removes >>> the codebase tag as an option. This patch does not at the moment, but I can >>> follow if that is what is determined to be wanted. >>> >>> Thoughts ? >>> >>> Thank you, >>> Lukasz Dracz >>> >> > > Agreed, leave it to the second one to go in (probably my parser stuff) to remove the option, don't > do it now. > > Looks good to me. Yes pelase, push. Btw - how does it will works without codebase argument (with realaprser in)? > > Thanks, From ptisnovs at icedtea.classpath.org Wed Jan 21 10:41:30 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 21 Jan 2015 10:41:30 +0000 Subject: /hg/gfx-test: Updated. Message-ID: changeset b8555455dafc in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=b8555455dafc author: Pavel Tisnovsky date: Wed Jan 21 11:43:22 2015 +0100 Updated. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 170 +++++++++++++++++++++ 2 files changed, 175 insertions(+), 0 deletions(-) diffs (192 lines): diff -r 9c7ff72ab5d8 -r b8555455dafc ChangeLog --- a/ChangeLog Tue Jan 20 11:01:02 2015 +0100 +++ b/ChangeLog Wed Jan 21 11:43:22 2015 +0100 @@ -1,3 +1,8 @@ +2015-01-21 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Updated. + 2015-01-20 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: diff -r 9c7ff72ab5d8 -r b8555455dafc src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Tue Jan 20 11:01:02 2015 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Jan 21 11:43:22 2015 +0100 @@ -2377,6 +2377,176 @@ } /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_USHORT_GRAY}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, backgroundColor); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image with type {@link BufferedImage#TYPE_CUSTOM}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltVerticalColorStripesBufferedImageTypeCustom(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_CUSTOM, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal color stripes buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalColorStripesBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalColorStripesImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal color stripes buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalColorStripesBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalColorStripesImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal color stripes buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_PRE}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalColorStripesBufferedImageType4ByteABGR_Pre(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalColorStripesImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal color stripes buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalColorStripesBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalColorStripesImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB, backgroundColor); + } + + /** + * Test basic BitBlt operation for diagonal color stripes buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param backgroundColor + * background color + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult doBitBltDiagonalColorStripesBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d, + Color backgroundColor) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalColorStripesImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE, backgroundColor); + } + + /** * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR_Pre. * Background color is set to Color.black. * From ptisnovs at icedtea.classpath.org Wed Jan 21 10:43:50 2015 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 21 Jan 2015 10:43:50 +0000 Subject: /hg/gfx-test: Updated too. Message-ID: changeset 497e87716479 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=497e87716479 author: Pavel Tisnovsky date: Wed Jan 21 11:45:37 2015 +0100 Updated too. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBufferedImageOp.java | 51 +++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diffs (73 lines): diff -r b8555455dafc -r 497e87716479 ChangeLog --- a/ChangeLog Wed Jan 21 11:43:22 2015 +0100 +++ b/ChangeLog Wed Jan 21 11:45:37 2015 +0100 @@ -1,3 +1,8 @@ +2015-01-21 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBufferedImageOp.java: + Updated too. + 2015-01-21 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r b8555455dafc -r 497e87716479 src/org/gfxtest/testsuites/BitBltBufferedImageOp.java --- a/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Wed Jan 21 11:43:22 2015 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java Wed Jan 21 11:45:37 2015 +0100 @@ -7176,6 +7176,57 @@ } /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6TypeUshort555RGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6TypeUshort565RGB(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB, rasterOp); + } + + /** + * Test basic BitBlt operation for buffered image with type {@link BufferedImage#TYPE_USHORT_GRAY}. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @param rasterOp + * selected raster operation + * @return test result status - PASSED, FAILED or ERROR + */ + protected TestResult doBitBltRGBTexture6TypeUshortGray(TestImage image, Graphics2D graphics2d, + BufferedImageOp rasterOp) + { + return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, rasterOp); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ldracz at icedtea.classpath.org Wed Jan 21 16:43:01 2015 From: ldracz at icedtea.classpath.org (ldracz at icedtea.classpath.org) Date: Wed, 21 Jan 2015 16:43:01 +0000 Subject: /hg/icedtea-web: Change PolicyEditor to use OptionParser Message-ID: changeset b6e1270385f4 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=b6e1270385f4 author: Lukasz Dracz date: Wed Jan 21 11:42:48 2015 -0500 Change PolicyEditor to use OptionParser 2014-01-21 Lukasz Dracz Change PolicyEditor to use OptionParser * netx/net/sourceforge/jnlp/OptionsDefinitions.java * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java: (argsToMap): removed * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java: (testArgsToMap): removed diffstat: ChangeLog | 9 + netx/net/sourceforge/jnlp/OptionsDefinitions.java | 4 +- netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java | 55 ++-------- tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java | 19 --- 4 files changed, 22 insertions(+), 65 deletions(-) diffs (146 lines): diff -r 02dd1b796d4b -r b6e1270385f4 ChangeLog --- a/ChangeLog Mon Dec 22 10:14:18 2014 +0100 +++ b/ChangeLog Wed Jan 21 11:42:48 2015 -0500 @@ -1,3 +1,12 @@ +2014-01-21 Lukasz Dracz + + Change PolicyEditor to use OptionParser + * netx/net/sourceforge/jnlp/OptionsDefinitions.java + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java: + (argsToMap): removed + * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java: + (testArgsToMap): removed + 2014-12-20 Jiri Vanek Added -html switch for javaws to run applets out of browser in applets sandbox diff -r 02dd1b796d4b -r b6e1270385f4 netx/net/sourceforge/jnlp/OptionsDefinitions.java --- a/netx/net/sourceforge/jnlp/OptionsDefinitions.java Mon Dec 22 10:14:18 2014 +0100 +++ b/netx/net/sourceforge/jnlp/OptionsDefinitions.java Wed Jan 21 11:42:48 2015 -0500 @@ -85,8 +85,8 @@ HELP2("-help", "BOHelp2"), //policyeditor //-help - FILE("-file", "policy_file", "PBOFile"), - CODEBASE("-codebase", "url", "PBOCodebase"); + FILE("-file", "policy_file", "PBOFile", NumberOfArguments.ONE), + CODEBASE("-codebase", "url", "PBOCodebase", NumberOfArguments.ONE_OR_MORE); public final String option; diff -r 02dd1b796d4b -r b6e1270385f4 netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Mon Dec 22 10:14:18 2014 +0100 +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Wed Jan 21 11:42:48 2015 -0500 @@ -111,6 +111,7 @@ import net.sourceforge.jnlp.util.docprovider.TextsProvider; import net.sourceforge.jnlp.util.docprovider.formatters.formatters.PlainTextFormatter; import net.sourceforge.jnlp.util.logging.OutputController; +import net.sourceforge.jnlp.util.optionparser.OptionParser; /** * This class provides a policy editing tool as a simpler alternate to @@ -1582,9 +1583,9 @@ * -help will print a help message and immediately return (no editor instance opens) */ public static void main(final String[] args) { - final Map argsMap = argsToMap(args); + final OptionParser optionParser = new OptionParser(args, OptionsDefinitions.getPolicyEditorOptions()); - if (argsMap.containsKey(HELP_FLAG)) { + if (optionParser.hasOption(OptionsDefinitions.OPTIONS.HELP1)) { final TextsProvider helpMessagesProvider = new PolicyEditorTextsProvider("utf-8", new PlainTextFormatter(), true, true); String HELP_MESSAGE = "\n"; if (JNLPRuntime.isDebug()) { @@ -1609,19 +1610,18 @@ SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - String filepath = argsMap.get(FILE_FLAG); - if (filepath == null && args.length == 1) { + String filepath = optionParser.getParam(OptionsDefinitions.OPTIONS.FILE); + if (optionParser.getMainArgs().size() == 0) { + filepath = null; + } else if (filepath == "") { // maybe the user just forgot the -file flag, so try to open anyway - filepath = args[0]; + filepath = optionParser.getMainArg(); } final PolicyEditorWindow frame = getPolicyEditorFrame(filepath); frame.asWindow().setVisible(true); - final String codebaseStr = argsMap.get(CODEBASE_FLAG); - if (codebaseStr != null) { - final String[] urls = codebaseStr.split(" "); - for (final String url : urls) { - frame.getPolicyEditor().addNewCodebase(url); - } + final List codebases = optionParser.getParams(OptionsDefinitions.OPTIONS.CODEBASE); + for (final String url : codebases) { + frame.getPolicyEditor().addNewCodebase(url); } } }); @@ -1637,37 +1637,4 @@ return new PolicyEditor(filepath); } - /** - * Create a Map out of argv - * @param args command line flags and parameters given to the program - * @return a Map representation of the command line arguments - */ - static Map argsToMap(final String[] args) { - final List argsList = Arrays. asList(args); - final Map map = new HashMap<>(); - - if (argsList.contains(HELP_FLAG)) { - map.put(HELP_FLAG, null); - } - - if (argsList.contains(FILE_FLAG)) { - map.put(FILE_FLAG, argsList.get(argsList.indexOf(FILE_FLAG) + 1)); - } - - if (argsList.contains(CODEBASE_FLAG)) { - final int flagIndex = argsList.indexOf(CODEBASE_FLAG); - final StringBuilder sb = new StringBuilder(); - for (int i = flagIndex + 1; i < argsList.size(); ++i) { - final String str = argsList.get(i); - if (str.equals(HELP_FLAG) || str.equals(CODEBASE_FLAG) || str.equals(FILE_FLAG)) { - break; - } - sb.append(str); - sb.append(" "); - } - map.put(CODEBASE_FLAG, sb.toString().trim()); - } - return map; - } - } diff -r 02dd1b796d4b -r b6e1270385f4 tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java Mon Dec 22 10:14:18 2014 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java Wed Jan 21 11:42:48 2015 -0500 @@ -265,23 +265,4 @@ } } - @Test - public void testArgsToMap() throws Exception { - final String[] args = new String[] { - "-codebase", "http://example.com http://icedtea.classpath.org", - "-file", "/tmp/some-policy-file.tmp", - "-help" - }; - Map map = PolicyEditor.argsToMap(args); - assertTrue("Args map should contain help flag", map.containsKey("-help")); - assertTrue("Value for -help should be null but was " + map.get("-help"), - map.get("-help") == null); - assertTrue("Args map should contain file flag", map.containsKey("-file")); - assertTrue("Value for -file should be /tmp/some-policy-file.tmp but was " + map.get("-file"), - map.get("-file").equals("/tmp/some-policy-file.tmp")); - assertTrue("Args map should contain codebase flag", map.containsKey("-codebase")); - assertTrue("Value for codebase flag should be \"http://example.com http://icedtea.classpath.org\" but was " + map.get("-codebase"), - map.get("-codebase").equals("http://example.com http://icedtea.classpath.org")); - } - } From edward.nevill at gmail.com Wed Jan 21 17:06:33 2015 From: edward.nevill at gmail.com (Edward Nevill) Date: Wed, 21 Jan 2015 17:06:33 +0000 Subject: RFR: Add support for ARMv6 to ARM JIT Message-ID: <1421859993.3200.131.camel@mint> Hi, The following patch adds support for ARMv6 to the ARM JIT (previously known as the Thumb2 JIT). http://openjdk.linaro.org/arm32jit/patches/6046.patch The following ARM architectures are now supported ARMv6 - Vanilla ARMv6 as on Raspberry PI (No Thumb2, No LDREXD/STREXD) ARMv6K - ARMv6 with MP support (No Thumb2, but has LDREXD/STREXD) ARMV6T2 - ARMv6 with Thumb2 and LDREXD/STREXD ARMV7 - all variants supported ARMV8 - all variants supported (in AARCH32 mode) Note, because of the lack of properly working double/long atomic primitives on vanilla ARMv6 only non MP is supported on this. The Raspberry PI is single core so this is not a problem, it just uses LDM/STM or LDRD/STRD. I have based the patches on the icedtea7 tree at http://icedtea.classpath.org/hg/icedtea7-forest/hotspot Is this the correct location for the tip of the icedtea7 development? Because of the size of the changes I have introduced a new file arm32JIT.cpp rather than modifying the existing thumb2.cpp. This is switched on a symbol ARM32JIT. By default it will continue to build the Thumb2 JIT. To change it to build the ARM32 JIT by default add -DARM32JIT to CFLAGS in zeroshark.make as in the following patch. http://openjdk.linaro.org/arm32jit/patches/6047.patch I have put an image at http://openjdk.linaro.org/arm32jit/images/arm32jit.tgz I would be grateful if people could try out this image, especially on Raspberry PI. Some influential environment variables are T2_COMPILE_ARM Force it to compile for ARM32. By default it still compiles for Thumb2 on Thumb2 capable cores, setting this variable will force it to compile for ARM. T2_PRINT_STATISTICS Print some compilation statistics as it compiles T2_PRINT_COMPILATION (or -XX:+PrintCompilation) Print the name of each method as it compiles T2_PRINT_DISASS (or -XX:+UnlockDiagnosticVMOptions -XX:+PrintAssembly) Disassemble each method as it compiles. I have tested the original Thumb2 JIT and the new ARM v6 JIT with hotspot and langtools tests from JTreg. Here are the results I get:- Original Thumb2 JIT Hotspot: Test results: passed: 265; failed: 13; error: 7 Langtools: Test results: passed: 1,957; failed: 1; error: 9 ARMv6 JIT Hotspot: Test results: passed: 266; failed: 8; error: 11 Langtools: Test results: passed: 1,957; failed: 1; error: 9 All comments welcome! Ed. From aph at redhat.com Wed Jan 21 17:16:29 2015 From: aph at redhat.com (Andrew Haley) Date: Wed, 21 Jan 2015 17:16:29 +0000 Subject: RFR: Add support for ARMv6 to ARM JIT In-Reply-To: <1421859993.3200.131.camel@mint> References: <1421859993.3200.131.camel@mint> Message-ID: <54BFDEED.9030506@redhat.com> On 01/21/2015 05:06 PM, Edward Nevill wrote: > Hi, > > The following patch adds support for ARMv6 to the ARM JIT (previously known as the Thumb2 JIT). > > http://openjdk.linaro.org/arm32jit/patches/6046.patch > > The following ARM architectures are now supported > > ARMv6 - Vanilla ARMv6 as on Raspberry PI (No Thumb2, No LDREXD/STREXD) > ARMv6K - ARMv6 with MP support (No Thumb2, but has LDREXD/STREXD) > ARMV6T2 - ARMv6 with Thumb2 and LDREXD/STREXD > ARMV7 - all variants supported > ARMV8 - all variants supported (in AARCH32 mode) > > Note, because of the lack of properly working double/long atomic > primitives on vanilla ARMv6 only non MP is supported on this. The > Raspberry PI is single core so this is not a problem, it just uses > LDM/STM or LDRD/STRD. > > I have based the patches on the icedtea7 tree at > http://icedtea.classpath.org/hg/icedtea7-forest/hotspot Is this the > correct location for the tip of the icedtea7 development? Umm, development? OpenJDK 7 is only a few weeks from being orphaned! > Because of the size of the changes I have introduced a new file > arm32JIT.cpp rather than modifying the existing thumb2.cpp. This is > switched on a symbol ARM32JIT. By default it will continue to build > the Thumb2 JIT. To change it to build the ARM32 JIT by default add > -DARM32JIT to CFLAGS in zeroshark.make as in the following patch. I don't get this. Surely we should have both, switchable at runtime. Andrew. From gnu.andrew at redhat.com Wed Jan 21 17:54:42 2015 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 21 Jan 2015 12:54:42 -0500 (EST) Subject: RFR: Add support for ARMv6 to ARM JIT In-Reply-To: <1421859993.3200.131.camel@mint> References: <1421859993.3200.131.camel@mint> Message-ID: <1290922418.12503977.1421862882016.JavaMail.zimbra@redhat.com> ----- Original Message ----- > Hi, > > The following patch adds support for ARMv6 to the ARM JIT (previously known > as the Thumb2 JIT). > > http://openjdk.linaro.org/arm32jit/patches/6046.patch > > The following ARM architectures are now supported > > ARMv6 - Vanilla ARMv6 as on Raspberry PI (No Thumb2, No LDREXD/STREXD) > ARMv6K - ARMv6 with MP support (No Thumb2, but has LDREXD/STREXD) > ARMV6T2 - ARMv6 with Thumb2 and LDREXD/STREXD > ARMV7 - all variants supported > ARMV8 - all variants supported (in AARCH32 mode) > > Note, because of the lack of properly working double/long atomic primitives > on vanilla ARMv6 only non MP is supported on this. The Raspberry PI is > single core so this is not a problem, it just uses LDM/STM or LDRD/STRD. > > I have based the patches on the icedtea7 tree at > http://icedtea.classpath.org/hg/icedtea7-forest/hotspot Is this the correct > location for the tip of the icedtea7 development? > Yes, this is correct. This will branched for 2.6.0 around the time of the u80 release upstream. > Because of the size of the changes I have introduced a new file arm32JIT.cpp > rather than modifying the existing thumb2.cpp. This is switched on a symbol > ARM32JIT. By default it will continue to build the Thumb2 JIT. To change it > to build the ARM32 JIT by default add -DARM32JIT to CFLAGS in zeroshark.make > as in the following patch. > > http://openjdk.linaro.org/arm32jit/patches/6047.patch > I guess we need to make a decision as to whether to turn it on by default now or wait until it's been in a release as the non-default option. > Thanks for the contribution! -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 18:10:06 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 18:10:06 +0000 Subject: [Bug 2184] New: [IcedTea6] CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2184 Bug ID: 2184 Summary: [IcedTea6] CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 Product: IcedTea Version: 6-1.13.5 Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org ../../../src/share/native/java/lang/Class.c:138: error: undefined reference to 'JVM_FindClassFromCaller' collect2: error: ld returned 1 exit status ../../common/Library.gmk:220: recipe for target '/home/andrew/builder/icedtea6-1.13/openjdk.build-ecj/lib/amd64/libjava.so' failed make[6]: *** [/home/andrew/builder/icedtea6-1.13/openjdk.build-ecj/lib/amd64/libjava.so] Error 1 Needs same fix as 7. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 18:10:23 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 18:10:23 +0000 Subject: [Bug 2184] [IcedTea6] CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2184 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |6-1.13.6 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From 3b5hkp at nottheoilrig.com Wed Jan 21 20:40:24 2015 From: 3b5hkp at nottheoilrig.com (Jack Bates) Date: Wed, 21 Jan 2015 12:40:24 -0800 Subject: NoSuchMethodError: Matcher.quoteReplacement In-Reply-To: <92690351.7038806.1421167541587.JavaMail.zimbra@redhat.com> References: <54B2E5A0.8020504@nottheoilrig.com> <1934335812.6553316.1421112530438.JavaMail.zimbra@redhat.com> <54B4971F.8090405@nottheoilrig.com> <92690351.7038806.1421167541587.JavaMail.zimbra@redhat.com> Message-ID: <54C00EB8.4080005@nottheoilrig.com> On 13/01/15 08:45 AM, Andrew Hughes wrote: > ----- Original Message ----- >> On 12/01/15 05:28 PM, Andrew Hughes wrote: >>> ----- Original Message ----- >>>> I get the following error when I try to build 2.5.3: >>>> >>>> [...] >>>> /home/nottheoilrig/icedtea-2.5.3/generated.build/com/sun/corba/se/impl/logging/UtilSystemException.java >>>> An exception has occurred in the compiler (1.7.0_71_bootstrap). Please >>>> file a bug at the Java Developer Connection >>>> (http://java.sun.com/webapps/bugreport) after checking the Bug Parade >>>> for duplicates. Include your program and the following diagnostic in >>>> your report. Thank you. >>>> java.lang.NoSuchMethodError: method >>>> java.util.regex.Matcher.quoteReplacement with signature >>>> (Ljava.lang.String;)Ljava.lang.String; was not found. >>>> [...] >>>> >>>> Any idea how to resolve it? >>>> Can I provide any additional details? >>>> I downloaded the IcedTea 2.5.3 archive, >>>> ran ./configure and make. >>>> >>>> The following are lines from my config.log, >>>> are they helpful? >>>> >>>> [...] >>>> configure:11304: checking if java.util.regex.Matcher.quoteReplacement is >>>> missing >>>> configure:11354: result: yes >>>> [...] >>>> configure:11820: checking if the VM supports 1.7 bytecode >>>> javac: invalid source release: 7 >>>> Usage: javac >>>> use -help for a list of possible options >>>> configure:11850: result: no >>>> configure:11866: checking whether to disable the use of bootstrap tools >>>> for bootstrapping >>>> configure:11890: result: yes >>>> [...] >>> >>> It's difficult to say much without the full config.log and build log. >> >> Thank you, >> >> here is the config.log: >> http://nottheoilrig.com/java/201501120/config.log >> >> and here is the build log: >> http://nottheoilrig.com/java/201501120/screenlog >> >> Can I provide any additional details? > > This is sufficient, thanks. The main problem is your setup is just too old. > It's about time this machine was upgraded to wheezy, as squeeze is obsolete. > Moreover, wheezy already includes a build of 2.5.3 which will save you > the trouble: https://packages.debian.org/wheezy/openjdk-7-jdk Yes, I'm only building from source because upgrading this machine isn't an option in the near future (although I'm working on it). > The actual problem is a bit convoluted. From the logs, I can see that a very > old version of gcj, 4.4, is being used to bootstrap the build. This is why > many features are found to be missing when your bootstrap JDK is tested during > configure. > > The quoteReplacement method is missing in gcj 4.4, and there is a test to > work around this in configure; if you look for the rt-class-files part > of the build log, you will see it builds > openjdk-boot/jdk/src/share/classes/java/util/regex/Matcher.java before the > OpenJDK build begins, so a version with quoteReplacement is available. > > All would be fine, thanks to this fix, but your javac (provided by gcj) is > too old to build Java 1.7 source code so the use of it to build is disabled. > It instead tries to use the javac it just built and fails because it needs > the missing method. Hrm, actually javac is provided by OpenJDK 6, but I guess that doesn't change a thing because it's also too old to build Java 1.7 source code? config.log: JAVAC='/usr/bin/javac' $ ls -l /usr/bin/javac /usr/bin/javac -> /etc/alternatives/javac $ ls -l /etc/alternatives/javac /etc/alternatives/javac -> /usr/lib/jvm/java-6-openjdk/bin/javac So it tries to use the javac it just built (bootstrap javac?) and fails. What I don't understand is, with --with-jdk-home=/usr/lib/jvm/java-6-openjdk it works! It uses the same javac (/usr/lib/jvm/java-6-openjdk/bin/javac) with and without --with-jdk-home but it works with, and fails without. Another question: It determines that GCJ 4.4/OpenJDK 6 are too old to build Java 1.7 source code, so it builds the bootstrap javac (right?) and it determines that the environment is missing quoteReplacement so it builds and uses Matcher.java to build the bootstrap javac, but then why does the bootstrap javac later fail? If the bootstrap javac is also missing quoteReplacement, then why build Matcher.java if it's not used? (Or used to build the bootstrap javac but not to build the rest?) Is there a case where the environment is missing quoteReplacement but the bootstrap javac isn't? (Maybe Matcher.java is irrelevant and obsolete, like this machine?) > I think it may be possible to fix this by running javac with the patched > runtime on the bootclasspath. However, it's difficult to know without testing > and changing that may break builds with other JDKs. We test builds with gcj > the most, but not a version this old. > > If you have https://packages.debian.org/squeeze/openjdk-6-jdk installed, > then you could try building with --with-jdk-home=/usr/lib/jvm/java-6-openjdk > to use that instead. However, I strongly recommend that you just upgrade > this system as the version of OpenJDK 6 is also outdated (1.13.5 is the latest) > and there are likely to be further missing system dependencies later in the > build that may cause problems, or lead to an incomplete JDK (for example, > NIO2 is likely to be incomplete without certain system calls being present). --with-jdk-home=/usr/lib/jvm/java-6-openjdk works so far, thanks a lot for your help! From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 21:05:10 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 21:05:10 +0000 Subject: [Bug 2181] [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2181 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- URL| |https://java.net/jira/brows | |e/OPENJDK6-53 --- Comment #5 from Andrew John Hughes --- OPENJDK-6 bug opened: https://java.net/jira/browse/OPENJDK6-53 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 21:09:42 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 21:09:42 +0000 Subject: [Bug 2185] New: [IcedTea6] Application of 6786276 introduces compatibility issue Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2185 Bug ID: 2185 Summary: [IcedTea6] Application of 6786276 introduces compatibility issue Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: major Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org https://java.net/jira/browse/OPENJDK6-52 Serbia & Montenegro ceased to exist in 2006 and its ISO-3166 code "CS" was deleted. 6786276 removes this code for Locale.getISOCountries() and was brought into OpenJDK 6 as part of the changeset for 6627549: "ISO 3166 code addition: Saint Barthelemy and Saint Martin". 6627549 was backported to the proprietary 6u14 release but 6786276 was not, and this introduces a difference between the behaviour of OpenJDK 6 and the proprietary Oracle JDK 6. We should revert the fix and bring Serbia & Montenegro back into existence, at least as far as Locale.getISOCountries() is concerned. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 21:10:05 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 21:10:05 +0000 Subject: [Bug 2185] [IcedTea6] Application of 6786276 introduces compatibility issue In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2185 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED URL| |https://java.net/jira/brows | |e/OPENJDK6-52 Target Milestone|--- |6-1.13.6 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 21:12:02 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 21:12:02 +0000 Subject: [Bug 2186] New: [IcedTea6] Backport 6730740: "Fix for 6729881 has apparently broken several 64 bit tests: 'Bad address'" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2186 Bug ID: 2186 Summary: [IcedTea6] Backport 6730740: "Fix for 6729881 has apparently broken several 64 bit tests: 'Bad address'" Product: IcedTea Version: 6-1.13.6 Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 21:12:14 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 21:12:14 +0000 Subject: [Bug 2186] [IcedTea6] Backport 6730740: "Fix for 6729881 has apparently broken several 64 bit tests: 'Bad address'" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2186 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |6-1.13.6 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 21:15:04 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 21:15:04 +0000 Subject: [Bug 2187] New: [IcedTea6] Sync patch for 4873188 with 7 version Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2187 Bug ID: 2187 Summary: [IcedTea6] Sync patch for 4873188 with 7 version Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org https://java.net/jira/browse/OPENJDK6-51 A fragment of 7031830 was accidentally included in the backport of 4873188. It doesn't cause any problems (it actually fixes a bug), but we should sync with the original 7 version of 4873188 and then apply 7031830 in full. Comparison of sun.security.ssl.SSLEngineImpl with the 7 version shows that the placement of a later block from 7064341: "HTTPS: block-wise chosen-plaintext attack against SSL/TLS (BEAST)" is incorrect; it should be further up. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 21:15:40 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 21:15:40 +0000 Subject: [Bug 2187] [IcedTea6] Sync patch for 4873188 with 7 version In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2187 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED URL| |https://java.net/jira/brows | |e/OPENJDK6-51 Target Milestone|--- |6-1.13.6 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 21:16:30 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 21:16:30 +0000 Subject: [Bug 2181] [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2181 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|6-1.13.7 |6-1.13.6 --- Comment #6 from Andrew John Hughes --- Will be included in 1.13.6. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 21:18:19 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 21:18:19 +0000 Subject: [Bug 2182] [IcedTea6] 6911104 reintroduces test fragment removed in existing 6964018 backport In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2182 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|6-1.13.7 |6-1.13.6 --- Comment #1 from Andrew John Hughes --- To be included in 1.13.6. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Wed Jan 21 22:22:50 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 21 Jan 2015 22:22:50 +0000 Subject: /hg/release/icedtea6-1.13: 2 new changesets Message-ID: changeset 024da504977d in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=024da504977d author: Andrew John Hughes date: Wed Jan 21 18:48:53 2015 +0000 PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 2014-10-29 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch for CACAO builds. * NEWS: Updated. * patches/cacao/pr2184.patch: Implement JVM_FindClassFromCaller as same as JVM_FindClassFromClassLoader for now. changeset 8693268730ca in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=8693268730ca author: Andrew John Hughes date: Wed Jan 21 22:22:34 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. diffstat: ChangeLog | 23 + Makefile.am | 11 +- NEWS | 8 + patches/cacao/pr2184.patch | 75 + patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch | 55 + patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch | 522 ++++++++++ patches/openjdk/oj51-pr2187-sync_4873188.patch | 58 + patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch | 73 + patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch | 25 + patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch | 15 + 10 files changed, 863 insertions(+), 2 deletions(-) diffs (truncated from 934 to 500 lines): diff -r 15e9801d9167 -r 8693268730ca ChangeLog --- a/ChangeLog Tue Jan 20 11:35:12 2015 +0000 +++ b/ChangeLog Wed Jan 21 22:22:34 2015 +0000 @@ -1,3 +1,26 @@ +2015-01-21 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add patches below. + * NEWS: Updated. + * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, + * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, + * patches/openjdk/oj51-pr2187-sync_4873188.patch, + * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, + * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, + * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: + New patches to fix issues found in b34. + +2014-10-29 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch for CACAO + builds. + * NEWS: Updated. + * patches/cacao/pr2184.patch: + Implement JVM_FindClassFromCaller as same + as JVM_FindClassFromClassLoader for now. + 2015-01-19 Andrew John Hughes * Makefile.am: diff -r 15e9801d9167 -r 8693268730ca Makefile.am --- a/Makefile.am Tue Jan 20 11:35:12 2015 +0000 +++ b/Makefile.am Wed Jan 21 22:22:34 2015 +0000 @@ -601,7 +601,13 @@ patches/pr2070-type_punning_warnings.patch \ patches/pr2082-s390_type_fixes.patch \ patches/pr2096-4096-bit_dh.patch \ - patches/pr2179-avoid_x86_workaround_on_zero.patch + patches/pr2179-avoid_x86_workaround_on_zero.patch \ + patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch \ + patches/openjdk/oj51-pr2187-sync_4873188.patch \ + patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch \ + patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch \ + patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch \ + patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -613,7 +619,8 @@ patches/cacao/launcher.patch \ patches/cacao/memory.patch \ patches/cacao/hotspot/original/memory.patch \ - patches/cacao/armhf.patch + patches/cacao/armhf.patch \ + patches/cacao/pr2184.patch else if USING_CACAO ICEDTEA_PATCHES += \ diff -r 15e9801d9167 -r 8693268730ca NEWS --- a/NEWS Tue Jan 20 11:35:12 2015 +0000 +++ b/NEWS Wed Jan 21 22:22:34 2015 +0000 @@ -164,6 +164,12 @@ - S8062807: Exporting RMI objects fails when run under restrictive SecurityManager - S8064560: (tz) Support tzdata2014j * Backports + - OJ51, PR2187: Sync patch for 4873188 with 7 version + - OJ52, PR2185: Application of 6786276 introduces compatibility issue + - OJ53, PR2181: strict-aliasing warnings issued on PPC32 + - OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport + - S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" + - S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine - S8000897, PR2173, RH1155012: VM crash in CompileBroker - S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object - S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. @@ -179,6 +185,8 @@ - PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS - PR2179: Avoid x86 workaround when running Zero rather than a JIT - PR2180: Old autotools dislike $(builddir)/fsg.sh +* CACAO + - PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 New in release 1.13.5 (2014-10-14): diff -r 15e9801d9167 -r 8693268730ca patches/cacao/pr2184.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/pr2184.patch Wed Jan 21 22:22:34 2015 +0000 @@ -0,0 +1,75 @@ +# HG changeset patch +# User Xerxes R??nby +# Date 1414362363 -3600 +# Node ID ec6bd33b3e927738d1353e6e639e76f74d55635f +# Parent ea3c9a40d975430d1e9dcb598bf25b4bd7aec4ca +OpenJDK: Implement JVM_FindClassFromCaller + +8015256: Better class accessibility +Summary: Improve protection domain check in forName() + +* contrib/mapfile-vers-product: Export said function. +* src/native/vm/openjdk/jvm.cpp (JVM_FindClassFromCaller): Implement it. + +diff --git a/contrib/mapfile-vers-product b/contrib/mapfile-vers-product +--- cacao/cacao/contrib/mapfile-vers-product ++++ cacao/cacao/contrib/mapfile-vers-product +@@ -87,6 +87,7 @@ + JVM_Exit; + JVM_FillInStackTrace; + JVM_FindClassFromBootLoader; ++ JVM_FindClassFromCaller; + JVM_FindClassFromClass; + JVM_FindClassFromClassLoader; + JVM_FindLibraryEntry; +--- cacao/cacao/src/native/vm/openjdk/jvm.cpp.orig 2014-10-29 16:40:30.732305204 +0000 ++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2014-10-29 16:44:06.643292016 +0000 +@@ -684,6 +684,48 @@ + } + + ++/* JVM_FindClassFromCaller ++ * Find a class from a given class loader. Throws ClassNotFoundException. ++ * name: name of class ++ * init: whether initialization is done ++ * loader: class loader to look up the class. ++ * This may not be the same as the caller's class loader. ++ * caller: initiating class. The initiating class may be null when a security ++ * manager is not installed. ++ * ++ * Find a class with this name in this loader, ++ * using the caller's "protection domain". ++ */ ++ ++jclass JVM_FindClassFromCaller(JNIEnv* env, const char* name, jboolean init, jobject loader, jclass caller) ++{ ++ classinfo *c; ++ utf *u; ++ classloader_t *cl; ++ ++ TRACEJVMCALLS(("JVM_FindClassFromCaller(name=%s, init=%d, loader=%p, caller=%p)", name, init, loader, caller)); ++ ++ u = utf_new_char(name); ++ cl = loader_hashtable_classloader_add((java_handle_t *) loader); ++ ++ /* XXX The caller's protection domain should be used during ++ the load_class_from_classloader but there is no specification or ++ unit-test in OpenJDK documenting the desired effect */ ++ ++ c = load_class_from_classloader(u, cl); ++ ++ if (c == NULL) ++ return NULL; ++ ++ if (init) ++ if (!(c->state & CLASS_INITIALIZED)) ++ if (!initialize_class(c)) ++ return NULL; ++ ++ return (jclass) LLNI_classinfo_wrap(c); ++} ++ ++ + /* JVM_FindClassFromClassLoader */ + + jclass JVM_FindClassFromClassLoader(JNIEnv* env, const char* name, jboolean init, jobject loader, jboolean throwError) diff -r 15e9801d9167 -r 8693268730ca patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch Wed Jan 21 22:22:34 2015 +0000 @@ -0,0 +1,55 @@ +# HG changeset patch +# User chegar +# Date 1217350415 25200 +# Tue Jul 29 09:53:35 2008 -0700 +# Node ID 629fa51e0281243c7341bce37e4421a7069c72ee +# Parent 31845b0edbd16232f26c266f1f79729fb83a6975 +6730740: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" +Reviewed-by: alanb, jccollet + +diff -r 31845b0edbd1 -r 629fa51e0281 src/solaris/native/java/net/linux_close.c +--- openjdk/jdk/src/solaris/native/java/net/linux_close.c Wed Jan 21 20:57:52 2015 +0000 ++++ openjdk/jdk/src/solaris/native/java/net/linux_close.c Tue Jul 29 09:53:35 2008 -0700 +@@ -281,7 +281,9 @@ + + int NET_RecvFrom(int s, void *buf, int len, unsigned int flags, + struct sockaddr *from, int *fromlen) { +- BLOCKING_IO_RETURN_INT( s, recvfrom(s, buf, len, flags, from, (socklen_t)fromlen) ); ++ socklen_t socklen = *fromlen; ++ BLOCKING_IO_RETURN_INT( s, recvfrom(s, buf, len, flags, from, &socklen) ); ++ *fromlen = socklen; + } + + int NET_Send(int s, void *msg, int len, unsigned int flags) { +@@ -298,7 +300,9 @@ + } + + int NET_Accept(int s, struct sockaddr *addr, int *addrlen) { +- BLOCKING_IO_RETURN_INT( s, accept(s, addr, (socklen_t)addrlen) ); ++ socklen_t socklen = *addrlen; ++ BLOCKING_IO_RETURN_INT( s, accept(s, addr, &socklen) ); ++ *addrlen = socklen; + } + + int NET_Connect(int s, struct sockaddr *addr, int addrlen) { +diff -r 31845b0edbd1 -r 629fa51e0281 src/solaris/native/java/net/net_util_md.c +--- openjdk/jdk/src/solaris/native/java/net/net_util_md.c Wed Jan 21 20:57:52 2015 +0000 ++++ openjdk/jdk/src/solaris/native/java/net/net_util_md.c Tue Jul 29 09:53:35 2008 -0700 +@@ -1104,7 +1104,16 @@ + } + #endif + +- rv = getsockopt(fd, level, opt, result, (socklen_t)len); ++#ifdef __solaris__ ++ rv = getsockopt(fd, level, opt, result, len); ++#else ++ { ++ socklen_t socklen = *len; ++ rv = getsockopt(fd, level, opt, result, &socklen); ++ *len = socklen; ++ } ++#endif ++ + if (rv < 0) { + return rv; + } diff -r 15e9801d9167 -r 8693268730ca patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch Wed Jan 21 22:22:34 2015 +0000 @@ -0,0 +1,522 @@ +# HG changeset patch +# User wetmore +# Date 1421871245 0 +# Wed Jan 21 20:14:05 2015 +0000 +# Node ID 8b1568063cd45ed88422dd8d98f019f9971708e8 +# Parent bbff2a7acd335d23a7946a1b7eedd42946946311 +7031830: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine +Reviewed-by: xuelei, weijun, asaha + +diff -r bbff2a7acd33 -r 8b1568063cd4 src/share/classes/sun/security/ssl/CipherBox.java +--- openjdk/jdk/src/share/classes/sun/security/ssl/CipherBox.java Wed Jan 21 20:02:14 2015 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/ssl/CipherBox.java Wed Jan 21 20:14:05 2015 +0000 +@@ -312,9 +312,11 @@ + byte[] buf = null; + int limit = bb.limit(); + if (bb.hasArray()) { ++ int arrayOffset = bb.arrayOffset(); + buf = bb.array(); +- System.arraycopy(buf, pos, +- buf, pos + prefix.length, limit - pos); ++ System.arraycopy(buf, arrayOffset + pos, ++ buf, arrayOffset + pos + prefix.length, ++ limit - pos); + bb.limit(limit + prefix.length); + } else { + buf = new byte[limit - pos]; +@@ -500,9 +502,10 @@ + byte[] buf = null; + int limit = bb.limit(); + if (bb.hasArray()) { ++ int arrayOffset = bb.arrayOffset(); + buf = bb.array(); +- System.arraycopy(buf, pos + blockSize, +- buf, pos, limit - pos - blockSize); ++ System.arraycopy(buf, arrayOffset + pos + blockSize, ++ buf, arrayOffset + pos, limit - pos - blockSize); + bb.limit(limit - blockSize); + } else { + buf = new byte[limit - pos - blockSize]; +diff -r bbff2a7acd33 -r 8b1568063cd4 test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java Wed Jan 21 20:14:05 2015 +0000 +@@ -0,0 +1,479 @@ ++/* ++ * Copyright (c) 2011, 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 7031830 ++ * @summary bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine ++ * @run main/othervm SSLEngineBadBufferArrayAccess ++ * ++ * SunJSSE does not support dynamic system properties, no way to re-use ++ * system properties in samevm/agentvm mode. ++ */ ++ ++/** ++ * A SSLSocket/SSLEngine interop test case. This is not the way to ++ * code SSLEngine-based servers, but works for what we need to do here, ++ * which is to make sure that SSLEngine/SSLSockets can talk to each other. ++ * SSLEngines can use direct or indirect buffers, and different code ++ * is used to get at the buffer contents internally, so we test that here. ++ * ++ * The test creates one SSLSocket (client) and one SSLEngine (server). ++ * The SSLSocket talks to a raw ServerSocket, and the server code ++ * does the translation between byte [] and ByteBuffers that the SSLEngine ++ * can use. The "transport" layer consists of a Socket Input/OutputStream ++ * and two byte buffers for the SSLEngines: think of them ++ * as directly connected pipes. ++ * ++ * Again, this is a *very* simple example: real code will be much more ++ * involved. For example, different threading and I/O models could be ++ * used, transport mechanisms could close unexpectedly, and so on. ++ * ++ * When this application runs, notice that several messages ++ * (wrap/unwrap) pass before any application data is consumed or ++ * produced. (For more information, please see the SSL/TLS ++ * specifications.) There may several steps for a successful handshake, ++ * so it's typical to see the following series of operations: ++ * ++ * client server message ++ * ====== ====== ======= ++ * write() ... ClientHello ++ * ... unwrap() ClientHello ++ * ... wrap() ServerHello/Certificate ++ * read() ... ServerHello/Certificate ++ * write() ... ClientKeyExchange ++ * write() ... ChangeCipherSpec ++ * write() ... Finished ++ * ... unwrap() ClientKeyExchange ++ * ... unwrap() ChangeCipherSpec ++ * ... unwrap() Finished ++ * ... wrap() ChangeCipherSpec ++ * ... wrap() Finished ++ * read() ... ChangeCipherSpec ++ * read() ... Finished ++ * ++ * This particular bug had a problem where byte buffers backed by an ++ * array didn't offset correctly, and we got bad MAC errors. ++ */ ++import javax.net.ssl.*; ++import javax.net.ssl.SSLEngineResult.*; ++import java.io.*; ++import java.net.*; ++import java.security.*; ++import java.nio.*; ++ ++public class SSLEngineBadBufferArrayAccess { ++ ++ /* ++ * Enables logging of the SSL/TLS operations. ++ */ ++ private static boolean logging = true; ++ ++ /* ++ * Enables the JSSE system debugging system property: ++ * ++ * -Djavax.net.debug=all ++ * ++ * This gives a lot of low-level information about operations underway, ++ * including specific handshake messages, and might be best examined ++ * after gaining some familiarity with this application. ++ */ ++ private static boolean debug = false; ++ private SSLContext sslc; ++ private SSLEngine serverEngine; // server-side SSLEngine ++ private SSLSocket sslSocket; // client-side socket ++ private ServerSocket serverSocket; // server-side Socket, generates the... ++ private Socket socket; // server-side socket that will read ++ ++ private final byte[] serverMsg = "Hi there Client, I'm a Server".getBytes(); ++ private final byte[] clientMsg = "Hello Server, I'm a Client".getBytes(); ++ ++ private ByteBuffer serverOut; // write side of serverEngine ++ private ByteBuffer serverIn; // read side of serverEngine ++ ++ private volatile Exception clientException; ++ private volatile Exception serverException; ++ ++ /* ++ * For data transport, this example uses local ByteBuffers. ++ */ ++ private ByteBuffer cTOs; // "reliable" transport client->server ++ private ByteBuffer sTOc; // "reliable" transport server->client ++ ++ /* ++ * The following is to set up the keystores/trust material. ++ */ ++ private static final String pathToStores = "../../../../../../../etc/"; ++ private static final String keyStoreFile = "keystore"; ++ private static final String trustStoreFile = "truststore"; ++ private static final String passwd = "passphrase"; ++ private static String keyFilename = ++ System.getProperty("test.src", ".") + "/" + pathToStores ++ + "/" + keyStoreFile; ++ private static String trustFilename = ++ System.getProperty("test.src", ".") + "/" + pathToStores ++ + "/" + trustStoreFile; ++ ++ /* ++ * Main entry point for this test. ++ */ ++ public static void main(String args[]) throws Exception { ++ if (debug) { ++ System.setProperty("javax.net.debug", "all"); ++ } ++ ++ String [] protocols = new String [] { ++ "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2" }; ++ ++ for (String protocol : protocols) { ++ log("Testing " + protocol); ++ /* ++ * Run the tests with direct and indirect buffers. ++ */ ++ SSLEngineBadBufferArrayAccess test = ++ new SSLEngineBadBufferArrayAccess(protocol); ++ test.runTest(true); ++ test.runTest(false); ++ } ++ ++ System.out.println("Test Passed."); ++ } ++ ++ /* ++ * Create an initialized SSLContext to use for these tests. ++ */ ++ public SSLEngineBadBufferArrayAccess(String protocol) throws Exception { ++ ++ KeyStore ks = KeyStore.getInstance("JKS"); ++ KeyStore ts = KeyStore.getInstance("JKS"); ++ ++ char[] passphrase = "passphrase".toCharArray(); ++ ++ ks.load(new FileInputStream(keyFilename), passphrase); ++ ts.load(new FileInputStream(trustFilename), passphrase); ++ ++ KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); ++ kmf.init(ks, passphrase); ++ ++ TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); ++ tmf.init(ts); ++ ++ SSLContext sslCtx = SSLContext.getInstance(protocol); ++ ++ sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); ++ ++ sslc = sslCtx; ++ } ++ ++ /* ++ * Run the test. ++ * ++ * Sit in a tight loop, with the server engine calling wrap/unwrap ++ * regardless of whether data is available or not. We do this until ++ * we get the application data. Then we shutdown and go to the next one. ++ * ++ * The main loop handles all of the I/O phases of the SSLEngine's ++ * lifetime: ++ * ++ * initial handshaking ++ * application data transfer ++ * engine closing ++ * ++ * One could easily separate these phases into separate ++ * sections of code. ++ */ ++ private void runTest(boolean direct) throws Exception { ++ boolean serverClose = direct; ++ ++ serverSocket = new ServerSocket(0); ++ int port = serverSocket.getLocalPort(); ++ Thread thread = createClientThread(port, serverClose); ++ ++ socket = serverSocket.accept(); ++ socket.setSoTimeout(500); ++ serverSocket.close(); ++ ++ createSSLEngine(); ++ createBuffers(direct); ++ ++ try { ++ boolean closed = false; ++ ++ InputStream is = socket.getInputStream(); ++ OutputStream os = socket.getOutputStream(); ++ ++ SSLEngineResult serverResult; // results from last operation ++ ++ /* ++ * Examining the SSLEngineResults could be much more involved, ++ * and may alter the overall flow of the application. ++ * ++ * For example, if we received a BUFFER_OVERFLOW when trying ++ * to write to the output pipe, we could reallocate a larger From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 22:23:00 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 22:23:00 +0000 Subject: [Bug 2184] [IcedTea6] CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2184 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=024da504977d author: Andrew John Hughes date: Wed Jan 21 18:48:53 2015 +0000 PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 2014-10-29 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch for CACAO builds. * NEWS: Updated. * patches/cacao/pr2184.patch: Implement JVM_FindClassFromCaller as same as JVM_FindClassFromClassLoader for now. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 22:23:15 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 22:23:15 +0000 Subject: [Bug 2181] [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2181 --- Comment #7 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=8693268730ca author: Andrew John Hughes date: Wed Jan 21 22:22:34 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 22:23:18 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 22:23:18 +0000 Subject: [Bug 2182] [IcedTea6] 6911104 reintroduces test fragment removed in existing 6964018 backport In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2182 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=8693268730ca author: Andrew John Hughes date: Wed Jan 21 22:22:34 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 22:23:21 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 22:23:21 +0000 Subject: [Bug 2183] [IcedTea6] Complete backport of 7031830, accidentally included in 4873188 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2183 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=8693268730ca author: Andrew John Hughes date: Wed Jan 21 22:22:34 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 22:23:24 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 22:23:24 +0000 Subject: [Bug 2185] [IcedTea6] Application of 6786276 introduces compatibility issue In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2185 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=8693268730ca author: Andrew John Hughes date: Wed Jan 21 22:22:34 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 22:23:28 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 22:23:28 +0000 Subject: [Bug 2186] [IcedTea6] Backport 6730740: "Fix for 6729881 has apparently broken several 64 bit tests: 'Bad address'" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2186 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=8693268730ca author: Andrew John Hughes date: Wed Jan 21 22:22:34 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 22:23:31 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 22:23:31 +0000 Subject: [Bug 2187] [IcedTea6] Sync patch for 4873188 with 7 version In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2187 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=8693268730ca author: Andrew John Hughes date: Wed Jan 21 22:22:34 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 21 22:27:39 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 21 Jan 2015 22:27:39 +0000 Subject: [Bug 2181] [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2181 Stefan Ring changed: What |Removed |Added ---------------------------------------------------------------------------- Hardware|x86_64 |ppc -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gnu.andrew at redhat.com Wed Jan 21 22:30:45 2015 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 21 Jan 2015 17:30:45 -0500 (EST) Subject: NoSuchMethodError: Matcher.quoteReplacement In-Reply-To: <54C00EB8.4080005@nottheoilrig.com> References: <54B2E5A0.8020504@nottheoilrig.com> <1934335812.6553316.1421112530438.JavaMail.zimbra@redhat.com> <54B4971F.8090405@nottheoilrig.com> <92690351.7038806.1421167541587.JavaMail.zimbra@redhat.com> <54C00EB8.4080005@nottheoilrig.com> Message-ID: <983053930.12707161.1421879445072.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 13/01/15 08:45 AM, Andrew Hughes wrote: > > ----- Original Message ----- > >> On 12/01/15 05:28 PM, Andrew Hughes wrote: > >>> ----- Original Message ----- > >>>> I get the following error when I try to build 2.5.3: > >>>> > >>>> [...] > >>>> /home/nottheoilrig/icedtea-2.5.3/generated.build/com/sun/corba/se/impl/logging/UtilSystemException.java > >>>> An exception has occurred in the compiler (1.7.0_71_bootstrap). Please > >>>> file a bug at the Java Developer Connection > >>>> (http://java.sun.com/webapps/bugreport) after checking the Bug Parade > >>>> for duplicates. Include your program and the following diagnostic in > >>>> your report. Thank you. > >>>> java.lang.NoSuchMethodError: method > >>>> java.util.regex.Matcher.quoteReplacement with signature > >>>> (Ljava.lang.String;)Ljava.lang.String; was not found. > >>>> [...] > >>>> > >>>> Any idea how to resolve it? > >>>> Can I provide any additional details? > >>>> I downloaded the IcedTea 2.5.3 archive, > >>>> ran ./configure and make. > >>>> > >>>> The following are lines from my config.log, > >>>> are they helpful? > >>>> > >>>> [...] > >>>> configure:11304: checking if java.util.regex.Matcher.quoteReplacement is > >>>> missing > >>>> configure:11354: result: yes > >>>> [...] > >>>> configure:11820: checking if the VM supports 1.7 bytecode > >>>> javac: invalid source release: 7 > >>>> Usage: javac > >>>> use -help for a list of possible options > >>>> configure:11850: result: no > >>>> configure:11866: checking whether to disable the use of bootstrap tools > >>>> for bootstrapping > >>>> configure:11890: result: yes > >>>> [...] > >>> > >>> It's difficult to say much without the full config.log and build log. > >> > >> Thank you, > >> > >> here is the config.log: > >> http://nottheoilrig.com/java/201501120/config.log > >> > >> and here is the build log: > >> http://nottheoilrig.com/java/201501120/screenlog > >> > >> Can I provide any additional details? > > > > This is sufficient, thanks. The main problem is your setup is just too old. > > It's about time this machine was upgraded to wheezy, as squeeze is > > obsolete. > > Moreover, wheezy already includes a build of 2.5.3 which will save you > > the trouble: https://packages.debian.org/wheezy/openjdk-7-jdk > > Yes, I'm only building from source because upgrading > this machine isn't an option in the near future > (although I'm working on it). > Ok. > > The actual problem is a bit convoluted. From the logs, I can see that a > > very > > old version of gcj, 4.4, is being used to bootstrap the build. This is why > > many features are found to be missing when your bootstrap JDK is tested > > during > > configure. > > > > The quoteReplacement method is missing in gcj 4.4, and there is a test to > > work around this in configure; if you look for the rt-class-files part > > of the build log, you will see it builds > > openjdk-boot/jdk/src/share/classes/java/util/regex/Matcher.java before the > > OpenJDK build begins, so a version with quoteReplacement is available. > > > > All would be fine, thanks to this fix, but your javac (provided by gcj) is > > too old to build Java 1.7 source code so the use of it to build is > > disabled. > > It instead tries to use the javac it just built and fails because it needs > > the missing method. > > Hrm, actually javac is provided by OpenJDK 6, but I guess that doesn't > change a thing because it's also too old to build Java 1.7 source code? > It is, but that's not the issue; the issue is a combination of gcj both not handling 1.7 source code and missing java.util.regex.Matcher.quoteReplacement. OpenJDK 6 doesn't suffer from the latter. > config.log: > JAVAC='/usr/bin/javac' > > $ ls -l /usr/bin/javac > /usr/bin/javac -> /etc/alternatives/javac > $ ls -l /etc/alternatives/javac > /etc/alternatives/javac -> /usr/lib/jvm/java-6-openjdk/bin/javac > > So it tries to use the javac it just built (bootstrap javac?) and fails. > What I don't understand is, > with --with-jdk-home=/usr/lib/jvm/java-6-openjdk it works! > It uses the same javac (/usr/lib/jvm/java-6-openjdk/bin/javac) > with and without --with-jdk-home but it works with, and fails without. > No, the old logs were using javac from gcj. > Another question: > It determines that GCJ 4.4/OpenJDK 6 are too old to build Java 1.7 Just GCJ 4. It was completely ignoring OpenJDK 6. > source code, so it builds the bootstrap javac (right?) > and it determines that the environment is missing quoteReplacement > so it builds and uses Matcher.java to build the bootstrap javac, > but then why does the bootstrap javac later fail? > If the bootstrap javac is also missing quoteReplacement, > then why build Matcher.java if it's not used? > (Or used to build the bootstrap javac but not to build the rest?) > Is there a case where the environment is missing quoteReplacement > but the bootstrap javac isn't? > (Maybe Matcher.java is irrelevant and obsolete, like this machine?) It could be, and that's what I considered as a potential fix for the original failure. The problem is that changing the build could break builds with other JDKs, and I'm not sure the risk is worth it for such a limited use case. Even if you just had GCJ, you could use that to build IcedTea 1.x/OpenJDK 6, then build IcedTea 2.x with that. > > > I think it may be possible to fix this by running javac with the patched > > runtime on the bootclasspath. However, it's difficult to know without > > testing > > and changing that may break builds with other JDKs. We test builds with gcj > > the most, but not a version this old. > > > > If you have https://packages.debian.org/squeeze/openjdk-6-jdk installed, > > then you could try building with > > --with-jdk-home=/usr/lib/jvm/java-6-openjdk > > to use that instead. However, I strongly recommend that you just upgrade > > this system as the version of OpenJDK 6 is also outdated (1.13.5 is the > > latest) > > and there are likely to be further missing system dependencies later in the > > build that may cause problems, or lead to an incomplete JDK (for example, > > NIO2 is likely to be incomplete without certain system calls being > > present). > > --with-jdk-home=/usr/lib/jvm/java-6-openjdk works so far, > thanks a lot for your help! > No problem. Thanks for making us aware of the issue! -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From andrew at icedtea.classpath.org Thu Jan 22 00:54:48 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:54:48 +0000 Subject: /hg/icedtea6: 12 new changesets Message-ID: changeset 3f63f5568e7f in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3f63f5568e7f author: Andrew John Hughes date: Fri Oct 24 02:53:21 2014 +0100 Bump to next version, b34. 2014-10-24 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Bump to next release, b34. changeset d6a1b5eb846b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d6a1b5eb846b author: Andrew John Hughes date: Wed Dec 24 18:48:30 2014 +0000 Merge changeset ccfb83ff9e78 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ccfb83ff9e78 author: Andrew John Hughes date: Mon Jan 19 17:52:30 2015 +0000 Sync with upstream OpenJDK 6 repository. Upstream changes: - OJ43: Backport JAX_WS-945; Socket backlog may be limiting lwhs performance - S6364329: jstat displays "invalid argument count" with usage - S6507067: TimeZone country/area message error - S6585666: Spanish language names not compliant with CLDR - S6608572: Currency change for Malta and Cyprus - S6610748: Dateformat - AM-PM indicator in Finnish appears to be from English - S6627549: ISO 3166 code addition: Saint Barthelemy and Saint Martin - S6645271: Wrong date format for Croatian (hr) locale - S6646611: Incorrect spelling of month name in locale for Belarusian language ("be", "BY") - S6647452: Remove obfuscation, framework and provider self-verification checking - S6716626: Integrate contributed language and country names for NL - S6786276: Locale.getISOCountries() still contains country code "CS" - S6868106: Ukrainian currency has wrong format - S6870908: reopen bug 4244752: month names in Estonian should be lowercase - S6873931: New Turkish currency since 2009 - S6910489: Slovenia Locale, wrong firstDayOfWeek number - S6914413: abbreviation name for November is not correct in be_BY - S6916787: Ukrainian currency name needs to be fixed - S6919624: minimalDaysInFirstWeek ressource for hungarian is wrong - S6931564: Incorrect display name of Locale for south africa - S6938454: 2 new testcases for bug: Unable to determine generic type in program that compiles under Java 6 - S6938454: Unable to determine generic type in program that compiles under Java 6 - S7019267: Currency Display Names are not localized into pt_BR. - S7020583: Some currency names are missing in some locales - S7020960: CurrencyNames_sr_RS.properties is missing. - S7025837: fix plural currency display names in sr_Latn_(BA|ME|RS).properties - S7028073: The currency symbol for Peru is wrong - S7036905: [de] dem - the german mark display name is incorrect - S7066203: Update currency data to the latest ISO 4217 standard - S7077119: remove past transition dates from CurrencyData.properties file - S7085757: Currency Data: ISO 4217 Amendment 152 - S7122142: (ann) Race condition between isAnnotationPresent and getAnnotations - S7161796: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror - S7171028: dots are missed in the datetime for Slovanian - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations - S7189611: Venezuela current Currency should be Bs.F. - S7195759: ISO 4217 Amendment 154 - S7201205: Add Makefile configuration option to build with unlimited crypto in OpenJDK. - S8005232: (JEP-149) Class Instance size reduction - S8006748: getISO3Country() returns wrong value - S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale - S8021121: ISO 4217 Amendment Number 156 - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws java.lang.IllegalStateException: unexpected condition - S8027695: There should be a space before % sign in Swedish locale - S8055222: Currency update needed for ISO 4217 Amendment #159 2015-01-19 Andrew John Hughes * patches/clean-crypto.patch: Removed; replaced by inclusion of UNLIMITED_CRYPTO=true solution upstream. * patches/openjdk/7122142-annotation_race_condition.patch, * patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch: Remove patches included upstream. * Makefile.am: (ICEDTEA_PATCHES): Remove above patches. (ICEDTEA_ENV): Set UNLIMITED_CRYPTO=true. * NEWS: Updated. * patches/openjdk/4963723-implement_sha-224.patch: Regenerated following backport of 6647452 upstream. * patches/openjdk/7044060-support_nsa_suite_b.patch: Likewise. * patches/openjdk/7106773-512_bits_rsa.patch: Likewise. * patches/openjdk/8006935-long_keys_in_hmac_prf.patch: Likewise. * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch: Likewise. * patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch: Likewise. 2015-01-05 Andrew John Hughes * patches/ecj/pr64174.patch: Drop the Lithuanian changeover date now, as it's in the past. 2014-12-04 Andrew John Hughes * Makefile.am: (ICEDTEA_ECJ_PATCHES): Add workaround for bug in parsing end-of-year dates (Classpath PR64174). * acinclude.m4: (IT_PR64174_CHECK): Detect if the boot JDK suffers from PR64174 and apply the patch if so. * configure.ac: Call IT_PR64174_CHECK. * patches/ecj/pr64174.patch: Drop the Latvian Euro changeover date, which is in the past anyway, and move Lithuania's two hours forward so it enters 2015 and avoids the bug. changeset ee1714db3b97 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ee1714db3b97 author: Andrew John Hughes date: Tue Jan 20 04:38:55 2015 +0000 Bring in 2015/01/20 security update. Upstream changes: - OJ44: Add missing TimeZone test cases included in OpenJDK 7 revision 0. - OJ45: Fix copyright headers on imported files - OJ46: Fix lost Classpath exception - OJ47: Remove @Override annotation on interfaces added by 2015/01/20 security fixes. - OJ48: Fix substitution error. - S4873188: Support TLS 1.1 - S6461635: [TESTBUG] BasicTests.sh test fails intermittently - S6541350: TimeZone display names localization - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec - S6578647: Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication() - S6587676: Krb5LoginModule failure if useTicketCache=true on Vista - S6631048: Problem when writing on output stream of HttpURLConnection - S6641309: Wrong Cookie separator used in HttpURLConnection - S6641312: Fix krb5 codes indentation problems - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems - S6659779: HttpURLConnections logger should log tunnel requests - S6670362: HTTP/SPNEGO should work across realms - S6706974: Add krb5 test infrastructure - S6720866: Slow performance using HttpURLConnection for upload - S6726695: HttpURLConnection shoul support 'Expect: 100-contimue' headers for PUT - S6729881: Compiler warning in networking native code - S6761072: new krb5 tests fail on multiple platforms - S6765491: Krb5LoginModule a little too restrictive, and the doc is not clear. - S6776102: sun/util/resources/TimeZone/Bug6317929.java test failed against 6u12b01 and passed against 6u11b03 - S6792180: Enhance to reject weak algorithms or conform to crypto recommendations - S6811297: Add more logging to HTTP protocol handler - S6821191: Timezone display name localization - S6822460: support self-issued certificate - S6830658: Changeset 67e5d3e41b5b breaks the fastdebug build in NativeCreds.c - S6835668: Use of /usr/include/linux/ files creates a dependence on kernel-headers - S6855297: Windows build breaks after 6811297 - S6856856: NPE in HTTP protocol handler logging - S6868106: Ukrainian currency has wrong format - S6870908: reopen bug 4244752: month names in Estonian should be lowercase - S6873931: New Turkish currency since 2009 - S6882594: Remove static dependancy on NTLM authentication - S6899503: Security code issue using Verisign root certificate - S6910489: Slovenia Locale, wrong firstDayOfWeek number - S6911104: Tests do not work with CYGWIN: tools, sun/tools, and com/sun/tools - S6914413: abbreviation name for November is not correct in be_BY - S6925851: Localize JRE into pt_BR - S6931566: NetworkInterface is not working when interface name is more than 15 characters long - S6945604: wrong error message in CardImpl.java - S6962617: Testcase changes, cleanup of problem list for jdk_tools targets - S6964714: NetworkInterface getInetAddresses enumerates IPv6 addresses if java.net.preferIPvStack property set - S6967937: Scope id no longer being set after 6931566 - S6972374: NetworkInterface.getNetworkInterfaces throws "java.net.SocketException" on Solaris zone - S6976117: SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets without TLSv1.1 enabled - S6977550: (tz) Support tzdata2010l - S6996686: (tz) Support tzdata2010o - S7001720: copyright templates not rebranded - S7017800: (tz) Support tzdata2011b - S7022269: clean up fscanf usage in Linux networking native code - S7027387: (tz) Support tzdata2011d - S7033174: (tz) Support tzdata2011e - S7035073: Add missing timezones to TimeZoneNames_pt_BR.java - S7035555: 4/4 attach/BasicTests.sh needs another tweak for Cygwin - S7036025: java.security.AccessControlException when creating JFileChooser in signed applet - S7039469: (tz) Support tzdata2011g - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true - S7079012: test/java/net/NetworkInterface/NetParamsTest.java fails with SocketException getting mac address - S7090843: (tz) Support tzdata2011j - S7103108: (tz) Support tzdata2011l - S7103405: Correct display names for Pacific/Apia timezone - S7104126: Insert openjdk copyright header back into TZdata files - S7153184: NullPointerException when calling SSLEngineImpl.getSupportedCipherSuites - S7158483: (tz) Support tzdata2012c - S7174244: NPE in Krb5ProxyImpl.getServerKeys() - S7198570: (tz) Support tzdata2012f - S7199066: Typo in method name - S8002225: (tz) Support tzdata2012i - S8009987: (tz) Support tzdata2013b - S8014469: (tz) Support tzdata2013c - S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE - S8015570: Use long comparison in Rule.getRules(). - S8020054: (tz) Support tzdata2013d - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address - S8023956: Provide a work-around to broken Linux 32 bit "Exec Shield" using CS for NX emulation (crashing with SI_KERNEL) - S8025051: Update resource files for TimeZone display names - S8025255: (tz) Support tzdata2013g - S8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing - S8027359: XML parser returns incorrect parsing results - S8027370: Support tzdata2013h - S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings - S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions - S8029153: [TESTBUG] test/compiler/7141637/SpreadNullArg.java fails because it expects NullPointerException - S8029318: Native Windows ccache still reads DES tickets - S8030822: (tz) Support tzdata2013i - S8031046: Native Windows ccache might still get unsupported ticket - S8032788: ImageIcon constructor throws an NPE and hangs when passed a null String parameter - S8032909: XSLT string-length returns incorrect length when string includes complementary chars - S8035613: With active Securitymanager JAXBContext.newInstance fails - S8037012: (tz) Support tzdata2014a - S8038306: (tz) Support tzdata2014b - S8040617: [macosx] Large JTable cell results in a OutOfMemoryException - S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser - S8043012: (tz) Support tzdata2014c - S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX - S8046656: Update protocol support - S8047125: (ref) More phantom object references - S8047130: Fewer escapes from escape analysis - S8048035: Ensure proper proxy protocols - S8049250: Need a flag to invert the Card.disconnect(reset) argument - S8049253: Better GC validation - S8049343: (tz) Support tzdata2014g - S8050485: super() in a try block in a ctor causes VerifyError - S8050807: Better performing performance data handling - S8051012: Regression in verifier for method call from inside of a branch - S8051614: smartcardio TCK tests fail due to lack of 'reset' permission - S8054367: More references for endpoints - S8055304: More boxing for DirectoryComboBoxModel - S8055309: RMI needs better transportation considerations - S8055479: TLAB stability - S8055489: Better substitution formats - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure - S8056264: Multicast support improvements - S8056276: Fontmanager feature improvements - S8057555: Less cryptic cipher suite management - S8058715: stability issues when being launched as an embedded JVM via JNI - S8058982: Better verification of an exceptional invokespecial - S8059206: (tz) Support tzdata2014i - S8059485: Resolve parsing ambiguity - S8060474: Resolve more parsing ambiguity - S8061210: Issues in TLS - S8061826: Part of JDK-8060474 should be reverted - S8062561: Test bug8055304 fails if file system default directory has read access - S8062807: Exporting RMI objects fails when run under restrictive SecurityManager - S8064560: (tz) Support tzdata2014j 2015-01-19 Andrew John Hughes * patches/openjdk/6541350-tz_display_names_l10n.patch, * patches/openjdk/6706974-krb5_test_infrastructure.patch, * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch, * patches/openjdk/6821191-tz_display_names_l10n.patch, * patches/openjdk/6925851-pt_br.patch, * patches/openjdk/6977550-tzdata2010l.patch, * patches/openjdk/6996686-tzdata2010o.patch, * patches/openjdk/7017800-tzdata2011b.patch, * patches/openjdk/7027387-tzdata2011d.patch, * patches/openjdk/7033174-tzdata2011e.patch, * patches/openjdk/7035073-missing_pt_br_timezones.patch, * patches/openjdk/7039469-tzdata2011g.patch, * patches/openjdk/7090843-tzdata2011j.patch, * patches/openjdk/7103108-tzdata2011l.patch, * patches/openjdk/7103405-correct_display_names.patch, * patches/openjdk/7104126-headers_tzdata.patch, * patches/openjdk/7158483-tzdata2012c.patch, * patches/openjdk/7198570-tzdata2012f.patch, * patches/openjdk/8002225-tzdata2012i.patch, * patches/openjdk/8009987-tzdata2013b.patch, * patches/openjdk/8014469-tzdata2013c.patch, * patches/openjdk/8020054-tzdata2013d.patch, * patches/openjdk/8025255-tzdata2013g.patch: Remove patches included upstream. * Makefile.am: (ICEDTEA_PATCHES): Remove above patches. * NEWS: Updated. * patches/hotspot/hs23/remove_jsr292_tests.patch: Regenerated. * patches/hotspot/hs23/type_fixes.patch: Remove threadLocalAllocBuffer.cpp hunk which is no longer applicable. changeset 102b1e9b36a3 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=102b1e9b36a3 author: Andrew John Hughes date: Tue Jan 20 05:50:58 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. changeset 8c50620ad9c0 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8c50620ad9c0 author: Andrew John Hughes date: Thu Jan 22 00:38:48 2015 +0000 Merge with icedtea6-hg for b34 update. changeset 521041824919 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=521041824919 author: Andrew John Hughes date: Tue Jan 20 06:41:59 2015 +0000 Update to b34 tarball. 2015-01-19 Andrew John Hughes * Makefile.am: (OPENJDK_DATE): Bump to security update release date; 20th of January, 2015. (OPENJDK_SHA256SUM): Update for b34 tarball. changeset d3fe84ca89da in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d3fe84ca89da author: Andrew John Hughes date: Tue Jan 20 08:21:36 2015 +0000 Update tarball to include x86 build fix and backport workaround for Zero from IcedTea 2.x. PR2179: Avoid x86 workaround when running Zero rather than a JIT Upstream changes: - OJ49: Fix placement of 8023956 fix. 2015-01-19 Andrew John Hughes * Makefile.am: (OPENJDK_SHA256SUM): Update for new b34 tarball. (ICEDTEA_PATCHES): Add fix for PR2179. * NEWS: Updated. * patches/pr2179-avoid_x86_workaround_on_zero.patch: Don't apply 8023956 when building Zero on x86. changeset 49e393ce37c9 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=49e393ce37c9 author: Andrew John Hughes date: Tue Jan 20 09:11:26 2015 +0000 Fix another build failure on x86. Upstream changes: - OJ50: Fix reference to missing pd_attempt_reserve_memory_at 2015-01-19 Andrew John Hughes * Makefile.am: (OPENJDK_SHA256SUM): Update for new b34 tarball. * NEWS: Updated. changeset b4b5ba7ebaeb in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b4b5ba7ebaeb author: Andrew John Hughes date: Tue Jan 20 11:35:12 2015 +0000 PR2180: Old autotools dislike $(builddir)/fsg.sh 2015-01-19 Andrew John Hughes * Makefile.am: (extract-openjdk): Use abs_top_builddir instead of builddir to please older versions of autotools. No need to set fsg.sh executable either as we run it via sh. * NEWS: Updated. changeset 00ac747c97a2 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=00ac747c97a2 author: Andrew John Hughes date: Wed Jan 21 18:48:53 2015 +0000 PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 2014-10-29 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch for CACAO builds. * NEWS: Updated. * patches/cacao/pr2184.patch: Implement JVM_FindClassFromCaller as same as JVM_FindClassFromClassLoader for now. changeset 6f0c7f0ded92 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6f0c7f0ded92 author: Andrew John Hughes date: Thu Jan 22 00:48:41 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. diffstat: ChangeLog | 214 + INSTALL | 1 + Makefile.am | 80 +- NEWS | 174 +- acinclude.m4 | 50 +- configure.ac | 5 +- fsg.sh | 91 - fsg.sh.in | 94 + patches/cacao/pr2184.patch | 75 + patches/clean-crypto.patch | 1099 -- patches/ecj/pr64174.patch | 21 + patches/hotspot/hs23/remove_jsr292_tests.patch | 35 +- patches/hotspot/hs23/type_fixes.patch | 96 +- patches/openjdk/4963723-implement_sha-224.patch | 289 +- patches/openjdk/6541350-tz_display_names_l10n.patch | 300 - patches/openjdk/6706974-krb5_test_infrastructure.patch | 2090 ----- patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch | 55 + patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch | 94 - patches/openjdk/6821191-tz_display_names_l10n.patch | 125 - patches/openjdk/6925851-pt_br.patch | 3651 --------- patches/openjdk/6977550-tzdata2010l.patch | 1208 --- patches/openjdk/6996686-tzdata2010o.patch | 93 - patches/openjdk/7017800-tzdata2011b.patch | 265 - patches/openjdk/7027387-tzdata2011d.patch | 522 - patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch | 522 + patches/openjdk/7033174-tzdata2011e.patch | 117 - patches/openjdk/7035073-missing_pt_br_timezones.patch | 1644 ---- patches/openjdk/7039469-tzdata2011g.patch | 116 - patches/openjdk/7044060-support_nsa_suite_b.patch | 125 +- patches/openjdk/7090843-tzdata2011j.patch | 1281 --- patches/openjdk/7103108-tzdata2011l.patch | 1660 ---- patches/openjdk/7103405-correct_display_names.patch | 130 - patches/openjdk/7104126-headers_tzdata.patch | 530 - patches/openjdk/7106773-512_bits_rsa.patch | 2 +- patches/openjdk/7122142-annotation_race_condition.patch | 1955 ---- patches/openjdk/7158483-tzdata2012c.patch | 1482 --- patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch | 40 - patches/openjdk/7198570-tzdata2012f.patch | 841 -- patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch | 29 + patches/openjdk/8000897-use_corresponding_digest_length.patch | 29 - patches/openjdk/8002225-tzdata2012i.patch | 261 - patches/openjdk/8006935-long_keys_in_hmac_prf.patch | 2 +- patches/openjdk/8009987-tzdata2013b.patch | 2275 ----- patches/openjdk/8014469-tzdata2013c.patch | 276 - patches/openjdk/8020054-tzdata2013d.patch | 314 - patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch | 80 + patches/openjdk/8025255-tzdata2013g.patch | 3976 ---------- patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch | 106 + patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch | 36 + patches/openjdk/oj51-pr2187-sync_4873188.patch | 58 + patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch | 73 + patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch | 25 + patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch | 15 + patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch | 7 - patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch | 2 +- patches/pr2070-type_punning_warnings.patch | 36 + patches/pr2082-s390_type_fixes.patch | 20 + patches/pr2083-aarch64_zero.patch | 88 + patches/pr2096-4096-bit_dh.patch | 120 + patches/pr2125.patch | 486 + patches/pr2179-avoid_x86_workaround_on_zero.patch | 33 + patches/rh1022017.patch | 44 + 62 files changed, 2746 insertions(+), 26817 deletions(-) diffs (truncated from 30877 to 500 lines): diff -r cd81722f010d -r 6f0c7f0ded92 ChangeLog --- a/ChangeLog Fri Oct 24 02:51:29 2014 +0100 +++ b/ChangeLog Thu Jan 22 00:48:41 2015 +0000 @@ -1,3 +1,217 @@ +2015-01-21 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add patches below. + * NEWS: Updated. + * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, + * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, + * patches/openjdk/oj51-pr2187-sync_4873188.patch, + * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, + * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, + * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: + New patches to fix issues found in b34. + +2014-10-29 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch for CACAO + builds. + * NEWS: Updated. + * patches/cacao/pr2184.patch: + Implement JVM_FindClassFromCaller as same + as JVM_FindClassFromClassLoader for now. + +2015-01-19 Andrew John Hughes + + * Makefile.am: + (extract-openjdk): Use abs_top_builddir + instead of builddir to please older + versions of autotools. No need to set + fsg.sh executable either as we run it + via sh. + * NEWS: Updated. + +2015-01-19 Andrew John Hughes + + * Makefile.am: + (OPENJDK_SHA256SUM): Update for new b34 tarball. + * NEWS: Updated. + +2015-01-19 Andrew John Hughes + + * Makefile.am: + (OPENJDK_SHA256SUM): Update for new b34 tarball. + (ICEDTEA_PATCHES): Add fix for PR2179. + * NEWS: Updated. + * patches/pr2179-avoid_x86_workaround_on_zero.patch: + Don't apply 8023956 when building Zero on x86. + +2015-01-19 Andrew John Hughes + + * Makefile.am: + (OPENJDK_DATE): Bump to security update release date; + 20th of January, 2015. + (OPENJDK_SHA256SUM): Update for b34 tarball. + +2015-01-19 Andrew John Hughes + + * patches/openjdk/8000897-use_corresponding_digest_length.patch: + Moved to... + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated. + * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: + ...here. + * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, + * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, + * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, + * patches/pr2070-type_punning_warnings.patch, + * patches/pr2082-s390_type_fixes.patch, + * patches/pr2096-4096-bit_dh.patch: + New backports from IcedTea 2.x. + +2015-01-19 Andrew John Hughes + + * patches/openjdk/6541350-tz_display_names_l10n.patch, + * patches/openjdk/6706974-krb5_test_infrastructure.patch, + * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch, + * patches/openjdk/6821191-tz_display_names_l10n.patch, + * patches/openjdk/6925851-pt_br.patch, + * patches/openjdk/6977550-tzdata2010l.patch, + * patches/openjdk/6996686-tzdata2010o.patch, + * patches/openjdk/7017800-tzdata2011b.patch, + * patches/openjdk/7027387-tzdata2011d.patch, + * patches/openjdk/7033174-tzdata2011e.patch, + * patches/openjdk/7035073-missing_pt_br_timezones.patch, + * patches/openjdk/7039469-tzdata2011g.patch, + * patches/openjdk/7090843-tzdata2011j.patch, + * patches/openjdk/7103108-tzdata2011l.patch, + * patches/openjdk/7103405-correct_display_names.patch, + * patches/openjdk/7104126-headers_tzdata.patch, + * patches/openjdk/7158483-tzdata2012c.patch, + * patches/openjdk/7198570-tzdata2012f.patch, + * patches/openjdk/8002225-tzdata2012i.patch, + * patches/openjdk/8009987-tzdata2013b.patch, + * patches/openjdk/8014469-tzdata2013c.patch, + * patches/openjdk/8020054-tzdata2013d.patch, + * patches/openjdk/8025255-tzdata2013g.patch: + Remove patches included upstream. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + * NEWS: Updated. + * patches/hotspot/hs23/remove_jsr292_tests.patch: + Regenerated. + * patches/hotspot/hs23/type_fixes.patch: + Remove threadLocalAllocBuffer.cpp hunk which is + no longer applicable. + +2015-01-19 Andrew John Hughes + + * patches/clean-crypto.patch: Removed; replaced by + inclusion of UNLIMITED_CRYPTO=true solution upstream. + * patches/openjdk/7122142-annotation_race_condition.patch, + * patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch: + Remove patches included upstream. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + (ICEDTEA_ENV): Set UNLIMITED_CRYPTO=true. + * NEWS: Updated. + * patches/openjdk/4963723-implement_sha-224.patch: + Regenerated following backport of 6647452 upstream. + * patches/openjdk/7044060-support_nsa_suite_b.patch: + Likewise. + * patches/openjdk/7106773-512_bits_rsa.patch: Likewise. + * patches/openjdk/8006935-long_keys_in_hmac_prf.patch: Likewise. + * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch: + Likewise. + * patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch: + Likewise. + +2015-01-05 Andrew John Hughes + + * patches/ecj/pr64174.patch: Drop the Lithuanian + changeover date now, as it's in the past. + +2014-12-04 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_ECJ_PATCHES): Add workaround for bug + in parsing end-of-year dates (Classpath PR64174). + * acinclude.m4: + (IT_PR64174_CHECK): Detect if the boot JDK suffers + from PR64174 and apply the patch if so. + * configure.ac: Call IT_PR64174_CHECK. + * patches/ecj/pr64174.patch: Drop the Latvian + Euro changeover date, which is in the past anyway, + and move Lithuania's two hours forward so it enters + 2015 and avoids the bug. + +2014-12-05 Andrew John Hughes + + PR2125: Synchronise elliptic curves in + sun.security.ec.NamedCurve with those listed by NSS + * fsg.sh: Moved to... + * Makefile.am: + (EXTRA_DIST): Remove fsg.sh, now generated + by configure. + (extract-openjdk): Fix path to new generated + fsg.sh and mark as executable + * NEWS: Updated. + * configure.ac: Add fsg.sh to AC_CONFIG_FILES. + * fsg.sh.in: ... here and added application + of PR2125 patch. + * patches/pr2125.patch: Patch to remove curves + unsupported by NSS. + +2015-01-06 Andrew John Hughes + + PR2062: Unset OS before running OpenJDK build + * Makefile.am: + (ICEDTEA_UNSET): Introduce variable to + store unsetting of environment variables. + (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and + JDK_HOME to ICEDTEA_UNSET. + (icedtea): Unset variables prior to running + $(MAKE). + (icedtea-debug): Likewise. + (icedtea-ecj): Likewise. + * NEWS: Updated. + +2014-06-10 Andrew John Hughes + + PR1832, RH1022017: Report elliptic curves + supported by NSS, not the SunEC library + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch when + PKCS11+NSS is enabled, so + that the NSS set of curves are announced + via SSL. + * NEWS: Updated. + * patches/rh1022017.patch: + Reduce number of curves announced over SSL + to just those supported by NSS. + +2014-06-10 Andrew John Hughes + + PR1831: Drop version requirement for LCMS 2 + * INSTALL: Document lcms2 requirement. + * NEWS: Updated. + * acinclude.m4: + (IT_CHECK_FOR_LCMS): Drop 2.5 requirement. + +2014-11-12 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. + * NEWS: Updated. + * patches/pr2083-aarch64_zero.patch: + Add HotSpot support for building Zero on AArch64. + +2014-10-24 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b34. + 2014-10-23 Andrew John Hughes * Makefile.am: diff -r cd81722f010d -r 6f0c7f0ded92 INSTALL --- a/INSTALL Fri Oct 24 02:51:29 2014 +0100 +++ b/INSTALL Thu Jan 22 00:48:41 2015 +0000 @@ -36,6 +36,7 @@ pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java) LLVM 2.5 or later (for --enable-shark) systemtap-sdl-devel >= 0.9.5 (for --enable-systemtap, Java method tracing requires systemtap >= 0.9.9) +lcms2-devel (for --enable-lcms2 and --enable-system-lcms) See ./configure --help if you need to override the defaults. diff -r cd81722f010d -r 6f0c7f0ded92 Makefile.am --- a/Makefile.am Fri Oct 24 02:51:29 2014 +0100 +++ b/Makefile.am Thu Jan 22 00:48:41 2015 +0000 @@ -1,8 +1,8 @@ # Dependencies -OPENJDK_DATE = 14_oct_2014 -OPENJDK_SHA256SUM = cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293 -OPENJDK_VERSION = b33 +OPENJDK_DATE = 20_jan_2015 +OPENJDK_SHA256SUM = 13d1b4e1e152b6f9ad81b5558d6c7c0d3315a9e9494e49e515229722e2ee4e51 +OPENJDK_VERSION = b34 OPENJDK_URL = https://java.net/downloads/openjdk6/ CACAO_VERSION = 68fe50ac34ec @@ -345,7 +345,6 @@ patches/nomotif-mtoolkit.patch \ patches/alt-jar.patch \ patches/jdk-use-ssize_t.patch \ - patches/clean-crypto.patch \ patches/arch.patch \ patches/lc_ctype.patch \ patches/xjc.patch \ @@ -454,9 +453,7 @@ patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ - patches/openjdk/6706974-krb5_test_infrastructure.patch \ patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \ - patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \ patches/ScriptEngineManager-doc.patch \ patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \ patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch \ @@ -507,24 +504,6 @@ patches/openjdk/8014427-raster_regression.patch \ patches/openjdk/8014676-javadebugger_space_in_paths.patch \ patches/openjdk/8014968-OCSP_timeout_default.patch \ - patches/openjdk/6541350-tz_display_names_l10n.patch \ - patches/openjdk/6821191-tz_display_names_l10n.patch \ - patches/openjdk/6925851-pt_br.patch \ - patches/openjdk/6977550-tzdata2010l.patch \ - patches/openjdk/6996686-tzdata2010o.patch \ - patches/openjdk/7017800-tzdata2011b.patch \ - patches/openjdk/7027387-tzdata2011d.patch \ - patches/openjdk/7033174-tzdata2011e.patch \ - patches/openjdk/7035073-missing_pt_br_timezones.patch \ - patches/openjdk/7039469-tzdata2011g.patch \ - patches/openjdk/7090843-tzdata2011j.patch \ - patches/openjdk/7103108-tzdata2011l.patch \ - patches/openjdk/7104126-headers_tzdata.patch \ - patches/openjdk/7103405-correct_display_names.patch \ - patches/openjdk/7158483-tzdata2012c.patch \ - patches/openjdk/7198570-tzdata2012f.patch \ - patches/openjdk/8002225-tzdata2012i.patch \ - patches/openjdk/8009987-tzdata2013b.patch \ patches/openjdk/6636370-appcontext_simplification.patch \ patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \ patches/sparc-ptracefix.patch \ @@ -545,8 +524,6 @@ patches/print_lsb_release.patch \ patches/alternative_krb5_cache.patch \ patches/alternative_krb5_cache_fixup.patch \ - patches/openjdk/8014469-tzdata2013c.patch \ - patches/openjdk/8020054-tzdata2013d.patch \ patches/imageiojpeg_sync.patch \ patches/openjdk/8005194-scale_memory_leak.patch \ patches/openjdk/6563752-ss12_support.patch \ @@ -600,7 +577,6 @@ patches/hotspot/hs23/arm-hsdis.patch \ patches/openjdk/7025066-embedded_build.patch \ patches/s390_casts.patch \ - patches/openjdk/8025255-tzdata2013g.patch \ patches/d729448-32_bit_alignment.patch \ patches/windows-awt.patch \ patches/windows-jdk-sizecalc.patch \ @@ -625,9 +601,21 @@ patches/openjdk/7106773-512_bits_rsa.patch \ patches/pr1904-icedtea_and_distro_versioning.patch \ patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch \ - patches/openjdk/7122142-annotation_race_condition.patch \ - patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch \ - patches/openjdk/8000897-use_corresponding_digest_length.patch + patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch \ + patches/pr2083-aarch64_zero.patch \ + patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch \ + patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch \ + patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch \ + patches/pr2070-type_punning_warnings.patch \ + patches/pr2082-s390_type_fixes.patch \ + patches/pr2096-4096-bit_dh.patch \ + patches/pr2179-avoid_x86_workaround_on_zero.patch \ + patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch \ + patches/openjdk/oj51-pr2187-sync_4873188.patch \ + patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch \ + patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch \ + patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch \ + patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -639,7 +627,8 @@ patches/cacao/launcher.patch \ patches/cacao/memory.patch \ patches/cacao/hotspot/original/memory.patch \ - patches/cacao/armhf.patch + patches/cacao/armhf.patch \ + patches/cacao/pr2184.patch else if USING_CACAO ICEDTEA_PATCHES += \ @@ -666,6 +655,7 @@ endif if ENABLE_NSS +ICEDTEA_PATCHES += patches/rh1022017.patch NSS_PATCHES = patches/nss-config.patch else NSS_PATCHES = patches/nss-not-enabled-config.patch @@ -747,6 +737,12 @@ ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch endif +# If date parsing bug is present, drop Lithuania and Latvia EUR transition +# dates as they are already in the past anyway. +if CP64174 +ICEDTEA_ECJ_PATCHES += patches/ecj/pr64174.patch +endif + ICEDTEA_ECJ_PATCHES += $(DISTRIBUTION_ECJ_PATCHES) # OpenJDK build environment. @@ -778,6 +774,12 @@ WERROR_STATUS=false endif +ICEDTEA_UNSET = \ + JAVAC= \ + JAVA_HOME= \ + JDK_HOME= \ + OS= + ICEDTEA_ENV = \ ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \ ANT="$(ANT)" \ @@ -808,9 +810,6 @@ FT2_LIB="$(FREETYPE2_LIBS)" \ ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ - JAVAC="" \ - JAVA_HOME="" \ - JDK_HOME="" \ ANT_RESPECT_JAVA_HOME="TRUE" \ DISTRIBUTION_ID="$(DIST_ID)" \ DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ @@ -821,7 +820,8 @@ STATIC_CXX="false" \ BUILD_GCC=gcc$(GCC_SUFFIX) \ BUILD_CXX=g++$(GCC_SUFFIX) \ - COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" + COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \ + UNLIMITED_CRYPTO="true" if ENABLE_CACAO ICEDTEA_ENV += \ @@ -941,7 +941,7 @@ contrib arm_port \ overlays \ jconsole.desktop policytool.desktop \ - $(JTREG_SRCS) HACKING pulseaudio fsg.sh \ + $(JTREG_SRCS) HACKING pulseaudio \ hotspot.map \ autogen.sh \ tapset/hotspot.stp.in \ @@ -1226,7 +1226,7 @@ mkdir openjdk ; \ $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \ chmod -R ug+w openjdk ; \ - sh $(abs_top_srcdir)/fsg.sh ; \ + sh $(abs_top_builddir)/fsg.sh ; \ fi endif endif @@ -1664,7 +1664,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ stamps/jamvm.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV) \ -C openjdk \ $(ICEDTEA_BUILD_TARGET) @@ -1695,7 +1695,7 @@ stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ stamps/jamvm.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV) \ -C openjdk \ $(ICEDTEA_DEBUG_BUILD_TARGET) @@ -2079,7 +2079,7 @@ stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ $(OPENJDK_ECJ_TREE) stamps/jamvm.stamp stamps/cacao.stamp \ stamps/rewrite-rhino.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV_ECJ) \ -C openjdk-ecj/ \ $(ICEDTEA_BUILD_TARGET) diff -r cd81722f010d -r 6f0c7f0ded92 NEWS --- a/NEWS Fri Oct 24 02:51:29 2014 +0100 +++ b/NEWS Thu Jan 22 00:48:41 2015 +0000 @@ -14,20 +14,188 @@ New in release 1.14.0 (201X-XX-XX): +* Security fixes + - S8046656: Update protocol support + - S8047125, CVE-2015-0395: (ref) More phantom object references + - S8047130: Fewer escapes from escape analysis + - S8048035, CVE-2015-0400: Ensure proper proxy protocols + - S8049253: Better GC validation + - S8050807, CVE-2015-0383: Better performing performance data handling + - S8054367, CVE-2015-0412: More references for endpoints + - S8055304, CVE-2015-0407: More boxing for DirectoryComboBoxModel + - S8055309, CVE-2015-0408: RMI needs better transportation considerations + - S8055479: TLAB stability + - S8055489, CVE-2014-6585: Better substitution formats + - S8056264, CVE-2014-6587: Multicast support improvements + - S8056276, CVE-2014-6591: Fontmanager feature improvements + - S8057555, CVE-2014-6593: Less cryptic cipher suite management + - S8058982, CVE-2014-6601: Better verification of an exceptional invokespecial + - S8059485, CVE-2015-0410: Resolve parsing ambiguity + - S8061210, CVE-2014-3566: Issues in TLS +* Import of OpenJDK6 b34 + - OJ43: Backport JAX_WS-945; Socket backlog may be limiting lwhs performance + - OJ44: Add missing TimeZone test cases included in OpenJDK 7 revision 0. + - OJ45: Fix copyright headers on imported files + - OJ46: Fix lost Classpath exception + - OJ47: Remove @Override annotation on interfaces added by 2015/01/20 security fixes. + - OJ48: Fix substitution error. + - OJ49: Fix placement of 8023956 fix. + - OJ50: Fix reference to missing pd_attempt_reserve_memory_at + - S4873188: Support TLS 1.1 + - S6364329: jstat displays "invalid argument count" with usage + - S6461635: [TESTBUG] BasicTests.sh test fails intermittently + - S6507067: TimeZone country/area message error + - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec + - S6578647: Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication() + - S6585666: Spanish language names not compliant with CLDR + - S6587676: Krb5LoginModule failure if useTicketCache=true on Vista + - S6608572: Currency change for Malta and Cyprus + - S6610748: Dateformat - AM-PM indicator in Finnish appears to be from English + - S6627549: ISO 3166 code addition: Saint Barthelemy and Saint Martin + - S6631048: Problem when writing on output stream of HttpURLConnection + - S6641309: Wrong Cookie separator used in HttpURLConnection + - S6641312: Fix krb5 codes indentation problems + - S6645271: Wrong date format for Croatian (hr) locale + - S6646611: Incorrect spelling of month name in locale for Belarusian language ("be", "BY") + - S6647452: Remove obfuscation, framework and provider self-verification checking + - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems + - S6659779: HttpURLConnections logger should log tunnel requests + - S6670362: HTTP/SPNEGO should work across realms + - S6716626: Integrate contributed language and country names for NL + - S6720866: Slow performance using HttpURLConnection for upload + - S6726695: HttpURLConnection shoul support 'Expect: 100-continue' headers for PUT + - S6729881: Compiler warning in networking native code + - S6765491: Krb5LoginModule a little too restrictive, and the doc is not clear. From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:55:36 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:55:36 +0000 Subject: [Bug 2177] [IcedTea6] Backport 8028623 so servicability agent works with apps using non-ASCII characters In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2177 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=102b1e9b36a3 author: Andrew John Hughes date: Tue Jan 20 05:50:58 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:55:43 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:55:43 +0000 Subject: [Bug 2082] [IcedTea6] Build fails on s390 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2082 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=102b1e9b36a3 author: Andrew John Hughes date: Tue Jan 20 05:50:58 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:55:47 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:55:47 +0000 Subject: [Bug 2096] [IcedTea6] 2048-bit DH upper bound too small for Fedora infrastructure In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2096 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=102b1e9b36a3 author: Andrew John Hughes date: Tue Jan 20 05:50:58 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:55:53 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:55:53 +0000 Subject: [Bug 2070] [IcedTea6] Type-punning warnings still evident on RHEL 5 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2070 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=102b1e9b36a3 author: Andrew John Hughes date: Tue Jan 20 05:50:58 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:56:00 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:56:00 +0000 Subject: [Bug 2173] [IcedTea6] Backport "8000897: VM crash in CompileBroker" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2173 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=102b1e9b36a3 author: Andrew John Hughes date: Tue Jan 20 05:50:58 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:56:05 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:56:05 +0000 Subject: [Bug 2174] [IcedTea6] Backport "8020190: Wrong argument passed to setupFTContext" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2174 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=102b1e9b36a3 author: Andrew John Hughes date: Tue Jan 20 05:50:58 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:56:12 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:56:12 +0000 Subject: [Bug 2179] [IcedTea6] Avoid x86 workaround when running Zero rather than a JIT In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2179 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=d3fe84ca89da author: Andrew John Hughes date: Tue Jan 20 08:21:36 2015 +0000 Update tarball to include x86 build fix and backport workaround for Zero from IcedTea 2.x. PR2179: Avoid x86 workaround when running Zero rather than a JIT Upstream changes: - OJ49: Fix placement of 8023956 fix. 2015-01-19 Andrew John Hughes * Makefile.am: (OPENJDK_SHA256SUM): Update for new b34 tarball. (ICEDTEA_PATCHES): Add fix for PR2179. * NEWS: Updated. * patches/pr2179-avoid_x86_workaround_on_zero.patch: Don't apply 8023956 when building Zero on x86. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:56:19 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:56:19 +0000 Subject: [Bug 2180] [IcedTea6] Old autotools dislike $(builddir)/fsg.sh In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2180 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=b4b5ba7ebaeb author: Andrew John Hughes date: Tue Jan 20 11:35:12 2015 +0000 PR2180: Old autotools dislike $(builddir)/fsg.sh 2015-01-19 Andrew John Hughes * Makefile.am: (extract-openjdk): Use abs_top_builddir instead of builddir to please older versions of autotools. No need to set fsg.sh executable either as we run it via sh. * NEWS: Updated. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:56:26 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:56:26 +0000 Subject: [Bug 2184] [IcedTea6] CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2184 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=00ac747c97a2 author: Andrew John Hughes date: Wed Jan 21 18:48:53 2015 +0000 PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 2014-10-29 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch for CACAO builds. * NEWS: Updated. * patches/cacao/pr2184.patch: Implement JVM_FindClassFromCaller as same as JVM_FindClassFromClassLoader for now. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:56:45 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:56:45 +0000 Subject: [Bug 2181] [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2181 --- Comment #8 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=6f0c7f0ded92 author: Andrew John Hughes date: Thu Jan 22 00:48:41 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:56:52 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:56:52 +0000 Subject: [Bug 2182] [IcedTea6] 6911104 reintroduces test fragment removed in existing 6964018 backport In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2182 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=6f0c7f0ded92 author: Andrew John Hughes date: Thu Jan 22 00:48:41 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:56:56 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:56:56 +0000 Subject: [Bug 2183] [IcedTea6] Complete backport of 7031830, accidentally included in 4873188 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2183 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=6f0c7f0ded92 author: Andrew John Hughes date: Thu Jan 22 00:48:41 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:57:01 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:57:01 +0000 Subject: [Bug 2185] [IcedTea6] Application of 6786276 introduces compatibility issue In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2185 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=6f0c7f0ded92 author: Andrew John Hughes date: Thu Jan 22 00:48:41 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:57:05 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:57:05 +0000 Subject: [Bug 2186] [IcedTea6] Backport 6730740: "Fix for 6729881 has apparently broken several 64 bit tests: 'Bad address'" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2186 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=6f0c7f0ded92 author: Andrew John Hughes date: Thu Jan 22 00:48:41 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 00:57:08 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 00:57:08 +0000 Subject: [Bug 2187] [IcedTea6] Sync patch for 4873188 with 7 version In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2187 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=6f0c7f0ded92 author: Andrew John Hughes date: Thu Jan 22 00:48:41 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Thu Jan 22 01:27:54 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 22 Jan 2015 01:27:54 +0000 Subject: /hg/release/icedtea7-2.5: 6 new changesets Message-ID: changeset 4795a4f25e49 in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=4795a4f25e49 author: Andrew John Hughes date: Tue Jan 06 20:30:58 2015 +0000 Fix RH bug reference in 2.5.3 release notes. 2015-01-06 Andrew John Hughes * NEWS: Fix RH bug reference in 2.5.3 release notes. changeset bf9210d67acb in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=bf9210d67acb author: Andrew John Hughes date: Wed Jan 21 18:17:25 2015 +0000 PR2064: Unset OS before running OpenJDK build 2015-01-06 Andrew John Hughes PR2064: Unset OS before running OpenJDK build * Makefile.am: (ICEDTEA_UNSET): Introduce variable to store unsetting of environment variables. (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and JDK_HOME to ICEDTEA_UNSET. (icedtea): Unset variables prior to running $(MAKE). (icedtea-debug): Likewise. (icedtea-boot): Likewise. * NEWS: Updated. changeset b08e78ab545a in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=b08e78ab545a author: Andrew John Hughes date: Wed Jan 21 18:20:42 2015 +0000 PR2161: RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_* 2015-01-07 Andrew John Hughes PR2161: RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_* * NEWS: Updated. * acinclude.m4: (IT_CHECK_FOR_GIO): Replace version test with a check for g_settings_new. changeset 17332a8545d8 in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=17332a8545d8 author: Andrew John Hughes date: Thu Jan 22 00:19:21 2015 +0000 PR2050: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 2015-01-07 Andrew John Hughes PR2050: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 * Makefile.am: (ICEDTEA_PATCHES): Add new patch when building JamVM. (EXTRA_DIST): Include patches from JamVM directory. * NEWS: Updated. * patches/jamvm/find_class_from_caller.patch: Backport JamVM patch to implement FindClassFromCaller. changeset 885a6e1730a8 in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=885a6e1730a8 author: Andrew John Hughes date: Thu Jan 22 00:51:01 2015 +0000 PR2171: JamVM builds with executable stack, causing failures on SELinux & PaX kernels 2011-08-15 Pavel Tisnovsky PR2171: JamVM builds with executable stack, causing failures on SELinux & PaX kernels * Makefile.am: (jamvm): Added LDFLAGS for JamVM to fix the SELinux executable flag issue. changeset 45ac6cd7aae2 in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=45ac6cd7aae2 author: Andrew John Hughes date: Thu Jan 22 01:27:39 2015 +0000 PR2032: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 2014-10-29 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch for CACAO builds. * NEWS: Updated. * patches/cacao/pr2032.patch: Implement JVM_FindClassFromCaller as same as JVM_FindClassFromClassLoader for now. diffstat: ChangeLog | 58 ++++++++++++++ Makefile.am | 25 ++++- NEWS | 13 ++- acinclude.m4 | 11 +- patches/cacao/pr2032.patch | 75 ++++++++++++++++++ patches/jamvm/pr2050-find_class_from_caller.patch | 93 +++++++++++++++++++++++ 6 files changed, 261 insertions(+), 14 deletions(-) diffs (390 lines): diff -r 5ecf54fa7dcd -r 45ac6cd7aae2 ChangeLog --- a/ChangeLog Wed Jan 21 03:46:59 2015 +0000 +++ b/ChangeLog Thu Jan 22 01:27:39 2015 +0000 @@ -1,3 +1,61 @@ +2014-10-29 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch for CACAO + builds. + * NEWS: Updated. + * patches/cacao/pr2032.patch: + Implement JVM_FindClassFromCaller as same + as JVM_FindClassFromClassLoader for now. + +2011-08-15 Pavel Tisnovsky + + PR2171: JamVM builds with executable stack, + causing failures on SELinux & PaX kernels + * Makefile.am: + (jamvm): Added LDFLAGS for JamVM + to fix the SELinux executable flag issue. + +2015-01-07 Andrew John Hughes + + PR2050: JamVM lacks JVM_FindClassFromCaller introduced + by security patch in 2.5.3 + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch when building + JamVM. + (EXTRA_DIST): Include patches from JamVM directory. + * NEWS: Updated. + * patches/jamvm/find_class_from_caller.patch: + Backport JamVM patch to implement FindClassFromCaller. + +2015-01-07 Andrew John Hughes + + PR2161: RHEL 6 has a version of GIO which meets + the version criteria, but has no g_settings_* + * NEWS: Updated. + * acinclude.m4: + (IT_CHECK_FOR_GIO): Replace version test with + a check for g_settings_new. + +2015-01-06 Andrew John Hughes + + PR2064: Unset OS before running OpenJDK build + * Makefile.am: + (ICEDTEA_UNSET): Introduce variable to + store unsetting of environment variables. + (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and + JDK_HOME to ICEDTEA_UNSET. + (icedtea): Unset variables prior to running + $(MAKE). + (icedtea-debug): Likewise. + (icedtea-boot): Likewise. + * NEWS: Updated. + +2015-01-06 Andrew John Hughes + + * NEWS: + Fix RH bug reference in 2.5.3 release notes. + 2015-01-20 Andrew John Hughes * Makefile.am: diff -r 5ecf54fa7dcd -r 45ac6cd7aae2 Makefile.am --- a/Makefile.am Wed Jan 21 03:46:59 2015 +0000 +++ b/Makefile.am Thu Jan 22 01:27:39 2015 +0000 @@ -255,7 +255,8 @@ ICEDTEA_PATCHES += \ patches/cacao/launcher.patch \ patches/cacao/memory.patch \ - patches/cacao/armhf.patch + patches/cacao/armhf.patch \ + patches/cacao/pr2032.patch else if USING_CACAO ICEDTEA_PATCHES += \ @@ -268,6 +269,11 @@ patches/cacao/ignore-tests.patch endif +if BUILD_JAMVM +ICEDTEA_PATCHES += \ + patches/jamvm/pr2050-find_class_from_caller.patch +endif + if ENABLE_NSS ICEDTEA_PATCHES += patches/nss-config.patch \ patches/rh1022017.patch @@ -450,6 +456,12 @@ TEST_IN_BUILD=false endif +ICEDTEA_UNSET = \ + JAVAC= \ + JAVA_HOME= \ + JDK_HOME= \ + OS= + ICEDTEA_ENV = \ ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \ ANT="$(ANT)" \ @@ -480,9 +492,6 @@ FT2_LIBS="$(FREETYPE2_LIBS)" \ ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ - JAVAC="" \ - JAVA_HOME="" \ - JDK_HOME="" \ QUIETLY="" \ ANT_RESPECT_JAVA_HOME="TRUE" \ DISTRIBUTION_ID="$(DIST_ID)" \ @@ -773,6 +782,7 @@ $(top_srcdir)/patches/boot/*.patch \ $(top_srcdir)/patches/cacao/*.patch \ $(top_srcdir)/patches/hotspot/*/*.patch \ + $(top_srcdir)/patches/jamvm/*.patch \ tools-copy contrib overlays \ jconsole.desktop policytool.desktop \ $(JTREG_SRCS) HACKING autogen.sh \ @@ -1713,7 +1723,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \ stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV) \ -C openjdk/ \ $(ICEDTEA_BUILD_TARGET) @@ -1823,7 +1833,7 @@ stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \ stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV) \ -C openjdk/ \ $(ICEDTEA_DEBUG_BUILD_TARGET) @@ -1953,7 +1963,7 @@ stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \ stamps/download.stamp $(OPENJDK_BOOT_TREE) stamps/cacao.stamp \ stamps/rewrite-rhino.stamp stamps/jamvm.stamp stamps/generated.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV_BOOT) \ -C openjdk-boot \ $(ICEDTEA_BUILD_TARGET) @@ -2138,6 +2148,7 @@ stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp if BUILD_JAMVM cd jamvm/jamvm && \ + LDFLAGS="-Xlinker -z -Xlinker noexecstack" \ ./autogen.sh --with-java-runtime-library=openjdk7 \ --prefix=$(abs_top_builddir)/jamvm/install ; \ $(MAKE) ; \ diff -r 5ecf54fa7dcd -r 45ac6cd7aae2 NEWS --- a/NEWS Wed Jan 21 03:46:59 2015 +0000 +++ b/NEWS Thu Jan 22 01:27:39 2015 +0000 @@ -103,11 +103,18 @@ - S8066747: Backing out Japanese translation change in awt_ja.properties - S8067364, PR2145, RH114622: Printing to Postscript doesn't support dieresis * Bug fixes + - PR2064: Unset OS before running OpenJDK build - PR2069: Type-punning warnings still evident on RHEL 5 - PR2094, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure - PR2123: SunEC provider crashes when built using system NSS - PR2124: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS - PR2135: Race condition in SunEC provider with system NSS + - PR2161: RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_* +* CACAO + - PR2032: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 +* JamVM + - PR2050: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 + - PR2171: JamVM builds with executable stack, causing failures on SELinux & PaX kernels New in release 2.5.3 (2014-10-14): @@ -137,11 +144,11 @@ - S8042797, CVE-2014-6502: Avoid strawberries in LogRecord - S8044274, CVE-2014-6531: Proper property processing * Backports - - S4963723, RH1131221: Implement SHA-224 - - S7044060, RH1131221: Need to support NSA Suite B Cryptography algorithms + - S4963723, RH1145848: Implement SHA-224 + - S7044060, RH1145848: Need to support NSA Suite B Cryptography algorithms - S7122142: (ann) Race condition between isAnnotationPresent and getAnnotations - S7160837: DigestOutputStream does not turn off digest calculation when "close()" is called - - S8006935, RH1131221: Need to take care of long secret keys in HMAC/PRF compuation + - S8006935, RH1145848: Need to take care of long secret keys in HMAC/PRF compuation - S8012637: Adjust CipherInputStream class to work in AEAD/GCM mode - S8028192: Use of PKCS11-NSS provider in FIPS mode broken - S8038000: java.awt.image.RasterFormatException: Incorrect scanline stride diff -r 5ecf54fa7dcd -r 45ac6cd7aae2 acinclude.m4 --- a/acinclude.m4 Wed Jan 21 03:46:59 2015 +0000 +++ b/acinclude.m4 Thu Jan 22 01:27:39 2015 +0000 @@ -2129,10 +2129,13 @@ AC_MSG_RESULT(${ENABLE_SYSTEM_GIO}) if test x"${ENABLE_SYSTEM_GIO}" = "xyes"; then dnl Check for Gio+ headers and libraries. - PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.26,[GIO_FOUND=yes],[GIO_FOUND=no]) - if test "x${GIO_FOUND}" = xno - then - AC_MSG_ERROR([Could not find GIO >= 2.26; install GIO or build with --disable-system-gio to use the in-tree headers.]) + PKG_CHECK_MODULES(GIO, gio-2.0,[GIO_FOUND=yes],[GIO_FOUND=no]) + OLD_LIBS=${LIBS} + LIBS="${LIBS} ${GIO_LIBS}" + AC_CHECK_FUNC([g_settings_new],[GIO_FUNC_FOUND=yes],[GIO_FUNC_FOUND=no]) + LIBS=${OLD_LIBS} + if test "x${GIO_FOUND}" = xno -o "x${GIO_FUNC_FOUND}" = xno; then + AC_MSG_ERROR([Could not find GIO; install GIO or build with --disable-system-gio to use the in-tree headers.]) fi AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS) diff -r 5ecf54fa7dcd -r 45ac6cd7aae2 patches/cacao/pr2032.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/pr2032.patch Thu Jan 22 01:27:39 2015 +0000 @@ -0,0 +1,75 @@ +# HG changeset patch +# User Xerxes R??nby +# Date 1414362363 -3600 +# Node ID ec6bd33b3e927738d1353e6e639e76f74d55635f +# Parent ea3c9a40d975430d1e9dcb598bf25b4bd7aec4ca +OpenJDK: Implement JVM_FindClassFromCaller + +8015256: Better class accessibility +Summary: Improve protection domain check in forName() + +* contrib/mapfile-vers-product: Export said function. +* src/native/vm/openjdk/jvm.cpp (JVM_FindClassFromCaller): Implement it. + +diff --git a/contrib/mapfile-vers-product b/contrib/mapfile-vers-product +--- cacao/cacao/contrib/mapfile-vers-product ++++ cacao/cacao/contrib/mapfile-vers-product +@@ -87,6 +87,7 @@ + JVM_Exit; + JVM_FillInStackTrace; + JVM_FindClassFromBootLoader; ++ JVM_FindClassFromCaller; + JVM_FindClassFromClass; + JVM_FindClassFromClassLoader; + JVM_FindLibraryEntry; +--- cacao/cacao/src/native/vm/openjdk/jvm.cpp.orig 2014-10-29 16:40:30.732305204 +0000 ++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2014-10-29 16:44:06.643292016 +0000 +@@ -684,6 +684,48 @@ + } + + ++/* JVM_FindClassFromCaller ++ * Find a class from a given class loader. Throws ClassNotFoundException. ++ * name: name of class ++ * init: whether initialization is done ++ * loader: class loader to look up the class. ++ * This may not be the same as the caller's class loader. ++ * caller: initiating class. The initiating class may be null when a security ++ * manager is not installed. ++ * ++ * Find a class with this name in this loader, ++ * using the caller's "protection domain". ++ */ ++ ++jclass JVM_FindClassFromCaller(JNIEnv* env, const char* name, jboolean init, jobject loader, jclass caller) ++{ ++ classinfo *c; ++ utf *u; ++ classloader_t *cl; ++ ++ TRACEJVMCALLS(("JVM_FindClassFromCaller(name=%s, init=%d, loader=%p, caller=%p)", name, init, loader, caller)); ++ ++ u = utf_new_char(name); ++ cl = loader_hashtable_classloader_add((java_handle_t *) loader); ++ ++ /* XXX The caller's protection domain should be used during ++ the load_class_from_classloader but there is no specification or ++ unit-test in OpenJDK documenting the desired effect */ ++ ++ c = load_class_from_classloader(u, cl); ++ ++ if (c == NULL) ++ return NULL; ++ ++ if (init) ++ if (!(c->state & CLASS_INITIALIZED)) ++ if (!initialize_class(c)) ++ return NULL; ++ ++ return (jclass) LLNI_classinfo_wrap(c); ++} ++ ++ + /* JVM_FindClassFromClassLoader */ + + jclass JVM_FindClassFromClassLoader(JNIEnv* env, const char* name, jboolean init, jobject loader, jboolean throwError) diff -r 5ecf54fa7dcd -r 45ac6cd7aae2 patches/jamvm/pr2050-find_class_from_caller.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jamvm/pr2050-find_class_from_caller.patch Thu Jan 22 01:27:39 2015 +0000 @@ -0,0 +1,93 @@ +diff -Nru jamvm.old/src/classlib/openjdk/class.c jamvm/src/classlib/openjdk/class.c +--- jamvm/jamvm.old/src/classlib/openjdk/class.c 2013-11-18 03:45:44.000000000 +0000 ++++ jamvm/jamvm/src/classlib/openjdk/class.c 2015-01-07 16:14:57.599311159 +0000 +@@ -23,6 +23,7 @@ + #include "jam.h" + #include "hash.h" + #include "class.h" ++#include "excep.h" + #include "symbol.h" + + /* Cached offset of classes field in java.lang.ClassLoader objects */ +@@ -161,3 +162,24 @@ + + return strcat(strcpy(endorsed_dirs, java_home), "/lib/endorsed"); + } ++ ++Class *findClassFromLoader(char *name, int init, Object *loader, ++ int throw_error) { ++ ++ Class *class = findClassFromClassLoader(name, loader); ++ ++ if(class == NULL) { ++ if(!throw_error) { ++ Object *excep = exceptionOccurred(); ++ char *dot_name = slash2DotsDup(name); ++ ++ clearException(); ++ signalChainedException(java_lang_ClassNotFoundException, ++ dot_name, excep); ++ sysFree(dot_name); ++ } ++ } else if(init) ++ initClass(class); ++ ++ return class; ++} +diff -Nru jamvm.old/src/classlib/openjdk/jvm.c jamvm/src/classlib/openjdk/jvm.c +--- jamvm/jamvm.old/src/classlib/openjdk/jvm.c 2013-11-18 03:45:44.000000000 +0000 ++++ jamvm/jamvm/src/classlib/openjdk/jvm.c 2015-01-07 16:16:43.560605105 +0000 +@@ -520,26 +520,22 @@ + jclass JVM_FindClassFromClassLoader(JNIEnv *env, const char *name, + jboolean init, jobject loader, + jboolean throw_error) { +- Class *class; + + TRACE("JVM_FindClassFromClassLoader(env=%p, name=%s, init=%d, loader=%p," + " throwError=%d)", env, name, init, loader, throwError); + +- class = findClassFromClassLoader((char *)name, loader); ++ return findClassFromLoader((char *)name, init, loader, throw_error); ++} ++ ++/* JVM_FindClassFromCaller */ ++ ++jclass JVM_FindClassFromCaller(JNIEnv *env, const char *name, jboolean init, ++ jobject loader, jclass caller) { + +- if(class == NULL && !throw_error) { +- Object *excep = exceptionOccurred(); +- char *dot_name = slash2DotsDup((char*)name); +- +- clearException(); +- signalChainedException(java_lang_ClassNotFoundException, +- dot_name, excep); +- sysFree(dot_name); +- } else +- if(init) +- initClass(class); ++ TRACE("JVM_FindClassFromCaller(env=%p, name=%s, init=%d, loader=%p," ++ " caller=%p)", env, name, init, loader, caller); + +- return class; ++ return findClassFromLoader((char *)name, init, loader, FALSE); + } + + +diff -Nru jamvm.old/src/classlib/openjdk/openjdk.h jamvm/src/classlib/openjdk/openjdk.h +--- jamvm/jamvm.old/src/classlib/openjdk/openjdk.h 2013-11-18 03:45:44.000000000 +0000 ++++ jamvm/jamvm/src/classlib/openjdk/openjdk.h 2015-01-07 16:14:57.599311159 +0000 +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2010, 2011, 2013 Robert Lougher . ++ * Copyright (C) 2010, 2011, 2013, 2014 Robert Lougher . + * + * This file is part of JamVM. + * +@@ -53,3 +53,6 @@ + extern Object *resolveMemberName(Class *mh_class, Object *mname); + + extern Object *getMethodParameters(Object *method); ++ ++extern Class *findClassFromLoader(char *name, int init, Object *loader, ++ int throw_error); From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 01:28:01 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 01:28:01 +0000 Subject: [Bug 2064] [IcedTea7] Unset OS before running OpenJDK build In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2064 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.5?cmd=changeset;node=bf9210d67acb author: Andrew John Hughes date: Wed Jan 21 18:17:25 2015 +0000 PR2064: Unset OS before running OpenJDK build 2015-01-06 Andrew John Hughes PR2064: Unset OS before running OpenJDK build * Makefile.am: (ICEDTEA_UNSET): Introduce variable to store unsetting of environment variables. (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and JDK_HOME to ICEDTEA_UNSET. (icedtea): Unset variables prior to running $(MAKE). (icedtea-debug): Likewise. (icedtea-boot): Likewise. * NEWS: Updated. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 01:28:08 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 01:28:08 +0000 Subject: [Bug 2161] [IcedTea7] RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_* In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2161 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.5?cmd=changeset;node=b08e78ab545a author: Andrew John Hughes date: Wed Jan 21 18:20:42 2015 +0000 PR2161: RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_* 2015-01-07 Andrew John Hughes PR2161: RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_* * NEWS: Updated. * acinclude.m4: (IT_CHECK_FOR_GIO): Replace version test with a check for g_settings_new. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 01:28:14 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 01:28:14 +0000 Subject: [Bug 2050] [IcedTea7] JamVM lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2050 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.5?cmd=changeset;node=17332a8545d8 author: Andrew John Hughes date: Thu Jan 22 00:19:21 2015 +0000 PR2050: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 2015-01-07 Andrew John Hughes PR2050: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 * Makefile.am: (ICEDTEA_PATCHES): Add new patch when building JamVM. (EXTRA_DIST): Include patches from JamVM directory. * NEWS: Updated. * patches/jamvm/find_class_from_caller.patch: Backport JamVM patch to implement FindClassFromCaller. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 01:28:20 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 01:28:20 +0000 Subject: [Bug 2171] [IcedTea7] JamVM builds with executable stack, causing failures on SELinux & PaX kernels In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2171 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.5?cmd=changeset;node=885a6e1730a8 author: Andrew John Hughes date: Thu Jan 22 00:51:01 2015 +0000 PR2171: JamVM builds with executable stack, causing failures on SELinux & PaX kernels 2011-08-15 Pavel Tisnovsky PR2171: JamVM builds with executable stack, causing failures on SELinux & PaX kernels * Makefile.am: (jamvm): Added LDFLAGS for JamVM to fix the SELinux executable flag issue. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 01:28:25 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 01:28:25 +0000 Subject: [Bug 2032] [IcedTea7] CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2032 --- Comment #9 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.5?cmd=changeset;node=45ac6cd7aae2 author: Andrew John Hughes date: Thu Jan 22 01:27:39 2015 +0000 PR2032: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 2014-10-29 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch for CACAO builds. * NEWS: Updated. * patches/cacao/pr2032.patch: Implement JVM_FindClassFromCaller as same as JVM_FindClassFromClassLoader for now. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:13:56 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:13:56 +0000 Subject: [Bug 2187] [IcedTea6] Sync patch for 4873188 with 7 version In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2187 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:22:46 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:22:46 +0000 Subject: [Bug 2182] [IcedTea6] 6911104 reintroduces test fragment removed in existing 6964018 backport In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2182 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:23:15 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:23:15 +0000 Subject: [Bug 2181] [IcedTea6] Type-punning warnings still evident on PPC+RHEL 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2181 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:25:21 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:25:21 +0000 Subject: [Bug 2184] [IcedTea6] CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2184 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:27:00 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:27:00 +0000 Subject: [Bug 2185] [IcedTea6] Application of 6786276 introduces compatibility issue In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2185 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:27:16 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:27:16 +0000 Subject: [Bug 2186] [IcedTea6] Backport 6730740: "Fix for 6729881 has apparently broken several 64 bit tests: 'Bad address'" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2186 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:27:50 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:27:50 +0000 Subject: [Bug 2070] [IcedTea6] Type-punning warnings still evident on RHEL 5 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2070 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:27:58 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:27:58 +0000 Subject: [Bug 2082] [IcedTea6] Build fails on s390 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2082 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:28:08 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:28:08 +0000 Subject: [Bug 2096] [IcedTea6] 2048-bit DH upper bound too small for Fedora infrastructure In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2096 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:28:15 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:28:15 +0000 Subject: [Bug 2173] [IcedTea6] Backport "8000897: VM crash in CompileBroker" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2173 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:28:26 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:28:26 +0000 Subject: [Bug 2174] [IcedTea6] Backport "8020190: Wrong argument passed to setupFTContext" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2174 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:28:33 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:28:33 +0000 Subject: [Bug 2177] [IcedTea6] Backport 8028623 so servicability agent works with apps using non-ASCII characters In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2177 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 02:28:41 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:28:41 +0000 Subject: [Bug 2179] [IcedTea6] Avoid x86 workaround when running Zero rather than a JIT In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2179 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Thu Jan 22 02:54:53 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:54:53 +0000 Subject: /hg/icedtea7: Bump to icedtea-2.6.0pre17. Message-ID: changeset ec4f4f0f51e1 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ec4f4f0f51e1 author: Andrew John Hughes date: Thu Jan 22 02:36:04 2015 +0000 Bump to icedtea-2.6.0pre17. S8047125, CVE-2015-0395: (ref) More phantom object references S8047130: Fewer escapes from escape analysis S8049253: Better GC validation S8050807, CVE-2015-0383: Better performing performance data handling S8055479: TLAB stability S8058715: stability issues when being launched as an embedded JVM via JNI S8058982, CVE-2014-6601: Better verification of an exceptional invokespecial S8061785: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge AArch64: Fix guarantee failure in synchronizer.cpp 2015-01-21 Andrew John Hughes * Makefile.am: (CORBA_CHANGESET): Update to icedtea-2.6pre17. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.6.0pre17. * hotspot.map.in: Update to icedtea-2.6pre17. diffstat: ChangeLog | 19 +++++++++++++++++++ Makefile.am | 24 ++++++++++++------------ NEWS | 10 ++++++++++ configure.ac | 2 +- hotspot.map.in | 2 +- 5 files changed, 43 insertions(+), 14 deletions(-) diffs (118 lines): diff -r 12ff28633b0f -r ec4f4f0f51e1 ChangeLog --- a/ChangeLog Fri Jan 09 15:33:38 2015 +0000 +++ b/ChangeLog Thu Jan 22 02:36:04 2015 +0000 @@ -1,3 +1,22 @@ +2015-01-21 Andrew John Hughes + + * Makefile.am: + (CORBA_CHANGESET): Update to icedtea-2.6pre17. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Updated. + * configure.ac: Bump to 2.6.0pre17. + * hotspot.map.in: Update to icedtea-2.6pre17. + 2011-08-15 Pavel Tisnovsky PR2171: JamVM builds with executable stack, diff -r 12ff28633b0f -r ec4f4f0f51e1 Makefile.am --- a/Makefile.am Fri Jan 09 15:33:38 2015 +0000 +++ b/Makefile.am Thu Jan 22 02:36:04 2015 +0000 @@ -4,19 +4,19 @@ BUILD_VERSION = b03 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = 8eeadf462400 -JAXP_CHANGESET = a41b3447afd7 -JAXWS_CHANGESET = 4bd22fe291c5 -JDK_CHANGESET = 2e8f3cd07f14 -LANGTOOLS_CHANGESET = c802d4cdd4cb -OPENJDK_CHANGESET = 78bdb9406195 +CORBA_CHANGESET = 1eb2d75d86f0 +JAXP_CHANGESET = 54100657ce67 +JAXWS_CHANGESET = f36becc08f66 +JDK_CHANGESET = 3ce28e98738c +LANGTOOLS_CHANGESET = e1dd8fea9abd +OPENJDK_CHANGESET = f92696272981 -CORBA_SHA256SUM = 7322dfcd54a07d7fdb92c26eea4e6f1e7c1db32358498c517d4d517e1380371c -JAXP_SHA256SUM = e3778d578b6644b52e94275763bec68105e4b1e1305cad1673bd23380f1b8911 -JAXWS_SHA256SUM = 0d992eda1cd58f2b1a0cdd055f0a610a500885ff4dce6299c0efec562c371fed -JDK_SHA256SUM = b34ee6dbf276d677e5555d3cce23e844f22f11659ca9a4efebe22c52bcaa1d65 -LANGTOOLS_SHA256SUM = eb1569c61425dbdaae0ff3ecb3745a135c13dddfa592df9d2242aab4f71f6150 -OPENJDK_SHA256SUM = 498f018a873c667bff997be00e3cd1190557f7c847f5f9adac1c16938d080b4e +CORBA_SHA256SUM = f2e5f4d456e95ee36c7e160d5e8a6f376d5a9e8ed5adf4c3c4a64a4fcc117a7a +JAXP_SHA256SUM = f39f547de8230aca3d5ed40833ecb5e8fccbfe796c75b4c4d554a0e579f5d289 +JAXWS_SHA256SUM = 4f9c499a7ced94b4198732443e0c4c53ed884d91babcebd750309c18121c62f1 +JDK_SHA256SUM = cb96e5a9385bac4b9a5f98373986d34ae00e517ff18c95502380cfb2eb650556 +LANGTOOLS_SHA256SUM = b896ac0baed2c855620e3180ce356e32c2bb4428b68f0a30508d557cd00d688a +OPENJDK_SHA256SUM = f61156d10fa0f7b1949ad8909ef1ad504d7dff15e217ba20da2c42e07946cedb DROP_URL = http://icedtea.classpath.org/download/drops diff -r 12ff28633b0f -r ec4f4f0f51e1 NEWS --- a/NEWS Fri Jan 09 15:33:38 2015 +0000 +++ b/NEWS Thu Jan 22 02:36:04 2015 +0000 @@ -14,6 +14,13 @@ New in release 2.6.0 (2014-XX-XX): +* Security fixes + - S8047125, CVE-2015-0395: (ref) More phantom object references + - S8047130: Fewer escapes from escape analysis + - S8049253: Better GC validation + - S8050807, CVE-2015-0383: Better performing performance data handling + - S8055479: TLAB stability + - S8058982, CVE-2014-6601: Better verification of an exceptional invokespecial * OpenJDK - S4792059: test/java/io/pathNames/GeneralSolaris.java fails on symbolic links - S4991647: PNGMetadata.getAsTree() sets bitDepth to invalid value @@ -301,6 +308,7 @@ - S8057813: Alterations to jdk_security3 test target - S8058120: Rendering / caret errors with HTMLDocument - S8058473: "Comparison method violates its general contract" when using Clipboard + - S8058715: stability issues when being launched as an embedded JVM via JNI - S8058927: ATG throws ClassNotFoundException - S8058932: java/net/InetAddress/IPv4Formats.java failed because hello.foo.bar does exist - S8058936: hotspot/test/Makefile should use jtreg script from $JT_HOME/bin/jreg (instead of $JT_HOME/win32/bin/jtreg) @@ -309,6 +317,7 @@ - S8059563: (proxy) sun.misc.ProxyGenerator.generateProxyClass should create intermediate directories - S8060006: No Russian time zones mapping for Windows - S8060169: Update the Crash Reporting URL in the Java crash log + - S8061785: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge - S8062744: jdk.net.Sockets.setOption/getOption does not support IP_TOS * Backports - S7172012, PR2067: Make test-in-build an option (Queens) @@ -398,6 +407,7 @@ - Fixed various typos and omissions - Fixed various typos, overlooked cases and wrong accessors - Fix error introduced into profiling code + - Fix guarantee failure in synchronizer.cpp - Fix more errors introduced into interpreter profile counter increment - Fix relocations - Fix several small typos diff -r 12ff28633b0f -r ec4f4f0f51e1 configure.ac --- a/configure.ac Fri Jan 09 15:33:38 2015 +0000 +++ b/configure.ac Thu Jan 22 02:36:04 2015 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.6.0pre16], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.6.0pre17], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile]) diff -r 12ff28633b0f -r ec4f4f0f51e1 hotspot.map.in --- a/hotspot.map.in Fri Jan 09 15:33:38 2015 +0000 +++ b/hotspot.map.in Thu Jan 22 02:36:04 2015 +0000 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 7891f0e7ae10 6f08e1a59c05f8d6ca1bc69f7e791c3d7f89bba0d8bb3dc7846813c3a517668c +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 4d25046abb67 60da8d427f7e3659f701e54c763ea8366d8af3280c7e10670004938b2f07efef From andrew at icedtea.classpath.org Thu Jan 22 02:56:52 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:56:52 +0000 Subject: /hg/icedtea7-forest/corba: Added tag icedtea-2.6pre17 for change... Message-ID: changeset d43d465d9eca in /hg/icedtea7-forest/corba details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=d43d465d9eca author: andrew date: Thu Jan 22 02:55:34 2015 +0000 Added tag icedtea-2.6pre17 for changeset 1eb2d75d86f0 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 1eb2d75d86f0 -r d43d465d9eca .hgtags --- a/.hgtags Tue Dec 30 21:41:16 2014 +0000 +++ b/.hgtags Thu Jan 22 02:55:34 2015 +0000 @@ -553,3 +553,4 @@ 646234c2fd7be902c44261aa8f909dfd115f308d icedtea-2.6pre14 9a9cde985e018164da97d4ed1b51a83cda59f93a icedtea-2.6pre15 8eeadf4624006ab6af52354a15aee8f9a890fc16 icedtea-2.6pre16 +1eb2d75d86f049cd2f57c1ff35e3d569baec0650 icedtea-2.6pre17 From andrew at icedtea.classpath.org Thu Jan 22 02:56:57 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:56:57 +0000 Subject: /hg/icedtea7-forest/jaxp: Added tag icedtea-2.6pre17 for changes... Message-ID: changeset 75422c2e0f34 in /hg/icedtea7-forest/jaxp details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=75422c2e0f34 author: andrew date: Thu Jan 22 02:55:35 2015 +0000 Added tag icedtea-2.6pre17 for changeset 54100657ce67 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 54100657ce67 -r 75422c2e0f34 .hgtags --- a/.hgtags Tue Dec 30 21:41:16 2014 +0000 +++ b/.hgtags Thu Jan 22 02:55:35 2015 +0000 @@ -554,3 +554,4 @@ 35cfccb24a9c229f960169ec986beae2329b0688 icedtea-2.6pre14 133c38a2d10fdb95e332ceefa4db8cf765c8b413 icedtea-2.6pre15 a41b3447afd7011c7d08b5077549695687b70ea4 icedtea-2.6pre16 +54100657ce67cb5164cb0683ceb58ae60542fd79 icedtea-2.6pre17 From andrew at icedtea.classpath.org Thu Jan 22 02:57:03 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:57:03 +0000 Subject: /hg/icedtea7-forest/jaxws: Added tag icedtea-2.6pre17 for change... Message-ID: changeset 592f7adb2016 in /hg/icedtea7-forest/jaxws details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxws?cmd=changeset;node=592f7adb2016 author: andrew date: Thu Jan 22 02:55:36 2015 +0000 Added tag icedtea-2.6pre17 for changeset f36becc08f66 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r f36becc08f66 -r 592f7adb2016 .hgtags --- a/.hgtags Tue Dec 30 21:41:17 2014 +0000 +++ b/.hgtags Thu Jan 22 02:55:36 2015 +0000 @@ -553,3 +553,4 @@ 8b238b2b6e64991f24d524a6e3ca878df11f1ba4 icedtea-2.6pre14 8946500e8f3d879b28e1e257d3683efe38217b4b icedtea-2.6pre15 4bd22fe291c59aaf427b15a64423bb38ebfff2e9 icedtea-2.6pre16 +f36becc08f6640b1f65e839d6d4c5bf7df23fcf4 icedtea-2.6pre17 From andrew at icedtea.classpath.org Thu Jan 22 02:57:10 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:57:10 +0000 Subject: /hg/icedtea7-forest/langtools: Added tag icedtea-2.6pre17 for ch... Message-ID: changeset ddeb14520365 in /hg/icedtea7-forest/langtools details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=ddeb14520365 author: andrew date: Thu Jan 22 02:55:38 2015 +0000 Added tag icedtea-2.6pre17 for changeset e1dd8fea9abd diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r e1dd8fea9abd -r ddeb14520365 .hgtags --- a/.hgtags Tue Dec 30 21:41:19 2014 +0000 +++ b/.hgtags Thu Jan 22 02:55:38 2015 +0000 @@ -553,3 +553,4 @@ ecf2ec173dd2c19b63d7cf543db23ec7d4f4732a icedtea-2.6pre14 029dd486cd1a8f6d7684b1633aae41c613055dd2 icedtea-2.6pre15 c802d4cdd4cbfa8116e4f612cf536de32d67221a icedtea-2.6pre16 +e1dd8fea9abd3663838008063715b4b7ab5a58a4 icedtea-2.6pre17 From andrew at icedtea.classpath.org Thu Jan 22 02:57:17 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:57:17 +0000 Subject: /hg/icedtea7-forest/hotspot: Added tag icedtea-2.6pre17 for chan... Message-ID: changeset 71fa31628126 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=71fa31628126 author: andrew date: Thu Jan 22 02:55:40 2015 +0000 Added tag icedtea-2.6pre17 for changeset 4d25046abb67 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 4d25046abb67 -r 71fa31628126 .hgtags --- a/.hgtags Fri Jan 09 17:00:02 2015 +0000 +++ b/.hgtags Thu Jan 22 02:55:40 2015 +0000 @@ -781,3 +781,4 @@ 1d3d9e81c8e16bfe948da9bc0756e922a3802ca4 icedtea-2.6pre14 5ad4c09169742e076305193c1e0b8256635cf33e icedtea-2.6pre15 7891f0e7ae10d8f636fdbf29bcfe06f43d057e5f icedtea-2.6pre16 +4d25046abb67ae570ae1dbb5e3e48e7a63d93b88 icedtea-2.6pre17 From andrew at icedtea.classpath.org Thu Jan 22 02:57:24 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 22 Jan 2015 02:57:24 +0000 Subject: /hg/icedtea7-forest/jdk: 2 new changesets Message-ID: changeset 3ce28e98738c in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=3ce28e98738c author: andrew date: Fri Jan 09 16:17:13 2015 +0000 Bump to icedtea-2.6.0pre17 changeset 6aa2809fd261 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=6aa2809fd261 author: andrew date: Thu Jan 22 02:55:37 2015 +0000 Added tag icedtea-2.6pre17 for changeset 3ce28e98738c diffstat: .hgtags | 1 + make/jdk_generic_profile.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (20 lines): diff -r a97c208d888a -r 6aa2809fd261 .hgtags --- a/.hgtags Tue Dec 30 21:41:18 2014 +0000 +++ b/.hgtags Thu Jan 22 02:55:37 2015 +0000 @@ -537,3 +537,4 @@ ccdc37cdfaa891e3c14174378a8e7a5871e8893b icedtea-2.6pre14 6dd583aadca80b71e8c004d9f4f3deb1d779ccfb icedtea-2.6pre15 2e8f3cd07f149eab799f60db51ff3629f6ab0664 icedtea-2.6pre16 +3ce28e98738c7f9bb238378a991d4708598058a2 icedtea-2.6pre17 diff -r a97c208d888a -r 6aa2809fd261 make/jdk_generic_profile.sh --- a/make/jdk_generic_profile.sh Tue Dec 30 21:41:18 2014 +0000 +++ b/make/jdk_generic_profile.sh Thu Jan 22 02:55:37 2015 +0000 @@ -625,7 +625,7 @@ # IcedTea versioning export ICEDTEA_NAME="IcedTea" -export PACKAGE_VERSION="2.6.0pre16" +export PACKAGE_VERSION="2.6.0pre17" export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}" echo "Building ${DERIVATIVE_ID}" From aph at redhat.com Thu Jan 22 10:00:52 2015 From: aph at redhat.com (Andrew Haley) Date: Thu, 22 Jan 2015 10:00:52 +0000 Subject: RFR: Add support for ARMv6 to ARM JIT In-Reply-To: References: <1421859993.3200.131.camel@mint> <54BFDEED.9030506@redhat.com> Message-ID: <54C0CA54.6000606@redhat.com> On 22/01/15 09:53, Edward Nevill wrote: > On Wed, Jan 21, 2015 at 5:16 PM, Andrew Haley wrote: > >> On 01/21/2015 05:06 PM, Edward Nevill wrote: >> >>> Because of the size of the changes I have introduced a new file >>> arm32JIT.cpp rather than modifying the existing thumb2.cpp. This is >>> switched on a symbol ARM32JIT. By default it will continue to build >>> the Thumb2 JIT. To change it to build the ARM32 JIT by default add >>> -DARM32JIT to CFLAGS in zeroshark.make as in the following patch. >> >> I don't get this. Surely we should have both, switchable at runtime. > > arm32jit.cpp supports generation for ARMV6, ARMV6K and ARMV6T2+. > > For ARMV6 and ARMV6K it will generate 32 bit ARM instructions. > > For ARMV6T2 and later it will generate Thumb2 instructions by defaulty, but > this can be changed by setting the T2_COMPILE_ARM environment variable. So what is thumb2.cpp for? I still don't get it. Andrew. From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 11:27:28 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 11:27:28 +0000 Subject: [Bug 2188] New: segfault while running "make check-jdk" after compiling with GCJ 4.8.4 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2188 Bug ID: 2188 Summary: segfault while running "make check-jdk" after compiling with GCJ 4.8.4 Product: IcedTea Version: 6-1.13.5 Hardware: x86_64 OS: Linux Status: NEW Severity: enhancement Priority: P5 Component: Bootstrapping Assignee: gnu.andrew at redhat.com Reporter: bugs at elephly.net CC: unassigned at icedtea.classpath.org Created attachment 1246 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1246&action=edit config.log for icedtea6 I'm attempting to package IcedTea6 for the GNU Guix package manager. I use GCJ as the JDK. GCJ was configured to include most JDK symlinks: --enable-java-home --enable-gjdoc --with-ecj-jar=/path/to/ecj.jar Since there is no javac wrapper included with GCJ, I took the Gentoo wrapper template (see here: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-java/gcj-jdk/files/javac.in). While running the test suite a considerable number of tests fail (which is worrying but probably should be subject of another bug report); one test in "make check-jdk", however, results in a segfault. Here's the output leading up to the segfault: ~~~~~~~ ... Passed: javax/crypto/spec/DESKeySpec/CheckParity.java Passed: javax/crypto/spec/DESKeySpec/CheckWeakKeys.java Passed: javax/crypto/spec/DESKeySpec/NullKey.java Passed: javax/crypto/spec/IvParameterSpec/InvalidArgs.java Passed: javax/crypto/spec/IvParameterSpec/NullIV.java Passed: javax/crypto/spec/RC2ParameterSpec/RC2AlgorithmParameters.java Passed: javax/crypto/spec/RC2ParameterSpec/RC2ParameterSpecEquals.java Passed: javax/crypto/spec/RC5ParameterSpec/InvalidIV.java Passed: javax/crypto/spec/RC5ParameterSpec/RC5ParameterSpecEquals.java # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007fe0733a61a1, pid=17032, tid=140600864315136 # # JRE version: 6.0_33-b33 # Java VM: OpenJDK 64-Bit Server VM (23.25-b01 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea6 1.13.5 # Distribution: guix # Problematic frame: # C [ld-linux-x86-64.so.2+0x141a1] _dl_close+0x1 # # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again # # An error report file with more information is saved as: # /buildtmp/nix-build-icedtea6-1.13.5.drv-1/icedtea6-1.13.5/test/jdk/JTwork/scratch/hs_err_pid17032.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # test -z `grep \"^Error:\|^FAILED:\" test/check-jdk.log` [me at host:/buildtmp/nix-build-icedtea6-1.13.5.drv-1/icedtea6-1.13.5] (526) $ ~~~~~~~ I'm building IcedTea version 1.13.5, downloaded from http://icedtea.wildebeest.org/download/source/icedtea6-1.13.5.tar.xz . Attached is the config.log for IcedTea6 as well as the error report file. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 11:29:03 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 11:29:03 +0000 Subject: [Bug 2188] segfault while running "make check-jdk" after compiling with GCJ 4.8.4 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2188 --- Comment #1 from bugs at elephly.net --- Created attachment 1247 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1247&action=edit error report produced on segfault -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From aph at redhat.com Thu Jan 22 11:57:32 2015 From: aph at redhat.com (Andrew Haley) Date: Thu, 22 Jan 2015 11:57:32 +0000 Subject: RFR: Add support for ARMv6 to ARM JIT In-Reply-To: References: <1421859993.3200.131.camel@mint> <54BFDEED.9030506@redhat.com> <54C0CA54.6000606@redhat.com> Message-ID: <54C0E5AC.8070805@redhat.com> On 01/22/2015 11:14 AM, Edward Nevill wrote: > On Thu, Jan 22, 2015 at 10:00 AM, Andrew Haley wrote: > >> So what is thumb2.cpp for? I still don't get it. > > The idea was to minimise the change to reduce the risk of breaking > anything for distros. The migration from thumb2 JIT to arm JIT would > be done in 3 stages. > > Stage 1: > > Introduced arm32JIT.cpp but still have the default build from the > old thumb2.cpp which is unchanged apart from the one #ifndef > ARM32JIT. > > Distros can then elect to choose the arm32 JIT by applying the 1 > small patch which adds -DARM32JIT to zeroshark.make. This patch can > be carried within the distro packaging. Alternatively distros can > ignore the arm32 JIT and continue with the unchanged thumb2 JIT as > before. > > Stage 2: > > When everyone is happy with the arm32 JIT make ARM32JIT the default. > Distros can still elect to build the thumb2 JIT by backing out the > -DARM32JIT in zeroshark.make > > Stage 3: > > Sometime in the future delete thumb2.cpp > > Of course if people are happy to go straight to stage 3 that is fine > by me. The only question then is whether the changes should just be > applied to thumb2.cpp which would now generate thumb2 or arm32 code > or whether to rename it to arm32JIT.cpp. This is a very different development model from what we use in IcedTea. There are stable branches we use for releases and the development trunk for new code. We don't need to keep old files around because we have everything under source control. IMO (and it is just my opinion) you should remove thumb2.cpp on the development trunk. I have no opinion about whether thumb2 or ARM should be the default on systems which support both. I'm guessing that thumb2 might be a slightly better choice, but I doubt that it will make any difference to most workloads. Andrew. From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 13:13:38 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 13:13:38 +0000 Subject: [Bug 2032] [IcedTea7] CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2032 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 13:14:30 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 13:14:30 +0000 Subject: [Bug 2064] [IcedTea7] Unset OS before running OpenJDK build In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2064 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 13:14:37 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 13:14:37 +0000 Subject: [Bug 2050] [IcedTea7] JamVM lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2050 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 13:14:44 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 13:14:44 +0000 Subject: [Bug 2171] [IcedTea7] JamVM builds with executable stack, causing failures on SELinux & PaX kernels In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2171 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 13:14:52 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 13:14:52 +0000 Subject: [Bug 2161] [IcedTea7] RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_* In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2161 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jvanek at redhat.com Thu Jan 22 13:23:37 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 22 Jan 2015 14:23:37 +0100 Subject: [rfc][[icedtea-web] fixing jnlp shortcuts Message-ID: <54C0F9D9.4070703@redhat.com> hi! I have accidentally excluded shortcuts generation for jnlp apps. If shortcut is to be created for jnlp app (not html applet) the shortcutdescriptor is accidentally simply left null and so it is never created. This small patch fixes that. Also I noted that opera is missing in list of browsers for browser shortcut. Fixed also. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: fixKilledJnlpShortcutsGeneration.patch Type: text/x-patch Size: 2377 bytes Desc: not available URL: From gnu_andrew at member.fsf.org Thu Jan 22 13:27:45 2015 From: gnu_andrew at member.fsf.org (Andrew Hughes) Date: Thu, 22 Jan 2015 13:27:45 +0000 Subject: [SECURITY] IcedTea 2.5.4 for OpenJDK 7 Released! Message-ID: <20150122132745.GA7642@carrie.the212.com> The IcedTea project provides a harness to build the source code from OpenJDK using Free Software build tools, along with additional features such as the ability to build against system libraries and support for alternative virtual machines and architectures beyond those supported by OpenJDK. This release updates our OpenJDK 7 support in the 2.5.x series with the January 2015 security fixes. If you find an issue with the release, please report it to our bug database (http://icedtea.classpath.org/bugzilla) under the appropriate component. Development discussion takes place on the distro-pkg-dev at openjdk.java.net mailing list and patches are always welcome. Full details of the release can be found below. What's New? =========== New in release 2.5.4 (2015-01-21): * Security fixes - S8046656: Update protocol support - S8047125, CVE-2015-0395: (ref) More phantom object references - S8047130: Fewer escapes from escape analysis - S8048035, CVE-2015-0400: Ensure proper proxy protocols - S8049253: Better GC validation - S8050807, CVE-2015-0383: Better performing performance data handling - S8054367, CVE-2015-0412: More references for endpoints - S8055304, CVE-2015-0407: More boxing for DirectoryComboBoxModel - S8055309, CVE-2015-0408: RMI needs better transportation considerations - S8055479: TLAB stability - S8055489, CVE-2014-6585: Better substitution formats - S8056264, CVE-2014-6587: Multicast support improvements - S8056276, CVE-2014-6591: Fontmanager feature improvements - S8057555, CVE-2014-6593: Less cryptic cipher suite management - S8058982, CVE-2014-6601: Better verification of an exceptional invokespecial - S8059485, CVE-2015-0410: Resolve parsing ambiguity - S8061210, CVE-2014-3566: Issues in TLS * Backports - S6461635: [TESTBUG] BasicTests.sh test fails intermittently - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems - S7028073: The currency symbol for Peru is wrong - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true - S7183753: [TEST] Some colon in the diff for this test - S7077119, PR2165, G534118: remove past transition dates from CurrencyData.properties file - S7085757: Currency Data: ISO 4217 Amendment 152 - S7169142: CookieHandler does not work with localhost - S7172012, PR2067: Make test-in-build an option (Queens) - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations - S7195759: ISO 4217 Amendment 154 - S8000897, RH1155012: VM crash in CompileBroker - S8001105: findVirtual of Object[].clone produces internal error - S8005232: (JEP-149) Class Instance size reduction - S8006748: getISO3Country() returns wrong value - S8012026: [macosx] Component.getMousePosition() does not work in an applet on MacOS - S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE - S8020190, PR2160, RH1176718: Fatal: Bug in native code: jfieldID must match object - S8021121: ISO 4217 Amendment Number 156 - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws java.lang.IllegalStateException: unexpected condition - S8025051: Update resource files for TimeZone display names - S8026792: HOTSPOT: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated. - S8027359: XML parser returns incorrect parsing results - S8028623, PR2112, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. - S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings - S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions - S8029153: [TESTBUG] test/compiler/7141637/SpreadNullArg.java fails because it expects NullPointerException - S8031046: Native Windows ccache might still get unsupported ticket - S8031502: JSR292: IncompatibleClassChangeError in LambdaForm for CharSequence.toString() method handle type converter - S8032078: [macosx] CPlatformWindow.setWindowState throws RuntimeException, if windowState=ICONIFIED|MAXIMIZED_BOTH - S8032669: Mouse release not being delivered to Swing component in 7u45 - S8032788: ImageIcon constructor throws an NPE and hangs when passed a null String parameter - S8032909: XSLT string-length returns incorrect length when string includes complementary chars - S8034200: Test java/net/CookieHandler/LocalHostCookie.java fails after fix of JDK-7169142 - S8036863: Update jdk7 testlibrary to match jdk8 in hotspot - S8040168: Set hotspot version to hs24.66 and build to b01 for 7u66 - S8040617: [macosx] Large JTable cell results in a OutOfMemoryException - S8041132: Increment hsx 24.66 build to b02 for 7u66-b09 - S8041408: Increment hsx 24.55 build to b04 for 7u55-b34 - S8041572: [macosx] huge native memory leak in AWTWindow.m - S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser - S8043610: Sorting columns in JFileChooser fails with AppContext NPE - S8044603: Increment minor version of HSx for 7u71 and initialize the build number - S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX - S8049250: Need a flag to invert the Card.disconnect(reset) argument - S8049343: (tz) Support tzdata2014g - S8049758: Increment minor version of HSx for 7u75 and initialize the build number - S8050485: super() in a try block in a ctor causes VerifyError - S8051359: JPopupMenu creation in headless mode with JDK9b23 causes NPE - S8051614: smartcardio TCK tests fail due to lack of 'reset' permission - S8055222: Currency update needed for ISO 4217 Amendment #159 - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure - S8057184: JCK8's api/javax_swing/JDesktopPane/descriptions.html#getset failed with GTKLookAndFeel on Linux and Solaris - S8058715: stability issues when being launched as an embedded JVM via JNI - S8059206: (tz) Support tzdata2014i - S8060474: Resolve more parsing ambiguity - S8061685: Increment hsx 24.75 build to b02 for 7u75-b06 - S8061785: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge - S8061826: Part of JDK-8060474 should be reverted - S8062561: Test bug8055304 fails if file system default directory has read access - S8062807: Exporting RMI objects fails when run under restrictive SecurityManager - S8064300: Increment hsx 24.75 build to b03 for 7u75-b06 - S8064560: (tz) Support tzdata2014j - S8065608: 7u75 l10n resource file translation update - S8065787: Increment hsx 24.75 build to b04 for 7u75-b10 - S8066747: Backing out Japanese translation change in awt_ja.properties - S8067364, PR2145, RH114622: Printing to Postscript doesn't support dieresis * Bug fixes - PR2064: Unset OS before running OpenJDK build - PR2069: Type-punning warnings still evident on RHEL 5 - PR2094, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure - PR2123: SunEC provider crashes when built using system NSS - PR2124: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS - PR2135: Race condition in SunEC provider with system NSS - PR2161: RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_* * CACAO - PR2032: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 * JamVM - PR2050: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 - PR2171: JamVM builds with executable stack, causing failures on SELinux & PaX kernels * AArch64 port - Use the IcedTea7 fork version rather than the one based on HotSpot 25. - Add arch-specific processing of tmp1 register needed for d/f2i - Add char_array_equals intrinsic - Add CNEG and CNEGW to macro assembler. - Add frame anchor fences. - Add missing instruction synchronization barriers and cache flushes. - Add some memory barriers for object creation and runtime calls. - Add support for A53 multiply accumulate - Add support for AES Intrinsics - Add support for pipeline scheduling - Add support for String.indexOf intrinsic - Added make rules to allow aarch64-x86 hybrid build to progress - Added missing aarch64-specific include - Added missing aarch64-specific make file - Added missing changes for debug code - Added missing inline method - Added missing shared global UseCRC32Intrinsics - Added pd global UseVectoredExceptions - Add local method to redirect to AbstractAssembler::relocate - Add missing declarations for CRC32 methods - Add missing include - Add missing special case code for aarch64 - Add rules to assemble .S files - Add support for storing aarch64 call format - Add wrapper method to avoid dependency on not yet defined code buffer class - Added missing endif - Allow for 0x400 aligned offsets for byte_map_base - Array load must only read 32 bits - A more efficient sequence for C1_MacroAssembler::float_cmp. - Backout 8c8b5e62e624 and instead move .S rule from zeroshark.make to rules.make - Backout additional changes made in ec6a6772fed6, which revert parts of the PPC/AIX port and IcedTea fixes. - Call ICache::invalidate_range() from Relocation::pd_set_data_value(). - Changed klass oop encode to heap oop encode - Changed Method* to methodOop - Correct assert to allow for AArch64 - Correct for difference in include hierarchy - Correct typos - Corrected error in disassembler code - Corrected include - Corrected include path - Corrected pipeline class for countTrailingZerosL - Corrected type - Corrected typo - Correct includes - Correct Method to methdoOopDesc - Define uabs(). Use it everywhere an absolute value is wanted. - Defn of BIND does not need to use __ macro - Delete dead code. - Disassembler library should be built as hsdis-aarch64.so - Don't test arraycopy routines when using AArch64 simulator - Emit_int64 is renamed - Ensure byte_map_base can be loaded using adrp with no need for following ldr - Ensure C1 static call stub employs absolute move to allow patching - Ensure C2 static calls use correct call adddress in static stub reloc - Ensure perm gen size is not rounded down to zero - Ensure rmethod is reloaded from stack when interpreter makes non leaf VM call - Ensure we pick up hsdis-aarch64.so if BUILTIN_SIM is true - Fix couple of mistakes in generate of method handle dispatch - Fix cut and paste-o in header - Fixed another typo - Fixed error in include - Fixed hsdis for aarch64 native or simulated - Fixed various typos and omissions - Fixed various typos, overlooked cases and wrong accessors - Fix error introduced into profiling code - Fix guarantee failure in synchronizer.cpp - Fix more errors introduced into interpreter profile counter increment - Fix relocations - Fix several small typos - Fix some typos - Fix thinko in Atomic::xchg_ptr. - Fix typo - Fix up aarch64-specific patching code - Fix up crc32 support - Fix various typos - Get rid of unnecessary declaration - Guess at how to implement C1 deoptimize_trap generator - Initial cut of aarch64 code pulled from jdk8 tree - Make aarch64-x86 hybrid build use correct paths - Make hsdis handle aarch64 native case - Make static stubs load methodOop in cpool to avoid problems at GC - Miscellaneous bug fixes. - Missing change needed to support aarch64 build - Modified make files to support aarch64 build - Modified shared src to support full aarch64 backport - Moved fields which need access from java to top level - Need to actually return the adapter code size - Need to pass CFLAGS when assembling .S files using CC_COMPILE - Need to use class handle not class - Provide missing CRC32 methods - Reload rcpool register after a VM call in case a permgen GC has moved the cache - Relocated aarch64 vtable generate code to conform to jdk7 - Remove comment to avoid breaking macro - Removed aarch64 compiled_IC implementation to conform to jdk7 - Removed metaspaceShared code to conform to jdk7 - Removed redundant field use_XOR_for_compressed_class_base - Removed some errors in signal handling code - Removed undefined metadata case - Remove redundant bracket - Remove support for volatile load/store rules in ad file - Renamed emit_int32 to emit_long and added local emit_long64 in place of missing emit_int64 - Restored missing open brace - Restored several load_heap_oop calls lost in translation - Restore working x86 build - Reverted aarch64 architecture description (ad) file to conform to jdk7 - Reverted aarch64 c1_xxx files to conform to jdk7 - Reverted aarch64 c2 globals to conform to jdk7 - Reverted aarch64 frame code to conform to jdk7 - Reverted aarch64 runtime code to conform to jdk7 - Reverted aarch64 stubs code to conform to jdk7 - Reverted aarch64 template interpreter code to conform to jdk7 - Reverted aarch64 vm structs code to conform to jdk7 - Reverted aarch64 vm version code to conform to jdk7 - Reverted aarch64 vtable stubs code to conform to jdk7 - Reverted assembler_aarch64.cpp/hpp to conform to jdk7 - Reverted bytecodeInterpreter_aarch64 to conform to jdk7 - Reverted global defs code to conform to jdk7 - Reverted instr cache code to conform to jdk7 - Reverted interpreter code to conform to jdk7 - Reverted interpreter masm code to conform to jdk7 - Reverted jni code to conform to jdk7 - Reverted method handles code to conform to jdk7 - Reverted native instr code to conform to jdk7 - Reverted os_cpu/linux_aarch64 code to conform to jdk7 - Reverted reloc info code to conform to jdk7 - Revert Method:: etc to methodOopDesc:: etc - Scripts to build aarch64-x86 hybrid and aarch64 native debug images - Some errors revealed when building debug image - Temporarily disable running test_gamma - Tidy up allocation prefetch - Use correct post-increment size in repne_scanw - Use membar rules and delete special case volatile rules - Use method register to access counter increment field - Use movoop in C1 ic_call to keep verifier happy - Use os::malloc to allocate the register map. - Use the correct return value from the VM resolve call - Use TLS for ThreadLocalStorage::thread() - Various changes to accommodate inclusion of ppc port in icedtea7 - Various concurrency fixes. - Work around weird compiler issue The tarballs can be downloaded from: http://icedtea.classpath.org/download/source/icedtea-2.5.4.tar.gz http://icedtea.classpath.org/download/source/icedtea-2.5.4.tar.xz We provide both gzip and xz tarballs, so that those who are able to make use of the smaller tarball produced by xz may do so. The tarballs are accompanied by digital signatures available at: http://icedtea.classpath.org/download/source/icedtea-2.5.4.tar.gz.sig http://icedtea.classpath.org/download/source/icedtea-2.5.4.tar.xz.sig These are produced using my public key. See details below. PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 I'm transitioning to the use of a new key for signing releases over the next year. Signatures made with this key are available at: http://icedtea.classpath.org/download/source/icedtea-2.5.4.tar.gz.sig.ec http://icedtea.classpath.org/download/source/icedtea-2.5.4.tar.xz.sig.ec and the new key is: PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 SHA256 checksums: 5301b9a8592af2cf8e3e7a3650e5e1fe744c6d2de7f8ff78080b2eeae86a9800 icedtea-2.5.4.tar.gz 379388e05eeb2076fad256c95e8045f5b83ce18f9aac4f9d3875eafe840cb6e6 icedtea-2.5.4.tar.gz.sig 3d34129aa9c85f7e0cf8a90b8456a750a05951928d32ca00170dcb7b02ef5b05 icedtea-2.5.4.tar.gz.sig.ec 1b50f5c42417c899e0dc831351470557c504c4e648f72cc621be9318c215ffda icedtea-2.5.4.tar.xz c86eeaefb7c7b6e869c24933da07882a2779d045b1d6b05d77f36ac7a089aeb0 icedtea-2.5.4.tar.xz.sig defd356e7dc9f93bc692246ebae28bdf58e5ebadfdfa74296062630fd6866715 icedtea-2.5.4.tar.xz.sig.ec The checksums can be downloaded from: http://icedtea.classpath.org/download/source/icedtea-2.5.4.sha256 The following people helped with these releases: * Andrew Dinn (AArch64 backport) * Andrew Hughes (all backports & other bug fixes, release management) * Robert Lougher (JamVM build fix) * Xerxes R?nby (CACAO build fix) * Pavel Tisnovsky (executable stack issue with JamVM) We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea-2.5.4.tar.gz or: $ tar x -I xz -f icedtea-2.5.4.tar.xz then: $ mkdir icedtea-build $ cd icedtea-build $ ../icedtea-2.5.4/configure $ make Full build requirements and instructions are available in the INSTALL file. Happy hacking! -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 213 bytes Desc: Digital signature URL: From jkang at redhat.com Thu Jan 22 14:41:03 2015 From: jkang at redhat.com (Jie Kang) Date: Thu, 22 Jan 2015 09:41:03 -0500 (EST) Subject: [icedtea-web][discussion] Regression in unit test ResourceTrackerTest.downloadResource() In-Reply-To: <1681346244.10399356.1421935433349.JavaMail.zimbra@redhat.com> Message-ID: <1914495023.10428615.1421937663349.JavaMail.zimbra@redhat.com> Hello, jvanek noticed a newly failing unit test, ResourceTrackerTest. after the changeset: changeset: 1135:ed2781d76012 user: Jiri Vanek date: Thu Dec 18 20:05:41 2014 +0100 summary: Added support for generating shortcuts also for applets. After some digging I found out the cause: 1. Changes to PluginBridge now uses JNLPFile.openURL(...). This function has a side effect of attempting to download the given URL. 2. Previous tests in PluginBridgeTest use fake URLs for JNLP files that are needed to initialize the PluginBridge object. 3. This leads to those tests calling JNLPFile.openURL(..) and attempting to download the fake urls. This has 2 side-effects that cause ResourceTrackerTest.downloadResource() to fail. Side-effect 1: In ResourceTracker.initializeResource(...): JNLPRuntime.detectOnline(...) is called on the fake URL. This obviously can't be connected to and so JNLPRuntime.isOnline() now returns false. When ResourceTrackerTest.downloadResource() is run, the call for JNLPRuntime.isOnline() inside ResourceTracker.initializeResource(...) returns false and this causes nothing to be downloaded, so the test fails This is addressed in the patch: Check online detection even if checked before [1]. Side-effect 2: In CacheUtil and CacheLRUWrapper, both classes have a separate static, first-use initialized variable cacheDir. Since PluginBridge now uses JNLPFile.openURL(), which calls ResourceTracker functions, which now call CacheUtil and CacheLRUWrapper functions, these classes get initialized to their default value, the user's cache directory. Now when ResourceTrackerTest.downloadResource(...) is run, the cachedir is already initialized and calls to JNLPRuntime.getConfiguration.setProperty("cache-dir-key") fail to change the value used by CacheUtil and CacheLRUWrapper. The test expects the cache-dir to actually be changed to the temp directory, and so once again, the test fails. As well, there are now entries in the user's cache directory from the tests in PluginBridgeTest. This is addressed in the two patches: Allow cache directory to be changed during runtime [2] and Use temporary cache in PluginBridge tests [3]. [1] http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030290.html [2] http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030291.html [3] http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030292.html I think there are various solutions to these problems, especially for Side-effect 1, and any thoughts/opinions are appreciated. Patch [1] does fix the problem but there could be a better solution. I do believe that patch [2] and [3] are good though. Hopefully this sheds some light on why the 3 patches above were sent for review. Regards, -- Jie Kang OpenJDK Team - Software Engineering Intern From jkang at redhat.com Thu Jan 22 14:56:47 2015 From: jkang at redhat.com (Jie Kang) Date: Thu, 22 Jan 2015 09:56:47 -0500 (EST) Subject: [rfc][icedtea-web] Add unit tests for CacheUtil class In-Reply-To: <54BF76C7.50903@redhat.com> References: <1444625884.7394119.1421339550356.JavaMail.zimbra@redhat.com> <54BF76C7.50903@redhat.com> Message-ID: <1608160514.10438619.1421938607351.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 01/15/2015 05:32 PM, Jie Kang wrote: > > Hello, > > > > The patch adds a set of basic unit tests to CacheUtil to make sure they > > work as intended. They don't cover many edge cases at the moment and are > > mainly for developer's to read and gain an understanding of the CacheUtil > > class quicker. Edge cases will be added in the future. > > > > As well, there is one KnownToFail test for CacheUtil.cleanCache : This is > > due to an implementation error that causes entries marked for deletion to > > never be deleted in certain circumstances. This will be fixed in a > > subsequent patch. > > > > Okay to push? > > > yes. Hello, I realized this patch relies on 'Allow cache directory to be changed during runtime' http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030291.html I will wait for that to be resolved before pushing this or submitting a revised version of this for review. Regards, > -- Jie Kang OpenJDK Team - Software Engineering Intern From 3b5hkp at nottheoilrig.com Thu Jan 22 17:37:18 2015 From: 3b5hkp at nottheoilrig.com (Jack Bates) Date: Thu, 22 Jan 2015 09:37:18 -0800 Subject: NoSuchMethodError: Matcher.quoteReplacement In-Reply-To: <983053930.12707161.1421879445072.JavaMail.zimbra@redhat.com> References: <54B2E5A0.8020504@nottheoilrig.com> <1934335812.6553316.1421112530438.JavaMail.zimbra@redhat.com> <54B4971F.8090405@nottheoilrig.com> <92690351.7038806.1421167541587.JavaMail.zimbra@redhat.com> <54C00EB8.4080005@nottheoilrig.com> <983053930.12707161.1421879445072.JavaMail.zimbra@redhat.com> Message-ID: <54C1354E.60304@nottheoilrig.com> On 21/01/15 02:30 PM, Andrew Hughes wrote: > ----- Original Message ----- >> On 13/01/15 08:45 AM, Andrew Hughes wrote: >>> ----- Original Message ----- >>>> On 12/01/15 05:28 PM, Andrew Hughes wrote: >>>>> ----- Original Message ----- >>>>>> I get the following error when I try to build 2.5.3: >>>>>> >>>>>> [...] >>>>>> /home/nottheoilrig/icedtea-2.5.3/generated.build/com/sun/corba/se/impl/logging/UtilSystemException.java >>>>>> An exception has occurred in the compiler (1.7.0_71_bootstrap). Please >>>>>> file a bug at the Java Developer Connection >>>>>> (http://java.sun.com/webapps/bugreport) after checking the Bug Parade >>>>>> for duplicates. Include your program and the following diagnostic in >>>>>> your report. Thank you. >>>>>> java.lang.NoSuchMethodError: method >>>>>> java.util.regex.Matcher.quoteReplacement with signature >>>>>> (Ljava.lang.String;)Ljava.lang.String; was not found. >>>>>> [...] >>>>>> >>>>>> Any idea how to resolve it? >>>>>> Can I provide any additional details? >>>>>> I downloaded the IcedTea 2.5.3 archive, >>>>>> ran ./configure and make. >>>>>> >>>>>> The following are lines from my config.log, >>>>>> are they helpful? >>>>>> >>>>>> [...] >>>>>> configure:11304: checking if java.util.regex.Matcher.quoteReplacement is >>>>>> missing >>>>>> configure:11354: result: yes >>>>>> [...] >>>>>> configure:11820: checking if the VM supports 1.7 bytecode >>>>>> javac: invalid source release: 7 >>>>>> Usage: javac >>>>>> use -help for a list of possible options >>>>>> configure:11850: result: no >>>>>> configure:11866: checking whether to disable the use of bootstrap tools >>>>>> for bootstrapping >>>>>> configure:11890: result: yes >>>>>> [...] >>>>> >>>>> It's difficult to say much without the full config.log and build log. >>>> >>>> Thank you, >>>> >>>> here is the config.log: >>>> http://nottheoilrig.com/java/201501120/config.log >>>> >>>> and here is the build log: >>>> http://nottheoilrig.com/java/201501120/screenlog >>>> >>>> Can I provide any additional details? >>> >>> This is sufficient, thanks. The main problem is your setup is just too old. >>> It's about time this machine was upgraded to wheezy, as squeeze is >>> obsolete. >>> Moreover, wheezy already includes a build of 2.5.3 which will save you >>> the trouble: https://packages.debian.org/wheezy/openjdk-7-jdk >> >> Yes, I'm only building from source because upgrading >> this machine isn't an option in the near future >> (although I'm working on it). > > Ok. > >>> The actual problem is a bit convoluted. From the logs, I can see that a >>> very >>> old version of gcj, 4.4, is being used to bootstrap the build. This is why >>> many features are found to be missing when your bootstrap JDK is tested >>> during >>> configure. >>> >>> The quoteReplacement method is missing in gcj 4.4, and there is a test to >>> work around this in configure; if you look for the rt-class-files part >>> of the build log, you will see it builds >>> openjdk-boot/jdk/src/share/classes/java/util/regex/Matcher.java before the >>> OpenJDK build begins, so a version with quoteReplacement is available. >>> >>> All would be fine, thanks to this fix, but your javac (provided by gcj) is >>> too old to build Java 1.7 source code so the use of it to build is >>> disabled. >>> It instead tries to use the javac it just built and fails because it needs >>> the missing method. >> >> Hrm, actually javac is provided by OpenJDK 6, but I guess that doesn't >> change a thing because it's also too old to build Java 1.7 source code? > > It is, but that's not the issue; the issue is a combination of gcj both > not handling 1.7 source code and missing java.util.regex.Matcher.quoteReplacement. > OpenJDK 6 doesn't suffer from the latter. > >> config.log: >> JAVAC='/usr/bin/javac' >> >> $ ls -l /usr/bin/javac >> /usr/bin/javac -> /etc/alternatives/javac >> $ ls -l /etc/alternatives/javac >> /etc/alternatives/javac -> /usr/lib/jvm/java-6-openjdk/bin/javac >> >> So it tries to use the javac it just built (bootstrap javac?) and fails. >> What I don't understand is, >> with --with-jdk-home=/usr/lib/jvm/java-6-openjdk it works! >> It uses the same javac (/usr/lib/jvm/java-6-openjdk/bin/javac) >> with and without --with-jdk-home but it works with, and fails without. > > No, the old logs were using javac from gcj. Maybe it's irrelevant, but here are the old logs: http://nottheoilrig.com/java/201501120/config.log http://nottheoilrig.com/java/201501120/screenlog What indicates that javac is from GCJ? /usr/lib/jvm/java-gcj/bin/java is from GCJ however GCJ javac is not installed on this machine. From the old logs: [...] JAVA='/usr/lib/jvm/java-gcj/bin/java' JAVAC='/usr/bin/javac' [...] Furthermore both /usr/bin/java and /usr/bin/javac are OpenJDK 6: /usr/bin/java -> /etc/alternatives/java /usr/bin/javac -> /etc/alternatives/javac /etc/alternatives/java -> /usr/lib/jvm/java-6-openjdk/jre/bin/java /etc/alternatives/javac -> /usr/lib/jvm/java-6-openjdk/bin/javac >> Another question: >> It determines that GCJ 4.4/OpenJDK 6 are too old to build Java 1.7 > > Just GCJ 4. It was completely ignoring OpenJDK 6. > >> source code, so it builds the bootstrap javac (right?) >> and it determines that the environment is missing quoteReplacement >> so it builds and uses Matcher.java to build the bootstrap javac, >> but then why does the bootstrap javac later fail? >> If the bootstrap javac is also missing quoteReplacement, >> then why build Matcher.java if it's not used? >> (Or used to build the bootstrap javac but not to build the rest?) >> Is there a case where the environment is missing quoteReplacement >> but the bootstrap javac isn't? >> (Maybe Matcher.java is irrelevant and obsolete, like this machine?) > > It could be, and that's what I considered as a potential fix for the > original failure. The problem is that changing the build could break > builds with other JDKs, and I'm not sure the risk is worth it for > such a limited use case. Even if you just had GCJ, you could use that > to build IcedTea 1.x/OpenJDK 6, then build IcedTea 2.x with that. > >>> I think it may be possible to fix this by running javac with the patched >>> runtime on the bootclasspath. However, it's difficult to know without >>> testing >>> and changing that may break builds with other JDKs. We test builds with gcj >>> the most, but not a version this old. >>> >>> If you have https://packages.debian.org/squeeze/openjdk-6-jdk installed, >>> then you could try building with >>> --with-jdk-home=/usr/lib/jvm/java-6-openjdk >>> to use that instead. However, I strongly recommend that you just upgrade >>> this system as the version of OpenJDK 6 is also outdated (1.13.5 is the >>> latest) >>> and there are likely to be further missing system dependencies later in the >>> build that may cause problems, or lead to an incomplete JDK (for example, >>> NIO2 is likely to be incomplete without certain system calls being >>> present). >> >> --with-jdk-home=/usr/lib/jvm/java-6-openjdk works so far, >> thanks a lot for your help! > > No problem. Thanks for making us aware of the issue! From jkang at icedtea.classpath.org Thu Jan 22 18:52:56 2015 From: jkang at icedtea.classpath.org (jkang at icedtea.classpath.org) Date: Thu, 22 Jan 2015 18:52:56 +0000 Subject: /hg/icedtea-web: Add quotes to Docs paths in Makefile.am Message-ID: changeset 5bd739d5e4e1 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=5bd739d5e4e1 author: Jie Kang date: Thu Jan 22 13:52:23 2015 -0500 Add quotes to Docs paths in Makefile.am 2014-01-22 Jie Kang Add quotes to Docs paths in Makefile.am * Makefile.am:(install-data-local)(stamps/generate-docs.stamp) paths have quotes "" around them diffstat: ChangeLog | 6 ++++++ Makefile.am | 42 +++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 21 deletions(-) diffs (90 lines): diff -r b6e1270385f4 -r 5bd739d5e4e1 ChangeLog --- a/ChangeLog Wed Jan 21 11:42:48 2015 -0500 +++ b/ChangeLog Thu Jan 22 13:52:23 2015 -0500 @@ -1,3 +1,9 @@ +2014-01-22 Jie Kang + + Add quotes to Docs paths in Makefile.am + * Makefile.am:(install-data-local)(stamps/generate-docs.stamp) paths have + quotes "" around them + 2014-01-21 Lukasz Dracz Change PolicyEditor to use OptionParser diff -r b6e1270385f4 -r 5bd739d5e4e1 Makefile.am --- a/Makefile.am Wed Jan 21 11:42:48 2015 -0500 +++ b/Makefile.am Thu Jan 22 13:52:23 2015 -0500 @@ -275,7 +275,7 @@ # all generated manpages are installed in swarm install-data-local: ${mkinstalldirs} -d $(DESTDIR)$(mandir) - cp -r $(DOCS_DIR)/man/* $(DESTDIR)$(mandir)/ + cp -r "$(DOCS_DIR)/man/"* $(DESTDIR)$(mandir)/ if ENABLE_DOCS ${mkinstalldirs} $(DESTDIR)$(htmldir) (cd ${abs_top_builddir}/docs/netx; \ @@ -495,36 +495,36 @@ endif stamps/generate-docs.stamp: stamps/netx.stamp - mkdir -p $(DOCS_DIR) ; \ - HTML_DOCS_TARGET_DIR=$(DOCS_DIR)/html ; \ - PLAIN_DOCS_TARGET_DIR=$(DOCS_DIR)/plain ; \ - MAN_DOCS_TARGET_DIR=$(DOCS_DIR)/man ; \ - mkdir $$HTML_DOCS_TARGET_DIR ; \ - mkdir $$PLAIN_DOCS_TARGET_DIR ; \ - mkdir $$MAN_DOCS_TARGET_DIR ; \ - HTML_DOCS_INDEX=$$HTML_DOCS_TARGET_DIR/index.html ; \ + mkdir -p "$(DOCS_DIR)" ; \ + HTML_DOCS_TARGET_DIR="$(DOCS_DIR)/html" ; \ + PLAIN_DOCS_TARGET_DIR="$(DOCS_DIR)/plain" ; \ + MAN_DOCS_TARGET_DIR="$(DOCS_DIR)/man" ; \ + mkdir "$$HTML_DOCS_TARGET_DIR" ; \ + mkdir "$$PLAIN_DOCS_TARGET_DIR" ; \ + mkdir "$$MAN_DOCS_TARGET_DIR" ; \ + HTML_DOCS_INDEX="$$HTML_DOCS_TARGET_DIR/index.html" ; \ TP_COMMAND="$(BOOT_DIR)/bin/java -cp $(NETX_DIR) net.sourceforge.jnlp.util.docprovider.TextsProvider" ; \ TP_TAIL="false $(FULL_VERSION)" ; \ LANG_BACKUP=$$LANG ; \ - echo "$(PLUGIN_VERSION)" > $$HTML_DOCS_INDEX ; \ + echo "$(PLUGIN_VERSION)" > "$$HTML_DOCS_INDEX" ; \ echo "

    $(PLUGIN_VERSION) docs:

    " >> $$HTML_DOCS_INDEX ; \ for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \ ID=`echo "$$LANG_ID" | head -c 2` ; \ ENCOD=`echo "$$LANG_ID" | tail -c 6` ; \ export LANG=$$LANG_ID; \ - mkdir $$HTML_DOCS_TARGET_DIR/$$ID ; \ - echo "
  • $$LANG_ID
  • " >> $$HTML_DOCS_INDEX ; \ - $$TP_COMMAND html $$HTML_DOCS_TARGET_DIR/$$ID false $$TP_TAIL ; \ - mkdir $$PLAIN_DOCS_TARGET_DIR/$$ID ; \ - $$TP_COMMAND plain $$PLAIN_DOCS_TARGET_DIR/$$ID 160 false $$TP_TAIL; \ + mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \ + echo "
  • $$LANG_ID
  • " >> "$$HTML_DOCS_INDEX" ; \ + $$TP_COMMAND html "$$HTML_DOCS_TARGET_DIR/$$ID" false "$$TP_TAIL" ; \ + mkdir "$$PLAIN_DOCS_TARGET_DIR/$$ID" ; \ + $$TP_COMMAND plain "$$PLAIN_DOCS_TARGET_DIR/$$ID" 160 false "$$TP_TAIL"; \ if [ $$ID == "en" ] ; then \ - MAN_DESC=$$MAN_DOCS_TARGET_DIR/man1 ; \ + MAN_DESC="$$MAN_DOCS_TARGET_DIR/man1" ; \ else \ - MAN_DESC=$$MAN_DOCS_TARGET_DIR/$$ID/man1 ; \ + MAN_DESC="$$MAN_DOCS_TARGET_DIR/$$ID/man1" ; \ fi ; \ - mkdir -p $$MAN_DESC ; \ - $$TP_COMMAND man $$ENCOD $$MAN_DESC $$TP_TAIL ; \ - $$TP_COMMAND htmlIntro $(NETX_DIR)/net/sourceforge/jnlp/resources/about_$$ID.html $$TP_TAIL; \ + mkdir -p "$$MAN_DESC" ; \ + $$TP_COMMAND man $$ENCOD "$$MAN_DESC" "$$TP_TAIL" ; \ + $$TP_COMMAND htmlIntro "$(NETX_DIR)/net/sourceforge/jnlp/resources/about_$$ID.html" "$$TP_TAIL"; \ done ; \ export LANG=$$LANG_BACKUP ; \ echo "" >> $$HTML_DOCS_INDEX ; \ @@ -672,7 +672,7 @@ rm -f stamps/plugin-docs.stamp clean-generated-docs: - rm -rf $(DOCS_DIR) + rm -rf "$(DOCS_DIR)" rm -f stamps/generate-docs.stamp From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 18:55:38 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 18:55:38 +0000 Subject: [Bug 2189] New: Unable to remove security pop up Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2189 Bug ID: 2189 Summary: Unable to remove security pop up Product: IcedTea Version: unspecified Hardware: x86 OS: Mac OS Status: NEW Severity: enhancement Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: mkellner at cognitivemedicine.com CC: unassigned at icedtea.classpath.org We are using Ubuntu version 14.04 and ice-tea to run our Java application. The browser used is Firefox. All certificate and trust settings have been set. When we run the application we get the error message below (with identifying information removed): The application (our application) from https://desired.website uses resources from the following remote locations: - https://desired.website Are you sure you want to run this application? Even at the lowest security settings we are receiving the pop up. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 22 19:00:15 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 22 Jan 2015 19:00:15 +0000 Subject: [Bug 2189] Unable to remove security pop up In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2189 Jie Kang changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jkang at redhat.com Component|IcedTea |Plugin Assignee|gnu.andrew at redhat.com |jvanek at redhat.com Product|IcedTea |IcedTea-Web --- Comment #1 from Jie Kang --- Moving to appropriate product and component. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jan 23 09:08:33 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 23 Jan 2015 09:08:33 +0000 Subject: [Bug 2189] Unable to remove security pop up In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2189 --- Comment #2 from JiriVanek --- By other words there is request on us to make those dialogues to rember decisission. If this is yyours application - it is much easier to set new manifest atributes to corect values. Then the dialogue wil not even pop up: http://docs.oracle.com/javase/tutorial/deployment/jar/secman.html -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jkang at redhat.com Fri Jan 23 14:22:04 2015 From: jkang at redhat.com (Jie Kang) Date: Fri, 23 Jan 2015 09:22:04 -0500 (EST) Subject: [rfc][[icedtea-web] fixing jnlp shortcuts In-Reply-To: <54C0F9D9.4070703@redhat.com> References: <54C0F9D9.4070703@redhat.com> Message-ID: <1257500307.11010054.1422022924051.JavaMail.zimbra@redhat.com> ----- Original Message ----- > hi! > > I have accidentally excluded shortcuts generation for jnlp apps. If shortcut > is to be created for > jnlp app (not html applet) the shortcutdescriptor is accidentally simply left > null and so it is > never created. > > This small patch fixes that. > > > Also I noted that opera is missing in list of browsers for browser shortcut. > Fixed also. Hello, Looks good to me. Regards, > > > J. > -- Jie Kang OpenJDK Team - Software Engineering Intern From jvanek at icedtea.classpath.org Fri Jan 23 14:37:25 2015 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Fri, 23 Jan 2015 14:37:25 +0000 Subject: /hg/icedtea-web: Returned accidentally removed creation of short... Message-ID: changeset 918fb141b815 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=918fb141b815 author: Jiri Vanek date: Fri Jan 23 15:35:46 2015 +0100 Returned accidentally removed creation of shortcuts for jnlp applications. Opera added to list of shortcut browsers. * netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java: filling of AccessWarningPaneComplexReturn no longer depnds on existence of htmlPanels. * netx/net/sourceforge/jnlp/util/XDesktopEntry.java: (BROWSERS) opera added to list of recognized browsers diffstat: ChangeLog | 8 ++++ netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java | 20 ++++++++-- netx/net/sourceforge/jnlp/util/XDesktopEntry.java | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diffs (58 lines): diff -r 5bd739d5e4e1 -r 918fb141b815 ChangeLog --- a/ChangeLog Thu Jan 22 13:52:23 2015 -0500 +++ b/ChangeLog Fri Jan 23 15:35:46 2015 +0100 @@ -1,3 +1,11 @@ +2014-01-23 Jiri Vanek + + Returned accidentally removed creation of shortcuts for jnlp applications. + * netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java: filling + of AccessWarningPaneComplexReturn no longer depnds on existence of htmlPanels. + * netx/net/sourceforge/jnlp/util/XDesktopEntry.java: (BROWSERS) opera added + to list of recognized browsers + 2014-01-22 Jie Kang Add quotes to Docs paths in Makefile.am diff -r 5bd739d5e4e1 -r 918fb141b815 netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java --- a/netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java Thu Jan 22 13:52:23 2015 -0500 +++ b/netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java Fri Jan 23 15:35:46 2015 +0100 @@ -328,11 +328,23 @@ private AccessWarningPaneComplexReturn getModifier(int button) { AccessWarningPaneComplexReturn ar = new AccessWarningPaneComplexReturn(button); - if (htmlPanelDesktop != null && desktopCheck != null) { - ar.setDekstop(htmlPanelDesktop.getShortcutResult(desktopCheck.isSelected())); + if (desktopCheck != null) { + if (htmlPanelDesktop != null) { + //html + ar.setDekstop(htmlPanelDesktop.getShortcutResult(desktopCheck.isSelected())); + } else { + //jnlp + ar.setDekstop(new AccessWarningPaneComplexReturn.ShortcutResult(desktopCheck.isSelected())); + } } - if (htmlPanelMenu != null && menuCheck != null) { - ar.setMenu(htmlPanelMenu.getShortcutResult(menuCheck.isSelected())); + if (menuCheck != null) { + if (htmlPanelMenu != null) { + //html + ar.setMenu(htmlPanelMenu.getShortcutResult(menuCheck.isSelected())); + } else { + //jnlp + ar.setMenu(new AccessWarningPaneComplexReturn.ShortcutResult(menuCheck.isSelected())); + } } if (rememberPanel != null) { ar.setRember(rememberPanel.getShortcutResult()); diff -r 5bd739d5e4e1 -r 918fb141b815 netx/net/sourceforge/jnlp/util/XDesktopEntry.java --- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Thu Jan 22 13:52:23 2015 -0500 +++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Fri Jan 23 15:35:46 2015 +0100 @@ -87,7 +87,7 @@ //in pixels private static final int[] VALID_ICON_SIZES = new int[] { 16, 22, 32, 48, 64, 128 }; //browsers we try to find on path for html shortcut - public static final String[] BROWSERS = new String[]{"firefox", "midori", "epiphany", "chromium", "chrome", "konqueror"}; + public static final String[] BROWSERS = new String[]{"firefox", "midori", "epiphany", "opera", "chromium", "chrome", "konqueror"}; public static final String FAVICON = "favicon.ico"; /** From gnu.andrew at redhat.com Fri Jan 23 16:01:23 2015 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Fri, 23 Jan 2015 11:01:23 -0500 (EST) Subject: NoSuchMethodError: Matcher.quoteReplacement In-Reply-To: <54C1354E.60304@nottheoilrig.com> References: <54B2E5A0.8020504@nottheoilrig.com> <1934335812.6553316.1421112530438.JavaMail.zimbra@redhat.com> <54B4971F.8090405@nottheoilrig.com> <92690351.7038806.1421167541587.JavaMail.zimbra@redhat.com> <54C00EB8.4080005@nottheoilrig.com> <983053930.12707161.1421879445072.JavaMail.zimbra@redhat.com> <54C1354E.60304@nottheoilrig.com> Message-ID: <579178918.14142278.1422028883527.JavaMail.zimbra@redhat.com> snip... > Maybe it's irrelevant, but here are the old logs: > http://nottheoilrig.com/java/201501120/config.log > http://nottheoilrig.com/java/201501120/screenlog > > What indicates that javac is from GCJ? > /usr/lib/jvm/java-gcj/bin/java is from GCJ > however GCJ javac is not installed on this machine. > > From the old logs: > [...] > JAVA='/usr/lib/jvm/java-gcj/bin/java' > JAVAC='/usr/bin/javac' > [...] > > Furthermore both /usr/bin/java and /usr/bin/javac are OpenJDK 6: > > /usr/bin/java -> /etc/alternatives/java > /usr/bin/javac -> /etc/alternatives/javac > > /etc/alternatives/java -> /usr/lib/jvm/java-6-openjdk/jre/bin/java > /etc/alternatives/javac -> /usr/lib/jvm/java-6-openjdk/bin/javac > Sorry, yes, I mis-remembered. I think that was creating part of the problem; you weren't giving it a full JDK but part of one and part of the other :/ -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From bugzilla-daemon at icedtea.classpath.org Fri Jan 23 18:11:26 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 23 Jan 2015 18:11:26 +0000 Subject: [Bug 2050] [IcedTea7] JamVM lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2050 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|xerxes at zafena.se |gnu.andrew at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jan 23 18:13:22 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 23 Jan 2015 18:13:22 +0000 Subject: [Bug 2190] New: [IcedTea6] JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2190 Bug ID: 2190 Summary: [IcedTea6] JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5 Product: IcedTea Version: 6-1.13.5 Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: JamVM Assignee: xerxes at zafena.se Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org Clone of PR2050 for 1.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jan 23 18:13:34 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 23 Jan 2015 18:13:34 +0000 Subject: [Bug 2184] [IcedTea6] CACAO lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2184 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|[IcedTea6] CACAO lacks |[IcedTea6] CACAO lacks |JVM_FindClassFromCaller |JVM_FindClassFromCaller |introduced by security |introduced by security |patch in 2.5.3 |patch in 1.13.5 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jan 23 18:14:24 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 23 Jan 2015 18:14:24 +0000 Subject: [Bug 2190] [IcedTea6] JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2190 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Assignee|xerxes at zafena.se |gnu.andrew at redhat.com Target Milestone|--- |6-1.13.6 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jkang at redhat.com Fri Jan 23 19:09:57 2015 From: jkang at redhat.com (Jie Kang) Date: Fri, 23 Jan 2015 14:09:57 -0500 (EST) Subject: [rfc][icedtea-web] Allow cache directory to be changed during runtime In-Reply-To: <54BF78BC.3020902@redhat.com> References: <923849450.2779734.1420487350270.JavaMail.zimbra@redhat.com> <54B80419.5050805@redhat.com> <54BF78BC.3020902@redhat.com> Message-ID: <632275992.11216492.1422040197222.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 01/15/2015 07:16 PM, Andrew Azores wrote: > > On 01/05/2015 02:49 PM, Jie Kang wrote: > >> Hello, > >> > >> This patch consolidates the cacheDir instance to a single place and allows > >> us to change it during > >> run-time. It also modifies a unit test to use this new feature. This > >> feature is aimed mainly at > >> unit tests that need the cache, but do not want to modify the > >> icedtea-web's user cache. > >> > >> Thoughts? Okay to push? > > I'm wondering why it is needed at all. > > JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR); > is the place > where you can set the dir. > > > For unittest you may force refelction to do the job. if the chnage of the > property isnot enough. > > > What I would rather see is, to get rid of all the static stuff in > CacheLRUWrapper and have > possibility to create in instance. > This instance will be also much more testable. But maybe it is overkill. Hello, Yes this is mainly to address that for unit tests, JNLPRuntime.[...] doesn't work since CacheLRUWrapper and CacheUtil both use static variables that get initialized on first use of either class. I think getting rid of all the static stuff in LRUWrapper and making it instantiable is a great idea. I see this patch as a baby-step towards doing that. I very strongly prefer NOT using reflection to set the cacheDir value in the unit tests. Also, please see [1] for a longer explanation [1] http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030470.html Regards, > > J. > >> > >> > >> Regards, > >> > > > > I think this looks generally ok. Maybe as a separate enhancement changeset, > > but since you're working > > in here anyway, could you look at doing some refactoring to store the cache > > directory as something > > better than a String? As a File, or using Java 7's nio2 stuff, a Path > > maybe? > > On one side - yes, on the other - why? What operations are mainly done on the > "string" string ops or > file ops - I have not checked code, but seems like concate is most often :) > > But yes - it is directory, so file or path is probably better then string. > Please, do this refactoring as separate changset anyway. > > J. > -- Jie Kang OpenJDK Team - Software Engineering Intern From bugzilla-daemon at icedtea.classpath.org Fri Jan 23 21:03:59 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 23 Jan 2015 21:03:59 +0000 Subject: [Bug 1904] [IcedTea6] [REGRESSION] Bug reports now lack IcedTea version & distribution packaging information In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1904 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |doko at ubuntu.com --- Comment #3 from Andrew John Hughes --- *** Bug 1893 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jan 23 21:03:59 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 23 Jan 2015 21:03:59 +0000 Subject: [Bug 1893] patches/hotspot/hs23/version.patch uses the unused CPPFLAGS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1893 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Andrew John Hughes --- *** This bug has been marked as a duplicate of bug 1904 *** -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jan 23 21:04:24 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 23 Jan 2015 21:04:24 +0000 Subject: [Bug 1904] [IcedTea6] [REGRESSION] Bug reports now lack IcedTea version & distribution packaging information In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1904 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|6-hg |6-1.13.4 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gnu.andrew at redhat.com Sat Jan 24 00:39:03 2015 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Sat, 24 Jan 2015 00:39:03 +0000 Subject: [SECURITY] IcedTea 1.13.6 for OpenJDK 6 Released! Message-ID: <20150124003852.GA29532@carrie.the212.com> The IcedTea project provides a harness to build the source code from OpenJDK using Free Software build tools, along with additional features such as a PulseAudio sound driver, the ability to build against system libraries and support for alternative virtual machines and architectures beyond those supported by OpenJDK. This release updates our OpenJDK 6 support in the 1.13.x series with the January 2015 security fixes. If you find an issue with the release, please report it to our bug database (http://icedtea.classpath.org/bugzilla) under the appropriate component. Development discussion takes place on the distro-pkg-dev at openjdk.java.net mailing list and patches are always welcome. Full details of the release can be found below. What's New? =========== New in release 1.13.6 (2015-01-23): * Security fixes - S8046656: Update protocol support - S8047125, CVE-2015-0395: (ref) More phantom object references - S8047130: Fewer escapes from escape analysis - S8048035, CVE-2015-0400: Ensure proper proxy protocols - S8049253: Better GC validation - S8050807, CVE-2015-0383: Better performing performance data handling - S8054367, CVE-2015-0412: More references for endpoints - S8055304, CVE-2015-0407: More boxing for DirectoryComboBoxModel - S8055309, CVE-2015-0408: RMI needs better transportation considerations - S8055479: TLAB stability - S8055489, CVE-2014-6585: Better substitution formats - S8056264, CVE-2014-6587: Multicast support improvements - S8056276, CVE-2014-6591: Fontmanager feature improvements - S8057555, CVE-2014-6593: Less cryptic cipher suite management - S8058982, CVE-2014-6601: Better verification of an exceptional invokespecial - S8059485, CVE-2015-0410: Resolve parsing ambiguity - S8061210, CVE-2014-3566: Issues in TLS * Import of OpenJDK6 b34 - OJ43: Backport JAX_WS-945; Socket backlog may be limiting lwhs performance - OJ44: Add missing TimeZone test cases included in OpenJDK 7 revision 0. - OJ45: Fix copyright headers on imported files - OJ46: Fix lost Classpath exception - OJ47: Remove @Override annotation on interfaces added by 2015/01/20 security fixes. - OJ48: Fix substitution error. - OJ49: Fix placement of 8023956 fix. - OJ50: Fix reference to missing pd_attempt_reserve_memory_at - S4873188: Support TLS 1.1 - S6364329: jstat displays "invalid argument count" with usage - S6461635: [TESTBUG] BasicTests.sh test fails intermittently - S6507067: TimeZone country/area message error - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec - S6578647: Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication() - S6585666: Spanish language names not compliant with CLDR - S6587676: Krb5LoginModule failure if useTicketCache=true on Vista - S6608572: Currency change for Malta and Cyprus - S6610748: Dateformat - AM-PM indicator in Finnish appears to be from English - S6627549: ISO 3166 code addition: Saint Barthelemy and Saint Martin - S6631048: Problem when writing on output stream of HttpURLConnection - S6641309: Wrong Cookie separator used in HttpURLConnection - S6641312: Fix krb5 codes indentation problems - S6645271: Wrong date format for Croatian (hr) locale - S6646611: Incorrect spelling of month name in locale for Belarusian language ("be", "BY") - S6647452: Remove obfuscation, framework and provider self-verification checking - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems - S6659779: HttpURLConnections logger should log tunnel requests - S6670362: HTTP/SPNEGO should work across realms - S6716626: Integrate contributed language and country names for NL - S6720866: Slow performance using HttpURLConnection for upload - S6726695: HttpURLConnection shoul support 'Expect: 100-continue' headers for PUT - S6729881: Compiler warning in networking native code - S6765491: Krb5LoginModule a little too restrictive, and the doc is not clear. - S6776102: sun/util/resources/TimeZone/Bug6317929.java test failed against 6u12b01 and passed against 6u11b03 - S6786276: Locale.getISOCountries() still contains country code "CS" - S6792180: Enhance to reject weak algorithms or conform to crypto recommendations - S6811297: Add more logging to HTTP protocol handler - S6822460: support self-issued certificate - S6830658: Changeset 67e5d3e41b5b breaks the fastdebug build in NativeCreds.c - S6835668: Use of /usr/include/linux/ files creates a dependence on kernel-headers - S6855297: Windows build breaks after 6811297 - S6856856: NPE in HTTP protocol handler logging - S6868106: Ukrainian currency has wrong format - S6870908: reopen bug 4244752: month names in Estonian should be lowercase - S6873931: New Turkish currency since 2009 - S6882594: Remove static dependancy on NTLM authentication - S6899503: Security code issue using Verisign root certificate - S6910489: Slovenia Locale, wrong firstDayOfWeek number - S6911104: Tests do not work with CYGWIN: tools, sun/tools, and com/sun/tools - S6914413: abbreviation name for November is not correct in be_BY - S6916787: Ukrainian currency name needs to be fixed - S6919624: minimalDaysInFirstWeek ressource for hungarian is wrong - S6931564: Incorrect display name of Locale for south africa - S6931566: NetworkInterface is not working when interface name is more than 15 characters long - S6938454: 2 new testcases for bug: Unable to determine generic type in program that compiles under Java 6 - S6938454: Unable to determine generic type in program that compiles under Java 6 - S6945604: wrong error message in CardImpl.java - S6962617: Testcase changes, cleanup of problem list for jdk_tools targets - S6964714: NetworkInterface getInetAddresses enumerates IPv6 addresses if java.net.preferIPvStack property set - S6967937: Scope id no longer being set after 6931566 - S6972374: NetworkInterface.getNetworkInterfaces throws "java.net.SocketException" on Solaris zone - S6976117: SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets without TLSv1.1 enabled - S7001720: copyright templates not rebranded - S7019267: Currency Display Names are not localized into pt_BR. - S7020583: Some currency names are missing in some locales - S7020960: CurrencyNames_sr_RS.properties is missing. - S7022269: clean up fscanf usage in Linux networking native code - S7025837: fix plural currency display names in sr_Latn_(BA|ME|RS).properties - S7028073: The currency symbol for Peru is wrong - S7035555: 4/4 attach/BasicTests.sh needs another tweak for Cygwin - S7036025: java.security.AccessControlException when creating JFileChooser in signed applet - S7036905: [de] dem - the german mark display name is incorrect - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true - S7066203: Update currency data to the latest ISO 4217 standard - S7077119: remove past transition dates from CurrencyData.properties file - S7085757: Currency Data: ISO 4217 Amendment 152 - S7122142, RH1151372: (ann) Race condition between isAnnotationPresent and getAnnotations - S7153184: NullPointerException when calling SSLEngineImpl.getSupportedCipherSuites - S7161796, RH1151372: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror - S7171028: dots are missed in the datetime for Slovanian - S7174244: NPE in Krb5ProxyImpl.getServerKeys() - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations - S7189611: Venezuela current Currency should be Bs.F. - S7195759: ISO 4217 Amendment 154 - S7199066: Typo in method name - S7201205: Add Makefile configuration option to build with unlimited crypto in OpenJDK. - S8005232: (JEP-149) Class Instance size reduction - S8006748: getISO3Country() returns wrong value - S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale - S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE - S8015570: Use long comparison in Rule.getRules(). - S8021121: ISO 4217 Amendment Number 156 - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws java.lang.IllegalStateException: unexpected condition - S8023956: Provide a work-around to broken Linux 32 bit "Exec Shield" using CS for NX emulation (crashing with SI_KERNEL) - S8025051: Update resource files for TimeZone display names - S8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing - S8027359: XML parser returns incorrect parsing results - S8027370: Support tzdata2013h - S8027695: There should be a space before % sign in Swedish locale - S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings - S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions - S8029153: [TESTBUG] test/compiler/7141637/SpreadNullArg.java fails because it expects NullPointerException - S8029318: Native Windows ccache still reads DES tickets - S8030822: (tz) Support tzdata2013i - S8031046: Native Windows ccache might still get unsupported ticket - S8032788: ImageIcon constructor throws an NPE and hangs when passed a null String parameter - S8032909: XSLT string-length returns incorrect length when string includes complementary chars - S8035613: With active Securitymanager JAXBContext.newInstance fails - S8037012: (tz) Support tzdata2014a - S8038306: (tz) Support tzdata2014b - S8040617: [macosx] Large JTable cell results in a OutOfMemoryException - S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser - S8043012: (tz) Support tzdata2014c - S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX - S8049250: Need a flag to invert the Card.disconnect(reset) argument - S8049343: (tz) Support tzdata2014g - S8050485: super() in a try block in a ctor causes VerifyError - S8051012: Regression in verifier for method call from inside of a branch - S8051614: smartcardio TCK tests fail due to lack of 'reset' permission - S8054367: More references for endpoints - S8055222: Currency update needed for ISO 4217 Amendment #159 - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure - S8058715: stability issues when being launched as an embedded JVM via JNI - S8059206: (tz) Support tzdata2014i - S8060474: Resolve more parsing ambiguity - S8061826: Part of JDK-8060474 should be reverted - S8062561: Test bug8055304 fails if file system default directory has read access - S8062807: Exporting RMI objects fails when run under restrictive SecurityManager - S8064560: (tz) Support tzdata2014j * Backports - OJ51, PR2187: Sync patch for 4873188 with 7 version - OJ52, PR2185: Application of 6786276 introduces compatibility issue - OJ53, PR2181: strict-aliasing warnings issued on PPC32 - OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport - S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" - S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine - S8000897, PR2173, RH1155012: VM crash in CompileBroker - S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object - S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. - S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge * Bug fixes - PR1831: Drop version requirement for LCMS 2 - PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library - PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop - PR2062: Unset OS before running OpenJDK build - PR2070: Type-punning warnings still evident on RHEL 5 - PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). - PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure - PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS - PR2179: Avoid x86 workaround when running Zero rather than a JIT - PR2180: Old autotools dislike $(builddir)/fsg.sh * CACAO - PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 1.13.6 * JamVM - PR2190: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.6 The tarballs can be downloaded from: http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.gz http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.xz We provide both gzip and xz tarballs, so that those who are able to make use of the smaller tarball produced by xz may do so. The tarballs are accompanied by digital signatures available at: http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.gz.sig http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.xz.sig These are produced using my public key. See details below. PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 I'm transitioning to the use of a new key for signing releases over the next year. Signatures made with this key are available at: http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.gz.sig.ec http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.xz.sig.ec and the new key is: PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 SHA256 checksums: eb06a1e9a16f6473ffac4072c753e8e0fd1c39ad00016bcbd984534a93189e52 icedtea6-1.13.6.tar.gz 1e62fe97d4a6dfe641373889534741ec5f06d268e2ea14a8f4ff505560e1c3f8 icedtea6-1.13.6.tar.gz.sig 356edb04945690e216f0569e9dc8afd8f55c2a0dfc8816a904e63506220cb523 icedtea6-1.13.6.tar.gz.sig.ec 2090f3a9e4b045073f8fcd147848e3b94b389fa2740b20ded4c5d2398f1b4c99 icedtea6-1.13.6.tar.xz ac02dc6515afcf2aac2d731e56b7aa6c987e98b7c7a9ed214e4e4a08d2b21528 icedtea6-1.13.6.tar.xz.sig 1fa7b55a960cbf3db4000e170c95b3e78413fef45655609de05f55a7c5012347 icedtea6-1.13.6.tar.xz.sig.ec The checksums can be downloaded from: http://icedtea.classpath.org/download/source/icedtea6-1.13.6.sha256 The following people helped with these releases: * Andrew Dinn (backport of S8047125) * Andrew Hughes (all other backports, release management) We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea6-1.13.6.tar.gz or: $ tar x -I xz -f icedtea6-1.13.6.tar.xz then: $ mkdir icedtea-build $ cd icedtea-build $ ../icedtea6-1.13.6/configure $ make Full build requirements and instructions are available in the INSTALL file. Happy hacking! -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 213 bytes Desc: Digital signature URL: From andrew at icedtea.classpath.org Sat Jan 24 02:08:17 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sat, 24 Jan 2015 02:08:17 +0000 Subject: /hg/release/icedtea6-1.13: 3 new changesets Message-ID: changeset 540eb79e2917 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=540eb79e2917 author: Andrew John Hughes date: Fri Jan 23 18:47:27 2015 +0000 PR2190: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5 2015-01-07 Andrew John Hughes PR2190: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5 * Makefile.am: (ICEDTEA_PATCHES): Add new patch when building JamVM. (EXTRA_DIST): Include patches from JamVM directory. * NEWS: Updated. * patches/jamvm/pr2190-find_class_from_caller.patch: Backport JamVM patch to implement FindClassFromCaller. changeset e6429eecdf69 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=e6429eecdf69 author: Andrew John Hughes date: Fri Jan 23 18:50:21 2015 +0000 Update release date and fix description of PR2184. 2015-01-23 Andrew John Hughes * NEWS: Update release date and fix description of PR2184. changeset a2adf13bc1ec in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=a2adf13bc1ec author: Andrew John Hughes date: Sat Jan 24 02:08:02 2015 +0000 Added tag icedtea6-1.13.6 for changeset e6429eecdf69 diffstat: .hgtags | 1 + ChangeLog | 17 ++++ Makefile.am | 5 + NEWS | 6 +- patches/jamvm/pr2190-find_class_from_caller.patch | 93 +++++++++++++++++++++++ 5 files changed, 120 insertions(+), 2 deletions(-) diffs (167 lines): diff -r 8693268730ca -r a2adf13bc1ec .hgtags --- a/.hgtags Wed Jan 21 22:22:34 2015 +0000 +++ b/.hgtags Sat Jan 24 02:08:02 2015 +0000 @@ -32,3 +32,4 @@ 0000000000000000000000000000000000000000 icedtea6-1.13.4 cbd687c7240d173b0b34840ba07a39a6e7b39a20 icedtea6-1.13.4 b2b4346dbdf5be3e9f8609e4a7e923f6557c19dd icedtea6-1.13.5 +e6429eecdf6945c6a4b431049bcbf1834b255158 icedtea6-1.13.6 diff -r 8693268730ca -r a2adf13bc1ec ChangeLog --- a/ChangeLog Wed Jan 21 22:22:34 2015 +0000 +++ b/ChangeLog Sat Jan 24 02:08:02 2015 +0000 @@ -1,3 +1,20 @@ +2015-01-23 Andrew John Hughes + + * NEWS: Update release date and fix + description of PR2184. + +2015-01-07 Andrew John Hughes + + PR2190: JamVM lacks JVM_FindClassFromCaller introduced + by security patch in 1.13.5 + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch when building + JamVM. + (EXTRA_DIST): Include patches from JamVM directory. + * NEWS: Updated. + * patches/jamvm/pr2190-find_class_from_caller.patch: + Backport JamVM patch to implement FindClassFromCaller. + 2015-01-21 Andrew John Hughes * Makefile.am: diff -r 8693268730ca -r a2adf13bc1ec Makefile.am --- a/Makefile.am Wed Jan 21 22:22:34 2015 +0000 +++ b/Makefile.am Sat Jan 24 02:08:02 2015 +0000 @@ -646,6 +646,11 @@ patches/hotspot/hs23/systemtap-alloc-size-workaround.patch endif +if BUILD_JAMVM +ICEDTEA_PATCHES += \ + patches/jamvm/pr2190-find_class_from_caller.patch +endif + if ENABLE_NSS ICEDTEA_PATCHES += patches/rh1022017.patch NSS_PATCHES = patches/nss-config.patch diff -r 8693268730ca -r a2adf13bc1ec NEWS --- a/NEWS Wed Jan 21 22:22:34 2015 +0000 +++ b/NEWS Sat Jan 24 02:08:02 2015 +0000 @@ -12,7 +12,7 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.13.6 (2015-01-20): +New in release 1.13.6 (2015-01-23): * Security fixes - S8046656: Update protocol support @@ -186,7 +186,9 @@ - PR2179: Avoid x86 workaround when running Zero rather than a JIT - PR2180: Old autotools dislike $(builddir)/fsg.sh * CACAO - - PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 + - PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 1.13.6 +* JamVM + - PR2190: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.6 New in release 1.13.5 (2014-10-14): diff -r 8693268730ca -r a2adf13bc1ec patches/jamvm/pr2190-find_class_from_caller.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jamvm/pr2190-find_class_from_caller.patch Sat Jan 24 02:08:02 2015 +0000 @@ -0,0 +1,93 @@ +diff -Nru jamvm.old/src/classlib/openjdk/class.c jamvm/src/classlib/openjdk/class.c +--- jamvm/jamvm.old/src/classlib/openjdk/class.c 2013-11-18 03:45:44.000000000 +0000 ++++ jamvm/jamvm/src/classlib/openjdk/class.c 2015-01-07 16:14:57.599311159 +0000 +@@ -23,6 +23,7 @@ + #include "jam.h" + #include "hash.h" + #include "class.h" ++#include "excep.h" + #include "symbol.h" + + /* Cached offset of classes field in java.lang.ClassLoader objects */ +@@ -161,3 +162,24 @@ + + return strcat(strcpy(endorsed_dirs, java_home), "/lib/endorsed"); + } ++ ++Class *findClassFromLoader(char *name, int init, Object *loader, ++ int throw_error) { ++ ++ Class *class = findClassFromClassLoader(name, loader); ++ ++ if(class == NULL) { ++ if(!throw_error) { ++ Object *excep = exceptionOccurred(); ++ char *dot_name = slash2DotsDup(name); ++ ++ clearException(); ++ signalChainedException(java_lang_ClassNotFoundException, ++ dot_name, excep); ++ sysFree(dot_name); ++ } ++ } else if(init) ++ initClass(class); ++ ++ return class; ++} +diff -Nru jamvm.old/src/classlib/openjdk/jvm.c jamvm/src/classlib/openjdk/jvm.c +--- jamvm/jamvm.old/src/classlib/openjdk/jvm.c 2013-11-18 03:45:44.000000000 +0000 ++++ jamvm/jamvm/src/classlib/openjdk/jvm.c 2015-01-07 16:16:43.560605105 +0000 +@@ -520,26 +520,22 @@ + jclass JVM_FindClassFromClassLoader(JNIEnv *env, const char *name, + jboolean init, jobject loader, + jboolean throw_error) { +- Class *class; + + TRACE("JVM_FindClassFromClassLoader(env=%p, name=%s, init=%d, loader=%p," + " throwError=%d)", env, name, init, loader, throwError); + +- class = findClassFromClassLoader((char *)name, loader); ++ return findClassFromLoader((char *)name, init, loader, throw_error); ++} ++ ++/* JVM_FindClassFromCaller */ ++ ++jclass JVM_FindClassFromCaller(JNIEnv *env, const char *name, jboolean init, ++ jobject loader, jclass caller) { + +- if(class == NULL && !throw_error) { +- Object *excep = exceptionOccurred(); +- char *dot_name = slash2DotsDup((char*)name); +- +- clearException(); +- signalChainedException(java_lang_ClassNotFoundException, +- dot_name, excep); +- sysFree(dot_name); +- } else +- if(init) +- initClass(class); ++ TRACE("JVM_FindClassFromCaller(env=%p, name=%s, init=%d, loader=%p," ++ " caller=%p)", env, name, init, loader, caller); + +- return class; ++ return findClassFromLoader((char *)name, init, loader, FALSE); + } + + +diff -Nru jamvm.old/src/classlib/openjdk/openjdk.h jamvm/src/classlib/openjdk/openjdk.h +--- jamvm/jamvm.old/src/classlib/openjdk/openjdk.h 2013-11-18 03:45:44.000000000 +0000 ++++ jamvm/jamvm/src/classlib/openjdk/openjdk.h 2015-01-07 16:14:57.599311159 +0000 +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2010, 2011, 2013 Robert Lougher . ++ * Copyright (C) 2010, 2011, 2013, 2014 Robert Lougher . + * + * This file is part of JamVM. + * +@@ -53,3 +53,6 @@ + extern Object *resolveMemberName(Class *mh_class, Object *mname); + + extern Object *getMethodParameters(Object *method); ++ ++extern Class *findClassFromLoader(char *name, int init, Object *loader, ++ int throw_error); From bugzilla-daemon at icedtea.classpath.org Sat Jan 24 02:08:25 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 24 Jan 2015 02:08:25 +0000 Subject: [Bug 2190] [IcedTea6] JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2190 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=540eb79e2917 author: Andrew John Hughes date: Fri Jan 23 18:47:27 2015 +0000 PR2190: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5 2015-01-07 Andrew John Hughes PR2190: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5 * Makefile.am: (ICEDTEA_PATCHES): Add new patch when building JamVM. (EXTRA_DIST): Include patches from JamVM directory. * NEWS: Updated. * patches/jamvm/pr2190-find_class_from_caller.patch: Backport JamVM patch to implement FindClassFromCaller. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Sat Jan 24 02:08:31 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 24 Jan 2015 02:08:31 +0000 Subject: [Bug 2184] [IcedTea6] CACAO lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2184 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=e6429eecdf69 author: Andrew John Hughes date: Fri Jan 23 18:50:21 2015 +0000 Update release date and fix description of PR2184. 2015-01-23 Andrew John Hughes * NEWS: Update release date and fix description of PR2184. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Sat Jan 24 02:10:28 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sat, 24 Jan 2015 02:10:28 +0000 Subject: /hg/release/icedtea7-2.5: 4 new changesets Message-ID: changeset 20d321ef9d8c in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=20d321ef9d8c author: Andrew John Hughes date: Thu Jan 22 04:20:29 2015 +0000 Change AArch64 HotSpot to the one from IcedTea 2.6.0pre17. * AArch64 port Use the IcedTea7 fork version rather than the one based on HotSpot 25. Add arch-specific processing of tmp1 register needed for d/f2i Add char_array_equals intrinsic Add CNEG and CNEGW to macro assembler. Add frame anchor fences. Add missing instruction synchronization barriers and cache flushes. Add some memory barriers for object creation and runtime calls. Add support for A53 multiply accumulate Add support for AES Intrinsics Add support for pipeline scheduling Add support for String.indexOf intrinsic Added make rules to allow aarch64-x86 hybrid build to progress Added missing aarch64-specific include Added missing aarch64-specific make file Added missing changes for debug code Added missing inline method Added missing shared global UseCRC32Intrinsics Added pd global UseVectoredExceptions Add local method to redirect to AbstractAssembler::relocate Add missing declarations for CRC32 methods Add missing include Add missing special case code for aarch64 Add rules to assemble .S files Add support for storing aarch64 call format Add wrapper method to avoid dependency on not yet defined code buffer class Added missing endif Allow for 0x400 aligned offsets for byte_map_base Array load must only read 32 bits A more efficient sequence for C1_MacroAssembler::float_cmp. Backout 8c8b5e62e624 and instead move .S rule from zeroshark.make to rules.make Backout additional changes made in ec6a6772fed6, which revert parts of the PPC/AIX port and IcedTea fixes. Call ICache::invalidate_range() from Relocation::pd_set_data_value(). Changed klass oop encode to heap oop encode Changed Method* to methodOop Correct assert to allow for AArch64 Correct for difference in include hierarchy Correct typos Corrected error in disassembler code Corrected include Corrected include path Corrected pipeline class for countTrailingZerosL Corrected type Corrected typo Correct includes Correct Method to methdoOopDesc Define uabs(). Use it everywhere an absolute value is wanted. Defn of BIND does not need to use __ macro Delete dead code. Disassembler library should be built as hsdis-aarch64.so Don't test arraycopy routines when using AArch64 simulator Emit_int64 is renamed Ensure byte_map_base can be loaded using adrp with no need for following ldr Ensure C1 static call stub employs absolute move to allow patching Ensure C2 static calls use correct call adddress in static stub reloc Ensure perm gen size is not rounded down to zero Ensure rmethod is reloaded from stack when interpreter makes non leaf VM call Ensure we pick up hsdis-aarch64.so if BUILTIN_SIM is true Fix couple of mistakes in generate of method handle dispatch Fix cut and paste-o in header Fixed another typo Fixed error in include Fixed hsdis for aarch64 native or simulated Fixed various typos and omissions Fixed various typos, overlooked cases and wrong accessors Fix error introduced into profiling code Fix guarantee failure in synchronizer.cpp Fix more errors introduced into interpreter profile counter increment Fix relocations Fix several small typos Fix some typos Fix thinko in Atomic::xchg_ptr. Fix typo Fix up aarch64-specific patching code Fix up crc32 support Fix various typos Get rid of unnecessary declaration Guess at how to implement C1 deoptimize_trap generator Initial cut of aarch64 code pulled from jdk8 tree Make aarch64-x86 hybrid build use correct paths Make hsdis handle aarch64 native case Make static stubs load methodOop in cpool to avoid problems at GC Miscellaneous bug fixes. Missing change needed to support aarch64 build Modified make files to support aarch64 build Modified shared src to support full aarch64 backport Moved fields which need access from java to top level Need to actually return the adapter code size Need to pass CFLAGS when assembling .S files using CC_COMPILE Need to use class handle not class Provide missing CRC32 methods Reload rcpool register after a VM call in case a permgen GC has moved the cache Relocated aarch64 vtable generate code to conform to jdk7 Remove comment to avoid breaking macro Removed aarch64 compiled_IC implementation to conform to jdk7 Removed metaspaceShared code to conform to jdk7 Removed redundant field use_XOR_for_compressed_class_base Removed some errors in signal handling code Removed undefined metadata case Remove redundant bracket Remove support for volatile load/store rules in ad file Renamed emit_int32 to emit_long and added local emit_long64 in place of missing emit_int64 Restored missing open brace Restored several load_heap_oop calls lost in translation Restore working x86 build Reverted aarch64 architecture description (ad) file to conform to jdk7 Reverted aarch64 c1_xxx files to conform to jdk7 Reverted aarch64 c2 globals to conform to jdk7 Reverted aarch64 frame code to conform to jdk7 Reverted aarch64 runtime code to conform to jdk7 Reverted aarch64 stubs code to conform to jdk7 Reverted aarch64 template interpreter code to conform to jdk7 Reverted aarch64 vm structs code to conform to jdk7 Reverted aarch64 vm version code to conform to jdk7 Reverted aarch64 vtable stubs code to conform to jdk7 Reverted assembler_aarch64.cpp/hpp to conform to jdk7 Reverted bytecodeInterpreter_aarch64 to conform to jdk7 Reverted global defs code to conform to jdk7 Reverted instr cache code to conform to jdk7 Reverted interpreter code to conform to jdk7 Reverted interpreter masm code to conform to jdk7 Reverted jni code to conform to jdk7 Reverted method handles code to conform to jdk7 Reverted native instr code to conform to jdk7 Reverted os_cpu/linux_aarch64 code to conform to jdk7 Reverted reloc info code to conform to jdk7 Revert Method:: etc to methodOopDesc:: etc Scripts to build aarch64-x86 hybrid and aarch64 native debug images Some errors revealed when building debug image Temporarily disable running test_gamma Tidy up allocation prefetch Use correct post-increment size in repne_scanw Use membar rules and delete special case volatile rules Use method register to access counter increment field Use movoop in C1 ic_call to keep verifier happy Use os::malloc to allocate the register map. Use the correct return value from the VM resolve call Use TLS for ThreadLocalStorage::thread() Various changes to accommodate inclusion of ppc port in icedtea7 Various concurrency fixes. Work around weird compiler issue 2015-01-21 Andrew John Hughes * patches/hotspot/default/systemtap_gc.patch: Remove unused patch. * Makefile.am: (ICEDTEA_ENV): Drop FULL_DEBUG_SYMBOLS=0. This is not needed with the IcedTea HotSpot. * NEWS: Updated. * hotspot.map.in: Update aarch64 HotSpot to icedtea-2.6.0pre17's. 2014-12-12 Andrew John Hughes * Makefile.am: (EXTRA_DIST): Drop reference to HotSpot patches as there is no longer an alternate HotSpot. 2014-11-11 Andrew John Hughes Merge AArch64 port into mainline IcedTea7. * patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch, * patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch, * patches/hotspot/aarch64/20141014-8036805-correct_linker_method_lookup.patch, * patches/hotspot/aarch64/20141014-8038898-safer_safepoints.patch, * patches/hotspot/aarch64/20141014-8038903-more_native_monitor_monitoring.patch, * patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch, * patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch, * patches/hotspot/aarch64/20141014-8044269-analysis_of_archive_files.patch, * patches/hotspot/aarch64/20141014-8046213-testemptybootstrapmethodsattr_failure.patch, * patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch, * patches/hotspot/aarch64/systemtap_gc.patch, * patches/hotspot/aarch64/werror.patch: Remove unneeded patches from AArch64 HotSpot build. * Makefile.am: (ICEDTEA_PATCHES): Remove AArch64 HotSpot build patches. changeset e32aa5c749cf in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=e32aa5c749cf author: Andrew John Hughes date: Thu Jan 22 04:28:13 2015 +0000 Set 2.5.4 release date. 2015-01-21 Andrew John Hughes * NEWS: Set release date. changeset bf2f57ed993b in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=bf2f57ed993b author: Andrew John Hughes date: Sat Jan 24 02:09:48 2015 +0000 Added tag icedtea-2.5.4pre03 for changeset e4cedb2051e9 changeset 2832e84a2b58 in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=2832e84a2b58 author: Andrew John Hughes date: Sat Jan 24 02:09:56 2015 +0000 Added tag icedtea-2.5.4 for changeset bf2f57ed993b diffstat: .hgtags | 2 + ChangeLog | 41 + Makefile.am | 26 - NEWS | 143 +++- hotspot.map.in | 2 +- patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch | 209 ----- patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch | 291 ------- patches/hotspot/aarch64/20141014-8036805-correct_linker_method_lookup.patch | 221 ----- patches/hotspot/aarch64/20141014-8038898-safer_safepoints.patch | 21 - patches/hotspot/aarch64/20141014-8038903-more_native_monitor_monitoring.patch | 30 - patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch | 33 - patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch | 22 - patches/hotspot/aarch64/20141014-8044269-analysis_of_archive_files.patch | 250 ------ patches/hotspot/aarch64/20141014-8046213-testemptybootstrapmethodsattr_failure.patch | 24 - patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch | 259 ------ patches/hotspot/aarch64/systemtap_gc.patch | 373 --------- patches/hotspot/aarch64/werror.patch | 43 - patches/hotspot/default/systemtap_gc.patch | 379 ---------- 18 files changed, 186 insertions(+), 2183 deletions(-) diffs (truncated from 2482 to 500 lines): diff -r 45ac6cd7aae2 -r 2832e84a2b58 .hgtags --- a/.hgtags Thu Jan 22 01:27:39 2015 +0000 +++ b/.hgtags Sat Jan 24 02:09:56 2015 +0000 @@ -42,3 +42,5 @@ ff1723d0a8a23ef46e158aafcf2ee15c3e6317dc icedtea-2.5.3 f7b45c5319970ed7e4b88e9d5aa386752ddd594f icedtea-2.5.4pre01 13b10ea1447cf1eab772658493eedeaf879bfd93 icedtea-2.5.4pre02 +e4cedb2051e989afb874d4bb3b568ffe3233320a icedtea-2.5.4pre03 +bf2f57ed993bf0759293822a0789ed1be4fcf48e icedtea-2.5.4 diff -r 45ac6cd7aae2 -r 2832e84a2b58 ChangeLog --- a/ChangeLog Thu Jan 22 01:27:39 2015 +0000 +++ b/ChangeLog Sat Jan 24 02:09:56 2015 +0000 @@ -1,3 +1,44 @@ +2015-01-21 Andrew John Hughes + + * NEWS: Set release date. + +2015-01-21 Andrew John Hughes + + * patches/hotspot/default/systemtap_gc.patch: + Remove unused patch. + * Makefile.am: + (ICEDTEA_ENV): Drop FULL_DEBUG_SYMBOLS=0. + This is not needed with the IcedTea HotSpot. + * NEWS: Updated. + * hotspot.map.in: Update aarch64 HotSpot + to icedtea-2.6.0pre17's. + +2014-12-12 Andrew John Hughes + + * Makefile.am: + (EXTRA_DIST): Drop reference to HotSpot patches + as there is no longer an alternate HotSpot. + +2014-11-11 Andrew John Hughes + + Merge AArch64 port into mainline IcedTea7. + * patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch, + * patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch, + * patches/hotspot/aarch64/20141014-8036805-correct_linker_method_lookup.patch, + * patches/hotspot/aarch64/20141014-8038898-safer_safepoints.patch, + * patches/hotspot/aarch64/20141014-8038903-more_native_monitor_monitoring.patch, + * patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch, + * patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch, + * patches/hotspot/aarch64/20141014-8044269-analysis_of_archive_files.patch, + * patches/hotspot/aarch64/20141014-8046213-testemptybootstrapmethodsattr_failure.patch, + * patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch, + * patches/hotspot/aarch64/systemtap_gc.patch, + * patches/hotspot/aarch64/werror.patch: + Remove unneeded patches from AArch64 HotSpot build. + * Makefile.am: + (ICEDTEA_PATCHES): Remove AArch64 HotSpot build + patches. + 2014-10-29 Andrew John Hughes * Makefile.am: diff -r 45ac6cd7aae2 -r 2832e84a2b58 Makefile.am --- a/Makefile.am Thu Jan 22 01:27:39 2015 +0000 +++ b/Makefile.am Sat Jan 24 02:09:56 2015 +0000 @@ -285,24 +285,6 @@ endif endif -if WITH_ALT_HSBUILD -ICEDTEA_PATCHES += patches/hotspot/aarch64/werror.patch \ - patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch \ - patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch \ - patches/hotspot/aarch64/20141014-8036805-correct_linker_method_lookup.patch \ - patches/hotspot/aarch64/20141014-8038898-safer_safepoints.patch \ - patches/hotspot/aarch64/20141014-8038903-more_native_monitor_monitoring.patch \ - patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch \ - patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch \ - patches/hotspot/aarch64/20141014-8044269-analysis_of_archive_files.patch \ - patches/hotspot/aarch64/20141014-8046213-testemptybootstrapmethodsattr_failure.patch \ - patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch -if ENABLE_SYSTEMTAP -ICEDTEA_PATCHES += \ - patches/hotspot/aarch64/systemtap_gc.patch -endif -endif - ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) # Bootstrapping patches @@ -613,13 +595,6 @@ INFINALITY_SUPPORT="true" endif -# This seems illogical, but it actually just -# turns off the creation of separate debuginfo files. -if WITH_ALT_HSBUILD -ICEDTEA_ENV += \ - FULL_DEBUG_SYMBOLS=0 -endif - # OpenJDK boot build environment. ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \ BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \ @@ -781,7 +756,6 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \ $(top_srcdir)/patches/boot/*.patch \ $(top_srcdir)/patches/cacao/*.patch \ - $(top_srcdir)/patches/hotspot/*/*.patch \ $(top_srcdir)/patches/jamvm/*.patch \ tools-copy contrib overlays \ jconsole.desktop policytool.desktop \ diff -r 45ac6cd7aae2 -r 2832e84a2b58 NEWS --- a/NEWS Thu Jan 22 01:27:39 2015 +0000 +++ b/NEWS Sat Jan 24 02:09:56 2015 +0000 @@ -12,7 +12,7 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 2.5.4 (2015-01-XX): +New in release 2.5.4 (2015-01-21): * Security fixes - S8046656: Update protocol support @@ -115,6 +115,147 @@ * JamVM - PR2050: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 - PR2171: JamVM builds with executable stack, causing failures on SELinux & PaX kernels +* AArch64 port + - Use the IcedTea7 fork version rather than the one based on HotSpot 25. + - Add arch-specific processing of tmp1 register needed for d/f2i + - Add char_array_equals intrinsic + - Add CNEG and CNEGW to macro assembler. + - Add frame anchor fences. + - Add missing instruction synchronization barriers and cache flushes. + - Add some memory barriers for object creation and runtime calls. + - Add support for A53 multiply accumulate + - Add support for AES Intrinsics + - Add support for pipeline scheduling + - Add support for String.indexOf intrinsic + - Added make rules to allow aarch64-x86 hybrid build to progress + - Added missing aarch64-specific include + - Added missing aarch64-specific make file + - Added missing changes for debug code + - Added missing inline method + - Added missing shared global UseCRC32Intrinsics + - Added pd global UseVectoredExceptions + - Add local method to redirect to AbstractAssembler::relocate + - Add missing declarations for CRC32 methods + - Add missing include + - Add missing special case code for aarch64 + - Add rules to assemble .S files + - Add support for storing aarch64 call format + - Add wrapper method to avoid dependency on not yet defined code buffer class + - Added missing endif + - Allow for 0x400 aligned offsets for byte_map_base + - Array load must only read 32 bits + - A more efficient sequence for C1_MacroAssembler::float_cmp. + - Backout 8c8b5e62e624 and instead move .S rule from zeroshark.make to rules.make + - Backout additional changes made in ec6a6772fed6, which revert parts of the PPC/AIX port and IcedTea fixes. + - Call ICache::invalidate_range() from Relocation::pd_set_data_value(). + - Changed klass oop encode to heap oop encode + - Changed Method* to methodOop + - Correct assert to allow for AArch64 + - Correct for difference in include hierarchy + - Correct typos + - Corrected error in disassembler code + - Corrected include + - Corrected include path + - Corrected pipeline class for countTrailingZerosL + - Corrected type + - Corrected typo + - Correct includes + - Correct Method to methdoOopDesc + - Define uabs(). Use it everywhere an absolute value is wanted. + - Defn of BIND does not need to use __ macro + - Delete dead code. + - Disassembler library should be built as hsdis-aarch64.so + - Don't test arraycopy routines when using AArch64 simulator + - Emit_int64 is renamed + - Ensure byte_map_base can be loaded using adrp with no need for following ldr + - Ensure C1 static call stub employs absolute move to allow patching + - Ensure C2 static calls use correct call adddress in static stub reloc + - Ensure perm gen size is not rounded down to zero + - Ensure rmethod is reloaded from stack when interpreter makes non leaf VM call + - Ensure we pick up hsdis-aarch64.so if BUILTIN_SIM is true + - Fix couple of mistakes in generate of method handle dispatch + - Fix cut and paste-o in header + - Fixed another typo + - Fixed error in include + - Fixed hsdis for aarch64 native or simulated + - Fixed various typos and omissions + - Fixed various typos, overlooked cases and wrong accessors + - Fix error introduced into profiling code + - Fix guarantee failure in synchronizer.cpp + - Fix more errors introduced into interpreter profile counter increment + - Fix relocations + - Fix several small typos + - Fix some typos + - Fix thinko in Atomic::xchg_ptr. + - Fix typo + - Fix up aarch64-specific patching code + - Fix up crc32 support + - Fix various typos + - Get rid of unnecessary declaration + - Guess at how to implement C1 deoptimize_trap generator + - Initial cut of aarch64 code pulled from jdk8 tree + - Make aarch64-x86 hybrid build use correct paths + - Make hsdis handle aarch64 native case + - Make static stubs load methodOop in cpool to avoid problems at GC + - Miscellaneous bug fixes. + - Missing change needed to support aarch64 build + - Modified make files to support aarch64 build + - Modified shared src to support full aarch64 backport + - Moved fields which need access from java to top level + - Need to actually return the adapter code size + - Need to pass CFLAGS when assembling .S files using CC_COMPILE + - Need to use class handle not class + - Provide missing CRC32 methods + - Reload rcpool register after a VM call in case a permgen GC has moved the cache + - Relocated aarch64 vtable generate code to conform to jdk7 + - Remove comment to avoid breaking macro + - Removed aarch64 compiled_IC implementation to conform to jdk7 + - Removed metaspaceShared code to conform to jdk7 + - Removed redundant field use_XOR_for_compressed_class_base + - Removed some errors in signal handling code + - Removed undefined metadata case + - Remove redundant bracket + - Remove support for volatile load/store rules in ad file + - Renamed emit_int32 to emit_long and added local emit_long64 in place of missing emit_int64 + - Restored missing open brace + - Restored several load_heap_oop calls lost in translation + - Restore working x86 build + - Reverted aarch64 architecture description (ad) file to conform to jdk7 + - Reverted aarch64 c1_xxx files to conform to jdk7 + - Reverted aarch64 c2 globals to conform to jdk7 + - Reverted aarch64 frame code to conform to jdk7 + - Reverted aarch64 runtime code to conform to jdk7 + - Reverted aarch64 stubs code to conform to jdk7 + - Reverted aarch64 template interpreter code to conform to jdk7 + - Reverted aarch64 vm structs code to conform to jdk7 + - Reverted aarch64 vm version code to conform to jdk7 + - Reverted aarch64 vtable stubs code to conform to jdk7 + - Reverted assembler_aarch64.cpp/hpp to conform to jdk7 + - Reverted bytecodeInterpreter_aarch64 to conform to jdk7 + - Reverted global defs code to conform to jdk7 + - Reverted instr cache code to conform to jdk7 + - Reverted interpreter code to conform to jdk7 + - Reverted interpreter masm code to conform to jdk7 + - Reverted jni code to conform to jdk7 + - Reverted method handles code to conform to jdk7 + - Reverted native instr code to conform to jdk7 + - Reverted os_cpu/linux_aarch64 code to conform to jdk7 + - Reverted reloc info code to conform to jdk7 + - Revert Method:: etc to methodOopDesc:: etc + - Scripts to build aarch64-x86 hybrid and aarch64 native debug images + - Some errors revealed when building debug image + - Temporarily disable running test_gamma + - Tidy up allocation prefetch + - Use correct post-increment size in repne_scanw + - Use membar rules and delete special case volatile rules + - Use method register to access counter increment field + - Use movoop in C1 ic_call to keep verifier happy + - Use os::malloc to allocate the register map. + - Use the correct return value from the VM resolve call + - Use TLS for ThreadLocalStorage::thread() + - Various changes to accommodate inclusion of ppc port in icedtea7 + - Various concurrency fixes. + - Work around weird compiler issue New in release 2.5.3 (2014-10-14): diff -r 45ac6cd7aae2 -r 2832e84a2b58 hotspot.map.in --- a/hotspot.map.in Thu Jan 22 01:27:39 2015 +0000 +++ b/hotspot.map.in Sat Jan 24 02:09:56 2015 +0000 @@ -1,3 +1,3 @@ # version type(drop/hg) url changeset sha256sum default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 6144ca9b6a72 4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34 -aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 116bc9da35de b9e7f67079184310450c9b461b492f340aa7824c27079b430c8f25b58b327ec5 +aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 4d25046abb67 60da8d427f7e3659f701e54c763ea8366d8af3280c7e10670004938b2f07efef diff -r 45ac6cd7aae2 -r 2832e84a2b58 patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch --- a/patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch Thu Jan 22 01:27:39 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,209 +0,0 @@ -# HG changeset patch -# User coleenp -# Date 1399583989 14400 -# Thu May 08 17:19:49 2014 -0400 -# Node ID 671021ba6f79fadfb510be047b23dcdabe35160d -# Parent 9580ebccfdc392c93c79633bdc207139de511438 -8015256: Better class accessibility -Summary: Improve protection domain check in forName() -Reviewed-by: mchung, acorn, jdn - -diff -r 9580ebccfdc3 -r 671021ba6f79 make/bsd/makefiles/mapfile-vers-debug ---- openjdk/hotspot/make/bsd/makefiles/mapfile-vers-debug Thu Sep 11 07:28:58 2014 -0400 -+++ openjdk/hotspot/make/bsd/makefiles/mapfile-vers-debug Thu May 08 17:19:49 2014 -0400 -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2002, 2014, 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 -@@ -82,6 +82,7 @@ - _JVM_EnableCompiler - _JVM_Exit - _JVM_FillInStackTrace -+ _JVM_FindClassFromCaller - _JVM_FindClassFromClass - _JVM_FindClassFromClassLoader - _JVM_FindClassFromBootLoader -diff -r 9580ebccfdc3 -r 671021ba6f79 make/bsd/makefiles/mapfile-vers-product ---- openjdk/hotspot/make/bsd/makefiles/mapfile-vers-product Thu Sep 11 07:28:58 2014 -0400 -+++ openjdk/hotspot/make/bsd/makefiles/mapfile-vers-product Thu May 08 17:19:49 2014 -0400 -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2002, 2014, 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 -@@ -82,6 +82,7 @@ - _JVM_EnableCompiler - _JVM_Exit - _JVM_FillInStackTrace -+ _JVM_FindClassFromCaller - _JVM_FindClassFromClass - _JVM_FindClassFromClassLoader - _JVM_FindClassFromBootLoader -diff -r 9580ebccfdc3 -r 671021ba6f79 make/linux/makefiles/mapfile-vers-debug ---- openjdk/hotspot/make/linux/makefiles/mapfile-vers-debug Thu Sep 11 07:28:58 2014 -0400 -+++ openjdk/hotspot/make/linux/makefiles/mapfile-vers-debug Thu May 08 17:19:49 2014 -0400 -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2002, 2014, 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 -@@ -84,6 +84,7 @@ - JVM_EnableCompiler; - JVM_Exit; - JVM_FillInStackTrace; -+ JVM_FindClassFromCaller; - JVM_FindClassFromClass; - JVM_FindClassFromClassLoader; - JVM_FindClassFromBootLoader; -diff -r 9580ebccfdc3 -r 671021ba6f79 make/linux/makefiles/mapfile-vers-product ---- openjdk/hotspot/make/linux/makefiles/mapfile-vers-product Thu Sep 11 07:28:58 2014 -0400 -+++ openjdk/hotspot/make/linux/makefiles/mapfile-vers-product Thu May 08 17:19:49 2014 -0400 -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2002, 2014, 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 -@@ -84,6 +84,7 @@ - JVM_EnableCompiler; - JVM_Exit; - JVM_FillInStackTrace; -+ JVM_FindClassFromCaller; - JVM_FindClassFromClass; - JVM_FindClassFromClassLoader; - JVM_FindClassFromBootLoader; -diff -r 9580ebccfdc3 -r 671021ba6f79 make/solaris/makefiles/mapfile-vers ---- openjdk/hotspot/make/solaris/makefiles/mapfile-vers Thu Sep 11 07:28:58 2014 -0400 -+++ openjdk/hotspot/make/solaris/makefiles/mapfile-vers Thu May 08 17:19:49 2014 -0400 -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2000, 2014, 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 -@@ -84,6 +84,7 @@ - JVM_EnableCompiler; - JVM_Exit; - JVM_FillInStackTrace; -+ JVM_FindClassFromCaller; - JVM_FindClassFromClass; - JVM_FindClassFromClassLoader; - JVM_FindClassFromBootLoader; -diff -r 9580ebccfdc3 -r 671021ba6f79 src/share/vm/prims/jvm.cpp ---- openjdk/hotspot/src/share/vm/prims/jvm.cpp Thu Sep 11 07:28:58 2014 -0400 -+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp Thu May 08 17:19:49 2014 -0400 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, 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 -@@ -777,6 +777,7 @@ - return (jclass) JNIHandles::make_local(env, k->java_mirror()); - JVM_END - -+// Not used; JVM_FindClassFromCaller replaces this. - JVM_ENTRY(jclass, JVM_FindClassFromClassLoader(JNIEnv* env, const char* name, - jboolean init, jobject loader, - jboolean throwError)) -@@ -803,6 +804,42 @@ - return result; - JVM_END - -+// Find a class with this name in this loader, using the caller's protection domain. -+JVM_ENTRY(jclass, JVM_FindClassFromCaller(JNIEnv* env, const char* name, -+ jboolean init, jobject loader, -+ jclass caller)) -+ JVMWrapper2("JVM_FindClassFromCaller %s throws ClassNotFoundException", name); -+ // Java libraries should ensure that name is never null... -+ if (name == NULL || (int)strlen(name) > Symbol::max_length()) { -+ // It's impossible to create this class; the name cannot fit -+ // into the constant pool. -+ THROW_MSG_0(vmSymbols::java_lang_ClassNotFoundException(), name); -+ } -+ -+ TempNewSymbol h_name = SymbolTable::new_symbol(name, CHECK_NULL); -+ -+ oop loader_oop = JNIHandles::resolve(loader); -+ oop from_class = JNIHandles::resolve(caller); -+ oop protection_domain = NULL; -+ // If loader is null, shouldn't call ClassLoader.checkPackageAccess; otherwise get -+ // NPE. Put it in another way, the bootstrap class loader has all permission and -+ // thus no checkPackageAccess equivalence in the VM class loader. -+ // The caller is also passed as NULL by the java code if there is no security -+ // manager to avoid the performance cost of getting the calling class. -+ if (from_class != NULL && loader_oop != NULL) { -+ protection_domain = java_lang_Class::as_Klass(from_class)->protection_domain(); -+ } -+ -+ Handle h_loader(THREAD, loader_oop); -+ Handle h_prot(THREAD, protection_domain); -+ jclass result = find_class_from_class_loader(env, h_name, init, h_loader, -+ h_prot, false, THREAD); -+ -+ if (TraceClassResolution && result != NULL) { -+ trace_class_resolution(java_lang_Class::as_Klass(JNIHandles::resolve_non_null(result))); -+ } -+ return result; -+JVM_END - - JVM_ENTRY(jclass, JVM_FindClassFromClass(JNIEnv *env, const char *name, - jboolean init, jclass from)) -@@ -3966,10 +4003,15 @@ - - // Shared JNI/JVM entry points ////////////////////////////////////////////////////////////// - --jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init, Handle loader, Handle protection_domain, jboolean throwError, TRAPS) { -+jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init, -+ Handle loader, Handle protection_domain, -+ jboolean throwError, TRAPS) { - // Security Note: - // The Java level wrapper will perform the necessary security check allowing -- // us to pass the NULL as the initiating class loader. -+ // us to pass the NULL as the initiating class loader. The VM is responsible for -+ // the checkPackageAccess relative to the initiating class loader via the -+ // protection_domain. The protection_domain is passed as NULL by the java code -+ // if there is no security manager in 3-arg Class.forName(). - Klass* klass = SystemDictionary::resolve_or_fail(name, loader, protection_domain, throwError != 0, CHECK_NULL); - - KlassHandle klass_handle(THREAD, klass); -diff -r 9580ebccfdc3 -r 671021ba6f79 src/share/vm/prims/jvm.h ---- openjdk/hotspot/src/share/vm/prims/jvm.h Thu Sep 11 07:28:58 2014 -0400 -+++ openjdk/hotspot/src/share/vm/prims/jvm.h Thu May 08 17:19:49 2014 -0400 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, 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 -@@ -417,6 +417,19 @@ - JVM_FindClassFromBootLoader(JNIEnv *env, const char *name); - - /* -+ * Find a class from a given class loader. Throws ClassNotFoundException. -+ * name: name of class -+ * init: whether initialization is done -+ * loader: class loader to look up the class. This may not be the same as the caller's -+ * class loader. -+ * caller: initiating class. The initiating class may be null when a security -+ * manager is not installed. -+ */ -+JNIEXPORT jclass JNICALL -+JVM_FindClassFromCaller(JNIEnv *env, const char *name, jboolean init, -+ jobject loader, jclass caller); -+ -+/* - * Find a class from a given class. - */ - JNIEXPORT jclass JNICALL diff -r 45ac6cd7aae2 -r 2832e84a2b58 patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch --- a/patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch Thu Jan 22 01:27:39 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,291 +0,0 @@ -# HG changeset patch -# User hseigel -# Date 1412453060 -3600 -# Sat Oct 04 21:04:20 2014 +0100 -# Node ID f26d56905af0d3d8584d7ebc1e77c0515742286c -# Parent 671021ba6f79fadfb510be047b23dcdabe35160d -8036533: Method for correct defaults -8036156: Limit default method hierarchy From andrew at icedtea.classpath.org Sat Jan 24 19:10:19 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sat, 24 Jan 2015 19:10:19 +0000 Subject: /hg/icedtea6-hg: 2 new changesets Message-ID: changeset ee1714db3b97 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ee1714db3b97 author: Andrew John Hughes date: Tue Jan 20 04:38:55 2015 +0000 Bring in 2015/01/20 security update. Upstream changes: - OJ44: Add missing TimeZone test cases included in OpenJDK 7 revision 0. - OJ45: Fix copyright headers on imported files - OJ46: Fix lost Classpath exception - OJ47: Remove @Override annotation on interfaces added by 2015/01/20 security fixes. - OJ48: Fix substitution error. - S4873188: Support TLS 1.1 - S6461635: [TESTBUG] BasicTests.sh test fails intermittently - S6541350: TimeZone display names localization - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec - S6578647: Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication() - S6587676: Krb5LoginModule failure if useTicketCache=true on Vista - S6631048: Problem when writing on output stream of HttpURLConnection - S6641309: Wrong Cookie separator used in HttpURLConnection - S6641312: Fix krb5 codes indentation problems - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems - S6659779: HttpURLConnections logger should log tunnel requests - S6670362: HTTP/SPNEGO should work across realms - S6706974: Add krb5 test infrastructure - S6720866: Slow performance using HttpURLConnection for upload - S6726695: HttpURLConnection shoul support 'Expect: 100-contimue' headers for PUT - S6729881: Compiler warning in networking native code - S6761072: new krb5 tests fail on multiple platforms - S6765491: Krb5LoginModule a little too restrictive, and the doc is not clear. - S6776102: sun/util/resources/TimeZone/Bug6317929.java test failed against 6u12b01 and passed against 6u11b03 - S6792180: Enhance to reject weak algorithms or conform to crypto recommendations - S6811297: Add more logging to HTTP protocol handler - S6821191: Timezone display name localization - S6822460: support self-issued certificate - S6830658: Changeset 67e5d3e41b5b breaks the fastdebug build in NativeCreds.c - S6835668: Use of /usr/include/linux/ files creates a dependence on kernel-headers - S6855297: Windows build breaks after 6811297 - S6856856: NPE in HTTP protocol handler logging - S6868106: Ukrainian currency has wrong format - S6870908: reopen bug 4244752: month names in Estonian should be lowercase - S6873931: New Turkish currency since 2009 - S6882594: Remove static dependancy on NTLM authentication - S6899503: Security code issue using Verisign root certificate - S6910489: Slovenia Locale, wrong firstDayOfWeek number - S6911104: Tests do not work with CYGWIN: tools, sun/tools, and com/sun/tools - S6914413: abbreviation name for November is not correct in be_BY - S6925851: Localize JRE into pt_BR - S6931566: NetworkInterface is not working when interface name is more than 15 characters long - S6945604: wrong error message in CardImpl.java - S6962617: Testcase changes, cleanup of problem list for jdk_tools targets - S6964714: NetworkInterface getInetAddresses enumerates IPv6 addresses if java.net.preferIPvStack property set - S6967937: Scope id no longer being set after 6931566 - S6972374: NetworkInterface.getNetworkInterfaces throws "java.net.SocketException" on Solaris zone - S6976117: SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets without TLSv1.1 enabled - S6977550: (tz) Support tzdata2010l - S6996686: (tz) Support tzdata2010o - S7001720: copyright templates not rebranded - S7017800: (tz) Support tzdata2011b - S7022269: clean up fscanf usage in Linux networking native code - S7027387: (tz) Support tzdata2011d - S7033174: (tz) Support tzdata2011e - S7035073: Add missing timezones to TimeZoneNames_pt_BR.java - S7035555: 4/4 attach/BasicTests.sh needs another tweak for Cygwin - S7036025: java.security.AccessControlException when creating JFileChooser in signed applet - S7039469: (tz) Support tzdata2011g - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true - S7079012: test/java/net/NetworkInterface/NetParamsTest.java fails with SocketException getting mac address - S7090843: (tz) Support tzdata2011j - S7103108: (tz) Support tzdata2011l - S7103405: Correct display names for Pacific/Apia timezone - S7104126: Insert openjdk copyright header back into TZdata files - S7153184: NullPointerException when calling SSLEngineImpl.getSupportedCipherSuites - S7158483: (tz) Support tzdata2012c - S7174244: NPE in Krb5ProxyImpl.getServerKeys() - S7198570: (tz) Support tzdata2012f - S7199066: Typo in method name - S8002225: (tz) Support tzdata2012i - S8009987: (tz) Support tzdata2013b - S8014469: (tz) Support tzdata2013c - S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE - S8015570: Use long comparison in Rule.getRules(). - S8020054: (tz) Support tzdata2013d - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address - S8023956: Provide a work-around to broken Linux 32 bit "Exec Shield" using CS for NX emulation (crashing with SI_KERNEL) - S8025051: Update resource files for TimeZone display names - S8025255: (tz) Support tzdata2013g - S8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing - S8027359: XML parser returns incorrect parsing results - S8027370: Support tzdata2013h - S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings - S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions - S8029153: [TESTBUG] test/compiler/7141637/SpreadNullArg.java fails because it expects NullPointerException - S8029318: Native Windows ccache still reads DES tickets - S8030822: (tz) Support tzdata2013i - S8031046: Native Windows ccache might still get unsupported ticket - S8032788: ImageIcon constructor throws an NPE and hangs when passed a null String parameter - S8032909: XSLT string-length returns incorrect length when string includes complementary chars - S8035613: With active Securitymanager JAXBContext.newInstance fails - S8037012: (tz) Support tzdata2014a - S8038306: (tz) Support tzdata2014b - S8040617: [macosx] Large JTable cell results in a OutOfMemoryException - S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser - S8043012: (tz) Support tzdata2014c - S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX - S8046656: Update protocol support - S8047125: (ref) More phantom object references - S8047130: Fewer escapes from escape analysis - S8048035: Ensure proper proxy protocols - S8049250: Need a flag to invert the Card.disconnect(reset) argument - S8049253: Better GC validation - S8049343: (tz) Support tzdata2014g - S8050485: super() in a try block in a ctor causes VerifyError - S8050807: Better performing performance data handling - S8051012: Regression in verifier for method call from inside of a branch - S8051614: smartcardio TCK tests fail due to lack of 'reset' permission - S8054367: More references for endpoints - S8055304: More boxing for DirectoryComboBoxModel - S8055309: RMI needs better transportation considerations - S8055479: TLAB stability - S8055489: Better substitution formats - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure - S8056264: Multicast support improvements - S8056276: Fontmanager feature improvements - S8057555: Less cryptic cipher suite management - S8058715: stability issues when being launched as an embedded JVM via JNI - S8058982: Better verification of an exceptional invokespecial - S8059206: (tz) Support tzdata2014i - S8059485: Resolve parsing ambiguity - S8060474: Resolve more parsing ambiguity - S8061210: Issues in TLS - S8061826: Part of JDK-8060474 should be reverted - S8062561: Test bug8055304 fails if file system default directory has read access - S8062807: Exporting RMI objects fails when run under restrictive SecurityManager - S8064560: (tz) Support tzdata2014j 2015-01-19 Andrew John Hughes * patches/openjdk/6541350-tz_display_names_l10n.patch, * patches/openjdk/6706974-krb5_test_infrastructure.patch, * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch, * patches/openjdk/6821191-tz_display_names_l10n.patch, * patches/openjdk/6925851-pt_br.patch, * patches/openjdk/6977550-tzdata2010l.patch, * patches/openjdk/6996686-tzdata2010o.patch, * patches/openjdk/7017800-tzdata2011b.patch, * patches/openjdk/7027387-tzdata2011d.patch, * patches/openjdk/7033174-tzdata2011e.patch, * patches/openjdk/7035073-missing_pt_br_timezones.patch, * patches/openjdk/7039469-tzdata2011g.patch, * patches/openjdk/7090843-tzdata2011j.patch, * patches/openjdk/7103108-tzdata2011l.patch, * patches/openjdk/7103405-correct_display_names.patch, * patches/openjdk/7104126-headers_tzdata.patch, * patches/openjdk/7158483-tzdata2012c.patch, * patches/openjdk/7198570-tzdata2012f.patch, * patches/openjdk/8002225-tzdata2012i.patch, * patches/openjdk/8009987-tzdata2013b.patch, * patches/openjdk/8014469-tzdata2013c.patch, * patches/openjdk/8020054-tzdata2013d.patch, * patches/openjdk/8025255-tzdata2013g.patch: Remove patches included upstream. * Makefile.am: (ICEDTEA_PATCHES): Remove above patches. * NEWS: Updated. * patches/hotspot/hs23/remove_jsr292_tests.patch: Regenerated. * patches/hotspot/hs23/type_fixes.patch: Remove threadLocalAllocBuffer.cpp hunk which is no longer applicable. changeset 102b1e9b36a3 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=102b1e9b36a3 author: Andrew John Hughes date: Tue Jan 20 05:50:58 2015 +0000 Backport recent fixes from IcedTea 2.x. PR2070: Type-punning warnings still evident on RHEL 5 PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure S8000897, PR2173, RH1155012: VM crash in CompileBroker S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 2015-01-19 Andrew John Hughes * patches/openjdk/8000897-use_corresponding_digest_length.patch: Moved to... * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: ...here. * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, * patches/pr2070-type_punning_warnings.patch, * patches/pr2082-s390_type_fixes.patch, * patches/pr2096-4096-bit_dh.patch: New backports from IcedTea 2.x. diffstat: ChangeLog | 52 + Makefile.am | 33 +- NEWS | 109 +- patches/hotspot/hs23/remove_jsr292_tests.patch | 35 +- patches/hotspot/hs23/type_fixes.patch | 96 +- patches/openjdk/6541350-tz_display_names_l10n.patch | 300 - patches/openjdk/6706974-krb5_test_infrastructure.patch | 2090 ----- patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch | 94 - patches/openjdk/6821191-tz_display_names_l10n.patch | 125 - patches/openjdk/6925851-pt_br.patch | 3651 --------- patches/openjdk/6977550-tzdata2010l.patch | 1208 --- patches/openjdk/6996686-tzdata2010o.patch | 93 - patches/openjdk/7017800-tzdata2011b.patch | 265 - patches/openjdk/7027387-tzdata2011d.patch | 522 - patches/openjdk/7033174-tzdata2011e.patch | 117 - patches/openjdk/7035073-missing_pt_br_timezones.patch | 1644 ---- patches/openjdk/7039469-tzdata2011g.patch | 116 - patches/openjdk/7090843-tzdata2011j.patch | 1281 --- patches/openjdk/7103108-tzdata2011l.patch | 1660 ---- patches/openjdk/7103405-correct_display_names.patch | 130 - patches/openjdk/7104126-headers_tzdata.patch | 530 - patches/openjdk/7158483-tzdata2012c.patch | 1482 --- patches/openjdk/7198570-tzdata2012f.patch | 841 -- patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch | 29 + patches/openjdk/8000897-use_corresponding_digest_length.patch | 29 - patches/openjdk/8002225-tzdata2012i.patch | 261 - patches/openjdk/8009987-tzdata2013b.patch | 2275 ----- patches/openjdk/8014469-tzdata2013c.patch | 276 - patches/openjdk/8020054-tzdata2013d.patch | 314 - patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch | 80 + patches/openjdk/8025255-tzdata2013g.patch | 3976 ---------- patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch | 106 + patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch | 36 + patches/pr2070-type_punning_warnings.patch | 36 + patches/pr2082-s390_type_fixes.patch | 20 + patches/pr2096-4096-bit_dh.patch | 120 + 36 files changed, 651 insertions(+), 23381 deletions(-) diffs (truncated from 24392 to 500 lines): diff -r ccfb83ff9e78 -r 102b1e9b36a3 ChangeLog --- a/ChangeLog Mon Jan 19 17:52:30 2015 +0000 +++ b/ChangeLog Tue Jan 20 05:50:58 2015 +0000 @@ -1,3 +1,55 @@ +2015-01-19 Andrew John Hughes + + * patches/openjdk/8000897-use_corresponding_digest_length.patch: + Moved to... + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated. + * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: + ...here. + * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, + * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, + * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, + * patches/pr2070-type_punning_warnings.patch, + * patches/pr2082-s390_type_fixes.patch, + * patches/pr2096-4096-bit_dh.patch: + New backports from IcedTea 2.x. + +2015-01-19 Andrew John Hughes + + * patches/openjdk/6541350-tz_display_names_l10n.patch, + * patches/openjdk/6706974-krb5_test_infrastructure.patch, + * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch, + * patches/openjdk/6821191-tz_display_names_l10n.patch, + * patches/openjdk/6925851-pt_br.patch, + * patches/openjdk/6977550-tzdata2010l.patch, + * patches/openjdk/6996686-tzdata2010o.patch, + * patches/openjdk/7017800-tzdata2011b.patch, + * patches/openjdk/7027387-tzdata2011d.patch, + * patches/openjdk/7033174-tzdata2011e.patch, + * patches/openjdk/7035073-missing_pt_br_timezones.patch, + * patches/openjdk/7039469-tzdata2011g.patch, + * patches/openjdk/7090843-tzdata2011j.patch, + * patches/openjdk/7103108-tzdata2011l.patch, + * patches/openjdk/7103405-correct_display_names.patch, + * patches/openjdk/7104126-headers_tzdata.patch, + * patches/openjdk/7158483-tzdata2012c.patch, + * patches/openjdk/7198570-tzdata2012f.patch, + * patches/openjdk/8002225-tzdata2012i.patch, + * patches/openjdk/8009987-tzdata2013b.patch, + * patches/openjdk/8014469-tzdata2013c.patch, + * patches/openjdk/8020054-tzdata2013d.patch, + * patches/openjdk/8025255-tzdata2013g.patch: + Remove patches included upstream. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + * NEWS: Updated. + * patches/hotspot/hs23/remove_jsr292_tests.patch: + Regenerated. + * patches/hotspot/hs23/type_fixes.patch: + Remove threadLocalAllocBuffer.cpp hunk which is + no longer applicable. + 2015-01-19 Andrew John Hughes * patches/clean-crypto.patch: Removed; replaced by diff -r ccfb83ff9e78 -r 102b1e9b36a3 Makefile.am --- a/Makefile.am Mon Jan 19 17:52:30 2015 +0000 +++ b/Makefile.am Tue Jan 20 05:50:58 2015 +0000 @@ -453,9 +453,7 @@ patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ - patches/openjdk/6706974-krb5_test_infrastructure.patch \ patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \ - patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \ patches/ScriptEngineManager-doc.patch \ patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \ patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch \ @@ -506,24 +504,6 @@ patches/openjdk/8014427-raster_regression.patch \ patches/openjdk/8014676-javadebugger_space_in_paths.patch \ patches/openjdk/8014968-OCSP_timeout_default.patch \ - patches/openjdk/6541350-tz_display_names_l10n.patch \ - patches/openjdk/6821191-tz_display_names_l10n.patch \ - patches/openjdk/6925851-pt_br.patch \ - patches/openjdk/6977550-tzdata2010l.patch \ - patches/openjdk/6996686-tzdata2010o.patch \ - patches/openjdk/7017800-tzdata2011b.patch \ - patches/openjdk/7027387-tzdata2011d.patch \ - patches/openjdk/7033174-tzdata2011e.patch \ - patches/openjdk/7035073-missing_pt_br_timezones.patch \ - patches/openjdk/7039469-tzdata2011g.patch \ - patches/openjdk/7090843-tzdata2011j.patch \ - patches/openjdk/7103108-tzdata2011l.patch \ - patches/openjdk/7104126-headers_tzdata.patch \ - patches/openjdk/7103405-correct_display_names.patch \ - patches/openjdk/7158483-tzdata2012c.patch \ - patches/openjdk/7198570-tzdata2012f.patch \ - patches/openjdk/8002225-tzdata2012i.patch \ - patches/openjdk/8009987-tzdata2013b.patch \ patches/openjdk/6636370-appcontext_simplification.patch \ patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \ patches/sparc-ptracefix.patch \ @@ -544,8 +524,6 @@ patches/print_lsb_release.patch \ patches/alternative_krb5_cache.patch \ patches/alternative_krb5_cache_fixup.patch \ - patches/openjdk/8014469-tzdata2013c.patch \ - patches/openjdk/8020054-tzdata2013d.patch \ patches/imageiojpeg_sync.patch \ patches/openjdk/8005194-scale_memory_leak.patch \ patches/openjdk/6563752-ss12_support.patch \ @@ -599,7 +577,6 @@ patches/hotspot/hs23/arm-hsdis.patch \ patches/openjdk/7025066-embedded_build.patch \ patches/s390_casts.patch \ - patches/openjdk/8025255-tzdata2013g.patch \ patches/d729448-32_bit_alignment.patch \ patches/windows-awt.patch \ patches/windows-jdk-sizecalc.patch \ @@ -624,8 +601,14 @@ patches/openjdk/7106773-512_bits_rsa.patch \ patches/pr1904-icedtea_and_distro_versioning.patch \ patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch \ - patches/openjdk/8000897-use_corresponding_digest_length.patch \ - patches/pr2083-aarch64_zero.patch + patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch \ + patches/pr2083-aarch64_zero.patch \ + patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch \ + patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch \ + patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch \ + patches/pr2070-type_punning_warnings.patch \ + patches/pr2082-s390_type_fixes.patch \ + patches/pr2096-4096-bit_dh.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r ccfb83ff9e78 -r 102b1e9b36a3 NEWS --- a/NEWS Mon Jan 19 17:52:30 2015 +0000 +++ b/NEWS Tue Jan 20 05:50:58 2015 +0000 @@ -14,65 +14,172 @@ New in release 1.14.0 (201X-XX-XX): +* Security fixes + - S8046656: Update protocol support + - S8047125, CVE-2015-0395: (ref) More phantom object references + - S8047130: Fewer escapes from escape analysis + - S8048035, CVE-2015-0400: Ensure proper proxy protocols + - S8049253: Better GC validation + - S8050807, CVE-2015-0383: Better performing performance data handling + - S8054367, CVE-2015-0412: More references for endpoints + - S8055304, CVE-2015-0407: More boxing for DirectoryComboBoxModel + - S8055309, CVE-2015-0408: RMI needs better transportation considerations + - S8055479: TLAB stability + - S8055489, CVE-2014-6585: Better substitution formats + - S8056264, CVE-2014-6587: Multicast support improvements + - S8056276, CVE-2014-6591: Fontmanager feature improvements + - S8057555, CVE-2014-6593: Less cryptic cipher suite management + - S8058982, CVE-2014-6601: Better verification of an exceptional invokespecial + - S8059485, CVE-2015-0410: Resolve parsing ambiguity + - S8061210, CVE-2014-3566: Issues in TLS * Import of OpenJDK6 b34 - OJ43: Backport JAX_WS-945; Socket backlog may be limiting lwhs performance + - OJ44: Add missing TimeZone test cases included in OpenJDK 7 revision 0. + - OJ45: Fix copyright headers on imported files + - OJ46: Fix lost Classpath exception + - OJ47: Remove @Override annotation on interfaces added by 2015/01/20 security fixes. + - OJ48: Fix substitution error. + - S4873188: Support TLS 1.1 - S6364329: jstat displays "invalid argument count" with usage + - S6461635: [TESTBUG] BasicTests.sh test fails intermittently - S6507067: TimeZone country/area message error + - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec + - S6578647: Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication() - S6585666: Spanish language names not compliant with CLDR + - S6587676: Krb5LoginModule failure if useTicketCache=true on Vista - S6608572: Currency change for Malta and Cyprus - S6610748: Dateformat - AM-PM indicator in Finnish appears to be from English - S6627549: ISO 3166 code addition: Saint Barthelemy and Saint Martin + - S6631048: Problem when writing on output stream of HttpURLConnection + - S6641309: Wrong Cookie separator used in HttpURLConnection + - S6641312: Fix krb5 codes indentation problems - S6645271: Wrong date format for Croatian (hr) locale - S6646611: Incorrect spelling of month name in locale for Belarusian language ("be", "BY") - S6647452: Remove obfuscation, framework and provider self-verification checking + - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems + - S6659779: HttpURLConnections logger should log tunnel requests + - S6670362: HTTP/SPNEGO should work across realms - S6716626: Integrate contributed language and country names for NL + - S6720866: Slow performance using HttpURLConnection for upload + - S6726695: HttpURLConnection shoul support 'Expect: 100-continue' headers for PUT + - S6729881: Compiler warning in networking native code + - S6765491: Krb5LoginModule a little too restrictive, and the doc is not clear. + - S6776102: sun/util/resources/TimeZone/Bug6317929.java test failed against 6u12b01 and passed against 6u11b03 - S6786276: Locale.getISOCountries() still contains country code "CS" + - S6792180: Enhance to reject weak algorithms or conform to crypto recommendations + - S6811297: Add more logging to HTTP protocol handler + - S6822460: support self-issued certificate + - S6830658: Changeset 67e5d3e41b5b breaks the fastdebug build in NativeCreds.c + - S6835668: Use of /usr/include/linux/ files creates a dependence on kernel-headers + - S6855297: Windows build breaks after 6811297 + - S6856856: NPE in HTTP protocol handler logging - S6868106: Ukrainian currency has wrong format - S6870908: reopen bug 4244752: month names in Estonian should be lowercase - S6873931: New Turkish currency since 2009 + - S6882594: Remove static dependancy on NTLM authentication + - S6899503: Security code issue using Verisign root certificate - S6910489: Slovenia Locale, wrong firstDayOfWeek number + - S6911104: Tests do not work with CYGWIN: tools, sun/tools, and com/sun/tools - S6914413: abbreviation name for November is not correct in be_BY - S6916787: Ukrainian currency name needs to be fixed - S6919624: minimalDaysInFirstWeek ressource for hungarian is wrong - S6931564: Incorrect display name of Locale for south africa + - S6931566: NetworkInterface is not working when interface name is more than 15 characters long - S6938454: 2 new testcases for bug: Unable to determine generic type in program that compiles under Java 6 - S6938454: Unable to determine generic type in program that compiles under Java 6 + - S6945604: wrong error message in CardImpl.java + - S6962617: Testcase changes, cleanup of problem list for jdk_tools targets + - S6964714: NetworkInterface getInetAddresses enumerates IPv6 addresses if java.net.preferIPvStack property set + - S6967937: Scope id no longer being set after 6931566 + - S6972374: NetworkInterface.getNetworkInterfaces throws "java.net.SocketException" on Solaris zone + - S6976117: SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets without TLSv1.1 enabled + - S7001720: copyright templates not rebranded - S7019267: Currency Display Names are not localized into pt_BR. - S7020583: Some currency names are missing in some locales - S7020960: CurrencyNames_sr_RS.properties is missing. + - S7022269: clean up fscanf usage in Linux networking native code - S7025837: fix plural currency display names in sr_Latn_(BA|ME|RS).properties - S7028073: The currency symbol for Peru is wrong + - S7035555: 4/4 attach/BasicTests.sh needs another tweak for Cygwin + - S7036025: java.security.AccessControlException when creating JFileChooser in signed applet - S7036905: [de] dem - the german mark display name is incorrect + - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true - S7066203: Update currency data to the latest ISO 4217 standard - S7077119: remove past transition dates from CurrencyData.properties file - S7085757: Currency Data: ISO 4217 Amendment 152 - S7122142, RH1151372: (ann) Race condition between isAnnotationPresent and getAnnotations + - S7153184: NullPointerException when calling SSLEngineImpl.getSupportedCipherSuites - S7161796, RH1151372: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror - S7171028: dots are missed in the datetime for Slovanian + - S7174244: NPE in Krb5ProxyImpl.getServerKeys() - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations - S7189611: Venezuela current Currency should be Bs.F. - S7195759: ISO 4217 Amendment 154 + - S7199066: Typo in method name - S7201205: Add Makefile configuration option to build with unlimited crypto in OpenJDK. - S8005232: (JEP-149) Class Instance size reduction - S8006748: getISO3Country() returns wrong value - S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale + - S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE + - S8015570: Use long comparison in Rule.getRules(). - S8021121: ISO 4217 Amendment Number 156 + - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws java.lang.IllegalStateException: unexpected condition + - S8023956: Provide a work-around to broken Linux 32 bit "Exec Shield" using CS for NX emulation (crashing with SI_KERNEL) + - S8025051: Update resource files for TimeZone display names + - S8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing + - S8027359: XML parser returns incorrect parsing results + - S8027370: Support tzdata2013h - S8027695: There should be a space before % sign in Swedish locale + - S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings + - S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions + - S8029153: [TESTBUG] test/compiler/7141637/SpreadNullArg.java fails because it expects NullPointerException + - S8029318: Native Windows ccache still reads DES tickets + - S8030822: (tz) Support tzdata2013i + - S8031046: Native Windows ccache might still get unsupported ticket + - S8032788: ImageIcon constructor throws an NPE and hangs when passed a null String parameter + - S8032909: XSLT string-length returns incorrect length when string includes complementary chars + - S8035613: With active Securitymanager JAXBContext.newInstance fails + - S8037012: (tz) Support tzdata2014a + - S8038306: (tz) Support tzdata2014b + - S8040617: [macosx] Large JTable cell results in a OutOfMemoryException + - S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser + - S8043012: (tz) Support tzdata2014c + - S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX + - S8049250: Need a flag to invert the Card.disconnect(reset) argument + - S8049343: (tz) Support tzdata2014g + - S8050485: super() in a try block in a ctor causes VerifyError + - S8051012: Regression in verifier for method call from inside of a branch + - S8051614: smartcardio TCK tests fail due to lack of 'reset' permission + - S8054367: More references for endpoints - S8055222: Currency update needed for ISO 4217 Amendment #159 + - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure + - S8058715: stability issues when being launched as an embedded JVM via JNI + - S8059206: (tz) Support tzdata2014i + - S8060474: Resolve more parsing ambiguity + - S8061826: Part of JDK-8060474 should be reverted + - S8062561: Test bug8055304 fails if file system default directory has read access + - S8062807: Exporting RMI objects fails when run under restrictive SecurityManager + - S8064560: (tz) Support tzdata2014j * Backports - S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init - S6727719: Performance of TextLayout.getBounds() - S6745225: Memory leak while drawing Attributed String - S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space. - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages - - S8000897, RH1155012: VM crash in CompileBroker + - S8000897, PR2173, RH1155012: VM crash in CompileBroker - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory() + - S8020190, PR2174, RH1176718: Fatal: Bug in native code: jfieldID must match object - S8026887: Make issues due to failed large pages allocations easier to debug + - S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. + - S8061785, PR2177: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge * Bug fixes - PR1886: IcedTea does not checksum supplied tarballs - PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop + - PR2070: Type-punning warnings still evident on RHEL 5 + - PR2082: Cast should use same type as GCDrainStackTargetSize (uintx). - PR2083: Add support for building Zero on AArch64 + - PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure New in release 1.13.5 (2014-10-14): diff -r ccfb83ff9e78 -r 102b1e9b36a3 patches/hotspot/hs23/remove_jsr292_tests.patch --- a/patches/hotspot/hs23/remove_jsr292_tests.patch Mon Jan 19 17:52:30 2015 +0000 +++ b/patches/hotspot/hs23/remove_jsr292_tests.patch Tue Jan 20 05:50:58 2015 +0000 @@ -1,7 +1,6 @@ -diff --git a/test/compiler/6990212/Test6990212.java b/test/compiler/6990212/Test6990212.java -deleted file mode 100644 ---- openjdk/hotspot/test/compiler/6990212/Test6990212.java -+++ /dev/null +diff -r 0dd28ac12d7d test/compiler/6990212/Test6990212.java +--- openjdk/hotspot/test/compiler/6990212/Test6990212.java Mon Jan 19 07:36:09 2015 +0000 ++++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -59,11 +58,10 @@ - } - } -} -diff --git a/test/compiler/7141637/SpreadNullArg.java b/test/compiler/7141637/SpreadNullArg.java -deleted file mode 100644 ---- openjdk/hotspot/test/compiler/7141637/SpreadNullArg.java -+++ /dev/null -@@ -1,62 +0,0 @@ +diff -r 0dd28ac12d7d test/compiler/7141637/SpreadNullArg.java +--- openjdk/hotspot/test/compiler/7141637/SpreadNullArg.java Mon Jan 19 07:36:09 2015 +0000 ++++ /dev/null Thu Jan 01 00:00:00 1970 +0000 +@@ -1,66 +0,0 @@ -/* - * Copyright 2011 SAP AG. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,13 +110,17 @@ - mh_spread_target = - MethodHandles.lookup().findStatic(SpreadNullArg.class, "target_spread_arg", mt_ref_arg); - result = (int) mh_spreadInvoker.invokeExact(mh_spread_target, (Object[]) null); -- } catch(NullPointerException e) { -- // Expected exception - do nothing! -- } catch(Throwable e) { +- throw new Error("Expected IllegalArgumentException was not thrown"); +- } catch (IllegalArgumentException e) { +- System.out.println("Expected exception : " + e); +- } catch (Throwable e) { - throw new Error(e); - } - -- if (result != 42) throw new Error("Expected NullPointerException was not thrown"); +- if (result != 42) { +- throw new Error("result [" + result +- + "] != 42 : Expected IllegalArgumentException was not thrown?"); +- } - } - - public static int target_spread_arg(Integer i1) { @@ -126,10 +128,9 @@ - } - -} -diff --git a/test/compiler/7158807/Test7158807.java b/test/compiler/7158807/Test7158807.java -deleted file mode 100644 ---- openjdk/hotspot/test/compiler/7158807/Test7158807.java -+++ /dev/null +diff -r 0dd28ac12d7d test/compiler/7158807/Test7158807.java +--- openjdk/hotspot/test/compiler/7158807/Test7158807.java Mon Jan 19 07:36:09 2015 +0000 ++++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. diff -r ccfb83ff9e78 -r 102b1e9b36a3 patches/hotspot/hs23/type_fixes.patch --- a/patches/hotspot/hs23/type_fixes.patch Mon Jan 19 17:52:30 2015 +0000 +++ b/patches/hotspot/hs23/type_fixes.patch Tue Jan 20 05:50:58 2015 +0000 @@ -1,14 +1,6 @@ -# HG changeset patch -# User andrew -# Date 1316650188 -3600 -# Thu Sep 22 01:09:48 2011 +0100 -# Node ID e0155b0ad538da0ed3046127cf087dda042783e8 -# Parent d88eef905e3079c07507cf395d4cb12fa2981db4 -Use appropriate types in order to allow builds on more architectures. - -diff --git a/src/share/vm/asm/codeBuffer.hpp b/src/share/vm/asm/codeBuffer.hpp ---- openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp -+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp +diff -Nru openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.hpp openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp +--- openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.hpp 2015-01-20 02:18:05.528822959 +0000 ++++ openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp 2015-01-20 02:24:10.553291894 +0000 @@ -93,7 +93,7 @@ address _locs_point; // last relocated position (grows upward) bool _locs_own; // did I allocate the locs myself? @@ -18,10 +10,10 @@ CodeBuffer* _outer; // enclosing CodeBuffer // (Note: _locs_point used to be called _last_reloc_offset.) -diff --git a/src/share/vm/ci/ciTypeFlow.cpp b/src/share/vm/ci/ciTypeFlow.cpp ---- openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp -@@ -403,7 +403,7 @@ +diff -Nru openjdk.orig/hotspot/src/share/vm/ci/ciTypeFlow.cpp openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp +--- openjdk.orig/hotspot/src/share/vm/ci/ciTypeFlow.cpp 2015-01-20 02:22:58.188406105 +0000 ++++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp 2015-01-20 02:24:10.553291894 +0000 +@@ -406,7 +406,7 @@ // Set the rest of the locals to bottom. Cell cell = state->next_cell(state->tos()); state->set_stack_size(0); @@ -30,9 +22,9 @@ for (; cell < limit; cell = state->next_cell(cell)) { state->set_type_at(cell, state->bottom_type()); } -diff --git a/src/share/vm/compiler/methodLiveness.cpp b/src/share/vm/compiler/methodLiveness.cpp ---- openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp -+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp +diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/methodLiveness.cpp openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp +--- openjdk.orig/hotspot/src/share/vm/compiler/methodLiveness.cpp 2015-01-20 02:18:13.308918231 +0000 ++++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp 2015-01-20 02:24:10.553291894 +0000 @@ -572,15 +572,15 @@ @@ -63,10 +55,10 @@ _analyzer->bit_map_size_bits()); answer.set_is_valid(); -diff --git a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp -@@ -957,7 +957,7 @@ +diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-01-20 02:20:42.290742422 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-01-20 02:24:10.557291942 +0000 +@@ -963,7 +963,7 @@ if (free_percentage < desired_free_percentage) { size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage)); assert(desired_capacity >= capacity(), "invalid expansion size"); @@ -75,7 +67,7 @@ } if (expand_bytes > 0) { if (PrintGCDetails && Verbose) { -@@ -6253,7 +6253,7 @@ +@@ -6282,7 +6282,7 @@ HeapWord* curAddr = _markBitMap.startWord(); while (curAddr < _markBitMap.endWord()) { size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr); @@ -84,7 +76,7 @@ _markBitMap.clear_large_range(chunk); if (ConcurrentMarkSweepThread::should_yield() && !foregroundGCIsActive() && -@@ -6546,7 +6546,7 @@ +@@ -6575,7 +6575,7 @@ return; } // Double capacity if possible @@ -93,9 +85,9 @@ // Do not give up existing stack until we have managed to // get the double capacity that we desired. ReservedSpace rs(ReservedSpace::allocation_align_size_up( -diff --git a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp +diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-01-20 02:18:02.044780293 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-01-20 02:24:10.557291942 +0000 @@ -897,8 +897,8 @@ void PSParallelCompact::initialize_dead_wood_limiter() { @@ -107,9 +99,9 @@ _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev); DEBUG_ONLY(_dwl_initialized = true;) _dwl_adjustment = normal_distribution(1.0); -diff --git a/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp b/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp +diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2015-01-20 02:18:02.140781469 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2015-01-20 02:24:10.557291942 +0000 @@ -69,7 +69,7 @@ _last_used = current_live; @@ -119,10 +111,10 @@ virtual_space()->alignment()); // Compute the desired size: -diff --git a/src/share/vm/memory/collectorPolicy.cpp b/src/share/vm/memory/collectorPolicy.cpp ---- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp -+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp -@@ -327,7 +327,7 @@ +diff -Nru openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp +--- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-01-20 02:18:07.024841278 +0000 ++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-01-20 02:24:10.557291942 +0000 +@@ -330,7 +330,7 @@ // yield a size that is too small) and bound it by MaxNewSize above. // Ergonomics plays here by previously calculating the desired // NewSize and MaxNewSize. @@ -131,22 +123,10 @@ } assert(max_new_size > 0, "All paths should set max_new_size"); From fridrich.strba at suse.com Sun Jan 25 20:31:13 2015 From: fridrich.strba at suse.com (Fridrich Strba) Date: Sun, 25 Jan 2015 21:31:13 +0100 Subject: [SECURITY] IcedTea 1.13.6 for OpenJDK 6 Released! In-Reply-To: <20150124003852.GA29532@carrie.the212.com> References: <20150124003852.GA29532@carrie.the212.com> Message-ID: <54C55291.7050706@suse.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, for those that try to build against giflib-5.1.0, there is a need of the attached little tiny patch. It is needed for 1.7.0 too. Cheers Fridrich On 24/01/15 01:39, Andrew Hughes wrote: > The IcedTea project provides a harness to build the source code > from OpenJDK using Free Software build tools, along with > additional features such as a PulseAudio sound driver, the ability > to build against system libraries and support for alternative > virtual machines and architectures beyond those supported by > OpenJDK. > > This release updates our OpenJDK 6 support in the 1.13.x series > with the January 2015 security fixes. > > If you find an issue with the release, please report it to our bug > database (http://icedtea.classpath.org/bugzilla) under the > appropriate component. Development discussion takes place on the > distro-pkg-dev at openjdk.java.net mailing list and patches are > always welcome. > > Full details of the release can be found below. > > What's New? =========== New in release 1.13.6 (2015-01-23): > > * Security fixes - S8046656: Update protocol support - S8047125, > CVE-2015-0395: (ref) More phantom object references - S8047130: > Fewer escapes from escape analysis - S8048035, CVE-2015-0400: > Ensure proper proxy protocols - S8049253: Better GC validation - > S8050807, CVE-2015-0383: Better performing performance data > handling - S8054367, CVE-2015-0412: More references for endpoints - > S8055304, CVE-2015-0407: More boxing for DirectoryComboBoxModel - > S8055309, CVE-2015-0408: RMI needs better transportation > considerations - S8055479: TLAB stability - S8055489, > CVE-2014-6585: Better substitution formats - S8056264, > CVE-2014-6587: Multicast support improvements - S8056276, > CVE-2014-6591: Fontmanager feature improvements - S8057555, > CVE-2014-6593: Less cryptic cipher suite management - S8058982, > CVE-2014-6601: Better verification of an exceptional invokespecial > - S8059485, CVE-2015-0410: Resolve parsing ambiguity - S8061210, > CVE-2014-3566: Issues in TLS * Import of OpenJDK6 b34 - OJ43: > Backport JAX_WS-945; Socket backlog may be limiting lwhs > performance - OJ44: Add missing TimeZone test cases included in > OpenJDK 7 revision 0. - OJ45: Fix copyright headers on imported > files - OJ46: Fix lost Classpath exception - OJ47: Remove @Override > annotation on interfaces added by 2015/01/20 security fixes. - > OJ48: Fix substitution error. - OJ49: Fix placement of 8023956 > fix. - OJ50: Fix reference to missing pd_attempt_reserve_memory_at > - S4873188: Support TLS 1.1 - S6364329: jstat displays "invalid > argument count" with usage - S6461635: [TESTBUG] BasicTests.sh test > fails intermittently - S6507067: TimeZone country/area message > error - S6545422: [TESTBUG] NativeErrors.java uses wrong path name > in exec - S6578647: Undefined requesting URL in > java.net.Authenticator.getPasswordAuthentication() - S6585666: > Spanish language names not compliant with CLDR - S6587676: > Krb5LoginModule failure if useTicketCache=true on Vista - S6608572: > Currency change for Malta and Cyprus - S6610748: Dateformat - AM-PM > indicator in Finnish appears to be from English - S6627549: ISO > 3166 code addition: Saint Barthelemy and Saint Martin - S6631048: > Problem when writing on output stream of HttpURLConnection - > S6641309: Wrong Cookie separator used in HttpURLConnection - > S6641312: Fix krb5 codes indentation problems - S6645271: Wrong > date format for Croatian (hr) locale - S6646611: Incorrect spelling > of month name in locale for Belarusian language ("be", "BY") - > S6647452: Remove obfuscation, framework and provider > self-verification checking - S6653795: C2 intrinsic for > Unsafe.getAddress performs pointer sign extension on 32-bit > systems - S6659779: HttpURLConnections logger should log tunnel > requests - S6670362: HTTP/SPNEGO should work across realms - > S6716626: Integrate contributed language and country names for NL - > S6720866: Slow performance using HttpURLConnection for upload - > S6726695: HttpURLConnection shoul support 'Expect: 100-continue' > headers for PUT - S6729881: Compiler warning in networking native > code - S6765491: Krb5LoginModule a little too restrictive, and the > doc is not clear. - S6776102: > sun/util/resources/TimeZone/Bug6317929.java test failed against > 6u12b01 and passed against 6u11b03 - S6786276: > Locale.getISOCountries() still contains country code "CS" - > S6792180: Enhance to reject weak algorithms or conform to crypto > recommendations - S6811297: Add more logging to HTTP protocol > handler - S6822460: support self-issued certificate - S6830658: > Changeset 67e5d3e41b5b breaks the fastdebug build in NativeCreds.c > - S6835668: Use of /usr/include/linux/ files creates a dependence > on kernel-headers - S6855297: Windows build breaks after 6811297 - > S6856856: NPE in HTTP protocol handler logging - S6868106: > Ukrainian currency has wrong format - S6870908: reopen bug 4244752: > month names in Estonian should be lowercase - S6873931: New Turkish > currency since 2009 - S6882594: Remove static dependancy on NTLM > authentication - S6899503: Security code issue using Verisign root > certificate - S6910489: Slovenia Locale, wrong firstDayOfWeek > number - S6911104: Tests do not work with CYGWIN: tools, sun/tools, > and com/sun/tools - S6914413: abbreviation name for November is not > correct in be_BY - S6916787: Ukrainian currency name needs to be > fixed - S6919624: minimalDaysInFirstWeek ressource for hungarian is > wrong - S6931564: Incorrect display name of Locale for south > africa - S6931566: NetworkInterface is not working when interface > name is more than 15 characters long - S6938454: 2 new testcases > for bug: Unable to determine generic type in program that compiles > under Java 6 - S6938454: Unable to determine generic type in > program that compiles under Java 6 - S6945604: wrong error message > in CardImpl.java - S6962617: Testcase changes, cleanup of problem > list for jdk_tools targets - S6964714: NetworkInterface > getInetAddresses enumerates IPv6 addresses if > java.net.preferIPvStack property set - S6967937: Scope id no longer > being set after 6931566 - S6972374: > NetworkInterface.getNetworkInterfaces throws > "java.net.SocketException" on Solaris zone - S6976117: > SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets > without TLSv1.1 enabled - S7001720: copyright templates not > rebranded - S7019267: Currency Display Names are not localized into > pt_BR. - S7020583: Some currency names are missing in some locales > - S7020960: CurrencyNames_sr_RS.properties is missing. - S7022269: > clean up fscanf usage in Linux networking native code - S7025837: > fix plural currency display names in sr_Latn_(BA|ME|RS).properties > - S7028073: The currency symbol for Peru is wrong - S7035555: 4/4 > attach/BasicTests.sh needs another tweak for Cygwin - S7036025: > java.security.AccessControlException when creating JFileChooser in > signed applet - S7036905: [de] dem - the german mark display name > is incorrect - S7047033: (smartcardio) Card.disconnect(boolean > reset) does not reset when reset is true - S7066203: Update > currency data to the latest ISO 4217 standard - S7077119: remove > past transition dates from CurrencyData.properties file - S7085757: > Currency Data: ISO 4217 Amendment 152 - S7122142, RH1151372: (ann) > Race condition between isAnnotationPresent and getAnnotations - > S7153184: NullPointerException when calling > SSLEngineImpl.getSupportedCipherSuites - S7161796, RH1151372: > PhaseStringOpts::fetch_static_field tries to fetch field from the > Klass instead of the mirror - S7171028: dots are missed in the > datetime for Slovanian - S7174244: NPE in > Krb5ProxyImpl.getServerKeys() - S7185456: (ann) Optimize Annotation > handling in java/sun.reflect.* code for small number of > annotations - S7189611: Venezuela current Currency should be Bs.F. > - S7195759: ISO 4217 Amendment 154 - S7199066: Typo in method name > - S7201205: Add Makefile configuration option to build with > unlimited crypto in OpenJDK. - S8005232: (JEP-149) Class Instance > size reduction - S8006748: getISO3Country() returns wrong value - > S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale - > S8015421: NegativeArraySizeException occurs in > ChunkedOutputStream() with Integer.MAX_VALUE - S8015570: Use long > comparison in Rule.getRules(). - S8021121: ISO 4217 Amendment > Number 156 - S8021372: NetworkInterface.getNetworkInterfaces() > returns duplicate hardware address - S8022721: TEST_BUG: > AnnotationTypeDeadlockTest.java throws > java.lang.IllegalStateException: unexpected condition - S8023956: > Provide a work-around to broken Linux 32 bit "Exec Shield" using CS > for NX emulation (crashing with SI_KERNEL) - S8025051: Update > resource files for TimeZone display names - S8026772: > test/sun/util/resources/TimeZone/Bug6317929.java failing - > S8027359: XML parser returns incorrect parsing results - S8027370: > Support tzdata2013h - S8027695: There should be a space before % > sign in Swedish locale - S8028627: Unsynchronized code path from > javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store > codebase mappings - S8028726: (prefs) Check > src/solaris/native/java/util/FileSystemPreferences.c for JNI > pending exceptions - S8029153: [TESTBUG] > test/compiler/7141637/SpreadNullArg.java fails because it expects > NullPointerException - S8029318: Native Windows ccache still reads > DES tickets - S8030822: (tz) Support tzdata2013i - S8031046: Native > Windows ccache might still get unsupported ticket - S8032788: > ImageIcon constructor throws an NPE and hangs when passed a null > String parameter - S8032909: XSLT string-length returns incorrect > length when string includes complementary chars - S8035613: With > active Securitymanager JAXBContext.newInstance fails - S8037012: > (tz) Support tzdata2014a - S8038306: (tz) Support tzdata2014b - > S8040617: [macosx] Large JTable cell results in a > OutOfMemoryException - S8041990: [macosx] Language specific keys > does not work in applets when opened outside the browser - > S8043012: (tz) Support tzdata2014c - S8046343: (smartcardio) > CardTerminal.connect('direct') does not work on MacOSX - S8049250: > Need a flag to invert the Card.disconnect(reset) argument - > S8049343: (tz) Support tzdata2014g - S8050485: super() in a try > block in a ctor causes VerifyError - S8051012: Regression in > verifier for method call from inside of a branch - S8051614: > smartcardio TCK tests fail due to lack of 'reset' permission - > S8054367: More references for endpoints - S8055222: Currency update > needed for ISO 4217 Amendment #159 - S8056211: > api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] > failure - S8058715: stability issues when being launched as an > embedded JVM via JNI - S8059206: (tz) Support tzdata2014i - > S8060474: Resolve more parsing ambiguity - S8061826: Part of > JDK-8060474 should be reverted - S8062561: Test bug8055304 fails if > file system default directory has read access - S8062807: Exporting > RMI objects fails when run under restrictive SecurityManager - > S8064560: (tz) Support tzdata2014j * Backports - OJ51, PR2187: Sync > patch for 4873188 with 7 version - OJ52, PR2185: Application of > 6786276 introduces compatibility issue - OJ53, PR2181: > strict-aliasing warnings issued on PPC32 - OJ54, PR2182: 6911104 > reintroduces test fragment removed in existing 6964018 backport - > S6730740, PR2186: Fix for 6729881 has apparently broken several 64 > bit tests: "Bad address" - S7031830, PR2183: bad_record_mac > failure on TLSv1.2 enabled connection with SSLEngine - S8000897, > PR2173, RH1155012: VM crash in CompileBroker - S8020190, PR2174, > RH1176718: Fatal: Bug in native code: jfieldID must match object - > S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable > mismatching java_lang_String::hash_code for extended characters. - > S8061785, PR2177: [TEST_BUG] > serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character > corrupted by earlier merge * Bug fixes - PR1831: Drop version > requirement for LCMS 2 - PR1832, RH1022017: Report elliptic curves > supported by NSS, not the SunEC library - PR2033: > patches/ecj/jaxws-getdtdtype.patch no longer applies since removal > of JAXWS drop - PR2062: Unset OS before running OpenJDK build - > PR2070: Type-punning warnings still evident on RHEL 5 - PR2082: > Cast should use same type as GCDrainStackTargetSize (uintx). - > PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora > infrastructure - PR2125: Synchronise elliptic curves in > sun.security.ec.NamedCurve with those listed by NSS - PR2179: Avoid > x86 workaround when running Zero rather than a JIT - PR2180: Old > autotools dislike $(builddir)/fsg.sh * CACAO - PR2184: CACAO lacks > JVM_FindClassFromCaller introduced by security patch in 1.13.6 * > JamVM - PR2190: JamVM lacks JVM_FindClassFromCaller introduced by > security patch in 1.13.6 > > The tarballs can be downloaded from: > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.gz > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.xz > > We provide both gzip and xz tarballs, so that those who are able to > make use of the smaller tarball produced by xz may do so. > > The tarballs are accompanied by digital signatures available at: > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.gz.sig > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.xz.sig > > These are produced using my public key. See details below. > > PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A > 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 > > I'm transitioning to the use of a new key for signing releases > over the next year. Signatures made with this key are available > at: > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.gz.sig.ec > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.xz.sig.ec > > and the new key is: > > PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 > 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 > > SHA256 checksums: > > eb06a1e9a16f6473ffac4072c753e8e0fd1c39ad00016bcbd984534a93189e52 > icedtea6-1.13.6.tar.gz > 1e62fe97d4a6dfe641373889534741ec5f06d268e2ea14a8f4ff505560e1c3f8 > icedtea6-1.13.6.tar.gz.sig > 356edb04945690e216f0569e9dc8afd8f55c2a0dfc8816a904e63506220cb523 > icedtea6-1.13.6.tar.gz.sig.ec > 2090f3a9e4b045073f8fcd147848e3b94b389fa2740b20ded4c5d2398f1b4c99 > icedtea6-1.13.6.tar.xz > ac02dc6515afcf2aac2d731e56b7aa6c987e98b7c7a9ed214e4e4a08d2b21528 > icedtea6-1.13.6.tar.xz.sig > 1fa7b55a960cbf3db4000e170c95b3e78413fef45655609de05f55a7c5012347 > icedtea6-1.13.6.tar.xz.sig.ec > > The checksums can be downloaded from: > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.sha256 > > > > The following people helped with these releases: > > * Andrew Dinn (backport of S8047125) * Andrew Hughes (all other > backports, release management) > > We would also like to thank the bug reporters and testers! > > To get started: > > $ tar xzf icedtea6-1.13.6.tar.gz > > or: > > $ tar x -I xz -f icedtea6-1.13.6.tar.xz > > then: > > $ mkdir icedtea-build $ cd icedtea-build $ > ../icedtea6-1.13.6/configure $ make > > Full build requirements and instructions are available in the > INSTALL file. > > Happy hacking! > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlTFUpEACgkQu9a1imXPdA/2ZQCfTm4+HXQ2c9RJZFLirGyf4Gi3 li0Ani1v9GcoWD7aQHj+lnBlHCEF5gNy =XMNi -----END PGP SIGNATURE----- -------------- next part -------------- A non-text attachment was scrubbed... Name: java-1_7_0-openjdk-giflib5.patch Type: text/x-patch Size: 484 bytes Desc: not available URL: From gnu.andrew at redhat.com Sun Jan 25 20:39:35 2015 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Sun, 25 Jan 2015 15:39:35 -0500 (EST) Subject: [SECURITY] IcedTea 1.13.6 for OpenJDK 6 Released! In-Reply-To: <54C55291.7050706@suse.com> References: <20150124003852.GA29532@carrie.the212.com> <54C55291.7050706@suse.com> Message-ID: <330029433.145643.1422218375226.JavaMail.zimbra@redhat.com> ----- Original Message ----- > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Hello, for those that try to build against giflib-5.1.0, there is a > need of the attached little tiny patch. It is needed for 1.7.0 too. > Thanks. I'll include it in the next set of releases. > Cheers > > Fridrich > > > > > On 24/01/15 01:39, Andrew Hughes wrote: > > The IcedTea project provides a harness to build the source code > > from OpenJDK using Free Software build tools, along with > > additional features such as a PulseAudio sound driver, the ability > > to build against system libraries and support for alternative > > virtual machines and architectures beyond those supported by > > OpenJDK. > > > > This release updates our OpenJDK 6 support in the 1.13.x series > > with the January 2015 security fixes. > > > > If you find an issue with the release, please report it to our bug > > database (http://icedtea.classpath.org/bugzilla) under the > > appropriate component. Development discussion takes place on the > > distro-pkg-dev at openjdk.java.net mailing list and patches are > > always welcome. > > > > Full details of the release can be found below. > > > > What's New? =========== New in release 1.13.6 (2015-01-23): > > > > * Security fixes - S8046656: Update protocol support - S8047125, > > CVE-2015-0395: (ref) More phantom object references - S8047130: > > Fewer escapes from escape analysis - S8048035, CVE-2015-0400: > > Ensure proper proxy protocols - S8049253: Better GC validation - > > S8050807, CVE-2015-0383: Better performing performance data > > handling - S8054367, CVE-2015-0412: More references for endpoints - > > S8055304, CVE-2015-0407: More boxing for DirectoryComboBoxModel - > > S8055309, CVE-2015-0408: RMI needs better transportation > > considerations - S8055479: TLAB stability - S8055489, > > CVE-2014-6585: Better substitution formats - S8056264, > > CVE-2014-6587: Multicast support improvements - S8056276, > > CVE-2014-6591: Fontmanager feature improvements - S8057555, > > CVE-2014-6593: Less cryptic cipher suite management - S8058982, > > CVE-2014-6601: Better verification of an exceptional invokespecial > > - S8059485, CVE-2015-0410: Resolve parsing ambiguity - S8061210, > > CVE-2014-3566: Issues in TLS * Import of OpenJDK6 b34 - OJ43: > > Backport JAX_WS-945; Socket backlog may be limiting lwhs > > performance - OJ44: Add missing TimeZone test cases included in > > OpenJDK 7 revision 0. - OJ45: Fix copyright headers on imported > > files - OJ46: Fix lost Classpath exception - OJ47: Remove @Override > > annotation on interfaces added by 2015/01/20 security fixes. - > > OJ48: Fix substitution error. - OJ49: Fix placement of 8023956 > > fix. - OJ50: Fix reference to missing pd_attempt_reserve_memory_at > > - S4873188: Support TLS 1.1 - S6364329: jstat displays "invalid > > argument count" with usage - S6461635: [TESTBUG] BasicTests.sh test > > fails intermittently - S6507067: TimeZone country/area message > > error - S6545422: [TESTBUG] NativeErrors.java uses wrong path name > > in exec - S6578647: Undefined requesting URL in > > java.net.Authenticator.getPasswordAuthentication() - S6585666: > > Spanish language names not compliant with CLDR - S6587676: > > Krb5LoginModule failure if useTicketCache=true on Vista - S6608572: > > Currency change for Malta and Cyprus - S6610748: Dateformat - AM-PM > > indicator in Finnish appears to be from English - S6627549: ISO > > 3166 code addition: Saint Barthelemy and Saint Martin - S6631048: > > Problem when writing on output stream of HttpURLConnection - > > S6641309: Wrong Cookie separator used in HttpURLConnection - > > S6641312: Fix krb5 codes indentation problems - S6645271: Wrong > > date format for Croatian (hr) locale - S6646611: Incorrect spelling > > of month name in locale for Belarusian language ("be", "BY") - > > S6647452: Remove obfuscation, framework and provider > > self-verification checking - S6653795: C2 intrinsic for > > Unsafe.getAddress performs pointer sign extension on 32-bit > > systems - S6659779: HttpURLConnections logger should log tunnel > > requests - S6670362: HTTP/SPNEGO should work across realms - > > S6716626: Integrate contributed language and country names for NL - > > S6720866: Slow performance using HttpURLConnection for upload - > > S6726695: HttpURLConnection shoul support 'Expect: 100-continue' > > headers for PUT - S6729881: Compiler warning in networking native > > code - S6765491: Krb5LoginModule a little too restrictive, and the > > doc is not clear. - S6776102: > > sun/util/resources/TimeZone/Bug6317929.java test failed against > > 6u12b01 and passed against 6u11b03 - S6786276: > > Locale.getISOCountries() still contains country code "CS" - > > S6792180: Enhance to reject weak algorithms or conform to crypto > > recommendations - S6811297: Add more logging to HTTP protocol > > handler - S6822460: support self-issued certificate - S6830658: > > Changeset 67e5d3e41b5b breaks the fastdebug build in NativeCreds.c > > - S6835668: Use of /usr/include/linux/ files creates a dependence > > on kernel-headers - S6855297: Windows build breaks after 6811297 - > > S6856856: NPE in HTTP protocol handler logging - S6868106: > > Ukrainian currency has wrong format - S6870908: reopen bug 4244752: > > month names in Estonian should be lowercase - S6873931: New Turkish > > currency since 2009 - S6882594: Remove static dependancy on NTLM > > authentication - S6899503: Security code issue using Verisign root > > certificate - S6910489: Slovenia Locale, wrong firstDayOfWeek > > number - S6911104: Tests do not work with CYGWIN: tools, sun/tools, > > and com/sun/tools - S6914413: abbreviation name for November is not > > correct in be_BY - S6916787: Ukrainian currency name needs to be > > fixed - S6919624: minimalDaysInFirstWeek ressource for hungarian is > > wrong - S6931564: Incorrect display name of Locale for south > > africa - S6931566: NetworkInterface is not working when interface > > name is more than 15 characters long - S6938454: 2 new testcases > > for bug: Unable to determine generic type in program that compiles > > under Java 6 - S6938454: Unable to determine generic type in > > program that compiles under Java 6 - S6945604: wrong error message > > in CardImpl.java - S6962617: Testcase changes, cleanup of problem > > list for jdk_tools targets - S6964714: NetworkInterface > > getInetAddresses enumerates IPv6 addresses if > > java.net.preferIPvStack property set - S6967937: Scope id no longer > > being set after 6931566 - S6972374: > > NetworkInterface.getNetworkInterfaces throws > > "java.net.SocketException" on Solaris zone - S6976117: > > SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets > > without TLSv1.1 enabled - S7001720: copyright templates not > > rebranded - S7019267: Currency Display Names are not localized into > > pt_BR. - S7020583: Some currency names are missing in some locales > > - S7020960: CurrencyNames_sr_RS.properties is missing. - S7022269: > > clean up fscanf usage in Linux networking native code - S7025837: > > fix plural currency display names in sr_Latn_(BA|ME|RS).properties > > - S7028073: The currency symbol for Peru is wrong - S7035555: 4/4 > > attach/BasicTests.sh needs another tweak for Cygwin - S7036025: > > java.security.AccessControlException when creating JFileChooser in > > signed applet - S7036905: [de] dem - the german mark display name > > is incorrect - S7047033: (smartcardio) Card.disconnect(boolean > > reset) does not reset when reset is true - S7066203: Update > > currency data to the latest ISO 4217 standard - S7077119: remove > > past transition dates from CurrencyData.properties file - S7085757: > > Currency Data: ISO 4217 Amendment 152 - S7122142, RH1151372: (ann) > > Race condition between isAnnotationPresent and getAnnotations - > > S7153184: NullPointerException when calling > > SSLEngineImpl.getSupportedCipherSuites - S7161796, RH1151372: > > PhaseStringOpts::fetch_static_field tries to fetch field from the > > Klass instead of the mirror - S7171028: dots are missed in the > > datetime for Slovanian - S7174244: NPE in > > Krb5ProxyImpl.getServerKeys() - S7185456: (ann) Optimize Annotation > > handling in java/sun.reflect.* code for small number of > > annotations - S7189611: Venezuela current Currency should be Bs.F. > > - S7195759: ISO 4217 Amendment 154 - S7199066: Typo in method name > > - S7201205: Add Makefile configuration option to build with > > unlimited crypto in OpenJDK. - S8005232: (JEP-149) Class Instance > > size reduction - S8006748: getISO3Country() returns wrong value - > > S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale - > > S8015421: NegativeArraySizeException occurs in > > ChunkedOutputStream() with Integer.MAX_VALUE - S8015570: Use long > > comparison in Rule.getRules(). - S8021121: ISO 4217 Amendment > > Number 156 - S8021372: NetworkInterface.getNetworkInterfaces() > > returns duplicate hardware address - S8022721: TEST_BUG: > > AnnotationTypeDeadlockTest.java throws > > java.lang.IllegalStateException: unexpected condition - S8023956: > > Provide a work-around to broken Linux 32 bit "Exec Shield" using CS > > for NX emulation (crashing with SI_KERNEL) - S8025051: Update > > resource files for TimeZone display names - S8026772: > > test/sun/util/resources/TimeZone/Bug6317929.java failing - > > S8027359: XML parser returns incorrect parsing results - S8027370: > > Support tzdata2013h - S8027695: There should be a space before % > > sign in Swedish locale - S8028627: Unsynchronized code path from > > javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store > > codebase mappings - S8028726: (prefs) Check > > src/solaris/native/java/util/FileSystemPreferences.c for JNI > > pending exceptions - S8029153: [TESTBUG] > > test/compiler/7141637/SpreadNullArg.java fails because it expects > > NullPointerException - S8029318: Native Windows ccache still reads > > DES tickets - S8030822: (tz) Support tzdata2013i - S8031046: Native > > Windows ccache might still get unsupported ticket - S8032788: > > ImageIcon constructor throws an NPE and hangs when passed a null > > String parameter - S8032909: XSLT string-length returns incorrect > > length when string includes complementary chars - S8035613: With > > active Securitymanager JAXBContext.newInstance fails - S8037012: > > (tz) Support tzdata2014a - S8038306: (tz) Support tzdata2014b - > > S8040617: [macosx] Large JTable cell results in a > > OutOfMemoryException - S8041990: [macosx] Language specific keys > > does not work in applets when opened outside the browser - > > S8043012: (tz) Support tzdata2014c - S8046343: (smartcardio) > > CardTerminal.connect('direct') does not work on MacOSX - S8049250: > > Need a flag to invert the Card.disconnect(reset) argument - > > S8049343: (tz) Support tzdata2014g - S8050485: super() in a try > > block in a ctor causes VerifyError - S8051012: Regression in > > verifier for method call from inside of a branch - S8051614: > > smartcardio TCK tests fail due to lack of 'reset' permission - > > S8054367: More references for endpoints - S8055222: Currency update > > needed for ISO 4217 Amendment #159 - S8056211: > > api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] > > failure - S8058715: stability issues when being launched as an > > embedded JVM via JNI - S8059206: (tz) Support tzdata2014i - > > S8060474: Resolve more parsing ambiguity - S8061826: Part of > > JDK-8060474 should be reverted - S8062561: Test bug8055304 fails if > > file system default directory has read access - S8062807: Exporting > > RMI objects fails when run under restrictive SecurityManager - > > S8064560: (tz) Support tzdata2014j * Backports - OJ51, PR2187: Sync > > patch for 4873188 with 7 version - OJ52, PR2185: Application of > > 6786276 introduces compatibility issue - OJ53, PR2181: > > strict-aliasing warnings issued on PPC32 - OJ54, PR2182: 6911104 > > reintroduces test fragment removed in existing 6964018 backport - > > S6730740, PR2186: Fix for 6729881 has apparently broken several 64 > > bit tests: "Bad address" - S7031830, PR2183: bad_record_mac > > failure on TLSv1.2 enabled connection with SSLEngine - S8000897, > > PR2173, RH1155012: VM crash in CompileBroker - S8020190, PR2174, > > RH1176718: Fatal: Bug in native code: jfieldID must match object - > > S8028623, PR2177, RH1168693: SA: hash codes in SymbolTable > > mismatching java_lang_String::hash_code for extended characters. - > > S8061785, PR2177: [TEST_BUG] > > serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character > > corrupted by earlier merge * Bug fixes - PR1831: Drop version > > requirement for LCMS 2 - PR1832, RH1022017: Report elliptic curves > > supported by NSS, not the SunEC library - PR2033: > > patches/ecj/jaxws-getdtdtype.patch no longer applies since removal > > of JAXWS drop - PR2062: Unset OS before running OpenJDK build - > > PR2070: Type-punning warnings still evident on RHEL 5 - PR2082: > > Cast should use same type as GCDrainStackTargetSize (uintx). - > > PR2096, RH1163501: 2048-bit DH upper bound too small for Fedora > > infrastructure - PR2125: Synchronise elliptic curves in > > sun.security.ec.NamedCurve with those listed by NSS - PR2179: Avoid > > x86 workaround when running Zero rather than a JIT - PR2180: Old > > autotools dislike $(builddir)/fsg.sh * CACAO - PR2184: CACAO lacks > > JVM_FindClassFromCaller introduced by security patch in 1.13.6 * > > JamVM - PR2190: JamVM lacks JVM_FindClassFromCaller introduced by > > security patch in 1.13.6 > > > > The tarballs can be downloaded from: > > > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.gz > > > > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.xz > > > > We provide both gzip and xz tarballs, so that those who are able to > > make use of the smaller tarball produced by xz may do so. > > > > The tarballs are accompanied by digital signatures available at: > > > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.gz.sig > > > > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.xz.sig > > > > These are produced using my public key. See details below. > > > > PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A > > 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 > > > > I'm transitioning to the use of a new key for signing releases > > over the next year. Signatures made with this key are available > > at: > > > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.gz.sig.ec > > > > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.xz.sig.ec > > > > and the new key is: > > > > PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 > > 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 > > > > SHA256 checksums: > > > > eb06a1e9a16f6473ffac4072c753e8e0fd1c39ad00016bcbd984534a93189e52 > > icedtea6-1.13.6.tar.gz > > 1e62fe97d4a6dfe641373889534741ec5f06d268e2ea14a8f4ff505560e1c3f8 > > icedtea6-1.13.6.tar.gz.sig > > 356edb04945690e216f0569e9dc8afd8f55c2a0dfc8816a904e63506220cb523 > > icedtea6-1.13.6.tar.gz.sig.ec > > 2090f3a9e4b045073f8fcd147848e3b94b389fa2740b20ded4c5d2398f1b4c99 > > icedtea6-1.13.6.tar.xz > > ac02dc6515afcf2aac2d731e56b7aa6c987e98b7c7a9ed214e4e4a08d2b21528 > > icedtea6-1.13.6.tar.xz.sig > > 1fa7b55a960cbf3db4000e170c95b3e78413fef45655609de05f55a7c5012347 > > icedtea6-1.13.6.tar.xz.sig.ec > > > > The checksums can be downloaded from: > > > > http://icedtea.classpath.org/download/source/icedtea6-1.13.6.sha256 > > > > > > > > The following people helped with these releases: > > > > * Andrew Dinn (backport of S8047125) * Andrew Hughes (all other > > backports, release management) > > > > We would also like to thank the bug reporters and testers! > > > > To get started: > > > > $ tar xzf icedtea6-1.13.6.tar.gz > > > > or: > > > > $ tar x -I xz -f icedtea6-1.13.6.tar.xz > > > > then: > > > > $ mkdir icedtea-build $ cd icedtea-build $ > > ../icedtea6-1.13.6/configure $ make > > > > Full build requirements and instructions are available in the > > INSTALL file. > > > > Happy hacking! > > > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2 > > iEYEARECAAYFAlTFUpEACgkQu9a1imXPdA/2ZQCfTm4+HXQ2c9RJZFLirGyf4Gi3 > li0Ani1v9GcoWD7aQHj+lnBlHCEF5gNy > =XMNi > -----END PGP SIGNATURE----- > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From bugzilla-daemon at icedtea.classpath.org Sun Jan 25 22:51:13 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 25 Jan 2015 22:51:13 +0000 Subject: [Bug 1298] LiveConnect - problem setting array elements (applet variables) from JS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 Marcin Cie??lak changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |marcin.cieslak at gmail.com Assignee|ldracz at redhat.com |marcin.cieslak at gmail.com --- Comment #1 from Marcin Cie??lak --- Looks like passing arrays from JavaScript to Java does not work at all. I have a fix, will be posting shortly :) -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jvanek at redhat.com Mon Jan 26 11:05:15 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 26 Jan 2015 12:05:15 +0100 Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <54BF7121.4070103@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com>, <54BF7121.4070103@redhat.com> Message-ID: <54C61F6B.3090504@redhat.com> On 01/21/2015 10:28 AM, Jiri Vanek wrote: > On 01/06/2015 09:19 PM, Jacob Wisor wrote: >> On 01/06/2015 at 01:25 PM Jacob Wisor wrote: >>> On 01/05/2015 at 05:19 PM Jie Kang wrote: >>>> Hello, >>>> >>>> This patch slightly modifies JNLPRuntime's online detection function to >>>> always perform the check, even if it has been called before. > > As Jacob is mentioning, this really is causing performance overkill. >>>> >>>> Previously, if the boolean onlineDetected wasn't null, the check would be >>>> skipped. This caused a bug when downloading multiple resources. > > The idea of the check was, that first resource to be downloaded, is mostly the most crucial - jnlp, > jnlpHref, mainclass, jar with main class... So this one have to be downlaoded - if it is not, then > we can assume the network inaccessible. >>>> >>>> For each resource being downloaded, we perform the detection check. For two >>>> consecutive resources: If for the first resource, we detected offline, the >>>> boolean onlineDetected would be set to false. Then for the second resource, >>>> the detection check would be skipped, even if that resource was able to be >>>> connected to. This would result in the second resource being unable to be >>>> downloaded, even though it definitely could and should be. The patch fixes >>>> this. > > Do you have some example of this behavior causing any real issues? > Maybe just sync the method or otherwise ensure that while isOnline is null, only one download can be > done? > >>>> >>>> Thoughts? >>> >>> Although I did not test it, seems to be working as advertised. >>> >>> While looking at the code, I was wondering why JNLPRuntime.onlineDetected was >>> a Boolean object instead of a primitive. And, apart from that, the whole >>> offline detection mechanism seems overly complex and unreliable to me. >>> I am also not really convinced that >>> >>> public static void detectOnline(URL location) { >>> if (onlineDetected != null) { >>> return; >>> } >>> try { >>> if (location.getProtocol().equals("file")) { >>> return; >>> } >>> //Checks the offline/online status of the system. >>> InetAddress.getByName(location.getHost()); >>> } catch (UnknownHostException ue) { [?] >>> >>> is the best or most reliable way in J2SE to test for the online/offline status >>> of a system. Do systems having no DNS server configured or which is unreachable >>> properly resolve their name? And, even if they do, does this really actually >>> prove them being online? >>> >>> Now, I was considering a few different options to reliably detecting a system's >>> online/offline status. Initially, I was thinking about pinging the default >>> gateway. However, hosts with public IPs may have their public IP as the default >>> gateway configured. So, the most reliable way I came up with is to send an echo >>> broadcast (on the local subnet) request. Of course, this does not prove the >>> system being connected to the /public/ internet. But this is not neccessary >>> either because JNLP applications may be (which they often are) served on an >>> intranet only. So, would you mind investigating this further? > > Before doing this looks-really-stupid InetAddress.getByName(location.getHost()); i was elaborating > on this, and have nnot found a generic way how to veryfi online status from java. >> >> Oh, I forgot: I am sure we do not want to make a DNS request for every resource >> we need to download, even when subsequent DNS resolution requests are pulled > > yah, to much correct. >> from the local DNS cache. So, although this patch fixes the bug, it is very >> inefficient and impractical because it induces an avoidable performance penalty. >> In other words, the online detection *logic* itself needs to be fixed. >> >> @Jie Kang: >> Thank you for spotting this bug. >> > > Is it really an bug? It actually eliminates the benefits of offline environment. > > >>> consecutive resources: If for the first resource, we detected offline, the > >>> boolean onlineDetected would be set to false. Then for the second resource, > >>> the detection check would be skipped, even if that resource was able to be > >>> connected to. This would result in the second resource being unable to be > >>> downloaded, even though it definitely could and should be. The patch fixes > >>> this. > > Thinking about it - how it is possible that first resource could not be downloaded, but second can > be, and how it is possible that first one can be missed, while second one not? > > > Maybe before deciding that environment i onnline/offline - we may try to download two or three > resources? > > > One more thing crossed my mind - if the check is done everytime ressource is download. Then the output of isOnline() method is actually prety undetermined. ? J. From jvanek at redhat.com Mon Jan 26 11:11:59 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 26 Jan 2015 12:11:59 +0100 Subject: [rfc][icedtea-web] dont expect junit have hamcrest included Message-ID: <54C620FF.3080407@redhat.com> Hi! I noticed an issue during build for fedora rawhide [1] Omair later investigated it, and found: "> Could it be that the junit version in rawhide is not compatible with > your junit-runner sources somehow? I tried removing the junit-runner but the errors persisted. It turns out that this is caused by a change in Fedora's junit.jar. In F20 (at least) the junit.jar includes org.hamcrest.* classes. This is no longer true for the version in rawhide (this matches the jar shipped by upstream in maven repositories). Since the hamcrest classes are not available on the classpath, a class that imports them, such as org/junit/internal/AssumptionViolatedException, fails to load with a NoClassDefFoundError. The fix is to make sure that the hamcrest jar is available on the classpath next to junit.jar too. The attached patch (for icedtea-web) does that and works on my machine with an upstream junit 4.12 jar. A scratch build with this patch applied is able to run the unit tests: http://koji.fedoraproject.org/koji/taskinfo?taskID=8711128" I'm attaching his patch here. Form my point of view is ok to push. Both head and 1.5 Any other ideas? Omair, Thank you! J. [1] http://koji.fedoraproject.org/koji/taskinfo?taskID=8707158 the following runs have no appearance of AssumptionViolatedException. And above, with import of it, hae built. http://koji.fedoraproject.org/koji/taskinfo?taskID=8708483 http://koji.fedoraproject.org/koji/taskinfo?taskID=8707469 the failures are a bit random: Passed: net.sourceforge.jnlp.runtime.CodeBaseClassLoaderTest.testClassResourceLoadSuccessCachingApplet - This test is running remote content, note that failures may be caused by broken target application or connection Exception in thread "main" java.lang.NoClassDefFoundError: org/junit/internal/AssumptionViolatedException at org.junit.runners.ParentRunner.run(ParentRunner.java:363) at org.junit.runner.JUnitCore.run(JUnitCore.java:137) at org.junit.runner.JUnitCore.run(JUnitCore.java:115) at org.junit.runner.JUnitCore.run(JUnitCore.java:105) at org.junit.runner.JUnitCore.run(JUnitCore.java:94) at CommandLine.runMain(CommandLine.java:48) at CommandLine.runMainAndExit(CommandLine.java:28) at CommandLine.main(CommandLine.java:24) Makefile:1727: recipe for target 'stamps/run-netx-unit-tests.stamp' failed Passed: net.sourceforge.jnlp.JNLPMatcherTest.testApplicationCDATA - WARNING This test is known to fail, but have passed! Exception in thread "main" java.lang.NoClassDefFoundError: org/junit/internal/AssumptionViolatedException at org.junit.runners.ParentRunner.run(ParentRunner.java:363) at org.junit.runner.JUnitCore.run(JUnitCore.java:137) at org.junit.runner.JUnitCore.run(JUnitCore.java:115) at org.junit.runner.JUnitCore.run(JUnitCore.java:105) at org.junit.runner.JUnitCore.run(JUnitCore.java:94) at CommandLine.runMain(CommandLine.java:48) at CommandLine.runMainAndExit(CommandLine.java:28) at CommandLine.main(CommandLine.java:24) Makefile:1727: recipe for target 'stamps/run-netx-unit-tests.stamp' failed Passed: net.sourceforge.jnlp.security.policyeditor.PolicyFileModelTest.testSavePolicyFileWithFileNull Exception in thread "main" java.lang.NoClassDefFoundError: org/junit/internal/AssumptionViolatedException at org.junit.runners.ParentRunner.run(ParentRunner.java:363) at org.junit.runner.JUnitCore.run(JUnitCore.java:137) at org.junit.runner.JUnitCore.run(JUnitCore.java:115) at org.junit.runner.JUnitCore.run(JUnitCore.java:105) at org.junit.runner.JUnitCore.run(JUnitCore.java:94) at CommandLine.runMain(CommandLine.java:48) at CommandLine.runMainAndExit(CommandLine.java:28) at CommandLine.main(CommandLine.java:24) Makefile:1727: recipe for target 'stamps/run-netx-unit-tests.stamp' failed -------------- next part -------------- A non-text attachment was scrubbed... Name: use-hamcrest.patch Type: text/x-patch Size: 9133 bytes Desc: not available URL: From bugzilla-daemon at icedtea.classpath.org Mon Jan 26 11:19:14 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Jan 2015 11:19:14 +0000 Subject: [Bug 1298] LiveConnect - problem setting array elements (applet variables) from JS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 --- Comment #2 from Marcin Cie??lak --- Created attachment 1248 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1248&action=edit Bug 1298: Fix LiveConnect arrays Recognize Java arrays properly -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Jan 26 11:19:57 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Jan 2015 11:19:57 +0000 Subject: [Bug 1298] LiveConnect - problem setting array elements (applet variables) from JS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 Marcin Cie??lak changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Jan 26 13:51:44 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Jan 2015 13:51:44 +0000 Subject: [Bug 1298] LiveConnect - problem setting array elements (applet variables) from JS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 Jie Kang changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jkang at redhat.com --- Comment #3 from Jie Kang --- Hello Marcin, Thank you very much for looking into this! The reproducers we have for this are no longer failing with patch applied. This patch has a +1 from me and I will look into getting this into HEAD as soon as possible. Regards, -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jkang at redhat.com Mon Jan 26 15:17:17 2015 From: jkang at redhat.com (Jie Kang) Date: Mon, 26 Jan 2015 10:17:17 -0500 (EST) Subject: [rfc][icedtea-web] Fix accessing Java array elements from Javascript In-Reply-To: <1744941232.320313.1422280533276.JavaMail.zimbra@redhat.com> Message-ID: <1254781788.370065.1422285437294.JavaMail.zimbra@redhat.com> Hello, Marcin Cieslak has taken the time to create a fix for a long-standing problem in Icedtea-Web where attempting to set/get Java array elements from Javascript fails. [1] [1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 The reproducers relevant to this fix are: simple/JToJSString These reproducers tests on F21 with OpenJDK 7 and HEAD patched are now passing for me. These aren't in 1.5.x simple/JSToJSet These reproducers are still failing. On further investigation, the reproducer itself is not working correctly. A fix is needed here and work is in progress. I have created a simple reproducer that mimics AppletJSToJSet_intArrayElement_Test and it passes. This is attached as: itw-js-int-array-test-1.patch. This reproducer passes on both 1.5 and HEAD. I think a backport to 1.5.x would also be great. The two patches for HEAD and 1.5 are attached as: itw-js-array-HEAD-1.patch and itw-js-array-1.5-1.patch. Thoughts? Thank you again Marcin! Regards, -- Jie Kang OpenJDK Team - Software Engineering Intern -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-js-array-1.5-1.patch Type: text/x-patch Size: 1611 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-js-int-array-test-1.patch Type: text/x-patch Size: 10032 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-js-array-HEAD-1.patch Type: text/x-patch Size: 1871 bytes Desc: not available URL: From omajid at redhat.com Mon Jan 26 15:25:58 2015 From: omajid at redhat.com (Omair Majid) Date: Mon, 26 Jan 2015 10:25:58 -0500 Subject: [rfc][icedtea-web] dont expect junit have hamcrest included In-Reply-To: <54C620FF.3080407@redhat.com> References: <54C620FF.3080407@redhat.com> Message-ID: <20150126152557.GA2720@redhat.com> Hi, * Jiri Vanek [2015-01-26 06:12]: > The fix is to make sure that the hamcrest jar is available on the > classpath next to junit.jar too. The attached patch (for icedtea-web) > does that and works on my machine with an upstream junit 4.12 jar. A couple of thoughts: Upstream clearly states that you need to put junit.jar and hamcrest.jar in your classpath in one place [1] but only mentions junit.jar in another [2]. Some distributions somehow transitively include hamcrest.jar in the claspath of junit.jar (such as debian [3]) and some distributions include the hamcrest classes in junit.jar (such as current release of Fedora). And a third type include a junit.jar which needs hamcrest.jar on the user-provied classpath to work. Maybe we should add more extensive configure tests to detect and handle all these cases correctly? The current patch assumes that the hamcrest jar, if present, is both needed by and compatible with junit. Thanks, Omair [1] https://github.com/junit-team/junit/wiki/Download-and-Install#plain-old-jar [2] https://github.com/junit-team/junit/wiki/Getting-started [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527308 -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jkang at redhat.com Mon Jan 26 15:32:41 2015 From: jkang at redhat.com (Jie Kang) Date: Mon, 26 Jan 2015 10:32:41 -0500 (EST) Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <54C61F6B.3090504@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> <54BF7121.4070103@redhat.com> <54C61F6B.3090504@redhat.com> Message-ID: <1003662908.381675.1422286361716.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 01/21/2015 10:28 AM, Jiri Vanek wrote: > > On 01/06/2015 09:19 PM, Jacob Wisor wrote: > >> On 01/06/2015 at 01:25 PM Jacob Wisor wrote: > >>> On 01/05/2015 at 05:19 PM Jie Kang wrote: > >>>> Hello, > >>>> > >>>> This patch slightly modifies JNLPRuntime's online detection function to > >>>> always perform the check, even if it has been called before. > > > > As Jacob is mentioning, this really is causing performance overkill. > >>>> > >>>> Previously, if the boolean onlineDetected wasn't null, the check would > >>>> be > >>>> skipped. This caused a bug when downloading multiple resources. > > > > The idea of the check was, that first resource to be downloaded, is mostly > > the most crucial - jnlp, > > jnlpHref, mainclass, jar with main class... So this one have to be > > downlaoded - if it is not, then > > we can assume the network inaccessible. > >>>> > >>>> For each resource being downloaded, we perform the detection check. For > >>>> two > >>>> consecutive resources: If for the first resource, we detected offline, > >>>> the > >>>> boolean onlineDetected would be set to false. Then for the second > >>>> resource, > >>>> the detection check would be skipped, even if that resource was able to > >>>> be > >>>> connected to. This would result in the second resource being unable to > >>>> be > >>>> downloaded, even though it definitely could and should be. The patch > >>>> fixes > >>>> this. > > > > Do you have some example of this behavior causing any real issues? > > Maybe just sync the method or otherwise ensure that while isOnline is null, > > only one download can be > > done? > > > >>>> > >>>> Thoughts? > >>> > >>> Although I did not test it, seems to be working as advertised. > >>> > >>> While looking at the code, I was wondering why JNLPRuntime.onlineDetected > >>> was > >>> a Boolean object instead of a primitive. And, apart from that, the whole > >>> offline detection mechanism seems overly complex and unreliable to me. > >>> I am also not really convinced that > >>> > >>> public static void detectOnline(URL location) { > >>> if (onlineDetected != null) { > >>> return; > >>> } > >>> try { > >>> if (location.getProtocol().equals("file")) { > >>> return; > >>> } > >>> //Checks the offline/online status of the system. > >>> InetAddress.getByName(location.getHost()); > >>> } catch (UnknownHostException ue) { [?] > >>> > >>> is the best or most reliable way in J2SE to test for the online/offline > >>> status > >>> of a system. Do systems having no DNS server configured or which is > >>> unreachable > >>> properly resolve their name? And, even if they do, does this really > >>> actually > >>> prove them being online? > >>> > >>> Now, I was considering a few different options to reliably detecting a > >>> system's > >>> online/offline status. Initially, I was thinking about pinging the > >>> default > >>> gateway. However, hosts with public IPs may have their public IP as the > >>> default > >>> gateway configured. So, the most reliable way I came up with is to send > >>> an echo > >>> broadcast (on the local subnet) request. Of course, this does not prove > >>> the > >>> system being connected to the /public/ internet. But this is not > >>> neccessary > >>> either because JNLP applications may be (which they often are) served on > >>> an > >>> intranet only. So, would you mind investigating this further? > > > > Before doing this looks-really-stupid > > InetAddress.getByName(location.getHost()); i was elaborating > > on this, and have nnot found a generic way how to veryfi online status from > > java. > >> > >> Oh, I forgot: I am sure we do not want to make a DNS request for every > >> resource > >> we need to download, even when subsequent DNS resolution requests are > >> pulled > > > > yah, to much correct. > >> from the local DNS cache. So, although this patch fixes the bug, it is > >> very > >> inefficient and impractical because it induces an avoidable performance > >> penalty. > >> In other words, the online detection *logic* itself needs to be fixed. > >> > >> @Jie Kang: > >> Thank you for spotting this bug. > >> > > > > Is it really an bug? It actually eliminates the benefits of offline > > environment. > > > > >>> consecutive resources: If for the first resource, we detected offline, > > >>> the > > >>> boolean onlineDetected would be set to false. Then for the second > > >>> resource, > > >>> the detection check would be skipped, even if that resource was able > > >>> to be > > >>> connected to. This would result in the second resource being unable to > > >>> be > > >>> downloaded, even though it definitely could and should be. The patch > > >>> fixes > > >>> this. > > > > Thinking about it - how it is possible that first resource could not be > > downloaded, but second can > > be, and how it is possible that first one can be missed, while second one > > not? > > > > > > Maybe before deciding that environment i onnline/offline - we may try to > > download two or three > > resources? > > > > > > > > One more thing crossed my mind - if the check is done everytime ressource is > download. > > Then the output of isOnline() method is actually prety undetermined. > > > ? Hello, > > Thinking about it - how it is possible that first resource could not be > > downloaded, but second can > > be, and how it is possible that first one can be missed, while second one > > not? > > This can occur in edge incidents such as: Resource 1 : Can't download, but it is in cache so we use the cache one. Resource 2 : Not in cache, but we can download, so we download it into cache. Applet now works. However, with the online detection as it is, the edge cases such as above will fail. > > Is it really an bug? It actually eliminates the benefits of offline > > environment. In terms of the offline environment, this should really only be controlled by the isOfflineForced setting rather than the isOnline setting. For any resource located off-site, the only way you know if that resource is accessible or not is by attempting to access it. The idea of an 'online' state is flawed in this regard. The idea of an 'offline' state is fine though. If the user sets it to offline, the rules are simple, we don't make any connection attempts. Otherwise, we should always be attempting to access them. The more I think about this, I feel like we shouldn't be using isOnline() to check when trying to download a resource. We should just try to download it unless offlineIsForced. If it fails to download, the code already deals with it as safely as possible. The online check beforehand isn't really beneficial here. Regards, > > > J. > -- Jie Kang OpenJDK Team - Software Engineering Intern From bugzilla-daemon at icedtea.classpath.org Mon Jan 26 15:37:54 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Jan 2015 15:37:54 +0000 Subject: [Bug 2188] segfault while running "make check-jdk" after compiling with GCJ 4.8.4 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2188 --- Comment #2 from bugs at elephly.net --- The problem still exists with IcedTea6 1.13.6. ~~~~~~~~~~~~ ... Passed: javax/crypto/spec/IvParameterSpec/NullIV.java Passed: javax/crypto/spec/RC2ParameterSpec/RC2AlgorithmParameters.java Passed: javax/crypto/spec/RC2ParameterSpec/RC2ParameterSpecEquals.java Passed: javax/crypto/spec/RC5ParameterSpec/InvalidIV.java Passed: javax/crypto/spec/RC5ParameterSpec/RC5ParameterSpecEquals.java # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007f59c3fcc1a1, pid=21582, tid=140021767509760 # # JRE version: 6.0_34-b34 # Java VM: OpenJDK 64-Bit Server VM (23.25-b01 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea6 1.13.6 # Distribution: guix # Problematic frame: # C [ld-linux-x86-64.so.2+0x141a1] _dl_close+0x1 # # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again # # An error report file with more information is saved as: # /buildtmp/nix-build-icedtea6-1.13.6.drv-0/icedtea6-1.13.6/test/jdk/JTwork/scratch/hs_err_pid21582.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # test -z `grep \"^Error:\|^FAILED:\" test/check-jdk.log` ... ~~~~~~~~~~~~~~~~~~~~~ -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From saper at saper.info Mon Jan 26 17:05:39 2015 From: saper at saper.info (Marcin Cieslak) Date: Mon, 26 Jan 2015 17:05:39 +0000 (UTC) Subject: [rfc][icedtea-web] Fix accessing Java array elements from Javascript References: <1744941232.320313.1422280533276.JavaMail.zimbra@redhat.com> <1254781788.370065.1422285437294.JavaMail.zimbra@redhat.com> Message-ID: >> Jie Kang wrote: > Marcin Cieslak has taken the time to create a fix for a long-standing > problem in Icedtea-Web where attempting to set/get Java array elements > from Javascript fails. [1] > > [1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 > > Thank you again Marcin! No problem :) One website where I use smartcard authentication switched its JavaScript code from: loginCardSignForm.serialNo.value = applet.serialNo(); loginCardSignForm.keyNumber.value = applet.keyNo(); loginCardSignForm.keyVersion.value = applet.keyVer(); to: loginCardSignForm.serialNo.value = applet.serialNo(); var cardValues = applet.getCardValues(); loginCardSignForm.keyNumber.value = cardValues[0]; loginCardSignForm.keyVersion.value = cardValues[1]; and, while "serialNo" was correct, the rest was sent as "undefined". We might have some duplicate bugs in bugzilla I think //Marcin From bugzilla-daemon at icedtea.classpath.org Mon Jan 26 18:30:17 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Jan 2015 18:30:17 +0000 Subject: [Bug 1794] LiveConnect - Problem with String arrays between Java and Javascript In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1794 Jie Kang changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |DUPLICATE --- Comment #4 from Jie Kang --- Marked as duplicate of PR1298. Patch has been posted to mailing list for review. *** This bug has been marked as a duplicate of bug 1298 *** -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Jan 26 18:30:17 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 26 Jan 2015 18:30:17 +0000 Subject: [Bug 1298] LiveConnect - problem setting array elements (applet variables) from JS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 Jie Kang changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ldracz at redhat.com --- Comment #4 from Jie Kang --- *** Bug 1794 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Mon Jan 26 20:29:09 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 26 Jan 2015 20:29:09 +0000 Subject: /hg/icedtea6-hg: 12 new changesets Message-ID: changeset be55ad609ddc in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=be55ad609ddc author: Andrew John Hughes date: Tue Jan 20 05:14:21 2015 +0000 PR1831: Drop version requirement for LCMS 2 2014-06-10 Andrew John Hughes PR1831: Drop version requirement for LCMS 2 * INSTALL: Document lcms2 requirement. * NEWS: Updated. * acinclude.m4: (IT_CHECK_FOR_LCMS): Drop 2.5 requirement. changeset 92941f2c41f4 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=92941f2c41f4 author: Andrew John Hughes date: Tue Jan 20 05:24:23 2015 +0000 PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library 2014-06-10 Andrew John Hughes PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library * Makefile.am: (ICEDTEA_PATCHES): Add new patch when PKCS11+NSS or SunEC+NSS are enabled, so that the NSS set of curves are announced via SSL. * NEWS: Updated. * patches/rh1022017.patch: Reduce number of curves announced over SSL to just those supported by NSS. changeset 2506d10f6b3a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2506d10f6b3a author: Andrew John Hughes date: Tue Jan 20 05:29:10 2015 +0000 PR2062: Unset OS before running OpenJDK build 2015-01-06 Andrew John Hughes PR2062: Unset OS before running OpenJDK build * Makefile.am: (ICEDTEA_UNSET): Introduce variable to store unsetting of environment variables. (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and JDK_HOME to ICEDTEA_UNSET. (icedtea): Unset variables prior to running $(MAKE). (icedtea-debug): Likewise. (icedtea-ecj): Likewise. * NEWS: Updated. changeset b34e892816ca in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b34e892816ca author: Andrew John Hughes date: Tue Jan 20 05:40:11 2015 +0000 PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS 2014-12-05 Andrew John Hughes PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS * fsg.sh: Moved to... * Makefile.am: (EXTRA_DIST): Remove fsg.sh, now generated by configure. (extract-openjdk): Fix path to new generated fsg.sh and mark as executable * NEWS: Updated. * configure.ac: Add fsg.sh to AC_CONFIG_FILES. * fsg.sh.in: ... here and added application of PR2125 patch. * patches/pr2125.patch: Patch to remove curves unsupported by NSS. changeset 8c50620ad9c0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8c50620ad9c0 author: Andrew John Hughes date: Thu Jan 22 00:38:48 2015 +0000 Merge with icedtea6-hg for b34 update. changeset 521041824919 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=521041824919 author: Andrew John Hughes date: Tue Jan 20 06:41:59 2015 +0000 Update to b34 tarball. 2015-01-19 Andrew John Hughes * Makefile.am: (OPENJDK_DATE): Bump to security update release date; 20th of January, 2015. (OPENJDK_SHA256SUM): Update for b34 tarball. changeset d3fe84ca89da in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d3fe84ca89da author: Andrew John Hughes date: Tue Jan 20 08:21:36 2015 +0000 Update tarball to include x86 build fix and backport workaround for Zero from IcedTea 2.x. PR2179: Avoid x86 workaround when running Zero rather than a JIT Upstream changes: - OJ49: Fix placement of 8023956 fix. 2015-01-19 Andrew John Hughes * Makefile.am: (OPENJDK_SHA256SUM): Update for new b34 tarball. (ICEDTEA_PATCHES): Add fix for PR2179. * NEWS: Updated. * patches/pr2179-avoid_x86_workaround_on_zero.patch: Don't apply 8023956 when building Zero on x86. changeset 49e393ce37c9 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=49e393ce37c9 author: Andrew John Hughes date: Tue Jan 20 09:11:26 2015 +0000 Fix another build failure on x86. Upstream changes: - OJ50: Fix reference to missing pd_attempt_reserve_memory_at 2015-01-19 Andrew John Hughes * Makefile.am: (OPENJDK_SHA256SUM): Update for new b34 tarball. * NEWS: Updated. changeset b4b5ba7ebaeb in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b4b5ba7ebaeb author: Andrew John Hughes date: Tue Jan 20 11:35:12 2015 +0000 PR2180: Old autotools dislike $(builddir)/fsg.sh 2015-01-19 Andrew John Hughes * Makefile.am: (extract-openjdk): Use abs_top_builddir instead of builddir to please older versions of autotools. No need to set fsg.sh executable either as we run it via sh. * NEWS: Updated. changeset 00ac747c97a2 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=00ac747c97a2 author: Andrew John Hughes date: Wed Jan 21 18:48:53 2015 +0000 PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 2014-10-29 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patch for CACAO builds. * NEWS: Updated. * patches/cacao/pr2184.patch: Implement JVM_FindClassFromCaller as same as JVM_FindClassFromClassLoader for now. changeset 6f0c7f0ded92 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6f0c7f0ded92 author: Andrew John Hughes date: Thu Jan 22 00:48:41 2015 +0000 Fix issues found with b34. OJ51, PR2187: Sync patch for 4873188 with 7 version OJ52, PR2185: Application of 6786276 introduces compatibility issue OJ53, PR2181: strict-aliasing warnings issued on PPC32 OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine 2015-01-21 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patches below. * NEWS: Updated. * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, * patches/openjdk/oj51-pr2187-sync_4873188.patch, * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: New patches to fix issues found in b34. changeset 51379b337a8e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=51379b337a8e author: Andrew John Hughes date: Sun Jan 25 20:35:44 2015 +0000 Bump to next release, b35. 2015-01-25 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Bump to next release, b35. diffstat: ChangeLog | 211 + INSTALL | 1 + Makefile.am | 81 +- NEWS | 173 +- acinclude.m4 | 50 +- configure.ac | 5 +- fsg.sh | 91 - fsg.sh.in | 94 + patches/cacao/pr2184.patch | 75 + patches/clean-crypto.patch | 1099 -- patches/ecj/pr64174.patch | 21 + patches/hotspot/hs23/remove_jsr292_tests.patch | 35 +- patches/hotspot/hs23/type_fixes.patch | 96 +- patches/openjdk/4963723-implement_sha-224.patch | 289 +- patches/openjdk/6541350-tz_display_names_l10n.patch | 300 - patches/openjdk/6706974-krb5_test_infrastructure.patch | 2090 ----- patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch | 55 + patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch | 94 - patches/openjdk/6821191-tz_display_names_l10n.patch | 125 - patches/openjdk/6925851-pt_br.patch | 3651 --------- patches/openjdk/6977550-tzdata2010l.patch | 1208 --- patches/openjdk/6996686-tzdata2010o.patch | 93 - patches/openjdk/7017800-tzdata2011b.patch | 265 - patches/openjdk/7027387-tzdata2011d.patch | 522 - patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch | 522 + patches/openjdk/7033174-tzdata2011e.patch | 117 - patches/openjdk/7035073-missing_pt_br_timezones.patch | 1644 ---- patches/openjdk/7039469-tzdata2011g.patch | 116 - patches/openjdk/7044060-support_nsa_suite_b.patch | 125 +- patches/openjdk/7090843-tzdata2011j.patch | 1281 --- patches/openjdk/7103108-tzdata2011l.patch | 1660 ---- patches/openjdk/7103405-correct_display_names.patch | 130 - patches/openjdk/7104126-headers_tzdata.patch | 530 - patches/openjdk/7106773-512_bits_rsa.patch | 2 +- patches/openjdk/7122142-annotation_race_condition.patch | 1955 ---- patches/openjdk/7158483-tzdata2012c.patch | 1482 --- patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch | 40 - patches/openjdk/7198570-tzdata2012f.patch | 841 -- patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch | 29 + patches/openjdk/8000897-use_corresponding_digest_length.patch | 29 - patches/openjdk/8002225-tzdata2012i.patch | 261 - patches/openjdk/8006935-long_keys_in_hmac_prf.patch | 2 +- patches/openjdk/8009987-tzdata2013b.patch | 2275 ----- patches/openjdk/8014469-tzdata2013c.patch | 276 - patches/openjdk/8020054-tzdata2013d.patch | 314 - patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch | 80 + patches/openjdk/8025255-tzdata2013g.patch | 3976 ---------- patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch | 106 + patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch | 36 + patches/openjdk/oj51-pr2187-sync_4873188.patch | 58 + patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch | 73 + patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch | 25 + patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch | 15 + patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch | 7 - patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch | 2 +- patches/pr2070-type_punning_warnings.patch | 36 + patches/pr2082-s390_type_fixes.patch | 20 + patches/pr2096-4096-bit_dh.patch | 120 + patches/pr2125.patch | 486 + patches/pr2179-avoid_x86_workaround_on_zero.patch | 33 + patches/rh1022017.patch | 44 + 61 files changed, 2654 insertions(+), 26818 deletions(-) diffs (truncated from 30790 to 500 lines): diff -r 199332d3ed53 -r 51379b337a8e ChangeLog --- a/ChangeLog Wed Nov 12 23:58:13 2014 +0000 +++ b/ChangeLog Sun Jan 25 20:35:44 2015 +0000 @@ -1,3 +1,209 @@ +2015-01-25 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b35. + +2015-01-21 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add patches below. + * NEWS: Updated. + * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch, + * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch, + * patches/openjdk/oj51-pr2187-sync_4873188.patch, + * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch, + * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch, + * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch: + New patches to fix issues found in b34. + +2014-10-29 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch for CACAO + builds. + * NEWS: Updated. + * patches/cacao/pr2184.patch: + Implement JVM_FindClassFromCaller as same + as JVM_FindClassFromClassLoader for now. + +2015-01-19 Andrew John Hughes + + * Makefile.am: + (extract-openjdk): Use abs_top_builddir + instead of builddir to please older + versions of autotools. No need to set + fsg.sh executable either as we run it + via sh. + * NEWS: Updated. + +2015-01-19 Andrew John Hughes + + * Makefile.am: + (OPENJDK_SHA256SUM): Update for new b34 tarball. + * NEWS: Updated. + +2015-01-19 Andrew John Hughes + + * Makefile.am: + (OPENJDK_SHA256SUM): Update for new b34 tarball. + (ICEDTEA_PATCHES): Add fix for PR2179. + * NEWS: Updated. + * patches/pr2179-avoid_x86_workaround_on_zero.patch: + Don't apply 8023956 when building Zero on x86. + +2015-01-19 Andrew John Hughes + + * Makefile.am: + (OPENJDK_DATE): Bump to security update release date; + 20th of January, 2015. + (OPENJDK_SHA256SUM): Update for b34 tarball. + +2015-01-19 Andrew John Hughes + + * patches/openjdk/8000897-use_corresponding_digest_length.patch: + Moved to... + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated. + * patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch: + ...here. + * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch, + * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch, + * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch, + * patches/pr2070-type_punning_warnings.patch, + * patches/pr2082-s390_type_fixes.patch, + * patches/pr2096-4096-bit_dh.patch: + New backports from IcedTea 2.x. + +2015-01-19 Andrew John Hughes + + * patches/openjdk/6541350-tz_display_names_l10n.patch, + * patches/openjdk/6706974-krb5_test_infrastructure.patch, + * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch, + * patches/openjdk/6821191-tz_display_names_l10n.patch, + * patches/openjdk/6925851-pt_br.patch, + * patches/openjdk/6977550-tzdata2010l.patch, + * patches/openjdk/6996686-tzdata2010o.patch, + * patches/openjdk/7017800-tzdata2011b.patch, + * patches/openjdk/7027387-tzdata2011d.patch, + * patches/openjdk/7033174-tzdata2011e.patch, + * patches/openjdk/7035073-missing_pt_br_timezones.patch, + * patches/openjdk/7039469-tzdata2011g.patch, + * patches/openjdk/7090843-tzdata2011j.patch, + * patches/openjdk/7103108-tzdata2011l.patch, + * patches/openjdk/7103405-correct_display_names.patch, + * patches/openjdk/7104126-headers_tzdata.patch, + * patches/openjdk/7158483-tzdata2012c.patch, + * patches/openjdk/7198570-tzdata2012f.patch, + * patches/openjdk/8002225-tzdata2012i.patch, + * patches/openjdk/8009987-tzdata2013b.patch, + * patches/openjdk/8014469-tzdata2013c.patch, + * patches/openjdk/8020054-tzdata2013d.patch, + * patches/openjdk/8025255-tzdata2013g.patch: + Remove patches included upstream. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + * NEWS: Updated. + * patches/hotspot/hs23/remove_jsr292_tests.patch: + Regenerated. + * patches/hotspot/hs23/type_fixes.patch: + Remove threadLocalAllocBuffer.cpp hunk which is + no longer applicable. + +2015-01-19 Andrew John Hughes + + * patches/clean-crypto.patch: Removed; replaced by + inclusion of UNLIMITED_CRYPTO=true solution upstream. + * patches/openjdk/7122142-annotation_race_condition.patch, + * patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch: + Remove patches included upstream. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + (ICEDTEA_ENV): Set UNLIMITED_CRYPTO=true. + * NEWS: Updated. + * patches/openjdk/4963723-implement_sha-224.patch: + Regenerated following backport of 6647452 upstream. + * patches/openjdk/7044060-support_nsa_suite_b.patch: + Likewise. + * patches/openjdk/7106773-512_bits_rsa.patch: Likewise. + * patches/openjdk/8006935-long_keys_in_hmac_prf.patch: Likewise. + * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch: + Likewise. + * patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch: + Likewise. + +2015-01-05 Andrew John Hughes + + * patches/ecj/pr64174.patch: Drop the Lithuanian + changeover date now, as it's in the past. + +2014-12-04 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_ECJ_PATCHES): Add workaround for bug + in parsing end-of-year dates (Classpath PR64174). + * acinclude.m4: + (IT_PR64174_CHECK): Detect if the boot JDK suffers + from PR64174 and apply the patch if so. + * configure.ac: Call IT_PR64174_CHECK. + * patches/ecj/pr64174.patch: Drop the Latvian + Euro changeover date, which is in the past anyway, + and move Lithuania's two hours forward so it enters + 2015 and avoids the bug. + +2014-12-05 Andrew John Hughes + + PR2125: Synchronise elliptic curves in + sun.security.ec.NamedCurve with those listed by NSS + * fsg.sh: Moved to... + * Makefile.am: + (EXTRA_DIST): Remove fsg.sh, now generated + by configure. + (extract-openjdk): Fix path to new generated + fsg.sh and mark as executable + * NEWS: Updated. + * configure.ac: Add fsg.sh to AC_CONFIG_FILES. + * fsg.sh.in: ... here and added application + of PR2125 patch. + * patches/pr2125.patch: Patch to remove curves + unsupported by NSS. + +2015-01-06 Andrew John Hughes + + PR2062: Unset OS before running OpenJDK build + * Makefile.am: + (ICEDTEA_UNSET): Introduce variable to + store unsetting of environment variables. + (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and + JDK_HOME to ICEDTEA_UNSET. + (icedtea): Unset variables prior to running + $(MAKE). + (icedtea-debug): Likewise. + (icedtea-ecj): Likewise. + * NEWS: Updated. + +2014-06-10 Andrew John Hughes + + PR1832, RH1022017: Report elliptic curves + supported by NSS, not the SunEC library + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch when + PKCS11+NSS is enabled, so + that the NSS set of curves are announced + via SSL. + * NEWS: Updated. + * patches/rh1022017.patch: + Reduce number of curves announced over SSL + to just those supported by NSS. + +2014-06-10 Andrew John Hughes + + PR1831: Drop version requirement for LCMS 2 + * INSTALL: Document lcms2 requirement. + * NEWS: Updated. + * acinclude.m4: + (IT_CHECK_FOR_LCMS): Drop 2.5 requirement. + 2014-11-12 Andrew John Hughes * Makefile.am: @@ -6,6 +212,11 @@ * patches/pr2083-aarch64_zero.patch: Add HotSpot support for building Zero on AArch64. +2014-10-24 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b34. + 2014-10-23 Andrew John Hughes * Makefile.am: diff -r 199332d3ed53 -r 51379b337a8e INSTALL --- a/INSTALL Wed Nov 12 23:58:13 2014 +0000 +++ b/INSTALL Sun Jan 25 20:35:44 2015 +0000 @@ -36,6 +36,7 @@ pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java) LLVM 2.5 or later (for --enable-shark) systemtap-sdl-devel >= 0.9.5 (for --enable-systemtap, Java method tracing requires systemtap >= 0.9.9) +lcms2-devel (for --enable-lcms2 and --enable-system-lcms) See ./configure --help if you need to override the defaults. diff -r 199332d3ed53 -r 51379b337a8e Makefile.am --- a/Makefile.am Wed Nov 12 23:58:13 2014 +0000 +++ b/Makefile.am Sun Jan 25 20:35:44 2015 +0000 @@ -1,8 +1,8 @@ # Dependencies -OPENJDK_DATE = 14_oct_2014 -OPENJDK_SHA256SUM = cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293 -OPENJDK_VERSION = b33 +OPENJDK_DATE = 20_jan_2015 +OPENJDK_SHA256SUM = 13d1b4e1e152b6f9ad81b5558d6c7c0d3315a9e9494e49e515229722e2ee4e51 +OPENJDK_VERSION = b35 OPENJDK_URL = https://java.net/downloads/openjdk6/ CACAO_VERSION = 68fe50ac34ec @@ -345,7 +345,6 @@ patches/nomotif-mtoolkit.patch \ patches/alt-jar.patch \ patches/jdk-use-ssize_t.patch \ - patches/clean-crypto.patch \ patches/arch.patch \ patches/lc_ctype.patch \ patches/xjc.patch \ @@ -454,9 +453,7 @@ patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ - patches/openjdk/6706974-krb5_test_infrastructure.patch \ patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \ - patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \ patches/ScriptEngineManager-doc.patch \ patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \ patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch \ @@ -507,24 +504,6 @@ patches/openjdk/8014427-raster_regression.patch \ patches/openjdk/8014676-javadebugger_space_in_paths.patch \ patches/openjdk/8014968-OCSP_timeout_default.patch \ - patches/openjdk/6541350-tz_display_names_l10n.patch \ - patches/openjdk/6821191-tz_display_names_l10n.patch \ - patches/openjdk/6925851-pt_br.patch \ - patches/openjdk/6977550-tzdata2010l.patch \ - patches/openjdk/6996686-tzdata2010o.patch \ - patches/openjdk/7017800-tzdata2011b.patch \ - patches/openjdk/7027387-tzdata2011d.patch \ - patches/openjdk/7033174-tzdata2011e.patch \ - patches/openjdk/7035073-missing_pt_br_timezones.patch \ - patches/openjdk/7039469-tzdata2011g.patch \ - patches/openjdk/7090843-tzdata2011j.patch \ - patches/openjdk/7103108-tzdata2011l.patch \ - patches/openjdk/7104126-headers_tzdata.patch \ - patches/openjdk/7103405-correct_display_names.patch \ - patches/openjdk/7158483-tzdata2012c.patch \ - patches/openjdk/7198570-tzdata2012f.patch \ - patches/openjdk/8002225-tzdata2012i.patch \ - patches/openjdk/8009987-tzdata2013b.patch \ patches/openjdk/6636370-appcontext_simplification.patch \ patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \ patches/sparc-ptracefix.patch \ @@ -545,8 +524,6 @@ patches/print_lsb_release.patch \ patches/alternative_krb5_cache.patch \ patches/alternative_krb5_cache_fixup.patch \ - patches/openjdk/8014469-tzdata2013c.patch \ - patches/openjdk/8020054-tzdata2013d.patch \ patches/imageiojpeg_sync.patch \ patches/openjdk/8005194-scale_memory_leak.patch \ patches/openjdk/6563752-ss12_support.patch \ @@ -600,7 +577,6 @@ patches/hotspot/hs23/arm-hsdis.patch \ patches/openjdk/7025066-embedded_build.patch \ patches/s390_casts.patch \ - patches/openjdk/8025255-tzdata2013g.patch \ patches/d729448-32_bit_alignment.patch \ patches/windows-awt.patch \ patches/windows-jdk-sizecalc.patch \ @@ -625,10 +601,21 @@ patches/openjdk/7106773-512_bits_rsa.patch \ patches/pr1904-icedtea_and_distro_versioning.patch \ patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch \ - patches/openjdk/7122142-annotation_race_condition.patch \ - patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch \ - patches/openjdk/8000897-use_corresponding_digest_length.patch \ - patches/pr2083-aarch64_zero.patch + patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch \ + patches/pr2083-aarch64_zero.patch \ + patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch \ + patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch \ + patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch \ + patches/pr2070-type_punning_warnings.patch \ + patches/pr2082-s390_type_fixes.patch \ + patches/pr2096-4096-bit_dh.patch \ + patches/pr2179-avoid_x86_workaround_on_zero.patch \ + patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch \ + patches/openjdk/oj51-pr2187-sync_4873188.patch \ + patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch \ + patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch \ + patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch \ + patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -640,7 +627,8 @@ patches/cacao/launcher.patch \ patches/cacao/memory.patch \ patches/cacao/hotspot/original/memory.patch \ - patches/cacao/armhf.patch + patches/cacao/armhf.patch \ + patches/cacao/pr2184.patch else if USING_CACAO ICEDTEA_PATCHES += \ @@ -667,6 +655,7 @@ endif if ENABLE_NSS +ICEDTEA_PATCHES += patches/rh1022017.patch NSS_PATCHES = patches/nss-config.patch else NSS_PATCHES = patches/nss-not-enabled-config.patch @@ -748,6 +737,12 @@ ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch endif +# If date parsing bug is present, drop Lithuania and Latvia EUR transition +# dates as they are already in the past anyway. +if CP64174 +ICEDTEA_ECJ_PATCHES += patches/ecj/pr64174.patch +endif + ICEDTEA_ECJ_PATCHES += $(DISTRIBUTION_ECJ_PATCHES) # OpenJDK build environment. @@ -779,6 +774,12 @@ WERROR_STATUS=false endif +ICEDTEA_UNSET = \ + JAVAC= \ + JAVA_HOME= \ + JDK_HOME= \ + OS= + ICEDTEA_ENV = \ ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \ ANT="$(ANT)" \ @@ -809,9 +810,6 @@ FT2_LIB="$(FREETYPE2_LIBS)" \ ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ - JAVAC="" \ - JAVA_HOME="" \ - JDK_HOME="" \ ANT_RESPECT_JAVA_HOME="TRUE" \ DISTRIBUTION_ID="$(DIST_ID)" \ DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ @@ -822,7 +820,8 @@ STATIC_CXX="false" \ BUILD_GCC=gcc$(GCC_SUFFIX) \ BUILD_CXX=g++$(GCC_SUFFIX) \ - COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" + COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \ + UNLIMITED_CRYPTO="true" if ENABLE_CACAO ICEDTEA_ENV += \ @@ -942,7 +941,7 @@ contrib arm_port \ overlays \ jconsole.desktop policytool.desktop \ - $(JTREG_SRCS) HACKING pulseaudio fsg.sh \ + $(JTREG_SRCS) HACKING pulseaudio \ hotspot.map \ autogen.sh \ tapset/hotspot.stp.in \ @@ -1227,7 +1226,7 @@ mkdir openjdk ; \ $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \ chmod -R ug+w openjdk ; \ - sh $(abs_top_srcdir)/fsg.sh ; \ + sh $(abs_top_builddir)/fsg.sh ; \ fi endif endif @@ -1665,7 +1664,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ stamps/jamvm.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV) \ -C openjdk \ $(ICEDTEA_BUILD_TARGET) @@ -1696,7 +1695,7 @@ stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ stamps/jamvm.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV) \ -C openjdk \ $(ICEDTEA_DEBUG_BUILD_TARGET) @@ -2080,7 +2079,7 @@ stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ $(OPENJDK_ECJ_TREE) stamps/jamvm.stamp stamps/cacao.stamp \ stamps/rewrite-rhino.stamp - $(ARCH_PREFIX) $(MAKE) -j1 \ + $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV_ECJ) \ -C openjdk-ecj/ \ $(ICEDTEA_BUILD_TARGET) diff -r 199332d3ed53 -r 51379b337a8e NEWS --- a/NEWS Wed Nov 12 23:58:13 2014 +0000 +++ b/NEWS Sun Jan 25 20:35:44 2015 +0000 @@ -14,21 +14,188 @@ New in release 1.14.0 (201X-XX-XX): +* Security fixes + - S8046656: Update protocol support + - S8047125, CVE-2015-0395: (ref) More phantom object references + - S8047130: Fewer escapes from escape analysis + - S8048035, CVE-2015-0400: Ensure proper proxy protocols + - S8049253: Better GC validation + - S8050807, CVE-2015-0383: Better performing performance data handling + - S8054367, CVE-2015-0412: More references for endpoints + - S8055304, CVE-2015-0407: More boxing for DirectoryComboBoxModel + - S8055309, CVE-2015-0408: RMI needs better transportation considerations + - S8055479: TLAB stability + - S8055489, CVE-2014-6585: Better substitution formats + - S8056264, CVE-2014-6587: Multicast support improvements + - S8056276, CVE-2014-6591: Fontmanager feature improvements + - S8057555, CVE-2014-6593: Less cryptic cipher suite management + - S8058982, CVE-2014-6601: Better verification of an exceptional invokespecial + - S8059485, CVE-2015-0410: Resolve parsing ambiguity + - S8061210, CVE-2014-3566: Issues in TLS +* Import of OpenJDK6 b34 + - OJ43: Backport JAX_WS-945; Socket backlog may be limiting lwhs performance + - OJ44: Add missing TimeZone test cases included in OpenJDK 7 revision 0. + - OJ45: Fix copyright headers on imported files + - OJ46: Fix lost Classpath exception + - OJ47: Remove @Override annotation on interfaces added by 2015/01/20 security fixes. + - OJ48: Fix substitution error. + - OJ49: Fix placement of 8023956 fix. + - OJ50: Fix reference to missing pd_attempt_reserve_memory_at + - S4873188: Support TLS 1.1 + - S6364329: jstat displays "invalid argument count" with usage + - S6461635: [TESTBUG] BasicTests.sh test fails intermittently + - S6507067: TimeZone country/area message error + - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec + - S6578647: Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication() + - S6585666: Spanish language names not compliant with CLDR + - S6587676: Krb5LoginModule failure if useTicketCache=true on Vista + - S6608572: Currency change for Malta and Cyprus + - S6610748: Dateformat - AM-PM indicator in Finnish appears to be from English + - S6627549: ISO 3166 code addition: Saint Barthelemy and Saint Martin + - S6631048: Problem when writing on output stream of HttpURLConnection + - S6641309: Wrong Cookie separator used in HttpURLConnection + - S6641312: Fix krb5 codes indentation problems + - S6645271: Wrong date format for Croatian (hr) locale + - S6646611: Incorrect spelling of month name in locale for Belarusian language ("be", "BY") + - S6647452: Remove obfuscation, framework and provider self-verification checking + - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems + - S6659779: HttpURLConnections logger should log tunnel requests + - S6670362: HTTP/SPNEGO should work across realms From andrew at icedtea.classpath.org Tue Jan 27 02:19:07 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 27 Jan 2015 02:19:07 +0000 Subject: /hg/release/icedtea6-1.13: 2 new changesets Message-ID: changeset 4746800b8508 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=4746800b8508 author: Andrew John Hughes date: Mon Jan 26 20:33:46 2015 +0000 Correct NEWS; CACAO & JamVM were broken by 1.13.5, not 1.13.6. 2015-01-26 Andrew John Hughes * NEWS: Correct NEWS; CACAO & JamVM were broken by 1.13.5, not 1.13.6. changeset c2b52092a6a7 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=c2b52092a6a7 author: Andrew John Hughes date: Tue Jan 27 02:18:51 2015 +0000 Start 1.13.7 release cycle. 2015-01-27 Andrew John Hughes * NEWS: Add 1.13.7 section. * configure.ac: Bump to 1.13.7pre. diffstat: ChangeLog | 10 ++++++++++ NEWS | 6 ++++-- configure.ac | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diffs (50 lines): diff -r a2adf13bc1ec -r c2b52092a6a7 ChangeLog --- a/ChangeLog Sat Jan 24 02:08:02 2015 +0000 +++ b/ChangeLog Tue Jan 27 02:18:51 2015 +0000 @@ -1,3 +1,13 @@ +2015-01-27 Andrew John Hughes + + * NEWS: Add 1.13.7 section. + * configure.ac: Bump to 1.13.7pre. + +2015-01-26 Andrew John Hughes + + * NEWS: Correct NEWS; CACAO & JamVM + were broken by 1.13.5, not 1.13.6. + 2015-01-23 Andrew John Hughes * NEWS: Update release date and fix diff -r a2adf13bc1ec -r c2b52092a6a7 NEWS --- a/NEWS Sat Jan 24 02:08:02 2015 +0000 +++ b/NEWS Tue Jan 27 02:18:51 2015 +0000 @@ -12,6 +12,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 1.13.7 (2015-04-XX): + New in release 1.13.6 (2015-01-23): * Security fixes @@ -186,9 +188,9 @@ - PR2179: Avoid x86 workaround when running Zero rather than a JIT - PR2180: Old autotools dislike $(builddir)/fsg.sh * CACAO - - PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 1.13.6 + - PR2184: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5 * JamVM - - PR2190: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.6 + - PR2190: JamVM lacks JVM_FindClassFromCaller introduced by security patch in 1.13.5 New in release 1.13.5 (2014-10-14): diff -r a2adf13bc1ec -r c2b52092a6a7 configure.ac --- a/configure.ac Sat Jan 24 02:08:02 2015 +0000 +++ b/configure.ac Tue Jan 27 02:18:51 2015 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.13.6],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.13.7pre],[distro-pkg-dev at openjdk.java.net]) AC_CANONICAL_HOST AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) From fridrich.strba at suse.com Tue Jan 27 07:08:27 2015 From: fridrich.strba at suse.com (Fridrich Strba) Date: Tue, 27 Jan 2015 08:08:27 +0100 Subject: [SECURITY] IcedTea 1.13.6 for OpenJDK 6 Released! In-Reply-To: <20150124003852.GA29532@carrie.the212.com> References: <20150124003852.GA29532@carrie.the212.com> Message-ID: <54C7396B.30709@suse.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 And for the Zero to build well on aarch64, I needed this attached patch Cheers Fridrich -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlTHOWsACgkQu9a1imXPdA8hxwCeOmYbWGaMGk19IV0dJCAlr0/X YiUAniA62qTEXTQq8xbxVSxrv/Lh6Nss =z6ll -----END PGP SIGNATURE----- -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-1.13.6-aarch64.patch Type: text/x-patch Size: 5607 bytes Desc: not available URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 27 14:55:43 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Jan 2015 14:55:43 +0000 Subject: [Bug 2191] New: [Regression] zero seems to broken in the 2.5.4 release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2191 Bug ID: 2191 Summary: [Regression] zero seems to broken in the 2.5.4 release Product: IcedTea Version: 2.5.4 Hardware: x86_64 OS: Linux Status: NEW Severity: major Priority: P5 Component: Zero Assignee: gnu.andrew at redhat.com Reporter: doko at ubuntu.com CC: unassigned at icedtea.classpath.org zero seems to broken in the 2.5.4 release, it builds, but then cannot be used to bootstrap openjdk-8, at least on mips, mipsel, powerpc, x86_64-linuxgnux32. The armel and armhf arm assembler ports still seem to work. builds logs available at https://buildd.debian.org/status/package.php?p=openjdk-8&suite=sid http://buildd.debian-ports.org/status/package.php?p=openjdk-8&suite=sid -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 27 15:01:13 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Jan 2015 15:01:13 +0000 Subject: [Bug 2191] [Regression] zero seems to be broken in the 2.5.4 release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2191 Matthias Klose changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|[Regression] zero seems to |[Regression] zero seems to |broken in the 2.5.4 release |be broken in the 2.5.4 | |release -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jvanek at redhat.com Tue Jan 27 15:12:04 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 27 Jan 2015 16:12:04 +0100 Subject: [rfc][icedtea-web] Fix accessing Java array elements from Javascript In-Reply-To: <1254781788.370065.1422285437294.JavaMail.zimbra@redhat.com> References: <1254781788.370065.1422285437294.JavaMail.zimbra@redhat.com> Message-ID: <54C7AAC4.1040007@redhat.com> On 01/26/2015 04:17 PM, Jie Kang wrote: > Hello, > > Marcin Cieslak has taken the time to create a fix for a long-standing problem in Icedtea-Web where attempting to set/get Java array elements from Javascript fails. [1] > > [1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 > > > The reproducers relevant to this fix are: > > simple/JToJSString > > These reproducers tests on F21 with OpenJDK 7 and HEAD patched are now passing for me. These aren't in 1.5.x > > > simple/JSToJSet > > These reproducers are still failing. On further investigation, the reproducer itself is not working correctly. A fix is needed here and work is in progress. > > I have created a simple reproducer that mimics AppletJSToJSet_intArrayElement_Test and it passes. This is attached as: itw-js-int-array-test-1.patch. This reproducer passes on both 1.5 and HEAD. > > > I think a backport to 1.5.x would also be great. The two patches for HEAD and 1.5 are attached as: itw-js-array-HEAD-1.patch and itw-js-array-1.5-1.patch. > > Thoughts? > > > Thank you again Marcin! > > The code of fix is ok AFAICS. Thank you both! For fixes: Please include NEWS entry and add Marcin to authors. For thests: SimpleJNLP.html and SimpleJNLP.jnlp have missing license headers SimpleJNLPTest.java - can it be reworked to work with default ClosingListeners? Please turn one more round of review before push. Thank you both! J. From gitne at gmx.de Tue Jan 27 15:16:58 2015 From: gitne at gmx.de (Jacob Wisor) Date: Tue, 27 Jan 2015 16:16:58 +0100 Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <54C61F6B.3090504@redhat.com> References: =?UTF-8?Q?<590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com>, =20=09=20<54BF7121.4070103@redhat.com>, =20<54C61F6B.3090504@redhat.com>?= Message-ID: On 01/26/2015 at 12:05 PM, Jiri Vanek wrote: > On 01/21/2015 10:28 AM, Jiri Vanek wrote: >> On 01/06/2015 09:19 PM, Jacob Wisor wrote: >>> On 01/06/2015 at 01:25 PM, Jacob Wisor wrote: >>>> On 01/05/2015 at 05:19 PM, Jie Kang wrote: [?] >>> @Jie Kang: >>> Thank you for spotting this bug. >>> >> >> Is it really an bug? It actually eliminates the benefits of offline environment. >> >>>>> consecutive resources: If for the first resource, we detected offline, the >>>>> boolean onlineDetected would be set to false. Then for the second resource, >>>>> the detection check would be skipped, even if that resource was able to be >>>>> connected to. This would result in the second resource being unable to be >>>>> downloaded, even though it definitely could and should be. The patch fixes >>>>> this. >> >> Thinking about it - how it is possible that first resource could not be downloaded, but second can >> be, and how it is possible that first one can be missed, while second one not? >> >> >> Maybe before deciding that environment i onnline/offline - we may try to download two or three >> resources? > > One more thing crossed my mind - if the check is done everytime ressource is download. > > Then the output of isOnline() method is actually prety undetermined. Is it possible for InetAddress.getByName() to be asynchronious? This could explain isOnline() to return false when called for the first time in some cases. Maybe some other asynchronious part of the code is causing this effect. Jacob From bugzilla-daemon at icedtea.classpath.org Tue Jan 27 15:26:19 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Jan 2015 15:26:19 +0000 Subject: [Bug 2191] [Regression] zero seems to be broken in the 2.5.4 release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2191 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Hardware|x86_64 |ppc Severity|major |normal -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 27 15:28:19 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 27 Jan 2015 15:28:19 +0000 Subject: [Bug 2191] [Regression] zero seems to be broken in the 2.5.4 release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2191 --- Comment #1 from Andrew John Hughes --- These all seem to be different and it's hard to make out anything from just small fragments of build logs. Have you tried allocating more memory to the MIPS ones? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jvanek at redhat.com Tue Jan 27 15:30:25 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 27 Jan 2015 16:30:25 +0100 Subject: [rfc][icedtea-web] dont expect junit have hamcrest included In-Reply-To: <20150126152557.GA2720@redhat.com> References: <54C620FF.3080407@redhat.com> <20150126152557.GA2720@redhat.com> Message-ID: <54C7AF11.9000805@redhat.com> On 01/26/2015 04:25 PM, Omair Majid wrote: > Hi, > > * Jiri Vanek [2015-01-26 06:12]: >> The fix is to make sure that the hamcrest jar is available on the >> classpath next to junit.jar too. The attached patch (for icedtea-web) >> does that and works on my machine with an upstream junit 4.12 jar. > > A couple of thoughts: > > Upstream clearly states that you need to put junit.jar and hamcrest.jar > in your classpath in one place [1] but only mentions junit.jar in > another [2]. > > Some distributions somehow transitively include hamcrest.jar in the > claspath of junit.jar (such as debian [3]) and some distributions > include the hamcrest classes in junit.jar (such as current release of > Fedora). And a third type include a junit.jar which needs hamcrest.jar > on the user-provied classpath to work. > > Maybe we should add more extensive configure tests to detect and handle > all these cases correctly? The current patch assumes that the hamcrest > jar, if present, is both needed by and compatible with junit. > > Thanks, > Omair > > [1] https://github.com/junit-team/junit/wiki/Download-and-Install#plain-old-jar > [2] https://github.com/junit-team/junit/wiki/Getting-started > [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527308 > Simple approach - try to detect hamcrest, and if it is avaiable, add it behind junit jar. If it is not avaible, then print warning and simply continue. (it is what you have done) (just maybe warning output may be better) Or really try if hammercest is included in junit - if so then dont add it, If is not, then proceed with simple approach. May actually any "distributions somehow transitively include hamcrest.jar in the claspath of junit.jar" work in our makefile-based cslasspath settings approach? I doubt a bit, And from this point of view, I would vote for "simple approach" ty! J. From jvanek at redhat.com Tue Jan 27 15:32:40 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 27 Jan 2015 16:32:40 +0100 Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com>, <54BF7121.4070103@redhat.com>, <54C61F6B.3090504@redhat.com> Message-ID: <54C7AF98.3080902@redhat.com> On 01/27/2015 04:16 PM, Jacob Wisor wrote: > On 01/26/2015 at 12:05 PM, Jiri Vanek wrote: >> On 01/21/2015 10:28 AM, Jiri Vanek wrote: >>> On 01/06/2015 09:19 PM, Jacob Wisor wrote: >>>> On 01/06/2015 at 01:25 PM, Jacob Wisor wrote: >>>>> On 01/05/2015 at 05:19 PM, Jie Kang wrote: > [?] >>>> @Jie Kang: >>>> Thank you for spotting this bug. >>>> >>> >>> Is it really an bug? It actually eliminates the benefits of offline environment. >>> >>>>>> consecutive resources: If for the first resource, we detected offline, the >>>>>> boolean onlineDetected would be set to false. Then for the second resource, >>>>>> the detection check would be skipped, even if that resource was able to be >>>>>> connected to. This would result in the second resource being unable to be >>>>>> downloaded, even though it definitely could and should be. The patch fixes >>>>>> this. >>> >>> Thinking about it - how it is possible that first resource could not be downloaded, but second can >>> be, and how it is possible that first one can be missed, while second one not? >>> >>> >>> Maybe before deciding that environment i onnline/offline - we may try to download two or three >>> resources? >> >> One more thing crossed my mind - if the check is done everytime ressource is download. >> >> Then the output of isOnline() method is actually prety undetermined. > > Is it possible for InetAddress.getByName() to be asynchronious? This could explain > isOnline() to return false when called for the first time in some cases. Maybe some > other asynchronious part of the code is causing this effect. > > Jacob > I had a different issue in mind: > > Resource 1 : Can't download, but it is in cache so we use the cache one. > isOnline will return false if called now > > Resource 2 : Not in cache, but we can download, so we download it into cache. > isOnline will now return true. J. From jkang at redhat.com Tue Jan 27 15:37:44 2015 From: jkang at redhat.com (Jie Kang) Date: Tue, 27 Jan 2015 10:37:44 -0500 (EST) Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <54C7AF98.3080902@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> <54BF7121.4070103@redhat.com> <54C61F6B.3090504@redhat.com> <54C7AF98.3080902@redhat.com> Message-ID: <509050979.973312.1422373064546.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 01/27/2015 04:16 PM, Jacob Wisor wrote: > > On 01/26/2015 at 12:05 PM, Jiri Vanek wrote: > >> On 01/21/2015 10:28 AM, Jiri Vanek wrote: > >>> On 01/06/2015 09:19 PM, Jacob Wisor wrote: > >>>> On 01/06/2015 at 01:25 PM, Jacob Wisor wrote: > >>>>> On 01/05/2015 at 05:19 PM, Jie Kang wrote: > > [?] > >>>> @Jie Kang: > >>>> Thank you for spotting this bug. > >>>> > >>> > >>> Is it really an bug? It actually eliminates the benefits of offline > >>> environment. > >>> > >>>>>> consecutive resources: If for the first resource, we detected offline, > >>>>>> the > >>>>>> boolean onlineDetected would be set to false. Then for the second > >>>>>> resource, > >>>>>> the detection check would be skipped, even if that resource was able > >>>>>> to be > >>>>>> connected to. This would result in the second resource being unable to > >>>>>> be > >>>>>> downloaded, even though it definitely could and should be. The patch > >>>>>> fixes > >>>>>> this. > >>> > >>> Thinking about it - how it is possible that first resource could not be > >>> downloaded, but second can > >>> be, and how it is possible that first one can be missed, while second one > >>> not? > >>> > >>> > >>> Maybe before deciding that environment i onnline/offline - we may try to > >>> download two or three > >>> resources? > >> > >> One more thing crossed my mind - if the check is done everytime ressource > >> is download. > >> > >> Then the output of isOnline() method is actually prety undetermined. > > > > Is it possible for InetAddress.getByName() to be asynchronious? This could > > explain > > isOnline() to return false when called for the first time in some cases. > > Maybe some > > other asynchronious part of the code is causing this effect. > > > > Jacob > > > I had a different issue in mind: > > > > > Resource 1 : Can't download, but it is in cache so we use the cache one. > > > isOnline will return false if called now > > > > > Resource 2 : Not in cache, but we can download, so we download it into > > cache. > > > isOnline will now return true. Hello, That isn't true with current implementation of ResourceTracker and JNLPRuntime. See ResourceTracker.initializeResource(), JNLPRuntime.detectOnline() and JNLPRuntime.isOnline(). Regards, > > > J. > > > > -- Jie Kang OpenJDK Team - Software Engineering Intern From jvanek at redhat.com Tue Jan 27 15:38:32 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 27 Jan 2015 16:38:32 +0100 Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <1003662908.381675.1422286361716.JavaMail.zimbra@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> <54BF7121.4070103@redhat.com> <54C61F6B.3090504@redhat.com> <1003662908.381675.1422286361716.JavaMail.zimbra@redhat.com> Message-ID: <54C7B0F8.5000709@redhat.com> On 01/26/2015 04:32 PM, Jie Kang wrote: > > > ----- Original Message ----- >> On 01/21/2015 10:28 AM, Jiri Vanek wrote: >>> On 01/06/2015 09:19 PM, Jacob Wisor wrote: >>>> On 01/06/2015 at 01:25 PM Jacob Wisor wrote: >>>>> On 01/05/2015 at 05:19 PM Jie Kang wrote: >>>>>> Hello, >>>>>> >>>>>> This patch slightly modifies JNLPRuntime's online detection function to >>>>>> always perform the check, even if it has been called before. >>> >>> As Jacob is mentioning, this really is causing performance overkill. >>>>>> >>>>>> Previously, if the boolean onlineDetected wasn't null, the check would >>>>>> be >>>>>> skipped. This caused a bug when downloading multiple resources. >>> >>> The idea of the check was, that first resource to be downloaded, is mostly >>> the most crucial - jnlp, >>> jnlpHref, mainclass, jar with main class... So this one have to be >>> downlaoded - if it is not, then >>> we can assume the network inaccessible. >>>>>> >>>>>> For each resource being downloaded, we perform the detection check. For >>>>>> two >>>>>> consecutive resources: If for the first resource, we detected offline, >>>>>> the >>>>>> boolean onlineDetected would be set to false. Then for the second >>>>>> resource, >>>>>> the detection check would be skipped, even if that resource was able to >>>>>> be >>>>>> connected to. This would result in the second resource being unable to >>>>>> be >>>>>> downloaded, even though it definitely could and should be. The patch >>>>>> fixes >>>>>> this. >>> >>> Do you have some example of this behavior causing any real issues? >>> Maybe just sync the method or otherwise ensure that while isOnline is null, >>> only one download can be >>> done? >>> >>>>>> >>>>>> Thoughts? >>>>> >>>>> Although I did not test it, seems to be working as advertised. >>>>> >>>>> While looking at the code, I was wondering why JNLPRuntime.onlineDetected >>>>> was >>>>> a Boolean object instead of a primitive. And, apart from that, the whole >>>>> offline detection mechanism seems overly complex and unreliable to me. >>>>> I am also not really convinced that >>>>> >>>>> public static void detectOnline(URL location) { >>>>> if (onlineDetected != null) { >>>>> return; >>>>> } >>>>> try { >>>>> if (location.getProtocol().equals("file")) { >>>>> return; >>>>> } >>>>> //Checks the offline/online status of the system. >>>>> InetAddress.getByName(location.getHost()); >>>>> } catch (UnknownHostException ue) { [?] >>>>> >>>>> is the best or most reliable way in J2SE to test for the online/offline >>>>> status >>>>> of a system. Do systems having no DNS server configured or which is >>>>> unreachable >>>>> properly resolve their name? And, even if they do, does this really >>>>> actually >>>>> prove them being online? >>>>> >>>>> Now, I was considering a few different options to reliably detecting a >>>>> system's >>>>> online/offline status. Initially, I was thinking about pinging the >>>>> default >>>>> gateway. However, hosts with public IPs may have their public IP as the >>>>> default >>>>> gateway configured. So, the most reliable way I came up with is to send >>>>> an echo >>>>> broadcast (on the local subnet) request. Of course, this does not prove >>>>> the >>>>> system being connected to the /public/ internet. But this is not >>>>> neccessary >>>>> either because JNLP applications may be (which they often are) served on >>>>> an >>>>> intranet only. So, would you mind investigating this further? >>> >>> Before doing this looks-really-stupid >>> InetAddress.getByName(location.getHost()); i was elaborating >>> on this, and have nnot found a generic way how to veryfi online status from >>> java. >>>> >>>> Oh, I forgot: I am sure we do not want to make a DNS request for every >>>> resource >>>> we need to download, even when subsequent DNS resolution requests are >>>> pulled >>> >>> yah, to much correct. >>>> from the local DNS cache. So, although this patch fixes the bug, it is >>>> very >>>> inefficient and impractical because it induces an avoidable performance >>>> penalty. >>>> In other words, the online detection *logic* itself needs to be fixed. >>>> >>>> @Jie Kang: >>>> Thank you for spotting this bug. >>>> >>> >>> Is it really an bug? It actually eliminates the benefits of offline >>> environment. >>> >>> >>> consecutive resources: If for the first resource, we detected offline, >>> >>> the >>> >>> boolean onlineDetected would be set to false. Then for the second >>> >>> resource, >>> >>> the detection check would be skipped, even if that resource was able >>> >>> to be >>> >>> connected to. This would result in the second resource being unable to >>> >>> be >>> >>> downloaded, even though it definitely could and should be. The patch >>> >>> fixes >>> >>> this. >>> >>> Thinking about it - how it is possible that first resource could not be >>> downloaded, but second can >>> be, and how it is possible that first one can be missed, while second one >>> not? >>> >>> >>> Maybe before deciding that environment i onnline/offline - we may try to >>> download two or three >>> resources? >>> >>> >>> >> >> One more thing crossed my mind - if the check is done everytime ressource is >> download. >> >> Then the output of isOnline() method is actually prety undetermined. >> >> >> ? > > Hello, > >>> Thinking about it - how it is possible that first resource could not be >>> downloaded, but second can >>> be, and how it is possible that first one can be missed, while second one >>> not? >>> > > This can occur in edge incidents such as: > > Resource 1 : Can't download, but it is in cache so we use the cache one. > > Resource 2 : Not in cache, but we can download, so we download it into cache. > > Applet now works. > > > However, with the online detection as it is, the edge cases such as above will fail. > >>> Is it really an bug? It actually eliminates the benefits of offline >>> environment. > > In terms of the offline environment, this should really only be controlled by the isOfflineForced setting rather than the isOnline setting. For any resource located off-site, the only way you know if that resource is accessible or not is by attempting to access it. The idea of an 'online' state is flawed in this regard. The idea of an 'offline' state is fine though. If the user sets it to offline, the rules are simple, we don't make any connection attempts. Otherwise, we should always be attempting to access them. > > The more I think about this, I feel like we shouldn't be using isOnline() to check when trying to download a resource. We should just try to download it unless offlineIsForced. If it fails to download, the code already deals with it as safely as possible. The online check beforehand isn't really beneficial here. > > > Regards, > >> >> >> J. >> > Ok. Now I understand better. This should happen only if javaws was killed during downloading. And then clearing the cache is the cure. But I see your point. If -Xoffline is specified, I would like to keep current approach. For the online detection, I'm really concerned about isOnline result (and so behaviour of system) So brainstroming (valid only if no xOffline is specified): on begging assume environment is offline (no check was done) The check on "is online" will be done always from now If suddenly the resource is being avaiable online , switch to "online verified" and consider environment is online. No more checks are done from here. with Xoffline - no check is done ever. What do you think? From jvanek at redhat.com Tue Jan 27 15:40:38 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 27 Jan 2015 16:40:38 +0100 Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <509050979.973312.1422373064546.JavaMail.zimbra@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> <54BF7121.4070103@redhat.com> <54C61F6B.3090504@redhat.com> <54C7AF98.3080902@redhat.com> <509050979.973312.1422373064546.JavaMail.zimbra@redhat.com> Message-ID: <54C7B176.4010600@redhat.com> On 01/27/2015 04:37 PM, Jie Kang wrote: > > > ----- Original Message ----- >> On 01/27/2015 04:16 PM, Jacob Wisor wrote: >>> On 01/26/2015 at 12:05 PM, Jiri Vanek wrote: >>>> On 01/21/2015 10:28 AM, Jiri Vanek wrote: >>>>> On 01/06/2015 09:19 PM, Jacob Wisor wrote: >>>>>> On 01/06/2015 at 01:25 PM, Jacob Wisor wrote: >>>>>>> On 01/05/2015 at 05:19 PM, Jie Kang wrote: >>> [?] >>>>>> @Jie Kang: >>>>>> Thank you for spotting this bug. >>>>>> >>>>> >>>>> Is it really an bug? It actually eliminates the benefits of offline >>>>> environment. >>>>> >>>>>>>> consecutive resources: If for the first resource, we detected offline, >>>>>>>> the >>>>>>>> boolean onlineDetected would be set to false. Then for the second >>>>>>>> resource, >>>>>>>> the detection check would be skipped, even if that resource was able >>>>>>>> to be >>>>>>>> connected to. This would result in the second resource being unable to >>>>>>>> be >>>>>>>> downloaded, even though it definitely could and should be. The patch >>>>>>>> fixes >>>>>>>> this. >>>>> >>>>> Thinking about it - how it is possible that first resource could not be >>>>> downloaded, but second can >>>>> be, and how it is possible that first one can be missed, while second one >>>>> not? >>>>> >>>>> >>>>> Maybe before deciding that environment i onnline/offline - we may try to >>>>> download two or three >>>>> resources? >>>> >>>> One more thing crossed my mind - if the check is done everytime ressource >>>> is download. >>>> >>>> Then the output of isOnline() method is actually prety undetermined. >>> >>> Is it possible for InetAddress.getByName() to be asynchronious? This could >>> explain >>> isOnline() to return false when called for the first time in some cases. >>> Maybe some >>> other asynchronious part of the code is causing this effect. >>> >>> Jacob >>> >> I had a different issue in mind: >> >> > >> > Resource 1 : Can't download, but it is in cache so we use the cache one. >> > >> isOnline will return false if called now >> >> > >> > Resource 2 : Not in cache, but we can download, so we download it into >> > cache. >> > >> isOnline will now return true. > > > Hello, > > That isn't true with current implementation of ResourceTracker and JNLPRuntime. > > See ResourceTracker.initializeResource(), JNLPRuntime.detectOnline() and JNLPRuntime.isOnline(). > > Yes I know. But will be valid if we apply your patch. Or not? J. From jkang at redhat.com Tue Jan 27 15:52:21 2015 From: jkang at redhat.com (Jie Kang) Date: Tue, 27 Jan 2015 10:52:21 -0500 (EST) Subject: [rfc][icedtea-web] Fix accessing Java array elements from Javascript In-Reply-To: <54C7AAC4.1040007@redhat.com> References: <1254781788.370065.1422285437294.JavaMail.zimbra@redhat.com> <54C7AAC4.1040007@redhat.com> Message-ID: <868558511.984727.1422373941416.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 01/26/2015 04:17 PM, Jie Kang wrote: > > Hello, > > > > Marcin Cieslak has taken the time to create a fix for a long-standing > > problem in Icedtea-Web where attempting to set/get Java array elements > > from Javascript fails. [1] > > > > [1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 > > > > > > The reproducers relevant to this fix are: > > > > simple/JToJSString > > > > These reproducers tests on F21 with OpenJDK 7 and HEAD patched are now > > passing for me. These aren't in 1.5.x > > > > > > simple/JSToJSet > > > > These reproducers are still failing. On further investigation, the > > reproducer itself is not working correctly. A fix is needed here and work > > is in progress. > > > > I have created a simple reproducer that mimics > > AppletJSToJSet_intArrayElement_Test and it passes. This is attached as: > > itw-js-int-array-test-1.patch. This reproducer passes on both 1.5 and > > HEAD. > > > > > > I think a backport to 1.5.x would also be great. The two patches for HEAD > > and 1.5 are attached as: itw-js-array-HEAD-1.patch and > > itw-js-array-1.5-1.patch. > > > > Thoughts? > > > > > > Thank you again Marcin! > > > > > > The code of fix is ok AFAICS. Thank you both! > > For fixes: Please include NEWS entry and add Marcin to authors. > > For thests: SimpleJNLP.html and SimpleJNLP.jnlp have missing license > headers > SimpleJNLPTest.java - can it be reworked to work with default > ClosingListeners? Hello, Just a quick note here: Sorry I didn't explain fully. The SimpleJNLP tests are just to show that the patch works; I didn't intend them for review. I included it in the e-mail because the original test in HEAD, JSToJSet, is actually broken, so they don't show that the patch worked. I will need to fix them. The SimpleJNLP test is just a small copy of JSToJSet test that is fixed so I don't think SimpleJNLP needs to go for review/push. I will fix the JSToJSet test and send patch for that in separate e-mail. Is that okay with you? > > > Please turn one more round of review before push. Okay, will do NEWS + Author and send for review soon. Regards, > > Thank you both! > J. > > > > > > -- Jie Kang OpenJDK Team - Software Engineering Intern From gnu.andrew at redhat.com Tue Jan 27 15:56:02 2015 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Tue, 27 Jan 2015 10:56:02 -0500 (EST) Subject: [SECURITY] IcedTea 1.13.6 for OpenJDK 6 Released! In-Reply-To: <54C7396B.30709@suse.com> References: <20150124003852.GA29532@carrie.the212.com> <54C7396B.30709@suse.com> Message-ID: <29273650.1704982.1422374162962.JavaMail.zimbra@redhat.com> ----- Original Message ----- > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > And for the Zero to build well on aarch64, I needed this attached patch > > Cheers > > Fridrich > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2 > > iEYEARECAAYFAlTHOWsACgkQu9a1imXPdA8hxwCeOmYbWGaMGk19IV0dJCAlr0/X > YiUAniA62qTEXTQq8xbxVSxrv/Lh6Nss > =z6ll > -----END PGP SIGNATURE----- > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2083 I haven't backported it to the 1.13.x because it's hard to test. The only AArch64 machines I have access to only have OpenJDK 7 and so can't build 6. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From jvanek at redhat.com Tue Jan 27 15:56:14 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 27 Jan 2015 16:56:14 +0100 Subject: [rfc][icedtea-web] Fix accessing Java array elements from Javascript In-Reply-To: <868558511.984727.1422373941416.JavaMail.zimbra@redhat.com> References: <1254781788.370065.1422285437294.JavaMail.zimbra@redhat.com> <54C7AAC4.1040007@redhat.com> <868558511.984727.1422373941416.JavaMail.zimbra@redhat.com> Message-ID: <54C7B51E.5080400@redhat.com> On 01/27/2015 04:52 PM, Jie Kang wrote: > > > ----- Original Message ----- >> On 01/26/2015 04:17 PM, Jie Kang wrote: >>> Hello, >>> >>> Marcin Cieslak has taken the time to create a fix for a long-standing >>> problem in Icedtea-Web where attempting to set/get Java array elements >>> from Javascript fails. [1] >>> >>> [1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 >>> >>> >>> The reproducers relevant to this fix are: >>> >>> simple/JToJSString >>> >>> These reproducers tests on F21 with OpenJDK 7 and HEAD patched are now >>> passing for me. These aren't in 1.5.x >>> >>> >>> simple/JSToJSet >>> >>> These reproducers are still failing. On further investigation, the >>> reproducer itself is not working correctly. A fix is needed here and work >>> is in progress. >>> >>> I have created a simple reproducer that mimics >>> AppletJSToJSet_intArrayElement_Test and it passes. This is attached as: >>> itw-js-int-array-test-1.patch. This reproducer passes on both 1.5 and >>> HEAD. >>> >>> >>> I think a backport to 1.5.x would also be great. The two patches for HEAD >>> and 1.5 are attached as: itw-js-array-HEAD-1.patch and >>> itw-js-array-1.5-1.patch. >>> >>> Thoughts? >>> >>> >>> Thank you again Marcin! >>> >>> >> >> The code of fix is ok AFAICS. Thank you both! >> >> For fixes: Please include NEWS entry and add Marcin to authors. >> >> For thests: SimpleJNLP.html and SimpleJNLP.jnlp have missing license >> headers >> SimpleJNLPTest.java - can it be reworked to work with default >> ClosingListeners? > > Hello, > > Just a quick note here: > > Sorry I didn't explain fully. > > The SimpleJNLP tests are just to show that the patch works; I didn't intend them for review. I included it in the e-mail because the original test in HEAD, JSToJSet, is actually broken, so they don't show that the patch worked. I will need to fix them. > > The SimpleJNLP test is just a small copy of JSToJSet test that is fixed so I don't think SimpleJNLP needs to go for review/push. I will fix the JSToJSet test and send patch for that in separate e-mail. Ah. sure. And why not to include them? It seems to be relevant test worthy to be added to reproducers suite. > > Is that okay with you? > Still please post updated versions of head and 1.5 patch. >> >> >> Please turn one more round of review before push. > > Okay, will do NEWS + Author and send for review soon. > > > Regards, > >> >> Thank you both! >> J. >> >> >> >> >> >> > From jkang at redhat.com Tue Jan 27 16:01:01 2015 From: jkang at redhat.com (Jie Kang) Date: Tue, 27 Jan 2015 11:01:01 -0500 (EST) Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <54C7B0F8.5000709@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> <54BF7121.4070103@redhat.com> <54C61F6B.3090504@redhat.com> <1003662908.381675.1422286361716.JavaMail.zimbra@redhat.com> <54C7B0F8.5000709@redhat.com> Message-ID: <701744361.989547.1422374461447.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 01/26/2015 04:32 PM, Jie Kang wrote: > > > > > > ----- Original Message ----- > >> On 01/21/2015 10:28 AM, Jiri Vanek wrote: > >>> On 01/06/2015 09:19 PM, Jacob Wisor wrote: > >>>> On 01/06/2015 at 01:25 PM Jacob Wisor wrote: > >>>>> On 01/05/2015 at 05:19 PM Jie Kang wrote: > >>>>>> Hello, > >>>>>> > >>>>>> This patch slightly modifies JNLPRuntime's online detection function > >>>>>> to > >>>>>> always perform the check, even if it has been called before. > >>> > >>> As Jacob is mentioning, this really is causing performance overkill. > >>>>>> > >>>>>> Previously, if the boolean onlineDetected wasn't null, the check would > >>>>>> be > >>>>>> skipped. This caused a bug when downloading multiple resources. > >>> > >>> The idea of the check was, that first resource to be downloaded, is > >>> mostly > >>> the most crucial - jnlp, > >>> jnlpHref, mainclass, jar with main class... So this one have to be > >>> downlaoded - if it is not, then > >>> we can assume the network inaccessible. > >>>>>> > >>>>>> For each resource being downloaded, we perform the detection check. > >>>>>> For > >>>>>> two > >>>>>> consecutive resources: If for the first resource, we detected offline, > >>>>>> the > >>>>>> boolean onlineDetected would be set to false. Then for the second > >>>>>> resource, > >>>>>> the detection check would be skipped, even if that resource was able > >>>>>> to > >>>>>> be > >>>>>> connected to. This would result in the second resource being unable to > >>>>>> be > >>>>>> downloaded, even though it definitely could and should be. The patch > >>>>>> fixes > >>>>>> this. > >>> > >>> Do you have some example of this behavior causing any real issues? > >>> Maybe just sync the method or otherwise ensure that while isOnline is > >>> null, > >>> only one download can be > >>> done? > >>> > >>>>>> > >>>>>> Thoughts? > >>>>> > >>>>> Although I did not test it, seems to be working as advertised. > >>>>> > >>>>> While looking at the code, I was wondering why > >>>>> JNLPRuntime.onlineDetected > >>>>> was > >>>>> a Boolean object instead of a primitive. And, apart from that, the > >>>>> whole > >>>>> offline detection mechanism seems overly complex and unreliable to me. > >>>>> I am also not really convinced that > >>>>> > >>>>> public static void detectOnline(URL location) { > >>>>> if (onlineDetected != null) { > >>>>> return; > >>>>> } > >>>>> try { > >>>>> if (location.getProtocol().equals("file")) { > >>>>> return; > >>>>> } > >>>>> //Checks the offline/online status of the system. > >>>>> InetAddress.getByName(location.getHost()); > >>>>> } catch (UnknownHostException ue) { [?] > >>>>> > >>>>> is the best or most reliable way in J2SE to test for the online/offline > >>>>> status > >>>>> of a system. Do systems having no DNS server configured or which is > >>>>> unreachable > >>>>> properly resolve their name? And, even if they do, does this really > >>>>> actually > >>>>> prove them being online? > >>>>> > >>>>> Now, I was considering a few different options to reliably detecting a > >>>>> system's > >>>>> online/offline status. Initially, I was thinking about pinging the > >>>>> default > >>>>> gateway. However, hosts with public IPs may have their public IP as the > >>>>> default > >>>>> gateway configured. So, the most reliable way I came up with is to send > >>>>> an echo > >>>>> broadcast (on the local subnet) request. Of course, this does not prove > >>>>> the > >>>>> system being connected to the /public/ internet. But this is not > >>>>> neccessary > >>>>> either because JNLP applications may be (which they often are) served > >>>>> on > >>>>> an > >>>>> intranet only. So, would you mind investigating this further? > >>> > >>> Before doing this looks-really-stupid > >>> InetAddress.getByName(location.getHost()); i was elaborating > >>> on this, and have nnot found a generic way how to veryfi online status > >>> from > >>> java. > >>>> > >>>> Oh, I forgot: I am sure we do not want to make a DNS request for every > >>>> resource > >>>> we need to download, even when subsequent DNS resolution requests are > >>>> pulled > >>> > >>> yah, to much correct. > >>>> from the local DNS cache. So, although this patch fixes the bug, it is > >>>> very > >>>> inefficient and impractical because it induces an avoidable performance > >>>> penalty. > >>>> In other words, the online detection *logic* itself needs to be fixed. > >>>> > >>>> @Jie Kang: > >>>> Thank you for spotting this bug. > >>>> > >>> > >>> Is it really an bug? It actually eliminates the benefits of offline > >>> environment. > >>> > >>> >>> consecutive resources: If for the first resource, we detected > >>> >>> offline, > >>> >>> the > >>> >>> boolean onlineDetected would be set to false. Then for the second > >>> >>> resource, > >>> >>> the detection check would be skipped, even if that resource was > >>> >>> able > >>> >>> to be > >>> >>> connected to. This would result in the second resource being unable > >>> >>> to > >>> >>> be > >>> >>> downloaded, even though it definitely could and should be. The > >>> >>> patch > >>> >>> fixes > >>> >>> this. > >>> > >>> Thinking about it - how it is possible that first resource could not be > >>> downloaded, but second can > >>> be, and how it is possible that first one can be missed, while second one > >>> not? > >>> > >>> > >>> Maybe before deciding that environment i onnline/offline - we may try to > >>> download two or three > >>> resources? > >>> > >>> > >>> > >> > >> One more thing crossed my mind - if the check is done everytime ressource > >> is > >> download. > >> > >> Then the output of isOnline() method is actually prety undetermined. > >> > >> > >> ? > > > > Hello, > > > >>> Thinking about it - how it is possible that first resource could not be > >>> downloaded, but second can > >>> be, and how it is possible that first one can be missed, while second one > >>> not? > >>> > > > > This can occur in edge incidents such as: > > > > Resource 1 : Can't download, but it is in cache so we use the cache one. > > > > Resource 2 : Not in cache, but we can download, so we download it into > > cache. > > > > Applet now works. > > > > > > However, with the online detection as it is, the edge cases such as above > > will fail. > > > >>> Is it really an bug? It actually eliminates the benefits of offline > >>> environment. > > > > In terms of the offline environment, this should really only be controlled > > by the isOfflineForced setting rather than the isOnline setting. For any > > resource located off-site, the only way you know if that resource is > > accessible or not is by attempting to access it. The idea of an 'online' > > state is flawed in this regard. The idea of an 'offline' state is fine > > though. If the user sets it to offline, the rules are simple, we don't > > make any connection attempts. Otherwise, we should always be attempting to > > access them. > > > > The more I think about this, I feel like we shouldn't be using isOnline() > > to check when trying to download a resource. We should just try to > > download it unless offlineIsForced. If it fails to download, the code > > already deals with it as safely as possible. The online check beforehand > > isn't really beneficial here. > > > > > > Regards, > > > >> > >> > >> J. > >> > > > > > Ok. Now I understand better. > > > This should happen only if javaws was killed during downloading. And then > clearing the cache is the > cure. > > > But I see your point. > > > > If -Xoffline is specified, I would like to keep current approach. > > > For the online detection, I'm really concerned about isOnline result (and so > behaviour of system) > > > So brainstroming (valid only if no xOffline is specified): > > on begging assume environment is offline (no check was done) > The check on "is online" will be done always from now > If suddenly the resource is being avaiable online , switch to "online > verified" and consider > environment is online. > No more checks are done from here. > > with Xoffline - no check is done ever. > > What do you think? Hello, If I understood correctly, I think the change to make it behave like above would be simple: In JNLPRuntime: public static void detectOnline(URL location) { if (onlineDetected != null) { return; } change: if (onlineDetected != null) { to: if (onlineDetected == true) { However, I wonder if we need to make it so complicated. I see two situations: A: Xoffline : no check is done ever and we never download : I think ResourceTracker.initializeResource() will need some patching for this. But I already wrote one, just haven't sent it yet. B: 'Online' : for each resource, try online and if it fails, try cache, otherwise error. This is already coded safely. My question here is: What is benefit of doing isOnline check? Where else is this used outside of initializing and downloading resources? When we use URLConnection object and try to initialize the resource, this already does a check for us. As well, the code already deals with the possible situations here. I do not think the isOnline check before trying to use URLConnection object has a performance benefit that justifies the extra complexity in code. Regards, > > -- Jie Kang OpenJDK Team - Software Engineering Intern From jkang at redhat.com Tue Jan 27 16:01:18 2015 From: jkang at redhat.com (Jie Kang) Date: Tue, 27 Jan 2015 11:01:18 -0500 (EST) Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <54C7B176.4010600@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> <54BF7121.4070103@redhat.com> <54C61F6B.3090504@redhat.com> <54C7AF98.3080902@redhat.com> <509050979.973312.1422373064546.JavaMail.zimbra@redhat.com> <54C7B176.4010600@redhat.com> Message-ID: <1395537984.989717.1422374478681.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 01/27/2015 04:37 PM, Jie Kang wrote: > > > > > > ----- Original Message ----- > >> On 01/27/2015 04:16 PM, Jacob Wisor wrote: > >>> On 01/26/2015 at 12:05 PM, Jiri Vanek wrote: > >>>> On 01/21/2015 10:28 AM, Jiri Vanek wrote: > >>>>> On 01/06/2015 09:19 PM, Jacob Wisor wrote: > >>>>>> On 01/06/2015 at 01:25 PM, Jacob Wisor wrote: > >>>>>>> On 01/05/2015 at 05:19 PM, Jie Kang wrote: > >>> [?] > >>>>>> @Jie Kang: > >>>>>> Thank you for spotting this bug. > >>>>>> > >>>>> > >>>>> Is it really an bug? It actually eliminates the benefits of offline > >>>>> environment. > >>>>> > >>>>>>>> consecutive resources: If for the first resource, we detected > >>>>>>>> offline, > >>>>>>>> the > >>>>>>>> boolean onlineDetected would be set to false. Then for the second > >>>>>>>> resource, > >>>>>>>> the detection check would be skipped, even if that resource was able > >>>>>>>> to be > >>>>>>>> connected to. This would result in the second resource being unable > >>>>>>>> to > >>>>>>>> be > >>>>>>>> downloaded, even though it definitely could and should be. The patch > >>>>>>>> fixes > >>>>>>>> this. > >>>>> > >>>>> Thinking about it - how it is possible that first resource could not be > >>>>> downloaded, but second can > >>>>> be, and how it is possible that first one can be missed, while second > >>>>> one > >>>>> not? > >>>>> > >>>>> > >>>>> Maybe before deciding that environment i onnline/offline - we may try > >>>>> to > >>>>> download two or three > >>>>> resources? > >>>> > >>>> One more thing crossed my mind - if the check is done everytime > >>>> ressource > >>>> is download. > >>>> > >>>> Then the output of isOnline() method is actually prety undetermined. > >>> > >>> Is it possible for InetAddress.getByName() to be asynchronious? This > >>> could > >>> explain > >>> isOnline() to return false when called for the first time in some cases. > >>> Maybe some > >>> other asynchronious part of the code is causing this effect. > >>> > >>> Jacob > >>> > >> I had a different issue in mind: > >> > >> > > >> > Resource 1 : Can't download, but it is in cache so we use the cache > >> > one. > >> > > >> isOnline will return false if called now > >> > >> > > >> > Resource 2 : Not in cache, but we can download, so we download it into > >> > cache. > >> > > >> isOnline will now return true. > > > > > > Hello, > > > > That isn't true with current implementation of ResourceTracker and > > JNLPRuntime. > > > > See ResourceTracker.initializeResource(), JNLPRuntime.detectOnline() and > > JNLPRuntime.isOnline(). > > > > > Yes I know. But will be valid if we apply your patch. Or not? Yeah it will be valid with the patch. > > J. > > -- Jie Kang OpenJDK Team - Software Engineering Intern From jkang at redhat.com Tue Jan 27 16:04:21 2015 From: jkang at redhat.com (Jie Kang) Date: Tue, 27 Jan 2015 11:04:21 -0500 (EST) Subject: [rfc][icedtea-web] Fix accessing Java array elements from Javascript In-Reply-To: <54C7B51E.5080400@redhat.com> References: <1254781788.370065.1422285437294.JavaMail.zimbra@redhat.com> <54C7AAC4.1040007@redhat.com> <868558511.984727.1422373941416.JavaMail.zimbra@redhat.com> <54C7B51E.5080400@redhat.com> Message-ID: <636818323.992926.1422374661559.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 01/27/2015 04:52 PM, Jie Kang wrote: > > > > > > ----- Original Message ----- > >> On 01/26/2015 04:17 PM, Jie Kang wrote: > >>> Hello, > >>> > >>> Marcin Cieslak has taken the time to create a fix for a long-standing > >>> problem in Icedtea-Web where attempting to set/get Java array elements > >>> from Javascript fails. [1] > >>> > >>> [1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 > >>> > >>> > >>> The reproducers relevant to this fix are: > >>> > >>> simple/JToJSString > >>> > >>> These reproducers tests on F21 with OpenJDK 7 and HEAD patched are now > >>> passing for me. These aren't in 1.5.x > >>> > >>> > >>> simple/JSToJSet > >>> > >>> These reproducers are still failing. On further investigation, the > >>> reproducer itself is not working correctly. A fix is needed here and work > >>> is in progress. > >>> > >>> I have created a simple reproducer that mimics > >>> AppletJSToJSet_intArrayElement_Test and it passes. This is attached as: > >>> itw-js-int-array-test-1.patch. This reproducer passes on both 1.5 and > >>> HEAD. > >>> > >>> > >>> I think a backport to 1.5.x would also be great. The two patches for HEAD > >>> and 1.5 are attached as: itw-js-array-HEAD-1.patch and > >>> itw-js-array-1.5-1.patch. > >>> > >>> Thoughts? > >>> > >>> > >>> Thank you again Marcin! > >>> > >>> > >> > >> The code of fix is ok AFAICS. Thank you both! > >> > >> For fixes: Please include NEWS entry and add Marcin to authors. > >> > >> For thests: SimpleJNLP.html and SimpleJNLP.jnlp have missing license > >> headers > >> SimpleJNLPTest.java - can it be reworked to work with > >> default > >> ClosingListeners? > > > > Hello, > > > > Just a quick note here: > > > > Sorry I didn't explain fully. > > > > The SimpleJNLP tests are just to show that the patch works; I didn't intend > > them for review. I included it in the e-mail because the original test in > > HEAD, JSToJSet, is actually broken, so they don't show that the patch > > worked. I will need to fix them. > > > > The SimpleJNLP test is just a small copy of JSToJSet test that is fixed so > > I don't think SimpleJNLP needs to go for review/push. I will fix the > > JSToJSet test and send patch for that in separate e-mail. > > Ah. sure. And why not to include them? It seems to be relevant test worthy to > be added to > reproducers suite. Uhm, the SimpleJNLP test is a copy of a test inside JSToJSet (in HEAD). So the test is already in the reproducers suite (but currently broken). > > > > > Is that okay with you? > > > Still please post updated versions of head and 1.5 patch. Yes of course. > >> > >> > >> Please turn one more round of review before push. > > > > Okay, will do NEWS + Author and send for review soon. > > > > > > Regards, > > > >> > >> Thank you both! > >> J. > >> > >> > >> > >> > >> > >> > > > > -- Jie Kang OpenJDK Team - Software Engineering Intern From jvanek at redhat.com Tue Jan 27 16:30:37 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 27 Jan 2015 17:30:37 +0100 Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <701744361.989547.1422374461447.JavaMail.zimbra@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> <54BF7121.4070103@redhat.com> <54C61F6B.3090504@redhat.com> <1003662908.381675.1422286361716.JavaMail.zimbra@redhat.com> <54C7B0F8.5000709@redhat.com> <701744361.989547.1422374461447.JavaMail.zimbra@redhat.com> Message-ID: <54C7BD2D.1090602@redhat.com> On 01/27/2015 05:01 PM, Jie Kang wrote: > > > ----- Original Message ----- >> On 01/26/2015 04:32 PM, Jie Kang wrote: >>> >>> >>> ----- Original Message ----- >>>> On 01/21/2015 10:28 AM, Jiri Vanek wrote: >>>>> On 01/06/2015 09:19 PM, Jacob Wisor wrote: >>>>>> On 01/06/2015 at 01:25 PM Jacob Wisor wrote: >>>>>>> On 01/05/2015 at 05:19 PM Jie Kang wrote: >>>>>>>> Hello, >>>>>>>> >>>>>>>> This patch slightly modifies JNLPRuntime's online detection function >>>>>>>> to >>>>>>>> always perform the check, even if it has been called before. >>>>> >>>>> As Jacob is mentioning, this really is causing performance overkill. >>>>>>>> >>>>>>>> Previously, if the boolean onlineDetected wasn't null, the check would >>>>>>>> be >>>>>>>> skipped. This caused a bug when downloading multiple resources. >>>>> >>>>> The idea of the check was, that first resource to be downloaded, is >>>>> mostly >>>>> the most crucial - jnlp, >>>>> jnlpHref, mainclass, jar with main class... So this one have to be >>>>> downlaoded - if it is not, then >>>>> we can assume the network inaccessible. >>>>>>>> >>>>>>>> For each resource being downloaded, we perform the detection check. >>>>>>>> For >>>>>>>> two >>>>>>>> consecutive resources: If for the first resource, we detected offline, >>>>>>>> the >>>>>>>> boolean onlineDetected would be set to false. Then for the second >>>>>>>> resource, >>>>>>>> the detection check would be skipped, even if that resource was able >>>>>>>> to >>>>>>>> be >>>>>>>> connected to. This would result in the second resource being unable to >>>>>>>> be >>>>>>>> downloaded, even though it definitely could and should be. The patch >>>>>>>> fixes >>>>>>>> this. >>>>> >>>>> Do you have some example of this behavior causing any real issues? >>>>> Maybe just sync the method or otherwise ensure that while isOnline is >>>>> null, >>>>> only one download can be >>>>> done? >>>>> >>>>>>>> >>>>>>>> Thoughts? >>>>>>> >>>>>>> Although I did not test it, seems to be working as advertised. >>>>>>> >>>>>>> While looking at the code, I was wondering why >>>>>>> JNLPRuntime.onlineDetected >>>>>>> was >>>>>>> a Boolean object instead of a primitive. And, apart from that, the >>>>>>> whole >>>>>>> offline detection mechanism seems overly complex and unreliable to me. >>>>>>> I am also not really convinced that >>>>>>> >>>>>>> public static void detectOnline(URL location) { >>>>>>> if (onlineDetected != null) { >>>>>>> return; >>>>>>> } >>>>>>> try { >>>>>>> if (location.getProtocol().equals("file")) { >>>>>>> return; >>>>>>> } >>>>>>> //Checks the offline/online status of the system. >>>>>>> InetAddress.getByName(location.getHost()); >>>>>>> } catch (UnknownHostException ue) { [?] >>>>>>> >>>>>>> is the best or most reliable way in J2SE to test for the online/offline >>>>>>> status >>>>>>> of a system. Do systems having no DNS server configured or which is >>>>>>> unreachable >>>>>>> properly resolve their name? And, even if they do, does this really >>>>>>> actually >>>>>>> prove them being online? >>>>>>> >>>>>>> Now, I was considering a few different options to reliably detecting a >>>>>>> system's >>>>>>> online/offline status. Initially, I was thinking about pinging the >>>>>>> default >>>>>>> gateway. However, hosts with public IPs may have their public IP as the >>>>>>> default >>>>>>> gateway configured. So, the most reliable way I came up with is to send >>>>>>> an echo >>>>>>> broadcast (on the local subnet) request. Of course, this does not prove >>>>>>> the >>>>>>> system being connected to the /public/ internet. But this is not >>>>>>> neccessary >>>>>>> either because JNLP applications may be (which they often are) served >>>>>>> on >>>>>>> an >>>>>>> intranet only. So, would you mind investigating this further? >>>>> >>>>> Before doing this looks-really-stupid >>>>> InetAddress.getByName(location.getHost()); i was elaborating >>>>> on this, and have nnot found a generic way how to veryfi online status >>>>> from >>>>> java. >>>>>> >>>>>> Oh, I forgot: I am sure we do not want to make a DNS request for every >>>>>> resource >>>>>> we need to download, even when subsequent DNS resolution requests are >>>>>> pulled >>>>> >>>>> yah, to much correct. >>>>>> from the local DNS cache. So, although this patch fixes the bug, it is >>>>>> very >>>>>> inefficient and impractical because it induces an avoidable performance >>>>>> penalty. >>>>>> In other words, the online detection *logic* itself needs to be fixed. >>>>>> >>>>>> @Jie Kang: >>>>>> Thank you for spotting this bug. >>>>>> >>>>> >>>>> Is it really an bug? It actually eliminates the benefits of offline >>>>> environment. >>>>> >>>>> >>> consecutive resources: If for the first resource, we detected >>>>> >>> offline, >>>>> >>> the >>>>> >>> boolean onlineDetected would be set to false. Then for the second >>>>> >>> resource, >>>>> >>> the detection check would be skipped, even if that resource was >>>>> >>> able >>>>> >>> to be >>>>> >>> connected to. This would result in the second resource being unable >>>>> >>> to >>>>> >>> be >>>>> >>> downloaded, even though it definitely could and should be. The >>>>> >>> patch >>>>> >>> fixes >>>>> >>> this. >>>>> >>>>> Thinking about it - how it is possible that first resource could not be >>>>> downloaded, but second can >>>>> be, and how it is possible that first one can be missed, while second one >>>>> not? >>>>> >>>>> >>>>> Maybe before deciding that environment i onnline/offline - we may try to >>>>> download two or three >>>>> resources? >>>>> >>>>> >>>>> >>>> >>>> One more thing crossed my mind - if the check is done everytime ressource >>>> is >>>> download. >>>> >>>> Then the output of isOnline() method is actually prety undetermined. >>>> >>>> >>>> ? >>> >>> Hello, >>> >>>>> Thinking about it - how it is possible that first resource could not be >>>>> downloaded, but second can >>>>> be, and how it is possible that first one can be missed, while second one >>>>> not? >>>>> >>> >>> This can occur in edge incidents such as: >>> >>> Resource 1 : Can't download, but it is in cache so we use the cache one. >>> >>> Resource 2 : Not in cache, but we can download, so we download it into >>> cache. >>> >>> Applet now works. >>> >>> >>> However, with the online detection as it is, the edge cases such as above >>> will fail. >>> >>>>> Is it really an bug? It actually eliminates the benefits of offline >>>>> environment. >>> >>> In terms of the offline environment, this should really only be controlled >>> by the isOfflineForced setting rather than the isOnline setting. For any >>> resource located off-site, the only way you know if that resource is >>> accessible or not is by attempting to access it. The idea of an 'online' >>> state is flawed in this regard. The idea of an 'offline' state is fine >>> though. If the user sets it to offline, the rules are simple, we don't >>> make any connection attempts. Otherwise, we should always be attempting to >>> access them. >>> >>> The more I think about this, I feel like we shouldn't be using isOnline() >>> to check when trying to download a resource. We should just try to >>> download it unless offlineIsForced. If it fails to download, the code >>> already deals with it as safely as possible. The online check beforehand >>> isn't really beneficial here. >>> >>> >>> Regards, >>> >>>> >>>> >>>> J. >>>> >>> >> >> >> Ok. Now I understand better. >> >> >> This should happen only if javaws was killed during downloading. And then >> clearing the cache is the >> cure. >> >> >> But I see your point. >> >> >> >> If -Xoffline is specified, I would like to keep current approach. >> >> >> For the online detection, I'm really concerned about isOnline result (and so >> behaviour of system) >> >> >> So brainstroming (valid only if no xOffline is specified): >> >> on begging assume environment is offline (no check was done) >> The check on "is online" will be done always from now >> If suddenly the resource is being avaiable online , switch to "online >> verified" and consider >> environment is online. >> No more checks are done from here. >> >> with Xoffline - no check is done ever. >> >> What do you think? > > Hello, > > If I understood correctly, I think the change to make it behave like above would be simple: > > In JNLPRuntime: > public static void detectOnline(URL location) { > if (onlineDetected != null) { > return; > } > > change: if (onlineDetected != null) { [*] If so, then with related Boolean -> boolean change. > to: if (onlineDetected == true) { > > > However, I wonder if we need to make it so complicated. > > I see two situations: > > A: Xoffline : no check is done ever and we never download : I think ResourceTracker.initializeResource() will need some patching for this. But I already wrote one, just haven't sent it yet. > > B: 'Online' : for each resource, try online and if it fails, try cache, otherwise error. This is already coded safely. I doubt. > > My question here is: What is benefit of doing isOnline check? Where else is this used outside of initializing and downloading resources? Find usages is your friend. Especially the one in resourceTracekr is imho critical. > > When we use URLConnection object and try to initialize the resource, this already does a check for us. As well, the code already deals with the possible situations here. This is not working as smotthly as you expect. Please be careful with any fixes here, otherwise you will break offline capabilities ITW with effort achieved. > > I do not think the isOnline check before trying to use URLConnection object has a performance benefit that justifies the extra complexity in code. No it does not. But make life much easier. > > > > Regards, Looking back to the orriginal patch which introduced offline capabilities: isOnlineDetected isOnline and detectOnline and their's usages - 4 (+3 comfortable) 2 and 3 it is not much, but the whole concept of those have to be revisited. If you grant that all the itw javaws and applets will work offline, than you can do whatever you need. But then I would recommand you to remove the offline capabilities patch, and implement the whole design on your own. I'm quite afraid to change individual parts of this patch. And I do not wont some functions to return random values. Even the change of yours [* above] may have side effects. But It may be what is seek. Fix for your issue, and still keeping all the behaviours I would like to have. J. From andrew at icedtea.classpath.org Tue Jan 27 17:06:51 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 27 Jan 2015 17:06:51 +0000 Subject: /hg/release/icedtea7-2.5: Bump to icedtea-2.5.5pre01. Message-ID: changeset 5078409f15b9 in /hg/release/icedtea7-2.5 details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=5078409f15b9 author: Andrew John Hughes date: Tue Jan 27 17:06:06 2015 +0000 Bump to icedtea-2.5.5pre01. Upstream changes: - S7142035: assert in j.l.instrument agents during shutdown when daemon thread is running - S7160837: DigestOutputStream does not turn off digest calculation when "close()" is called - S7195480: javax.smartcardio does not detect cards on Mac OS X - S8001472: api/java_awt/Window/indexTGF_* tests fail because expected colors aren't equal - S8011646: SEGV in compiled code with loop predication - S8012637: Adjust CipherInputStream class to work in AEAD/GCM mode - S8016545: java.beans.XMLEncoder.writeObject output is wrong - S8019324: assert(_f2 == 0 || _f2 == f2) failed: illegal field change - S8019623: Lack of synchronization in AppContext.getAppContext() - S8021804: Certpath validation fails if validity period of root cert does not include validity period of intermediate cert - S8022070: Compilation error in stubGenerator_sparc.cpp with some compilers - S8024061: Exception thrown when drag and drop between two components is executed quickly - S8028616: Htmleditorkit parser doesn't handle leading slash (/) - S8028617: Dvorak keyboard mapping not honored when ctrl key pressed - S8029837: NPE seen in XMLDocumentFragmentScannerImpl.setProperty since 7u40b33 - S8031290: Adjust call to getisax() for additional words returned - S8032872: [macosx] Cannot select from JComboBox in a JWindow - S8032874: ArrayIndexOutOfBoundsException in JTable while clearing data in JTable - S8032878: Editable combos in table do not behave as expected - S8033113: wsimport fails on WSDL:header parameter name customization - S8033696: "assert(thread != NULL) failed: just checking" due to Thread::current() and JNI pthread interaction - S8036022: D3D: rendering with XOR composite causes InternalError. - S8036709: Java 7 jarsigner displays warning about cert policy tree - S8036819: JAB: mneumonics not read for textboxes - S8036983: JAB:Multiselection Ctrl+CursorUp/Down and ActivateDescenderPropertyChanged event - S8037477: Reproducible hang of JAWS and webstart application with JAB 2.0.4 - S8038925: Java with G1 crashes in dump_instance_fields using jmap or jcmd without fullgc - S8039050: Crash in C2 compiler at Node::rematerialize - S8039298: assert(base == NULL || t_adr->isa_rawptr() || ! phase->type(base)->higher_equal(TypePtr::NULL_PTR)) - S8039319: (smartcardio) Card.transmitControlCommand() does not work on Mac OS X - S8041451: com.sun.jndi.ldap.Connection:ReadTimeout should abandon ldap request - S8042059: Various fixes to linux/sparc - S8042857: 14 stuck threads waiting for notification on LDAPRequest - S8043200: Decrease the preference mode of RC4 in the enabled cipher suite list - S8043205: Incorrect system traps.h include path - S8043206: Fix signed vs. unsigned comparison warning in copy_sparc.hpp - S8043207: Add const to Address argument for Assembler::swap - S8043210: Add _BIG_ENDIAN define on linux/sparc - S8043507: javax.smartcardio.CardTerminals.list() fails on MacOSX - S8044602: Increment minor version of HSx for 7u72 and initialize the build number - S8044659: Java SecureRandom on SPARC T4 much slower than on x86/Linux - S8046769: Set T family feature bit on Niagara systems - S8048080: (smartcardio) javax.smartcardio.Card.openLogicalChannel() dosn't work on MacOSX - S8049081: Increment hsx 24.72 build to b02 for 7u72-b03 - S8049542: C2: assert(size_in_words <= (julong)max_jint) failed: no overflow - S8049787: Increment hsx 24.72 build to b03 for 7u72-b04 - S8050158: Introduce system property to maintain RC4 preference order - S8050165: linux-sparcv9: NMT detail causes assert((intptr_t*)younger_sp[FP->sp_offset_in_saved_window()] == (intptr_t*)((intptr_t)sp - STACK_BIAS)) failed: younger_sp must be valid - S8050167: linux-sparcv9: hs_err file does not show any stack information - S8055714: Increment hsx 24.72 build to b04 for 7u72-b11 - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure - S8068405: GenerateCurrencyData throws RuntimeException for old data 2015-01-27 Andrew John Hughes * Makefile.am, (BUILD_VERSION): Bump to b31. (CORBA_CHANGESET): Update to icedtea-2.5.5pre01. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.5.5pre01. * hotspot.map.in: Update to icedtea-2.5.5pre01. * patches/boot/ecj-multicatch.patch: Add new case for sun.security.provider.SecureRandom diffstat: ChangeLog | 22 ++++++++++++++ Makefile.am | 26 ++++++++-------- NEWS | 58 ++++++++++++++++++++++++++++++++++++++- configure.ac | 2 +- hotspot.map.in | 2 +- patches/boot/ecj-multicatch.patch | 51 ++++++++++++++++++++++++++++++++++ 6 files changed, 145 insertions(+), 16 deletions(-) diffs (222 lines): diff -r 2832e84a2b58 -r 5078409f15b9 ChangeLog --- a/ChangeLog Sat Jan 24 02:09:56 2015 +0000 +++ b/ChangeLog Tue Jan 27 17:06:06 2015 +0000 @@ -1,3 +1,25 @@ +2015-01-27 Andrew John Hughes + + * Makefile.am, + (BUILD_VERSION): Bump to b31. + (CORBA_CHANGESET): Update to icedtea-2.5.5pre01. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Updated. + * configure.ac: Bump to 2.5.5pre01. + * hotspot.map.in: Update to icedtea-2.5.5pre01. + * patches/boot/ecj-multicatch.patch: + Add new case for sun.security.provider.SecureRandom + 2015-01-21 Andrew John Hughes * NEWS: Set release date. diff -r 2832e84a2b58 -r 5078409f15b9 Makefile.am --- a/Makefile.am Sat Jan 24 02:09:56 2015 +0000 +++ b/Makefile.am Tue Jan 27 17:06:06 2015 +0000 @@ -1,22 +1,22 @@ # Dependencies JDK_UPDATE_VERSION = 75 -BUILD_VERSION = b13 +BUILD_VERSION = b31 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = 3c9f523bf96e -JAXP_CHANGESET = ca26767d3375 -JAXWS_CHANGESET = 9a6c90336922 -JDK_CHANGESET = 1e6db4f8b0f3 -LANGTOOLS_CHANGESET = 960cdffa8b3f -OPENJDK_CHANGESET = 6cf2880aab5e +CORBA_CHANGESET = e8e7ada7819c +JAXP_CHANGESET = 91f042201bb6 +JAXWS_CHANGESET = be14a67897fc +JDK_CHANGESET = e1bfd77b6e1a +LANGTOOLS_CHANGESET = 62af99c4ba80 +OPENJDK_CHANGESET = cf5639f1ca27 -CORBA_SHA256SUM = 7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b -JAXP_SHA256SUM = 84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3 -JAXWS_SHA256SUM = 4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b -JDK_SHA256SUM = e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09 -LANGTOOLS_SHA256SUM = 4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a -OPENJDK_SHA256SUM = 88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1 +CORBA_SHA256SUM = a0ad9c9bec9f9381ff32aa7e0fa4a6cacd30bbf77bb7c4a7a416990e6bf3e254 +JAXP_SHA256SUM = a31439d977298cb49c4c6c7b2fe5a54f5d434d9744c7e9d19da1fd223dfbf6ce +JAXWS_SHA256SUM = c04aa71beccb31dba2b65a5cb31f1de8b614985722b00d8afa55f0c7809de1a1 +JDK_SHA256SUM = a6b60a3d1236cca2649e8071cdcbf56b3697384332daa161b35c6e5c59878f0c +LANGTOOLS_SHA256SUM = fb200d190bd3544dcece20eb3c43619134c6a8be2c8d96ab2c5484b477648621 +OPENJDK_SHA256SUM = 3268954c04d6d9b11f5c56b0ea4ecfc099ee37fc3a9ff9a67bdde42b1d1bdf2f DROP_URL = http://icedtea.classpath.org/download/drops diff -r 2832e84a2b58 -r 5078409f15b9 NEWS --- a/NEWS Sat Jan 24 02:09:56 2015 +0000 +++ b/NEWS Tue Jan 27 17:06:06 2015 +0000 @@ -12,6 +12,62 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 2.5.5 (2015-04-XX): + +* Backports + - S7142035: assert in j.l.instrument agents during shutdown when daemon thread is running + - S7160837: DigestOutputStream does not turn off digest calculation when "close()" is called + - S7195480: javax.smartcardio does not detect cards on Mac OS X + - S8001472: api/java_awt/Window/indexTGF_* tests fail because expected colors aren't equal + - S8011646: SEGV in compiled code with loop predication + - S8012637: Adjust CipherInputStream class to work in AEAD/GCM mode + - S8016545: java.beans.XMLEncoder.writeObject output is wrong + - S8019324: assert(_f2 == 0 || _f2 == f2) failed: illegal field change + - S8019623: Lack of synchronization in AppContext.getAppContext() + - S8021804: Certpath validation fails if validity period of root cert does not include validity period of intermediate cert + - S8022070: Compilation error in stubGenerator_sparc.cpp with some compilers + - S8024061: Exception thrown when drag and drop between two components is executed quickly + - S8028616: Htmleditorkit parser doesn't handle leading slash (/) + - S8028617: Dvorak keyboard mapping not honored when ctrl key pressed + - S8029837: NPE seen in XMLDocumentFragmentScannerImpl.setProperty since 7u40b33 + - S8031290: Adjust call to getisax() for additional words returned + - S8032872: [macosx] Cannot select from JComboBox in a JWindow + - S8032874: ArrayIndexOutOfBoundsException in JTable while clearing data in JTable + - S8032878: Editable combos in table do not behave as expected + - S8033113: wsimport fails on WSDL:header parameter name customization + - S8033696: "assert(thread != NULL) failed: just checking" due to Thread::current() and JNI pthread interaction + - S8036022: D3D: rendering with XOR composite causes InternalError. + - S8036709: Java 7 jarsigner displays warning about cert policy tree + - S8036819: JAB: mneumonics not read for textboxes + - S8036983: JAB:Multiselection Ctrl+CursorUp/Down and ActivateDescenderPropertyChanged event + - S8037477: Reproducible hang of JAWS and webstart application with JAB 2.0.4 + - S8038925: Java with G1 crashes in dump_instance_fields using jmap or jcmd without fullgc + - S8039050: Crash in C2 compiler at Node::rematerialize + - S8039298: assert(base == NULL || t_adr->isa_rawptr() || ! phase->type(base)->higher_equal(TypePtr::NULL_PTR)) + - S8039319: (smartcardio) Card.transmitControlCommand() does not work on Mac OS X + - S8041451: com.sun.jndi.ldap.Connection:ReadTimeout should abandon ldap request + - S8042059: Various fixes to linux/sparc + - S8042857: 14 stuck threads waiting for notification on LDAPRequest + - S8043200: Decrease the preference mode of RC4 in the enabled cipher suite list + - S8043205: Incorrect system traps.h include path + - S8043206: Fix signed vs. unsigned comparison warning in copy_sparc.hpp + - S8043207: Add const to Address argument for Assembler::swap + - S8043210: Add _BIG_ENDIAN define on linux/sparc + - S8043507: javax.smartcardio.CardTerminals.list() fails on MacOSX + - S8044602: Increment minor version of HSx for 7u72 and initialize the build number + - S8044659: Java SecureRandom on SPARC T4 much slower than on x86/Linux + - S8046769: Set T family feature bit on Niagara systems + - S8048080: (smartcardio) javax.smartcardio.Card.openLogicalChannel() dosn't work on MacOSX + - S8049081: Increment hsx 24.72 build to b02 for 7u72-b03 + - S8049542: C2: assert(size_in_words <= (julong)max_jint) failed: no overflow + - S8049787: Increment hsx 24.72 build to b03 for 7u72-b04 + - S8050158: Introduce system property to maintain RC4 preference order + - S8050165: linux-sparcv9: NMT detail causes assert((intptr_t*)younger_sp[FP->sp_offset_in_saved_window()] == (intptr_t*)((intptr_t)sp - STACK_BIAS)) failed: younger_sp must be valid + - S8050167: linux-sparcv9: hs_err file does not show any stack information + - S8055714: Increment hsx 24.72 build to b04 for 7u72-b11 + - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure + - S8068405: GenerateCurrencyData throws RuntimeException for old data + New in release 2.5.4 (2015-01-21): * Security fixes @@ -38,11 +94,11 @@ - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems - S7028073: The currency symbol for Peru is wrong - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true - - S7183753: [TEST] Some colon in the diff for this test - S7077119, PR2165, G534118: remove past transition dates from CurrencyData.properties file - S7085757: Currency Data: ISO 4217 Amendment 152 - S7169142: CookieHandler does not work with localhost - S7172012, PR2067: Make test-in-build an option (Queens) + - S7183753: [TEST] Some colon in the diff for this test - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations - S7195759: ISO 4217 Amendment 154 - S8000897, RH1155012: VM crash in CompileBroker diff -r 2832e84a2b58 -r 5078409f15b9 configure.ac --- a/configure.ac Sat Jan 24 02:09:56 2015 +0000 +++ b/configure.ac Tue Jan 27 17:06:06 2015 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.5.4], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.5.5pre01], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile]) diff -r 2832e84a2b58 -r 5078409f15b9 hotspot.map.in --- a/hotspot.map.in Sat Jan 24 02:09:56 2015 +0000 +++ b/hotspot.map.in Tue Jan 27 17:06:06 2015 +0000 @@ -1,3 +1,3 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 6144ca9b6a72 4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34 +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ bbda609c9d24 006cee4f215f228f1131a8c5cfcd3e1d9d33f8fe980a1172bf208606a0100b68 aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 4d25046abb67 60da8d427f7e3659f701e54c763ea8366d8af3280c7e10670004938b2f07efef diff -r 2832e84a2b58 -r 5078409f15b9 patches/boot/ecj-multicatch.patch --- a/patches/boot/ecj-multicatch.patch Sat Jan 24 02:09:56 2015 +0000 +++ b/patches/boot/ecj-multicatch.patch Tue Jan 27 17:06:06 2015 +0000 @@ -552,3 +552,54 @@ // Missing VK is okay return 0; } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SecureRandom.java openjdk-boot/jdk/src/share/classes/sun/security/provider/SecureRandom.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SecureRandom.java 2015-01-27 03:06:33.100525224 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SecureRandom.java 2015-01-27 03:15:51.615360901 +0000 +@@ -94,14 +94,22 @@ + * and sets the seed, if given. + */ + private void init(byte[] seed) { ++ Exception ex = null; ++ + try { + /* + * Use the local SUN implementation to avoid native + * performance overhead. + */ + digest = MessageDigest.getInstance("SHA", "SUN"); +- } catch (NoSuchProviderException | NoSuchAlgorithmException e) { +- // Fallback to any available. ++ } catch (NoSuchProviderException e) { ++ ex = e; ++ } catch (NoSuchAlgorithmException e) { ++ ex = e; ++ } ++ ++ // Fallback to any available. ++ if (ex != null) { + try { + digest = MessageDigest.getInstance("SHA"); + } catch (NoSuchAlgorithmException exc) { +@@ -265,6 +273,7 @@ + */ + private void readObject(java.io.ObjectInputStream s) + throws IOException, ClassNotFoundException { ++ Exception ex = null; + + s.defaultReadObject (); + +@@ -274,7 +283,13 @@ + * performance overhead. + */ + digest = MessageDigest.getInstance("SHA", "SUN"); +- } catch (NoSuchProviderException | NoSuchAlgorithmException e) { ++ } catch (NoSuchProviderException e) { ++ ex = e; ++ } catch (NoSuchAlgorithmException e) { ++ ex = e; ++ } ++ ++ if (ex != null) { + // Fallback to any available. + try { + digest = MessageDigest.getInstance("SHA"); From jkang at redhat.com Tue Jan 27 17:09:06 2015 From: jkang at redhat.com (Jie Kang) Date: Tue, 27 Jan 2015 12:09:06 -0500 (EST) Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <54C7BD2D.1090602@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> <54BF7121.4070103@redhat.com> <54C61F6B.3090504@redhat.com> <1003662908.381675.1422286361716.JavaMail.zimbra@redhat.com> <54C7B0F8.5000709@redhat.com> <701744361.989547.1422374461447.JavaMail.zimbra@redhat.com> <54C7BD2D.1090602@redhat.com> Message-ID: <1429572036.1036053.1422378546846.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 01/27/2015 05:01 PM, Jie Kang wrote: > > > > > > ----- Original Message ----- > >> On 01/26/2015 04:32 PM, Jie Kang wrote: > >>> > >>> > >>> ----- Original Message ----- > >>>> On 01/21/2015 10:28 AM, Jiri Vanek wrote: > >>>>> On 01/06/2015 09:19 PM, Jacob Wisor wrote: > >>>>>> On 01/06/2015 at 01:25 PM Jacob Wisor wrote: > >>>>>>> On 01/05/2015 at 05:19 PM Jie Kang wrote: > >>>>>>>> Hello, > >>>>>>>> > >>>>>>>> This patch slightly modifies JNLPRuntime's online detection function > >>>>>>>> to > >>>>>>>> always perform the check, even if it has been called before. > >>>>> > >>>>> As Jacob is mentioning, this really is causing performance overkill. > >>>>>>>> > >>>>>>>> Previously, if the boolean onlineDetected wasn't null, the check > >>>>>>>> would > >>>>>>>> be > >>>>>>>> skipped. This caused a bug when downloading multiple resources. > >>>>> > >>>>> The idea of the check was, that first resource to be downloaded, is > >>>>> mostly > >>>>> the most crucial - jnlp, > >>>>> jnlpHref, mainclass, jar with main class... So this one have to be > >>>>> downlaoded - if it is not, then > >>>>> we can assume the network inaccessible. > >>>>>>>> > >>>>>>>> For each resource being downloaded, we perform the detection check. > >>>>>>>> For > >>>>>>>> two > >>>>>>>> consecutive resources: If for the first resource, we detected > >>>>>>>> offline, > >>>>>>>> the > >>>>>>>> boolean onlineDetected would be set to false. Then for the second > >>>>>>>> resource, > >>>>>>>> the detection check would be skipped, even if that resource was able > >>>>>>>> to > >>>>>>>> be > >>>>>>>> connected to. This would result in the second resource being unable > >>>>>>>> to > >>>>>>>> be > >>>>>>>> downloaded, even though it definitely could and should be. The patch > >>>>>>>> fixes > >>>>>>>> this. > >>>>> > >>>>> Do you have some example of this behavior causing any real issues? > >>>>> Maybe just sync the method or otherwise ensure that while isOnline is > >>>>> null, > >>>>> only one download can be > >>>>> done? > >>>>> > >>>>>>>> > >>>>>>>> Thoughts? > >>>>>>> > >>>>>>> Although I did not test it, seems to be working as advertised. > >>>>>>> > >>>>>>> While looking at the code, I was wondering why > >>>>>>> JNLPRuntime.onlineDetected > >>>>>>> was > >>>>>>> a Boolean object instead of a primitive. And, apart from that, the > >>>>>>> whole > >>>>>>> offline detection mechanism seems overly complex and unreliable to > >>>>>>> me. > >>>>>>> I am also not really convinced that > >>>>>>> > >>>>>>> public static void detectOnline(URL location) { > >>>>>>> if (onlineDetected != null) { > >>>>>>> return; > >>>>>>> } > >>>>>>> try { > >>>>>>> if (location.getProtocol().equals("file")) { > >>>>>>> return; > >>>>>>> } > >>>>>>> //Checks the offline/online status of the system. > >>>>>>> InetAddress.getByName(location.getHost()); > >>>>>>> } catch (UnknownHostException ue) { [?] > >>>>>>> > >>>>>>> is the best or most reliable way in J2SE to test for the > >>>>>>> online/offline > >>>>>>> status > >>>>>>> of a system. Do systems having no DNS server configured or which is > >>>>>>> unreachable > >>>>>>> properly resolve their name? And, even if they do, does this really > >>>>>>> actually > >>>>>>> prove them being online? > >>>>>>> > >>>>>>> Now, I was considering a few different options to reliably detecting > >>>>>>> a > >>>>>>> system's > >>>>>>> online/offline status. Initially, I was thinking about pinging the > >>>>>>> default > >>>>>>> gateway. However, hosts with public IPs may have their public IP as > >>>>>>> the > >>>>>>> default > >>>>>>> gateway configured. So, the most reliable way I came up with is to > >>>>>>> send > >>>>>>> an echo > >>>>>>> broadcast (on the local subnet) request. Of course, this does not > >>>>>>> prove > >>>>>>> the > >>>>>>> system being connected to the /public/ internet. But this is not > >>>>>>> neccessary > >>>>>>> either because JNLP applications may be (which they often are) served > >>>>>>> on > >>>>>>> an > >>>>>>> intranet only. So, would you mind investigating this further? > >>>>> > >>>>> Before doing this looks-really-stupid > >>>>> InetAddress.getByName(location.getHost()); i was elaborating > >>>>> on this, and have nnot found a generic way how to veryfi online status > >>>>> from > >>>>> java. > >>>>>> > >>>>>> Oh, I forgot: I am sure we do not want to make a DNS request for every > >>>>>> resource > >>>>>> we need to download, even when subsequent DNS resolution requests are > >>>>>> pulled > >>>>> > >>>>> yah, to much correct. > >>>>>> from the local DNS cache. So, although this patch fixes the bug, it is > >>>>>> very > >>>>>> inefficient and impractical because it induces an avoidable > >>>>>> performance > >>>>>> penalty. > >>>>>> In other words, the online detection *logic* itself needs to be fixed. > >>>>>> > >>>>>> @Jie Kang: > >>>>>> Thank you for spotting this bug. > >>>>>> > >>>>> > >>>>> Is it really an bug? It actually eliminates the benefits of offline > >>>>> environment. > >>>>> > >>>>> >>> consecutive resources: If for the first resource, we detected > >>>>> >>> offline, > >>>>> >>> the > >>>>> >>> boolean onlineDetected would be set to false. Then for the > >>>>> >>> second > >>>>> >>> resource, > >>>>> >>> the detection check would be skipped, even if that resource was > >>>>> >>> able > >>>>> >>> to be > >>>>> >>> connected to. This would result in the second resource being > >>>>> >>> unable > >>>>> >>> to > >>>>> >>> be > >>>>> >>> downloaded, even though it definitely could and should be. The > >>>>> >>> patch > >>>>> >>> fixes > >>>>> >>> this. > >>>>> > >>>>> Thinking about it - how it is possible that first resource could not be > >>>>> downloaded, but second can > >>>>> be, and how it is possible that first one can be missed, while second > >>>>> one > >>>>> not? > >>>>> > >>>>> > >>>>> Maybe before deciding that environment i onnline/offline - we may try > >>>>> to > >>>>> download two or three > >>>>> resources? > >>>>> > >>>>> > >>>>> > >>>> > >>>> One more thing crossed my mind - if the check is done everytime > >>>> ressource > >>>> is > >>>> download. > >>>> > >>>> Then the output of isOnline() method is actually prety undetermined. > >>>> > >>>> > >>>> ? > >>> > >>> Hello, > >>> > >>>>> Thinking about it - how it is possible that first resource could not be > >>>>> downloaded, but second can > >>>>> be, and how it is possible that first one can be missed, while second > >>>>> one > >>>>> not? > >>>>> > >>> > >>> This can occur in edge incidents such as: > >>> > >>> Resource 1 : Can't download, but it is in cache so we use the cache one. > >>> > >>> Resource 2 : Not in cache, but we can download, so we download it into > >>> cache. > >>> > >>> Applet now works. > >>> > >>> > >>> However, with the online detection as it is, the edge cases such as above > >>> will fail. > >>> > >>>>> Is it really an bug? It actually eliminates the benefits of offline > >>>>> environment. > >>> > >>> In terms of the offline environment, this should really only be > >>> controlled > >>> by the isOfflineForced setting rather than the isOnline setting. For any > >>> resource located off-site, the only way you know if that resource is > >>> accessible or not is by attempting to access it. The idea of an 'online' > >>> state is flawed in this regard. The idea of an 'offline' state is fine > >>> though. If the user sets it to offline, the rules are simple, we don't > >>> make any connection attempts. Otherwise, we should always be attempting > >>> to > >>> access them. > >>> > >>> The more I think about this, I feel like we shouldn't be using isOnline() > >>> to check when trying to download a resource. We should just try to > >>> download it unless offlineIsForced. If it fails to download, the code > >>> already deals with it as safely as possible. The online check beforehand > >>> isn't really beneficial here. > >>> > >>> > >>> Regards, > >>> > >>>> > >>>> > >>>> J. > >>>> > >>> > >> > >> > >> Ok. Now I understand better. > >> > >> > >> This should happen only if javaws was killed during downloading. And then > >> clearing the cache is the > >> cure. > >> > >> > >> But I see your point. > >> > >> > >> > >> If -Xoffline is specified, I would like to keep current approach. > >> > >> > >> For the online detection, I'm really concerned about isOnline result (and > >> so > >> behaviour of system) > >> > >> > >> So brainstroming (valid only if no xOffline is specified): > >> > >> on begging assume environment is offline (no check was done) > >> The check on "is online" will be done always from now > >> If suddenly the resource is being avaiable online , switch to "online > >> verified" and consider > >> environment is online. > >> No more checks are done from here. > >> > >> with Xoffline - no check is done ever. > >> > >> What do you think? > > > > Hello, > > > > If I understood correctly, I think the change to make it behave like above > > would be simple: > > > > In JNLPRuntime: > > public static void detectOnline(URL location) { > > if (onlineDetected != null) { > > return; > > } > > > > change: if (onlineDetected != null) { > > [*] If so, then with related Boolean -> boolean change. Sorry can you explain this comment a little more? > > > to: if (onlineDetected == true) { > > > > > > However, I wonder if we need to make it so complicated. > > > > I see two situations: > > > > A: Xoffline : no check is done ever and we never download : I think > > ResourceTracker.initializeResource() will need some patching for this. But > > I already wrote one, just haven't sent it yet. > > > > B: 'Online' : for each resource, try online and if it fails, try cache, > > otherwise error. This is already coded safely. > I doubt. > > > > > My question here is: What is benefit of doing isOnline check? Where else > > is this used outside of initializing and downloading resources? > > Find usages is your friend. > > Especially the one in resourceTracekr is imho critical. Hahah, I think the opposite. The ones outside of ResourceTracker are great, but the one in ResourceTracker is not as good. > > > > When we use URLConnection object and try to initialize the resource, > > this already does a check for us. As well, the code already deals with > > the possible situations here. > > This is not working as smotthly as you expect. Please be careful with any > fixes here, otherwise you > will break offline capabilities ITW with effort achieved. Can you explain a little more? Possibly provide some examples and describe what you mean by offline capabilities? > > > > > I do not think the isOnline check before trying to use URLConnection > > object has a performance benefit that justifies the extra complexity in > > code. > > No it does not. But make life much easier. > > > > > > > > Regards, > > > > Looking back to the orriginal patch which introduced offline capabilities: > > isOnlineDetected > isOnline > and > detectOnline > > > and their's usages - > 4 (+3 comfortable) > 2 > and > 3 > > it is not much, but the whole concept of those have to be revisited. If you > grant that all the itw > javaws and applets will work offline, than you can do whatever you need. But > then I would recommand > you to remove the offline capabilities patch, and implement the whole design > on your own. I'd rather not remove the patch :\ > > > I'm quite afraid to change individual parts of this patch. And I do not wont > some functions to > return random values. > > > Even the change of yours [* above] may have side effects. But It may be > what is seek. Fix for your > issue, and still keeping all the behaviours I would like to have. I know for sure the [*] change will fix the issue I am having. I also strongly think that it will keep the behaviours you'd like to have, but this would need a bit more review. But, if you can specify exactly what behaviours you are looking for, then it will be easier to see if this fix works or not. At the same time, I still feel a call to detectOnline() shouldn't return just because it's been called before. I think the only cost of the original patch is in performance and in my opinion it is extremely small. It keeps pretty much everything you want, fixes my issue, and has one drawback that I can see, which is performance. However, how big of a performance drop is this? I don't think it's even close to noticeable. Regards, > > J. > -- Jie Kang OpenJDK Team - Software Engineering Intern From jvanek at redhat.com Tue Jan 27 16:08:38 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 27 Jan 2015 17:08:38 +0100 Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <1395537984.989717.1422374478681.JavaMail.zimbra@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> <54BF7121.4070103@redhat.com> <54C61F6B.3090504@redhat.com> <54C7AF98.3080902@redhat.com> <509050979.973312.1422373064546.JavaMail.zimbra@redhat.com> <54C7B176.4010600@redhat.com> <1395537984.989717.1422374478681.JavaMail.zimbra@redhat.com> Message-ID: <54C7B806.3080505@redhat.com> On 01/27/2015 05:01 PM, Jie Kang wrote: > > > ----- Original Message ----- >> On 01/27/2015 04:37 PM, Jie Kang wrote: >>> >>> >>> ----- Original Message ----- >>>> On 01/27/2015 04:16 PM, Jacob Wisor wrote: >>>>> On 01/26/2015 at 12:05 PM, Jiri Vanek wrote: >>>>>> On 01/21/2015 10:28 AM, Jiri Vanek wrote: >>>>>>> On 01/06/2015 09:19 PM, Jacob Wisor wrote: >>>>>>>> On 01/06/2015 at 01:25 PM, Jacob Wisor wrote: >>>>>>>>> On 01/05/2015 at 05:19 PM, Jie Kang wrote: >>>>> [?] >>>>>>>> @Jie Kang: >>>>>>>> Thank you for spotting this bug. >>>>>>>> >>>>>>> >>>>>>> Is it really an bug? It actually eliminates the benefits of offline >>>>>>> environment. >>>>>>> >>>>>>>>>> consecutive resources: If for the first resource, we detected >>>>>>>>>> offline, >>>>>>>>>> the >>>>>>>>>> boolean onlineDetected would be set to false. Then for the second >>>>>>>>>> resource, >>>>>>>>>> the detection check would be skipped, even if that resource was able >>>>>>>>>> to be >>>>>>>>>> connected to. This would result in the second resource being unable >>>>>>>>>> to >>>>>>>>>> be >>>>>>>>>> downloaded, even though it definitely could and should be. The patch >>>>>>>>>> fixes >>>>>>>>>> this. >>>>>>> >>>>>>> Thinking about it - how it is possible that first resource could not be >>>>>>> downloaded, but second can >>>>>>> be, and how it is possible that first one can be missed, while second >>>>>>> one >>>>>>> not? >>>>>>> >>>>>>> >>>>>>> Maybe before deciding that environment i onnline/offline - we may try >>>>>>> to >>>>>>> download two or three >>>>>>> resources? >>>>>> >>>>>> One more thing crossed my mind - if the check is done everytime >>>>>> ressource >>>>>> is download. >>>>>> >>>>>> Then the output of isOnline() method is actually prety undetermined. >>>>> >>>>> Is it possible for InetAddress.getByName() to be asynchronious? This >>>>> could >>>>> explain >>>>> isOnline() to return false when called for the first time in some cases. >>>>> Maybe some >>>>> other asynchronious part of the code is causing this effect. >>>>> >>>>> Jacob >>>>> >>>> I had a different issue in mind: >>>> >>>> > >>>> > Resource 1 : Can't download, but it is in cache so we use the cache >>>> > one. >>>> > >>>> isOnline will return false if called now >>>> >>>> > >>>> > Resource 2 : Not in cache, but we can download, so we download it into >>>> > cache. >>>> > >>>> isOnline will now return true. >>> >>> >>> Hello, >>> >>> That isn't true with current implementation of ResourceTracker and >>> JNLPRuntime. >>> >>> See ResourceTracker.initializeResource(), JNLPRuntime.detectOnline() and >>> JNLPRuntime.isOnline(). >>> >>> >> Yes I know. But will be valid if we apply your patch. Or not? > > Yeah it will be valid with the patch. Thats something I would like to avoid J. From jvanek at redhat.com Tue Jan 27 17:27:01 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 27 Jan 2015 18:27:01 +0100 Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <1429572036.1036053.1422378546846.JavaMail.zimbra@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> <54BF7121.4070103@redhat.com> <54C61F6B.3090504@redhat.com> <1003662908.381675.1422286361716.JavaMail.zimbra@redhat.com> <54C7B0F8.5000709@redhat.com> <701744361.989547.1422374461447.JavaMail.zimbra@redhat.com> <54C7BD2D.1090602@redhat.com> <1429572036.1036053.1422378546846.JavaMail.zimbra@redhat.com> Message-ID: <54C7CA65.4050301@redhat.com> ...snip... >>>> >>>> >>>> >>>> If -Xoffline is specified, I would like to keep current approach. >>>> >>>> >>>> For the online detection, I'm really concerned about isOnline result (and >>>> so >>>> behaviour of system) >>>> >>>> >>>> So brainstroming (valid only if no xOffline is specified): >>>> >>>> on begging assume environment is offline (no check was done) >>>> The check on "is online" will be done always from now >>>> If suddenly the resource is being avaiable online , switch to "online >>>> verified" and consider >>>> environment is online. >>>> No more checks are done from here. >>>> >>>> with Xoffline - no check is done ever. >>>> >>>> What do you think? >>> >>> Hello, >>> >>> If I understood correctly, I think the change to make it behave like above >>> would be simple: >>> >>> In JNLPRuntime: >>> public static void detectOnline(URL location) { >>> if (onlineDetected != null) { >>> return; >>> } >>> >>> change: if (onlineDetected != null) { >> >> [*] If so, then with related Boolean -> boolean change. > > Sorry can you explain this comment a little more? If the null will be never used, then it have to type of boolean, not Boolean. And I think it will not be. the default value now will be false. [***] I have now realized - how slow it will be if the environment really will be offline? It will keep "pinging" all resources, and actually dying with timeouts. ... You will have to measures this on sme biger (all will start offline with current appracha and mostly sometimes dye later with runtimeexception) There may be hiddden performance drop. (as opposite to current state, where is performance up when you plug out the cable) > >> >>> to: if (onlineDetected == true) { >>> >>> >>> However, I wonder if we need to make it so complicated. >>> >>> I see two situations: >>> >>> A: Xoffline : no check is done ever and we never download : I think >>> ResourceTracker.initializeResource() will need some patching for this. But >>> I already wrote one, just haven't sent it yet. >>> >>> B: 'Online' : for each resource, try online and if it fails, try cache, >>> otherwise error. This is already coded safely. >> I doubt. >> >>> >>> My question here is: What is benefit of doing isOnline check? Where else >>> is this used outside of initializing and downloading resources? >> >> Find usages is your friend. >> >> Especially the one in resourceTracekr is imho critical. > > Hahah, I think the opposite. The ones outside of ResourceTracker are great, but the one in ResourceTracker is not as good. And how will you proceed without them? I doubt it will work. > >>> >>> When we use URLConnection object and try to initialize the resource, >>> this already does a check for us. As well, the code already deals with >>> the possible situations here. >> >> This is not working as smotthly as you expect. Please be careful with any >> fixes here, otherwise you >> will break offline capabilities ITW with effort achieved. > > Can you explain a little more? Possibly provide some examples and describe what you mean by offline capabilities? [**] That every part of ITW works even if you unplug the utp cable and turn of WiFi. Its crucial part of javaws implementation, which was long time (before offline patch) missing. As benefit, also appelts works offline. And it is something What I also wont to keep. > > >> >>> >>> I do not think the isOnline check before trying to use URLConnection >>> object has a performance benefit that justifies the extra complexity in >>> code. >> >> No it does not. But make life much easier. >>> >>> >>> >>> Regards, >> >> >> >> Looking back to the orriginal patch which introduced offline capabilities: >> >> isOnlineDetected >> isOnline >> and >> detectOnline >> >> >> and their's usages - >> 4 (+3 comfortable) >> 2 >> and >> 3 >> >> it is not much, but the whole concept of those have to be revisited. If you >> grant that all the itw >> javaws and applets will work offline, than you can do whatever you need. But >> then I would recommand >> you to remove the offline capabilities patch, and implement the whole design >> on your own. > > I'd rather not remove the patch :\ But it may be best way, Remove it, and try to reimplemnt the offline solution with the bug you found fixed. > >> >> >> I'm quite afraid to change individual parts of this patch. And I do not wont >> some functions to >> return random values. >> >> >> Even the change of yours [* above] may have side effects. But It may be >> what is seek. Fix for your >> issue, and still keeping all the behaviours I would like to have. > > I know for sure the [*] change will fix the issue I am having. I also strongly think that it will keep the behaviours you'd like to have, Ok. So well.. lets try it. (but be aware of [***]) I would like to know Jacob's opinion about [*] [**] and [***] :) > but this would need a bit more review. But, if you can specify exactly what behaviours you are looking for, then it will be easier to see if this fix works or not. > explained in [**] > At the same time, I still feel a call to detectOnline() shouldn't return just because it's been called before. I think the only cost of the original patch is in performance and in my opinion it is extremely small. It keeps pretty much everything you want, fixes my issue, and has one drawback that I can see, which is performance. However, how big of a performance drop is this? I don't think it's even close to noticeable. > > > Regards, > >> J. From fstrba at suse.com Tue Jan 27 17:32:47 2015 From: fstrba at suse.com (Fridrich Strba) Date: Tue, 27 Jan 2015 10:32:47 -0700 Subject: [SECURITY] IcedTea 1.13.6 for OpenJDK 6 Released! In-Reply-To: <29273650.1704982.1422374162962.JavaMail.zimbra@redhat.com> References: <20150124003852.GA29532@carrie.the212.com> <54C7396B.30709@suse.com> <29273650.1704982.1422374162962.JavaMail.zimbra@redhat.com> Message-ID: <54C7694F0200000C000FC421@prv-mh.provo.novell.com> Hello, Andrew, https://build.opensuse.org/package/binaries/Java:Factory/java-1_6_0-openjdk?repository=openSUSE_Factory_ARM witnesses about it being able at least to build the aarch64. Cheers F. >>> Andrew Hughes 01/27/15 4:56 PM >>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2083 I haven't backported it to the 1.13.x because it's hard to test. The only AArch64 machines I have access to only have OpenJDK 7 and so can't build 6. From omajid at redhat.com Tue Jan 27 17:50:11 2015 From: omajid at redhat.com (Omair Majid) Date: Tue, 27 Jan 2015 12:50:11 -0500 Subject: [rfc][icedtea-web] dont expect junit have hamcrest included In-Reply-To: <54C7AF11.9000805@redhat.com> References: <54C620FF.3080407@redhat.com> <20150126152557.GA2720@redhat.com> <54C7AF11.9000805@redhat.com> Message-ID: <20150127175011.GA2938@redhat.com> * Jiri Vanek [2015-01-27 10:30]: > May actually any "distributions somehow transitively include > hamcrest.jar in the claspath of junit.jar" work in our > makefile-based cslasspath settings approach? Actually, I am not sure about this. It's quite clear in the docs that if you use `java -jar some.jar`, CLASSPATH is ignored, but it's not very clear from the docs whether `java -cp some.jar` will ignore or use Class-Path defined in the manifest.file. Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jkang at icedtea.classpath.org Wed Jan 28 15:14:17 2015 From: jkang at icedtea.classpath.org (jkang at icedtea.classpath.org) Date: Wed, 28 Jan 2015 15:14:17 +0000 Subject: /hg/icedtea-web: Refactor initialize/download runnable out of Re... Message-ID: changeset 16760ac4a689 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=16760ac4a689 author: Jie Kang date: Wed Jan 28 10:12:28 2015 -0500 Refactor initialize/download runnable out of ResourceTracker and add tests 2015-01-28 Jie Kang Refactor initialize/download runnable out of ResourceTracker and add tests * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: moved Downloader runnable into ResourceDownloader along with initialize and download functions and their sub-functions. Removed prefetchTracker system and queue. Moved downloadOptions into Resource.java. * netx/net/sourceforge/jnlp/cache/Resource.java: added downloadOptions field and getter/setter * netx/net/sourceforge/jnlp/cache/ResourceDownloader.java: (getUrlResponseCode), (getUrlResponseCodeWithRedirectonResult) (initializeResource), (findBestUrl), (downloadResource), (getDownloadConnection), (downloadPackGzFile), (downloadGZipFile), (downloadFile), (storeEntryFields), (writeDownloadToFile)(uncompressGzip), (uncompressPackGz): new Runnable class for initializing and downloading resources. Code from ResourceTracker.java * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java: tests for downloading/initializing functions and their subfunctions moved to ResourceDownloaderTest.java * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java: relevant tests from ResourceTrackerTest.java moved here. (testDownloadResource), (testDownloadPackGzResource) (testDownloadVersionedResource), (testDownloadVersionedPackGzResource) (testDownloadLocalResourceFails), (testDownloadNotExistingResourceFails): New tests added diffstat: ChangeLog | 26 + netx/net/sourceforge/jnlp/cache/Resource.java | 16 +- netx/net/sourceforge/jnlp/cache/ResourceDownloader.java | 445 ++++++ netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 644 +--------- tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java | 498 +++++++ tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java | 210 +--- 6 files changed, 991 insertions(+), 848 deletions(-) diffs (truncated from 2037 to 500 lines): diff -r 918fb141b815 -r 16760ac4a689 ChangeLog --- a/ChangeLog Fri Jan 23 15:35:46 2015 +0100 +++ b/ChangeLog Wed Jan 28 10:12:28 2015 -0500 @@ -1,3 +1,29 @@ +2015-01-28 Jie Kang + + Refactor initialize/download runnable out of ResourceTracker and add tests + * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: moved Downloader + runnable into ResourceDownloader along with initialize and download + functions and their sub-functions. Removed prefetchTracker system and + queue. Moved downloadOptions into Resource.java. + * netx/net/sourceforge/jnlp/cache/Resource.java: added downloadOptions + field and getter/setter + * netx/net/sourceforge/jnlp/cache/ResourceDownloader.java: + (getUrlResponseCode), (getUrlResponseCodeWithRedirectonResult) + (initializeResource), (findBestUrl), (downloadResource), + (getDownloadConnection), (downloadPackGzFile), (downloadGZipFile), + (downloadFile), (storeEntryFields), (writeDownloadToFile)(uncompressGzip), + (uncompressPackGz): new Runnable class for initializing and downloading + resources. Code from ResourceTracker.java + * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java: + tests for downloading/initializing functions and their subfunctions moved + to ResourceDownloaderTest.java + * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java: + relevant tests from ResourceTrackerTest.java moved here. + (testDownloadResource), (testDownloadPackGzResource) + (testDownloadVersionedResource), (testDownloadVersionedPackGzResource) + (testDownloadLocalResourceFails), (testDownloadNotExistingResourceFails): + New tests added + 2014-01-23 Jiri Vanek Returned accidentally removed creation of shortcuts for jnlp applications. diff -r 918fb141b815 -r 16760ac4a689 netx/net/sourceforge/jnlp/cache/Resource.java --- a/netx/net/sourceforge/jnlp/cache/Resource.java Fri Jan 23 15:35:46 2015 +0100 +++ b/netx/net/sourceforge/jnlp/cache/Resource.java Wed Jan 28 10:12:28 2015 -0500 @@ -23,6 +23,7 @@ import java.util.List; import java.util.Set; +import net.sourceforge.jnlp.DownloadOptions; import net.sourceforge.jnlp.Version; import net.sourceforge.jnlp.util.UrlUtils; import net.sourceforge.jnlp.util.WeakList; @@ -47,7 +48,6 @@ * @version $Revision: 1.9 $ */ public class Resource { - // todo: fix resources to handle different versions // todo: IIRC, any resource is checked for being up-to-date @@ -97,6 +97,9 @@ /** Update policy for this resource */ private final UpdatePolicy updatePolicy; + /** Download options for this resource */ + private DownloadOptions downloadOptions; + /** * Create a resource. */ @@ -414,6 +417,14 @@ } } + public void setDownloadOptions(DownloadOptions downloadOptions) { + this.downloadOptions = downloadOptions; + } + + public DownloadOptions getDownloadOptions() { + return this.downloadOptions; + } + @Override public int hashCode() { // FIXME: should probably have a better hashcode than this, but considering @@ -440,7 +451,4 @@ public String toString() { return "location=" + location.toString() + " state=" + getStatusString(); } - - - } diff -r 918fb141b815 -r 16760ac4a689 netx/net/sourceforge/jnlp/cache/ResourceDownloader.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java Wed Jan 28 10:12:28 2015 -0500 @@ -0,0 +1,445 @@ +package net.sourceforge.jnlp.cache; + +import static net.sourceforge.jnlp.cache.Resource.Status.CONNECTED; +import static net.sourceforge.jnlp.cache.Resource.Status.CONNECTING; +import static net.sourceforge.jnlp.cache.Resource.Status.DOWNLOADED; +import static net.sourceforge.jnlp.cache.Resource.Status.DOWNLOADING; +import static net.sourceforge.jnlp.cache.Resource.Status.ERROR; +import static net.sourceforge.jnlp.cache.Resource.Status.PRECONNECT; +import static net.sourceforge.jnlp.cache.Resource.Status.PREDOWNLOAD; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLConnection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.jar.JarOutputStream; +import java.util.jar.Pack200; +import java.util.zip.GZIPInputStream; + +import net.sourceforge.jnlp.DownloadOptions; +import net.sourceforge.jnlp.Version; +import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.security.ConnectionFactory; +import net.sourceforge.jnlp.util.HttpUtils; +import net.sourceforge.jnlp.util.logging.OutputController; + +public class ResourceDownloader implements Runnable { + + private final Resource resource; + private final Object lock; + + public ResourceDownloader(Resource resource, Object lock) { + this.resource = resource; + this.lock = lock; + } + + static int getUrlResponseCode(URL url, Map requestProperties, ResourceTracker.RequestMethods requestMethod) throws IOException { + return getUrlResponseCodeWithRedirectonResult(url, requestProperties, requestMethod).result; + } + + /** + * Connects to the given URL, and grabs a response code and redirecton if + * the URL uses the HTTP protocol, or returns an arbitrary valid HTTP + * response code. + * + * @return the response code if HTTP connection and redirection value, or + * HttpURLConnection.HTTP_OK and null if not. + * @throws IOException + */ + static CodeWithRedirect getUrlResponseCodeWithRedirectonResult(URL url, Map requestProperties, ResourceTracker.RequestMethods requestMethod) throws IOException { + CodeWithRedirect result = new CodeWithRedirect(); + URLConnection connection = ConnectionFactory.getConnectionFactory().openConnection(url); + + for (Map.Entry property : requestProperties.entrySet()) { + connection.addRequestProperty(property.getKey(), property.getValue()); + } + + if (connection instanceof HttpURLConnection) { + HttpURLConnection httpConnection = (HttpURLConnection) connection; + httpConnection.setRequestMethod(requestMethod.toString()); + + int responseCode = httpConnection.getResponseCode(); + + /* Fully consuming current request helps with connection re-use + * See http://docs.oracle.com/javase/1.5.0/docs/guide/net/http-keepalive.html */ + HttpUtils.consumeAndCloseConnectionSilently(httpConnection); + + result.result = responseCode; + } + + Map> header = connection.getHeaderFields(); + for (Map.Entry> entry : header.entrySet()) { + OutputController.getLogger().log("Key : " + entry.getKey() + " ,Value : " + entry.getValue()); + } + /* + * Do this only on 301,302,303(?)307,308> + * Now setting value for all, and lets upper stack to handle it + */ + String possibleRedirect = connection.getHeaderField("Location"); + if (possibleRedirect != null && possibleRedirect.trim().length() > 0) { + result.URL = new URL(possibleRedirect); + } + ConnectionFactory.getConnectionFactory().disconnect(connection); + + return result; + + } + + @Override + public void run() { + if (resource.isSet(PRECONNECT) && !resource.hasFlags(EnumSet.of(ERROR, CONNECTING, CONNECTED))) { + resource.changeStatus(EnumSet.noneOf(Resource.Status.class), EnumSet.of(CONNECTING)); + resource.fireDownloadEvent(); // fire CONNECTING + initializeResource(); + } + if (resource.isSet(PREDOWNLOAD) && !resource.hasFlags(EnumSet.of(ERROR, DOWNLOADING, DOWNLOADED))) { + resource.changeStatus(EnumSet.noneOf(Resource.Status.class), EnumSet.of(DOWNLOADING)); + resource.fireDownloadEvent(); // fire CONNECTING + downloadResource(); + } + } + + /** + * Open a URL connection and get the content length and other + * fields. + */ + private void initializeResource() { + //verify connection + if(!JNLPRuntime.isOfflineForced()){ + JNLPRuntime.detectOnline(resource.getLocation()/*or doenloadLocation*/); + } + + CacheEntry entry = new CacheEntry(resource.getLocation(), resource.getRequestVersion()); + entry.lock(); + + try { + File localFile = CacheUtil.getCacheFile(resource.getLocation(), resource.getDownloadVersion()); + long size = 0; + boolean current = true; + //this can be null, as it is always filled in online mode, and never read in offline mode + URLConnection connection = null; + if (localFile != null) { + size = localFile.length(); + } else if (!JNLPRuntime.isOnline()) { + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "You are trying to get resource " + resource.getLocation().toExternalForm() + " but you are in offline mode, and it is not in cache. Attempting to continue, but you may expect failure"); + } + if (JNLPRuntime.isOnline()) { + // connect + URL finalLocation = findBestUrl(resource); + + if (finalLocation == null) { + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "Attempted to download " + resource.getLocation() + ", but failed to connect!"); + throw new NullPointerException("finalLocation == null"); // Caught below + } + + resource.setDownloadLocation(finalLocation); + connection = ConnectionFactory.getConnectionFactory().openConnection(finalLocation); // this won't change so should be okay not-synchronized + connection.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip"); + + size = connection.getContentLength(); + current = CacheUtil.isCurrent(resource.getLocation(), resource.getRequestVersion(), connection.getLastModified()) && resource.getUpdatePolicy() != UpdatePolicy.FORCE; + if (!current) { + if (entry.isCached()) { + entry.markForDelete(); + entry.store(); + // Old entry will still exist. (but removed at cleanup) + localFile = CacheUtil.makeNewCacheFile(resource.getLocation(), resource.getDownloadVersion()); + CacheEntry newEntry = new CacheEntry(resource.getLocation(), resource.getRequestVersion()); + newEntry.lock(); + entry.unlock(); + entry = newEntry; + } + } + } + synchronized (resource) { + resource.setLocalFile(localFile); + // resource.connection = connection; + resource.setSize(size); + resource.changeStatus(EnumSet.of(PRECONNECT, CONNECTING), EnumSet.of(CONNECTED, PREDOWNLOAD)); + + // check if up-to-date; if so set as downloaded + if (current) + resource.changeStatus(EnumSet.of(PREDOWNLOAD, DOWNLOADING), EnumSet.of(DOWNLOADED)); + } + + // update cache entry + if (!current && JNLPRuntime.isOnline()) { + entry.setRemoteContentLength(connection.getContentLengthLong()); + entry.setLastModified(connection.getLastModified()); + } + + entry.setLastUpdated(System.currentTimeMillis()); + entry.store(); + + synchronized (lock) { + lock.notifyAll(); // wake up wait's to check for completion + } + resource.fireDownloadEvent(); // fire CONNECTED + + // explicitly close the URLConnection. + ConnectionFactory.getConnectionFactory().disconnect(connection); + } catch (Exception ex) { + OutputController.getLogger().log(ex); + resource.changeStatus(EnumSet.noneOf(Resource.Status.class), EnumSet.of(ERROR)); + synchronized (lock) { + lock.notifyAll(); // wake up wait's to check for completion + } + resource.fireDownloadEvent(); // fire ERROR + } finally { + entry.unlock(); + } + } + + /** + * Returns the 'best' valid URL for the given resource. + * This first adjusts the file name to take into account file versioning + * and packing, if possible. + * + * @param resource the resource + * @return the best URL, or null if all failed to resolve + */ + protected URL findBestUrl(Resource resource) { + DownloadOptions options = resource.getDownloadOptions(); + if (options == null) { + options = new DownloadOptions(false, false); + } + + List urls = new ResourceUrlCreator(resource, options).getUrls(); + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Finding best URL for: " + resource.getLocation() + " : " + options.toString()); + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "All possible urls for " + + resource.toString() + " : " + urls); + + for (ResourceTracker.RequestMethods requestMethod : ResourceTracker.RequestMethods.getValidRequestMethods()) { + for (int i = 0; i < urls.size(); i++) { + URL url = urls.get(i); + try { + Map requestProperties = new HashMap<>(); + requestProperties.put("Accept-Encoding", "pack200-gzip, gzip"); + + CodeWithRedirect response = getUrlResponseCodeWithRedirectonResult(url, requestProperties, requestMethod); + if (response.shouldRedirect()){ + if (response.URL == null) { + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Although " + resource.toString() + " got redirect " + response.result + " code for " + requestMethod + " request for " + url.toExternalForm() + " the target was null. Not following"); + } else { + OutputController.getLogger().log(OutputController.Level.MESSAGE_DEBUG, "Resource " + resource.toString() + " got redirect " + response.result + " code for " + requestMethod + " request for " + url.toExternalForm() + " adding " + response.URL.toExternalForm()+" to list of possible urls"); + if (!JNLPRuntime.isAllowRedirect()){ + throw new RedirectionException("The resource " + url.toExternalForm() + " is being redirected (" + response.result + ") to " + response.URL.toExternalForm() + ". This is disabled by default. If you wont to allow it, run javaws with -allowredirect parameter."); + } + urls.add(response.URL); + } + } else if (response.isInvalid()) { + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "For " + resource.toString() + " the server returned " + response.result + " code for " + requestMethod + " request for " + url.toExternalForm()); + } else { + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "best url for " + resource.toString() + " is " + url.toString() + " by " + requestMethod); + return url; /* This is the best URL */ + } + } catch (IOException e) { + // continue to next candidate + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "While processing " + url.toString() + " by " + requestMethod + " for resource " + resource.toString() + " got " + e + ": "); + OutputController.getLogger().log(e); + } + } + } + + /* No valid URL, return null */ + return null; + } + + private void downloadResource() { + URLConnection connection = null; + URL downloadFrom = resource.getDownloadLocation(); //Where to download from + URL downloadTo = resource.getLocation(); //Where to download to + + try { + connection = getDownloadConnection(downloadFrom); + + String contentEncoding = connection.getContentEncoding(); + + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Downloading " + downloadTo + " using " + + downloadFrom + " (encoding : " + contentEncoding + ") "); + + boolean packgz = "pack200-gzip".equals(contentEncoding) || + downloadFrom.getPath().endsWith(".pack.gz"); + boolean gzip = "gzip".equals(contentEncoding); + + // It's important to check packgz first. If a stream is both + // pack200 and gz encoded, then con.getContentEncoding() could + // return ".gz", so if we check gzip first, we would end up + // treating a pack200 file as a jar file. + + if (packgz) { + downloadPackGzFile(resource, connection, new URL(downloadFrom + ".pack.gz"), downloadTo); + } else if (gzip) { + downloadGZipFile(resource, connection, new URL(downloadFrom + ".gz"), downloadTo); + } else { + downloadFile(resource, connection, downloadTo); + } + + resource.changeStatus(EnumSet.of(DOWNLOADING), EnumSet.of(DOWNLOADED)); + synchronized (lock) { + lock.notifyAll(); // wake up wait's to check for completion + } + resource.fireDownloadEvent(); // fire DOWNLOADED + } catch (Exception ex) { + OutputController.getLogger().log(ex); + resource.changeStatus(EnumSet.noneOf(Resource.Status.class), EnumSet.of(ERROR)); + synchronized (lock) { + lock.notifyAll(); + } + resource.fireDownloadEvent(); // fire ERROR + } finally { + if (connection != null) { + ConnectionFactory.getConnectionFactory().disconnect(connection); + } + } + } + + private URLConnection getDownloadConnection(URL location) throws IOException { + URLConnection con = ConnectionFactory.getConnectionFactory().openConnection(location); + con.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip"); + con.connect(); + return con; + } + + private void downloadPackGzFile(Resource resource, URLConnection connection, URL downloadFrom, URL downloadTo) throws IOException { + downloadFile(resource, connection, downloadFrom); + + uncompressPackGz(downloadFrom, downloadTo, resource.getDownloadVersion()); + storeEntryFields(new CacheEntry(downloadTo, resource.getDownloadVersion()), connection.getContentLength(), connection.getLastModified()); + } + + private void downloadGZipFile(Resource resource, URLConnection connection, URL downloadFrom, URL downloadTo) throws IOException { + downloadFile(resource, connection, downloadFrom); + + uncompressGzip(downloadFrom, downloadTo, resource.getDownloadVersion()); + storeEntryFields(new CacheEntry(downloadTo, resource.getDownloadVersion()), connection.getContentLength(), connection.getLastModified()); + } + + private void downloadFile(Resource resource, URLConnection connection, URL downloadLocation) throws IOException { + CacheEntry downloadEntry = new CacheEntry(downloadLocation, resource.getDownloadVersion()); + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Downloading file: " + downloadLocation + " into: " + downloadEntry.getCacheFile().getCanonicalPath()); + if (!downloadEntry.isCurrent(connection.getLastModified())) { + writeDownloadToFile(resource, downloadLocation, new BufferedInputStream(connection.getInputStream())); + } else { + resource.setTransferred(CacheUtil.getCacheFile(downloadLocation, resource.getDownloadVersion()).length()); + } + + storeEntryFields(downloadEntry, connection.getContentLengthLong(), connection.getLastModified()); + } + + private void storeEntryFields(CacheEntry entry, long contentLength, long lastModified) { + entry.lock(); + try { + entry.setRemoteContentLength(contentLength); + entry.setLastModified(lastModified); + entry.store(); + } finally { + entry.unlock(); + } + } + + private void writeDownloadToFile(Resource resource, URL downloadLocation, InputStream in) throws IOException { + byte buf[] = new byte[1024]; + int rlen; + OutputStream out = CacheUtil.getOutputStream(downloadLocation, resource.getDownloadVersion()); + while (-1 != (rlen = in.read(buf))) { + resource.incrementTransferred(rlen); + out.write(buf, 0, rlen); + } + + in.close(); + out.close(); + } + + private void uncompressGzip(URL compressedLocation, URL uncompressedLocation, Version version) throws IOException { + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Extracting gzip: " + compressedLocation + " to " + uncompressedLocation); + byte buf[] = new byte[1024]; + int rlen; + + GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil + .getCacheFile(compressedLocation, version))); + InputStream inputStream = new BufferedInputStream(gzInputStream); + + BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(CacheUtil + .getCacheFile(uncompressedLocation, version))); + + while (-1 != (rlen = inputStream.read(buf))) { + outputStream.write(buf, 0, rlen); + } + + outputStream.close(); + inputStream.close(); + gzInputStream.close(); + } + + private void uncompressPackGz(URL compressedLocation, URL uncompressedLocation, Version version) throws IOException { + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Extracting packgz: " + compressedLocation + " to " + uncompressedLocation); + + GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil + .getCacheFile(compressedLocation, version))); + InputStream inputStream = new BufferedInputStream(gzInputStream); + + JarOutputStream outputStream = new JarOutputStream(new FileOutputStream(CacheUtil + .getCacheFile(uncompressedLocation, version))); + + Pack200.Unpacker unpacker = Pack200.newUnpacker(); + unpacker.unpack(inputStream, outputStream); + + outputStream.close(); + inputStream.close(); + gzInputStream.close(); + } + + /** + * Complex wrapper around return code with utility methods + * Default is HTTP_OK + */ + private static class CodeWithRedirect { + + int result = HttpURLConnection.HTTP_OK; + URL URL; From gitne at gmx.de Wed Jan 28 16:16:51 2015 From: gitne at gmx.de (Jacob Wisor) Date: Wed, 28 Jan 2015 17:16:51 +0100 Subject: [rfc][icedtea-web] Check online detection even if checked before In-Reply-To: <701744361.989547.1422374461447.JavaMail.zimbra@redhat.com> References: <590928475.2651879.1420474761830.JavaMail.zimbra@redhat.com> <54BF7121.4070103@redhat.com> <54C61F6B.3090504@redhat.com> <1003662908.381675.1422286361716.JavaMail.zimbra@redhat.com> <54C7B0F8.5000709@redhat.com>, <701744361.989547.1422374461447.JavaMail.zimbra@redhat.com> Message-ID: On 01/27/2015 at 05:01 PM, Jie Kang wrote: > ----- Original Message ----- >> On 01/26/2015 04:32 PM, Jie Kang wrote: >>> >>> >>> ----- Original Message ----- >>>> On 01/21/2015 10:28 AM, Jiri Vanek wrote: >>>>> On 01/06/2015 09:19 PM, Jacob Wisor wrote: >>>>>> On 01/06/2015 at 01:25 PM Jacob Wisor wrote: >>>>>>> On 01/05/2015 at 05:19 PM Jie Kang wrote: >>>>>>>> Hello, >>>>>>>> >>>>>>>> This patch slightly modifies JNLPRuntime's online detection function >>>>>>>> to >>>>>>>> always perform the check, even if it has been called before. >>>>> >>>>> As Jacob is mentioning, this really is causing performance overkill. >>>>>>>> >>>>>>>> Previously, if the boolean onlineDetected wasn't null, the check would >>>>>>>> be >>>>>>>> skipped. This caused a bug when downloading multiple resources. >>>>> >>>>> The idea of the check was, that first resource to be downloaded, is >>>>> mostly >>>>> the most crucial - jnlp, >>>>> jnlpHref, mainclass, jar with main class... So this one have to be >>>>> downlaoded - if it is not, then >>>>> we can assume the network inaccessible. >>>>>>>> >>>>>>>> For each resource being downloaded, we perform the detection check. >>>>>>>> For >>>>>>>> two >>>>>>>> consecutive resources: If for the first resource, we detected offline, >>>>>>>> the >>>>>>>> boolean onlineDetected would be set to false. Then for the second >>>>>>>> resource, >>>>>>>> the detection check would be skipped, even if that resource was able >>>>>>>> to >>>>>>>> be >>>>>>>> connected to. This would result in the second resource being unable to >>>>>>>> be >>>>>>>> downloaded, even though it definitely could and should be. The patch >>>>>>>> fixes >>>>>>>> this. >>>>> >>>>> Do you have some example of this behavior causing any real issues? >>>>> Maybe just sync the method or otherwise ensure that while isOnline is >>>>> null, >>>>> only one download can be >>>>> done? >>>>> >>>>>>>> >>>>>>>> Thoughts? >>>>>>> >>>>>>> Although I did not test it, seems to be working as advertised. >>>>>>> >>>>>>> While looking at the code, I was wondering why >>>>>>> JNLPRuntime.onlineDetected >>>>>>> was >>>>>>> a Boolean object instead of a primitive. And, apart from that, the >>>>>>> whole >>>>>>> offline detection mechanism seems overly complex and unreliable to me. >>>>>>> I am also not really convinced that >>>>>>> >>>>>>> public static void detectOnline(URL location) { >>>>>>> if (onlineDetected != null) { >>>>>>> return; >>>>>>> } >>>>>>> try { >>>>>>> if (location.getProtocol().equals("file")) { >>>>>>> return; >>>>>>> } >>>>>>> //Checks the offline/online status of the system. >>>>>>> InetAddress.getByName(location.getHost()); >>>>>>> } catch (UnknownHostException ue) { [?] >>>>>>> >>>>>>> is the best or most reliable way in J2SE to test for the online/offline >>>>>>> status >>>>>>> of a system. Do systems having no DNS server configured or which is >>>>>>> unreachable >>>>>>> properly resolve their name? And, even if they do, does this really >>>>>>> actually >>>>>>> prove them being online? >>>>>>> >>>>>>> Now, I was considering a few different options to reliably detecting a >>>>>>> system's >>>>>>> online/offline status. Initially, I was thinking about pinging the >>>>>>> default >>>>>>> gateway. However, hosts with public IPs may have their public IP as the >>>>>>> default >>>>>>> gateway configured. So, the most reliable way I came up with is to send >>>>>>> an echo >>>>>>> broadcast (on the local subnet) request. Of course, this does not prove >>>>>>> the >>>>>>> system being connected to the /public/ internet. But this is not >>>>>>> neccessary >>>>>>> either because JNLP applications may be (which they often are) served >>>>>>> on >>>>>>> an >>>>>>> intranet only. So, would you mind investigating this further? >>>>> >>>>> Before doing this looks-really-stupid >>>>> InetAddress.getByName(location.getHost()); i was elaborating >>>>> on this, and have nnot found a generic way how to veryfi online status >>>>> from >>>>> java. >>>>>> >>>>>> Oh, I forgot: I am sure we do not want to make a DNS request for every >>>>>> resource >>>>>> we need to download, even when subsequent DNS resolution requests are >>>>>> pulled >>>>> >>>>> yah, to much correct. >>>>>> from the local DNS cache. So, although this patch fixes the bug, it is >>>>>> very >>>>>> inefficient and impractical because it induces an avoidable performance >>>>>> penalty. >>>>>> In other words, the online detection *logic* itself needs to be fixed. >>>>>> >>>>>> @Jie Kang: >>>>>> Thank you for spotting this bug. >>>>>> >>>>> >>>>> Is it really an bug? It actually eliminates the benefits of offline >>>>> environment. >>>>> >>>>>>>> consecutive resources: If for the first resource, we detected >>>>>>>> offline, >>>>>>>> the >>>>>>>> boolean onlineDetected would be set to false. Then for the second >>>>>>>> resource, >>>>>>>> the detection check would be skipped, even if that resource was >>>>>>>> able >>>>>>>> to be >>>>>>>> connected to. This would result in the second resource being unable >>>>>>>> to >>>>>>>> be >>>>>>>> downloaded, even though it definitely could and should be. The >>>>>>>> patch >>>>>>>> fixes >>>>>>>> this. >>>>> >>>>> Thinking about it - how it is possible that first resource could not be >>>>> downloaded, but second can >>>>> be, and how it is possible that first one can be missed, while second one >>>>> not? >>>>> >>>>> >>>>> Maybe before deciding that environment i onnline/offline - we may try to >>>>> download two or three >>>>> resources? >>>>> >>>>> >>>>> >>>> >>>> One more thing crossed my mind - if the check is done everytime ressource >>>> is >>>> download. >>>> >>>> Then the output of isOnline() method is actually prety undetermined. >>>> >>>> >>>> ? >>> >>> Hello, >>> >>>>> Thinking about it - how it is possible that first resource could not be >>>>> downloaded, but second can >>>>> be, and how it is possible that first one can be missed, while second one >>>>> not? >>>>> >>> >>> This can occur in edge incidents such as: >>> >>> Resource 1 : Can't download, but it is in cache so we use the cache one. >>> >>> Resource 2 : Not in cache, but we can download, so we download it into >>> cache. >>> >>> Applet now works. >>> >>> >>> However, with the online detection as it is, the edge cases such as above >>> will fail. >>> >>>>> Is it really an bug? It actually eliminates the benefits of offline >>>>> environment. >>> >>> In terms of the offline environment, this should really only be controlled >>> by the isOfflineForced setting rather than the isOnline setting. For any >>> resource located off-site, the only way you know if that resource is >>> accessible or not is by attempting to access it. The idea of an 'online' >>> state is flawed in this regard. The idea of an 'offline' state is fine >>> though. If the user sets it to offline, the rules are simple, we don't >>> make any connection attempts. Otherwise, we should always be attempting to >>> access them. >>> >>> The more I think about this, I feel like we shouldn't be using isOnline() >>> to check when trying to download a resource. We should just try to >>> download it unless offlineIsForced. If it fails to download, the code >>> already deals with it as safely as possible. The online check beforehand >>> isn't really beneficial here. >>> >>> >>> Regards, >>> >>>> >>>> >>>> J. >>>> >>> >> >> >> Ok. Now I understand better. >> >> >> This should happen only if javaws was killed during downloading. And then >> clearing the cache is the >> cure. >> >> >> But I see your point. >> >> >> >> If -Xoffline is specified, I would like to keep current approach. >> >> >> For the online detection, I'm really concerned about isOnline result (and so >> behaviour of system) >> >> >> So brainstroming (valid only if no xOffline is specified): >> >> on begging assume environment is offline (no check was done) >> The check on "is online" will be done always from now >> If suddenly the resource is being avaiable online , switch to "online >> verified" and consider >> environment is online. >> No more checks are done from here. >> >> with Xoffline - no check is done ever. >> >> What do you think? > > Hello, > > If I understood correctly, I think the change to make it behave like above would be simple: > > In JNLPRuntime: > public static void detectOnline(URL location) { > if (onlineDetected != null) { > return; > } > > change: if (onlineDetected != null) { > to: if (onlineDetected == true) { > > > However, I wonder if we need to make it so complicated. > > I see two situations: > > A: Xoffline : no check is done ever and we never download : I think > ResourceTracker.initializeResource() will need some patching for this. But I > already wrote one, just haven't sent it yet. > > B: 'Online' : for each resource, try online and if it fails, try cache, > otherwise error. This is already coded safely. I think Jie has got the concept quite right. The current internal online/offline downloading concept is messed up. Jie is also right about the fact that when in "online mode" (no -Xoffline switch specified) every time a resource is requested it should be checked online for a more recent one. This is indeed somewhat tricky. HTTP 1.1 has a bunch of specifications to ease dealing with cached resources, thus saving bandwidth and reducing latency. For example, resources are given an expiration date. Good HTTP servers provide additional header information before actually serving a resource, like size and/or creation date etc. Building a sane caching mechanism is actually a non-trivial task. I am telling this just as a hint to Jie so that he can perhaps have look into what of those HTTP 1.1 features are already provided by the J2SE class library. > My question here is: What is the benefit of doing isOnline() check? Where else > is this used outside of initializing and downloading resources? > > When we use URLConnection object and try to initialize the resource, this > already does a check for us. As well, the code already deals with the possible > situations here. > > I do not think the isOnline() check before trying to use URLConnection object > has a performance benefit that justifies the extra complexity in code. As far as I understand, isOnline() has been introduced to avoid timeouts on every attempt a resource needs to be downloaded. Jacob From bugzilla-daemon at icedtea.classpath.org Wed Jan 28 16:24:06 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 28 Jan 2015 16:24:06 +0000 Subject: [Bug 2192] New: [IcedTea8] jvmtiStringPrimitiveCallback should not be invoked when string value is null Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2192 Bug ID: 2192 Summary: [IcedTea8] jvmtiStringPrimitiveCallback should not be invoked when string value is null Product: IcedTea Version: 8-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org Backport: http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/4a14bb075882 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 28 16:24:54 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 28 Jan 2015 16:24:54 +0000 Subject: [Bug 2192] [IcedTea8] jvmtiStringPrimitiveCallback should not be invoked when string value is null In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2192 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED URL| |https://bugzilla.redhat.com | |/show_bug.cgi?id=1173326 Blocks| |1282 Target Milestone|--- |3.0.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 28 16:24:54 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 28 Jan 2015 16:24:54 +0000 Subject: [Bug 1282] [TRACKER] IcedTea 3.0.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1282 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |2192 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 28 16:25:59 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 28 Jan 2015 16:25:59 +0000 Subject: [Bug 2193] New: [IcedTea7] jvmtiStringPrimitiveCallback should not be invoked when string value is null Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2193 Bug ID: 2193 Summary: [IcedTea7] jvmtiStringPrimitiveCallback should not be invoked when string value is null Product: IcedTea Version: 7-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org Backport: http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/4a14bb075882 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 28 16:26:21 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 28 Jan 2015 16:26:21 +0000 Subject: [Bug 2193] [IcedTea7] jvmtiStringPrimitiveCallback should not be invoked when string value is null In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2193 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED URL| |https://bugzilla.redhat.com | |/show_bug.cgi?id=1173326 Target Milestone|--- |2.5.5 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From aazores at redhat.com Wed Jan 28 17:31:44 2015 From: aazores at redhat.com (Andrew Azores) Date: Wed, 28 Jan 2015 12:31:44 -0500 Subject: [rfc][icedtea-web] dont expect junit have hamcrest included In-Reply-To: <54C620FF.3080407@redhat.com> References: <54C620FF.3080407@redhat.com> Message-ID: <54C91D00.5050807@redhat.com> On 01/26/2015 06:11 AM, Jiri Vanek wrote: > Hi! > > I noticed an issue during build for fedora rawhide [1] > > Omair later investigated it, and found: > "> Could it be that the junit version in rawhide is not compatible with > > your junit-runner sources somehow? > > I tried removing the junit-runner but the errors persisted. > > It turns out that this is caused by a change in Fedora's junit.jar. In > F20 (at least) the junit.jar includes org.hamcrest.* classes. This is no > longer true for the version in rawhide (this matches the jar shipped by > upstream in maven repositories). Since the hamcrest classes are not > available on the classpath, a class that imports them, such as > org/junit/internal/AssumptionViolatedException, fails to load with a > NoClassDefFoundError. > > The fix is to make sure that the hamcrest jar is available on the > classpath next to junit.jar too. The attached patch (for icedtea-web) > does that and works on my machine with an upstream junit 4.12 jar. > > A scratch build with this patch applied is able to run the unit tests: > http://koji.fedoraproject.org/koji/taskinfo?taskID=8711128" > > > I'm attaching his patch here. Form my point of view is ok to push. Both > head and 1.5 > > Any other ideas? > > Omair, Thank you! > > > J. Aha! This would be why I have never been able to get the ITW tests working on my laptops - my JUnit doesn't include Hamcrest. +1 for fixing this, +0 for quality of this patch (I don't know enough about distro development, packaging, etc. to judge :) ) Thanks, -- Andrew Azores From aazores at redhat.com Wed Jan 28 17:45:31 2015 From: aazores at redhat.com (Andrew Azores) Date: Wed, 28 Jan 2015 12:45:31 -0500 Subject: [rfc][icedtea-web] PolicyEditor gains a real parser In-Reply-To: <54B80CCD.4090401@redhat.com> References: <549DB266.8050304@redhat.com> <634432449.2830218.1420493276156.JavaMail.zimbra@redhat.com> <54B808F3.4080500@redhat.com> <566986650.7463391.1421347884410.JavaMail.zimbra@redhat.com> <54B80CCD.4090401@redhat.com> Message-ID: <54C9203B.7010502@redhat.com> On 01/15/2015 01:54 PM, Andrew Azores wrote: > On 01/15/2015 01:51 PM, Jie Kang wrote: >> >> >> ----- Original Message ----- >>> On 01/05/2015 04:27 PM, Jie Kang wrote: >>>> Hello, >>>> >>>> Long time no see :D >>>> >>>> After reading over the patch a few times, I don't have any major >>>> concerns >>>> with the code. I haven't noticed any bugs while user-testing as well. >>>> Great work! >>>> >>>> >>>> One suggestion below and a question: >>>> >>>> diff --git >>>> a/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java >>>> b/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java >>>> new file mode 100644 >>>> --- /dev/null >>>> +++ b/netx/net/sourceforge/jnlp/security/policyeditor/KeystoreInfo.java >>>> @@ -0,0 +1,113 @@ >>>> [...] >>>> + @Override >>>> + public int hashCode() { >>>> + int result = keyStoreUrl.hashCode(); >>>> + result = 31 * result + keyStoreType.hashCode(); >>>> + result = 31 * result + keyStoreProvider.hashCode(); >>>> + result = 31 * result + keyStorePasswordUrl.hashCode(); >>>> + return result; >>>> + } >>>> >>>> I'd suggest replacing this code with usage of the Objects.hash() : >>>> http://docs.oracle.com/javase/7/docs/api/java/util/Objects.html#hash(java.lang.Object...) >>>> >>>> >>>> It performs a extremely similar algorithm as the above but has the >>>> advantage of looking nicer. One of the answers in this thread shows >>>> what >>>> code it ends up running: >>>> http://stackoverflow.com/questions/13785353/equals-and-hashcode-is-objects-hash-method-broken >>>> >>>> >>> >>> Nice catch. I'd gotten used to using Apache HashCodeBuilder and when >>> that wasn't available here, I just let my IDE generate it for me ;) >>> >>>> >>>> diff --git >>>> a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>>> b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>>> --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>>> +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java >>>> @@ -63,39 +63,16 @@ >>>> [...] >>>> +import javax.swing.*; >>>> >>>> Is this package import intended? I think individual imports would be >>>> preferable (http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style) >>>> >>>> >>>> Everything else is fine to me. >>> >>> Oops... I blame my IDE again! That was definitely not intentional. >>> >>>> >>>> >>>> >>>> Regards, >>>> >>>> ----- Original Message ----- >>>>> Hi all, >>>>> >>>>> Long time no see! >>>>> >>>>> I started this patch several months ago, but my school work became far >>>>> too heavy and I had to put off any further work to finish off this >>>>> patch. Today I've managed to finish it to a point that I think it's >>>>> worth submitting for review. >>>>> >>>>> It's a big, long patch, so review will probably take quite some time, >>>>> and may be difficult at times. I know I've appeared to be completely >>>>> gone for many weeks, but I have actually been checking on my emails >>>>> fairly often, just haven't had time to reply to any patch reviews. But >>>>> right now I should have at least a few weeks before school really >>>>> picks >>>>> back up again. >>>>> >>>>> The gist of this patch is basically that I discovered that >>>>> policytool's >>>>> parser is actually available to use without any dirty reflection hacks >>>>> or anything like that, but it's hidden away and not really documented, >>>>> and is marked as an internal API. But it's open and so I think the >>>>> worst >>>>> case scenario if it's removed later is that we just fork and >>>>> maintain an >>>>> older copy. It's much easier and IMHO smarter than writing a whole new >>>>> parser from scratch to duplicate the one that policytool uses, anyhow. >>>>> This patch just rips out the old, crappy code that used horrible regex >>>>> to try to parse policy files, and plops in the policytool parser >>>>> instead. Anything else pretty much comes down to reconciling the >>>>> existing PolicyEditor code and structures with the new ones that the >>>>> parser gives and expects. >>>>> >>>>> Nice side effect: all policyeditor tests now pass, even the tricky >>>>> comments handling ones ;) >>>>> >>>>> Thanks, >>>>> -- >>>>> Andrew Azores >>>>> >>>> >>> >>> New patch attached that addresses your two nits, and nothing else. >> >> Hey, >> >> Looks good to me. +1. Up to you if you'd like another set of eyes >> before pushing. Heads up if you're not aware: jvanek and ldracz are >> both on PTO till this coming Monday Jan 19th. >> >> >> Regards, >> >>> >>> Thanks, >>> -- >>> Andrew Azores >>> >> > > Okay, thanks for the notice. I think I will wait for another pair of > eyes on this before pushing - really don't want to accidentally break > PolicyEditor :) > Ultra ping! ;) Thanks, -- Andrew Azores From ongunarisev at gmail.com Wed Jan 28 19:43:50 2015 From: ongunarisev at gmail.com (=?UTF-8?Q?Ongun_Ar=C4=B1sev?=) Date: Wed, 28 Jan 2015 21:43:50 +0200 Subject: Firefox 35.0 on Ubuntu 14.04.1 LTS 64-bit always prompted for Message-ID: Greetings, I would like to mark some of the Java applications I use regularly such as the campus VPN services as trusted so that I will not be prompted everytime I launch it about whether I am sure or not running the application. However, I could not find an easy way after doing an exhausting search on the web and using the *IcedTea Web Control Panel* both as a regular user and as an administrator. I am posting a screenshot too in order to illustrate the prompt that I want to get rid of. I would be very grateful if someone can assist or guide me in the right direction with this problem. Regards, Ongun Ar?sev -------------- next part -------------- An HTML attachment was scrubbed... URL: From ongunarisev at gmail.com Wed Jan 28 19:45:10 2015 From: ongunarisev at gmail.com (=?UTF-8?Q?Ongun_Ar=C4=B1sev?=) Date: Wed, 28 Jan 2015 21:45:10 +0200 Subject: Firefox 35.0 on Ubuntu 14.04.1 LTS 64-bit always prompted for In-Reply-To: References: Message-ID: I could not attach the screen shot to the previous e-mail, I apologize for that here it is. Ongun Ar?sev On Wed, Jan 28, 2015 at 9:43 PM, Ongun Ar?sev wrote: > Greetings, > > I would like to mark some of the Java applications I use regularly such as > the campus VPN services as trusted so that I will not be prompted everytime > I launch it about whether I am sure or not running the application. > However, I could not find an easy way after doing an exhausting search on > the web and using the *IcedTea Web Control Panel* both as a regular user > and as an administrator. I am posting a screenshot too in order to > illustrate the prompt that I want to get rid of. I would be very grateful > if someone can assist or guide me in the right direction with this problem. > > Regards, > > Ongun Ar?sev > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: _001.png Type: image/png Size: 19337 bytes Desc: not available URL: From omajid at redhat.com Wed Jan 28 19:57:22 2015 From: omajid at redhat.com (Omair Majid) Date: Wed, 28 Jan 2015 14:57:22 -0500 Subject: [rfc][icedtea-web] dont expect junit have hamcrest included In-Reply-To: <54C91D00.5050807@redhat.com> References: <54C620FF.3080407@redhat.com> <54C91D00.5050807@redhat.com> Message-ID: <20150128195721.GB19535@redhat.com> * Andrew Azores [2015-01-28 12:31]: > Aha! This would be why I have never been able to get the ITW tests working > on my laptops - my JUnit doesn't include Hamcrest. > > +1 for fixing this Can you confirm that the patch fixes the unit tests and makes them run for you? Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jkang at redhat.com Wed Jan 28 21:30:19 2015 From: jkang at redhat.com (Jie Kang) Date: Wed, 28 Jan 2015 16:30:19 -0500 (EST) Subject: [rfc][icedtea-web] Fix accessing Java array elements from Javascript In-Reply-To: <54C7AAC4.1040007@redhat.com> References: <1254781788.370065.1422285437294.JavaMail.zimbra@redhat.com> <54C7AAC4.1040007@redhat.com> Message-ID: <916734354.1787053.1422480619792.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 01/26/2015 04:17 PM, Jie Kang wrote: > > Hello, > > > > Marcin Cieslak has taken the time to create a fix for a long-standing > > problem in Icedtea-Web where attempting to set/get Java array elements > > from Javascript fails. [1] > > > > [1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 > > > > > > The reproducers relevant to this fix are: > > > > simple/JToJSString > > > > These reproducers tests on F21 with OpenJDK 7 and HEAD patched are now > > passing for me. These aren't in 1.5.x > > > > > > simple/JSToJSet > > > > These reproducers are still failing. On further investigation, the > > reproducer itself is not working correctly. A fix is needed here and work > > is in progress. > > > > I have created a simple reproducer that mimics > > AppletJSToJSet_intArrayElement_Test and it passes. This is attached as: > > itw-js-int-array-test-1.patch. This reproducer passes on both 1.5 and > > HEAD. > > > > > > I think a backport to 1.5.x would also be great. The two patches for HEAD > > and 1.5 are attached as: itw-js-array-HEAD-1.patch and > > itw-js-array-1.5-1.patch. > > > > Thoughts? > > > > > > Thank you again Marcin! > > > > > > The code of fix is ok AFAICS. Thank you both! > > For fixes: Please include NEWS entry and add Marcin to authors. > > For thests: SimpleJNLP.html and SimpleJNLP.jnlp have missing license > headers > SimpleJNLPTest.java - can it be reworked to work with default > ClosingListeners? > > > Please turn one more round of review before push. Hello, Revised patches for HEAD and 1.5 attached. For 1.5 I also added ldracz and myself to authors. How do they look? Regards, > > Thank you both! > J. > > > > > > -- Jie Kang OpenJDK Team - Software Engineering Intern -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-js-array-1.5-2.patch Type: text/x-patch Size: 2613 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-js-array-HEAD-2.patch Type: text/x-patch Size: 2417 bytes Desc: not available URL: From jvanek at redhat.com Thu Jan 29 09:52:41 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 29 Jan 2015 10:52:41 +0100 Subject: Firefox 35.0 on Ubuntu 14.04.1 LTS 64-bit always prompted for In-Reply-To: References: Message-ID: <54CA02E9.4030207@redhat.com> On 01/28/2015 08:45 PM, Ongun Ar?sev wrote: > I could not attach the screen shot to the previous e-mail, I apologize for that here it is. > > Ongun Ar?sev > > On Wed, Jan 28, 2015 at 9:43 PM, Ongun Ar?sev > > wrote: > > Greetings, > > I would like to mark some of the Java applications I use regularly such as the campus VPN > services as trusted so that I will not be prompted everytime I launch it about whether I am sure > or not running the application. However, I could not find an easy way after doing an exhausting > search on the web and using the *IcedTea Web Control Panel* both as a regular user and as an > administrator. I am posting a screenshot too in order to illustrate the prompt that I want to > get rid of. I would be very grateful if someone can assist or guide me in the right direction > with this problem. > > Regards, > > Ongun Ar?sev > > hi! Luckily for you, there is multiple solutions for your case. If you have access to the application (as it is in your vpn, some administrator should be able to fix it) then you should apply the most correct solution: Most correct solution: adapt application manifest to valid state: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html In your case, the non-set/wrongly set attribute is http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library Your admin just can put : Application-Library-Allowable-Codebase: https://vpn.ku.edu.tr/* to main jar's manifest. (note, the application must be signed again after this change) If you will go by this way, you may wont to fill in most of the rest security manifest attributes Other solution are customization of your itw via itweb settings: If you put Extended applet security -> security settings to LOW then Application-Library-Allowable-Codebase attribute is not checked. (you could read this in the provided links in yor dialogue ;) If you need Extended applet security -> security settings on higher level then low, you have to modify ~/.config/icedtea-web/deployment.properties file. If you will include line deployment.manifest.attributes.check=false then manifest attributes are not ever checked. If you set this up, and will access outside of vpn, you may face mallicious programs. I strongly encourages you to use "most correct solution" If non of those solutions fits you, then good new for you is, that in upcoming version of ITW (1.6) this dialogue have "remember decision" checkbox. But you must wait for few month for it. J. From jvanek at redhat.com Thu Jan 29 09:59:12 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 29 Jan 2015 10:59:12 +0100 Subject: [rfc][icedtea-web] dont expect junit have hamcrest included In-Reply-To: <20150128195721.GB19535@redhat.com> References: <54C620FF.3080407@redhat.com> <54C91D00.5050807@redhat.com> <20150128195721.GB19535@redhat.com> Message-ID: <54CA0470.90205@redhat.com> On 01/28/2015 08:57 PM, Omair Majid wrote: > * Andrew Azores [2015-01-28 12:31]: >> Aha! This would be why I have never been able to get the ITW tests working >> on my laptops - my JUnit doesn't include Hamcrest. That explains failing unittets after yours patches! :)) Nope, just kidding :) >> >> +1 for fixing this > > Can you confirm that the patch fixes the unit tests and makes them run > for you? > Still, if we drop the "transitive hamcrest" then the best solution should be applied: If junit is found: - check if junit contains hamcrest - should be simple cllass compiling with importing some hamcrest class - if does, no hamcrest search - if does not, check for hamcrest - if no hamcrest avaiable halt configure Or use your curent approach - always check for hamcrest, but continue if it do not exists. - disadvantage is that missing hamcrest is quite hard to find from gotten exception J. From jvanek at redhat.com Thu Jan 29 10:05:38 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 29 Jan 2015 11:05:38 +0100 Subject: [rfc][icedtea-web] PolicyEditor gains a real parser In-Reply-To: <54C9203B.7010502@redhat.com> References: <549DB266.8050304@redhat.com> <634432449.2830218.1420493276156.JavaMail.zimbra@redhat.com> <54B808F3.4080500@redhat.com> <566986650.7463391.1421347884410.JavaMail.zimbra@redhat.com> <54B80CCD.4090401@redhat.com> <54C9203B.7010502@redhat.com> Message-ID: <54CA05F2.1020602@redhat.com> >>> >> >> Okay, thanks for the notice. I think I will wait for another pair of >> eyes on this before pushing - really don't want to accidentally break >> PolicyEditor :) >> > > Ultra ping! ;) > I started to look over this. I have not noted need of second pairs of eyes. Sorry . Btw you owe reply to Jacob from 5.1.2015.... J. From jvanek at redhat.com Thu Jan 29 11:23:22 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 29 Jan 2015 12:23:22 +0100 Subject: [rfc][icedtea-web] PolicyEditor gains a real parser In-Reply-To: <54B808F3.4080500@redhat.com> References: <549DB266.8050304@redhat.com> <634432449.2830218.1420493276156.JavaMail.zimbra@redhat.com> <54B808F3.4080500@redhat.com> Message-ID: <54CA182A.4030408@redhat.com> I was not reading whole thread (lazyyY!) So maybe those were already answered: Why OPTIONS.CODEBASE disapeared??? I can not see its replacement. Also the patch do not apply the - FILE("-file", "policy_file", "PBOFile"), and CODEBASE("-codebase", "url", "PBOCodebase"); definitions changed. The code itself is pretty god - especially via using the import sun.security.provider.PolicyParser; *however* http://mail.openjdk.java.net/pipermail/awt-dev/2014-June/008072.html "In JDK-9 we would have modules and you will not be able to use the sun.* packages at all, so this changeset is useless for JDK9. " Makes me worrying about this approach. Especially also because of http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2014-October/029989.html So if we are going to use it, it sholdbe changed to public api. So you should have some adapter, which will allow simply switch between old and new api. And ofcourse, somebody have to negotiate it with upstream.. oh dear.... Also, I.m aware of http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2014-November/030101.html thread. It died without push. Or am I wrong? To code: Why DisplayablePermission isnt regualr class? the + /** + * PolicyEditor is only designed to deal with grant entries with a single codeBase - + * no signedBy and no principals. Any "identifiers" attached to grant entries which + * do not strictly match this will be ignored and not displayed in the UI. + */ + static boolean isCodeBaseIdentifier(final PolicyIdentifier identifier) { + return (identifier.getSignedBy() == null || identifier.getSignedBy().isEmpty()) + && (identifier.getPrincipals() == null || identifier.getPrincipals().isEmpty()) + && identifier.getCodebase() != null; MEans, that all other policies will be unvisible, but not lost. What about showing them at least read only? Aka as plain text or something like it... It wouldbe suspicious if they are "just not there" Why +public enum PolicyEditorPermissions implements Serializable { is now serializable? +public class PolicyEntry implements Serializable, Transferable { again.. why so? Because of: public static final DataFlavor DATA_FLAVOR What is it for? For clipboard actions only? MAybe rneame the DATA_FLAVOR o POLICY_ENTRY_DATA_FLAVOR or similar. Why public static class PolicyEntryBuilder { is initernal class? May you please higligh usage of import sun.security.provider.PolicyParser; ? The net.sourceforge.jnlp.security.policyeditor package have grown a lot. Maybe separate it to data/gui/rest/ ? Can be doen as another (following) changeset. J. From jvanek at redhat.com Thu Jan 29 11:31:28 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 29 Jan 2015 12:31:28 +0100 Subject: [rfc][icedtea-web] Fix accessing Java array elements from Javascript In-Reply-To: <916734354.1787053.1422480619792.JavaMail.zimbra@redhat.com> References: <1254781788.370065.1422285437294.JavaMail.zimbra@redhat.com> <54C7AAC4.1040007@redhat.com> <916734354.1787053.1422480619792.JavaMail.zimbra@redhat.com> Message-ID: <54CA1A10.6020306@redhat.com> On 01/28/2015 10:30 PM, Jie Kang wrote: > > > ----- Original Message ----- >> On 01/26/2015 04:17 PM, Jie Kang wrote: >>> Hello, >>> >>> Marcin Cieslak has taken the time to create a fix for a long-standing >>> problem in Icedtea-Web where attempting to set/get Java array elements >>> from Javascript fails. [1] >>> >>> [1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 >>> >>> >>> The reproducers relevant to this fix are: >>> >>> simple/JToJSString >>> >>> These reproducers tests on F21 with OpenJDK 7 and HEAD patched are now >>> passing for me. These aren't in 1.5.x >>> >>> >>> simple/JSToJSet >>> >>> These reproducers are still failing. On further investigation, the >>> reproducer itself is not working correctly. A fix is needed here and work >>> is in progress. >>> >>> I have created a simple reproducer that mimics >>> AppletJSToJSet_intArrayElement_Test and it passes. This is attached as: >>> itw-js-int-array-test-1.patch. This reproducer passes on both 1.5 and >>> HEAD. >>> >>> >>> I think a backport to 1.5.x would also be great. The two patches for HEAD >>> and 1.5 are attached as: itw-js-array-HEAD-1.patch and >>> itw-js-array-1.5-1.patch. >>> >>> Thoughts? >>> >>> >>> Thank you again Marcin! >>> >>> >> >> The code of fix is ok AFAICS. Thank you both! >> >> For fixes: Please include NEWS entry and add Marcin to authors. >> >> For thests: SimpleJNLP.html and SimpleJNLP.jnlp have missing license >> headers >> SimpleJNLPTest.java - can it be reworked to work with default >> ClosingListeners? >> >> >> Please turn one more round of review before push. > > Hello, > > > Revised patches for HEAD and 1.5 attached. > > For 1.5 I also added ldracz and myself to authors. > > How do they look? > > They look *great* Thank you! Feel free to push. J. From jkang at icedtea.classpath.org Thu Jan 29 17:25:03 2015 From: jkang at icedtea.classpath.org (jkang at icedtea.classpath.org) Date: Thu, 29 Jan 2015 17:25:03 +0000 Subject: /hg/icedtea-web: Fix accessing Java array elements from Javascri... Message-ID: changeset 382fb9c6634f in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=382fb9c6634f author: Jie Kang date: Thu Jan 29 12:22:18 2015 -0500 Fix accessing Java array elements from Javascript. PR1298. 2015-01-29 Jie Kang Fix accessing Java array elements from Javascript. PR1298. Fix provided by Marcin Cieslak * AUTHORS : Add Marcin Cieslak to authors. * NEWS : Add fix to news * plugin/icedteanp/IcedTeaPluginUtils.cc: (javaObjectResultToNPVariant) add jclass_name parameter to javaObjectResultToNPVariant function and use to determine type of object. diffstat: AUTHORS | 1 + ChangeLog | 10 ++++++++++ NEWS | 1 + plugin/icedteanp/IcedTeaPluginUtils.cc | 9 ++++++--- 4 files changed, 18 insertions(+), 3 deletions(-) diffs (77 lines): diff -r 16760ac4a689 -r 382fb9c6634f AUTHORS --- a/AUTHORS Wed Jan 28 10:12:28 2015 -0500 +++ b/AUTHORS Thu Jan 29 12:22:18 2015 -0500 @@ -5,6 +5,7 @@ Andrew Azores Deepak Bhole Ricardo Mart??n Camarero +Marcin Cieslak Danesh Dadachanji Adam Domurad Lukasz Dracz diff -r 16760ac4a689 -r 382fb9c6634f ChangeLog --- a/ChangeLog Wed Jan 28 10:12:28 2015 -0500 +++ b/ChangeLog Thu Jan 29 12:22:18 2015 -0500 @@ -1,3 +1,13 @@ +2015-01-29 Jie Kang + + Fix accessing Java array elements from Javascript. PR1298. Fix provided by + Marcin Cieslak + * AUTHORS : Add Marcin Cieslak to authors. + * NEWS : Add fix to news + * plugin/icedteanp/IcedTeaPluginUtils.cc: (javaObjectResultToNPVariant) add + jclass_name parameter to javaObjectResultToNPVariant function and use to + determine type of object. + 2015-01-28 Jie Kang Refactor initialize/download runnable out of ResourceTracker and add tests diff -r 16760ac4a689 -r 382fb9c6634f NEWS --- a/NEWS Wed Jan 28 10:12:28 2015 -0500 +++ b/NEWS Thu Jan 29 12:22:18 2015 -0500 @@ -29,6 +29,7 @@ - added support for -html switch for javaws. Now you can run most of the applets without browser at all * Plugin - PR1743 - Intermittant deadlock in PluginRequestProcessor + - PR1298 - LiveConnect - problem setting array elements (applet variables) from JS - RH1121549: coverity defects - Resolves method overloading correctly with superclass heirarchy distance * PolicyEditor diff -r 16760ac4a689 -r 382fb9c6634f plugin/icedteanp/IcedTeaPluginUtils.cc --- a/plugin/icedteanp/IcedTeaPluginUtils.cc Wed Jan 28 10:12:28 2015 -0500 +++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Thu Jan 29 12:22:18 2015 -0500 @@ -863,7 +863,7 @@ } static bool -javaObjectResultToNPVariant(NPP instance, const std::string& jobject_id, NPVariant* variant) +javaObjectResultToNPVariant(NPP instance, const std::string& jclass_name, const std::string& jobject_id, NPVariant* variant) { // Reference the class object so we can construct an NPObject with it and the instance @@ -878,12 +878,14 @@ std::string jclass_id = *jclass_result->return_string; NPObject* obj; - if (jclass_id.at(0) == '[') // array + if (jclass_name.at(0) == '[') // array { + PLUGIN_DEBUG( "javaObjectResultToNPVariant Array detected: \"%s\"\n", jclass_name.c_str()); obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id, jobject_id, true); } else { + PLUGIN_DEBUG( "javaObjectResultToNPVariant Scalar object: \"%s\"\n", jclass_name.c_str()); obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id, jobject_id, false); } @@ -924,7 +926,8 @@ return javaStringResultToNPVariant(jobject_id, variant); } else // Else this needs a java object wrapper { - return javaObjectResultToNPVariant(instance, jobject_id, variant); + return javaObjectResultToNPVariant(instance, *jclassname_result->return_string, + jobject_id, variant); } } From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 17:25:13 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 17:25:13 +0000 Subject: [Bug 1298] LiveConnect - problem setting array elements (applet variables) from JS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 --- Comment #5 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=382fb9c6634f author: Jie Kang date: Thu Jan 29 12:22:18 2015 -0500 Fix accessing Java array elements from Javascript. PR1298. 2015-01-29 Jie Kang Fix accessing Java array elements from Javascript. PR1298. Fix provided by Marcin Cieslak * AUTHORS : Add Marcin Cieslak to authors. * NEWS : Add fix to news * plugin/icedteanp/IcedTeaPluginUtils.cc: (javaObjectResultToNPVariant) add jclass_name parameter to javaObjectResultToNPVariant function and use to determine type of object. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 17:46:15 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 17:46:15 +0000 Subject: [Bug 2195] New: [IcedTea6] jvmtiStringPrimitiveCallback should not be invoked when string value is null Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2195 Bug ID: 2195 Summary: [IcedTea6] jvmtiStringPrimitiveCallback should not be invoked when string value is null Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org Backport: http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/4a14bb075882 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 17:47:06 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 17:47:06 +0000 Subject: [Bug 2195] [IcedTea6] jvmtiStringPrimitiveCallback should not be invoked when string value is null In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2195 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED URL| |https://bugzilla.redhat.com | |/show_bug.cgi?id=1173326 Target Milestone|--- |6-1.13.7 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:08:38 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:08:38 +0000 Subject: [Bug 2196] New: [IcedTea7] jhat man page has broken URL Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2196 Bug ID: 2196 Summary: [IcedTea7] jhat man page has broken URL Product: IcedTea Version: 7-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org The link to the HPROF demo page is broken. See: https://bugzilla.redhat.com/show_bug.cgi?id=1164762 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:09:03 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:09:03 +0000 Subject: [Bug 2196] [IcedTea7] jhat man page has broken URL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2196 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |2.5.5 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:09:14 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:09:14 +0000 Subject: [Bug 2196] [IcedTea7] jhat man page has broken URL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2196 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- URL| |https://bugzilla.redhat.com | |/show_bug.cgi?id=1164762 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:10:31 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:10:31 +0000 Subject: [Bug 2197] New: [IcedTea6] jhat man page has broken URL Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2197 Bug ID: 2197 Summary: [IcedTea6] jhat man page has broken URL Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org The link to the HPROF demo page is broken. See: https://bugzilla.redhat.com/show_bug.cgi?id=1164762 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:10:53 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:10:53 +0000 Subject: [Bug 2197] [IcedTea6] jhat man page has broken URL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2197 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED URL| |https://bugzilla.redhat.com | |/show_bug.cgi?id=1164762 Target Milestone|--- |6-1.13.7 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jkang at redhat.com Thu Jan 29 18:20:50 2015 From: jkang at redhat.com (Jie Kang) Date: Thu, 29 Jan 2015 13:20:50 -0500 (EST) Subject: [rfc][icedtea-web] Remove KnownToFail annotation from JToJSString reproducer tests In-Reply-To: <428422541.2222318.1422551647759.JavaMail.zimbra@redhat.com> Message-ID: <396520302.2250665.1422555650604.JavaMail.zimbra@redhat.com> Hello, Title says it all. Any opinions on whether or not to keep the Bug annotation? Okay to push? Regards, -- Jie Kang OpenJDK Team - Software Engineering Intern -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-jtojsstring-fixed-1.patch Type: text/x-patch Size: 1091 bytes Desc: not available URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:44:55 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:44:55 +0000 Subject: [Bug 2198] New: [IcedTea6] Make sure that a connection is still alive when retrieved from KeepAliveCache in certain cases Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2198 Bug ID: 2198 Summary: [IcedTea6] Make sure that a connection is still alive when retrieved from KeepAliveCache in certain cases Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org https://bugs.openjdk.java.net/browse/JDK-7199862 This change was included in the proprietary 6u38, so we should include it too. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:45:33 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:45:33 +0000 Subject: [Bug 2198] [IcedTea6] Make sure that a connection is still alive when retrieved from KeepAliveCache in certain cases In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2198 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED URL| |https://bugs.openjdk.java.n | |et/browse/JDK-7199862 Target Milestone|--- |6-1.13.7 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:48:46 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:48:46 +0000 Subject: [Bug 2199] New: [IcedTea8] Support giflib 5.1.0 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2199 Bug ID: 2199 Summary: [IcedTea8] Support giflib 5.1.0 Product: IcedTea Version: 8-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030494.html -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:49:04 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:49:04 +0000 Subject: [Bug 2199] [IcedTea8] Support giflib 5.1.0 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2199 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1282 Target Milestone|--- |3.0.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:49:04 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:49:04 +0000 Subject: [Bug 1282] [TRACKER] IcedTea 3.0.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1282 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |2199 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:49:35 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:49:35 +0000 Subject: [Bug 2200] New: [IcedTea7] Support giflib 5.1.0 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2200 Bug ID: 2200 Summary: [IcedTea7] Support giflib 5.1.0 Product: IcedTea Version: 7-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030494.html -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:49:47 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:49:47 +0000 Subject: [Bug 2200] [IcedTea7] Support giflib 5.1.0 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2200 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |2.5.5 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:50:27 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:50:27 +0000 Subject: [Bug 2201] New: [IcedTea6] Support giflib 5.1.0 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2201 Bug ID: 2201 Summary: [IcedTea6] Support giflib 5.1.0 Product: IcedTea Version: 6-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-January/030494.html -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 18:50:42 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 18:50:42 +0000 Subject: [Bug 2201] [IcedTea6] Support giflib 5.1.0 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2201 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |6-1.13.7 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ongunarisev at gmail.com Thu Jan 29 18:55:51 2015 From: ongunarisev at gmail.com (=?UTF-8?Q?Ongun_Ar=C4=B1sev?=) Date: Thu, 29 Jan 2015 20:55:51 +0200 Subject: Firefox 35.0 on Ubuntu 14.04.1 LTS 64-bit always prompted for In-Reply-To: <54CA02E9.4030207@redhat.com> References: <54CA02E9.4030207@redhat.com> Message-ID: Thanks for the quick reply I think I will contact with the IT department of my university and may forward your e-mail to point at the issue. Apart from that I changed the mentioned line on the file *~/.config/icedtea-web/deployme**nt.properties *but it did not solve my issue, here is the modified version of the file for the trial of a quick fix: #Netx deployment configuration #Thu Jan 29 20:47:47 EET 2015 #deployment.security.level=ASK_UNSIGNED deployment.security.level=FALSE I should also note that I use Firefox 35.0 as a regular user and noticed that the settings differ in the "IcedTea Web Control Panel" when launched within the terminal via the following command: gksudo itweb-settings itweb-settings Should I modify another file instead for a global change in effect for all the users on my PC? Furthermore, is it possible to install IcedTea 1.6 somehow(via using backports for example)? Ongun Ar?sev On Thu, Jan 29, 2015 at 11:52 AM, Jiri Vanek wrote: > On 01/28/2015 08:45 PM, Ongun Ar?sev wrote: > >> I could not attach the screen shot to the previous e-mail, I apologize >> for that here it is. >> >> Ongun Ar?sev >> >> On Wed, Jan 28, 2015 at 9:43 PM, Ongun Ar?sev > > >> wrote: >> >> Greetings, >> >> I would like to mark some of the Java applications I use regularly >> such as the campus VPN >> services as trusted so that I will not be prompted everytime I launch >> it about whether I am sure >> or not running the application. However, I could not find an easy way >> after doing an exhausting >> search on the web and using the *IcedTea Web Control Panel* both as a >> regular user and as an >> administrator. I am posting a screenshot too in order to illustrate >> the prompt that I want to >> get rid of. I would be very grateful if someone can assist or guide >> me in the right direction >> with this problem. >> >> Regards, >> >> Ongun Ar?sev >> >> >> hi! > > Luckily for you, there is multiple solutions for your case. > > If you have access to the application (as it is in your vpn, some > administrator should be able to fix it) then you should apply the most > correct solution: > > Most correct solution: adapt application manifest to valid state: > http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/ > security/manifest.html > http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/ > security/no_redeploy.html > > In your case, the non-set/wrongly set attribute is > http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/ > security/manifest.html#app_library > Your admin just can put : > > Application-Library-Allowable-Codebase: https://vpn.ku.edu.tr/* > > to main jar's manifest. (note, the application must be signed again after > this change) > > If you will go by this way, you may wont to fill in most of the rest > security manifest attributes > > > > > Other solution are customization of your itw via itweb settings: > If you put > Extended applet security -> security settings to LOW then > Application-Library-Allowable-Codebase attribute is not checked. (you > could read this in the provided links in yor dialogue ;) > > > If you need Extended applet security -> security settings on higher level > then low, you have to modify ~/.config/icedtea-web/deployment.properties > file. If you will include line > deployment.manifest.attributes.check=false > then manifest attributes are not ever checked. > > > If you set this up, and will access outside of vpn, you may face > mallicious programs. > > > I strongly encourages you to use "most correct solution" > > > > If non of those solutions fits you, then good new for you is, that in > upcoming version of ITW (1.6) this dialogue have "remember decision" > checkbox. But you must wait for few month for it. > > > J. > > > > > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 20:28:11 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 20:28:11 +0000 Subject: [Bug 2202] New: internalexception:java.lang.runtimeexception Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2202 Bug ID: 2202 Summary: internalexception:java.lang.runtimeexception Product: IcedTea Version: 8-hg Hardware: x86_64 OS: Linux Status: NEW Severity: enhancement Priority: P5 Component: NPPlugin Assignee: dbhole at redhat.com Reporter: silas.e at fettabernett.de CC: unassigned at icedtea.classpath.org -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 20:31:21 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 20:31:21 +0000 Subject: [Bug 2202] internalexception:java.lang.runtimeexception:unable to access of address of buffer In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2202 silas.e at fettabernett.de changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|internalexception:java.lang |internalexception:java.lang |.runtimeexception |.runtimeexception:unable to | |access of address of buffer -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 29 21:08:50 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 29 Jan 2015 21:08:50 +0000 Subject: [Bug 2024] [STORY] Number of threads chart should not require turning on thread recording In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2024 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/thermostat?cmd=changeset;node=17334ef9a9c9 author: Omair Majid date: Thu Jan 29 15:56:21 2015 -0500 PR2024: Number of threads chart should not require turning on thread recording Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2014-December/012361.html -- You are receiving this mail because: You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From aazores at redhat.com Fri Jan 30 03:01:34 2015 From: aazores at redhat.com (Andrew Azores) Date: Thu, 29 Jan 2015 22:01:34 -0500 Subject: [rfc][icedtea-web] PolicyEditor gains a real parser In-Reply-To: References: <549DB266.8050304@redhat.com> , <683356188.1653238.1420136038380.JavaMail.zimbra@redhat.com> Message-ID: <54CAF40E.3010408@redhat.com> On 01/05/2015 03:59 PM, Jacob Wisor wrote: > On 01/01/2015 at 07:13 PM Andrew Azores wrote: >> Hi, >> >> I agree that the format is an odd one. It would be nice if the policies could >> instead use some other well-known format, although one (probably fairly >> minor) advantage of the existing policy file format over an XML format is >> simply that the current format is probably much more human-friendly when >> trying to read and evaluate the file manually, with a standard text editor. >> Nonetheless, dual support for the existing format as well as some other >> standardized format would be a very nice feature. Although not so much in the >> Java spirit as XML, and perhaps not as widely supported in the ecosystem, >> perhaps other formats to consider might include YAML or JSON, simply for their >> readability? What do you think of that? > > AFAIK YAML has not been standardized, although it is colloquially called a > superset of JSON. JSON is good but its main purpose and strength lies in > converting or /serializing/ run-time *objects* into human-readable text for > *transmission*. Transmission is not actually key here. policytool and > PolicyEditor are storing *static* configuration *data* which may be subject to > parsing by external tools and/or need to be easily readable by human beings. > Static data calls for a document format. And, this is exactly what XML has been > originally designed for: documents. Unfortunatelly, many people and even > software architects did not get this point or have forgotten about it. Instead, > they just jumped onto a buzz word which indeed could or can offer stuctured, > human-readable, interoperable and standardized data, but you have to design > your XML schema for it. Just because XML may - when designing XML schmas > correctly - be human-readable too, it does not mean that it should be used for > every use-case which should require human-readability at some point in the > future. The main reason for XML loosing momentum and gaining somewhat negative > sentiments among developers especially during the last few years is because XML > has been abusively repurposed by many people. Sometimes not so much by technical > people but by management people who requested to have their products XML built > in, no matter the cost or merrit. There was a time where every commercial product > of significance or that wanted to become significant had to /speak/ XML. I am > just telling this in order to help you clear any confusing thoughts or things > you may have heard about how bad XML might be. > > Anyway, I would advise not to use JSON for the purpose of policytool and > PolicyEditor and go for XML. Another important feature of XML as a static data > document format is that it convays implcit semantics. JSON does not do that. > JSON simply transmits data without neccessarily implying semantics. And > finally, XML documents can or should be defined by a schema. Schemas are great > because they help to validate XML documents as well as describe the semantics > of data. Again, afaik JSON does not offer anything similar except for simple > syntax checking. You cannot write a correct JSON object from scratch just by > looking at a batch of JSON objects and comparing them. However, you can do this > with XML documents, even more so when you have a schema at hand. > >> Anyway, even once a format is selected, it will take some work to make this >> functional. It isn't just PolicyEditor and policytool that need to be >> "brought up to speed" with a new format, but also java.security.Policy at >> least, and other related classes. But I do like this idea and would like to >> explore further. > > Yep, it is definitely going to require some significant amount of work but I > think it could be worth it. Thank you for at least considering it and putting > some thought into it. :-) > > Jacob > >> ----- Original Message ----- >>> On 12/26/2014 at 08:09 PM Andrew Azores wrote: >>>> Hi all, >>>> >>>> Long time no see! >>>> >>>> I started this patch several months ago, but my school work became far >>>> too heavy and I had to put off any further work to finish off this >>>> patch. Today I've managed to finish it to a point that I think it's >>>> worth submitting for review. >>>> >>>> It's a big, long patch, so review will probably take quite some time, >>>> and may be difficult at times. I know I've appeared to be completely >>>> gone for many weeks, but I have actually been checking on my emails >>>> fairly often, just haven't had time to reply to any patch reviews. But >>>> right now I should have at least a few weeks before school really picks >>>> back up again. >>>> >>>> The gist of this patch is basically that I discovered that policytool's >>>> parser is actually available to use without any dirty reflection hacks >>>> or anything like that, but it's hidden away and not really documented, >>>> and is marked as an internal API. But it's open and so I think the worst >>>> case scenario if it's removed later is that we just fork and maintain an >>>> older copy. It's much easier and IMHO smarter than writing a whole new >>>> parser from scratch to duplicate the one that policytool uses, anyhow. >>>> This patch just rips out the old, crappy code that used horrible regex >>>> to try to parse policy files, and plops in the policytool parser >>>> instead. Anything else pretty much comes down to reconciling the >>>> existing PolicyEditor code and structures with the new ones that the >>>> parser gives and expects. >>>> >>>> Nice side effect: all policyeditor tests now pass, even the tricky >>>> comments handling ones ;) >>> >>> Although I have not reviewed the patch, I have to admit it is a good idea for >>> PolicyEditor and policytool to share the same configuration file and Format >>> (and parser code). >>> However, I have always found policytool's file format very odd and doll to >>> parse. In some sense it is quite "proprietary", except for conforming to >>> ASCII. >>> So, even though it is simple text it is not based on any other standard like >>> SGML or XML. It is not even based on Java's "all-purpose" properties file >>> format. I do not know if there is any need for this or how many people may be >>> affected, but would you like to give it some thought developing a XML (with >>> schema) or properties file format for policytool's and PolcyEditor's purpose? >>> This new file format and parser could be added as an extension to policytool >>> and PolicyEditor in the future. There is no need to drop support for >>> policytool's current file format, but there certainly is still room for >>> improvement. What do you think? >>> >>> Jacob Well, after some more consideration, I have no more argument here. XML does seem like the better choice of all the options examined, and I haven't come up with anything "better". The only downside anyway is, IMO, the not-so-human-readable nature of XML, but it isn't *that* bad anyway if it's reasonably formatted. Thanks, -- Andrew Azores From aazores at redhat.com Fri Jan 30 03:26:00 2015 From: aazores at redhat.com (Andrew Azores) Date: Thu, 29 Jan 2015 22:26:00 -0500 Subject: [rfc][icedtea-web] PolicyEditor gains a real parser In-Reply-To: <54CA182A.4030408@redhat.com> References: <549DB266.8050304@redhat.com> <634432449.2830218.1420493276156.JavaMail.zimbra@redhat.com> <54B808F3.4080500@redhat.com> <54CA182A.4030408@redhat.com> Message-ID: <54CAF9C8.7000001@redhat.com> Hi, On 01/29/2015 06:23 AM, Jiri Vanek wrote: > I was not reading whole thread (lazyyY!) > > So maybe those were already answered: > > Why OPTIONS.CODEBASE disapeared??? I can not see its replacement. Before this patch, PolicyEditor's internal model assumes that codebases can be used as unique identifiers of sorts - each entry in a policy file always has exactly zero or one codebases, and does not have principals, or signedby. With this patch, the internal model becomes full-featured, like upstream policytool's, and PolicyEditor can actually handle policy entries with any combination of codebase/signedby/principal, just like policytool. The PolicyEditor GUI just doesn't have a way to display them (yet). So a -codebase selector is no longer guaranteed to return exactly one (or none) result, and I don't know what the expected behaviour would be if there were multiple matches in the policy file, especially when some of them may be "hidden". > > Also the patch do not apply the - FILE("-file", "policy_file", > "PBOFile"), and CODEBASE("-codebase", "url", "PBOCodebase"); definitions > changed. Yes, I'll make that change this weekend I hope. > > The code itself is pretty god - especially via using the > import sun.security.provider.PolicyParser; > > *however* > > http://mail.openjdk.java.net/pipermail/awt-dev/2014-June/008072.html > "In JDK-9 we would have modules and you will not be able to use the > sun.* packages at all, so this changeset is useless for JDK9. " > > Makes me worrying about this approach. Especially also because of > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2014-October/029989.html > > > So if we are going to use it, it sholdbe changed to public api. So you > should have some adapter, which will allow simply switch between old and > new api. And ofcourse, somebody have to negotiate it with upstream.. oh > dear.... Yea, this sounds problematic. I have no idea how to move forward with this kind of forward compatibility in mind, honestly. > > Also, I.m aware of > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2014-November/030101.html > thread. It died without push. Or am I wrong? > Not wrong, it did die without push, but only because it was around that time that I discovered these sun parser bits, and found out that the PolicyIdentifier I was making there could be easily adapted and made much more useful by doing some rewrites and using the sun stuff, and then this whole patch happened. So really, that old patch just became this one :) > > > > To code: > > > Why DisplayablePermission isnt regualr class? You mean why is it an inner static class rather than its own top level? Mostly just because the only context I intend it to be used it is within the Custom Policy Viewer. Its only reason to exist is because the Sun PolicyParser.PermissionEntry doesn't implement toString nicely, really, but I need the CustomPolicyViewer to be able to display its permissions, obviously. It seemed nicer to subclass the class I actually wanted to use (PermissionEntry) and have this implement toString than to make all my CustomPolicyViewer Swing stuff use custom adapters to render the collection of permission entries. > > the > > + /** > + * PolicyEditor is only designed to deal with grant entries with a > single codeBase - > + * no signedBy and no principals. Any "identifiers" attached to > grant entries which > + * do not strictly match this will be ignored and not displayed in > the UI. > + */ > + static boolean isCodeBaseIdentifier(final PolicyIdentifier > identifier) { > + return (identifier.getSignedBy() == null || > identifier.getSignedBy().isEmpty()) > + && (identifier.getPrincipals() == null || > identifier.getPrincipals().isEmpty()) > + && identifier.getCodebase() != null; > > > MEans, that all other policies will be unvisible, but not lost. > > What about showing them at least read only? Aka as plain text or > something like it... It wouldbe suspicious if they are "just not there" > > Yes, I've been intending to work on this somehow but have not yet had time. Do you have any suggestions on how to display them read-only? I was thinking maybe (temporarily, until somebody makes the PolicyEditor GUI properly handle the full permission entry feature set) just have another child window like the CustomPolicyViewer... or maybe just have them displayed in the CustomPolicyViewer itself, honestly. What do you think? > > Why > +public enum PolicyEditorPermissions implements Serializable { > is now serializable? > +public class PolicyEntry implements Serializable, Transferable { > again.. why so? > Because of: public static final DataFlavor DATA_FLAVOR > What is it for? For clipboard actions only? Clipboard actions and also dragging actions. I think the Serializable and Transferable all come from that, but it's been so long at this point that I can't remember for sure. I would need to go back and do some API diving probably :) again, I'm hoping to have some time to work on this this weekend, so I'll take note to look into why this is. > > MAybe rneame the DATA_FLAVOR o POLICY_ENTRY_DATA_FLAVOR or similar. > Sure thing. > > Why public static class PolicyEntryBuilder { is initernal class? > Well, it's a Builder, this one *definitely* doesn't have any good context as a top-level IMO :) > > May you please higligh usage of import > sun.security.provider.PolicyParser; ? > What do you mean? Just put a comment next to it I suppose? > > The net.sourceforge.jnlp.security.policyeditor package have grown a lot. > Maybe separate it to data/gui/rest/ ? Can be doen as another (following) > changeset. > > > > J. Sure, as a separate changeset. Thanks, -- Andrew Azores From aazores at redhat.com Fri Jan 30 03:37:45 2015 From: aazores at redhat.com (Andrew Azores) Date: Thu, 29 Jan 2015 22:37:45 -0500 Subject: [rfc][icedtea-web] dont expect junit have hamcrest included In-Reply-To: <20150128195721.GB19535@redhat.com> References: <54C620FF.3080407@redhat.com> <54C91D00.5050807@redhat.com> <20150128195721.GB19535@redhat.com> Message-ID: <54CAFC89.50701@redhat.com> On 01/28/2015 02:57 PM, Omair Majid wrote:> * Andrew Azores [2015-01-28 12:31]: >> Aha! This would be why I have never been able to get the ITW tests working >> on my laptops - my JUnit doesn't include Hamcrest. >> >> +1 for fixing this > > Can you confirm that the patch fixes the unit tests and makes them run > for you? > > Thanks, > Omair > Just cloned a fresh ITW and tried running unit tests with this patch applied: > CLASSPATH=/home/andrew/icedtea-web-fresh/build/netx.build/lib/classes.jar:/home/andrew/icedtea-web-fresh/build/liveconnect/lib/classes.jar:/usr/share/java/junit.jar:/usr/share/java/hamcrest-library.jar:/home/andrew/icedtea-web-fresh/build/junit-runner.jar:/home/andrew/icedtea-web-fresh/build/tests.build/test-extensions:.:/home/andrew/icedtea-web-fresh/build/../tests/test-extensions: ; \ > /home/andrew/icedtea-web-fresh/build/bootstrap/jdk1.6.0/bin/java -Xbootclasspath/a:/home/andrew/icedtea-web-fresh/build/bootstrap/jdk1.6.0/jre/lib/rt.jar:/home/andrew/icedtea-web-fresh/build/bootstrap/jdk1.6.0/jre/lib/jsse.jar:/usr/share/java/js.jar:/home/andrew/icedtea-web-fresh/build/bootstrap/jdk1.6.0/jre/lib/resources.jar:$CLASSPATH CommandLine $class_names > Passed: net.sourceforge.jnlp.JREDescTest.testMaximumHeapSizeBad > Exception in thread "main" java.lang.NoClassDefFoundError: org/junit/internal/AssumptionViolatedException > at org.junit.runners.ParentRunner.run(ParentRunner.java:309) > at org.junit.runner.JUnitCore.run(JUnitCore.java:160) > at org.junit.runner.JUnitCore.run(JUnitCore.java:138) > at org.junit.runner.JUnitCore.run(JUnitCore.java:117) > at CommandLine.runMain(CommandLine.java:48) > at CommandLine.runMainAndExit(CommandLine.java:28) > at CommandLine.main(CommandLine.java:24) > Makefile:1731: recipe for target 'stamps/run-netx-unit-tests.stamp' failed > make: *** [stamps/run-netx-unit-tests.stamp] Error 1 /usr/share/java/hamcrest-library.jar does exist, though. It's a symlink to /usr/share/java/hamcrest/hamcrest-library-1.3.jar (and similar for hamcrest-core, hamcrest-generator, hamcrest-integration JARs). Does this sound reasonable? My junit is also a symlink to /usr/share/java/junit-4.11.jar. This is Arch Linux by the way. Thanks, -- Andrew Azores From jvanek at redhat.com Fri Jan 30 07:04:56 2015 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 30 Jan 2015 08:04:56 +0100 Subject: [rfc][icedtea-web] Remove KnownToFail annotation from JToJSString reproducer tests In-Reply-To: <396520302.2250665.1422555650604.JavaMail.zimbra@redhat.com> References: <396520302.2250665.1422555650604.JavaMail.zimbra@redhat.com> Message-ID: <54CB2D18.6030700@redhat.com> On 01/29/2015 07:20 PM, Jie Kang wrote: > Hello, > > Title says it all. > > Any opinions on whether or not to keep the Bug annotation? Okay to push? The removal of KnownToFail is ok. However, please keep the bug annotation present. It is representing which bug is this test representing. Not why it is known to fail :) Ok to go with removal of KnownToFail only ty! J. From jkang at icedtea.classpath.org Fri Jan 30 16:34:43 2015 From: jkang at icedtea.classpath.org (jkang at icedtea.classpath.org) Date: Fri, 30 Jan 2015 16:34:43 +0000 Subject: /hg/icedtea-web: Remove KnownToFail annotation from JToJSString ... Message-ID: changeset f214f6ad1223 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f214f6ad1223 author: Jie Kang date: Fri Jan 30 11:34:20 2015 -0500 Remove KnownToFail annotation from JToJSString reproducer tests. Fix in changeset 382fb9c6634f. PR1298 2015-01-30 Jie Kang Remove KnownToFail annotation from JToJSString reproducer tests. * tests/reproducers/simple/JToJSString/testcases/JToJSStringTest.java: (StringArrayTest)(jnlpStringArrayAppletTest): annotations removed diffstat: ChangeLog | 6 ++++++ tests/reproducers/simple/JToJSString/testcases/JToJSStringTest.java | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diffs (32 lines): diff -r 382fb9c6634f -r f214f6ad1223 ChangeLog --- a/ChangeLog Thu Jan 29 12:22:18 2015 -0500 +++ b/ChangeLog Fri Jan 30 11:34:20 2015 -0500 @@ -1,3 +1,9 @@ +2015-01-30 Jie Kang + + Remove KnownToFail annotation from JToJSString reproducer tests. + * tests/reproducers/simple/JToJSString/testcases/JToJSStringTest.java: + (StringArrayTest)(jnlpStringArrayAppletTest): annotations removed + 2015-01-29 Jie Kang Fix accessing Java array elements from Javascript. PR1298. Fix provided by diff -r 382fb9c6634f -r f214f6ad1223 tests/reproducers/simple/JToJSString/testcases/JToJSStringTest.java --- a/tests/reproducers/simple/JToJSString/testcases/JToJSStringTest.java Thu Jan 29 12:22:18 2015 -0500 +++ b/tests/reproducers/simple/JToJSString/testcases/JToJSStringTest.java Fri Jan 30 11:34:20 2015 -0500 @@ -80,7 +80,6 @@ @Test @TestInBrowsers(testIn = { Browsers.all }) @NeedsDisplay - @KnownToFail @Bug(id = { "PR1794" }) public void StringArrayTest() throws Exception { javaToJSTest("/JToJSString.html", "abc"); @@ -96,7 +95,6 @@ @Test @TestInBrowsers(testIn = { Browsers.all }) @NeedsDisplay - @KnownToFail @Bug(id = { "PR1794" }) public void jnlpStringArrayAppletTest() throws Exception { javaToJSTest("/JToJSStringJnlpApplet.html", "abc"); From bugzilla-daemon at icedtea.classpath.org Fri Jan 30 16:34:57 2015 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 30 Jan 2015 16:34:57 +0000 Subject: [Bug 1298] LiveConnect - problem setting array elements (applet variables) from JS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1298 --- Comment #6 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=f214f6ad1223 author: Jie Kang date: Fri Jan 30 11:34:20 2015 -0500 Remove KnownToFail annotation from JToJSString reproducer tests. Fix in changeset 382fb9c6634f. PR1298 2015-01-30 Jie Kang Remove KnownToFail annotation from JToJSString reproducer tests. * tests/reproducers/simple/JToJSString/testcases/JToJSStringTest.java: (StringArrayTest)(jnlpStringArrayAppletTest): annotations removed -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From omajid at redhat.com Fri Jan 30 17:56:48 2015 From: omajid at redhat.com (Omair Majid) Date: Fri, 30 Jan 2015 12:56:48 -0500 Subject: [rfc][icedtea-web] dont expect junit have hamcrest included In-Reply-To: <54CAFC89.50701@redhat.com> References: <54C620FF.3080407@redhat.com> <54C91D00.5050807@redhat.com> <20150128195721.GB19535@redhat.com> <54CAFC89.50701@redhat.com> Message-ID: <20150130175647.GC1638@redhat.com> * Andrew Azores [2015-01-29 22:37]: > /usr/share/java/hamcrest-library.jar does exist, though. It's a symlink to > /usr/share/java/hamcrest/hamcrest-library-1.3.jar (and similar for > hamcrest-core, hamcrest-generator, hamcrest-integration JARs). Does this > sound reasonable? My junit is also a symlink to > /usr/share/java/junit-4.11.jar. Yup, the jars look sane. I guess my mistake was including hamcrest-library (now that I read hamcrest docs [1], I am sure if that's really needed) without hamcrest-core. Can you try the attached patch? Thanks, Omair [1] https://code.google.com/p/hamcrest/wiki/HamcrestDistributables -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 -------------- next part -------------- diff --git a/Makefile.am b/Makefile.am --- a/Makefile.am +++ b/Makefile.am @@ -102,6 +102,12 @@ RHINO_RUNTIME= endif +if WITH_HAMCREST + JUNIT_RUNTIME:=$(JUNIT_JAR):$(HAMCREST_JAR) +else + JUNIT_RUNTIME:=$(JUNIT_JAR) +endif + # support for javaws -html needs plugin.jar on classpath. rest of javaws works of course without it. if ENABLE_PLUGIN PLUGIN_RUNTIME=:$(datadir)/$(PACKAGE_NAME)/plugin.jar @@ -703,7 +709,7 @@ mkdir -p $(JUNIT_RUNNER_DIR) && \ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -d $(JUNIT_RUNNER_DIR) \ - -classpath $(JUNIT_JAR):$(TEST_EXTENSIONS_DIR) \ + -classpath $(JUNIT_RUNTIME):$(TEST_EXTENSIONS_DIR) \ @junit-runner-source-files.txt && \ $(BOOT_DIR)/bin/jar cf $@ -C $(JUNIT_RUNNER_DIR) . @@ -876,7 +882,7 @@ ln -s $(TEST_EXTENSIONS_DIR) $(TEST_EXTENSIONS_COMPATIBILITY_SYMLINK); $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -d $(TEST_EXTENSIONS_DIR) \ - -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar \ + -classpath $(JUNIT_RUNTIME):$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar \ @test-extensions-source-files.txt && \ mkdir -p stamps && \ touch $@ @@ -891,7 +897,7 @@ for x in `cat $(abs_top_builddir)/test-extensions-tests-source-files.txt` ; do \ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -d $(TEST_EXTENSIONS_TESTS_DIR) \ - -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ + -classpath $(JUNIT_RUNTIME):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ $$x ; \ done ; \ mkdir -p stamps && \ @@ -908,7 +914,7 @@ echo "compiling" $$dir ; \ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -d $(TEST_EXTENSIONS_TESTS_DIR) \ - -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ + -classpath $(JUNIT_RUNTIME):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \ "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"*.java ; \ if [ -d "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases" ]; then \ pushd "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases" ; \ @@ -972,7 +978,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES) stamps/process-custom-reproducers.stamp cd $(TEST_EXTENSIONS_DIR) ; \ class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) ; \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_RUNTIME):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) ; \ $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \ -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH CommandLine $$class_names if WITH_XSLTPROC @@ -1121,7 +1127,7 @@ mkdir -p $(NETX_UNIT_TEST_DIR) && \ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -d $(NETX_UNIT_TEST_DIR) \ - -classpath $(JUNIT_JAR):$(abs_top_builddir)/liveconnect/lib/classes.jar:$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR):$(TAGSOUP_JAR) \ + -classpath $(JUNIT_RUNTIME):$(abs_top_builddir)/liveconnect/lib/classes.jar:$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR):$(TAGSOUP_JAR) \ @netx-unit-tests-source-files.txt && \ mkdir -p stamps && \ touch $@ @@ -1151,7 +1157,7 @@ done ; \ cd $(NETX_UNIT_TEST_DIR) ; \ class_names=`cat $(UNIT_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) ; \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_RUNTIME):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) ; \ $(BOOT_DIR)/bin/java -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH CommandLine $$class_names if WITH_XSLTPROC -$(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html @@ -1172,7 +1178,7 @@ mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \ done ;\ class_names=`cat $(UNIT_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) ; \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_RUNTIME):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) ; \ $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emmarun \ -Dreport.html.out.encoding=UTF-8 \ -raw \ @@ -1183,6 +1189,7 @@ -r xml \ -cp $(NETX_DIR)/lib/classes.jar \ -cp $(JUNIT_JAR) \ + -cp $(HAMCREST_JAR) \ -cp $(JUNIT_RUNNER_JAR) \ -cp $(BOOT_DIR)/jre/lib/rt.jar \ -cp $(BOOT_DIR)/jre/lib/jsse.jar \ @@ -1237,7 +1244,7 @@ mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \ done ;\ class_names=`cat $(UNIT_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) ; \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_RUNTIME):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) ; \ $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH CommandLine $$class_names ; \ for file in $(EMMA_MODIFIED_FILES) ; do \ mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \ @@ -1294,7 +1301,7 @@ done ; \ cd $(TEST_EXTENSIONS_DIR) ; \ class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) ; \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_RUNTIME):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) ; \ $(BOOT_DIR)/bin/java \ $(EMMA_JAVA_ARGS) \ $(REPRODUCERS_DPARAMETERS) \ @@ -1302,6 +1309,7 @@ -raw \ -cp $(NETX_DIR)/lib/classes.jar \ -cp $(JUNIT_JAR) \ + -cp $(HAMCREST_JAR) \ -cp $(JUNIT_RUNNER_JAR) \ -cp $(BOOT_DIR)/jre/lib/rt.jar \ -cp $(BOOT_DIR)/jre/lib/jsse.jar \ @@ -1414,7 +1422,7 @@ done ; \ cd $(TEST_EXTENSIONS_DIR) ; \ class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) ; \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_RUNTIME):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) ; \ $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) $(REPRODUCERS_DPARAMETERS) \ -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH CommandLine $$class_names ; \ if [ -f $(JACOCO_JAVAWS_RESULTS) ] ; then \ @@ -1523,14 +1531,14 @@ run-test-server-on-44321: stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \ stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp cd $(TEST_EXTENSIONS_DIR) ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) ; \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_RUNTIME):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) ; \ $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \ -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH net.sourceforge.jnlp.ServerAccess run-test-server-on-random-port: stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \ stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp cd $(TEST_EXTENSIONS_DIR) ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) ; \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_RUNTIME):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) ; \ $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \ -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH net.sourceforge.jnlp.ServerAccess randomport diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -118,6 +118,8 @@ [/usr/share/java/js.jar /usr/share/rhino-1.6/lib/js.jar]) IT_FIND_OPTIONAL_JAR([junit], JUNIT, [/usr/share/java/junit4.jar /usr/share/junit-4/lib/junit.jar]) +IT_FIND_OPTIONAL_JAR([hamcrest], HAMCREST, + [/usr/share/java/hamcrest/all.jar /usr/share/java/hamcrest-core.jar]) IT_FIND_OPTIONAL_JAR([emma], EMMA, [/usr/share/java/emma.jar]) IT_FIND_OPTIONAL_JAR([jacoco], JACOCO, From jkang at redhat.com Fri Jan 30 18:43:28 2015 From: jkang at redhat.com (Jie Kang) Date: Fri, 30 Jan 2015 13:43:28 -0500 (EST) Subject: [rfc][icedtea-web] Fix javascript url error in JSToJSet reproducer In-Reply-To: <96381513.1767636.1422477772491.JavaMail.zimbra@redhat.com> Message-ID: <70322527.2831178.1422643408385.JavaMail.zimbra@redhat.com> Hello, The reproducers for JSToJSet are broken due to errors in the javascript code. The error causing the code to fail has been fixed by decoding the URL before using it in arguments. Previously a URL containing characters like [ was not decoded and so the argument would end up including the characters "%5B" as opposed to "[". Okay to push? There are still some parts of the javascript that result in failing tests but it is not 100% clear whether the behaviour is expected when compared to Oracle's implementation of live-connect. Example: javascript code: Case 1: var value = "1"; applet.integer = value; versus Case 2: var value = 1; applet.integer = value; When applet.integer is declared as an Integer in java code, case 1 fails while case 2 passes. The javascript code in JSToJSet tests for case 1 at the moment. However, when applet.integer is declared as an int (primitive as opposed to Object) in java code, both cases pass. This affects most boxed primitives such as Double, Float, Byte, etc. I'm assuming it should pass for Case 1 when using Integer, so there are still some issues with our implementation of LiveConnect :\ Regards, -- Jie Kang OpenJDK Team - Software Engineering Intern -------------- next part -------------- A non-text attachment was scrubbed... Name: itw-fix-jstojset-reproducer-1.patch Type: text/x-patch Size: 2397 bytes Desc: not available URL: From andrew at icedtea.classpath.org Fri Jan 30 18:50:35 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 30 Jan 2015 18:50:35 +0000 Subject: /hg/icedtea7: 2 new changesets Message-ID: changeset ba0c0c090ec4 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ba0c0c090ec4 author: Andrew John Hughes date: Thu Jan 22 02:55:05 2015 +0000 Added tag icedtea-2.6.0pre17 for changeset ec4f4f0f51e1 changeset b2c3a2dac077 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=b2c3a2dac077 author: Andrew John Hughes date: Fri Jan 30 18:09:03 2015 +0000 Bump to icedtea-2.6.0pre18. Upstream changes: S6695379: Copy method annotations and parameter annotations to synthetic bridge methods S6976528: PS: assert(!limit_exceeded || softrefs_clear) failed: Should have been cleared S7172176: test/sun/tools/jconsole/ImmutableResourceTest.sh failing S8001633: Wrong alt processing during switching between windows. S8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so S8013485: javac can't handle annotations with a from a previous compilation unit S8013849: Awt assert on Hashtable.cpp:124 S8015780: java/lang/reflect/Method/GenericStringTest.java failing S8020675: invalid jar file in the bootclasspath could lead to jvm fatal error S8020829: NMT tests fail on platforms if NMT detail is not supported S8029775: Solaris code cleanup S8031471: Test closed/java/awt/dnd/FileDialogDropTargetTest/FileDialogDropTargetTest.java fails on Solaris zones virtual hosts S8031765: Child process error stream is not empty! S8042235: redefining method used by multiple MethodHandles crashes VM S8046289: compiler/6340864/TestLongVect.java timeout with S8046656: Update protocol support S8047340: (process) Runtime.exec() fails in Turkish locale S8048035: Ensure proper proxy protocols S8048050: Agent NullPointerException when rmi.port in use S8048170: Test closed/java/text/Normalizer/ConformanceTest.java failed S8049758: Increment minor version of HSx for 7u75 and initialize the build number S8050983: Misplaced parentheses in sun.net.www.http.HttpClient break HTTP PUT streaming S8054367: More references for endpoints S8054478: C2: Incorrectly compiled char[] array access crashes JVM S8055304: More boxing for DirectoryComboBoxModel S8055309: RMI needs better transportation considerations S8055489: Better substitution formats S8056264: Multicast support improvements S8056276: Fontmanager feature improvements S8056309: Set minor version for hotspot in 7u76 to 76 and build number to b01 S8057555: Less cryptic cipher suite management S8058583: Remove CompilationRepeat S8058935: CPU detection gives 0 cores per cpu, 2 threads per core in Amazon EC2 environment S8059216: Make PrintGCApplicationStoppedTime print information about stopping threads S8059327: XML parser returns corrupt attribute value S8059485: Resolve parsing ambiguity S8060474: Resolve more parsing ambiguity S8061210: Issues in TLS S8061507: Increment hsx 24.76 build to b02 for 7u76-b05 S8061685: Increment hsx 24.75 build to b02 for 7u75-b06 S8061694: Increment hsx 24.76 build to b03 for 7u76-b06 S8061826: Part of JDK-8060474 should be reverted S8061954: 7u76 - deployment warning dialogs do not work on Linux S8062021: NPE in sun/lwawt/macosx/CPlatformWindow::toFront after JDK-8060146 S8062178: merge issue: Test closed/java/util/TimeZone/Bug6329116.java fails in 7u-cpu nightly S8062561: Test bug8055304 fails if file system default directory has read access S8062608: BCEL corrupts debug data of methods that use generics S8062672: JVM crashes during GC on various asserts which checks that HeapWord ptr is an oop S8062771: Core reflection should use final fields whenever possible S8062807: Exporting RMI objects fails when run under restrictive SecurityManager S8064300: Increment hsx 24.75 build to b03 for 7u75-b06 S8064391: More thread safety problems in core reflection S8064407: (fc) FileChannel transferTo should use TransmitFile on Windows S8064493: Increment the build value to b04 for hs24.76 in 7u76-b08 S8064516: BCEL still corrupts generic methods if bytecode offsets are modified S8064532: 7u76 build failed with # 8041979 S8064533: Remove and retag jdk7u76-b08 tag in 7u76/jdk repo S8064560: (tz) Support tzdata2014j S8064667: Add -XX:+CheckEndorsedAndExtDirs flag to JDK 8 S8064846: Lazy-init thread safety problems in core reflection S8065098: JColorChooser no longer supports drag and drop between two JVM instances S8065552: setAccessible(true) on fields of Class may throw a SecurityException S8065608: 7u75 l10n resource file translation update S8065609: 7u76 l10n resource file translation update S8065618: C2 RA incorrectly removes kill projections S8065674: javac generates incorrect LVT table for trivial cases S8065765: Missing space in output message from -XX:+CheckEndorsedAndExtDirs S8065787: Increment hsx 24.75 build to b04 for 7u75-b10 S8066045: opto/node.hpp:355, assert(i < _max) failed: oob: i=1, _max=1 S8066103: C2's range check smearing allows out of bound array accesses S8066612: Add a test that will call getDeclaredFields() on all classes and try to set them accessible. S8066649: 8u backport for 8065618 is incorrect S8066747: Backing out Japanese translation change in awt_ja.properties S8066756: Test test/sun/awt/dnd/8024061/bug8024061.java fails S8066775: opto/node.hpp:355, assert(i < _max) failed: oob: i=1, _max=1 S8068338: Better message about incompatible zlib in Deflater.init S8068405: GenerateCurrencyData throws RuntimeException for old data S8068507: (fc) Rename the new jdk.net.enableFastFileTransfer system property to jdk.nio.enableFastFileTransfer S8068639: Make certain annotation classfile warnings opt-in 2015-01-30 Andrew John Hughes * Makefile.am: (BUILD_VERSION): Bump to b05. (CORBA_CHANGESET): Update to icedtea-2.6pre18. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.6.0pre18. * hotspot.map.in: Update to icedtea-2.6pre18. 2015-01-20 Andrew John Hughes * patches/boot/ecj-diamond.patch: Regenerated. Add new cases introduced in sun.security.ssl.ProtocolVersion and sun.security.ssl.SSLContextImpl 2015-01-20 Andrew John Hughes * patches/boot/ecj-trywithresources.patch: Add new case in sun.security.krb5.internal.ccache.FileCredentialsCache. Change is taken from the OpenJDK 6 version of the file. diffstat: .hgtags | 1 + ChangeLog | 35 + Makefile.am | 26 +- NEWS | 79 ++ configure.ac | 2 +- hotspot.map.in | 2 +- patches/boot/ecj-diamond.patch | 1165 +++++++++++++++--------------- patches/boot/ecj-trywithresources.patch | 84 ++ 8 files changed, 807 insertions(+), 587 deletions(-) diffs (truncated from 3593 to 500 lines): diff -r ec4f4f0f51e1 -r b2c3a2dac077 .hgtags --- a/.hgtags Thu Jan 22 02:36:04 2015 +0000 +++ b/.hgtags Fri Jan 30 18:09:03 2015 +0000 @@ -44,3 +44,4 @@ 7b1e986f50790d605106ccb930efa9520ada88bc icedtea-2.6.0pre14 96928f512863a4d6aa9b709922d9fbbc55dcb7e0 icedtea-2.6.0pre15 cbffdefdd884899ca11dbdf192496aefb19e3ac6 icedtea-2.6.0pre16 +ec4f4f0f51e1bbaa2bffdef261d1e566832669d2 icedtea-2.6.0pre17 diff -r ec4f4f0f51e1 -r b2c3a2dac077 ChangeLog --- a/ChangeLog Thu Jan 22 02:36:04 2015 +0000 +++ b/ChangeLog Fri Jan 30 18:09:03 2015 +0000 @@ -1,3 +1,38 @@ +2015-01-30 Andrew John Hughes + + * Makefile.am: + (BUILD_VERSION): Bump to b05. + (CORBA_CHANGESET): Update to icedtea-2.6pre18. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Updated. + * configure.ac: Bump to 2.6.0pre18. + * hotspot.map.in: Update to icedtea-2.6pre18. + +2015-01-20 Andrew John Hughes + + * patches/boot/ecj-diamond.patch: + Regenerated. Add new cases introduced in + sun.security.ssl.ProtocolVersion and + sun.security.ssl.SSLContextImpl + +2015-01-20 Andrew John Hughes + + * patches/boot/ecj-trywithresources.patch: + Add new case in + sun.security.krb5.internal.ccache.FileCredentialsCache. + Change is taken from the OpenJDK 6 version of + the file. + 2015-01-21 Andrew John Hughes * Makefile.am: diff -r ec4f4f0f51e1 -r b2c3a2dac077 Makefile.am --- a/Makefile.am Thu Jan 22 02:36:04 2015 +0000 +++ b/Makefile.am Fri Jan 30 18:09:03 2015 +0000 @@ -1,22 +1,22 @@ # Dependencies JDK_UPDATE_VERSION = 80 -BUILD_VERSION = b03 +BUILD_VERSION = b05 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = 1eb2d75d86f0 -JAXP_CHANGESET = 54100657ce67 -JAXWS_CHANGESET = f36becc08f66 -JDK_CHANGESET = 3ce28e98738c -LANGTOOLS_CHANGESET = e1dd8fea9abd -OPENJDK_CHANGESET = f92696272981 +CORBA_CHANGESET = 15250731630c +JAXP_CHANGESET = 8cc37ea6edf6 +JAXWS_CHANGESET = 5ee59be2092b +JDK_CHANGESET = 19a30444897f +LANGTOOLS_CHANGESET = bb9d09219d3e +OPENJDK_CHANGESET = e229119aa0a0 -CORBA_SHA256SUM = f2e5f4d456e95ee36c7e160d5e8a6f376d5a9e8ed5adf4c3c4a64a4fcc117a7a -JAXP_SHA256SUM = f39f547de8230aca3d5ed40833ecb5e8fccbfe796c75b4c4d554a0e579f5d289 -JAXWS_SHA256SUM = 4f9c499a7ced94b4198732443e0c4c53ed884d91babcebd750309c18121c62f1 -JDK_SHA256SUM = cb96e5a9385bac4b9a5f98373986d34ae00e517ff18c95502380cfb2eb650556 -LANGTOOLS_SHA256SUM = b896ac0baed2c855620e3180ce356e32c2bb4428b68f0a30508d557cd00d688a -OPENJDK_SHA256SUM = f61156d10fa0f7b1949ad8909ef1ad504d7dff15e217ba20da2c42e07946cedb +CORBA_SHA256SUM = 9448485932e5f74b545e7c9e1d4a586bf4a93c85223e500d803eecfe287786fb +JAXP_SHA256SUM = 66ee4dfac13fd748a6e7f42726be66b625ba0ee5454635e48c4f4b17c4257210 +JAXWS_SHA256SUM = 5891f10569b4f26f6bf6eb8548a565057930d7ca39e19a72ba28a220fd920614 +JDK_SHA256SUM = 2f3c22d729d65851f491d924fb0844f7a04c6e4d9b5e926f08938d58e214dd1a +LANGTOOLS_SHA256SUM = 5df2c2a496409b0eb1f4ff923ee6de554ab74af8b91af26185f7e2f73071642d +OPENJDK_SHA256SUM = 8c77d4d16d38b2ee4edd98525186548c33138a400c61978e1e54b70c494250df DROP_URL = http://icedtea.classpath.org/download/drops diff -r ec4f4f0f51e1 -r b2c3a2dac077 NEWS --- a/NEWS Thu Jan 22 02:36:04 2015 +0000 +++ b/NEWS Fri Jan 30 18:09:03 2015 +0000 @@ -30,8 +30,10 @@ - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec - S6642881: Improve performance of Class.getClassLoader() - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems + - S6695379: Copy method annotations and parameter annotations to synthetic bridge methods - S6883953: java -client -XX:ValueMapInitialSize=0 crashes - S6931564: Incorrect display name of Locale for south africa + - S6976528: PS: assert(!limit_exceeded || softrefs_clear) failed: Should have been cleared - S6984762: Invalid close of file descriptor '-1' in findZoneinfoFile - S6993873: java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java test indicates ".a frame wasn't focused on click" jdk7 issue on linux - S7010989: Duplicate closure of file descriptors leads to unexpected and incorrect closure of sockets @@ -62,6 +64,7 @@ - S7161320: TEST_BUG: java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java fails (Invalid key code) - S7164841: Improvements to the GC log file rotation - S7169142: CookieHandler does not work with localhost + - S7172176: test/sun/tools/jconsole/ImmutableResourceTest.sh failing - S7172865: PropertyDescriptor fails to work with setter method name if setter is non-void - S7180038: regression test failure, SSLEngineBadBufferArrayAccess.java - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations @@ -70,12 +73,14 @@ - S7199674: (props) user.home property does not return an accessible location in sandboxed environment [macosx] - S8001105: findVirtual of Object[].clone produces internal error - S8001472: api/java_awt/Window/indexTGF_* tests fail because expected colors aren't equal + - S8001633: Wrong alt processing during switching between windows. - S8002148: [TEST_BUG] The four lines printed are not the bold typeface. - S8004488: wrong permissions checked in krb5 - S8005232: (JEP-149) Class Instance size reduction - S8006023: Embedded Builds fail management test because of requirement for UsePerfData being enabled. - S8006748: getISO3Country() returns wrong value - S8008328: [partfait] Null pointer defererence in hotspot/src/cpu/x86/vm/frame_x86.inline.hpp + - S8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so - S8009258: TEST_BUG:java/io/pathNames/GeneralWin32.java fails intermittently - S8010738: G1: Output for full GCs with +PrintGCDetails should contain perm gen/meta data size change info - S8011646: SEGV in compiled code with loop predication @@ -84,10 +89,13 @@ - S8012625: Incorrect handling of HTTP/1.1 " Expect: 100-continue " in HttpURLConnection - S8012941: JSR 292: too deep inlining might crash compiler because of stack overflow - S8013098: [macosx] localized aqua_xx.properties are not included in rt.jar + - S8013485: javac can't handle annotations with a from a previous compilation unit + - S8013849: Awt assert on Hashtable.cpp:124 - S8014254: Selector in HttpServer introduces a 1000 ms delay when using KeepAlive - S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE - S8015586: [macosx] Test closed/java/awt/print/PrinterJob/PrintToDir.java fails on MacOSX - S8015628: Test Failure in closed/java/io/pathNames/GeneralSolaris.java + - S8015780: java/lang/reflect/Method/GenericStringTest.java failing - S8016545: java.beans.XMLEncoder.writeObject output is wrong - S8016579: (process) IOException thrown by ProcessBuilder.start() method is incorrectly encoded - S8017212: File.createTempFile requires unnecessary "read" permission @@ -96,6 +104,8 @@ - S8019800: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8017011 - S8019834: InetAddress.getByName hangs for bad IPv6 literals - S8020190, PR2160, RH1176718: Fatal: Bug in native code: jfieldID must match object + - S8020675: invalid jar file in the bootclasspath could lead to jvm fatal error + - S8020829: NMT tests fail on platforms if NMT detail is not supported - S8021121: ISO 4217 Amendment Number 156 - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address - S8021804: Certpath validation fails if validity period of root cert does not include validity period of intermediate cert @@ -132,6 +142,7 @@ - S8029190: VM_Version::determine_features() asserts on Fujitsu Sparc64 CPUs - S8029302: Performance regression in Math.pow intrinsic - S8029607: Type of Service (TOS) cannot be set in IPv6 header + - S8029775: Solaris code cleanup - S8029837: NPE seen in XMLDocumentFragmentScannerImpl.setProperty since 7u40b33 - S8030114: [parfait] warnings from b119 for jdk.src.share.native.sun.security.smartcardio: JNI exception pending - S8030192: TESTFAIL: java/util/logging/TestLoggerBundleSync.java failed with NPE @@ -144,10 +155,12 @@ - S8031068: java/util/logging/ParentLoggersTest.java: checkLoggers: getLoggerNames() returned unexpected loggers - S8031290: Adjust call to getisax() for additional words returned - S8031435: Ftp download does not work properly for ftp user without password + - S8031471: Test closed/java/awt/dnd/FileDialogDropTargetTest/FileDialogDropTargetTest.java fails on Solaris zones virtual hosts - S8031566: regression test failure, SSLEngineBadBufferArrayAccess.java - S8031572: jarsigner -verify exits with 0 when a jar file is not properly signed - S8031743: C2: loadI2L_immI broken for negative memory values - S8031764: tmtools/jmap/heap_config tests fail on Linux-ia32 because it Cant attach to the core file + - S8031765: Child process error stream is not empty! - S8032078: [macosx] CPlatformWindow.setWindowState throws RuntimeException, if windowState=ICONIFIED|MAXIMIZED_BOTH - S8032466: serviceability/sa/jmap-hashcode/Test8028623.java fails with compilation errors - S8032669: Mouse release not being delivered to Swing component in 7u45 @@ -225,6 +238,7 @@ - S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser - S8042052: assert(t != NULL) failed: must set before get - S8042059: Various fixes to linux/sparc + - S8042235: redefining method used by multiple MethodHandles crashes VM - S8042247: Make 7u60 the default jprt release for hs24.80 - S8042250: Misleading command line output for ReservedCodeCacheSize validation - S8042465: Applet menus not rendering when browser is full screen on Mac @@ -254,16 +268,22 @@ - S8046269: Build broken : THIS_FILE : undeclared identifier - S8046275: Fastdebug build failing on jdk9/hs/ control jobs after pulling some hs-comp changes - S8046287: [TESTBUG] runtime/Thread/TestThreadDumpMonitorContention.java failed error_cnt=12 + - S8046289: compiler/6340864/TestLongVect.java timeout with - S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX - S8046495: KeyEvent can not be accepted in quick mouse clicking - S8046516: Segmentation fault in JVM (easily reproducible) - S8046559: NPE when changing Windows theme - S8046588: test for SO_FLOW_SLA availability does not check for EACCESS + - S8046656: Update protocol support - S8046769: Set T family feature bit on Niagara systems - S8047186: jdk.net.Sockets throws InvocationTargetException instead of original runtime exceptions - S8047187: Test jdk/net/Sockets/Test.java fails to compile after fix JDK-8046588 + - S8047340: (process) Runtime.exec() fails in Turkish locale + - S8048035: Ensure proper proxy protocols + - S8048050: Agent NullPointerException when rmi.port in use - S8048080: (smartcardio) javax.smartcardio.Card.openLogicalChannel() dosn't work on MacOSX - S8048110: Using tables in JTextPane leads to infinite loop in FlowLayout.layoutRow + - S8048170: Test closed/java/text/Normalizer/ConformanceTest.java failed - S8048212: Two tests failed with "java.net.SocketException: Bad protocol option" on Windows after 8029607 - S8048271: Minor GC times doubled from JDK 6u35 to JDK 7u51 - S8048506: [macosx] javax.swing.PopupFactory issue with null owner @@ -274,6 +294,7 @@ - S8049514: FEATURE_SECURE_PROCESSING can not be turned off on a validator through SchemaFactory - S8049542: C2: assert(size_in_words <= (julong)max_jint) failed: no overflow - S8049684: pstack crashes on java core dump + - S8049758: Increment minor version of HSx for 7u75 and initialize the build number - S8049787: Increment hsx 24.72 build to b03 for 7u72-b04 - S8050022: linux-sparcv9: assert(SharedSkipVerify || obj->is_oop()) failed: sanity check - S8050158: Introduce system property to maintain RC4 preference order @@ -281,6 +302,7 @@ - S8050167: linux-sparcv9: hs_err file does not show any stack information - S8050386: javac, follow-up of fix for JDK-8049305 - S8050485: super() in a try block in a ctor causes VerifyError + - S8050983: Misplaced parentheses in sun.net.www.http.HttpClient break HTTP PUT streaming - S8051004: javac, incorrect bug id in tests for JDK-8050386 - S8051359: JPopupMenu creation in headless mode with JDK9b23 causes NPE - S8051614: smartcardio TCK tests fail due to lack of 'reset' permission @@ -289,36 +311,93 @@ - S8052159: TEST_BUG: javax/swing/JTextField/8036819/bug8036819.java fails to compile - S8052406: SSLv2Hello protocol may be filter out unexpectedly - S8054019: Keytool Error publicKey's is not X.509, but X509 + - S8054367: More references for endpoints + - S8054478: C2: Incorrectly compiled char[] array access crashes JVM - S8054530: C2: assert(res == old_res) failed: Inconsistency between old and new - S8054817: File ccache only recognizes Linux and Solaris defaults - S8054841: (process) ProcessBuilder leaks native memory - S8054883: Segmentation error while running program - S8055222: Currency update needed for ISO 4217 Amendment #159 + - S8055304: More boxing for DirectoryComboBoxModel + - S8055309: RMI needs better transportation considerations - S8055421: (fs) bad error handling in java.base/unix/native/libnio/fs/UnixNativeDispatcher.c + - S8055489: Better substitution formats - S8055714: Increment hsx 24.72 build to b04 for 7u72-b11 - S8055731: sun/security/smartcardio/TestDirect.java throws java.lang.IndexOutOfBoundsException - S8055949: ByteArrayOutputStream capacity should be maximal array size permitted by VM - S8056026: Debug security logging should print Provider used for each crypto operation - S8056156: [TEST_BUG] Test javax/swing/JFileChooser/8046391/bug8046391.java fails in Windows - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure + - S8056264: Multicast support improvements + - S8056276: Fontmanager feature improvements + - S8056309: Set minor version for hotspot in 7u76 to 76 and build number to b01 - S8056914: Right Click Menu for Paste not showing after upgrading to java 7 - S8057184: JCK8's api/javax_swing/JDesktopPane/descriptions.html#getset failed with GTKLookAndFeel on Linux and Solaris - S8057530: (process) Runtime.exec throws garbled message in jp locale + - S8057555: Less cryptic cipher suite management - S8057564: JVM hangs at getAgentProperties after attaching to VM with lower - S8057813: Alterations to jdk_security3 test target - S8058120: Rendering / caret errors with HTMLDocument - S8058473: "Comparison method violates its general contract" when using Clipboard + - S8058583: Remove CompilationRepeat - S8058715: stability issues when being launched as an embedded JVM via JNI - S8058927: ATG throws ClassNotFoundException - S8058932: java/net/InetAddress/IPv4Formats.java failed because hello.foo.bar does exist + - S8058935: CPU detection gives 0 cores per cpu, 2 threads per core in Amazon EC2 environment - S8058936: hotspot/test/Makefile should use jtreg script from $JT_HOME/bin/jreg (instead of $JT_HOME/win32/bin/jtreg) - S8059206: (tz) Support tzdata2014i + - S8059216: Make PrintGCApplicationStoppedTime print information about stopping threads - S8059299: assert(adr_type != NULL) failed: expecting TypeKlassPtr + - S8059327: XML parser returns corrupt attribute value + - S8059485: Resolve parsing ambiguity - S8059563: (proxy) sun.misc.ProxyGenerator.generateProxyClass should create intermediate directories - S8060006: No Russian time zones mapping for Windows - S8060169: Update the Crash Reporting URL in the Java crash log + - S8060474: Resolve more parsing ambiguity + - S8061210: Issues in TLS + - S8061507: Increment hsx 24.76 build to b02 for 7u76-b05 + - S8061685: Increment hsx 24.75 build to b02 for 7u75-b06 + - S8061694: Increment hsx 24.76 build to b03 for 7u76-b06 - S8061785: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge + - S8061826: Part of JDK-8060474 should be reverted + - S8061954: 7u76 - deployment warning dialogs do not work on Linux + - S8062021: NPE in sun/lwawt/macosx/CPlatformWindow::toFront after JDK-8060146 + - S8062178: merge issue: Test closed/java/util/TimeZone/Bug6329116.java fails in 7u-cpu nightly + - S8062561: Test bug8055304 fails if file system default directory has read access + - S8062608: BCEL corrupts debug data of methods that use generics + - S8062672: JVM crashes during GC on various asserts which checks that HeapWord ptr is an oop - S8062744: jdk.net.Sockets.setOption/getOption does not support IP_TOS + - S8062771: Core reflection should use final fields whenever possible + - S8062807: Exporting RMI objects fails when run under restrictive SecurityManager + - S8064300: Increment hsx 24.75 build to b03 for 7u75-b06 + - S8064391: More thread safety problems in core reflection + - S8064407: (fc) FileChannel transferTo should use TransmitFile on Windows + - S8064493: Increment the build value to b04 for hs24.76 in 7u76-b08 + - S8064516: BCEL still corrupts generic methods if bytecode offsets are modified + - S8064532: 7u76 build failed with # 8041979 + - S8064533: Remove and retag jdk7u76-b08 tag in 7u76/jdk repo + - S8064560: (tz) Support tzdata2014j + - S8064667: Add -XX:+CheckEndorsedAndExtDirs flag to JDK 8 + - S8064846: Lazy-init thread safety problems in core reflection + - S8065098: JColorChooser no longer supports drag and drop between two JVM instances + - S8065552: setAccessible(true) on fields of Class may throw a SecurityException + - S8065608: 7u75 l10n resource file translation update + - S8065609: 7u76 l10n resource file translation update + - S8065618: C2 RA incorrectly removes kill projections + - S8065674: javac generates incorrect LVT table for trivial cases + - S8065765: Missing space in output message from -XX:+CheckEndorsedAndExtDirs + - S8065787: Increment hsx 24.75 build to b04 for 7u75-b10 + - S8066045: opto/node.hpp:355, assert(i < _max) failed: oob: i=1, _max=1 + - S8066103: C2's range check smearing allows out of bound array accesses + - S8066612: Add a test that will call getDeclaredFields() on all classes and try to set them accessible. + - S8066649: 8u backport for 8065618 is incorrect + - S8066747: Backing out Japanese translation change in awt_ja.properties + - S8066756: Test test/sun/awt/dnd/8024061/bug8024061.java fails + - S8066775: opto/node.hpp:355, assert(i < _max) failed: oob: i=1, _max=1 + - S8068338: Better message about incompatible zlib in Deflater.init + - S8068405: GenerateCurrencyData throws RuntimeException for old data + - S8068507: (fc) Rename the new jdk.net.enableFastFileTransfer system property to jdk.nio.enableFastFileTransfer + - S8068639: Make certain annotation classfile warnings opt-in * Backports - S7172012, PR2067: Make test-in-build an option (Queens) - S8000897, RH1155012: VM crash in CompileBroker diff -r ec4f4f0f51e1 -r b2c3a2dac077 configure.ac --- a/configure.ac Thu Jan 22 02:36:04 2015 +0000 +++ b/configure.ac Fri Jan 30 18:09:03 2015 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.6.0pre17], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.6.0pre18], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile]) diff -r ec4f4f0f51e1 -r b2c3a2dac077 hotspot.map.in --- a/hotspot.map.in Thu Jan 22 02:36:04 2015 +0000 +++ b/hotspot.map.in Fri Jan 30 18:09:03 2015 +0000 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 4d25046abb67 60da8d427f7e3659f701e54c763ea8366d8af3280c7e10670004938b2f07efef +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1792bfb4a54d c08056f64be5923353a75838e66b26aedf0213cbf2296cac449a5ee874c6759a diff -r ec4f4f0f51e1 -r b2c3a2dac077 patches/boot/ecj-diamond.patch --- a/patches/boot/ecj-diamond.patch Thu Jan 22 02:36:04 2015 +0000 +++ b/patches/boot/ecj-diamond.patch Fri Jan 30 18:09:03 2015 +0000 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-11-28 03:10:17.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-11-28 15:55:01.049797223 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-01-29 22:20:19.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-01-30 03:30:15.833325373 +0000 @@ -58,7 +58,7 @@ private CorbaConnection conn; @@ -11,8 +11,8 @@ public static synchronized void cleanCache( ORB orb ) { synchronized (iorMapLock) { diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2014-11-28 03:10:17.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2014-11-28 15:55:01.049797223 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2015-01-29 22:20:19.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2015-01-30 03:30:15.833325373 +0000 @@ -50,7 +50,7 @@ */ private class HookPutFields extends ObjectOutputStream.PutField @@ -23,8 +23,8 @@ /** * Put the value of the named boolean field into the persistent field. diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-11-28 03:10:17.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-11-28 15:55:01.049797223 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-01-29 22:20:19.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-01-30 03:30:15.833325373 +0000 @@ -1315,7 +1315,7 @@ protected void shutdownServants(boolean wait_for_completion) { Set oaset; @@ -35,8 +35,8 @@ for (ObjectAdapterFactory oaf : oaset) diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-11-28 03:10:17.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-11-28 15:55:01.049797223 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-01-29 22:20:19.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-01-30 03:30:15.833325373 +0000 @@ -108,7 +108,7 @@ private ThreadGroup threadGroup; @@ -56,8 +56,8 @@ for (WorkerThread wt : copy) { diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-11-28 07:13:39.125924468 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-11-28 15:55:01.049797223 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2015-01-30 03:29:04.252446195 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2015-01-30 03:30:15.833325373 +0000 @@ -297,8 +297,8 @@ // private final static class EncodingInfos { @@ -79,8 +79,8 @@ final String javaName = (String) keys.nextElement(); final String[] mimes = parseMimeTypes(props.getProperty(javaName)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-11-28 03:10:26.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-11-28 15:55:01.049797223 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2015-01-29 22:21:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2015-01-30 03:30:15.833325373 +0000 @@ -63,9 +63,10 @@ */ public final class DocumentHandler extends DefaultHandler { @@ -96,8 +96,8 @@ private Reference loader; private ExceptionListener listener; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-11-28 03:10:26.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-11-28 15:55:01.049797223 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2015-01-29 22:21:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2015-01-30 03:30:15.837325421 +0000 @@ -46,7 +46,7 @@ */ public final class TypeResolver { @@ -117,8 +117,8 @@ CACHE.put(actual, map); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-11-28 03:10:26.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-11-28 15:55:01.049797223 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2015-01-29 22:21:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2015-01-30 03:30:15.837325421 +0000 @@ -45,7 +45,7 @@ private final Kind keyKind; // a reference kind for the cache keys private final Kind valueKind; // a reference kind for the cache values @@ -165,8 +165,8 @@ }; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-11-28 03:10:26.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-11-28 15:55:01.049797223 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2015-01-29 22:21:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2015-01-30 03:30:15.837325421 +0000 @@ -104,9 +104,9 @@ return this.def.compareTo(that.def); } @@ -238,8 +238,8 @@ for (int i = 0; i < layout.length(); i++) { if (layout.charAt(i++) != '[') diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-11-28 07:13:39.177925171 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-11-28 15:55:01.053797276 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-01-30 03:29:05.176457544 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-01-30 03:30:15.837325421 +0000 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -302,8 +302,8 @@ return true; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-11-28 07:13:39.021923061 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-11-28 15:55:01.053797276 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2015-01-30 03:29:02.384423250 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2015-01-30 03:30:15.837325421 +0000 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -314,8 +314,8 @@ InnerClass ic = new InnerClass(readClassRef(), diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-11-28 03:10:26.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-11-28 15:55:01.053797276 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2015-01-29 22:21:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2015-01-30 03:30:15.837325421 +0000 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -352,8 +352,8 @@ if (popset.add(values[i])) popvals.add(values[i]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-11-28 03:10:26.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-11-28 15:55:01.053797276 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2015-01-29 22:21:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2015-01-30 03:30:15.837325421 +0000 @@ -402,7 +402,7 @@ private static Map codeMap; @@ -364,8 +364,8 @@ Coding x1 = codeMap.get(x0); if (x1 == null) codeMap.put(x0, x1 = x0); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-11-28 03:10:26.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-11-28 15:55:01.053797276 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2015-01-29 22:21:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2015-01-30 03:30:15.837325421 +0000 @@ -921,7 +921,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -394,8 +394,8 @@ Entry e = work.previous(); work.remove(); // pop stack diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-11-28 07:13:39.177925171 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-11-28 15:55:01.053797276 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-01-30 03:29:05.180457593 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-01-30 03:30:15.837325421 +0000 @@ -61,7 +61,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -433,8 +433,8 @@ for (String optline : options.split("\n")) { String[] words = optline.split("\\p{Space}+"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-11-28 03:10:26.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-11-28 15:55:01.053797276 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2015-01-29 22:21:31.000000000 +0000 From aazores at redhat.com Fri Jan 30 20:03:29 2015 From: aazores at redhat.com (Andrew Azores) Date: Fri, 30 Jan 2015 15:03:29 -0500 Subject: [rfc][icedtea-web] dont expect junit have hamcrest included In-Reply-To: <20150130175647.GC1638@redhat.com> References: <54C620FF.3080407@redhat.com> <54C91D00.5050807@redhat.com> <20150128195721.GB19535@redhat.com> <54CAFC89.50701@redhat.com> <20150130175647.GC1638@redhat.com> Message-ID: <54CBE391.9020304@redhat.com> On 01/30/2015 12:56 PM, Omair Majid wrote: > * Andrew Azores [2015-01-29 22:37]: >> /usr/share/java/hamcrest-library.jar does exist, though. It's a symlink to >> /usr/share/java/hamcrest/hamcrest-library-1.3.jar (and similar for >> hamcrest-core, hamcrest-generator, hamcrest-integration JARs). Does this >> sound reasonable? My junit is also a symlink to >> /usr/share/java/junit-4.11.jar. > > Yup, the jars look sane. I guess my mistake was including > hamcrest-library (now that I read hamcrest docs [1], I am sure if that's > really needed) without hamcrest-core. Can you try the attached patch? > > Thanks, > Omair > > [1] https://code.google.com/p/hamcrest/wiki/HamcrestDistributables > Works great :) Thanks, -- Andrew Azores From andrew at icedtea.classpath.org Fri Jan 30 20:28:23 2015 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 30 Jan 2015 20:28:23 +0000 Subject: /hg/icedtea7: Added tag icedtea-2.6.0pre18 for changeset b2c3a2d... Message-ID: changeset 64c40a3f40f6 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=64c40a3f40f6 author: Andrew John Hughes date: Fri Jan 30 20:28:17 2015 +0000 Added tag icedtea-2.6.0pre18 for changeset b2c3a2dac077 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r b2c3a2dac077 -r 64c40a3f40f6 .hgtags --- a/.hgtags Fri Jan 30 18:09:03 2015 +0000 +++ b/.hgtags Fri Jan 30 20:28:17 2015 +0000 @@ -45,3 +45,4 @@ 96928f512863a4d6aa9b709922d9fbbc55dcb7e0 icedtea-2.6.0pre15 cbffdefdd884899ca11dbdf192496aefb19e3ac6 icedtea-2.6.0pre16 ec4f4f0f51e1bbaa2bffdef261d1e566832669d2 icedtea-2.6.0pre17 +b2c3a2dac0777ef083482e1cda396c7723392682 icedtea-2.6.0pre18 From omajid at redhat.com Fri Jan 30 21:12:29 2015 From: omajid at redhat.com (Omair Majid) Date: Fri, 30 Jan 2015 16:12:29 -0500 Subject: [rfc][icedtea-web] dont expect junit have hamcrest included In-Reply-To: <54CA0470.90205@redhat.com> References: <54C620FF.3080407@redhat.com> <54C91D00.5050807@redhat.com> <20150128195721.GB19535@redhat.com> <54CA0470.90205@redhat.com> Message-ID: <20150130211229.GA6244@redhat.com> * Jiri Vanek [2015-01-29 04:59]: > Still, if we drop the "transitive hamcrest" then the best solution should be applied: > If junit is found: > - check if junit contains hamcrest > - should be simple cllass compiling with importing some hamcrest class > - if does, no hamcrest search > - if does not, check for hamcrest > - if no hamcrest avaiable halt configure This does seem like the right approach. > Or use your curent approach > - always check for hamcrest, but continue if it do not exists. > - disadvantage is that missing hamcrest is quite hard to find from gotten exception How about I push my current patch, and then someone (possibly me) can step in and further improve things to work as you suggested? We now know this patch fixes tests on at least two systems. Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jjjtre at yahoo.com Wed Jan 14 23:33:23 2015 From: jjjtre at yahoo.com (T J) Date: Wed, 14 Jan 2015 23:33:23 -0000 Subject: icedteaweb failing to load resource files Message-ID: <1507199381.295299.1421278401458.JavaMail.yahoo@jws10795.mail.gq1.yahoo.com> In running a javaws application with icedteaweb and openjfx/openjdk, the .css stylesheets in jfxrt.jar are not loading, causing the windows to be displayed incorrectly.??? I tracked down the problem to JNLPClassLoader being created without a parent, causing only the resource files in the .jnlp file to be found and not those in jre/lib/ext/*.jar.???? This is due in turn to? the JNLPClassLoader's constructor, which calls super(new URL[], JNLPClassLoader.class.getClassLoader()).???? But JNLPClassLoader.class.getClassLoader is ALWAYS returning null, causing JNLPClassloader to be created with null parent, as per above.??? In the document for Class, it appears that in some implementations if the loader for a class is the bootloader, getClassLoader will return null; I assume this may be the problem here. ?? I don't see how this problem has not been noticed before but I can't find anything online about it. I would like to know if this has been seen elsewhere and if it is being addressed. Thank you, J. Mahannah -------------- next part -------------- An HTML attachment was scrubbed... URL: From edward.nevill at gmail.com Thu Jan 22 09:53:18 2015 From: edward.nevill at gmail.com (Edward Nevill) Date: Thu, 22 Jan 2015 09:53:18 -0000 Subject: RFR: Add support for ARMv6 to ARM JIT In-Reply-To: <54BFDEED.9030506@redhat.com> References: <1421859993.3200.131.camel@mint> <54BFDEED.9030506@redhat.com> Message-ID: On Wed, Jan 21, 2015 at 5:16 PM, Andrew Haley wrote: > On 01/21/2015 05:06 PM, Edward Nevill wrote: > > > Because of the size of the changes I have introduced a new file > > arm32JIT.cpp rather than modifying the existing thumb2.cpp. This is > > switched on a symbol ARM32JIT. By default it will continue to build > > the Thumb2 JIT. To change it to build the ARM32 JIT by default add > > -DARM32JIT to CFLAGS in zeroshark.make as in the following patch. > > I don't get this. Surely we should have both, switchable at runtime. > arm32jit.cpp supports generation for ARMV6, ARMV6K and ARMV6T2+. For ARMV6 and ARMV6K it will generate 32 bit ARM instructions. For ARMV6T2 and later it will generate Thumb2 instructions by defaulty, but this can be changed by setting the T2_COMPILE_ARM environment variable. All the best, Ed. -------------- next part -------------- An HTML attachment was scrubbed... URL: From edward.nevill at gmail.com Thu Jan 22 11:14:24 2015 From: edward.nevill at gmail.com (Edward Nevill) Date: Thu, 22 Jan 2015 11:14:24 -0000 Subject: RFR: Add support for ARMv6 to ARM JIT In-Reply-To: <54C0CA54.6000606@redhat.com> References: <1421859993.3200.131.camel@mint> <54BFDEED.9030506@redhat.com> <54C0CA54.6000606@redhat.com> Message-ID: On Thu, Jan 22, 2015 at 10:00 AM, Andrew Haley wrote: > On 22/01/15 09:53, Edward Nevill wrote: > > On Wed, Jan 21, 2015 at 5:16 PM, Andrew Haley wrote: > > > >> On 01/21/2015 05:06 PM, Edward Nevill wrote: > >> > >>> Because of the size of the changes I have introduced a new file > >>> arm32JIT.cpp rather than modifying the existing thumb2.cpp. This is > >>> switched on a symbol ARM32JIT. By default it will continue to build > >>> the Thumb2 JIT. To change it to build the ARM32 JIT by default add > >>> -DARM32JIT to CFLAGS in zeroshark.make as in the following patch. > >> > >> I don't get this. Surely we should have both, switchable at runtime. > > > > arm32jit.cpp supports generation for ARMV6, ARMV6K and ARMV6T2+. > > > > For ARMV6 and ARMV6K it will generate 32 bit ARM instructions. > > > > For ARMV6T2 and later it will generate Thumb2 instructions by defaulty, > but > > this can be changed by setting the T2_COMPILE_ARM environment variable. > > So what is thumb2.cpp for? I still don't get it. > The idea was to minimise the change to reduce the risk of breaking anything for distros. The migration from thumb2 JIT to arm JIT would be done in 3 stages. Stage 1: Introduced arm32JIT.cpp but still have the default build from the old thumb2.cpp which is unchanged apart from the one #ifndef ARM32JIT. Distros can then elect to choose the arm32 JIT by applying the 1 small patch which adds -DARM32JIT to zeroshark.make. This patch can be carried within the distro packaging. Alternatively distros can ignore the arm32 JIT and continue with the unchanged thumb2 JIT as before. Stage 2: When everyone is happy with the arm32 JIT make ARM32JIT the default. Distros can still elect to build the thumb2 JIT by backing out the -DARM32JIT in zeroshark.make Stage 3: Sometime in the future delete thumb2.cpp Of course if people are happy to go straight to stage 3 that is fine by me. The only question then is whether the changes should just be applied to thumb2.cpp which would now generate thumb2 or arm32 code or whether to rename it to arm32JIT.cpp. All the best, Ed. -------------- next part -------------- An HTML attachment was scrubbed... URL: From edward.nevill at gmail.com Fri Jan 23 09:07:40 2015 From: edward.nevill at gmail.com (Edward Nevill) Date: Fri, 23 Jan 2015 09:07:40 -0000 Subject: RFR: Add support for ARMv6 to ARM JIT In-Reply-To: <54C0E5AC.8070805@redhat.com> References: <1421859993.3200.131.camel@mint> <54BFDEED.9030506@redhat.com> <54C0CA54.6000606@redhat.com> <54C0E5AC.8070805@redhat.com> Message-ID: On Thu, Jan 22, 2015 at 11:57 AM, Andrew Haley wrote: > On 01/22/2015 11:14 AM, Edward Nevill wrote: > > On Thu, Jan 22, 2015 at 10:00 AM, Andrew Haley wrote: > > > >> So what is thumb2.cpp for? I still don't get it. > > > > The idea was to minimise the change to reduce the risk of breaking > > anything for distros. The migration from thumb2 JIT to arm JIT would > > be done in 3 stages. > > This is a very different development model from what we use in > IcedTea. There are stable branches we use for releases and the > development trunk for new code. We don't need to keep old files > around because we have everything under source control. > > IMO (and it is just my opinion) you should remove thumb2.cpp on the > development trunk. I have no opinion about whether thumb2 or ARM > should be the default on systems which support both. I'm guessing > that thumb2 might be a slightly better choice, but I doubt that it > will make any difference to most workloads. > > OK. Maybe I was just being paranoid because it is a large change and I didn't want to break anything. If everyone is happy with this shall I remove thumb2.cpp, replace it with arm32JIT.cpp. It will generate Thumb2 code by default on any processor that has Thumb2, ARM 32 bit code otherwise. All the best, Ed. -------------- next part -------------- An HTML attachment was scrubbed... URL: