From bugzilla-daemon at icedtea.classpath.org Sun Jan 3 10:16:57 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 03 Jan 2016 10:16:57 +0000 Subject: [Bug 2732] Raise javadoc memory limits for CACAO on ppc64 again! (v2) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2732 --- Comment #3 from James Le Cuirot --- I've been told by a Gentoo developer that these hardcoded limits are no good when you have -g in your CFLAGS. Perhaps something more dynamic is needed. -- 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 4 10:01:29 2016 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 04 Jan 2016 10:01:29 +0000 Subject: /hg/gfx-test: Updated comments in the class HtmlStructureWriter. Message-ID: changeset 61cadaf2583d in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=61cadaf2583d author: Pavel Tisnovsky date: Mon Jan 04 11:04:54 2016 +0100 Updated comments in the class HtmlStructureWriter. diffstat: ChangeLog | 5 + src/org/gfxtest/ImageDiffer/ResultWriters/HtmlStructureWriter.java | 50 ++++++++- 2 files changed, 47 insertions(+), 8 deletions(-) diffs (190 lines): diff -r fd109a931f89 -r 61cadaf2583d ChangeLog --- a/ChangeLog Fri Nov 13 13:26:05 2015 +0100 +++ b/ChangeLog Mon Jan 04 11:04:54 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-04 Pavel Tisnovsky + + * src/org/gfxtest/ImageDiffer/ResultWriters/HtmlStructureWriter.java: + Updated comments in the class HtmlStructureWriter. + 2015-11-13 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r fd109a931f89 -r 61cadaf2583d src/org/gfxtest/ImageDiffer/ResultWriters/HtmlStructureWriter.java --- a/src/org/gfxtest/ImageDiffer/ResultWriters/HtmlStructureWriter.java Fri Nov 13 13:26:05 2015 +0100 +++ b/src/org/gfxtest/ImageDiffer/ResultWriters/HtmlStructureWriter.java Mon Jan 04 11:04:54 2016 +0100 @@ -1,7 +1,7 @@ /* Java gfx-test framework - Copyright (C) 2010, 2011, 2012 Red Hat + Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Red Hat This file is part of IcedTea. @@ -62,8 +62,10 @@ import org.gfxtest.ImageDiffer.Configuration; import org.gfxtest.framework.Log; + + /** - * + * Helper class for writting result(s) into an HTML page. * * @author Pavel Tisnovsky */ @@ -74,19 +76,31 @@ */ private static final String DEFAULT_ENCODING = "UTF-8"; + /** + * Directory that contains HTML templates. + */ private static final String TEMPLATE_DIR = "templates"; + /** + * Initialization of the logger used during HTML generation. + */ static Log log = new Log(HtmlStructureWriter.class.getName(), true); + /** + * Create directory where the results should be placed. + */ public static void createAndFillResultDirectory(Configuration configuration, BufferedImage[] sourceImages, ComparisonResult comparisonResult, String dirName) throws IOException { File newDir = new File(configuration.getOutputDirectory(), dirName); log.logProcess("creating directory %s", newDir.getAbsolutePath()); + // create directory to store results (this directory might exists) if (!newDir.mkdir()) { log.logError("error creating directory %s", newDir.getAbsolutePath()); } + // write images according to computed diff + // but only when at least one diff have been found if (!comparisonResult.isEqualsImages()) { log.logProcess("writing source and diff images to directory %s", dirName); @@ -102,11 +116,16 @@ createHtmlFile(newDir, comparisonResult); } + /** + * Create HTML file containing result(s). + */ private static void createHtmlFile(File newDir, ComparisonResult cr) throws IOException { + // get the appropriate template String templateName = cr.isEqualsImages() ? "template_same_images.html" : "template_different_images.html"; BufferedWriter writer = null; BufferedReader template = null; + // read the template and write the resulting HTML by using this template try { writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(newDir, "result.html")), DEFAULT_ENCODING)); @@ -119,21 +138,26 @@ } catch (UnsupportedEncodingException e) { + // print stack trace in case of exception e.printStackTrace(); throw e; } catch (FileNotFoundException e) { + // print stack trace in case of exception e.printStackTrace(); throw e; } catch (IOException e) { + // print stack trace in case of exception e.printStackTrace(); throw e; } + // try to close template & the resulting HTML file finally { + // close the template if (template != null) { try @@ -145,6 +169,7 @@ e.printStackTrace(); } } + // close the HTML file with results if (writer != null) { try @@ -159,12 +184,17 @@ } } + /** + * Replace placeholder name with the appropriate value. + */ private static String replacePlaceholders(ComparisonResult cr, File newDir, String line) { StringBuffer out = new StringBuffer(); + // placeholder is written as ${IDENTIFIER} Pattern pattern = Pattern.compile("\\$\\{(.*?)\\}", Pattern.CASE_INSENSITIVE); Matcher matcher = pattern.matcher(line); + // each placeholder is processed in one iteration while (matcher.find()) { matcher.appendReplacement(out, getPlaceholderValue(cr, matcher.group(1))); @@ -173,41 +203,45 @@ return out.toString() + "\n"; } + /** + * Try to read the value of getter with the same name as placeholder. + */ private static String getPlaceholderValue(ComparisonResult cr, String group) { Method method; try { - // call appropriate getter + // try to call appropriate getter method = cr.getClass().getDeclaredMethod("get" + group, (Class[]) null); return "" + method.invoke(cr, (Object[]) null); } catch (IllegalAccessException e) { - // print ST in case of exception + // print stack trace in case of exception e.printStackTrace(); } catch (SecurityException e) { - // print ST in case of exception + // print stack trace in case of exception e.printStackTrace(); } catch (NoSuchMethodException e) { - // print ST in case of exception + // print stack trace in case of exception e.printStackTrace(); } catch (IllegalArgumentException e) { - // print ST in case of exception + // print stack trace in case of exception e.printStackTrace(); } catch (InvocationTargetException e) { - // print ST in case of exception + // print stack trace in case of exception e.printStackTrace(); } return group; } } + From bugzilla-daemon at icedtea.classpath.org Mon Jan 4 13:17:13 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 04 Jan 2016 13:17:13 +0000 Subject: [Bug 2591] IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2591 --- Comment #4 from JiriVanek --- Thank you for update. Your modification have sense. I will send it to public review 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 jvanek at redhat.com Mon Jan 4 15:55:02 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 4 Jan 2016 16:55:02 +0100 Subject: [rfc][icedtea-web] fix for multiple in-sequence opened connection Message-ID: <568A95D6.3010609@redhat.com> There is the patch for and so fix for http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2591 According to reporter, it fixed the issue. According to myself, i did not found any regeressions. Well, the patch is not nicest, and as addition, I have no idea how to properly test it in unittest. And as top of worst, I eould like to backport it to 1.6 soon... Thoughts? J. -------------- next part -------------- A non-text attachment was scrubbed... Name: 1489.patch Type: text/x-patch Size: 8931 bytes Desc: not available URL: From jvanek at redhat.com Mon Jan 4 16:19:48 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 4 Jan 2016 17:19:48 +0100 Subject: [rfc][icedtea-web] fix for " html-gen.sh: Don't try to call hg if .hg directory isn't present" Message-ID: <568A9BA4.7000209@redhat.com> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2779 The fix came with the bug report. I had tested an checked. I added following hunk to it: +if [ ! -e html-gen ]; then + echo "No html-gen directory, exiting. See Makefile.am for usage" + exit 1 +fi + I will push this tomorrow to both head and 1.6 J. -------------- next part -------------- A non-text attachment was scrubbed... Name: html-gen.sh.patch Type: text/x-patch Size: 2386 bytes Desc: not available URL: From aazores at redhat.com Mon Jan 4 16:35:33 2016 From: aazores at redhat.com (Andrew Azores) Date: Mon, 4 Jan 2016 11:35:33 -0500 Subject: [rfc][icedtea-web] fix for multiple in-sequence opened connection In-Reply-To: <568A95D6.3010609@redhat.com> References: <568A95D6.3010609@redhat.com> Message-ID: <568A9F55.4020301@redhat.com> On 04/01/16 10:55 AM, Jiri Vanek wrote: > There is the patch for > and so fix for http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2591 > > According to reporter, it fixed the issue. > According to myself, i did not found any regeressions. > > Well, the patch is not nicest, and as addition, I have no idea how to > properly test it in unittest. > > And as top of worst, I eould like to backport it to 1.6 soon... > > Thoughts? > > > J. > Just a few thoughts here. The intent of the patch seems fine but I'm not sure at a quick glance if this is the best approach. > + > + @Override > + public String toString() { > + return URL.toExternalForm() + "; " + result + "; " + (lastModified==null?"null":lastModified.toString()) + "; " + length==null?"null":length.toString() + "; "; > + } > + > + > + > + Can the extra blank lines at the bottom be removed? And can the toString be moved to the end of the class? The formatting just seems strange. The toString body is also a little hard to read, it could probably do with some internal whitespaces and some linebreaks at the '+'. > - private static class CodeWithRedirect { > + static class CodeWithRedirect { > > int result = HttpURLConnection.HTTP_OK; > URL URL; > + > + Long lastModified; > + Long length; > "CodeWithRedirect" doesn't seem like a fitting name anymore. It's more than that now with the extra fields added. Is adding these fields to this class the best way to go? They don't really seem related - they feel shoehorned in to me. Maybe there should be some "URLResponse" class which has lastModified, length, and codeWithRedirect fields? Just an idea, though. I'm not entirely sure that that's the best abstraction. -- Thanks, Andrew Azores From aazores at redhat.com Mon Jan 4 16:40:42 2016 From: aazores at redhat.com (Andrew Azores) Date: Mon, 4 Jan 2016 11:40:42 -0500 Subject: [rfc][icedtea-web] fix for " html-gen.sh: Don't try to call hg if .hg directory isn't present" In-Reply-To: <568A9BA4.7000209@redhat.com> References: <568A9BA4.7000209@redhat.com> Message-ID: <568AA08A.5040202@redhat.com> On 04/01/16 11:19 AM, Jiri Vanek wrote: > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2779 > > The fix came with the bug report. I had tested an checked. > I added following hunk to it: > +if [ ! -e html-gen ]; then > + echo "No html-gen directory, exiting. See Makefile.am for usage" > + exit 1 > +fi > + > > I will push this tomorrow to both head and 1.6 > > > J. Looks good to me. -- Thanks, Andrew Azores From bugzilla-daemon at icedtea.classpath.org Mon Jan 4 20:58:28 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 04 Jan 2016 20:58:28 +0000 Subject: [Bug 2781] New: CACAO - typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781 Bug ID: 2781 Summary: CACAO - typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed Product: IcedTea Version: 2.6.3 Hardware: ppc OS: Linux Status: NEW Severity: normal Priority: P5 Component: CACAO Assignee: stefan at complang.tuwien.ac.at Reporter: chewi at gentoo.org CC: unassigned at icedtea.classpath.org, xerxes at zafena.se When running the junit 4.11 and hsqldb 1.8.1.3 unit tests, the java process aborts with the following. java: typeinfo.cpp:1449: typecheck_result typeinfo_merge_nonarrays(typeinfo_t*, classref_or_classinfo*, classref_or_classinfo, classref_or_classinfo, typeinfo_mergedlist_t*, typeinfo_mergedlist_t*): Assertion `dest && result && x.any && y.any' failed. Aborted I have seen this with icedtea 2.6.3 + CACAO on ppc and ppc64. I haven't tried any other architectures. icedtea 2.5.6 works fine, which makes sense as a much more recent CACAO version was used in the former. Unfortunately this makes tracking the precise cause difficult. I was hoping to reproduce it with standalone CACAO but it runs the hsqldb tests fine and produces a single seemingly unrelated test error (not an abort) on the junit tests regardless of the version. I believe this to be quite a serious issue so I will report it upstream. -- 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 4 21:57:20 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 04 Jan 2016 21:57:20 +0000 Subject: [Bug 2781] CACAO - typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781 --- Comment #1 from Stefan Ring --- You don't need to go to CACAO upstream. We can handle it here. It would be good to find out the root cause of this. CACAO has not changed much recently. I'll check if I can reproduce the 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 Mon Jan 4 22:46:18 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 04 Jan 2016 22:46:18 +0000 Subject: [Bug 2781] CACAO - typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781 --- Comment #2 from James Le Cuirot --- I've now reproduced it on amd64 for good measure. -- 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 4 23:37:40 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 04 Jan 2016 23:37:40 +0000 Subject: [Bug 2781] CACAO - typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781 --- Comment #3 from Stefan Ring --- I can reproduce it as well, on amd64. -- 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 icedtea.classpath.org Tue Jan 5 09:27:33 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 05 Jan 2016 09:27:33 +0000 Subject: /hg/release/icedtea-web-1.6: html-gen.sh: now don't generate mer... Message-ID: changeset f589afe6e008 in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=f589afe6e008 author: Jiri Vanek date: Tue Jan 05 10:27:13 2016 +0100 html-gen.sh: now don't generate mercurial changesets' links if .hg is missing diffstat: ChangeLog | 5 +++++ NEWS | 1 + html-gen.sh | 26 ++++++++++++++++++++------ 3 files changed, 26 insertions(+), 6 deletions(-) diffs (78 lines): diff -r ee907deeda19 -r f589afe6e008 ChangeLog --- a/ChangeLog Thu Dec 31 13:29:17 2015 +0100 +++ b/ChangeLog Tue Jan 05 10:27:13 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-05 Jiri Vanek + + * NEWS: mentioned PR2779 + * html-gen.sh: now don't generate mercurial changesets' links if .hg is missing + 2015-12-23 Jiri Vanek Small properties parser in C (plugin) now unescapes \= \\ \: \t \n and \r correctly diff -r ee907deeda19 -r f589afe6e008 NEWS --- a/NEWS Thu Dec 31 13:29:17 2015 +0100 +++ b/NEWS Tue Jan 05 10:27:13 2016 +0100 @@ -10,6 +10,7 @@ New in release 1.6.2 (YYYY-MM-DD): * all connection restrictions now consider also port +* PR2779: html-gen.sh: Don't try to call hg if .hg directory isn't present * NetX - main-class attribute trimmed by default - in strict mode, main-class attribute checked for invalid characters diff -r ee907deeda19 -r f589afe6e008 html-gen.sh --- a/html-gen.sh Thu Dec 31 13:29:17 2015 +0100 +++ b/html-gen.sh Tue Jan 05 10:27:13 2016 +0100 @@ -67,13 +67,23 @@ if [ -z "$CHANGESETS" ] || [ "$CHANGESETS" -lt 0 ]; then CHANGESETS=10; fi NEWS_ITEMS=2 -REPO_URL="$(hg paths default | sed -r 's/.*icedtea.classpath.org\/(.*)/\1/')" + +if [ -d .hg ]; then + REPO_URL="$(hg paths default | sed -r 's/.*icedtea.classpath.org\/(.*)/\1/')" +else + unset REPO_URL +fi start_time="$(date +%s.%N)" +if [ ! -e html-gen ]; then + echo "No html-gen directory, exiting. See Makefile.am for usage" + exit 1 +fi + cd html-gen -print_debug "Generating HTML content for javaws -about for $REPO_URL. $CHANGESETS changesets, $NEWS_ITEMS news items" +print_debug "Generating HTML content for javaws -about${REPO_URL:+ for }$REPO_URL. $CHANGESETS changesets, $NEWS_ITEMS news items" print_debug "Starting sed substitutions" for FILE in NEWS AUTHORS COPYING ChangeLog do @@ -99,7 +109,9 @@ sed -i '5i
Jam Icon

' AUTHORS.html echo "" >> AUTHORS.html -REVS=(`hg log -l"$CHANGESETS" | grep 'changeset:' | cut -d: -f3 | tr '\n' ' '`) +if [ -n "${REPO_URL}" ]; then + REVS=(`hg log -l"$CHANGESETS" | grep 'changeset:' | cut -d: -f3 | tr '\n' ' '`) +fi print_debug "Done. Starting formatting (bolding, mailto and hyperlink creation)" @@ -132,9 +144,11 @@ if [[ "$LINE" =~ $date_regex* ]] # Matches line starting with eg 2013-07-01 then html_space="\ \ " - REV="${REVS["$COUNTER"]}" - # Turn the date into a hyperlink for the revision this changelog entry describes - LINE=$(echo "$LINE" | sed -r "s|($date_regex)($html_space.*$html_space.*)|\1\2|") + if [ -n "${REPO_URL}" ]; then + REV="${REVS["$COUNTER"]}" + # Turn the date into a hyperlink for the revision this changelog entry describes + LINE=$(echo "$LINE" | sed -r "s|($date_regex)($html_space.*$html_space.*)|\1\2|") + fi COUNTER="$(( COUNTER + 1 ))" fi if [ "$COUNTER" -gt "$CHANGESETS" ] # Cut to ten changesets From jvanek at icedtea.classpath.org Tue Jan 5 09:32:08 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 05 Jan 2016 09:32:08 +0000 Subject: /hg/icedtea-web: html-gen.sh: now don't generate mercurial chang... Message-ID: changeset d2b2e45c958a in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d2b2e45c958a author: Jiri Vanek date: Tue Jan 05 10:30:19 2016 +0100 html-gen.sh: now don't generate mercurial changesets' links if .hg is missing diffstat: ChangeLog | 5 +++++ NEWS | 1 + html-gen.sh | 26 ++++++++++++++++++++------ 3 files changed, 26 insertions(+), 6 deletions(-) diffs (78 lines): diff -r f1a97bf85276 -r d2b2e45c958a ChangeLog --- a/ChangeLog Thu Dec 31 13:26:39 2015 +0100 +++ b/ChangeLog Tue Jan 05 10:30:19 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-05 Jiri Vanek + + * NEWS: mentioned PR2779 + * html-gen.sh: now don't generate mercurial changesets' links if .hg is missing + 2015-12-23 Jiri Vanek Added base logic and design for rememberable dialogues editor. diff -r f1a97bf85276 -r d2b2e45c958a NEWS --- a/NEWS Thu Dec 31 13:26:39 2015 +0100 +++ b/NEWS Tue Jan 05 10:30:19 2016 +0100 @@ -13,6 +13,7 @@ * Enabled Entry-Point attribute check * permissions sandbox and signed app and unsigned app with permissions all-permissions now run in sandbox instead of not at all. * fixed DownloadService +* PR2779: html-gen.sh: Don't try to call hg if .hg directory isn't present * comments in deployment.properties now should persists load/save * fixed bug in caching of files with query * fixed issues with recreating of existing shortcut diff -r f1a97bf85276 -r d2b2e45c958a html-gen.sh --- a/html-gen.sh Thu Dec 31 13:26:39 2015 +0100 +++ b/html-gen.sh Tue Jan 05 10:30:19 2016 +0100 @@ -67,13 +67,23 @@ if [ -z "$CHANGESETS" ] || [ "$CHANGESETS" -lt 0 ]; then CHANGESETS=10; fi NEWS_ITEMS=2 -REPO_URL="$(hg paths default | sed -r 's/.*icedtea.classpath.org\/(.*)/\1/')" + +if [ -d .hg ]; then + REPO_URL="$(hg paths default | sed -r 's/.*icedtea.classpath.org\/(.*)/\1/')" +else + unset REPO_URL +fi start_time="$(date +%s.%N)" +if [ ! -e html-gen ]; then + echo "No html-gen directory, exiting. See Makefile.am for usage" + exit 1 +fi + cd html-gen -print_debug "Generating HTML content for javaws -about for $REPO_URL. $CHANGESETS changesets, $NEWS_ITEMS news items" +print_debug "Generating HTML content for javaws -about${REPO_URL:+ for }$REPO_URL. $CHANGESETS changesets, $NEWS_ITEMS news items" print_debug "Starting sed substitutions" for FILE in NEWS AUTHORS COPYING ChangeLog do @@ -99,7 +109,9 @@ sed -i '5i
Jam Icon

' AUTHORS.html echo "" >> AUTHORS.html -REVS=(`hg log -l"$CHANGESETS" | grep 'changeset:' | cut -d: -f3 | tr '\n' ' '`) +if [ -n "${REPO_URL}" ]; then + REVS=(`hg log -l"$CHANGESETS" | grep 'changeset:' | cut -d: -f3 | tr '\n' ' '`) +fi print_debug "Done. Starting formatting (bolding, mailto and hyperlink creation)" @@ -132,9 +144,11 @@ if [[ "$LINE" =~ $date_regex* ]] # Matches line starting with eg 2013-07-01 then html_space="\ \ " - REV="${REVS["$COUNTER"]}" - # Turn the date into a hyperlink for the revision this changelog entry describes - LINE=$(echo "$LINE" | sed -r "s|($date_regex)($html_space.*$html_space.*)|\1\2|") + if [ -n "${REPO_URL}" ]; then + REV="${REVS["$COUNTER"]}" + # Turn the date into a hyperlink for the revision this changelog entry describes + LINE=$(echo "$LINE" | sed -r "s|($date_regex)($html_space.*$html_space.*)|\1\2|") + fi COUNTER="$(( COUNTER + 1 ))" fi if [ "$COUNTER" -gt "$CHANGESETS" ] # Cut to ten changesets From bugzilla-daemon at icedtea.classpath.org Tue Jan 5 11:54:17 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 05 Jan 2016 11:54:17 +0000 Subject: [Bug 2690] Can't run BOM into JNLP file. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2690 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #1 from JiriVanek --- Hello, this happens also when tagsoup is run with ITW? If you are nto sure, Do you have verbose output of that run? -- 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 5 16:47:20 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 5 Jan 2016 17:47:20 +0100 Subject: [rfc][icedtea-web] fix for multiple in-sequence opened connection In-Reply-To: <568A9F55.4020301@redhat.com> References: <568A95D6.3010609@redhat.com> <568A9F55.4020301@redhat.com> Message-ID: <568BF398.8070505@redhat.com> On 01/04/2016 05:35 PM, Andrew Azores wrote: I filled all what yu did not liked - yteh main concenr - bottoms "CodeWithRedirect" issue - I just renamed the class... I do nto wont ot make more wrappers hierarchy. However. I could not sleep to dont have those tesetd. So I created sucessfully tests :) 1) I created test to test rdirect - thsoe are passing both on patched and unpathced version 2) I created tests which is counting resourcess accesses in our internal server - and yes, without patch there are always 2 gets. Wit, only 1. I will push the tests as separate changeset, as I wont to see them failing in my "grab changeset and test" machine. THANX! J. ps: sorry for formating issues in patch.I need ru run from work and I'm hoping to use your timezone tobe able to push + test the tests tomorow morning (and so the aptch itself after meeting over night):) > On 04/01/16 10:55 AM, Jiri Vanek wrote: >> There is the patch for >> and so fix for http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2591 >> >> According to reporter, it fixed the issue. >> According to myself, i did not found any regeressions. >> >> Well, the patch is not nicest, and as addition, I have no idea how to >> properly test it in unittest. >> >> And as top of worst, I eould like to backport it to 1.6 soon... >> >> Thoughts? >> >> >> J. >> > > Just a few thoughts here. The intent of the patch seems fine but I'm not sure at a quick glance if > this is the best approach. > > >> + >> + @Override >> + public String toString() { >> + return URL.toExternalForm() + "; " + result + "; " + >> (lastModified==null?"null":lastModified.toString()) + "; " + length==null?"null":length.toString() >> + "; "; >> + } >> + >> + >> + >> + > > Can the extra blank lines at the bottom be removed? And can the toString be moved to the end of the > class? The formatting just seems strange. The toString body is also a little hard to read, it could > probably do with some internal whitespaces and some linebreaks at the '+'. > >> - private static class CodeWithRedirect { >> + static class CodeWithRedirect { >> >> int result = HttpURLConnection.HTTP_OK; >> URL URL; >> + >> + Long lastModified; >> + Long length; >> > > "CodeWithRedirect" doesn't seem like a fitting name anymore. It's more than that now with the extra > fields added. Is adding these fields to this class the best way to go? They don't really seem > related - they feel shoehorned in to me. Maybe there should be some "URLResponse" class which has > lastModified, length, and codeWithRedirect fields? Just an idea, though. I'm not entirely sure that > that's the best abstraction. > -------------- next part -------------- A non-text attachment was scrubbed... Name: multipleConnectioinsWithTest.patch Type: text/x-patch Size: 60131 bytes Desc: not available URL: From aazores at redhat.com Tue Jan 5 17:10:04 2016 From: aazores at redhat.com (Andrew Azores) Date: Tue, 5 Jan 2016 12:10:04 -0500 Subject: [rfc][icedtea-web] fix for multiple in-sequence opened connection In-Reply-To: <568BF398.8070505@redhat.com> References: <568A95D6.3010609@redhat.com> <568A9F55.4020301@redhat.com> <568BF398.8070505@redhat.com> Message-ID: <568BF8EC.1010708@redhat.com> On 05/01/16 11:47 AM, Jiri Vanek wrote: > On 01/04/2016 05:35 PM, Andrew Azores wrote: > > I filled all what yu did not liked - yteh main concenr - bottoms > "CodeWithRedirect" issue - I just renamed the class... I do nto wont ot > make more wrappers hierarchy. > > > However. I could not sleep to dont have those tesetd. > > So I created sucessfully tests :) > > 1) I created test to test rdirect > - thsoe are passing both on patched and unpathced version > 2) I created tests which is counting resourcess accesses in our internal > server > - and yes, without patch there are always 2 gets. Wit, only 1. > > I will push the tests as separate changeset, as I wont to see them > failing in my "grab changeset and test" machine. > > > THANX! > J. > > ps: sorry for formating issues in patch.I need ru run from work and I'm > hoping to use your timezone tobe able to push + test the tests tomorow > morning (and so the aptch itself after meeting over night):) Okay. I think this looks fine to push. If you have time to fix the formatting then please do first. -- Thanks, Andrew Azores From bugzilla-daemon at icedtea.classpath.org Tue Jan 5 22:33:10 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 05 Jan 2016 22:33:10 +0000 Subject: [Bug 2781] CACAO - typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781 --- Comment #4 from Stefan Ring --- I bisected it to this changeset: https://bitbucket.org/cacaovm/cacao-staging/commits/1e9787c3484ea9506c385cfe4cfd57998fb728d2 Something must have gone wrong in the refactoring. -- 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 5 23:07:13 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 05 Jan 2016 23:07:13 +0000 Subject: [Bug 2781] CACAO - typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781 --- Comment #5 from James Le Cuirot --- Thanks, that must have taken a while! -- 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 5 23:35:32 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 05 Jan 2016 23:35:32 +0000 Subject: [Bug 2781] CACAO - typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781 --- Comment #6 from Stefan Ring --- The bisection was not that bad. Sifting through this huge changeset is ;). I've now stared at it for an hour and found two bugs, but fixing them has still not repaired it :(. I'll go to bed now and split the patch up when I get to work on this next time. It cannot be that hard. -- 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 6 04:57:43 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 06 Jan 2016 04:57:43 +0000 Subject: /hg/icedtea7: PR2652: CACAO fails as a build VM for icedtea Message-ID: changeset d44ea9fb2df8 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d44ea9fb2df8 author: Andrew John Hughes date: Tue Jan 05 21:16:49 2016 +0000 PR2652: CACAO fails as a build VM for icedtea 2015-10-15 Stefan Ring PR2652: CACAO fails as a build VM for icedtea * Makefile.am: (ICEDTEA_PATCHES): Add CACAO patch for PR2652. * README: Fix CACAO URL. * patches/cacao/pr2652-classloader.patch: Set classLoader field in java.lang.Class as expected by JDK. diffstat: ChangeLog | 9 ++++ Makefile.am | 3 +- README | 2 +- patches/cacao/pr2652-classloader.patch | 74 ++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 2 deletions(-) diffs (119 lines): diff -r bffa3455fa17 -r d44ea9fb2df8 ChangeLog --- a/ChangeLog Mon Nov 23 02:54:31 2015 +0000 +++ b/ChangeLog Tue Jan 05 21:16:49 2016 +0000 @@ -1,3 +1,12 @@ +2015-10-15 Stefan Ring + + PR2652: CACAO fails as a build VM for icedtea + * Makefile.am: + (ICEDTEA_PATCHES): Add CACAO patch for PR2652. + * README: Fix CACAO URL. + * patches/cacao/pr2652-classloader.patch: + Set classLoader field in java.lang.Class as expected by JDK. + 2015-11-20 Andrew John Hughes * Makefile.am, diff -r bffa3455fa17 -r d44ea9fb2df8 Makefile.am --- a/Makefile.am Mon Nov 23 02:54:31 2015 +0000 +++ b/Makefile.am Tue Jan 05 21:16:49 2016 +0000 @@ -382,7 +382,8 @@ patches/cacao/launcher.patch \ patches/cacao/memory.patch \ patches/cacao/pr2032.patch \ - patches/cacao/pr2520-tempdir.patch + patches/cacao/pr2520-tempdir.patch \ + patches/cacao/pr2652-classloader.patch else if USING_CACAO ICEDTEA_PATCHES += \ diff -r bffa3455fa17 -r d44ea9fb2df8 README --- a/README Mon Nov 23 02:54:31 2015 +0000 +++ b/README Tue Jan 05 21:16:49 2016 +0000 @@ -69,7 +69,7 @@ CACAO as VM =========== -The CACAO virtual machine (http://cacaovm.org) can be used as an +The CACAO virtual machine (http://cacaojvm.org) can be used as an alternative to the HotSpot virtual machine. One advantage of this is that it already provides a JIT for many platforms to which HotSpot has not yet been ported, including ppc, arm and mips. To use CACAO as the diff -r bffa3455fa17 -r d44ea9fb2df8 patches/cacao/pr2652-classloader.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/pr2652-classloader.patch Tue Jan 05 21:16:49 2016 +0000 @@ -0,0 +1,74 @@ +Set classLoader field in java.lang.Class as expected by JDK + +--- cacao/cacao/src/vm/class.cpp ++++ cacao/cacao/src/vm/class.cpp +@@ -314,6 +314,9 @@ + + c = classcache_store(cl, c, true); + ++ java_lang_Class jlc(LLNI_classinfo_wrap(c)); ++ jlc.set_classLoader(cl); ++ + return c; + } + +--- cacao/cacao/src/vm/javaobjects.cpp ++++ cacao/cacao/src/vm/javaobjects.cpp +@@ -270,11 +270,19 @@ + { 0, 0 } + }; + ++off_t java_lang_Class::offset_classLoader; ++ ++static DynOffsetEntry dyn_entries_java_lang_Class[] = { ++ { &java_lang_Class::set_classLoader_offset, "classLoader" }, ++ { 0, 0 } ++}; ++ + #endif + + void jobjects_register_dyn_offsets() + { + register_dyn_entry_table(class_java_lang_Thread, dyn_entries_java_lang_Thread); ++ register_dyn_entry_table(class_java_lang_Class, dyn_entries_java_lang_Class); + } + + #endif // ENABLE_JAVASE +--- cacao/cacao/src/vm/javaobjects.hpp ++++ cacao/cacao/src/vm/javaobjects.hpp +@@ -1847,6 +1847,35 @@ + + + /** ++ * OpenJDK java/lang/Class ++ * ++ * Object layout: ++ * ++ * 0. object header ++ * ? java.lang.ClassLoader classLoader ++ */ ++class java_lang_Class : public java_lang_Object, private FieldAccess { ++private: ++ // Static offsets of the object's instance fields. ++ static off_t offset_classLoader; ++ ++public: ++ java_lang_Class(java_handle_t* h) : java_lang_Object(h) {} ++ ++ // Setters. ++ void set_classLoader(java_handle_t* value); ++ ++ // Offset initializers ++ static void set_classLoader_offset(int32_t off) { offset_classLoader = off; } ++}; ++ ++inline void java_lang_Class::set_classLoader(java_handle_t* value) ++{ ++ assert(offset_classLoader); ++ set(_handle, offset_classLoader, value); ++} ++ ++/** + * OpenJDK java/lang/ClassLoader + * + * Object layout: From bugzilla-daemon at icedtea.classpath.org Wed Jan 6 04:58:27 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 04:58:27 +0000 Subject: [Bug 2652] icedtea/cacao 2.6 fails as a build VM for icedtea In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2652 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=d44ea9fb2df8 author: Andrew John Hughes date: Tue Jan 05 21:16:49 2016 +0000 PR2652: CACAO fails as a build VM for icedtea 2015-10-15 Stefan Ring PR2652: CACAO fails as a build VM for icedtea * Makefile.am: (ICEDTEA_PATCHES): Add CACAO patch for PR2652. * README: Fix CACAO URL. * patches/cacao/pr2652-classloader.patch: Set classLoader field in java.lang.Class as expected by JDK. -- 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 6 04:59:17 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 04:59:17 +0000 Subject: [Bug 2652] icedtea/cacao 2.6 fails as a build VM for icedtea In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2652 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 Wed Jan 6 05:00:42 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 05:00:42 +0000 Subject: [Bug 2652] icedtea/cacao 2.6 fails as a build VM for icedtea In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2652 --- Comment #5 from Andrew John Hughes --- http://icedtea.classpath.org/hg/release/icedtea7-2.6/rev/fe0d3806c5ad -- 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 6 05:23:45 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 06 Jan 2016 05:23:45 +0000 Subject: /hg/icedtea7: PR2684: AArch64 port not selected on architectures... Message-ID: changeset ac0e7ec6e958 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ac0e7ec6e958 author: Andrew John Hughes date: Wed Jan 06 05:23:06 2016 +0000 PR2684: AArch64 port not selected on architectures where host_cpu != aarch64 2016-01-06 Andrew John Hughes PR2684: AArch64 port not selected on architectures where host_cpu != aarch64 * acinclude.m4: (IT_HAS_NATIVE_HOTSPOT_PORT): Depend on IT_SET_ARCH_SETTINGS and use values of INSTALL_ARCH_DIR to determine port availability rather than host_cpu. diffstat: ChangeLog | 10 ++++++++++ acinclude.m4 | 13 +++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diffs (44 lines): diff -r d44ea9fb2df8 -r ac0e7ec6e958 ChangeLog --- a/ChangeLog Tue Jan 05 21:16:49 2016 +0000 +++ b/ChangeLog Wed Jan 06 05:23:06 2016 +0000 @@ -1,3 +1,13 @@ +2016-01-06 Andrew John Hughes + + PR2684: AArch64 port not selected on architectures + where host_cpu != aarch64 + * acinclude.m4: + (IT_HAS_NATIVE_HOTSPOT_PORT): Depend on + IT_SET_ARCH_SETTINGS and use values of + INSTALL_ARCH_DIR to determine port availability + rather than host_cpu. + 2015-10-15 Stefan Ring PR2652: CACAO fails as a build VM for icedtea diff -r d44ea9fb2df8 -r ac0e7ec6e958 acinclude.m4 --- a/acinclude.m4 Tue Jan 05 21:16:49 2016 +0000 +++ b/acinclude.m4 Wed Jan 06 05:23:06 2016 +0000 @@ -2832,16 +2832,17 @@ AC_DEFUN_ONCE([IT_HAS_NATIVE_HOTSPOT_PORT], [ + AC_REQUIRE([IT_SET_ARCH_SETTINGS]) AC_MSG_CHECKING([if a native HotSpot port is available for this architecture]) has_native_hotspot_port=yes; - case "${host_cpu}" in + case "${INSTALL_ARCH_DIR}" in aarch64) ;; - arm64) ;; - i?86) ;; + amd64) ;; + i386) ;; + ppc64) ;; + ppc64le) ;; sparc) ;; - x86_64) ;; - powerpc64) ;; - powerpc64le) ;; + sparcv9) ;; *) has_native_hotspot_port=no; esac AC_MSG_RESULT([$has_native_hotspot_port]) From bugzilla-daemon at icedtea.classpath.org Wed Jan 6 05:24:22 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 05:24:22 +0000 Subject: [Bug 2684] [IcedTea7] AArch64 port not selected on architectures where host_cpu != aarch64 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2684 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=ac0e7ec6e958 author: Andrew John Hughes date: Wed Jan 06 05:23:06 2016 +0000 PR2684: AArch64 port not selected on architectures where host_cpu != aarch64 2016-01-06 Andrew John Hughes PR2684: AArch64 port not selected on architectures where host_cpu != aarch64 * acinclude.m4: (IT_HAS_NATIVE_HOTSPOT_PORT): Depend on IT_SET_ARCH_SETTINGS and use values of INSTALL_ARCH_DIR to determine port availability rather than host_cpu. -- 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 6 05:37:00 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 05:37:00 +0000 Subject: [Bug 2684] [IcedTea7] AArch64 port not selected on architectures where host_cpu != aarch64 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2684 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 Wed Jan 6 07:16:42 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 07:16:42 +0000 Subject: [Bug 1603] Dell Console Redirection Client fails to log in In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1603 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |jvanek at redhat.com Resolution|--- |FIXED --- Comment #1 from JiriVanek --- dell console is known to be fixing with 1.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 jvanek at icedtea.classpath.org Wed Jan 6 08:53:53 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 06 Jan 2016 08:53:53 +0000 Subject: /hg/release/icedtea-web-1.6: Added redirection tests Message-ID: changeset f48d4c62c2e3 in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=f48d4c62c2e3 author: Jiri Vanek date: Wed Jan 06 09:53:38 2016 +0100 Added redirection tests diffstat: ChangeLog | 13 + tests/reproducers/simple/simpletest1/testcases/SimpleTest1CountRequests.java | 109 +++ tests/reproducers/simple/simpletest1/testcases/SimpleTest1Test.java | 76 +- tests/reproducers/simple/simpletest1/testcases/SimpleTestDefaultRedirects.java | 290 ++++++++++ tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java | 92 ++- tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java | 225 ++++-- 6 files changed, 656 insertions(+), 149 deletions(-) diffs (truncated from 967 to 500 lines): diff -r f589afe6e008 -r f48d4c62c2e3 ChangeLog --- a/ChangeLog Tue Jan 05 10:27:13 2016 +0100 +++ b/ChangeLog Wed Jan 06 09:53:38 2016 +0100 @@ -1,3 +1,16 @@ +2016-01-06 Jiri Vanek + + Added redirection tests + * tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java: Enhanced so + it can redirect requests to another instance. Enhanced to be able to count requests + * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: same + * tests/reproducers/simple/simpletest1/testcases/SimpleTest1Test.java: small + refactoring to reuse checking methods + * tests/reproducers/simple/simpletest1/testcases/SimpleTest1CountRequests.java: + added set of tests to test behavior under various redirect codes + * tests/reproducers/simple/simpletest1/testcases/SimpleTestDefaultRedirects.java: + Added FAILING tests for 2591 - counting ITW requests to test server + 2016-01-05 Jiri Vanek * NEWS: mentioned PR2779 diff -r f589afe6e008 -r f48d4c62c2e3 tests/reproducers/simple/simpletest1/testcases/SimpleTest1CountRequests.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/simpletest1/testcases/SimpleTest1CountRequests.java Wed Jan 06 09:53:38 2016 +0100 @@ -0,0 +1,109 @@ +/* SimpleTest1Test.java + Copyright (C) 2011 Red Hat, Inc. + + This file is part of IcedTea. + + IcedTea is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2. + + IcedTea 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 for more details. + + You should have received a copy of the GNU General Public License + along with IcedTea; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. + + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. + */ + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.ServerLauncher; +import net.sourceforge.jnlp.annotations.Bug; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; + +import org.junit.Test; + + at Bug(id = "PR2591") +public class SimpleTest1CountRequests { + + private static final ServerAccess server = new ServerAccess(); + private static ServerLauncher server0; + private static final Map> counter = new HashMap<>(); + private static final List hv = Arrays.asList(new String[]{ServerAccess.VERBOSE_OPTION, ServerAccess.HEADLES_OPTION}); + + @BeforeClass + public static void createCountingServer() { + server0 = ServerAccess.getIndependentInstance(); + server0.setRequestsCounter(counter); + } + + @AfterClass + public static void stopCountingServer() { + server0.stop(); + } + + @Bug(id = "PR2591") + @Test + public void testSimpletest1EachResourceOnePerRun() throws Exception { + server0.setSupportingHeadRequest(true); + counter.clear(); + ProcessResult pr = ServerAccess.executeProcessUponURL(server.getJavawsLocation(), + hv, + server0.getUrl("/simpletest1.jnlp"), + null, + null + ); + SimpleTest1Test.checkLaunched(pr); + Assert.assertTrue(counter.get("./simpletest1.jnlp").get("GET").equals(1)); //2 without bugfix + Assert.assertTrue(counter.get("./simpletest1.jnlp").get("HEAD").equals(1)); + Assert.assertTrue(counter.get("./simpletest1.jar").get("GET").equals(1));//2 without bugfix + Assert.assertTrue(counter.get("./simpletest1.jar").get("HEAD").equals(1)); + + } + + @Bug(id = "PR2591") + @Test + public void testSimpletest1EachResourceOnePerRunHeadsOff() throws Exception { + server0.setSupportingHeadRequest(false); + counter.clear(); + ProcessResult pr = ServerAccess.executeProcessUponURL(server.getJavawsLocation(), + hv, + server0.getUrl("/simpletest1.jnlp"), + null, + null + ); + SimpleTest1Test.checkLaunched(pr); + Assert.assertTrue(counter.get("./simpletest1.jnlp").get("GET").equals(2)); //3 without bugfix + Assert.assertTrue(counter.get("./simpletest1.jnlp").get("HEAD") == null); + Assert.assertTrue(counter.get("./simpletest1.jar").get("GET").equals(2));//3 without bugfix + Assert.assertTrue(counter.get("./simpletest1.jar").get("HEAD") == (null)); + + } + +} diff -r f589afe6e008 -r f48d4c62c2e3 tests/reproducers/simple/simpletest1/testcases/SimpleTest1Test.java --- a/tests/reproducers/simple/simpletest1/testcases/SimpleTest1Test.java Tue Jan 05 10:27:13 2016 +0100 +++ b/tests/reproducers/simple/simpletest1/testcases/SimpleTest1Test.java Wed Jan 06 09:53:38 2016 +0100 @@ -1,38 +1,38 @@ /* SimpleTest1Test.java -Copyright (C) 2011 Red Hat, Inc. + Copyright (C) 2011 Red Hat, Inc. -This file is part of IcedTea. + This file is part of IcedTea. -IcedTea is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 2. + IcedTea is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2. -IcedTea 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 for more details. + IcedTea 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 for more details. -You should have received a copy of the GNU General Public License -along with IcedTea; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. + You should have received a copy of the GNU General Public License + along with IcedTea; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. */ import java.io.File; @@ -50,14 +50,18 @@ public class SimpleTest1Test { - private static ServerAccess server = new ServerAccess(); + private static final ServerAccess server = new ServerAccess(); private static final List strict = Arrays.asList(new String[]{"-strict", ServerAccess.VERBOSE_OPTION}); - private void checkLaunched(ProcessResult pr) { + static void checkLaunched(ProcessResult pr) { checkLaunched(pr, false); } - private void checkLaunched(ProcessResult pr, boolean negate) { + static void checkLaunched(ProcessResult pr, boolean negate) { + checkLaunched(pr, negate, true); + } + + static void checkLaunched(ProcessResult pr, boolean negate, boolean checkTermination) { String s = "Good simple javaws exapmle"; if (negate) { Assert.assertFalse("testSimpletest1lunchOk stdout should NOT contains " + s + " bud did", pr.stdout.contains(s)); @@ -71,8 +75,14 @@ //disabled, unnecessary exceptions may occure //Assert.assertFalse("testSimpletest1lunchOk stderr should not contains " + ss + " but did", pr.stderr.contains(ss)); } - Assert.assertFalse(pr.wasTerminated); - Assert.assertEquals((Integer) 0, pr.returnValue); + if (checkTermination) { + Assert.assertFalse(pr.wasTerminated); + if (negate) { + Assert.assertEquals((Integer) 1, pr.returnValue); + } else { + Assert.assertEquals((Integer) 0, pr.returnValue); + } + } } @Test diff -r f589afe6e008 -r f48d4c62c2e3 tests/reproducers/simple/simpletest1/testcases/SimpleTestDefaultRedirects.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/simpletest1/testcases/SimpleTestDefaultRedirects.java Wed Jan 06 09:53:38 2016 +0100 @@ -0,0 +1,290 @@ +/* SimpleTest1Test.java + Copyright (C) 2011 Red Hat, Inc. + + This file is part of IcedTea. + + IcedTea is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2. + + IcedTea 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 for more details. + + You should have received a copy of the GNU General Public License + along with IcedTea; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. + + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. + */ + +import java.net.MalformedURLException; +import java.util.Arrays; +import java.util.List; +import net.sourceforge.jnlp.OptionsDefinitions; +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.ServerLauncher; +import org.junit.Assert; + +import org.junit.Test; + +public class SimpleTestDefaultRedirects { + + private static final ServerAccess server = new ServerAccess(); + + private static final String D = "-J-Dhttp.maxRedirects=20"; //default - https://docs.oracle.com/javase/7/docs/api/java/net/doc-files/net-properties.html , but... + //unluckily, setting http.maxRedirects to eg 1 do not have testing benefit + //as httpconnection then jsut throws exception instead of returning header to app's investigations + //I doubt it is worthy to struggle with setInstanceFollowRedirects in production code + + private static final List hr = Arrays.asList(new String[]{D, ServerAccess.HEADLES_OPTION, OptionsDefinitions.OPTIONS.REDIRECT.option}); + private static final List hrv = Arrays.asList(new String[]{D, ServerAccess.VERBOSE_OPTION, ServerAccess.HEADLES_OPTION, OptionsDefinitions.OPTIONS.REDIRECT.option}); + private static final List hv = Arrays.asList(new String[]{D, ServerAccess.VERBOSE_OPTION, ServerAccess.HEADLES_OPTION}); + +/* creates redirecting instances so oe can debug itw against it */ +// public static void main(String[] args) throws InterruptedException, MalformedURLException { +// ServerLauncher[] servers = new ServerLauncher[3]; +// +// ServerLauncher server0 = ServerAccess.getIndependentInstance(); +// server0.setRedirect(ServerAccess.getInstance()); //redirecting to normal server singleton +// server0.setRedirectCode(301); +// servers[0] = server0; +// +// ServerLauncher server1 = ServerAccess.getIndependentInstance(); +// server1.setRedirect(server0); +// server1.setRedirectCode(301); +// servers[1] = server1; +// +// ServerLauncher server2 = ServerAccess.getIndependentInstance(); +// server2.setRedirect(server1); +// server2.setRedirectCode(301); +// servers[2] = server2; +// +// System.out.println(server0); +// System.out.println(server1); +// System.out.println(server2); +// +// try { +// System.out.println(server0.getUrl("/" + "simpletest1.jnlp")); +// System.out.println(server1.getUrl("/" + "simpletest1.jnlp")); +// System.out.println(server2.getUrl("/" + "simpletest1.jnlp")); +// while (true) { +// Thread.sleep(100); +// } +// } finally { +// for (ServerLauncher server : servers) { +// server.stop(); +// } +// } +// } + + public void testbody(List args, boolean pass, int... redirectCodes) throws Exception { + testbody(args, pass, -1, redirectCodes); + } + + public void testbody(List args, boolean pass, int breakChain, int... redirectCodes) throws Exception { + if (redirectCodes.length < 1) { + throw new RuntimeException("At least one redrection server pelase"); + } + ServerLauncher[] servers = new ServerLauncher[redirectCodes.length]; + + ServerLauncher server0 = ServerAccess.getIndependentInstance(); + server0.setRedirect(ServerAccess.getInstance()); //redirecting to normal server singleton + server0.setRedirectCode(redirectCodes[0]); //redirecting by first code + servers[0] = server0; + + //create redirect chain + for (int i = 1; i < redirectCodes.length; i++) { + ServerLauncher serverI = ServerAccess.getIndependentInstance(); + serverI.setRedirect(servers[i - 1]); //redirecting to pevious in chain + serverI.setRedirectCode(redirectCodes[i]); //by given code + servers[i] = serverI; + + } + testbody(args, pass, breakChain, servers); + } + + public void testbody(List args, boolean pass, int breakChain, ServerLauncher[] servers) throws Exception { + if (breakChain >= 0) { + servers[breakChain].setRedirect(null); + servers[breakChain].stop(); + } + ServerLauncher server3012378 = servers[servers.length - 1]; + try { + //now connect to last in chain and we should always get reposnse from ServerAccess.getInstance() + ProcessResult pr = ServerAccess.executeProcessUponURL(server.getJavawsLocation(), + args, + server3012378.getUrl("/" + "simpletest1.jnlp"), + null, + null + ); + SimpleTest1Test.checkLaunched(pr, !pass, false); + if (pass) { + Assert.assertTrue(0 == pr.returnValue); + } else { + //1.6 have wrong handling of pr.return value + //Assert.assertFalse(0 == pr.returnValue); + } + } finally { + for (int i = 0; i < servers.length; i++) { + if (i != breakChain) { + ServerLauncher serverI = servers[i]; + try { + serverI.setRedirect(null); + serverI.stop(); + } catch (Exception ex) { + ServerAccess.logException(ex); + } + } + } + } + } + + // note, tonly 308 needs help form ITW,others are redirected autmatically in http connection + // https://docs.oracle.com/javase/7/docs/api/java/net/HttpURLConnection.html#setInstanceFollowRedirects%28boolean%29 + public void testbody308(boolean pass, int... redirectCodes) throws Exception { + if (pass) { + testbody(hr, pass, redirectCodes); + } else { + testbody(hv, pass, redirectCodes); + } + } + + public void testbodyOthers(boolean pass, int... redirectCodes) throws Exception { + if (pass) { + testbody(hr, true, redirectCodes); + } else { + testbody(hv, true, redirectCodes); + } + } + + //some chains tests + @Test + public void testSimpletest1RedirectChain1AllowedOk() throws Exception { + testbodyOthers(true, 301, 302, 303, 307); + } + + @Test + public void testSimpletest1RedirectChain1NotAllowedOk() throws Exception { + testbodyOthers(false, 301, 302, 303, 307); + } + + @Test + public void testSimpletest1RedirectChain2AllowedOk() throws Exception { + testbody308(true, 301, 308, 302, 303, 307); + } + + @Test + public void testSimpletest1RedirectChain2NotAllowedOk() throws Exception { + server.executeJavawsClearCache(); + testbody308(false, 301, 308, 302, 303, 307); + } + + @Test + public void testSimpletest1RedirectChain3AllowedBroken() throws Exception { + server.executeJavawsClearCache(); + testbody(hrv, false, 1, new int[]{301, 302, 302, 303, 307}); + } + + @Test + public void testSimpletest1RedirectChain3NotAllowedBroken() throws Exception { + server.executeJavawsClearCache(); + testbody(hv, false, 1, new int[]{301, 302, 302, 303, 307}); + } + + @Test + public void testSimpletest1RedirectChain3AlowedCycle() throws Exception { + server.executeJavawsClearCache(); + ServerLauncher[] servers = new ServerLauncher[3]; + + ServerLauncher server0 = ServerAccess.getIndependentInstance(); + server0.setRedirect(ServerAccess.getInstance()); //redirecting to normal server singleton + server0.setRedirectCode(301); + servers[0] = server0; + + ServerLauncher server1 = ServerAccess.getIndependentInstance(); + server1.setRedirectCode(301); + servers[1] = server1; + + ServerLauncher server2 = ServerAccess.getIndependentInstance(); + server2.setRedirectCode(301); + servers[2] = server2; + + server1.setRedirect(server2); + server2.setRedirect(server1); + testbody(hrv, false, -1, servers); + } + + //end chains + // basic tests + @Test + public void testSimpletest1Redirect301AllowedOk() throws Exception { + testbodyOthers(true, 301); + } + + @Test + public void testSimpletest1Redirect301NotAllowedOk() throws Exception { + testbodyOthers(false, 301); + } + + @Test + public void testSimpletest1Redirect302AllowedOk() throws Exception { + testbodyOthers(true, 302); + } + + @Test + public void testSimpletest1Redirect302NotAllowedOk() throws Exception { From jvanek at icedtea.classpath.org Wed Jan 6 09:19:10 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 06 Jan 2016 09:19:10 +0000 Subject: /hg/icedtea-web: Added redirection tests Message-ID: changeset 6cbc3a7acc95 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6cbc3a7acc95 author: Jiri Vanek date: Wed Jan 06 10:19:00 2016 +0100 Added redirection tests diffstat: ChangeLog | 13 + tests/reproducers/simple/simpletest1/testcases/SimpleTest1CountRequests.java | 109 +++ tests/reproducers/simple/simpletest1/testcases/SimpleTest1Test.java | 81 +- tests/reproducers/simple/simpletest1/testcases/SimpleTestDefaultRedirects.java | 289 ++++++++++ tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java | 116 ++- tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java | 225 ++++-- 6 files changed, 669 insertions(+), 164 deletions(-) diffs (truncated from 1041 to 500 lines): diff -r d2b2e45c958a -r 6cbc3a7acc95 ChangeLog --- a/ChangeLog Tue Jan 05 10:30:19 2016 +0100 +++ b/ChangeLog Wed Jan 06 10:19:00 2016 +0100 @@ -1,3 +1,16 @@ +2016-01-06 Jiri Vanek + + Added redirection tests + * tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java: Enhanced so + it can redirect requests to another instance. Enhanced to be able to count requests + * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: same + * tests/reproducers/simple/simpletest1/testcases/SimpleTest1Test.java: small + refactoring to reuse checking methods + * tests/reproducers/simple/simpletest1/testcases/SimpleTest1CountRequests.java: + added set of tests to test behavior under various redirect codes + * tests/reproducers/simple/simpletest1/testcases/SimpleTestDefaultRedirects.java: + Added FAILING tests for 2591 - counting ITW requests to test server + 2016-01-05 Jiri Vanek * NEWS: mentioned PR2779 diff -r d2b2e45c958a -r 6cbc3a7acc95 tests/reproducers/simple/simpletest1/testcases/SimpleTest1CountRequests.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/simpletest1/testcases/SimpleTest1CountRequests.java Wed Jan 06 10:19:00 2016 +0100 @@ -0,0 +1,109 @@ +/* SimpleTest1Test.java + Copyright (C) 2011 Red Hat, Inc. + + This file is part of IcedTea. + + IcedTea is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2. + + IcedTea 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 for more details. + + You should have received a copy of the GNU General Public License + along with IcedTea; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. + + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. + */ + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.ServerLauncher; +import net.sourceforge.jnlp.annotations.Bug; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; + +import org.junit.Test; + + at Bug(id = "PR2591") +public class SimpleTest1CountRequests { + + private static final ServerAccess server = new ServerAccess(); + private static ServerLauncher server0; + private static final Map> counter = new HashMap<>(); + private static final List hv = Arrays.asList(new String[]{ServerAccess.VERBOSE_OPTION, ServerAccess.HEADLES_OPTION}); + + @BeforeClass + public static void createCountingServer() { + server0 = ServerAccess.getIndependentInstance(); + server0.setRequestsCounter(counter); + } + + @AfterClass + public static void stopCountingServer() { + server0.stop(); + } + + @Bug(id = "PR2591") + @Test + public void testSimpletest1EachResourceOnePerRun() throws Exception { + server0.setSupportingHeadRequest(true); + counter.clear(); + ProcessResult pr = ServerAccess.executeProcessUponURL(server.getJavawsLocation(), + hv, + server0.getUrl("/simpletest1.jnlp"), + null, + null + ); + SimpleTest1Test.checkLaunched(pr); + Assert.assertTrue(counter.get("./simpletest1.jnlp").get("GET").equals(1)); //2 without bugfix + Assert.assertTrue(counter.get("./simpletest1.jnlp").get("HEAD").equals(1)); + Assert.assertTrue(counter.get("./simpletest1.jar").get("GET").equals(1));//2 without bugfix + Assert.assertTrue(counter.get("./simpletest1.jar").get("HEAD").equals(1)); + + } + + @Bug(id = "PR2591") + @Test + public void testSimpletest1EachResourceOnePerRunHeadsOff() throws Exception { + server0.setSupportingHeadRequest(false); + counter.clear(); + ProcessResult pr = ServerAccess.executeProcessUponURL(server.getJavawsLocation(), + hv, + server0.getUrl("/simpletest1.jnlp"), + null, + null + ); + SimpleTest1Test.checkLaunched(pr); + Assert.assertTrue(counter.get("./simpletest1.jnlp").get("GET").equals(2)); //3 without bugfix + Assert.assertTrue(counter.get("./simpletest1.jnlp").get("HEAD") == null); + Assert.assertTrue(counter.get("./simpletest1.jar").get("GET").equals(2));//3 without bugfix + Assert.assertTrue(counter.get("./simpletest1.jar").get("HEAD") == (null)); + + } + +} diff -r d2b2e45c958a -r 6cbc3a7acc95 tests/reproducers/simple/simpletest1/testcases/SimpleTest1Test.java --- a/tests/reproducers/simple/simpletest1/testcases/SimpleTest1Test.java Tue Jan 05 10:30:19 2016 +0100 +++ b/tests/reproducers/simple/simpletest1/testcases/SimpleTest1Test.java Wed Jan 06 10:19:00 2016 +0100 @@ -1,42 +1,41 @@ /* SimpleTest1Test.java -Copyright (C) 2011 Red Hat, Inc. + Copyright (C) 2011 Red Hat, Inc. -This file is part of IcedTea. + This file is part of IcedTea. -IcedTea is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 2. + IcedTea is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2. -IcedTea 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 for more details. + IcedTea 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 for more details. -You should have received a copy of the GNU General Public License -along with IcedTea; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. + You should have received a copy of the GNU General Public License + along with IcedTea; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. */ import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; @@ -52,14 +51,18 @@ public class SimpleTest1Test { - private static ServerAccess server = new ServerAccess(); + private static final ServerAccess server = new ServerAccess(); private static final List strict = Arrays.asList(new String[]{OptionsDefinitions.OPTIONS.STRICT.option, ServerAccess.VERBOSE_OPTION}); - private void checkLaunched(ProcessResult pr) { + static void checkLaunched(ProcessResult pr) { checkLaunched(pr, false); } - private void checkLaunched(ProcessResult pr, boolean negate) { + static void checkLaunched(ProcessResult pr, boolean negate) { + checkLaunched(pr, negate, true); + } + + static void checkLaunched(ProcessResult pr, boolean negate, boolean checkTermination) { String s = "Good simple javaws exapmle"; if (negate) { Assert.assertFalse("testSimpletest1lunchOk stdout should NOT contains " + s + " bud did", pr.stdout.contains(s)); @@ -73,11 +76,13 @@ //disabled, unnecessary exceptions may occure //Assert.assertFalse("testSimpletest1lunchOk stderr should not contains " + ss + " but did", pr.stderr.contains(ss)); } - Assert.assertFalse(pr.wasTerminated); - if (negate){ - Assert.assertEquals((Integer) 1, pr.returnValue); - } else { - Assert.assertEquals((Integer) 0, pr.returnValue); + if (checkTermination) { + Assert.assertFalse(pr.wasTerminated); + if (negate) { + Assert.assertEquals((Integer) 1, pr.returnValue); + } else { + Assert.assertEquals((Integer) 0, pr.returnValue); + } } } @@ -113,7 +118,7 @@ private void createStrictFile(String originalResourceName, String newResourceName, URL codebase) throws MalformedURLException, IOException { String originalContent = FileUtils.loadFileAsString(new File(server.getDir(), originalResourceName)); - String nwContent1 = originalContent.replaceAll("href=\""+originalResourceName+"\"", "href=\""+newResourceName+"\""); + String nwContent1 = originalContent.replaceAll("href=\"" + originalResourceName + "\"", "href=\"" + newResourceName + "\""); String nwContent = nwContent1.replaceAll("codebase=\".\"", "codebase=\"" + codebase + "\""); nwContent = nwContent.replace("simpletest2", ""); ServerAccess.saveFile(nwContent, new File(server.getDir(), newResourceName)); diff -r d2b2e45c958a -r 6cbc3a7acc95 tests/reproducers/simple/simpletest1/testcases/SimpleTestDefaultRedirects.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/simple/simpletest1/testcases/SimpleTestDefaultRedirects.java Wed Jan 06 10:19:00 2016 +0100 @@ -0,0 +1,289 @@ +/* SimpleTest1Test.java + Copyright (C) 2011 Red Hat, Inc. + + This file is part of IcedTea. + + IcedTea is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2. + + IcedTea 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 for more details. + + You should have received a copy of the GNU General Public License + along with IcedTea; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. + + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. + */ + +import java.net.MalformedURLException; +import java.util.Arrays; +import java.util.List; +import net.sourceforge.jnlp.OptionsDefinitions; +import net.sourceforge.jnlp.ProcessResult; +import net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.ServerLauncher; +import org.junit.Assert; + +import org.junit.Test; + +public class SimpleTestDefaultRedirects { + + private static final ServerAccess server = new ServerAccess(); + + private static final String D = "-J-Dhttp.maxRedirects=20"; //default - https://docs.oracle.com/javase/7/docs/api/java/net/doc-files/net-properties.html , but... + //unluckily, setting http.maxRedirects to eg 1 do not have testing benefit + //as httpconnection then jsut throws exception instead of returning header to app's investigations + //I doubt it is worthy to struggle with setInstanceFollowRedirects in production code + + private static final List hr = Arrays.asList(new String[]{D, ServerAccess.HEADLES_OPTION, OptionsDefinitions.OPTIONS.REDIRECT.option}); + private static final List hrv = Arrays.asList(new String[]{D, ServerAccess.VERBOSE_OPTION, ServerAccess.HEADLES_OPTION, OptionsDefinitions.OPTIONS.REDIRECT.option}); + private static final List hv = Arrays.asList(new String[]{D, ServerAccess.VERBOSE_OPTION, ServerAccess.HEADLES_OPTION}); + +/* creates redirecting instances so oe can debug itw against it */ +// public static void main(String[] args) throws InterruptedException, MalformedURLException { +// ServerLauncher[] servers = new ServerLauncher[3]; +// +// ServerLauncher server0 = ServerAccess.getIndependentInstance(); +// server0.setRedirect(ServerAccess.getInstance()); //redirecting to normal server singleton +// server0.setRedirectCode(301); +// servers[0] = server0; +// +// ServerLauncher server1 = ServerAccess.getIndependentInstance(); +// server1.setRedirect(server0); +// server1.setRedirectCode(301); +// servers[1] = server1; +// +// ServerLauncher server2 = ServerAccess.getIndependentInstance(); +// server2.setRedirect(server1); +// server2.setRedirectCode(301); +// servers[2] = server2; +// +// System.out.println(server0); +// System.out.println(server1); +// System.out.println(server2); +// +// try { +// System.out.println(server0.getUrl("/" + "simpletest1.jnlp")); +// System.out.println(server1.getUrl("/" + "simpletest1.jnlp")); +// System.out.println(server2.getUrl("/" + "simpletest1.jnlp")); +// while (true) { +// Thread.sleep(100); +// } +// } finally { +// for (ServerLauncher server : servers) { +// server.stop(); +// } +// } +// } + + public void testbody(List args, boolean pass, int... redirectCodes) throws Exception { + testbody(args, pass, -1, redirectCodes); + } + + public void testbody(List args, boolean pass, int breakChain, int... redirectCodes) throws Exception { + if (redirectCodes.length < 1) { + throw new RuntimeException("At least one redrection server pelase"); + } + ServerLauncher[] servers = new ServerLauncher[redirectCodes.length]; + + ServerLauncher server0 = ServerAccess.getIndependentInstance(); + server0.setRedirect(ServerAccess.getInstance()); //redirecting to normal server singleton + server0.setRedirectCode(redirectCodes[0]); //redirecting by first code + servers[0] = server0; + + //create redirect chain + for (int i = 1; i < redirectCodes.length; i++) { + ServerLauncher serverI = ServerAccess.getIndependentInstance(); + serverI.setRedirect(servers[i - 1]); //redirecting to pevious in chain + serverI.setRedirectCode(redirectCodes[i]); //by given code + servers[i] = serverI; + + } + testbody(args, pass, breakChain, servers); + } + + public void testbody(List args, boolean pass, int breakChain, ServerLauncher[] servers) throws Exception { + if (breakChain >= 0) { + servers[breakChain].setRedirect(null); + servers[breakChain].stop(); + } + ServerLauncher server3012378 = servers[servers.length - 1]; + try { + //now connect to last in chain and we should always get reposnse from ServerAccess.getInstance() + ProcessResult pr = ServerAccess.executeProcessUponURL(server.getJavawsLocation(), + args, + server3012378.getUrl("/" + "simpletest1.jnlp"), + null, + null + ); + SimpleTest1Test.checkLaunched(pr, !pass, false); + if (pass) { + Assert.assertTrue(0 == pr.returnValue); + } else { + Assert.assertFalse(0 == pr.returnValue); + } + } finally { + for (int i = 0; i < servers.length; i++) { + if (i != breakChain) { + ServerLauncher serverI = servers[i]; + try { + serverI.setRedirect(null); + serverI.stop(); + } catch (Exception ex) { + ServerAccess.logException(ex); + } + } + } + } + } + + // note, tonly 308 needs help form ITW,others are redirected autmatically in http connection + // https://docs.oracle.com/javase/7/docs/api/java/net/HttpURLConnection.html#setInstanceFollowRedirects%28boolean%29 + public void testbody308(boolean pass, int... redirectCodes) throws Exception { + if (pass) { + testbody(hr, pass, redirectCodes); + } else { + testbody(hv, pass, redirectCodes); + } + } + + public void testbodyOthers(boolean pass, int... redirectCodes) throws Exception { + if (pass) { + testbody(hr, true, redirectCodes); + } else { + testbody(hv, true, redirectCodes); + } + } + + //some chains tests + @Test + public void testSimpletest1RedirectChain1AllowedOk() throws Exception { + testbodyOthers(true, 301, 302, 303, 307); + } + + @Test + public void testSimpletest1RedirectChain1NotAllowedOk() throws Exception { + testbodyOthers(false, 301, 302, 303, 307); + } + + @Test + public void testSimpletest1RedirectChain2AllowedOk() throws Exception { + testbody308(true, 301, 308, 302, 303, 307); + } + + @Test + public void testSimpletest1RedirectChain2NotAllowedOk() throws Exception { + server.executeJavawsClearCache(); + testbody308(false, 301, 308, 302, 303, 307); + } + + @Test + public void testSimpletest1RedirectChain3AllowedBroken() throws Exception { + server.executeJavawsClearCache(); + testbody(hrv, false, 1, new int[]{301, 302, 302, 303, 307}); + } + + @Test + public void testSimpletest1RedirectChain3NotAllowedBroken() throws Exception { + server.executeJavawsClearCache(); + testbody(hv, false, 1, new int[]{301, 302, 302, 303, 307}); + } + + @Test + public void testSimpletest1RedirectChain3AlowedCycle() throws Exception { + server.executeJavawsClearCache(); + ServerLauncher[] servers = new ServerLauncher[3]; + + ServerLauncher server0 = ServerAccess.getIndependentInstance(); + server0.setRedirect(ServerAccess.getInstance()); //redirecting to normal server singleton + server0.setRedirectCode(301); + servers[0] = server0; + + ServerLauncher server1 = ServerAccess.getIndependentInstance(); + server1.setRedirectCode(301); + servers[1] = server1; + + ServerLauncher server2 = ServerAccess.getIndependentInstance(); + server2.setRedirectCode(301); + servers[2] = server2; + + server1.setRedirect(server2); + server2.setRedirect(server1); + testbody(hrv, false, -1, servers); + } + + //end chains + // basic tests + @Test + public void testSimpletest1Redirect301AllowedOk() throws Exception { + testbodyOthers(true, 301); From bugzilla-daemon at icedtea.classpath.org Wed Jan 6 09:36:48 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 09:36:48 +0000 Subject: [Bug 2591] IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2591 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #5 from JiriVanek --- ok. pushing it now. It will be in next release of 1.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 jvanek at icedtea.classpath.org Wed Jan 6 09:49:47 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 06 Jan 2016 09:49:47 +0000 Subject: /hg/release/icedtea-web-1.6: Fixed PR2591 - IcedTea-Web request ... Message-ID: changeset 199702cfbca7 in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=199702cfbca7 author: Jiri Vanek date: Wed Jan 06 10:49:31 2016 +0100 Fixed PR2591 - IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet diffstat: ChangeLog | 17 +- NEWS | 1 + netx/net/sourceforge/jnlp/cache/ResourceDownloader.java | 121 ++++++--- tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java | 31 +- 4 files changed, 113 insertions(+), 57 deletions(-) diffs (417 lines): diff -r f48d4c62c2e3 -r 199702cfbca7 ChangeLog --- a/ChangeLog Wed Jan 06 09:53:38 2016 +0100 +++ b/ChangeLog Wed Jan 06 10:49:31 2016 +0100 @@ -1,3 +1,16 @@ +2016-01-06 Jiri Vanek + + Fixed PR2591 - IcedTea-Web request resources twice for meta informations and + causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet + * NEWS: mentioned PR2591 + * netx/net/sourceforge/jnlp/cache/ResourceDownloader.java: CodeWithRedirect renamed + to UrlRequestResult and now cached also lastModified and length if available. + (initializeFromURL) now expects UrlRequestResult instead of URL, (findBestUrl) + now returns in same manner + (SimpleTest1CountRequests) now passes + * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java: adapted + to ResourceDownloader. + 2016-01-06 Jiri Vanek Added redirection tests @@ -7,9 +20,9 @@ * tests/reproducers/simple/simpletest1/testcases/SimpleTest1Test.java: small refactoring to reuse checking methods * tests/reproducers/simple/simpletest1/testcases/SimpleTest1CountRequests.java: + Added FAILING tests for 2591 - counting ITW requests to test server + * tests/reproducers/simple/simpletest1/testcases/SimpleTestDefaultRedirects.java: added set of tests to test behavior under various redirect codes - * tests/reproducers/simple/simpletest1/testcases/SimpleTestDefaultRedirects.java: - Added FAILING tests for 2591 - counting ITW requests to test server 2016-01-05 Jiri Vanek diff -r f48d4c62c2e3 -r 199702cfbca7 NEWS --- a/NEWS Wed Jan 06 09:53:38 2016 +0100 +++ b/NEWS Wed Jan 06 10:49:31 2016 +0100 @@ -11,6 +11,7 @@ New in release 1.6.2 (YYYY-MM-DD): * all connection restrictions now consider also port * PR2779: html-gen.sh: Don't try to call hg if .hg directory isn't present +* PR2591 - IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet * NetX - main-class attribute trimmed by default - in strict mode, main-class attribute checked for invalid characters diff -r f48d4c62c2e3 -r 199702cfbca7 netx/net/sourceforge/jnlp/cache/ResourceDownloader.java --- a/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java Wed Jan 06 09:53:38 2016 +0100 +++ b/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java Wed Jan 06 10:49:31 2016 +0100 @@ -57,8 +57,8 @@ * 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(); + static UrlRequestResult getUrlResponseCodeWithRedirectonResult(URL url, Map requestProperties, ResourceTracker.RequestMethods requestMethod) throws IOException { + UrlRequestResult result = new UrlRequestResult(); URLConnection connection = ConnectionFactory.getConnectionFactory().openConnection(url); for (Map.Entry property : requestProperties.entrySet()) { @@ -92,6 +92,9 @@ } ConnectionFactory.getConnectionFactory().disconnect(connection); + result.lastModified = connection.getLastModified(); + result.length = connection.getContentLengthLong(); + return result; } @@ -120,7 +123,7 @@ private void initializeOnlineResource() { try { - URL finalLocation = findBestUrl(resource); + UrlRequestResult finalLocation = findBestUrl(resource); if (finalLocation != null) { initializeFromURL(finalLocation); } else { @@ -136,18 +139,25 @@ } } - private void initializeFromURL(URL location) throws IOException { + private void initializeFromURL(UrlRequestResult location) throws IOException { CacheEntry entry = new CacheEntry(resource.getLocation(), resource.getRequestVersion()); entry.lock(); try { - resource.setDownloadLocation(location); - URLConnection connection = ConnectionFactory.getConnectionFactory().openConnection(location); // this won't change so should be okay not-synchronized + resource.setDownloadLocation(location.URL); + URLConnection connection = ConnectionFactory.getConnectionFactory().openConnection(location.URL); // this won't change so should be okay not-synchronized connection.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip"); File localFile = CacheUtil.getCacheFile(resource.getLocation(), resource.getDownloadVersion()); - long size = connection.getContentLengthLong(); + Long size = location.length; + if (size == null) { + size = connection.getContentLengthLong(); + } + Long lm = location.lastModified; + if (lm == null) { + lm = connection.getLastModified(); + } - boolean current = CacheUtil.isCurrent(resource.getLocation(), resource.getRequestVersion(), connection.getLastModified()) && resource.getUpdatePolicy() != UpdatePolicy.FORCE; + boolean current = CacheUtil.isCurrent(resource.getLocation(), resource.getRequestVersion(), lm) && resource.getUpdatePolicy() != UpdatePolicy.FORCE; if (!current) { if (entry.isCached()) { entry.markForDelete(); @@ -168,14 +178,15 @@ resource.changeStatus(EnumSet.of(PRECONNECT, CONNECTING), EnumSet.of(CONNECTED, PREDOWNLOAD)); // check if up-to-date; if so set as downloaded - if (current) + if (current) { resource.changeStatus(EnumSet.of(PREDOWNLOAD, DOWNLOADING), EnumSet.of(DOWNLOADED)); + } } // update cache entry if (!current) { - entry.setRemoteContentLength(connection.getContentLengthLong()); - entry.setLastModified(connection.getLastModified()); + entry.setRemoteContentLength(size); + entry.setLastModified(lm); } entry.setLastUpdated(System.currentTimeMillis()); @@ -225,14 +236,14 @@ } /** - * 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. + * 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) { + protected UrlRequestResult findBestUrl(Resource resource) { DownloadOptions options = resource.getDownloadOptions(); if (options == null) { options = new DownloadOptions(false, false); @@ -242,7 +253,6 @@ 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); @@ -250,13 +260,13 @@ Map requestProperties = new HashMap<>(); requestProperties.put("Accept-Encoding", "pack200-gzip, gzip"); - CodeWithRedirect response = getUrlResponseCodeWithRedirectonResult(url, requestProperties, requestMethod); - if (response.shouldRedirect()){ + UrlRequestResult 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()){ + 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); @@ -265,7 +275,11 @@ 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 */ + if (response.URL == null) { + response.URL = url; + } + return response; /* This is the best URL */ + } } catch (IOException e) { // continue to next candidate @@ -289,18 +303,17 @@ String contentEncoding = connection.getContentEncoding(); - OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Downloading " + downloadTo + " using " + - downloadFrom + " (encoding : " + contentEncoding + ") "); + 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 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) { @@ -380,7 +393,7 @@ resource.incrementTransferred(rlen); out.write(buf, 0, rlen); } - + in.close(); } } @@ -393,14 +406,14 @@ try (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(); } @@ -412,29 +425,51 @@ try (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(); } } /** - * Complex wrapper around return code with utility methods - * Default is HTTP_OK + * Complex wrapper around url request Contains return code (default is + * HTTP_OK), length and last modified + * + * The storing of redirect target is quite obvious The storing length and + * last modified may be not, but appearently + * (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2591) the url + * conenction is not always chaced as expected, and so another request may + * be sent when length and lastmodified are checked + * */ - private static class CodeWithRedirect { + static class UrlRequestResult { int result = HttpURLConnection.HTTP_OK; URL URL; + Long lastModified; + Long length; + + public UrlRequestResult() { + } + + public UrlRequestResult(URL URL) { + this.URL = URL; + } + + URL getURL() { + return URL; + } + /** - * @return whether the result code is redirect one. Rigth now 301-303 and 307-308 + * @return whether the result code is redirect one. Rigth now 301-303 + * and 307-308 */ public boolean shouldRedirect() { return (result == 301 @@ -445,11 +480,20 @@ } /** - * @return whether the return code is OK one - anything except <200,300) + * @return whether the return code is OK one - anything except <200,300) */ public boolean isInvalid() { return (result < 200 || result >= 300); } + + @Override + public String toString() { + return "" + + "url: " + (URL == null ? "null" : URL.toExternalForm()) + "; " + + "result:" + result + "; " + + "lastModified: " + (lastModified == null ? "null" : lastModified.toString()) + "; " + + "length: " + length == null ? "null" : length.toString() + "; "; + } } private static class RedirectionException extends RuntimeException { @@ -464,5 +508,4 @@ } - } diff -r f48d4c62c2e3 -r 199702cfbca7 tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java Wed Jan 06 09:53:38 2016 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java Wed Jan 06 10:49:31 2016 +0100 @@ -19,7 +19,6 @@ import java.util.jar.Pack200; import java.util.zip.GZIPOutputStream; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -35,7 +34,7 @@ import net.sourceforge.jnlp.util.logging.NoStdOutErrTest; import net.sourceforge.jnlp.util.logging.OutputController; -public class ResourceDownloaderTest extends NoStdOutErrTest{ +public class ResourceDownloaderTest extends NoStdOutErrTest { public static ServerLauncher testServer; public static ServerLauncher testServerWithBrokenHead; @@ -78,7 +77,6 @@ OutputController.getLogger().setOut(new PrintStream(currentErrorStream)); OutputController.getLogger().setErr(new PrintStream(currentErrorStream)); - } @AfterClass @@ -130,7 +128,8 @@ redirectErr(); try { File f = File.createTempFile(nameStub1, nameStub2); - int i = ResourceDownloader.getUrlResponseCode(testServer.getUrl(f.getName()), new HashMap(), ResourceTracker.RequestMethods.HEAD); Assert.assertEquals(HttpURLConnection.HTTP_OK, i); + int i = ResourceDownloader.getUrlResponseCode(testServer.getUrl(f.getName()), new HashMap(), ResourceTracker.RequestMethods.HEAD); + Assert.assertEquals(HttpURLConnection.HTTP_OK, i); f.delete(); i = ResourceDownloader.getUrlResponseCode(testServer.getUrl(f.getName()), new HashMap(), ResourceTracker.RequestMethods.HEAD); Assert.assertEquals(HttpURLConnection.HTTP_NOT_FOUND, i); @@ -227,30 +226,29 @@ Resource r2 = Resource.getResource(testServerWithBrokenHead.getUrl(fileForServerWithoutHeader.getName()), null, UpdatePolicy.NEVER); Resource r3 = Resource.getResource(testServer.getUrl(versionedFileForServerWithHeader.getName()), new Version("1.0"), UpdatePolicy.NEVER); Resource r4 = Resource.getResource(testServerWithBrokenHead.getUrl(versionedFileForServerWithoutHeader.getName()), new Version("1.0"), UpdatePolicy.NEVER); - assertOnServerWithHeader(resourceDownloader.findBestUrl(r1)); - assertVersionedOneOnServerWithHeader(resourceDownloader.findBestUrl(r3)); - assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2)); - assertVersionedOneOnServerWithoutHeader(resourceDownloader.findBestUrl(r4)); + assertOnServerWithHeader(resourceDownloader.findBestUrl(r1).getURL()); + assertVersionedOneOnServerWithHeader(resourceDownloader.findBestUrl(r3).URL); + assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2).URL); + assertVersionedOneOnServerWithoutHeader(resourceDownloader.findBestUrl(r4).URL); fileForServerWithHeader.delete(); Assert.assertNull(resourceDownloader.findBestUrl(r1)); - assertVersionedOneOnServerWithHeader(resourceDownloader.findBestUrl(r3)); - assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2)); - assertVersionedOneOnServerWithoutHeader(resourceDownloader.findBestUrl(r4)); + assertVersionedOneOnServerWithHeader(resourceDownloader.findBestUrl(r3).URL); + assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2).URL); + assertVersionedOneOnServerWithoutHeader(resourceDownloader.findBestUrl(r4).URL); versionedFileForServerWithHeader.delete(); Assert.assertNull(resourceDownloader.findBestUrl(r1)); Assert.assertNull(resourceDownloader.findBestUrl(r3)); - assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2)); - assertVersionedOneOnServerWithoutHeader(resourceDownloader.findBestUrl(r4)); + assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2).URL); + assertVersionedOneOnServerWithoutHeader(resourceDownloader.findBestUrl(r4).URL); versionedFileForServerWithoutHeader.delete(); Assert.assertNull(resourceDownloader.findBestUrl(r1)); Assert.assertNull(resourceDownloader.findBestUrl(r3)); - assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2)); + assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2).URL); Assert.assertNull(resourceDownloader.findBestUrl(r4)); - fileForServerWithoutHeader.delete(); Assert.assertNull(resourceDownloader.findBestUrl(r1)); Assert.assertNull(resourceDownloader.findBestUrl(r3)); @@ -283,6 +281,7 @@ assertPort(u, testServer.getPort()); assertVersion(u); } + private void assertCommonComponentsOfUrl(URL u) { Assert.assertTrue(u.getProtocol().equals("http")); Assert.assertTrue(u.getHost().equals("localhost")); @@ -311,7 +310,7 @@ redirectErrBack(); cacheDir = PathsAndFiles.CACHE_DIR.getFullPath(); - PathsAndFiles.CACHE_DIR.setValue(System.getProperty("java.io.tmpdir") + File.separator + "tempcache"); + PathsAndFiles.CACHE_DIR.setValue(System.getProperty("java.io.tmpdir") + File.separator + "tempcache"); } @AfterClass From bugzilla-daemon at icedtea.classpath.org Wed Jan 6 09:49:53 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 09:49:53 +0000 Subject: [Bug 2591] IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2591 --- Comment #6 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea-web-1.6?cmd=changeset;node=199702cfbca7 author: Jiri Vanek date: Wed Jan 06 10:49:31 2016 +0100 Fixed PR2591 - IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet -- 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 6 10:26:13 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 10:26:13 +0000 Subject: [Bug 2690] Can't run BOM into JNLP file. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2690 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #2 from JiriVanek --- Hello. Tagsoup is correctly rmeoving this from source so no direct patch will be delivered to ITW. However, tests for BOM will be added. -- 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 6 11:01:42 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 11:01:42 +0000 Subject: [Bug 2690] Can't run BOM into JNLP file. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2690 --- Comment #3 from JiriVanek --- Anyway, sending to public review as future feature to resole its next destiny for head. -- 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 Wed Jan 6 11:09:23 2016 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 06 Jan 2016 11:09:23 +0000 Subject: /hg/gfx-test: Updated comments in the class HtmlWriter. Message-ID: changeset e9bbfa68cc70 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=e9bbfa68cc70 author: Pavel Tisnovsky date: Wed Jan 06 12:12:52 2016 +0100 Updated comments in the class HtmlWriter. diffstat: ChangeLog | 5 ++ src/org/gfxtest/ImageDiffer/ResultWriters/HtmlWriter.java | 29 ++++++++++++++- 2 files changed, 33 insertions(+), 1 deletions(-) diffs (91 lines): diff -r 61cadaf2583d -r e9bbfa68cc70 ChangeLog --- a/ChangeLog Mon Jan 04 11:04:54 2016 +0100 +++ b/ChangeLog Wed Jan 06 12:12:52 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-06 Pavel Tisnovsky + + * src/org/gfxtest/ImageDiffer/ResultWriters/HtmlWriter.java: + Updated comments in the class HtmlWriter. + 2016-01-04 Pavel Tisnovsky * src/org/gfxtest/ImageDiffer/ResultWriters/HtmlStructureWriter.java: diff -r 61cadaf2583d -r e9bbfa68cc70 src/org/gfxtest/ImageDiffer/ResultWriters/HtmlWriter.java --- a/src/org/gfxtest/ImageDiffer/ResultWriters/HtmlWriter.java Mon Jan 04 11:04:54 2016 +0100 +++ b/src/org/gfxtest/ImageDiffer/ResultWriters/HtmlWriter.java Wed Jan 06 12:12:52 2016 +0100 @@ -1,7 +1,7 @@ /* Java gfx-test framework - Copyright (C) 2010, 2011 Red Hat + Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Red Hat This file is part of IcedTea. @@ -47,8 +47,16 @@ import org.gfxtest.ImageDiffer.ComparisonResult; import org.gfxtest.ImageDiffer.Configuration; + + +/** + * Class that can generates HTML page containing test results. + */ public class HtmlWriter extends ResultWriter { + /** + * Header of HTML page + first part of its body. + */ private static final String HTML_HEADER = "\n " + @@ -62,30 +70,49 @@ " \n" + " \n"; + /** + * Footer of HTML page. + */ private static final String HTML_FOOTER = "
TestComparison resultImagesPerceptionDiff image thumbnail
\n" + " \n" + "\n"; + /** + * Name of output file. + */ private static final String HTML_FILE_NAME = "results.html"; + /** + * Constructor that accepts directory, where the resulting HTML page should + * be stored. + */ public HtmlWriter(File outputDirectory) throws IOException { super(outputDirectory, HTML_FILE_NAME); } + /** + * Print HTML header. + */ @Override public void printHeader() throws IOException { this.writer.write(HTML_HEADER); } + /** + * Print HTML footer. + */ @Override public void printFooter() throws IOException { this.writer.write(HTML_FOOTER); } + /** + * Print result for one result from image comparison into HTML page. + */ @Override public void printResultForOneImage(Configuration configuration, String imageFileName, BufferedImage[] sourceImages, ComparisonResult comparisonResult) throws IOException From jvanek at redhat.com Wed Jan 6 11:28:00 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 6 Jan 2016 12:28:00 +0100 Subject: [rfc][icedtea-web] alowing bom character in basic parser Message-ID: <568CFA40.20203@redhat.com> Thsi is fix for http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2690 In bugI stated that no direct action will be taken, but then I realised that yes, tagsoup is removeing this for us, but maybe it is doing it wrongly - as the character is mandatory for utf 16 and 32 So I think its a bit better to add it to switches in parser. I hope I had refactored all the scanWhitespaces corresctly. J. note - the patch contains he bom character. I dont know it it survives sending by email. Eg in hexa edior, you should see the bytes right in front of first but the signing is Java Detection Oracle Inc. you may see the redundant codebase in signing one (or missing in launching one) If proprietary plugin launches this, it is big 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 Wed Jan 6 13:16:23 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 13:16:23 +0000 Subject: [Bug 2579] Spelling errors in console In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2579 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu.andrew at redhat.com --- Comment #2 from Andrew John Hughes --- Jiri, if you tell me what files are involved, I can proof-read the text for you. As a minimum, files with user-visible text should at least be spell-checked. -- 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 6 13:19:51 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 13:19:51 +0000 Subject: [Bug 2058] [IcedTea7] Build crashes at start of second stage (building with itself) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2058 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |RESOLVED Resolution|--- |DUPLICATE --- Comment #8 from Andrew John Hughes --- Closing this as a duplicate of bug 2652. Both HEAD and the 2.6 branch have fully bootstrapped for me with CACAO. *** This bug has been marked as a duplicate of bug 2652 *** -- 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 6 13:19:51 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 13:19:51 +0000 Subject: [Bug 2652] icedtea/cacao 2.6 fails as a build VM for icedtea In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2652 --- Comment #6 from Andrew John Hughes --- *** Bug 2058 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 Wed Jan 6 13:22:38 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 13:22:38 +0000 Subject: [Bug 2058] [IcedTea7] Build crashes at start of second stage (building with itself) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2058 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|--- |2.6.2 -- 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 6 14:01:47 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 14:01:47 +0000 Subject: [Bug 2778] fatal error by the Java Problematic frame: # C libCRFPP.so CRFPP In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2778 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Hardware|32-bit |x86 Resolution|--- |INVALID Severity|enhancement |normal --- Comment #1 from Andrew John Hughes --- This is not a crash in OpenJDK/IcedTea, but a crash in the native code of the program you're running. You need to report the bug to that package. -- 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 Wed Jan 6 15:06:13 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 6 Jan 2016 16:06:13 +0100 Subject: [rfc][icedtea-web] supply fileLocation if codebase is null Message-ID: <568D2D65.1030106@redhat.com> Hello! When codebase is nto supplied, then in code in patch can came NPE. This patch is preventing it in most secure way I found. J. However, I need to dig into the codebase/docbase again a bit, becuase of http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2746#c2 So maybe this hunk will be useless again Also - this bug is present only in apps WITHOUT codebase attribute. Yes, it violates jnlp specification but ORacle's implementation eats it, so we shold too... -------------- next part -------------- A non-text attachment was scrubbed... Name: supplySourceLocationIfCodebaseIsNUll.patch Type: text/x-patch Size: 839 bytes Desc: not available URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 6 15:29:04 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 15:29:04 +0000 Subject: [Bug 2746] IcedTea-Web Plugin 1.6.1: net.sourceforge.jnlp.LaunchException In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2746 --- Comment #3 from JiriVanek --- I digged into it a bit more, because by luck I got ir once working and was wondering why. the why this works with oracle plugin and not with ITW is, that all resources onthis server are duplicated. And obviously, onse set of them is long time unmintined. Unluckily ITW resolves always to the old ones, but oracles one to maintained ones. so maintained one (last times February 2015): http://www.java.com/ga/applet/verify/JavaDetection_applet.jnlp http://www.java.com/ga/applet/verify/JavaDetection.jar legacy one (alst update October 2013): https://java.com/en/download/JavaDetection_applet.jnlp https://java.com/en/download/JavaDetection.jar Now JNLP signature is valid on both legacy among them and also among new ones, but not across them. Now the new ones have one huge error - missing codebase. If this is true, then for apple tITW takes as codebase the html page, but ORacle's takes the location of delegated jnlphref-ed jnlp. None is right. According to spec both should died as codebase is mandatory. Now whta is happening. the applet is specified as: var appletHTML = " "; >From it, the From jvanek at icedtea.classpath.org Wed Jan 6 16:04:32 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 06 Jan 2016 16:04:32 +0000 Subject: /hg/icedtea-web: Fixed PR2591 - IcedTea-Web request resources tw... Message-ID: changeset 2a4f622776e9 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2a4f622776e9 author: Jiri Vanek date: Wed Jan 06 10:53:12 2016 +0100 Fixed PR2591 - IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet diffstat: ChangeLog | 17 +- NEWS | 1 + netx/net/sourceforge/jnlp/cache/ResourceDownloader.java | 121 ++++++--- tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java | 31 +- 4 files changed, 113 insertions(+), 57 deletions(-) diffs (417 lines): diff -r 6cbc3a7acc95 -r 2a4f622776e9 ChangeLog --- a/ChangeLog Wed Jan 06 10:19:00 2016 +0100 +++ b/ChangeLog Wed Jan 06 10:53:12 2016 +0100 @@ -1,3 +1,16 @@ +2016-01-06 Jiri Vanek + + Fixed PR2591 - IcedTea-Web request resources twice for meta informations and + causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet + * NEWS: mentioned PR2591 + * netx/net/sourceforge/jnlp/cache/ResourceDownloader.java: CodeWithRedirect renamed + to UrlRequestResult and now cached also lastModified and length if available. + (initializeFromURL) now expects UrlRequestResult instead of URL, (findBestUrl) + now returns in same manner + (SimpleTest1CountRequests) now passes + * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java: adapted + to ResourceDownloader. + 2016-01-06 Jiri Vanek Added redirection tests @@ -7,9 +20,9 @@ * tests/reproducers/simple/simpletest1/testcases/SimpleTest1Test.java: small refactoring to reuse checking methods * tests/reproducers/simple/simpletest1/testcases/SimpleTest1CountRequests.java: + Added FAILING tests for 2591 - counting ITW requests to test server + * tests/reproducers/simple/simpletest1/testcases/SimpleTestDefaultRedirects.java: added set of tests to test behavior under various redirect codes - * tests/reproducers/simple/simpletest1/testcases/SimpleTestDefaultRedirects.java: - Added FAILING tests for 2591 - counting ITW requests to test server 2016-01-05 Jiri Vanek diff -r 6cbc3a7acc95 -r 2a4f622776e9 NEWS --- a/NEWS Wed Jan 06 10:19:00 2016 +0100 +++ b/NEWS Wed Jan 06 10:53:12 2016 +0100 @@ -14,6 +14,7 @@ * permissions sandbox and signed app and unsigned app with permissions all-permissions now run in sandbox instead of not at all. * fixed DownloadService * PR2779: html-gen.sh: Don't try to call hg if .hg directory isn't present +* PR2591 - IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet * comments in deployment.properties now should persists load/save * fixed bug in caching of files with query * fixed issues with recreating of existing shortcut diff -r 6cbc3a7acc95 -r 2a4f622776e9 netx/net/sourceforge/jnlp/cache/ResourceDownloader.java --- a/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java Wed Jan 06 10:19:00 2016 +0100 +++ b/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java Wed Jan 06 10:53:12 2016 +0100 @@ -57,8 +57,8 @@ * 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(); + static UrlRequestResult getUrlResponseCodeWithRedirectonResult(URL url, Map requestProperties, ResourceTracker.RequestMethods requestMethod) throws IOException { + UrlRequestResult result = new UrlRequestResult(); URLConnection connection = ConnectionFactory.getConnectionFactory().openConnection(url); for (Map.Entry property : requestProperties.entrySet()) { @@ -92,6 +92,9 @@ } ConnectionFactory.getConnectionFactory().disconnect(connection); + result.lastModified = connection.getLastModified(); + result.length = connection.getContentLengthLong(); + return result; } @@ -120,7 +123,7 @@ private void initializeOnlineResource() { try { - URL finalLocation = findBestUrl(resource); + UrlRequestResult finalLocation = findBestUrl(resource); if (finalLocation != null) { initializeFromURL(finalLocation); } else { @@ -136,18 +139,25 @@ } } - private void initializeFromURL(URL location) throws IOException { + private void initializeFromURL(UrlRequestResult location) throws IOException { CacheEntry entry = new CacheEntry(resource.getLocation(), resource.getRequestVersion()); entry.lock(); try { - resource.setDownloadLocation(location); - URLConnection connection = ConnectionFactory.getConnectionFactory().openConnection(location); // this won't change so should be okay not-synchronized + resource.setDownloadLocation(location.URL); + URLConnection connection = ConnectionFactory.getConnectionFactory().openConnection(location.URL); // this won't change so should be okay not-synchronized connection.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip"); File localFile = CacheUtil.getCacheFile(resource.getLocation(), resource.getDownloadVersion()); - long size = connection.getContentLengthLong(); + Long size = location.length; + if (size == null) { + size = connection.getContentLengthLong(); + } + Long lm = location.lastModified; + if (lm == null) { + lm = connection.getLastModified(); + } - boolean current = CacheUtil.isCurrent(resource.getLocation(), resource.getRequestVersion(), connection.getLastModified()) && resource.getUpdatePolicy() != UpdatePolicy.FORCE; + boolean current = CacheUtil.isCurrent(resource.getLocation(), resource.getRequestVersion(), lm) && resource.getUpdatePolicy() != UpdatePolicy.FORCE; if (!current) { if (entry.isCached()) { entry.markForDelete(); @@ -168,14 +178,15 @@ resource.changeStatus(EnumSet.of(PRECONNECT, CONNECTING), EnumSet.of(CONNECTED, PREDOWNLOAD)); // check if up-to-date; if so set as downloaded - if (current) + if (current) { resource.changeStatus(EnumSet.of(PREDOWNLOAD, DOWNLOADING), EnumSet.of(DOWNLOADED)); + } } // update cache entry if (!current) { - entry.setRemoteContentLength(connection.getContentLengthLong()); - entry.setLastModified(connection.getLastModified()); + entry.setRemoteContentLength(size); + entry.setLastModified(lm); } entry.setLastUpdated(System.currentTimeMillis()); @@ -225,14 +236,14 @@ } /** - * 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. + * 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) { + protected UrlRequestResult findBestUrl(Resource resource) { DownloadOptions options = resource.getDownloadOptions(); if (options == null) { options = new DownloadOptions(false, false); @@ -242,7 +253,6 @@ 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); @@ -250,13 +260,13 @@ Map requestProperties = new HashMap<>(); requestProperties.put("Accept-Encoding", "pack200-gzip, gzip"); - CodeWithRedirect response = getUrlResponseCodeWithRedirectonResult(url, requestProperties, requestMethod); - if (response.shouldRedirect()){ + UrlRequestResult 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()){ + 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); @@ -265,7 +275,11 @@ 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 */ + if (response.URL == null) { + response.URL = url; + } + return response; /* This is the best URL */ + } } catch (IOException e) { // continue to next candidate @@ -289,18 +303,17 @@ String contentEncoding = connection.getContentEncoding(); - OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Downloading " + downloadTo + " using " + - downloadFrom + " (encoding : " + contentEncoding + ") "); + 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 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) { @@ -380,7 +393,7 @@ resource.incrementTransferred(rlen); out.write(buf, 0, rlen); } - + in.close(); } } @@ -393,14 +406,14 @@ try (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(); } @@ -412,29 +425,51 @@ try (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(); } } /** - * Complex wrapper around return code with utility methods - * Default is HTTP_OK + * Complex wrapper around url request Contains return code (default is + * HTTP_OK), length and last modified + * + * The storing of redirect target is quite obvious The storing length and + * last modified may be not, but appearently + * (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2591) the url + * conenction is not always chaced as expected, and so another request may + * be sent when length and lastmodified are checked + * */ - private static class CodeWithRedirect { + static class UrlRequestResult { int result = HttpURLConnection.HTTP_OK; URL URL; + Long lastModified; + Long length; + + public UrlRequestResult() { + } + + public UrlRequestResult(URL URL) { + this.URL = URL; + } + + URL getURL() { + return URL; + } + /** - * @return whether the result code is redirect one. Rigth now 301-303 and 307-308 + * @return whether the result code is redirect one. Rigth now 301-303 + * and 307-308 */ public boolean shouldRedirect() { return (result == 301 @@ -445,11 +480,20 @@ } /** - * @return whether the return code is OK one - anything except <200,300) + * @return whether the return code is OK one - anything except <200,300) */ public boolean isInvalid() { return (result < 200 || result >= 300); } + + @Override + public String toString() { + return "" + + "url: " + (URL == null ? "null" : URL.toExternalForm()) + "; " + + "result:" + result + "; " + + "lastModified: " + (lastModified == null ? "null" : lastModified.toString()) + "; " + + "length: " + length == null ? "null" : length.toString() + "; "; + } } private static class RedirectionException extends RuntimeException { @@ -464,5 +508,4 @@ } - } diff -r 6cbc3a7acc95 -r 2a4f622776e9 tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java Wed Jan 06 10:19:00 2016 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java Wed Jan 06 10:53:12 2016 +0100 @@ -19,7 +19,6 @@ import java.util.jar.Pack200; import java.util.zip.GZIPOutputStream; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -35,7 +34,7 @@ import net.sourceforge.jnlp.util.logging.NoStdOutErrTest; import net.sourceforge.jnlp.util.logging.OutputController; -public class ResourceDownloaderTest extends NoStdOutErrTest{ +public class ResourceDownloaderTest extends NoStdOutErrTest { public static ServerLauncher testServer; public static ServerLauncher testServerWithBrokenHead; @@ -78,7 +77,6 @@ OutputController.getLogger().setOut(new PrintStream(currentErrorStream)); OutputController.getLogger().setErr(new PrintStream(currentErrorStream)); - } @AfterClass @@ -130,7 +128,8 @@ redirectErr(); try { File f = File.createTempFile(nameStub1, nameStub2); - int i = ResourceDownloader.getUrlResponseCode(testServer.getUrl(f.getName()), new HashMap(), ResourceTracker.RequestMethods.HEAD); Assert.assertEquals(HttpURLConnection.HTTP_OK, i); + int i = ResourceDownloader.getUrlResponseCode(testServer.getUrl(f.getName()), new HashMap(), ResourceTracker.RequestMethods.HEAD); + Assert.assertEquals(HttpURLConnection.HTTP_OK, i); f.delete(); i = ResourceDownloader.getUrlResponseCode(testServer.getUrl(f.getName()), new HashMap(), ResourceTracker.RequestMethods.HEAD); Assert.assertEquals(HttpURLConnection.HTTP_NOT_FOUND, i); @@ -227,30 +226,29 @@ Resource r2 = Resource.getResource(testServerWithBrokenHead.getUrl(fileForServerWithoutHeader.getName()), null, UpdatePolicy.NEVER); Resource r3 = Resource.getResource(testServer.getUrl(versionedFileForServerWithHeader.getName()), new Version("1.0"), UpdatePolicy.NEVER); Resource r4 = Resource.getResource(testServerWithBrokenHead.getUrl(versionedFileForServerWithoutHeader.getName()), new Version("1.0"), UpdatePolicy.NEVER); - assertOnServerWithHeader(resourceDownloader.findBestUrl(r1)); - assertVersionedOneOnServerWithHeader(resourceDownloader.findBestUrl(r3)); - assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2)); - assertVersionedOneOnServerWithoutHeader(resourceDownloader.findBestUrl(r4)); + assertOnServerWithHeader(resourceDownloader.findBestUrl(r1).getURL()); + assertVersionedOneOnServerWithHeader(resourceDownloader.findBestUrl(r3).URL); + assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2).URL); + assertVersionedOneOnServerWithoutHeader(resourceDownloader.findBestUrl(r4).URL); fileForServerWithHeader.delete(); Assert.assertNull(resourceDownloader.findBestUrl(r1)); - assertVersionedOneOnServerWithHeader(resourceDownloader.findBestUrl(r3)); - assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2)); - assertVersionedOneOnServerWithoutHeader(resourceDownloader.findBestUrl(r4)); + assertVersionedOneOnServerWithHeader(resourceDownloader.findBestUrl(r3).URL); + assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2).URL); + assertVersionedOneOnServerWithoutHeader(resourceDownloader.findBestUrl(r4).URL); versionedFileForServerWithHeader.delete(); Assert.assertNull(resourceDownloader.findBestUrl(r1)); Assert.assertNull(resourceDownloader.findBestUrl(r3)); - assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2)); - assertVersionedOneOnServerWithoutHeader(resourceDownloader.findBestUrl(r4)); + assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2).URL); + assertVersionedOneOnServerWithoutHeader(resourceDownloader.findBestUrl(r4).URL); versionedFileForServerWithoutHeader.delete(); Assert.assertNull(resourceDownloader.findBestUrl(r1)); Assert.assertNull(resourceDownloader.findBestUrl(r3)); - assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2)); + assertOnServerWithoutHeader(resourceDownloader.findBestUrl(r2).URL); Assert.assertNull(resourceDownloader.findBestUrl(r4)); - fileForServerWithoutHeader.delete(); Assert.assertNull(resourceDownloader.findBestUrl(r1)); Assert.assertNull(resourceDownloader.findBestUrl(r3)); @@ -283,6 +281,7 @@ assertPort(u, testServer.getPort()); assertVersion(u); } + private void assertCommonComponentsOfUrl(URL u) { Assert.assertTrue(u.getProtocol().equals("http")); Assert.assertTrue(u.getHost().equals("localhost")); @@ -311,7 +310,7 @@ redirectErrBack(); cacheDir = PathsAndFiles.CACHE_DIR.getFullPath(); - PathsAndFiles.CACHE_DIR.setValue(System.getProperty("java.io.tmpdir") + File.separator + "tempcache"); + PathsAndFiles.CACHE_DIR.setValue(System.getProperty("java.io.tmpdir") + File.separator + "tempcache"); } @AfterClass From bugzilla-daemon at icedtea.classpath.org Wed Jan 6 16:05:10 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 16:05:10 +0000 Subject: [Bug 2591] IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2591 --- Comment #7 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=2a4f622776e9 author: Jiri Vanek date: Wed Jan 06 10:53:12 2016 +0100 Fixed PR2591 - IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet -- 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 icedtea.classpath.org Wed Jan 6 16:34:21 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 06 Jan 2016 16:34:21 +0000 Subject: /hg/release/icedtea-web-1.6: Fixed typo in javadoc generation Message-ID: changeset 486f0dc7b5ca in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=486f0dc7b5ca author: Jiri Vanek date: Wed Jan 06 17:34:03 2016 +0100 Fixed typo in javadoc generation diffstat: ChangeLog | 5 +++++ Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 199702cfbca7 -r 486f0dc7b5ca ChangeLog --- a/ChangeLog Wed Jan 06 10:49:31 2016 +0100 +++ b/ChangeLog Wed Jan 06 17:34:03 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-06 James Le Cuirot + + Fixed typo in javadoc generation + * Makefile.am: (stamps/netx-docs.stamp) ( _OPTS)->(JAVADOC_OPTS) + 2016-01-06 Jiri Vanek Fixed PR2591 - IcedTea-Web request resources twice for meta informations and diff -r 199702cfbca7 -r 486f0dc7b5ca Makefile.am --- a/Makefile.am Wed Jan 06 10:49:31 2016 +0100 +++ b/Makefile.am Wed Jan 06 17:34:03 2016 +0100 @@ -652,7 +652,7 @@ stamps/netx-docs.stamp: if ENABLE_DOCS - $(SYSTEM_JDK_DIR)/bin/javadoc $(JAVADOC_MEM_OPTS) $( _OPTS) \ + $(SYSTEM_JDK_DIR)/bin/javadoc $(JAVADOC_MEM_OPTS) $(JAVADOC_OPTS) \ -d ${abs_top_builddir}/docs/netx -sourcepath $(NETX_SRCDIR) \ -doctitle 'IcedTea-Web: NetX API Specification' \ -windowtitle 'IcedTea-Web: NetX ' \ From jvanek at icedtea.classpath.org Wed Jan 6 16:39:05 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 06 Jan 2016 16:39:05 +0000 Subject: /hg/icedtea-web: Fixed typo in javadoc generation Message-ID: changeset 78a490b19df5 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=78a490b19df5 author: Jiri Vanek date: Wed Jan 06 17:38:47 2016 +0100 Fixed typo in javadoc generation diffstat: ChangeLog | 5 +++++ Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 2a4f622776e9 -r 78a490b19df5 ChangeLog --- a/ChangeLog Wed Jan 06 10:53:12 2016 +0100 +++ b/ChangeLog Wed Jan 06 17:38:47 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-06 James Le Cuirot + + Fixed typo in javadoc generation + * Makefile.am: (stamps/netx-docs.stamp) ( _OPTS)->(JAVADOC_OPTS) + 2016-01-06 Jiri Vanek Fixed PR2591 - IcedTea-Web request resources twice for meta informations and diff -r 2a4f622776e9 -r 78a490b19df5 Makefile.am --- a/Makefile.am Wed Jan 06 10:53:12 2016 +0100 +++ b/Makefile.am Wed Jan 06 17:38:47 2016 +0100 @@ -667,7 +667,7 @@ stamps/netx-docs.stamp: if ENABLE_DOCS - $(SYSTEM_JDK_DIR)/bin/javadoc $(JAVADOC_MEM_OPTS) $( _OPTS) \ + $(SYSTEM_JDK_DIR)/bin/javadoc $(JAVADOC_MEM_OPTS) $(JAVADOC_OPTS) \ -d ${abs_top_builddir}/docs/netx -sourcepath $(NETX_SRCDIR) \ -doctitle 'IcedTea-Web: NetX API Specification' \ -windowtitle 'IcedTea-Web: NetX ' \ From jvanek at redhat.com Wed Jan 6 18:18:27 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 6 Jan 2016 19:18:27 +0100 Subject: [rfc][icedtea-web] align jnlp-href codebase handling to oracle plugin Message-ID: <568D5A73.3010909@redhat.com> Info at http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2746#c3 Longstory short - when jnlp-href is used, and no codebase is specified, then itw is taking docBase as ceodebase and oracle plugin is taking base of jnlp file from jnlp-href. After several thoughts about it, I came to conclusion that ITW behaves on edge of security bug. So although this is changing behavior a lot, I think it shold go to 1.6 too. Thoughts? J. See the aligned change in SecurityDesc (originally posted for [rfc][icedtea-web] supply fileLocation if codebase is null -------------- next part -------------- A non-text attachment was scrubbed... Name: fixForJavaVersionJnlpHref.patch Type: text/x-patch Size: 10003 bytes Desc: not available URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 6 23:43:52 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 23:43:52 +0000 Subject: [Bug 2667] IntelliJ does not run on my machine with Ubuntu 4.14 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2667 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |gnu.andrew at redhat.com Component|JamVM |IcedTea Resolution|--- |WONTFIX Assignee|xerxes at zafena.se |gnu.andrew at redhat.com --- Comment #2 from Andrew John Hughes --- The 2.5.x series of IcedTea is no longer supported. Please upgrade to the 2.6.x release series and re-open if this bug persists, with details on how to reproduce it. >From the above, it looks like your JDK installation is broken in some way. -- 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 6 23:44:01 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 23:44:01 +0000 Subject: [Bug 2667] IntelliJ does not run on my machine with Ubuntu 4.14 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2667 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- 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 Wed Jan 6 23:47:07 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jan 2016 23:47:07 +0000 Subject: [Bug 2665] icedtea/jamvm 2.6 fails as a build VM for icedtea In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2665 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |gnu.andrew at redhat.com Target Milestone|--- |2.6.4 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 Thu Jan 7 00:32:34 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 00:32:34 +0000 Subject: [Bug 2086] Failed to write core dump. Core dumps have been disabled. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2086 --- Comment #8 from Andrew John Hughes --- What version of IcedTea are you using? -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Jan 7 00:35:37 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 00:35:37 +0000 Subject: [Bug 2651] A fatal error has been detected by the Java Runtime Environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2651 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |2.6.1 Severity|blocker |normal --- Comment #3 from Andrew John Hughes --- That's a workaround rather than a fix. Any idea why this is failing? -- 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 7 06:47:39 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 06:47:39 +0000 Subject: [Bug 2651] A fatal error has been detected by the Java Runtime Environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2651 --- Comment #4 from stephane.betton at gmail.com --- Absolutely not , but the problem is the same with version 8.1 on debian testing but this time no trace in the logs :-( -- 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 7 10:35:07 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 10:35:07 +0000 Subject: [Bug 2746] IcedTea-Web Plugin 1.6.1: net.sourceforge.jnlp.LaunchException In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2746 --- Comment #4 from JiriVanek --- http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2016-January/034446.html will be in next 1.6 update -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From edward.nevill at gmail.com Thu Jan 7 10:56:14 2016 From: edward.nevill at gmail.com (Edward Nevill) Date: Thu, 07 Jan 2016 10:56:14 +0000 Subject: RFR: JDK 7: Add support for large code cache Message-ID: <1452164174.4371.33.camel@mint> Hi, The following webrev adds support for large code caches (>128M) to JDK 7 for aarch64. http://cr.openjdk.java.net/~enevill/jdk7_largecode/webrev.01/ Tested with jtreg hotspot & langtools hotspot(original): Test results: passed: 297; failed: 12; error: 2 hotspot(256m cache): Test results: passed: 298; failed: 11; error: 2 langtools(original): Test results: passed: 1,973; failed: 1 langtools(256m cache): Test results: passed: 1,973; failed: 1 OK to push? Ed. From bugzilla-daemon at icedtea.classpath.org Thu Jan 7 11:41:34 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 11:41:34 +0000 Subject: [Bug 2687] [1.5-2+deb8u1] Impossible to interact with some buttons on a Java application hosted on the embedded web server of a Mitsubishi air conditioner controller In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2687 --- Comment #2 from JiriVanek --- Hello, is this sitll present with 1.6? Will be provided more info? If no more info will go in, I will close this as invalid. Sorry. -- 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 7 11:49:16 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 11:49:16 +0000 Subject: [Bug 2518] If JNLP contains 'vendor' the generated .desktop-file contains invalid 'Vendor' entry key which invalidates file and inhibits installation In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2518 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #2 from JiriVanek --- >From curiosity, what system are you using that presence of vendor actually makes the file unusable? I tested with mate, gnome3, kde(4 iirc), xfce, lxde, cinamon and awesome. yes, validators complains, but the desktop file always worked. Otherwise I think your patch can be accepted. Was the patch all what was needed? -- 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 7 11:50:16 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 11:50:16 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #3 from JiriVanek --- Please may you verify ot works fine with icedtea-web 1.6.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 7 11:52:47 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 11:52:47 +0000 Subject: [Bug 2464] checkEntryPoint is implemented, but never called in checkAll or elsewhere in ManifestAttributesChecker or ITW In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2464 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from JiriVanek --- Already 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 7 11:53:14 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 11:53:14 +0000 Subject: [Bug 2426] IcedTea-Web security issues In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2426 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |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 aph at redhat.com Thu Jan 7 12:16:25 2016 From: aph at redhat.com (Andrew Haley) Date: Thu, 7 Jan 2016 12:16:25 +0000 Subject: [aarch64-port-dev ] RFR: JDK 7: Add support for large code cache In-Reply-To: <1452164174.4371.33.camel@mint> References: <1452164174.4371.33.camel@mint> Message-ID: <568E5719.6010102@redhat.com> On 07/01/16 10:56, Edward Nevill wrote: > OK to push? OK, thanks. Andrew. From bugzilla-daemon at icedtea.classpath.org Thu Jan 7 12:52:13 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 12:52:13 +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 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from JiriVanek --- This is fixed in head. Cannto be fixed sooner so it will appear in 1.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 7 12:52:49 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 12:52:49 +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 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from JiriVanek --- This was modified a bit in 1.6 but full fix is going in future 1.7. Cant be fixed earlier. -- 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 7 12:53:34 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 12:53:34 +0000 Subject: [Bug 2159] fatal error crash running iDRAC7 virtual console In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2159 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from JiriVanek --- Hello. Idrac is known to be working. Please reopne if ti is persisitng with 1.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 Thu Jan 7 12:55:15 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 12:55:15 +0000 Subject: [Bug 1245] Offline launching from a shortcut results in fatal error In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1245 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |jvanek at redhat.com Resolution|--- |FIXED --- Comment #2 from JiriVanek --- Hello. Offline capabilites and desktop support were hugely improved. This hsould eb resolved -- 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 Thu Jan 7 13:57:17 2016 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 07 Jan 2016 13:57:17 +0000 Subject: /hg/gfx-test: Eight new tests added into BitBltUsingBgColor. Message-ID: changeset 6e2bcc48fba8 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=6e2bcc48fba8 author: Pavel Tisnovsky date: Thu Jan 07 15:00:41 2016 +0100 Eight new tests added into BitBltUsingBgColor. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 122 ++++++++++++++++++++- 2 files changed, 126 insertions(+), 1 deletions(-) diffs (151 lines): diff -r e9bbfa68cc70 -r 6e2bcc48fba8 ChangeLog --- a/ChangeLog Wed Jan 06 12:12:52 2016 +0100 +++ b/ChangeLog Thu Jan 07 15:00:41 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-07 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Eight new tests added into BitBltUsingBgColor. + 2016-01-06 Pavel Tisnovsky * src/org/gfxtest/ImageDiffer/ResultWriters/HtmlWriter.java: diff -r e9bbfa68cc70 -r 6e2bcc48fba8 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Jan 06 12:12:52 2016 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Jan 07 15:00:41 2016 +0100 @@ -1,7 +1,7 @@ /* Java gfx-test framework - Copyright (C) 2010, 2011, 2012, 2013, 2014 Red Hat + Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Red Hat This file is part of IcedTea. @@ -14656,6 +14656,126 @@ } /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType3ByteBGR(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType3ByteBGR(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType3ByteBGR(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType3ByteBGR(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType3ByteBGR(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType3ByteBGR(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType3ByteBGR(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType3ByteBGR(image, graphics2d, Color.white); + } + + /** * Entry point to the test suite. * * @param args not used in this case From bugzilla-daemon at icedtea.classpath.org Thu Jan 7 14:17:50 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 14:17:50 +0000 Subject: [Bug 2714] IcedTea-Web plugin sends uninitialized memory garbage across a pipe when NPN_GetValueForURL call fails In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2714 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from JiriVanek --- Pushed. Will be in next 1.6 release. TY for patch. For curiosity, what was your base for this patch? The initilization hunks failed, because the ariabels were mostly already initialised... If you can, cahn you chek against head? -- 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 icedtea.classpath.org Thu Jan 7 14:38:09 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 07 Jan 2016 14:38:09 +0000 Subject: /hg/release/icedtea-web-1.6: 4 new changesets Message-ID: changeset 97d5dcfd9ec0 in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=97d5dcfd9ec0 author: Jiri Vanek date: Thu Jan 07 12:17:43 2016 +0100 fixed R2690 - Can't run BOM into JNLP file changeset 0d9faf51357d in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=0d9faf51357d author: Jiri Vanek date: Thu Jan 07 14:46:46 2016 +0100 Codebase resolution of jnlp-href is now aligned with oracle plugin changeset 090ff301b57d in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=090ff301b57d author: Jiri Vanek date: Thu Jan 07 15:24:21 2016 +0100 Fixed 2714 - IcedTea-Web plugin sends uninitialized memory garbage across a pipe when NPN_GetValueForURL call Resolves an issue where, if IcedTea-Web's call to NPN_GetValueForURL fails, IcedTea-Web attempts to send uninitialized memory garbage across a pipe, which (usually) results in an error. At this point, IcedTea gives up, but does not inform Firefox that it has done so, and unless dom.ipc.plugins.asyncInit is true, this causes Firefox's UI to lock up in addition to the Java component failing to changeset 834746c2a271 in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=834746c2a271 author: Jiri Vanek date: Thu Jan 07 15:33:12 2016 +0100 Remove bash-specifics from top level Makefile.am The == in the test comparison is not necessary, the = test works fine. Invoke html-gen.sh with 'sh' as opposed to 'bash' since it does not require bash. No reason to require bash when it is not needed. Tested with dash and zsh installed as /bin/sh. diffstat: ChangeLog | 58 +++++++ Makefile.am | 4 +- NEWS | 4 + netx/net/sourceforge/jnlp/PluginBridge.java | 8 +- netx/net/sourceforge/jnlp/SecurityDesc.java | 6 +- netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java | 49 +----- netx/net/sourceforge/jnlp/util/UrlUtils.java | 58 +++++++ netx/net/sourceforge/nanoxml/XMLElement.java | 81 +++++++-- plugin/icedteanp/IcedTeaNPPlugin.cc | 14 +- tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java | 19 ++ tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java | 2 - tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java | 8 +- tests/netx/unit/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmationTest.java | 17 +- tests/netx/unit/net/sourceforge/jnlp/templates/EFBBBF.jnlp | 59 +++++++ tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java | 56 ++++++- 15 files changed, 351 insertions(+), 92 deletions(-) diffs (truncated from 745 to 500 lines): diff -r 486f0dc7b5ca -r 834746c2a271 ChangeLog --- a/ChangeLog Wed Jan 06 17:34:03 2016 +0100 +++ b/ChangeLog Thu Jan 07 15:33:12 2016 +0100 @@ -1,3 +1,61 @@ +2016-01-07 David Cantrell + Jiri Vanek + Andrew John Hughes + + Remove bash-specifics from top level Makefile.a + * Makefile.am: (generate-docs.stamp) double == in test function replaced by single = + (stamps/netx-html-gen.stamp) call to plain bash replaced by ${SHELL} + * NEWS: mentioned PR2669 + +2016-01-07 Tiago St??rmer Daitx + Jiri Vanek + + Resolves an issue where, if IcedTea's call to NPN_GetValueForURL fails, + IcedTea-Web attempts to send uninitialized memory garbage across a pipe, which + (usually) results in an error. At this point, IcedTea gives up, but does not + inform Firefox that it has done so, and unless dom.ipc.plugins.asyncInit is + true, this causes Firefox's UI to lock up in addition to the Java component failing to load. + * plugin/icedteanp/IcedTeaNPPlugin.cc: (onsume_plugin_message) initialize len + and proxy_info. (get_proxy_info) returns correct message if + browser_functions.getvalueforurl returns error + * NEWS: mentioned PR2714 + +2016-01-07 Jiri Vanek + + Codebase resolution of jnlp-href is now aligned with oracle plugin + * netx/net/sourceforge/jnlp/PluginBridge.java: When jnlp href is used, codebase + is forced to become codebase of jnlp + * netx/net/sourceforge/jnlp/SecurityDesc.java: When file.getCodeBase() is null + then instead of NPE, codebase of file.fileLocation is used + * netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java: + stripFile and ensureSlashTail moved to UrlUtils + * netx/net/sourceforge/jnlp/util/UrlUtils.java: stripFile and ensureSlashTail + moved from UnsignedAppletTrustConfirmation + * tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java: removed empty lines + * tests/netx/unit/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmationTest.java: + adapted to moved methods + * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java: added more tests + to removeFileName and enabled accidentlay disabled getHostAndPortTest and + getPortTest + * tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: + ensured manifest attributes are off for this test + * tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java: fixed bom tests + to use proper classloader + +2016-01-07 Jiri Vanek + + BOM character now dont cause error + * netx/net/sourceforge/nanoxml/XMLElement.java: duplicated whitespace recognition + code moved to isRegularWhiteSpace. First call to scanWhitespace repalced by + call to scanLeadingWhitespace. New field BOM introduced. (scanWhitespace) + made private, and uses isRegularWhiteSpace. (scanLeadingWhitespace) new method, + same as scanWhitespacebut also skipps BOM and marks it. + * tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java: Added tests to + issue + * tests/netx/unit/net/sourceforge/jnlp/templates/EFBBBF.jnlp: new file. jnlp + file starting with bom. + * NEWS: mentioned PR2690 + 2016-01-06 James Le Cuirot Fixed typo in javadoc generation diff -r 486f0dc7b5ca -r 834746c2a271 Makefile.am --- a/Makefile.am Wed Jan 06 17:34:03 2016 +0100 +++ b/Makefile.am Thu Jan 07 15:33:12 2016 +0100 @@ -531,7 +531,7 @@ $$TP_COMMAND html "$$HTML_DOCS_TARGET_DIR/$$ID" $$TP_TAIL ; \ mkdir "$$PLAIN_DOCS_TARGET_DIR/$$ID" ; \ $$TP_COMMAND plain "$$PLAIN_DOCS_TARGET_DIR/$$ID" 160 $$TP_TAIL; \ - if [ $$ID == "en" ] ; then \ + if [ $$ID = "en" ] ; then \ MAN_DESC="$$MAN_DOCS_TARGET_DIR/man1" ; \ else \ MAN_DESC="$$MAN_DOCS_TARGET_DIR/$$ID/man1" ; \ @@ -549,7 +549,7 @@ mkdir -p html-gen; \ cp AUTHORS NEWS COPYING ChangeLog html-gen/; \ export HTML_GEN_DEBUG=true; \ - bash html-gen.sh 40; \ + ${SHELL} html-gen.sh 40; \ unset HTML_GEN_DEBUG) ${INSTALL_DATA} $(NETX_SRCDIR)/../html-gen/*.html $(NETX_RESOURCE_DIR) rm -r $(NETX_SRCDIR)/../html-gen/ diff -r 486f0dc7b5ca -r 834746c2a271 NEWS --- a/NEWS Wed Jan 06 17:34:03 2016 +0100 +++ b/NEWS Thu Jan 07 15:33:12 2016 +0100 @@ -12,11 +12,15 @@ * all connection restrictions now consider also port * PR2779: html-gen.sh: Don't try to call hg if .hg directory isn't present * PR2591 - IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet +* PR2690 - Can't run BOM into JNLP file +* PR2669 - remove bash-specific syntax from top level Makefile.am * NetX - main-class attribute trimmed by default - in strict mode, main-class attribute checked for invalid characters * Plugin - RH1273691 - Escaped equals signs in deployment.properties not un-escaped when used + - PR2746 - IcedTea-Web Plugin 1.6.1: net.sourceforge.jnlp.LaunchException + - PR2714 - IcedTea-Web plugin sends uninitialized memory garbage across a pipe when NPN_GetValueForURL call fails New in release 1.6.1 (2015-09-11): * Enabled Entry-Point attribute check diff -r 486f0dc7b5ca -r 834746c2a271 netx/net/sourceforge/jnlp/PluginBridge.java --- a/netx/net/sourceforge/jnlp/PluginBridge.java Wed Jan 06 17:34:03 2016 +0100 +++ b/netx/net/sourceforge/jnlp/PluginBridge.java Thu Jan 07 15:33:12 2016 +0100 @@ -40,6 +40,7 @@ import net.sourceforge.jnlp.cache.UpdatePolicy; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.util.StreamUtils; +import net.sourceforge.jnlp.util.UrlUtils; import net.sourceforge.jnlp.util.logging.OutputController; import net.sourceforge.jnlp.util.replacements.BASE64Decoder; @@ -130,7 +131,10 @@ }.readStream(); } else { - jnlpFile = jnlpCreator.create(jnlp, null, defaultSettings, JNLPRuntime.getDefaultUpdatePolicy(), codeBase); + // see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2746#c3 + URL codebaseRewriter=UrlUtils.ensureSlashTail(UrlUtils.removeFileName(jnlp)); + this.codeBase = codebaseRewriter; + jnlpFile = jnlpCreator.create(jnlp, null, defaultSettings, JNLPRuntime.getDefaultUpdatePolicy(), codebaseRewriter); debugJnlp = new StreamProvider() { @Override @@ -594,7 +598,7 @@ private static String getAllPermissionsElement() { return " \n"; } - + private abstract class StreamProvider { diff -r 486f0dc7b5ca -r 834746c2a271 netx/net/sourceforge/jnlp/SecurityDesc.java --- a/netx/net/sourceforge/jnlp/SecurityDesc.java Wed Jan 06 17:34:03 2016 +0100 +++ b/netx/net/sourceforge/jnlp/SecurityDesc.java Thu Jan 07 15:33:12 2016 +0100 @@ -415,7 +415,11 @@ } } try { - final URI codebase = file.getCodeBase().toURI().normalize(); + URL codebaseOriginal = file.getCodeBase(); + if (codebaseOriginal == null){ + codebaseOriginal =file.fileLocation; + } + final URI codebase = codebaseOriginal.toURI().normalize(); final URI host = getHost(codebase); final String codebaseHostUriString = host.toString(); final String urlPermissionUrlString = appendRecursiveSubdirToCodebaseHostString(codebaseHostUriString); diff -r 486f0dc7b5ca -r 834746c2a271 netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java --- a/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java Wed Jan 06 17:34:03 2016 +0100 +++ b/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java Thu Jan 07 15:33:12 2016 +0100 @@ -36,7 +36,6 @@ package net.sourceforge.jnlp.security.appletextendedsecurity; -import java.net.MalformedURLException; import static net.sourceforge.jnlp.runtime.Translator.R; import java.net.URL; @@ -49,8 +48,8 @@ import net.sourceforge.jnlp.JNLPFile; import net.sourceforge.jnlp.LaunchException; import net.sourceforge.jnlp.PluginBridge; +import net.sourceforge.jnlp.runtime.JNLPClassLoader.SecurityDelegate; import net.sourceforge.jnlp.runtime.JNLPRuntime; -import net.sourceforge.jnlp.runtime.JNLPClassLoader.SecurityDelegate; import net.sourceforge.jnlp.security.dialogs.apptrustwarningpanel.AppTrustWarningPanel.AppSigningWarningAction; import net.sourceforge.jnlp.security.CertVerifier; import net.sourceforge.jnlp.security.SecurityDialogs; @@ -140,7 +139,7 @@ /* Else, create a new entry */ UrlRegEx codebaseRegex = UrlRegEx.quote(codebase.toExternalForm()); - UrlRegEx documentbaseRegex = UrlRegEx.quoteAndStar(stripFile(documentbase)); // Match any from codebase and sourceFile "base" + UrlRegEx documentbaseRegex = UrlRegEx.quoteAndStar(UrlUtils.stripFile(documentbase)); // Match any from codebase and sourceFile "base" List archiveMatches = null; // Match any from codebase if (!rememberForCodeBase) { @@ -278,48 +277,4 @@ } - static String stripFile(URL documentbase) { - //whenused in generation of regec, the trailing slash is very important - //see the result between http:/some.url/path.* and http:/some.url/path/.* - return ensureSlashTail(stripFileImp(documentbase)); - } - - private static String stripFileImp(URL documentbase) { - try { - String normalized = UrlUtils.normalizeUrlAndStripParams(documentbase).toExternalForm().trim(); - if (normalized.endsWith("/") || normalized.endsWith("\\")) { - return normalized; - } - URL middleway = new URL(normalized); - String file = middleway.getFile(); - int i = Math.max(file.lastIndexOf('/'), file.lastIndexOf('\\')); - if (i<0){ - return normalized; - } - String parent = file.substring(0, i+1); - String stripped = normalized.replace(file, parent); - return stripped; - } catch (Exception ex) { - OutputController.getLogger().log(ex); - return documentbase.toExternalForm(); - } - - } - - private static String ensureSlashTail(String s) { - if (s.endsWith("/")) { - return s; - } - if (s.endsWith("\\")) { - return s; - } - if (s.contains("/")) { - return s + "/"; - } - if (s.contains("\\")) { - return s + "\\"; - } - return s + "/"; - } - } diff -r 486f0dc7b5ca -r 834746c2a271 netx/net/sourceforge/jnlp/util/UrlUtils.java --- a/netx/net/sourceforge/jnlp/util/UrlUtils.java Wed Jan 06 17:34:03 2016 +0100 +++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java Thu Jan 07 15:33:12 2016 +0100 @@ -346,5 +346,63 @@ public static String getHostAndPort(final URL url) { return url.getHost() + ":" + getSanitizedPort(url); } + + public static URL ensureSlashTail(URL u) { + if (u == null) { + return null; + } + String s = ensureSlashTail(u.toExternalForm()); + try { + return new URL(s); + } catch (MalformedURLException ex) { + OutputController.getLogger().log(ex); + return u; + } + + } + + public static String ensureSlashTail(String s) { + if (s.endsWith("/")) { + return s; + } + if (s.endsWith("\\")) { + return s; + } + if (s.contains("/")) { + return s + "/"; + } + if (s.contains("\\")) { + return s + "\\"; + } + return s + "/"; + } + + public static String stripFile(URL documentbase) { + //whenused in generation of regec, the trailing slash is very important + //see the result between http:/some.url/path.* and http:/some.url/path/.* + return UrlUtils.ensureSlashTail(stripFileImp(documentbase)); + } + + private static String stripFileImp(URL documentbase) { + try { + String normalized = UrlUtils.normalizeUrlAndStripParams(documentbase).toExternalForm().trim(); + if (normalized.endsWith("/") || normalized.endsWith("\\")) { + return normalized; + } + URL middleway = new URL(normalized); + String file = middleway.getFile(); + int i = Math.max(file.lastIndexOf('/'), file.lastIndexOf('\\')); + if (i < 0) { + return normalized; + } + String parent = file.substring(0, i + 1); + String stripped = normalized.replace(file, parent); + return stripped; + } catch (Exception ex) { + OutputController.getLogger().log(ex); + return documentbase.toExternalForm(); + } + + } } diff -r 486f0dc7b5ca -r 834746c2a271 netx/net/sourceforge/nanoxml/XMLElement.java --- a/netx/net/sourceforge/nanoxml/XMLElement.java Wed Jan 06 17:34:03 2016 +0100 +++ b/netx/net/sourceforge/nanoxml/XMLElement.java Thu Jan 07 15:33:12 2016 +0100 @@ -195,6 +195,11 @@ * Character read too much for the comment remover. */ private char sanitizeCharReadTooMuch; + + /** + * Whether the BOM header appeared + */ + private boolean BOM = false; /** * The reader provided by the caller of the parse method. @@ -494,7 +499,7 @@ this.parserLineNr = startingLineNr; for (;;) { - char ch = this.scanWhitespace(); + char ch = this.scanLeadingWhitespace(); if (ch != '<') { throw this.expectedInput("<", ch); @@ -584,24 +589,50 @@ } } + private boolean isRegularWhiteSpace(char ch) { + switch (ch) { + case ' ': + case '\t': + case '\n': + case '\r': + return true; + default: + return false; + } + } + /** * This method scans an identifier from the current reader. * * @return the next character following the whitespace. * @throws java.io.IOException if something goes wrong */ - protected char scanWhitespace() + private char scanWhitespace() throws IOException { - for (;;) { + while(true) { char ch = this.readChar(); - switch (ch) { - case ' ': - case '\t': - case '\n': - case '\r': - break; - default: - return ch; + if (!isRegularWhiteSpace(ch)) { + return ch; + } + } + } + /** + * This method scans an leading identifier from the current reader. + * + * UNlike scanWhitespace, it skipps also BOM + * + * @return the next character following the whitespace. + * @throws java.io.IOException if something goes wrong + */ + private char scanLeadingWhitespace() + throws IOException { + while(true) { + char ch = this.readChar(); + //this is BOM , not space + if (ch == '???') { + BOM = true; + } else if (!isRegularWhiteSpace(ch)) { + return ch; } } } @@ -621,18 +652,17 @@ */ protected char scanWhitespace(StringBuffer result) throws IOException { - for (;;) { + while (true) { char ch = this.readChar(); - switch (ch) { - case ' ': - case '\t': - case '\n': - result.append(ch); - break; - case '\r': - break; - default: - return ch; + if (!isRegularWhiteSpace(ch)) { + return ch; + } else { + switch (ch) { + case ' ': + case '\t': + case '\n': + result.append(ch); + } } } } @@ -1297,4 +1327,11 @@ } } + + public boolean isBOM() { + return BOM; + } + + + } diff -r 486f0dc7b5ca -r 834746c2a271 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Jan 06 17:34:03 2016 +0100 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Jan 07 15:33:12 2016 +0100 @@ -1154,13 +1154,13 @@ if (g_str_has_prefix(parts[1], "PluginProxyInfo")) { gchar* proxy = NULL; - uint32_t len; + uint32_t len = 0; gchar* decoded_url = (gchar*) calloc(strlen(parts[4]) + 1, sizeof(gchar)); IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url); PLUGIN_DEBUG("parts[0]=%s, parts[1]=%s, reference, parts[3]=%s, parts[4]=%s -- decoded_url=%s\n", parts[0], parts[1], parts[3], parts[4], decoded_url); - gchar* proxy_info; + gchar* proxy_info = NULL; proxy_info = g_strconcat ("plugin PluginProxyInfo reference ", parts[3], " ", NULL); if (get_proxy_info(decoded_url, &proxy, &len) == NPERR_NO_ERROR) @@ -1331,10 +1331,16 @@ } if (browser_functions.getvalueforurl) { - + NPError err; // As in get_cookie_info, we use the first active instance gpointer instance=getFirstInTableInstance(instance_to_id_map); - browser_functions.getvalueforurl((NPP) instance, NPNURLVProxy, siteAddr, proxy, len); + err = browser_functions.getvalueforurl((NPP) instance, NPNURLVProxy, siteAddr, proxy, len); + + if (err != NPERR_NO_ERROR) + { + *proxy = (char *) malloc(sizeof **proxy * 7); + *len = g_strlcpy(*proxy, "DIRECT", 7); + } } else { return NPERR_GENERIC_ERROR; diff -r 486f0dc7b5ca -r 834746c2a271 tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java --- a/tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java Wed Jan 06 17:34:03 2016 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java Thu Jan 07 15:33:12 2016 +0100 @@ -42,7 +42,10 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.IOException; +import net.sourceforge.jnlp.annotations.Bug; import net.sourceforge.jnlp.annotations.KnownToFail; +import net.sourceforge.jnlp.util.FileUtils; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -105,5 +108,21 @@ String malformedJnlp = originalJnlp.replace("'jnlp.jnlp'", "jnlp.jnlp"); Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()), new ParserSettings(false, true, false)); } + + + @Bug(id = "PR2690") + @Test + public void testXmlBomTagSoupOff() throws ParseException { + InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream("net/sourceforge/jnlp/templates/EFBBBF.jnlp"); + Assert.assertNotNull(is); + Parser.getRootNode(is, new ParserSettings(false, true, false)); + } + + @Test + public void testXmlBomTagSoupOn() throws ParseException { + InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream("net/sourceforge/jnlp/templates/EFBBBF.jnlp"); + Assert.assertNotNull(is); + Parser.getRootNode(is, new ParserSettings(false, true, true)); + } } diff -r 486f0dc7b5ca -r 834746c2a271 tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java From bugzilla-daemon at icedtea.classpath.org Thu Jan 7 14:43:14 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 14:43:14 +0000 Subject: [Bug 1260] IcedTea-Web should not rely on GTK In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1260 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |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 7 15:25:21 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 15:25:21 +0000 Subject: [Bug 2781] CACAO - typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781 --- Comment #9 from James Le Cuirot --- That has indeed sorted it, thanks! -- 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 7 15:58:53 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 15:58:53 +0000 Subject: [Bug 2714] IcedTea-Web plugin sends uninitialized memory garbage across a pipe when NPN_GetValueForURL call fails In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2714 --- Comment #2 from Tiago St?rmer Daitx --- Michael Greene (mgreene-l in Launchpad) provided the patch in https://bugs.launchpad.net/ubuntu/+source/icedtea-web/+bug/1222912 I will check if he can test against icedtea-web head. Thank you very much! -- 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 icedtea.classpath.org Thu Jan 7 16:00:44 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 07 Jan 2016 16:00:44 +0000 Subject: /hg/icedtea-web: 4 new changesets Message-ID: changeset 971644c257ae in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=971644c257ae author: Jiri Vanek date: Thu Jan 07 16:25:24 2016 +0100 fixed R2690 - Can't run BOM into JNLP file changeset 22b7becd48a7 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=22b7becd48a7 author: Jiri Vanek date: Thu Jan 07 16:34:53 2016 +0100 Codebase resolution of jnlp-href is now aligned with oracle plugin changeset ec057d601e50 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=ec057d601e50 author: Jiri Vanek date: Thu Jan 07 16:54:21 2016 +0100 Fixed 2714 - IcedTea-Web plugin sends uninitialized memory garbage across a pipe when NPN_GetValueForURL call Resolves an issue where, if IcedTea-Web's call to NPN_GetValueForURL fails, IcedTea-Web attempts to send uninitialized memory garbage across a pipe, which (usually) results in an error. At this point, IcedTea gives up, but does not inform Firefox that it has done so, and unless dom.ipc.plugins.asyncInit is true, this causes Firefox's UI to lock up in addition to the Java component failing to changeset ea6a2a888131 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=ea6a2a888131 author: Jiri Vanek date: Thu Jan 07 16:59:45 2016 +0100 Remove bash-specifics from top level Makefile.am The == in the test comparison is not necessary, the = test works fine. Invoke html-gen.sh with 'sh' as opposed to 'bash' since it does not require bash. No reason to require bash when it is not needed. Tested with dash and zsh installed as /bin/sh. diffstat: ChangeLog | 58 +++++++ Makefile.am | 4 +- NEWS | 4 + netx/net/sourceforge/jnlp/PluginBridge.java | 8 +- netx/net/sourceforge/jnlp/SecurityDesc.java | 6 +- netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java | 47 +----- netx/net/sourceforge/jnlp/util/UrlUtils.java | 58 +++++++ netx/net/sourceforge/nanoxml/XMLElement.java | 81 +++++++-- plugin/icedteanp/IcedTeaNPPlugin.cc | 14 +- tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java | 19 ++ tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java | 2 - tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java | 8 +- tests/netx/unit/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmationTest.java | 17 +- tests/netx/unit/net/sourceforge/jnlp/templates/EFBBBF.jnlp | 59 +++++++ tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java | 56 ++++++- 15 files changed, 350 insertions(+), 91 deletions(-) diffs (truncated from 737 to 500 lines): diff -r 78a490b19df5 -r ea6a2a888131 ChangeLog --- a/ChangeLog Wed Jan 06 17:38:47 2016 +0100 +++ b/ChangeLog Thu Jan 07 16:59:45 2016 +0100 @@ -1,3 +1,61 @@ +2016-01-07 David Cantrell + Jiri Vanek + Andrew John Hughes + + Remove bash-specifics from top level Makefile.a + * Makefile.am: (generate-docs.stamp) double == in test function replaced by single = + (stamps/netx-html-gen.stamp) call to plain bash replaced by ${SHELL} + * NEWS: mentioned PR2669 + +2016-01-07 Tiago St??rmer Daitx + Jiri Vanek + + Resolves an issue where, if IcedTea's call to NPN_GetValueForURL fails, + IcedTea-Web attempts to send uninitialized memory garbage across a pipe, which + (usually) results in an error. At this point, IcedTea gives up, but does not + inform Firefox that it has done so, and unless dom.ipc.plugins.asyncInit is + true, this causes Firefox's UI to lock up in addition to the Java component failing to load. + * plugin/icedteanp/IcedTeaNPPlugin.cc: (onsume_plugin_message) initialize len + and proxy_info. (get_proxy_info) returns correct message if + browser_functions.getvalueforurl returns error + * NEWS: mentioned PR2714 + +2016-01-07 Jiri Vanek + + Codebase resolution of jnlp-href is now aligned with oracle plugin + * netx/net/sourceforge/jnlp/PluginBridge.java: When jnlp href is used, codebase + is forced to become codebase of jnlp + * netx/net/sourceforge/jnlp/SecurityDesc.java: When file.getCodeBase() is null + then instead of NPE, codebase of file.fileLocation is used + * netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java: + stripFile and ensureSlashTail moved to UrlUtils + * netx/net/sourceforge/jnlp/util/UrlUtils.java: stripFile and ensureSlashTail + moved from UnsignedAppletTrustConfirmation + * tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java: removed empty lines + * tests/netx/unit/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmationTest.java: + adapted to moved methods + * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java: added more tests + to removeFileName and enabled accidentlay disabled getHostAndPortTest and + getPortTest + * tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: + ensured manifest attributes are off for this test + * tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java: fixed bom tests + to use proper classloader + +2016-01-07 Jiri Vanek + + BOM character now dont cause error + * netx/net/sourceforge/nanoxml/XMLElement.java: duplicated whitespace recognition + code moved to isRegularWhiteSpace. First call to scanWhitespace repalced by + call to scanLeadingWhitespace. New field BOM introduced. (scanWhitespace) + made private, and uses isRegularWhiteSpace. (scanLeadingWhitespace) new method, + same as scanWhitespacebut also skipps BOM and marks it. + * tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java: Added tests to + issue + * tests/netx/unit/net/sourceforge/jnlp/templates/EFBBBF.jnlp: new file. jnlp + file starting with bom. + * NEWS: mentioned PR2690 + 2016-01-06 James Le Cuirot Fixed typo in javadoc generation diff -r 78a490b19df5 -r ea6a2a888131 Makefile.am --- a/Makefile.am Wed Jan 06 17:38:47 2016 +0100 +++ b/Makefile.am Thu Jan 07 16:59:45 2016 +0100 @@ -546,7 +546,7 @@ $$TP_COMMAND html "$$HTML_DOCS_TARGET_DIR/$$ID" $$TP_TAIL ; \ mkdir "$$PLAIN_DOCS_TARGET_DIR/$$ID" ; \ $$TP_COMMAND plain "$$PLAIN_DOCS_TARGET_DIR/$$ID" 160 $$TP_TAIL; \ - if [ $$ID == "en" ] ; then \ + if [ $$ID = "en" ] ; then \ MAN_DESC="$$MAN_DOCS_TARGET_DIR/man1" ; \ else \ MAN_DESC="$$MAN_DOCS_TARGET_DIR/$$ID/man1" ; \ @@ -564,7 +564,7 @@ mkdir -p html-gen; \ cp AUTHORS NEWS COPYING ChangeLog html-gen/; \ export HTML_GEN_DEBUG=true; \ - bash html-gen.sh; \ + ${SHELL} html-gen.sh; \ unset HTML_GEN_DEBUG) ${INSTALL_DATA} $(NETX_SRCDIR)/../html-gen/*.html $(NETX_RESOURCE_DIR) rm -r $(NETX_SRCDIR)/../html-gen/ diff -r 78a490b19df5 -r ea6a2a888131 NEWS --- a/NEWS Wed Jan 06 17:38:47 2016 +0100 +++ b/NEWS Thu Jan 07 16:59:45 2016 +0100 @@ -15,6 +15,8 @@ * fixed DownloadService * PR2779: html-gen.sh: Don't try to call hg if .hg directory isn't present * PR2591 - IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet +* PR2690 - Can't run BOM into JNLP file +* PR2669 - remove bash-specific syntax from top level Makefile.am * comments in deployment.properties now should persists load/save * fixed bug in caching of files with query * fixed issues with recreating of existing shortcut @@ -45,6 +47,8 @@ - support for SignedBy and Principals along with existing Codebase * Plugin - RH1273691 - Escaped equals signs in deployment.properties not un-escaped when used + - PR2746 - IcedTea-Web Plugin 1.6.1: net.sourceforge.jnlp.LaunchException + - PR2714 - IcedTea-Web plugin sends uninitialized memory garbage across a pipe when NPN_GetValueForURL call fails New in release 1.6 (2015-XX-XX): * Massively improved offline abilities. Added Xoffline switch to force work without inet connection. diff -r 78a490b19df5 -r ea6a2a888131 netx/net/sourceforge/jnlp/PluginBridge.java --- a/netx/net/sourceforge/jnlp/PluginBridge.java Wed Jan 06 17:38:47 2016 +0100 +++ b/netx/net/sourceforge/jnlp/PluginBridge.java Thu Jan 07 16:59:45 2016 +0100 @@ -40,6 +40,7 @@ import net.sourceforge.jnlp.cache.UpdatePolicy; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.util.StreamUtils; +import net.sourceforge.jnlp.util.UrlUtils; import net.sourceforge.jnlp.util.logging.OutputController; import net.sourceforge.jnlp.util.replacements.BASE64Decoder; @@ -130,7 +131,10 @@ }.readStream(); } else { - jnlpFile = jnlpCreator.create(jnlp, null, defaultSettings, JNLPRuntime.getDefaultUpdatePolicy(), codeBase); + // see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2746#c3 + URL codebaseRewriter=UrlUtils.ensureSlashTail(UrlUtils.removeFileName(jnlp)); + this.codeBase = codebaseRewriter; + jnlpFile = jnlpCreator.create(jnlp, null, defaultSettings, JNLPRuntime.getDefaultUpdatePolicy(), codebaseRewriter); debugJnlp = new StreamProvider() { @Override @@ -594,7 +598,7 @@ private static String getAllPermissionsElement() { return " \n"; } - + private abstract class StreamProvider { diff -r 78a490b19df5 -r ea6a2a888131 netx/net/sourceforge/jnlp/SecurityDesc.java --- a/netx/net/sourceforge/jnlp/SecurityDesc.java Wed Jan 06 17:38:47 2016 +0100 +++ b/netx/net/sourceforge/jnlp/SecurityDesc.java Thu Jan 07 16:59:45 2016 +0100 @@ -415,7 +415,11 @@ } } try { - final URI codebase = file.getCodeBase().toURI().normalize(); + URL codebaseOriginal = file.getCodeBase(); + if (codebaseOriginal == null){ + codebaseOriginal =file.fileLocation; + } + final URI codebase = codebaseOriginal.toURI().normalize(); final URI host = getHost(codebase); final String codebaseHostUriString = host.toString(); final String urlPermissionUrlString = appendRecursiveSubdirToCodebaseHostString(codebaseHostUriString); diff -r 78a490b19df5 -r ea6a2a888131 netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java --- a/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java Wed Jan 06 17:38:47 2016 +0100 +++ b/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java Thu Jan 07 16:59:45 2016 +0100 @@ -36,7 +36,6 @@ package net.sourceforge.jnlp.security.appletextendedsecurity; -import java.net.MalformedURLException; import static net.sourceforge.jnlp.runtime.Translator.R; import java.net.URL; @@ -156,7 +155,7 @@ documentbaseRegex = UrlRegEx.quote(documentbase.toExternalForm()); // Match only this applet archiveMatches = toRelativePaths(getJars(file), file.getCodeBase().toString()); // Match only this applet } else { - documentbaseRegex = UrlRegEx.quoteAndStar(stripFile(documentbase)); // Match any from codebase and sourceFile "base" + documentbaseRegex = UrlRegEx.quoteAndStar(UrlUtils.stripFile(documentbase)); // Match any from codebase and sourceFile "base" } } @@ -247,48 +246,4 @@ } - static String stripFile(URL documentbase) { - //whenused in generation of regec, the trailing slash is very important - //see the result between http:/some.url/path.* and http:/some.url/path/.* - return ensureSlashTail(stripFileImp(documentbase)); - } - - private static String stripFileImp(URL documentbase) { - try { - String normalized = UrlUtils.normalizeUrlAndStripParams(documentbase).toExternalForm().trim(); - if (normalized.endsWith("/") || normalized.endsWith("\\")) { - return normalized; - } - URL middleway = new URL(normalized); - String file = middleway.getFile(); - int i = Math.max(file.lastIndexOf('/'), file.lastIndexOf('\\')); - if (i<0){ - return normalized; - } - String parent = file.substring(0, i+1); - String stripped = normalized.replace(file, parent); - return stripped; - } catch (Exception ex) { - OutputController.getLogger().log(ex); - return documentbase.toExternalForm(); - } - - } - - private static String ensureSlashTail(String s) { - if (s.endsWith("/")) { - return s; - } - if (s.endsWith("\\")) { - return s; - } - if (s.contains("/")) { - return s + "/"; - } - if (s.contains("\\")) { - return s + "\\"; - } - return s + "/"; - } - } diff -r 78a490b19df5 -r ea6a2a888131 netx/net/sourceforge/jnlp/util/UrlUtils.java --- a/netx/net/sourceforge/jnlp/util/UrlUtils.java Wed Jan 06 17:38:47 2016 +0100 +++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java Thu Jan 07 16:59:45 2016 +0100 @@ -346,5 +346,63 @@ public static String getHostAndPort(final URL url) { return url.getHost() + ":" + getSanitizedPort(url); } + + public static URL ensureSlashTail(URL u) { + if (u == null) { + return null; + } + String s = ensureSlashTail(u.toExternalForm()); + try { + return new URL(s); + } catch (MalformedURLException ex) { + OutputController.getLogger().log(ex); + return u; + } + + } + + public static String ensureSlashTail(String s) { + if (s.endsWith("/")) { + return s; + } + if (s.endsWith("\\")) { + return s; + } + if (s.contains("/")) { + return s + "/"; + } + if (s.contains("\\")) { + return s + "\\"; + } + return s + "/"; + } + + public static String stripFile(URL documentbase) { + //whenused in generation of regec, the trailing slash is very important + //see the result between http:/some.url/path.* and http:/some.url/path/.* + return UrlUtils.ensureSlashTail(stripFileImp(documentbase)); + } + + private static String stripFileImp(URL documentbase) { + try { + String normalized = UrlUtils.normalizeUrlAndStripParams(documentbase).toExternalForm().trim(); + if (normalized.endsWith("/") || normalized.endsWith("\\")) { + return normalized; + } + URL middleway = new URL(normalized); + String file = middleway.getFile(); + int i = Math.max(file.lastIndexOf('/'), file.lastIndexOf('\\')); + if (i < 0) { + return normalized; + } + String parent = file.substring(0, i + 1); + String stripped = normalized.replace(file, parent); + return stripped; + } catch (Exception ex) { + OutputController.getLogger().log(ex); + return documentbase.toExternalForm(); + } + + } } diff -r 78a490b19df5 -r ea6a2a888131 netx/net/sourceforge/nanoxml/XMLElement.java --- a/netx/net/sourceforge/nanoxml/XMLElement.java Wed Jan 06 17:38:47 2016 +0100 +++ b/netx/net/sourceforge/nanoxml/XMLElement.java Thu Jan 07 16:59:45 2016 +0100 @@ -195,6 +195,11 @@ * Character read too much for the comment remover. */ private char sanitizeCharReadTooMuch; + + /** + * Whether the BOM header appeared + */ + private boolean BOM = false; /** * The reader provided by the caller of the parse method. @@ -494,7 +499,7 @@ this.parserLineNr = startingLineNr; for (;;) { - char ch = this.scanWhitespace(); + char ch = this.scanLeadingWhitespace(); if (ch != '<') { throw this.expectedInput("<", ch); @@ -584,24 +589,50 @@ } } + private boolean isRegularWhiteSpace(char ch) { + switch (ch) { + case ' ': + case '\t': + case '\n': + case '\r': + return true; + default: + return false; + } + } + /** * This method scans an identifier from the current reader. * * @return the next character following the whitespace. * @throws java.io.IOException if something goes wrong */ - protected char scanWhitespace() + private char scanWhitespace() throws IOException { - for (;;) { + while(true) { char ch = this.readChar(); - switch (ch) { - case ' ': - case '\t': - case '\n': - case '\r': - break; - default: - return ch; + if (!isRegularWhiteSpace(ch)) { + return ch; + } + } + } + /** + * This method scans an leading identifier from the current reader. + * + * UNlike scanWhitespace, it skipps also BOM + * + * @return the next character following the whitespace. + * @throws java.io.IOException if something goes wrong + */ + private char scanLeadingWhitespace() + throws IOException { + while(true) { + char ch = this.readChar(); + //this is BOM , not space + if (ch == '???') { + BOM = true; + } else if (!isRegularWhiteSpace(ch)) { + return ch; } } } @@ -621,18 +652,17 @@ */ protected char scanWhitespace(StringBuffer result) throws IOException { - for (;;) { + while (true) { char ch = this.readChar(); - switch (ch) { - case ' ': - case '\t': - case '\n': - result.append(ch); - break; - case '\r': - break; - default: - return ch; + if (!isRegularWhiteSpace(ch)) { + return ch; + } else { + switch (ch) { + case ' ': + case '\t': + case '\n': + result.append(ch); + } } } } @@ -1297,4 +1327,11 @@ } } + + public boolean isBOM() { + return BOM; + } + + + } diff -r 78a490b19df5 -r ea6a2a888131 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Jan 06 17:38:47 2016 +0100 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Jan 07 16:59:45 2016 +0100 @@ -1154,13 +1154,13 @@ if (g_str_has_prefix(parts[1], "PluginProxyInfo")) { gchar* proxy = NULL; - uint32_t len; + uint32_t len = 0; gchar* decoded_url = (gchar*) calloc(strlen(parts[4]) + 1, sizeof(gchar)); IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url); PLUGIN_DEBUG("parts[0]=%s, parts[1]=%s, reference, parts[3]=%s, parts[4]=%s -- decoded_url=%s\n", parts[0], parts[1], parts[3], parts[4], decoded_url); - gchar* proxy_info; + gchar* proxy_info = NULL; proxy_info = g_strconcat ("plugin PluginProxyInfo reference ", parts[3], " ", NULL); if (get_proxy_info(decoded_url, &proxy, &len) == NPERR_NO_ERROR) @@ -1331,10 +1331,16 @@ } if (browser_functions.getvalueforurl) { - + NPError err; // As in get_cookie_info, we use the first active instance gpointer instance=getFirstInTableInstance(instance_to_id_map); - browser_functions.getvalueforurl((NPP) instance, NPNURLVProxy, siteAddr, proxy, len); + err = browser_functions.getvalueforurl((NPP) instance, NPNURLVProxy, siteAddr, proxy, len); + + if (err != NPERR_NO_ERROR) + { + *proxy = (char *) malloc(sizeof **proxy * 7); + *len = g_strlcpy(*proxy, "DIRECT", 7); + } } else { return NPERR_GENERIC_ERROR; diff -r 78a490b19df5 -r ea6a2a888131 tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java --- a/tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java Wed Jan 06 17:38:47 2016 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java Thu Jan 07 16:59:45 2016 +0100 @@ -42,7 +42,10 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.IOException; +import net.sourceforge.jnlp.annotations.Bug; import net.sourceforge.jnlp.annotations.KnownToFail; +import net.sourceforge.jnlp.util.FileUtils; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -105,5 +108,21 @@ String malformedJnlp = originalJnlp.replace("'jnlp.jnlp'", "jnlp.jnlp"); Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()), new ParserSettings(false, true, false)); } + + + @Bug(id = "PR2690") + @Test + public void testXmlBomTagSoupOff() throws ParseException { + InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream("net/sourceforge/jnlp/templates/EFBBBF.jnlp"); + Assert.assertNotNull(is); + Parser.getRootNode(is, new ParserSettings(false, true, false)); + } + + @Test + public void testXmlBomTagSoupOn() throws ParseException { + InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream("net/sourceforge/jnlp/templates/EFBBBF.jnlp"); + Assert.assertNotNull(is); + Parser.getRootNode(is, new ParserSettings(false, true, true)); + } } diff -r 78a490b19df5 -r ea6a2a888131 tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java Wed Jan 06 17:38:47 2016 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java Thu Jan 07 16:59:45 2016 +0100 @@ -520,7 +520,5 @@ String fixed = fixCommonIssues(source, true); checkIssuesFixed(fixed, true, false); } - - From bugzilla-daemon at icedtea.classpath.org Thu Jan 7 16:05:13 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 16:05:13 +0000 Subject: [Bug 2219] plugin not working on chess.com (play against computer) in IceWeasel 35.0.1 on HandyLinux (Debian) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2219 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #2 from JiriVanek --- The reason of not searching the jar were same as in 2746. JArs is loaded now. But app still fails. Investigations in progress. -- 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 7 16:09:23 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 16:09:23 +0000 Subject: [Bug 2219] plugin not working on chess.com (play against computer) in IceWeasel 35.0.1 on HandyLinux (Debian) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2219 --- Comment #3 from JiriVanek --- Now I got java.lang.ClassNotFoundException: com.chess.chessboard.MoveListener ????at net.sourceforge.jnlp.runtime.JNLPClassLoader.loadClassExt(JNLPClassLoader.java:1716) ????at net.sourceforge.jnlp.runtime.JNLPClassLoader.loadClass(JNLPClassLoader.java:1514) ????at java.lang.ClassLoader.defineClass1(Native Method) ????at java.lang.ClassLoader.defineClass(ClassLoader.java:760) ????at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ????at java.net.URLClassLoader.defineClass(URLClassLoader.java:467) ????at java.net.URLClassLoader.access$100(URLClassLoader.java:73) ????at java.net.URLClassLoader$1.run(URLClassLoader.java:368) ????at java.net.URLClassLoader$1.run(URLClassLoader.java:362) ????at java.security.AccessController.doPrivileged(Native Method) ????at java.net.URLClassLoader.findClass(URLClassLoader.java:361) ????at net.sourceforge.jnlp.runtime.JNLPClassLoader.access$1701(JNLPClassLoader.java:103) ????at net.sourceforge.jnlp.runtime.JNLPClassLoader$5.run(JNLPClassLoader.java:1661) ? ??at net.sourceforge.jnlp.runtime.JNLPClassLoader$5.run(JNLPClassLoader.java:1658) ? ??at java.security.AccessController.doPrivileged(Native Method) ????at net.sourceforge.jnlp.runtime.JNLPClassLoader.findClass(JNLPClassLoader.java:1657) ????at net.sourceforge.jnlp.runtime.JNLPClassLoader.loadClassExt(JNLPClassLoader.java:1694) ????at net.sourceforge.jnlp.runtime.JNLPClassLoader.loadClass(JNLPClassLoader.java:1493) ????at java.lang.Class.getDeclaredConstructors0(Native Method) ????at java.lang.Class.privateGetDeclaredConstructors(Class.java:2671) ????at java.lang.Class.getConstructor0(Class.java:3075) ????at java.lang.Class.newInstance(Class.java:412) ????at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:751) ????at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:683) ????at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:930) And indeeed.. the class i missing in the jar. -- 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 7 16:09:51 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 16:09:51 +0000 Subject: [Bug 2219] plugin not working on chess.com (play against computer) in IceWeasel 35.0.1 on HandyLinux (Debian) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2219 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Version|1.4 |hg -- 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 7 16:14:48 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 16:14:48 +0000 Subject: [Bug 2781] CACAO - typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |gnu.andrew at redhat.com Target Milestone|--- |2.6.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 bugzilla-daemon at icedtea.classpath.org Thu Jan 7 18:13:15 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 07 Jan 2016 18:13:15 +0000 Subject: [Bug 2656] Opening a CSS file in NetBeans editor and typing anything crashes NetBeans immediately In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2656 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|critical |normal --- Comment #1 from Andrew John Hughes --- Please include the crash information and the hs_*.log file that is created by the JVM. -- 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 8 09:03:57 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 08 Jan 2016 09:03:57 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #1 from JiriVanek --- Hello. This application now works for me with 1.6. Does it works also for you? -- 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 Fri Jan 8 11:06:50 2016 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 08 Jan 2016 11:06:50 +0000 Subject: /hg/gfx-test: Eight new tests added into BitBltUsingBgColor. Message-ID: changeset 7300b085de09 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=7300b085de09 author: Pavel Tisnovsky date: Fri Jan 08 12:10:16 2016 +0100 Eight new tests added into BitBltUsingBgColor. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 120 +++++++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) diffs (142 lines): diff -r 6e2bcc48fba8 -r 7300b085de09 ChangeLog --- a/ChangeLog Thu Jan 07 15:00:41 2016 +0100 +++ b/ChangeLog Fri Jan 08 12:10:16 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-08 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Eight new tests added into BitBltUsingBgColor. + 2016-01-07 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 6e2bcc48fba8 -r 7300b085de09 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Jan 07 15:00:41 2016 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Fri Jan 08 12:10:16 2016 +0100 @@ -14776,6 +14776,126 @@ } /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGRbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR(image, graphics2d, Color.white); + } + + /** * Entry point to the test suite. * * @param args not used in this case From jvanek at redhat.com Fri Jan 8 12:35:11 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 8 Jan 2016 13:35:11 +0100 Subject: [rfc][icedtea-web] Uptream metada files Message-ID: <568FACFF.7090600@redhat.com> Hello! I have several files in fedora repo: Two maven fragments: 4.0.0 net.sourceforge.jnlp %{name} %{version} EOF cat < $RPM_BUILD_ROOT/%{_mavenpomdir}/%{name}-plugin.pom 4.0.0 sun.applet %{name}-plugin %{version} EOF Anf two attached for (not only gnome-)software. Those are using classapth resources as abse anyway. I would like to push them all four two usptream For 1.6 only as plain files occuring in release tarball And for 1.7 as also installed stuff. Thoughts? J. -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea-web.metainfo.xml Type: text/xml Size: 570 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea-web-javaws.appdata.xml Type: text/xml Size: 1768 bytes Desc: not available URL: From jvanek at redhat.com Fri Jan 8 12:37:20 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 8 Jan 2016 13:37:20 +0100 Subject: [rfc][icedtea-web] add GenericName to desktop shortcuts Message-ID: <568FAD80.2050108@redhat.com> Next to -rw-rw-r-- 1 jvanek jvanek 554 Jan 8 09:46 itweb-settings.desktop.in Name=IcedTea-Web Control Panel Name[de]=IcedTea-Web Systemsteuerung Name[pl]=Panel sterowania IcedTea-Web Name[cs]=Ovl?dac? panel IcedTea-Web -rw-rw-r-- 1 jvanek jvanek 228 Jan 8 09:46 javaws.desktop.in Name=IcedTea Web Start -rw-rw-r-- 1 jvanek jvanek 260 Jan 8 09:46 policyeditor.desktop.in Name=IcedTea-Web Policy Editor It will be added GenericName=Control Panel GenericName=Java Web Start GenericName=Policy Tool http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2599#c5 Ok? From enevill at icedtea.classpath.org Fri Jan 8 20:04:14 2016 From: enevill at icedtea.classpath.org (enevill at icedtea.classpath.org) Date: Fri, 08 Jan 2016 20:04:14 +0000 Subject: /hg/icedtea7-forest/hotspot: Summary: Add support for large code... Message-ID: changeset f9b06d6bb411 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=f9b06d6bb411 author: enevill date: Thu Dec 17 15:07:46 2015 +0000 Summary: Add support for large code cache Contributed-by: aph at redhat.com, edward.nevill at gmail.com diffstat: src/cpu/aarch64/vm/aarch64.ad | 56 +++---- src/cpu/aarch64/vm/assembler_aarch64.cpp | 139 ++++++++++++++++++-- src/cpu/aarch64/vm/assembler_aarch64.hpp | 66 +++++++-- src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp | 28 ++-- src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 48 ++---- src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp | 8 +- src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp | 4 +- src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp | 14 +- src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp | 4 + src/cpu/aarch64/vm/globals_aarch64.hpp | 7 +- src/cpu/aarch64/vm/icBuffer_aarch64.cpp | 21 +- src/cpu/aarch64/vm/methodHandles_aarch64.cpp | 2 +- src/cpu/aarch64/vm/nativeInst_aarch64.cpp | 141 ++++++++++++++++---- src/cpu/aarch64/vm/nativeInst_aarch64.hpp | 74 ++++++++-- src/cpu/aarch64/vm/relocInfo_aarch64.cpp | 29 +++- src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp | 14 +- src/cpu/aarch64/vm/stubGenerator_aarch64.cpp | 2 +- src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp | 2 +- src/cpu/aarch64/vm/vm_version_aarch64.cpp | 4 + src/cpu/aarch64/vm/vtableStubs_aarch64.cpp | 2 +- src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 9 +- src/share/vm/code/compiledIC.cpp | 2 +- src/share/vm/runtime/arguments.cpp | 6 +- src/share/vm/utilities/globalDefinitions.hpp | 5 + 24 files changed, 490 insertions(+), 197 deletions(-) diffs (truncated from 1576 to 500 lines): diff -r eeb4a3ec4563 -r f9b06d6bb411 src/cpu/aarch64/vm/aarch64.ad --- a/src/cpu/aarch64/vm/aarch64.ad Tue Nov 24 09:02:26 2015 +0000 +++ b/src/cpu/aarch64/vm/aarch64.ad Thu Dec 17 15:07:46 2015 +0000 @@ -775,16 +775,18 @@ int MachCallRuntimeNode::ret_addr_offset() { // for generated stubs the call will be - // bl(addr) + // far_call(addr) // for real runtime callouts it iwll be // mov(rscratch1, RuntimeAddress(addr) // blrt rscratch1 CodeBlob *cb = CodeCache::find_blob(_entry_point); if (cb) { - return 4; + return MacroAssembler::far_branch_size(); } else { // A 48-bit address. See movptr(). - return 16; + // then a blrt + // return 16; + return 4 * NativeInstruction::instruction_size; } } @@ -1361,7 +1363,7 @@ uint size_java_to_interp() { // ob jdk7 we only need a mov oop and a branch - return 2 * NativeInstruction::instruction_size; + return 7 * NativeInstruction::instruction_size; } // Offset from start of compiled java to interpreter stub to the load @@ -1395,7 +1397,8 @@ // pool oop and GC overwrites the patch with movk/z 0x0000 again __ movoop(rmethod, (jobject) NULL); // This is recognized as unresolved by relocs/nativeinst/ic code - __ b(__ pc()); + __ movptr(rscratch1, 0); + __ br(rscratch1); assert((__ offset() - offset) <= (int)size_java_to_interp(), "stub too big"); // Update current stubs pointer and restore insts_end. @@ -1433,13 +1436,12 @@ // This is the unverified entry point. MacroAssembler _masm(&cbuf); - // no need to worry about 4-byte of br alignment on AArch64 __ cmp_klass(j_rarg0, rscratch2, rscratch1); Label skip; // TODO // can we avoid this skip and still use a reloc? __ br(Assembler::EQ, skip); - __ b(RuntimeAddress(SharedRuntime::get_ic_miss_stub())); + __ far_jump(RuntimeAddress(SharedRuntime::get_ic_miss_stub())); __ bind(skip); } @@ -1454,8 +1456,7 @@ uint size_exception_handler() { - // count up to 4 movz/n/k instructions and one branch instruction - return 5 * NativeInstruction::instruction_size; + return MacroAssembler::far_branch_size(); } // Emit exception handler code. @@ -1470,7 +1471,7 @@ __ start_a_stub(size_exception_handler()); if (base == NULL) return 0; // CodeBuffer::expand failed int offset = __ offset(); - __ b(RuntimeAddress(OptoRuntime::exception_blob()->entry_point())); + __ far_jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point())); assert(__ offset() - offset <= (int) size_exception_handler(), "overflow"); __ end_a_stub(); return offset; @@ -1478,8 +1479,8 @@ uint size_deopt_handler() { - // count one adr and one branch instruction - return 2 * NativeInstruction::instruction_size; + // count one adr and one far branch instruction + return NativeInstruction::instruction_size + MacroAssembler::far_branch_size(); } // Emit deopt handler code. @@ -1494,8 +1495,7 @@ int offset = __ offset(); __ adr(lr, __ pc()); - // should we load this into rscratch1 and use a br? - __ b(RuntimeAddress(SharedRuntime::deopt_blob()->unpack())); + __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack())); assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow"); __ end_a_stub(); @@ -2802,11 +2802,11 @@ address addr = (address)$meth$$method; if (!_method) { // A call to a runtime wrapper, e.g. new, new_typeArray_Java, uncommon_trap. - __ bl(Address(addr, relocInfo::runtime_call_type)); + __ trampoline_call(Address(addr, relocInfo::runtime_call_type), &cbuf); } else if (_optimized_virtual) { - __ bl(Address(addr, relocInfo::opt_virtual_call_type)); + __ trampoline_call(Address(addr, relocInfo::opt_virtual_call_type), &cbuf); } else { - __ bl(Address(addr, relocInfo::static_call_type)); + __ trampoline_call(Address(addr, relocInfo::static_call_type), &cbuf); } if (_method) { @@ -2818,22 +2818,19 @@ enc_class aarch64_enc_java_handle_call(method meth) %{ MacroAssembler _masm(&cbuf); - // TODO fixme - // this is supposed to preserve and restore SP around the call - // need to check it works + // RFP is preserved across all calls, even compiled calls. + // Use it to preserve SP. __ mov(rfp, sp); address mark = __ pc(); address addr = (address)$meth$$method; if (!_method) { - // TODO check this - // think we are calling generated Java here not x86 // A call to a runtime wrapper, e.g. new, new_typeArray_Java, uncommon_trap. - __ bl(Address(addr, relocInfo::runtime_call_type)); + __ trampoline_call(Address(addr, relocInfo::runtime_call_type), &cbuf); } else if (_optimized_virtual) { - __ bl(Address(addr, relocInfo::opt_virtual_call_type)); + __ trampoline_call(Address(addr, relocInfo::opt_virtual_call_type), &cbuf); } else { - __ bl(Address(addr, relocInfo::static_call_type)); + __ trampoline_call(Address(addr, relocInfo::static_call_type), &cbuf); } if (_method) { @@ -2848,10 +2845,7 @@ enc_class aarch64_enc_java_dynamic_call(method meth) %{ MacroAssembler _masm(&cbuf); address entry = (address)$meth$$method; - RelocationHolder rh = virtual_call_Relocation::spec(__ pc()); - // we use movoop here as per emit_java_to_interp and c1's ic_call - __ movoop(rscratch2, (jobject)Universe::non_oop_word(), /*immediate*/true); - __ bl(Address(entry, rh)); + __ ic_call(entry); %} enc_class aarch64_enc_call_epilog() %{ @@ -2872,7 +2866,7 @@ address entry = (address)$meth$$method; CodeBlob *cb = CodeCache::find_blob(entry); if (cb) { - __ bl(Address(entry)); + __ trampoline_call(Address(entry, relocInfo::runtime_call_type)); } else { int gpcnt; int fpcnt; @@ -2885,7 +2879,7 @@ enc_class aarch64_enc_rethrow() %{ MacroAssembler _masm(&cbuf); - __ b(RuntimeAddress(OptoRuntime::rethrow_stub())); + __ far_jump(RuntimeAddress(OptoRuntime::rethrow_stub())); %} enc_class aarch64_enc_ret() %{ diff -r eeb4a3ec4563 -r f9b06d6bb411 src/cpu/aarch64/vm/assembler_aarch64.cpp --- a/src/cpu/aarch64/vm/assembler_aarch64.cpp Tue Nov 24 09:02:26 2015 +0000 +++ b/src/cpu/aarch64/vm/assembler_aarch64.cpp Thu Dec 17 15:07:46 2015 +0000 @@ -1369,7 +1369,6 @@ if (L.is_bound()) { br(cc, target(L)); } else { - InstructionMark im(this); L.add_patch_at(code(), locator()); br(cc, pc()); } @@ -1380,7 +1379,6 @@ if (L.is_bound()) { (this->*insn)(target(L)); } else { - InstructionMark im(this); L.add_patch_at(code(), locator()); (this->*insn)(pc()); } @@ -1391,7 +1389,6 @@ if (L.is_bound()) { (this->*insn)(r, target(L)); } else { - InstructionMark im(this); L.add_patch_at(code(), locator()); (this->*insn)(r, pc()); } @@ -1402,7 +1399,6 @@ if (L.is_bound()) { (this->*insn)(r, bitpos, target(L)); } else { - InstructionMark im(this); L.add_patch_at(code(), locator()); (this->*insn)(r, bitpos, pc()); } @@ -1412,7 +1408,6 @@ if (L.is_bound()) { (this->*insn)(target(L), op); } else { - InstructionMark im(this); L.add_patch_at(code(), locator()); (this->*insn)(pc(), op); } @@ -1653,8 +1648,8 @@ Instruction_aarch64::patch(branch, 20, 5, dest & 0xffff); Instruction_aarch64::patch(branch+4, 20, 5, (dest >>= 16) & 0xffff); Instruction_aarch64::patch(branch+8, 20, 5, (dest >>= 16) & 0xffff); - assert(pd_call_destination(branch) == target, "should be"); - instructions = 2; + assert(target_addr_for_insn(branch) == target, "should be"); + instructions = 3; } else if (Instruction_aarch64::extract(insn, 31, 22) == 0b1011100101 && Instruction_aarch64::extract(insn, 4, 0) == 0b11111) { // nothing to do @@ -1861,6 +1856,42 @@ } } +void MacroAssembler::far_call(Address entry, CodeBuffer *cbuf, Register tmp) { + assert(ReservedCodeCacheSize < 4*G, "branch out of range"); + assert(CodeCache::find_blob(entry.target()) != NULL, + "destination of far call not found in code cache"); + if (far_branches()) { + unsigned long offset; + // We can use ADRP here because we know that the total size of + // the code cache cannot exceed 2Gb. + adrp(tmp, entry, offset); + add(tmp, tmp, offset); + if (cbuf) cbuf->set_insts_mark(); + blr(tmp); + } else { + if (cbuf) cbuf->set_insts_mark(); + bl(entry); + } +} + +void MacroAssembler::far_jump(Address entry, CodeBuffer *cbuf, Register tmp) { + assert(ReservedCodeCacheSize < 4*G, "branch out of range"); + assert(CodeCache::find_blob(entry.target()) != NULL, + "destination of far call not found in code cache"); + if (far_branches()) { + unsigned long offset; + // We can use ADRP here because we know that the total size of + // the code cache cannot exceed 2Gb. + adrp(tmp, entry, offset); + add(tmp, tmp, offset); + if (cbuf) cbuf->set_insts_mark(); + br(tmp); + } else { + if (cbuf) cbuf->set_insts_mark(); + b(entry); + } +} + int MacroAssembler::biased_locking_enter(Register lock_reg, Register obj_reg, Register swap_reg, @@ -2135,14 +2166,93 @@ call_VM_base(oop_result, noreg, noreg, entry_point, number_of_arguments, check_exceptions); } -void MacroAssembler::call(Address entry) { - if (true // reachable(entry) - ) { - bl(entry); +// Maybe emit a call via a trampoline. If the code cache is small +// trampolines won't be emitted. + +void MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) { + assert(entry.rspec().type() == relocInfo::runtime_call_type + || entry.rspec().type() == relocInfo::opt_virtual_call_type + || entry.rspec().type() == relocInfo::static_call_type + || entry.rspec().type() == relocInfo::virtual_call_type, "wrong reloc type"); + + unsigned int start_offset = offset(); +#ifdef COMPILER2 + if (far_branches() && !Compile::current()->in_scratch_emit_size()) { + emit_trampoline_stub(offset(), entry.target()); + } +#endif + + if (cbuf) cbuf->set_insts_mark(); + relocate(entry.rspec()); +#ifdef COMPILER2 + if (!far_branches()) { + bl(entry.target()); } else { - lea(rscratch1, entry); - blr(rscratch1); + bl(pc()); } +#else + bl(entry.target()); +#endif +} + + +// Emit a trampoline stub for a call to a target which is too far away. +// +// code sequences: +// +// call-site: +// branch-and-link to or +// +// Related trampoline stub for this call site in the stub section: +// load the call target from the constant pool +// branch (LR still points to the call site above) + +void MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset, + address dest) { +#ifdef COMPILER2 + address stub = start_a_stub(Compile::MAX_stubs_size/2); + if (stub == NULL) { + start_a_stub(Compile::MAX_stubs_size/2); + Compile::current()->env()->record_out_of_memory_failure(); + return; + } + + // Create a trampoline stub relocation which relates this trampoline stub + // with the call instruction at insts_call_instruction_offset in the + // instructions code-section. + align(wordSize); + relocate(trampoline_stub_Relocation::spec(code()->insts()->start() + + insts_call_instruction_offset)); + const int stub_start_offset = offset(); + + // Now, create the trampoline stub's code: + // - load the call + // - call + Label target; + ldr(rscratch1, target); + br(rscratch1); + bind(target); + assert(offset() - stub_start_offset == NativeCallTrampolineStub::data_offset, + "should be"); + emit_long64((int64_t)dest); + + const address stub_start_addr = addr_at(stub_start_offset); + + assert(is_NativeCallTrampolineStub_at(stub_start_addr), "doesn't look like a trampoline"); + + end_a_stub(); +#else + ShouldNotReachHere(); +#endif +} + +void MacroAssembler::ic_call(address entry) { + RelocationHolder rh = virtual_call_Relocation::spec(pc()); + // address const_ptr = long_constant((jlong)Universe::non_oop_word()); + // unsigned long offset; + // ldr_constant(rscratch2, const_ptr); + movoop(rscratch2, (jobject)Universe::non_oop_word(), /*immediate*/true); + trampoline_call(Address(entry, rh)); } // Implementation of call_VM versions @@ -2806,8 +2916,7 @@ // public methods void MacroAssembler::mov(Register r, Address dest) { - InstructionMark im(this); - code_section()->relocate(inst_mark(), dest.rspec()); + code_section()->relocate(pc(), dest.rspec()); u_int64_t imm64 = (u_int64_t)dest.target(); movptr(r, imm64); } diff -r eeb4a3ec4563 -r f9b06d6bb411 src/cpu/aarch64/vm/assembler_aarch64.hpp --- a/src/cpu/aarch64/vm/assembler_aarch64.hpp Tue Nov 24 09:02:26 2015 +0000 +++ b/src/cpu/aarch64/vm/assembler_aarch64.hpp Thu Dec 17 15:07:46 2015 +0000 @@ -845,16 +845,28 @@ #undef INSN + // The maximum range of a branch is fixed for the AArch64 + // architecture. In debug mode we shrink it in order to test + // trampolines, but not so small that branches in the interpreter + // are out of range. + static const unsigned long branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M); + + static bool reachable_from_branch_at(address branch, address target) { + return uabs(target - branch) < branch_range; + } + // Unconditional branch (immediate) -#define INSN(NAME, opcode) \ - void NAME(address dest) { \ - starti; \ - long offset = (dest - pc()) >> 2; \ - f(opcode, 31), f(0b00101, 30, 26), sf(offset, 25, 0); \ - } \ - void NAME(Label &L) { \ - wrap_label(L, &Assembler::NAME); \ - } \ + +#define INSN(NAME, opcode) \ + void NAME(address dest) { \ + starti; \ + long offset = (dest - pc()) >> 2; \ + DEBUG_ONLY(assert(reachable_from_branch_at(pc(), dest), "debug only")); \ + f(opcode, 31), f(0b00101, 30, 26), sf(offset, 25, 0); \ + } \ + void NAME(Label &L) { \ + wrap_label(L, &Assembler::NAME); \ + } \ void NAME(const Address &dest); INSN(b, 0); @@ -2741,6 +2753,10 @@ static bool needs_explicit_null_check(intptr_t offset); static address target_addr_for_insn(address insn_addr, unsigned insn); + static address target_addr_for_insn(address insn_addr) { + unsigned insn = *(unsigned*)insn_addr; + return target_addr_for_insn(insn_addr, insn); + } // Required platform-specific helpers for Label::patch_instructions. // They _shadow_ the declarations in AbstractAssembler, which are undefined. @@ -2749,8 +2765,7 @@ pd_patch_instruction_size (branch, target); } static address pd_call_destination(address branch) { - unsigned insn = *(unsigned*)branch; - return target_addr_for_insn(branch, insn); + return target_addr_for_insn(branch); } #ifndef PRODUCT static void pd_print_patched_instruction(address branch); @@ -2758,6 +2773,8 @@ static int patch_oop(address insn_addr, address o); + void emit_trampoline_stub(int insts_call_instruction_offset, address target); + // The following 4 methods return the offset of the appropriate move instruction // Support for fast byte/short loading with zero extension (depending on particular CPU) @@ -3265,12 +3282,27 @@ // Calls - // void call(Label& L, relocInfo::relocType rtype); - - // NOTE: this call tranfers to the effective address of entry NOT - // the address contained by entry. This is because this is more natural - // for jumps/calls. - void call(Address entry); + void trampoline_call(Address entry, CodeBuffer *cbuf = NULL); + + static bool far_branches() { + return ReservedCodeCacheSize > branch_range; + } + + // Jumps that can reach anywhere in the code cache. + // Trashes tmp. + void far_call(Address entry, CodeBuffer *cbuf = NULL, Register tmp = rscratch1); + void far_jump(Address entry, CodeBuffer *cbuf = NULL, Register tmp = rscratch1); + + static int far_branch_size() { + if (far_branches()) { + return 3 * 4; // adrp, add, br + } else { + return 4; + } + } + + // Emit the CompiledIC call idiom + void ic_call(address entry); // Jumps diff -r eeb4a3ec4563 -r f9b06d6bb411 src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp --- a/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp Tue Nov 24 09:02:26 2015 +0000 +++ b/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp Thu Dec 17 15:07:46 2015 +0000 @@ -115,7 +115,7 @@ __ bind(_entry); ce->store_parameter(_method->as_register(), 1); ce->store_parameter(_bci, 0); - __ call(RuntimeAddress(Runtime1::entry_for(Runtime1::counter_overflow_id))); + __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::counter_overflow_id))); ce->add_call_info_here(_info); ce->verify_oop_map(_info); __ b(_continuation); @@ -143,7 +143,7 @@ } else { stub_id = Runtime1::throw_range_check_failed_id; } From bugzilla-daemon at icedtea.classpath.org Sat Jan 9 23:30:39 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 09 Jan 2016 23:30:39 +0000 Subject: [Bug 2782] New: CACAO - Internal compiler error: java.lang.ArrayIndexOutOfBoundsException (ECJ race condition) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2782 Bug ID: 2782 Summary: CACAO - Internal compiler error: java.lang.ArrayIndexOutOfBoundsException (ECJ race condition) Product: IcedTea Version: 2.6.3 Hardware: ppc OS: Linux Status: NEW Severity: normal Priority: P5 Component: CACAO Assignee: stefan at complang.tuwien.ac.at Reporter: chewi at gentoo.org CC: unassigned at icedtea.classpath.org, xerxes at zafena.se When trying to compile gnu-classpath 0.98 (and probably 0.99, haven't tried) with any version of ECJ (3.7, 4.2, 4.4, 4.5, 4.6M4), I get output like the following from a CACAO-based icedtea. 1. ERROR in /var/tmp/portage/dev-java/gnu-classpath-0.98-r4/work/classpath-0.98/org/omg/CORBA/DynEnum.java (at line 0) /* DynEnum.java -- ^ Internal compiler error: java.lang.ArrayIndexOutOfBoundsException: 45 at java.lang.Throwable.fillInStackTrace(Throwable.java:783) I know it's a race condition because it works if I manually perform the compilation under "taskset -c 0". I'm pretty sure it's a CACAO problem because it doesn't happen with a Zero-based icedtea, IBM's JVM, or a native ECJ built with GCJ. It also happens with icedtea 1.13.9 so I don't believe it's a recent CACAO 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 Sat Jan 9 23:32:30 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 09 Jan 2016 23:32:30 +0000 Subject: [Bug 2782] CACAO - Internal compiler error: java.lang.ArrayIndexOutOfBoundsException (ECJ race condition) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2782 --- Comment #1 from James Le Cuirot --- Forgot to add that this only happens on ppc32. ppc64 seems fine. -- 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 11 12:31:50 2016 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 11 Jan 2016 12:31:50 +0000 Subject: /hg/gfx-test: Eight new tests added into BitBltUsingBgColor. Message-ID: changeset 33467bb51622 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=33467bb51622 author: Pavel Tisnovsky date: Mon Jan 11 13:35:17 2016 +0100 Eight new tests added into BitBltUsingBgColor. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 120 +++++++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) diffs (142 lines): diff -r 7300b085de09 -r 33467bb51622 ChangeLog --- a/ChangeLog Fri Jan 08 12:10:16 2016 +0100 +++ b/ChangeLog Mon Jan 11 13:35:17 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-11 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Eight new tests added into BitBltUsingBgColor. + 2016-01-08 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 7300b085de09 -r 33467bb51622 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Fri Jan 08 12:10:16 2016 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Mon Jan 11 13:35:17 2016 +0100 @@ -14896,6 +14896,126 @@ } /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGR_Pre_backgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGR_Pre_backgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGR_Pre_backgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGR_Pre_backgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGR_Pre_backgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGR_Pre_backgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGR_Pre_backgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_Pre}. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageType4ByteABGR_Pre_backgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageType4ByteABGR_Pre(image, graphics2d, Color.white); + } + + /** * Entry point to the test suite. * * @param args not used in this case From bugzilla-daemon at icedtea.classpath.org Mon Jan 11 13:28:20 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 13:28:20 +0000 Subject: [Bug 2219] plugin not working on chess.com (play against computer) in IceWeasel 35.0.1 on HandyLinux (Debian) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2219 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |WONTFIX --- Comment #4 from JiriVanek --- So I had debugged quite a lot. And unluckily, the results are really bad. I was not able to make it work, and indeed, it is running in Proprietary plugin. I don't know how it is possible that it is running in oracle plugin. Proprietary plugin is containig a lot of copypasted and hacekd code form java (and so overriding standard library). I belive this is case when it can not be fixed without such approach. I'm going to close this, because I did not found way how to fix this without copypasting classloading logic from jdk and changing it. However, I belive only small changes in chess' code will make it work. Something like if (isApplet()) then { donUseClassesMissingInAppletJar() } Or to add com.chess.chessboard.MoveListener class (and maybe few more as proprietary plugin was compalining baout more missing classes, but somehow survived missing of MoveListener) Also - they are announcing leaving of applet technlogy soon, but still shipping applet with missing classes .. thats shame. On contrary I agree that ITW should survive such an error (and jsut let the application die). But - it usually does. -- 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 11 14:07:22 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 14:07:22 +0000 Subject: [Bug 2461] Problem with Marvinsketch In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2461 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #1 from JiriVanek --- Hello, this is working for me. theirs javascript is a bit creepy, but when you use javaws https://marvin-demo.chemaxon.com/marvin/examples/webstart/msketch.jnlp or javaws https://marvin-demo.chemaxon.com/marvin/examples/webstart/mview.jnlp both are working fine. With this result, you may try to contact marvin developers,so they can revisit the javascript they are using (firebug was quite crazy from it) Feel free to reopen if there is something more what cen be fixed in ITW for this case. -- 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 11 14:09:52 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 14:09:52 +0000 Subject: [Bug 2143] flyordie.com In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2143 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #2 from JiriVanek --- Not able to reproduce from stack trace and flyordie.com. Closing for half an year inactivity. -- 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 11 14:10:59 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 14:10:59 +0000 Subject: [Bug 2092] Error report: An exception has occurred In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2092 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #1 from JiriVanek --- Hello. Can you pelase provide where/how I can reproducer this? Or is it already working with 1.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 Mon Jan 11 14:12:15 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 14:12:15 +0000 Subject: [Bug 2076] XDG configuration spec support In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2076 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from JiriVanek --- ITW is runnng on XDG spec sinc 1.5. If the target was really OpenJDK, bug Oracle please. -- 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 Mon Jan 11 16:25:20 2016 From: aazores at redhat.com (Andrew Azores) Date: Mon, 11 Jan 2016 11:25:20 -0500 Subject: [rfc][icedtea-web] add GenericName to desktop shortcuts In-Reply-To: <568FAD80.2050108@redhat.com> References: <568FAD80.2050108@redhat.com> Message-ID: <5693D770.5080105@redhat.com> On 08/01/16 07:37 AM, Jiri Vanek wrote: > Next to > -rw-rw-r-- 1 jvanek jvanek 554 Jan 8 09:46 itweb-settings.desktop.in > Name=IcedTea-Web Control Panel > Name[de]=IcedTea-Web Systemsteuerung > Name[pl]=Panel sterowania IcedTea-Web > Name[cs]=Ovl?dac? panel IcedTea-Web > -rw-rw-r-- 1 jvanek jvanek 228 Jan 8 09:46 javaws.desktop.in > Name=IcedTea Web Start > -rw-rw-r-- 1 jvanek jvanek 260 Jan 8 09:46 policyeditor.desktop.in > Name=IcedTea-Web Policy Editor > > It will be added > GenericName=Control Panel > GenericName=Java Web Start > GenericName=Policy Tool > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2599#c5 > > > Ok? Yea, looks OK I think. -- Thanks, Andrew Azores From bugzilla-daemon at icedtea.classpath.org Mon Jan 11 16:51:44 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 16:51:44 +0000 Subject: [Bug 2651] A fatal error has been detected by the Java Runtime Environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2651 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|FIXED |REMIND -- 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 11 16:52:47 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 16:52:47 +0000 Subject: [Bug 2650] Crash on opening Maltego In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2650 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Component|Licensing |IcedTea Version|8-hg |2.6.1 Severity|critical |normal --- Comment #1 from Andrew John Hughes --- The second one you posted is from the proprietary Oracle JVM. -- 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 11 16:54:28 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 16:54:28 +0000 Subject: [Bug 2650] Crash on opening Maltego In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2650 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #2 from Andrew John Hughes --- This looks the same as bug 2651. *** This bug has been marked as a duplicate of bug 2651 *** -- 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 11 16:54:28 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 16:54:28 +0000 Subject: [Bug 2651] A fatal error has been detected by the Java Runtime Environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2651 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |wakanda_gm at outlook.com --- Comment #5 from Andrew John Hughes --- *** Bug 2650 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 Mon Jan 11 16:55:48 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 16:55:48 +0000 Subject: [Bug 2648] NetBeans crashes on start In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2648 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #2 from Andrew John Hughes --- This seems different. The crash is in the accessibility toolkit (Atk) used by Gtk+. -- 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 11 16:56:09 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 16:56:09 +0000 Subject: [Bug 2648] NetBeans crashes on start In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2648 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |2.6.1 Severity|critical |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 Mon Jan 11 17:51:19 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 17:51:19 +0000 Subject: [Bug 2086] Failed to write core dump. Core dumps have been disabled. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2086 --- Comment #9 from Arnaud LE CAM --- (In reply to Andrew John Hughes from comment #8) > What version of IcedTea are you using? from comment #7 (attachment 1426) : # JRE version: OpenJDK Runtime Environment (7.0_85-b01) (build 1.7.0_85-b01) # Java VM: OpenJDK 64-Bit Server VM (24.85-b03 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea 2.6.1 from comment #5 (attachment 1351) : # JRE version: OpenJDK Runtime Environment (7.0_79-b14) (build 1.7.0_79-b14) # Java VM: OpenJDK 64-Bit Server VM (24.79-b02 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea 2.5.5 -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Mon Jan 11 18:26:24 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 11 Jan 2016 18:26:24 +0000 Subject: /hg/icedtea7-forest/hotspot: 2 new changesets Message-ID: changeset cfa5486d930e in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=cfa5486d930e author: andrew date: Fri Nov 13 04:57:20 2015 +0000 PR2683: AArch64 port has broken Zero on AArch64 changeset bd546c6e4aa5 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=bd546c6e4aa5 author: andrew date: Mon Jan 11 18:14:16 2016 +0000 Merge diffstat: src/cpu/aarch64/vm/aarch64.ad | 56 +++---- src/cpu/aarch64/vm/assembler_aarch64.cpp | 139 ++++++++++++++++++-- src/cpu/aarch64/vm/assembler_aarch64.hpp | 66 +++++++-- src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp | 28 ++-- src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 48 ++---- src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp | 8 +- src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp | 4 +- src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp | 14 +- src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp | 4 + src/cpu/aarch64/vm/globals_aarch64.hpp | 7 +- src/cpu/aarch64/vm/icBuffer_aarch64.cpp | 21 +- src/cpu/aarch64/vm/methodHandles_aarch64.cpp | 2 +- src/cpu/aarch64/vm/nativeInst_aarch64.cpp | 141 ++++++++++++++++---- src/cpu/aarch64/vm/nativeInst_aarch64.hpp | 74 ++++++++-- src/cpu/aarch64/vm/relocInfo_aarch64.cpp | 29 +++- src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp | 14 +- src/cpu/aarch64/vm/stubGenerator_aarch64.cpp | 2 +- src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp | 2 +- src/cpu/aarch64/vm/vm_version_aarch64.cpp | 4 + src/cpu/aarch64/vm/vtableStubs_aarch64.cpp | 2 +- src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 9 +- src/share/vm/code/compiledIC.cpp | 2 +- src/share/vm/runtime/arguments.cpp | 6 +- src/share/vm/runtime/vmStructs.cpp | 4 +- src/share/vm/utilities/globalDefinitions.hpp | 5 + 25 files changed, 492 insertions(+), 199 deletions(-) diffs (truncated from 1592 to 500 lines): diff -r eeb4a3ec4563 -r bd546c6e4aa5 src/cpu/aarch64/vm/aarch64.ad --- a/src/cpu/aarch64/vm/aarch64.ad Tue Nov 24 09:02:26 2015 +0000 +++ b/src/cpu/aarch64/vm/aarch64.ad Mon Jan 11 18:14:16 2016 +0000 @@ -775,16 +775,18 @@ int MachCallRuntimeNode::ret_addr_offset() { // for generated stubs the call will be - // bl(addr) + // far_call(addr) // for real runtime callouts it iwll be // mov(rscratch1, RuntimeAddress(addr) // blrt rscratch1 CodeBlob *cb = CodeCache::find_blob(_entry_point); if (cb) { - return 4; + return MacroAssembler::far_branch_size(); } else { // A 48-bit address. See movptr(). - return 16; + // then a blrt + // return 16; + return 4 * NativeInstruction::instruction_size; } } @@ -1361,7 +1363,7 @@ uint size_java_to_interp() { // ob jdk7 we only need a mov oop and a branch - return 2 * NativeInstruction::instruction_size; + return 7 * NativeInstruction::instruction_size; } // Offset from start of compiled java to interpreter stub to the load @@ -1395,7 +1397,8 @@ // pool oop and GC overwrites the patch with movk/z 0x0000 again __ movoop(rmethod, (jobject) NULL); // This is recognized as unresolved by relocs/nativeinst/ic code - __ b(__ pc()); + __ movptr(rscratch1, 0); + __ br(rscratch1); assert((__ offset() - offset) <= (int)size_java_to_interp(), "stub too big"); // Update current stubs pointer and restore insts_end. @@ -1433,13 +1436,12 @@ // This is the unverified entry point. MacroAssembler _masm(&cbuf); - // no need to worry about 4-byte of br alignment on AArch64 __ cmp_klass(j_rarg0, rscratch2, rscratch1); Label skip; // TODO // can we avoid this skip and still use a reloc? __ br(Assembler::EQ, skip); - __ b(RuntimeAddress(SharedRuntime::get_ic_miss_stub())); + __ far_jump(RuntimeAddress(SharedRuntime::get_ic_miss_stub())); __ bind(skip); } @@ -1454,8 +1456,7 @@ uint size_exception_handler() { - // count up to 4 movz/n/k instructions and one branch instruction - return 5 * NativeInstruction::instruction_size; + return MacroAssembler::far_branch_size(); } // Emit exception handler code. @@ -1470,7 +1471,7 @@ __ start_a_stub(size_exception_handler()); if (base == NULL) return 0; // CodeBuffer::expand failed int offset = __ offset(); - __ b(RuntimeAddress(OptoRuntime::exception_blob()->entry_point())); + __ far_jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point())); assert(__ offset() - offset <= (int) size_exception_handler(), "overflow"); __ end_a_stub(); return offset; @@ -1478,8 +1479,8 @@ uint size_deopt_handler() { - // count one adr and one branch instruction - return 2 * NativeInstruction::instruction_size; + // count one adr and one far branch instruction + return NativeInstruction::instruction_size + MacroAssembler::far_branch_size(); } // Emit deopt handler code. @@ -1494,8 +1495,7 @@ int offset = __ offset(); __ adr(lr, __ pc()); - // should we load this into rscratch1 and use a br? - __ b(RuntimeAddress(SharedRuntime::deopt_blob()->unpack())); + __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack())); assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow"); __ end_a_stub(); @@ -2802,11 +2802,11 @@ address addr = (address)$meth$$method; if (!_method) { // A call to a runtime wrapper, e.g. new, new_typeArray_Java, uncommon_trap. - __ bl(Address(addr, relocInfo::runtime_call_type)); + __ trampoline_call(Address(addr, relocInfo::runtime_call_type), &cbuf); } else if (_optimized_virtual) { - __ bl(Address(addr, relocInfo::opt_virtual_call_type)); + __ trampoline_call(Address(addr, relocInfo::opt_virtual_call_type), &cbuf); } else { - __ bl(Address(addr, relocInfo::static_call_type)); + __ trampoline_call(Address(addr, relocInfo::static_call_type), &cbuf); } if (_method) { @@ -2818,22 +2818,19 @@ enc_class aarch64_enc_java_handle_call(method meth) %{ MacroAssembler _masm(&cbuf); - // TODO fixme - // this is supposed to preserve and restore SP around the call - // need to check it works + // RFP is preserved across all calls, even compiled calls. + // Use it to preserve SP. __ mov(rfp, sp); address mark = __ pc(); address addr = (address)$meth$$method; if (!_method) { - // TODO check this - // think we are calling generated Java here not x86 // A call to a runtime wrapper, e.g. new, new_typeArray_Java, uncommon_trap. - __ bl(Address(addr, relocInfo::runtime_call_type)); + __ trampoline_call(Address(addr, relocInfo::runtime_call_type), &cbuf); } else if (_optimized_virtual) { - __ bl(Address(addr, relocInfo::opt_virtual_call_type)); + __ trampoline_call(Address(addr, relocInfo::opt_virtual_call_type), &cbuf); } else { - __ bl(Address(addr, relocInfo::static_call_type)); + __ trampoline_call(Address(addr, relocInfo::static_call_type), &cbuf); } if (_method) { @@ -2848,10 +2845,7 @@ enc_class aarch64_enc_java_dynamic_call(method meth) %{ MacroAssembler _masm(&cbuf); address entry = (address)$meth$$method; - RelocationHolder rh = virtual_call_Relocation::spec(__ pc()); - // we use movoop here as per emit_java_to_interp and c1's ic_call - __ movoop(rscratch2, (jobject)Universe::non_oop_word(), /*immediate*/true); - __ bl(Address(entry, rh)); + __ ic_call(entry); %} enc_class aarch64_enc_call_epilog() %{ @@ -2872,7 +2866,7 @@ address entry = (address)$meth$$method; CodeBlob *cb = CodeCache::find_blob(entry); if (cb) { - __ bl(Address(entry)); + __ trampoline_call(Address(entry, relocInfo::runtime_call_type)); } else { int gpcnt; int fpcnt; @@ -2885,7 +2879,7 @@ enc_class aarch64_enc_rethrow() %{ MacroAssembler _masm(&cbuf); - __ b(RuntimeAddress(OptoRuntime::rethrow_stub())); + __ far_jump(RuntimeAddress(OptoRuntime::rethrow_stub())); %} enc_class aarch64_enc_ret() %{ diff -r eeb4a3ec4563 -r bd546c6e4aa5 src/cpu/aarch64/vm/assembler_aarch64.cpp --- a/src/cpu/aarch64/vm/assembler_aarch64.cpp Tue Nov 24 09:02:26 2015 +0000 +++ b/src/cpu/aarch64/vm/assembler_aarch64.cpp Mon Jan 11 18:14:16 2016 +0000 @@ -1369,7 +1369,6 @@ if (L.is_bound()) { br(cc, target(L)); } else { - InstructionMark im(this); L.add_patch_at(code(), locator()); br(cc, pc()); } @@ -1380,7 +1379,6 @@ if (L.is_bound()) { (this->*insn)(target(L)); } else { - InstructionMark im(this); L.add_patch_at(code(), locator()); (this->*insn)(pc()); } @@ -1391,7 +1389,6 @@ if (L.is_bound()) { (this->*insn)(r, target(L)); } else { - InstructionMark im(this); L.add_patch_at(code(), locator()); (this->*insn)(r, pc()); } @@ -1402,7 +1399,6 @@ if (L.is_bound()) { (this->*insn)(r, bitpos, target(L)); } else { - InstructionMark im(this); L.add_patch_at(code(), locator()); (this->*insn)(r, bitpos, pc()); } @@ -1412,7 +1408,6 @@ if (L.is_bound()) { (this->*insn)(target(L), op); } else { - InstructionMark im(this); L.add_patch_at(code(), locator()); (this->*insn)(pc(), op); } @@ -1653,8 +1648,8 @@ Instruction_aarch64::patch(branch, 20, 5, dest & 0xffff); Instruction_aarch64::patch(branch+4, 20, 5, (dest >>= 16) & 0xffff); Instruction_aarch64::patch(branch+8, 20, 5, (dest >>= 16) & 0xffff); - assert(pd_call_destination(branch) == target, "should be"); - instructions = 2; + assert(target_addr_for_insn(branch) == target, "should be"); + instructions = 3; } else if (Instruction_aarch64::extract(insn, 31, 22) == 0b1011100101 && Instruction_aarch64::extract(insn, 4, 0) == 0b11111) { // nothing to do @@ -1861,6 +1856,42 @@ } } +void MacroAssembler::far_call(Address entry, CodeBuffer *cbuf, Register tmp) { + assert(ReservedCodeCacheSize < 4*G, "branch out of range"); + assert(CodeCache::find_blob(entry.target()) != NULL, + "destination of far call not found in code cache"); + if (far_branches()) { + unsigned long offset; + // We can use ADRP here because we know that the total size of + // the code cache cannot exceed 2Gb. + adrp(tmp, entry, offset); + add(tmp, tmp, offset); + if (cbuf) cbuf->set_insts_mark(); + blr(tmp); + } else { + if (cbuf) cbuf->set_insts_mark(); + bl(entry); + } +} + +void MacroAssembler::far_jump(Address entry, CodeBuffer *cbuf, Register tmp) { + assert(ReservedCodeCacheSize < 4*G, "branch out of range"); + assert(CodeCache::find_blob(entry.target()) != NULL, + "destination of far call not found in code cache"); + if (far_branches()) { + unsigned long offset; + // We can use ADRP here because we know that the total size of + // the code cache cannot exceed 2Gb. + adrp(tmp, entry, offset); + add(tmp, tmp, offset); + if (cbuf) cbuf->set_insts_mark(); + br(tmp); + } else { + if (cbuf) cbuf->set_insts_mark(); + b(entry); + } +} + int MacroAssembler::biased_locking_enter(Register lock_reg, Register obj_reg, Register swap_reg, @@ -2135,14 +2166,93 @@ call_VM_base(oop_result, noreg, noreg, entry_point, number_of_arguments, check_exceptions); } -void MacroAssembler::call(Address entry) { - if (true // reachable(entry) - ) { - bl(entry); +// Maybe emit a call via a trampoline. If the code cache is small +// trampolines won't be emitted. + +void MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) { + assert(entry.rspec().type() == relocInfo::runtime_call_type + || entry.rspec().type() == relocInfo::opt_virtual_call_type + || entry.rspec().type() == relocInfo::static_call_type + || entry.rspec().type() == relocInfo::virtual_call_type, "wrong reloc type"); + + unsigned int start_offset = offset(); +#ifdef COMPILER2 + if (far_branches() && !Compile::current()->in_scratch_emit_size()) { + emit_trampoline_stub(offset(), entry.target()); + } +#endif + + if (cbuf) cbuf->set_insts_mark(); + relocate(entry.rspec()); +#ifdef COMPILER2 + if (!far_branches()) { + bl(entry.target()); } else { - lea(rscratch1, entry); - blr(rscratch1); + bl(pc()); } +#else + bl(entry.target()); +#endif +} + + +// Emit a trampoline stub for a call to a target which is too far away. +// +// code sequences: +// +// call-site: +// branch-and-link to or +// +// Related trampoline stub for this call site in the stub section: +// load the call target from the constant pool +// branch (LR still points to the call site above) + +void MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset, + address dest) { +#ifdef COMPILER2 + address stub = start_a_stub(Compile::MAX_stubs_size/2); + if (stub == NULL) { + start_a_stub(Compile::MAX_stubs_size/2); + Compile::current()->env()->record_out_of_memory_failure(); + return; + } + + // Create a trampoline stub relocation which relates this trampoline stub + // with the call instruction at insts_call_instruction_offset in the + // instructions code-section. + align(wordSize); + relocate(trampoline_stub_Relocation::spec(code()->insts()->start() + + insts_call_instruction_offset)); + const int stub_start_offset = offset(); + + // Now, create the trampoline stub's code: + // - load the call + // - call + Label target; + ldr(rscratch1, target); + br(rscratch1); + bind(target); + assert(offset() - stub_start_offset == NativeCallTrampolineStub::data_offset, + "should be"); + emit_long64((int64_t)dest); + + const address stub_start_addr = addr_at(stub_start_offset); + + assert(is_NativeCallTrampolineStub_at(stub_start_addr), "doesn't look like a trampoline"); + + end_a_stub(); +#else + ShouldNotReachHere(); +#endif +} + +void MacroAssembler::ic_call(address entry) { + RelocationHolder rh = virtual_call_Relocation::spec(pc()); + // address const_ptr = long_constant((jlong)Universe::non_oop_word()); + // unsigned long offset; + // ldr_constant(rscratch2, const_ptr); + movoop(rscratch2, (jobject)Universe::non_oop_word(), /*immediate*/true); + trampoline_call(Address(entry, rh)); } // Implementation of call_VM versions @@ -2806,8 +2916,7 @@ // public methods void MacroAssembler::mov(Register r, Address dest) { - InstructionMark im(this); - code_section()->relocate(inst_mark(), dest.rspec()); + code_section()->relocate(pc(), dest.rspec()); u_int64_t imm64 = (u_int64_t)dest.target(); movptr(r, imm64); } diff -r eeb4a3ec4563 -r bd546c6e4aa5 src/cpu/aarch64/vm/assembler_aarch64.hpp --- a/src/cpu/aarch64/vm/assembler_aarch64.hpp Tue Nov 24 09:02:26 2015 +0000 +++ b/src/cpu/aarch64/vm/assembler_aarch64.hpp Mon Jan 11 18:14:16 2016 +0000 @@ -845,16 +845,28 @@ #undef INSN + // The maximum range of a branch is fixed for the AArch64 + // architecture. In debug mode we shrink it in order to test + // trampolines, but not so small that branches in the interpreter + // are out of range. + static const unsigned long branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M); + + static bool reachable_from_branch_at(address branch, address target) { + return uabs(target - branch) < branch_range; + } + // Unconditional branch (immediate) -#define INSN(NAME, opcode) \ - void NAME(address dest) { \ - starti; \ - long offset = (dest - pc()) >> 2; \ - f(opcode, 31), f(0b00101, 30, 26), sf(offset, 25, 0); \ - } \ - void NAME(Label &L) { \ - wrap_label(L, &Assembler::NAME); \ - } \ + +#define INSN(NAME, opcode) \ + void NAME(address dest) { \ + starti; \ + long offset = (dest - pc()) >> 2; \ + DEBUG_ONLY(assert(reachable_from_branch_at(pc(), dest), "debug only")); \ + f(opcode, 31), f(0b00101, 30, 26), sf(offset, 25, 0); \ + } \ + void NAME(Label &L) { \ + wrap_label(L, &Assembler::NAME); \ + } \ void NAME(const Address &dest); INSN(b, 0); @@ -2741,6 +2753,10 @@ static bool needs_explicit_null_check(intptr_t offset); static address target_addr_for_insn(address insn_addr, unsigned insn); + static address target_addr_for_insn(address insn_addr) { + unsigned insn = *(unsigned*)insn_addr; + return target_addr_for_insn(insn_addr, insn); + } // Required platform-specific helpers for Label::patch_instructions. // They _shadow_ the declarations in AbstractAssembler, which are undefined. @@ -2749,8 +2765,7 @@ pd_patch_instruction_size (branch, target); } static address pd_call_destination(address branch) { - unsigned insn = *(unsigned*)branch; - return target_addr_for_insn(branch, insn); + return target_addr_for_insn(branch); } #ifndef PRODUCT static void pd_print_patched_instruction(address branch); @@ -2758,6 +2773,8 @@ static int patch_oop(address insn_addr, address o); + void emit_trampoline_stub(int insts_call_instruction_offset, address target); + // The following 4 methods return the offset of the appropriate move instruction // Support for fast byte/short loading with zero extension (depending on particular CPU) @@ -3265,12 +3282,27 @@ // Calls - // void call(Label& L, relocInfo::relocType rtype); - - // NOTE: this call tranfers to the effective address of entry NOT - // the address contained by entry. This is because this is more natural - // for jumps/calls. - void call(Address entry); + void trampoline_call(Address entry, CodeBuffer *cbuf = NULL); + + static bool far_branches() { + return ReservedCodeCacheSize > branch_range; + } + + // Jumps that can reach anywhere in the code cache. + // Trashes tmp. + void far_call(Address entry, CodeBuffer *cbuf = NULL, Register tmp = rscratch1); + void far_jump(Address entry, CodeBuffer *cbuf = NULL, Register tmp = rscratch1); + + static int far_branch_size() { + if (far_branches()) { + return 3 * 4; // adrp, add, br + } else { + return 4; + } + } + + // Emit the CompiledIC call idiom + void ic_call(address entry); // Jumps diff -r eeb4a3ec4563 -r bd546c6e4aa5 src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp --- a/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp Tue Nov 24 09:02:26 2015 +0000 +++ b/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp Mon Jan 11 18:14:16 2016 +0000 @@ -115,7 +115,7 @@ __ bind(_entry); ce->store_parameter(_method->as_register(), 1); ce->store_parameter(_bci, 0); - __ call(RuntimeAddress(Runtime1::entry_for(Runtime1::counter_overflow_id))); + __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::counter_overflow_id))); ce->add_call_info_here(_info); ce->verify_oop_map(_info); __ b(_continuation); @@ -143,7 +143,7 @@ } else { stub_id = Runtime1::throw_range_check_failed_id; } From bugzilla-daemon at icedtea.classpath.org Mon Jan 11 18:26:31 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 18:26:31 +0000 Subject: [Bug 2683] [IcedTea7] AArch64 port has broken Zero on AArch64 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2683 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7-forest/hotspot?cmd=changeset;node=cfa5486d930e author: andrew date: Fri Nov 13 04:57:20 2015 +0000 PR2683: AArch64 port has broken Zero on AArch64 -- 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 11 18:26:45 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 11 Jan 2016 18:26:45 +0000 Subject: /hg/icedtea7-forest/jdk: 4 new changesets Message-ID: changeset 1b3ddd2693b5 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=1b3ddd2693b5 author: andrew date: Fri Nov 13 05:05:36 2015 +0000 PR2557: Forwardport Fedora font configuration support changeset 09c2cc84d451 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=09c2cc84d451 author: andrew date: Fri Nov 13 05:11:53 2015 +0000 PR2557: Forwardport Gentoo font configuration support changeset 79e4644bd404 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=79e4644bd404 author: omajid date: Tue Oct 27 15:19:15 2015 -0400 8140620, PR2710: Find and load default.sf2 as the default soundbank on Linux Reviewed-by: serb changeset ceb95f0d38d7 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=ceb95f0d38d7 author: coffeys date: Tue Sep 01 09:37:34 2015 -0700 8133196, PR2712: HTTPS hostname invalid issue with InetAddress Reviewed-by: chegar, xuelei diffstat: make/sun/awt/Makefile | 7 +- src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 34 + src/share/classes/java/net/Inet4Address.java | 2 + src/share/classes/java/net/InetAddress.java | 2 +- src/share/native/java/net/InetAddress.c | 3 + src/share/native/java/net/net_util.c | 1 + src/share/native/java/net/net_util.h | 1 + src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.10.properties | 377 ++++++++ src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.11.properties | 420 ++++++++++ src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.12.properties | 420 ++++++++++ src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.9.properties | 377 ++++++++ src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties | 73 +- src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties | 385 +++++++++ src/solaris/classes/sun/awt/motif/MFontConfiguration.java | 3 + test/java/net/InetAddress/getOriginalHostName.java | 71 + 15 files changed, 2159 insertions(+), 17 deletions(-) diffs (truncated from 2440 to 500 lines): diff -r 4045b2061282 -r ceb95f0d38d7 make/sun/awt/Makefile --- a/make/sun/awt/Makefile Fri Nov 20 01:09:50 2015 +0000 +++ b/make/sun/awt/Makefile Tue Sep 01 09:37:34 2015 -0700 @@ -482,7 +482,12 @@ fontconfig.properties \ fontconfig.SuSE.properties \ fontconfig.Ubuntu.properties \ - fontconfig.Fedora.properties + fontconfig.Fedora.properties \ + fontconfig.Fedora.9.properties \ + fontconfig.Fedora.10.properties \ + fontconfig.Fedora.11.properties \ + fontconfig.Fedora.12.properties \ + fontconfig.Gentoo.properties else FONTCONFIGS_SRC = $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs diff -r 4045b2061282 -r ceb95f0d38d7 src/share/classes/com/sun/media/sound/SoftSynthesizer.java --- a/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Fri Nov 20 01:09:50 2015 +0000 +++ b/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Tue Sep 01 09:37:34 2015 -0700 @@ -668,6 +668,40 @@ actions.add(new PrivilegedAction() { public InputStream run() { if (System.getProperties().getProperty("os.name") + .startsWith("Linux")) { + + File[] systemSoundFontsDir = new File[] { + /* Arch, Fedora, Mageia */ + new File("/usr/share/soundfonts/"), + new File("/usr/local/share/soundfonts/"), + /* Debian, Gentoo, OpenSUSE, Ubuntu */ + new File("/usr/share/sounds/sf2/"), + new File("/usr/local/share/sounds/sf2/"), + }; + + /* + * Look for a default.sf2 + */ + for (File systemSoundFontDir : systemSoundFontsDir) { + if (systemSoundFontDir.exists()) { + File defaultSoundFont = new File(systemSoundFontDir, "default.sf2"); + if (defaultSoundFont.exists()) { + try { + return new FileInputStream(defaultSoundFont); + } catch (IOException e) { + // continue with lookup + } + } + } + } + } + return null; + } + }); + + actions.add(new PrivilegedAction() { + public InputStream run() { + if (System.getProperties().getProperty("os.name") .startsWith("Windows")) { File gm_dls = new File(System.getenv("SystemRoot") + "\\system32\\drivers\\gm.dls"); diff -r 4045b2061282 -r ceb95f0d38d7 src/share/classes/java/net/Inet4Address.java --- a/src/share/classes/java/net/Inet4Address.java Fri Nov 20 01:09:50 2015 +0000 +++ b/src/share/classes/java/net/Inet4Address.java Tue Sep 01 09:37:34 2015 -0700 @@ -119,11 +119,13 @@ holder().address = address; } } + holder().originalHostName = hostName; } Inet4Address(String hostName, int address) { holder().hostName = hostName; holder().family = IPv4; holder().address = address; + holder().originalHostName = hostName; } /** diff -r 4045b2061282 -r ceb95f0d38d7 src/share/classes/java/net/InetAddress.java --- a/src/share/classes/java/net/InetAddress.java Fri Nov 20 01:09:50 2015 +0000 +++ b/src/share/classes/java/net/InetAddress.java Tue Sep 01 09:37:34 2015 -0700 @@ -218,7 +218,7 @@ * * Note: May define a new public method in the future if necessary. */ - private String originalHostName; + String originalHostName; InetAddressHolder() {} diff -r 4045b2061282 -r ceb95f0d38d7 src/share/native/java/net/InetAddress.c --- a/src/share/native/java/net/InetAddress.c Fri Nov 20 01:09:50 2015 +0000 +++ b/src/share/native/java/net/InetAddress.c Tue Sep 01 09:37:34 2015 -0700 @@ -38,6 +38,7 @@ jfieldID iac_addressID; jfieldID iac_familyID; jfieldID iac_hostNameID; +jfieldID iac_origHostNameID; jfieldID ia_preferIPv6AddressID; /* @@ -64,4 +65,6 @@ iac_familyID = (*env)->GetFieldID(env, iac_class, "family", "I"); CHECK_NULL(iac_familyID); iac_hostNameID = (*env)->GetFieldID(env, iac_class, "hostName", "Ljava/lang/String;"); + CHECK_NULL(iac_hostNameID); + iac_origHostNameID = (*env)->GetFieldID(env, iac_class, "originalHostName", "Ljava/lang/String;"); } diff -r 4045b2061282 -r ceb95f0d38d7 src/share/native/java/net/net_util.c --- a/src/share/native/java/net/net_util.c Fri Nov 20 01:09:50 2015 +0000 +++ b/src/share/native/java/net/net_util.c Tue Sep 01 09:37:34 2015 -0700 @@ -227,6 +227,7 @@ initInetAddrs(env); holder = (*env)->GetObjectField(env, iaObj, ia_holderID); (*env)->SetObjectField(env, holder, iac_hostNameID, host); + (*env)->SetObjectField(env, holder, iac_origHostNameID, host); } int getInetAddress_addr(JNIEnv *env, jobject iaObj) { diff -r 4045b2061282 -r ceb95f0d38d7 src/share/native/java/net/net_util.h --- a/src/share/native/java/net/net_util.h Fri Nov 20 01:09:50 2015 +0000 +++ b/src/share/native/java/net/net_util.h Tue Sep 01 09:37:34 2015 -0700 @@ -56,6 +56,7 @@ extern jfieldID iac_addressID; extern jfieldID iac_familyID; extern jfieldID iac_hostNameID; +extern jfieldID iac_origHostNameID; extern jfieldID ia_preferIPv6AddressID; /** (Inet6Address accessors) diff -r 4045b2061282 -r ceb95f0d38d7 src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.10.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.10.properties Tue Sep 01 09:37:34 2015 -0700 @@ -0,0 +1,377 @@ +# +# +# Copyright (c) 2007, 2010, 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. 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. +# + +# Version + +# Uses Fedora 9 fonts and file paths. +version=1 + +# Component Font Mappings + +dialog.plain.latin-1=DejaVu Sans +dialog.plain.japanese-x0208=Sazanami Gothic +dialog.plain.korean=Baekmuk Gulim +dialog.plain.chinese-big5=AR PL ShanHeiSun Uni +dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni +dialog.plain.bengali=Lohit Bengali +dialog.plain.gujarati=Lohit Gujarati +dialog.plain.hindi=Lohit Hindi +dialog.plain.malayalam=Lohit Malayalam +dialog.plain.oriya=Lohit Oriya +dialog.plain.punjabi=Lohit Punjabi +dialog.plain.tamil=Lohit Tamil +dialog.plain.telugu=Lohit Telugu +dialog.plain.sinhala=LKLUG + +dialog.bold.latin-1=DejaVu Sans Bold +dialog.bold.japanese-x0208=Sazanami Gothic +dialog.bold.korean=Baekmuk Gulim +dialog.bold.chinese-big5=AR PL ShanHeiSun Uni +dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni +dialog.bold.bengali=Lohit Bengali +dialog.bold.gujarati=Lohit Gujarati +dialog.bold.hindi=Lohit Hindi +dialog.bold.malayalam=Lohit Malayalam +dialog.bold.oriya=Lohit Oriya +dialog.bold.punjabi=Lohit Punjabi +dialog.bold.tamil=Lohit Tamil +dialog.bold.telugu=Lohit Telugu +dialog.bold.sinhala=LKLUG + +dialog.italic.latin-1=DejaVu Sans Oblique +dialog.italic.japanese-x0208=Sazanami Gothic +dialog.italic.korean=Baekmuk Gulim +dialog.italic.chinese-big5=AR PL ShanHeiSun Uni +dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni +dialog.italic.bengali=Lohit Bengali +dialog.italic.gujarati=Lohit Gujarati +dialog.italic.hindi=Lohit Hindi +dialog.italic.malayalam=Lohit Malayalam +dialog.italic.oriya=Lohit Oriya +dialog.italic.punjabi=Lohit Punjabi +dialog.italic.tamil=Lohit Tamil +dialog.italic.telugu=Lohit Telugu +dialog.italic.sinhala=LKLUG + +dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique +dialog.bolditalic.japanese-x0208=Sazanami Gothic +dialog.bolditalic.korean=Baekmuk Gulim +dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni +dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni +dialog.bolditalic.bengali=Lohit Bengali +dialog.bolditalic.gujarati=Lohit Gujarati +dialog.bolditalic.hindi=Lohit Hindi +dialog.bolditalic.malayalam=Lohit Malayalam +dialog.bolditalic.oriya=Lohit Oriya +dialog.bolditalic.punjabi=Lohit Punjabi +dialog.bolditalic.tamil=Lohit Tamil +dialog.bolditalic.telugu=Lohit Telugu +dialog.bolditalic.sinhala=LKLUG + +sansserif.plain.latin-1=DejaVu Sans +sansserif.plain.japanese-x0208=Sazanami Gothic +sansserif.plain.korean=Baekmuk Gulim +sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni +sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni +sansserif.plain.bengali=Lohit Bengali +sansserif.plain.gujarati=Lohit Gujarati +sansserif.plain.hindi=Lohit Hindi +sansserif.plain.malayalam=Lohit Malayalam +sansserif.plain.oriya=Lohit Oriya +sansserif.plain.punjabi=Lohit Punjabi +sansserif.plain.tamil=Lohit Tamil +sansserif.plain.telugu=Lohit Telugu +sansserif.plain.sinhala=LKLUG + +sansserif.bold.latin-1=DejaVu Sans Bold +sansserif.bold.japanese-x0208=Sazanami Gothic +sansserif.bold.korean=Baekmuk Gulim +sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni +sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni +sansserif.bold.bengali=Lohit Bengali +sansserif.bold.gujarati=Lohit Gujarati +sansserif.bold.hindi=Lohit Hindi +sansserif.bold.malayalam=Lohit Malayalam +sansserif.bold.oriya=Lohit Oriya +sansserif.bold.punjabi=Lohit Punjabi +sansserif.bold.tamil=Lohit Tamil +sansserif.bold.telugu=Lohit Telugu +sansserif.bold.sinhala=LKLUG + +sansserif.italic.latin-1=DejaVu Sans Oblique +sansserif.italic.japanese-x0208=Sazanami Gothic +sansserif.italic.korean=Baekmuk Gulim +sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni +sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni +sansserif.italic.bengali=Lohit Bengali +sansserif.italic.gujarati=Lohit Gujarati +sansserif.italic.hindi=Lohit Hindi +sansserif.italic.malayalam=Lohit Malayalam +sansserif.italic.oriya=Lohit Oriya +sansserif.italic.punjabi=Lohit Punjabi +sansserif.italic.tamil=Lohit Tamil +sansserif.italic.telugu=Lohit Telugu +sansserif.italic.sinhala=LKLUG + +sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique +sansserif.bolditalic.japanese-x0208=Sazanami Gothic +sansserif.bolditalic.korean=Baekmuk Gulim +sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni +sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni +sansserif.bolditalic.bengali=Lohit Bengali +sansserif.bolditalic.gujarati=Lohit Gujarati +sansserif.bolditalic.hindi=Lohit Hindi +sansserif.bolditalic.malayalam=Lohit Malayalam +sansserif.bolditalic.oriya=Lohit Oriya +sansserif.bolditalic.punjabi=Lohit Punjabi +sansserif.bolditalic.tamil=Lohit Tamil +sansserif.bolditalic.telugu=Lohit Telugu +sansserif.bolditalic.sinhala=LKLUG + +serif.plain.latin-1=DejaVu Serif +serif.plain.japanese-x0208=Sazanami Mincho +serif.plain.korean=Baekmuk Batang +serif.plain.chinese-big5=AR PL ZenKai Uni +serif.plain.chinese-gb18030=AR PL ZenKai Uni +serif.plain.bengali=Lohit Bengali +serif.plain.gujarati=Lohit Gujarati +serif.plain.hindi=Lohit Hindi +serif.plain.malayalam=Lohit Malayalam +serif.plain.oriya=Lohit Oriya +serif.plain.punjabi=Lohit Punjabi +serif.plain.tamil=Lohit Tamil +serif.plain.telugu=Lohit Telugu +serif.plain.sinhala=LKLUG + +serif.bold.latin-1=DejaVu Serif Bold +serif.bold.japanese-x0208=Sazanami Mincho +serif.bold.korean=Baekmuk Batang +serif.bold.chinese-big5=AR PL ZenKai Uni +serif.bold.chinese-gb18030=AR PL ZenKai Uni +serif.bold.bengali=Lohit Bengali +serif.bold.gujarati=Lohit Gujarati +serif.bold.hindi=Lohit Hindi +serif.bold.malayalam=Lohit Malayalam +serif.bold.oriya=Lohit Oriya +serif.bold.punjabi=Lohit Punjabi +serif.bold.tamil=Lohit Tamil +serif.bold.telugu=Lohit Telugu +serif.bold.sinhala=LKLUG + +serif.italic.latin-1=DejaVu Serif Oblique +serif.italic.japanese-x0208=Sazanami Mincho +serif.italic.korean=Baekmuk Batang +serif.italic.chinese-big5=AR PL ZenKai Uni +serif.italic.chinese-gb18030=AR PL ZenKai Uni +serif.italic.bengali=Lohit Bengali +serif.italic.gujarati=Lohit Gujarati +serif.italic.hindi=Lohit Hindi +serif.italic.malayalam=Lohit Malayalam +serif.italic.oriya=Lohit Oriya +serif.italic.punjabi=Lohit Punjabi +serif.italic.tamil=Lohit Tamil +serif.italic.telugu=Lohit Telugu +serif.italic.sinhala=LKLUG + +serif.bolditalic.latin-1=DejaVu Serif Bold Oblique +serif.bolditalic.japanese-x0208=Sazanami Mincho +serif.bolditalic.korean=Baekmuk Batang +serif.bolditalic.chinese-big5=AR PL ZenKai Uni +serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni +serif.bolditalic.bengali=Lohit Bengali +serif.bolditalic.gujarati=Lohit Gujarati +serif.bolditalic.hindi=Lohit Hindi +serif.bolditalic.malayalam=Lohit Malayalam +serif.bolditalic.oriya=Lohit Oriya +serif.bolditalic.punjabi=Lohit Punjabi +serif.bolditalic.tamil=Lohit Tamil +serif.bolditalic.telugu=Lohit Telugu +serif.bolditalic.sinhala=LKLUG + +monospaced.plain.latin-1=DejaVu Sans Mono +monospaced.plain.japanese-x0208=Sazanami Gothic +monospaced.plain.korean=Baekmuk Gulim +monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni +monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni +monospaced.plain.bengali=Lohit Bengali +monospaced.plain.gujarati=Lohit Gujarati +monospaced.plain.hindi=Lohit Hindi +monospaced.plain.malayalam=Lohit Malayalam +monospaced.plain.oriya=Lohit Oriya +monospaced.plain.punjabi=Lohit Punjabi +monospaced.plain.tamil=Lohit Tamil +monospaced.plain.telugu=Lohit Telugu +monospaced.plain.sinhala=LKLUG + +monospaced.bold.latin-1=DejaVu Sans Mono Bold +monospaced.bold.japanese-x0208=Sazanami Gothic +monospaced.bold.korean=Baekmuk Gulim +monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni +monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni +monospaced.bold.bengali=Lohit Bengali +monospaced.bold.gujarati=Lohit Gujarati +monospaced.bold.hindi=Lohit Hindi +monospaced.bold.malayalam=Lohit Malayalam +monospaced.bold.oriya=Lohit Oriya +monospaced.bold.punjabi=Lohit Punjabi +monospaced.bold.tamil=Lohit Tamil +monospaced.bold.telugu=Lohit Telugu +monospaced.bold.sinhala=LKLUG + +monospaced.italic.latin-1=DejaVu Sans Mono Oblique +monospaced.italic.japanese-x0208=Sazanami Gothic +monospaced.italic.korean=Baekmuk Gulim +monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni +monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni +monospaced.italic.bengali=Lohit Bengali +monospaced.italic.gujarati=Lohit Gujarati +monospaced.italic.hindi=Lohit Hindi +monospaced.italic.malayalam=Lohit Malayalam +monospaced.italic.oriya=Lohit Oriya +monospaced.italic.punjabi=Lohit Punjabi +monospaced.italic.tamil=Lohit Tamil +monospaced.italic.telugu=Lohit Telugu +monospaced.italic.sinhala=LKLUG + +monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique +monospaced.bolditalic.japanese-x0208=Sazanami Gothic +monospaced.bolditalic.korean=Baekmuk Gulim +monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni +monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni +monospaced.bolditalic.bengali=Lohit Bengali +monospaced.bolditalic.gujarati=Lohit Gujarati +monospaced.bolditalic.hindi=Lohit Hindi +monospaced.bolditalic.malayalam=Lohit Malayalam +monospaced.bolditalic.oriya=Lohit Oriya +monospaced.bolditalic.punjabi=Lohit Punjabi +monospaced.bolditalic.tamil=Lohit Tamil +monospaced.bolditalic.telugu=Lohit Telugu +monospaced.bolditalic.sinhala=LKLUG + +dialoginput.plain.latin-1=DejaVu Sans Mono +dialoginput.plain.japanese-x0208=Sazanami Gothic +dialoginput.plain.korean=Baekmuk Gulim +dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni +dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni +dialoginput.plain.bengali=Lohit Bengali +dialoginput.plain.gujarati=Lohit Gujarati +dialoginput.plain.hindi=Lohit Hindi +dialoginput.plain.malayalam=Lohit Malayalam +dialoginput.plain.oriya=Lohit Oriya +dialoginput.plain.punjabi=Lohit Punjabi +dialoginput.plain.tamil=Lohit Tamil +dialoginput.plain.telugu=Lohit Telugu +dialoginput.plain.sinhala=LKLUG + +dialoginput.bold.latin-1=DejaVu Sans Mono Bold +dialoginput.bold.japanese-x0208=Sazanami Gothic +dialoginput.bold.korean=Baekmuk Gulim +dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni +dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni +dialoginput.bold.bengali=Lohit Bengali +dialoginput.bold.gujarati=Lohit Gujarati +dialoginput.bold.hindi=Lohit Hindi +dialoginput.bold.malayalam=Lohit Malayalam +dialoginput.bold.oriya=Lohit Oriya +dialoginput.bold.punjabi=Lohit Punjabi +dialoginput.bold.tamil=Lohit Tamil +dialoginput.bold.telugu=Lohit Telugu +dialoginput.bold.sinhala=LKLUG + +dialoginput.italic.latin-1=DejaVu Sans Mono Oblique +dialoginput.italic.japanese-x0208=Sazanami Gothic +dialoginput.italic.korean=Baekmuk Gulim +dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni +dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni +dialoginput.italic.bengali=Lohit Bengali +dialoginput.italic.gujarati=Lohit Gujarati +dialoginput.italic.hindi=Lohit Hindi +dialoginput.italic.malayalam=Lohit Malayalam +dialoginput.italic.oriya=Lohit Oriya +dialoginput.italic.punjabi=Lohit Punjabi +dialoginput.italic.tamil=Lohit Tamil +dialoginput.italic.telugu=Lohit Telugu +dialoginput.italic.sinhala=LKLUG + +dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique +dialoginput.bolditalic.japanese-x0208=Sazanami Gothic +dialoginput.bolditalic.korean=Baekmuk Gulim +dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni +dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni +dialoginput.bolditalic.bengali=Lohit Bengali +dialoginput.bolditalic.gujarati=Lohit Gujarati +dialoginput.bolditalic.hindi=Lohit Hindi +dialoginput.bolditalic.malayalam=Lohit Malayalam +dialoginput.bolditalic.oriya=Lohit Oriya +dialoginput.bolditalic.punjabi=Lohit Punjabi +dialoginput.bolditalic.tamil=Lohit Tamil +dialoginput.bolditalic.telugu=Lohit Telugu +dialoginput.bolditalic.sinhala=LKLUG + +# Search Sequences + +sequence.allfonts=latin-1 +sequence.allfonts.Big5=chinese-big5,latin-1 +sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1 +sequence.allfonts.EUC-KR=korean,latin-1 +sequence.allfonts.GB18030=chinese-gb18030,latin-1 +sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala + +# Font File Names + +filename.DejaVu_Sans=/usr/share/fonts/dejavu/DejaVuSans.ttf +filename.DejaVu_Sans_Bold=/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf +filename.DejaVu_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf +filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf + +filename.DejaVu_Sans_Mono=/usr/share/fonts/dejavu/DejaVuSansMono.ttf +filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf +filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf +filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf + +filename.DejaVu_Serif=/usr/share/fonts/dejavu/DejaVuSerif.ttf +filename.DejaVu_Serif_Bold=/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf +filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf +filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf + +filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf +filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf +filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttc +filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttc +filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf +filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf + From bugzilla-daemon at icedtea.classpath.org Mon Jan 11 18:26:52 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 18:26:52 +0000 Subject: [Bug 2557] [IcedTea7] Update Gentoo font configuration and allow font directory to be specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2557 --- Comment #7 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7-forest/jdk?cmd=changeset;node=1b3ddd2693b5 author: andrew date: Fri Nov 13 05:05:36 2015 +0000 PR2557: Forwardport Fedora font configuration support -- 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 11 18:26:59 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 18:26:59 +0000 Subject: [Bug 2557] [IcedTea7] Update Gentoo font configuration and allow font directory to be specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2557 --- Comment #8 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7-forest/jdk?cmd=changeset;node=09c2cc84d451 author: andrew date: Fri Nov 13 05:11:53 2015 +0000 PR2557: Forwardport Gentoo font configuration support -- 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 11 18:27:06 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 18:27:06 +0000 Subject: [Bug 2710] [IcedTea7] Backport "8140620: Find and load default.sf2 as the default soundbank on Linux" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2710 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7-forest/jdk?cmd=changeset;node=79e4644bd404 author: omajid date: Tue Oct 27 15:19:15 2015 -0400 8140620, PR2710: Find and load default.sf2 as the default soundbank on Linux Reviewed-by: serb -- 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 11 18:27:13 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 11 Jan 2016 18:27:13 +0000 Subject: [Bug 2712] [IcedTea7] Backport "8133196: HTTPS hostname invalid issue with InetAddress" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2712 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7-forest/jdk?cmd=changeset;node=ceb95f0d38d7 author: coffeys date: Tue Sep 01 09:37:34 2015 -0700 8133196, PR2712: HTTPS hostname invalid issue with InetAddress Reviewed-by: chegar, xuelei -- 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 12 00:09:57 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 12 Jan 2016 00:09:57 +0000 Subject: [Bug 2086] Failed to write core dump. Core dumps have been disabled. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2086 Yasumasa Suenaga changed: What |Removed |Added ---------------------------------------------------------------------------- CC|heapstats at icedtea.classpath | |.org | --- Comment #10 from Yasumasa Suenaga --- Crash of 7.0_79-b14: It is caused by LibreOffice. You should check BrowseBox::DoHideCursor() in /home/arnaud_Xubuntu-Vivid/Contrib/Tests/LibreOfficeDev_5.0.0.0.beta1/LibreOfficeDev_5.0.0.0.beta1_Linux_x86-64_deb/DEBS/install/opt/libreofficedev5.0/program/libmergedlo.so Crash of 7.0_85-b01: I don't know why crashed. It seems to be a problem in safepoint. If you want to know more details, you should get and analyze core image. -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jan 12 08:54:00 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 12 Jan 2016 08:54:00 +0000 Subject: [Bug 2086] Failed to write core dump. Core dumps have been disabled. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2086 myself5 at carbonrom.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #11 from myself5 at carbonrom.org --- I meanwhile managed to trace back my issue. It was caused by a strange combination of C Flags, glibc on Arch, and my personal dumbness. Thanks for your help though :) -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ptisnovs at icedtea.classpath.org Tue Jan 12 10:07:15 2016 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 12 Jan 2016 10:07:15 +0000 Subject: /hg/gfx-test: Another set of eight new tests added into BitBltUs... Message-ID: changeset ee8e53eae071 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=ee8e53eae071 author: Pavel Tisnovsky date: Tue Jan 12 11:10:43 2016 +0100 Another set of eight new tests added into BitBltUsingBgColor. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 120 +++++++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) diffs (142 lines): diff -r 33467bb51622 -r ee8e53eae071 ChangeLog --- a/ChangeLog Mon Jan 11 13:35:17 2016 +0100 +++ b/ChangeLog Tue Jan 12 11:10:43 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-12 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Another set of eight new tests added into BitBltUsingBgColor. + 2016-01-11 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 33467bb51622 -r ee8e53eae071 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Mon Jan 11 13:35:17 2016 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Tue Jan 12 11:10:43 2016 +0100 @@ -15016,6 +15016,126 @@ } /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntBGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntBGR(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntBGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntBGR(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntBGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntBGR(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntBGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntBGR(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntBGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntBGR(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntBGR(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntBGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntBGR(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_BGR}. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntBGRbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntBGR(image, graphics2d, Color.white); + } + + /** * Entry point to the test suite. * * @param args not used in this case From jvanek at redhat.com Tue Jan 12 16:57:23 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 12 Jan 2016 17:57:23 +0100 Subject: [rfc][icedtea-web] move itw (head only) to jdk 8 Message-ID: <56953073.10209@redhat.com> Hello! I would like to move future itw 1.7 to be jdk8+ compliant only. Will post patch tomorow, but.. general thoughts? J. From aazores at redhat.com Tue Jan 12 17:09:53 2016 From: aazores at redhat.com (Andrew Azores) Date: Tue, 12 Jan 2016 12:09:53 -0500 Subject: [rfc][icedtea-web] move itw (head only) to jdk 8 In-Reply-To: <56953073.10209@redhat.com> References: <56953073.10209@redhat.com> Message-ID: <56953361.5030601@redhat.com> On 12/01/16 11:57 AM, Jiri Vanek wrote: > Hello! > > I would like to move future itw 1.7 to be jdk8+ compliant only. > > Will post patch tomorow, but.. general thoughts? > > > J. What minimum versions of RHEL, CentOS, and Fedora will this restrict 1.7 to? It would be a very welcome change for ITW development but it sounds like it might also restrict any improvements that come with 1.7 to users of pretty recent distro releases. Some future backports might also become a little more involved but I don't think that would be too big of an issue. -- Thanks, Andrew Azores From jvanek at redhat.com Tue Jan 12 18:00:07 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 12 Jan 2016 19:00:07 +0100 Subject: [rfc][icedtea-web] move itw (head only) to jdk 8 In-Reply-To: <56953361.5030601@redhat.com> References: <56953073.10209@redhat.com> <56953361.5030601@redhat.com> Message-ID: <56953F27.2000005@redhat.com> On 01/12/2016 06:09 PM, Andrew Azores wrote: > On 12/01/16 11:57 AM, Jiri Vanek wrote: >> Hello! >> >> I would like to move future itw 1.7 to be jdk8+ compliant only. >> >> Will post patch tomorow, but.. general thoughts? >> >> >> J. > > What minimum versions of RHEL, CentOS, and Fedora will this restrict 1.7 to? It would be a very welcome change for ITW development but it sounds like it might also restrict any improvements that come with 1.7 to users of pretty recent distro releases. Some future backports might also become a little more involved but I don't think that would be too big of an issue. > I doubt that there is distro which do not have openjdk8 in repositories. To answer to your examples - none. All have it. (ok, rhel 5 does not, but it do not have ITW anyway). My main concern is maintainability. 1.7 is last planned heaving-features relase. That means nearly no maintenance interest. And less supported jdks == less maintenance and less supported jdks == less possible threads. Does it sounds better? J. From jvanek at redhat.com Tue Jan 12 18:01:08 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 12 Jan 2016 19:01:08 +0100 Subject: [rfc][icedtea-web] Uptream metada files In-Reply-To: <568FACFF.7090600@redhat.com> References: <568FACFF.7090600@redhat.com> Message-ID: <56953F64.7060104@redhat.com> On 01/08/2016 01:35 PM, Jiri Vanek wrote: > Hello! > > I have several files in fedora repo: > > Two maven fragments: > > > 4.0.0 > net.sourceforge.jnlp > %{name} > %{version} > > EOF > cat < $RPM_BUILD_ROOT/%{_mavenpomdir}/%{name}-plugin.pom > > 4.0.0 > sun.applet > %{name}-plugin > %{version} > > EOF > > Anf two attached for (not only gnome-)software. Those are using classapth resources as abse anyway. > > I would like to push them all four two usptream > For 1.6 only as plain files occuring in release tarball > > And for 1.7 as also installed stuff. > > Thoughts? > J. Here we go. 1.6+head. For head Iwouldlike (in some close futyure) include also some make-install changes J. -------------- next part -------------- A non-text attachment was scrubbed... Name: includeMetadata.patch Type: text/x-patch Size: 7921 bytes Desc: not available URL: From jvanek at redhat.com Tue Jan 12 18:02:42 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 12 Jan 2016 19:02:42 +0100 Subject: [rfc][icedtea-web] 2518 - If JNLP contains 'vendor' the generated .desktop-file contains invalid 'Vendor' entry key which invalidates file and inhibits installation Message-ID: <56953FC2.7000001@redhat.com> UNlike bug's attached patch - http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1382&action=diff - I would ratehr go with X-Vendor. But if somebody else thinks plain removal is cleaner/beter, I do nto isnists. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: xVendor.patch Type: text/x-patch Size: 601 bytes Desc: not available URL: From aazores at redhat.com Tue Jan 12 18:10:20 2016 From: aazores at redhat.com (Andrew Azores) Date: Tue, 12 Jan 2016 13:10:20 -0500 Subject: [rfc][icedtea-web] move itw (head only) to jdk 8 In-Reply-To: <56953F27.2000005@redhat.com> References: <56953073.10209@redhat.com> <56953361.5030601@redhat.com> <56953F27.2000005@redhat.com> Message-ID: <5695418C.6080902@redhat.com> On 12/01/16 01:00 PM, Jiri Vanek wrote: > On 01/12/2016 06:09 PM, Andrew Azores wrote: >> On 12/01/16 11:57 AM, Jiri Vanek wrote: >>> Hello! >>> >>> I would like to move future itw 1.7 to be jdk8+ compliant only. >>> >>> Will post patch tomorow, but.. general thoughts? >>> >>> >>> J. >> >> What minimum versions of RHEL, CentOS, and Fedora will this restrict >> 1.7 to? It would be a very welcome change for ITW development but it >> sounds like it might also restrict any improvements that come with 1.7 >> to users of pretty recent distro releases. Some future backports might >> also become a little more involved but I don't think that would be too >> big of an issue. >> > > I doubt that there is distro which do not have openjdk8 in repositories. > To answer to your examples - none. All have it. (ok, rhel 5 does not, > but it do not have ITW anyway). > > My main concern is maintainability. 1.7 is last planned > heaving-features relase. That means nearly no maintenance interest. And > less supported jdks == less maintenance and less supported jdks == less > possible threads. > > Does it sounds better? > J. Okay, that makes sense to me then. -- Thanks, Andrew Azores From aazores at redhat.com Tue Jan 12 18:15:44 2016 From: aazores at redhat.com (Andrew Azores) Date: Tue, 12 Jan 2016 13:15:44 -0500 Subject: [rfc][icedtea-web] 2518 - If JNLP contains 'vendor' the generated .desktop-file contains invalid 'Vendor' entry key which invalidates file and inhibits installation In-Reply-To: <56953FC2.7000001@redhat.com> References: <56953FC2.7000001@redhat.com> Message-ID: <569542D0.9060806@redhat.com> On 12/01/16 01:02 PM, Jiri Vanek wrote: > UNlike bug's attached patch - > http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1382&action=diff > - I would ratehr go with X-Vendor. > > But if somebody else thinks plain removal is cleaner/beter, I do nto > isnists. > > J. +1 for X-Vendor. It's nice information to include if available, but using it as a prefix to the .desktop filename sounds kludgy. -- Thanks, Andrew Azores From bugzilla-daemon at icedtea.classpath.org Tue Jan 12 18:24:41 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 12 Jan 2016 18:24:41 +0000 Subject: [Bug 2086] Failed to write core dump. Core dumps have been disabled. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2086 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |2.6.1 -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fridrich.strba at suse.com Wed Jan 13 09:12:17 2016 From: fridrich.strba at suse.com (Fridrich Strba) Date: Wed, 13 Jan 2016 10:12:17 +0100 Subject: Another jdk9 patch :) Message-ID: <569614F1.4020104@suse.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, good people, Our friends moved the sun.misc.HexDumpEncoder class to sun.security.util.HexDumpEncoder. That is why icedtea-web's configure will bomb on anything that is higher then tag jdk-9+98. I fixed it in a way that allows us to use the same code for 1.7 - 1.9. Please check whether I did not do anything stupid. Cheers F. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlaWFPEACgkQu9a1imXPdA8FmACffOrJ1o6naVE78yFPinyo/usp 428An1iDTNtzVGbcHWuJjJEkDPhQF+Tj =Dn3W -----END PGP SIGNATURE----- -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea-web-1.6.1-HexDumpEncoder.patch Type: text/x-patch Size: 3286 bytes Desc: not available URL: From ptisnovs at icedtea.classpath.org Wed Jan 13 11:12:34 2016 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 13 Jan 2016 11:12:34 +0000 Subject: /hg/gfx-test: Another set of eight new tests added into BitBltUs... Message-ID: changeset 0693c9739a0f in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=0693c9739a0f author: Pavel Tisnovsky date: Wed Jan 13 12:16:02 2016 +0100 Another set of eight new tests added into BitBltUsingBgColor. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 120 +++++++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) diffs (142 lines): diff -r ee8e53eae071 -r 0693c9739a0f ChangeLog --- a/ChangeLog Tue Jan 12 11:10:43 2016 +0100 +++ b/ChangeLog Wed Jan 13 12:16:02 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-13 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Another set of eight new tests added into BitBltUsingBgColor. + 2016-01-12 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r ee8e53eae071 -r 0693c9739a0f src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Tue Jan 12 11:10:43 2016 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Jan 13 12:16:02 2016 +0100 @@ -15136,6 +15136,126 @@ } /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntRGBbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntRGB(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntRGBbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntRGB(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntRGBbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntRGB(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntRGBbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntRGB(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntRGBbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntRGB(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntRGBbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntRGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntRGBbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntRGB(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_RGB}. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntRGBbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntRGB(image, graphics2d, Color.white); + } + + /** * Entry point to the test suite. * * @param args not used in this case From jvanek at redhat.com Wed Jan 13 12:24:52 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 13 Jan 2016 13:24:52 +0100 Subject: Another jdk9 patch :) In-Reply-To: <569614F1.4020104@suse.com> References: <569614F1.4020104@suse.com> Message-ID: <56964214.3040504@redhat.com> On 01/13/2016 10:12 AM, Fridrich Strba wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Hello, good people, > > Our friends moved the sun.misc.HexDumpEncoder class to > sun.security.util.HexDumpEncoder. That is why icedtea-web's configure > will bomb on anything that is higher then tag jdk-9+98. > > I fixed it in a way that allows us to use the same code for 1.7 - 1.9. > Please check whether I did not do anything stupid. Hello, thanx for patch. It looks reasonable. Few nits inline: > > Cheers > > F. > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2 > > iEYEARECAAYFAlaWFPEACgkQu9a1imXPdA8FmACffOrJ1o6naVE78yFPinyo/usp > 428An1iDTNtzVGbcHWuJjJEkDPhQF+Tj > =Dn3W > -----END PGP SIGNATURE----- > > > icedtea-web-1.6.1-HexDumpEncoder.patch > > > --- icedtea-web-1.6.1/acinclude.m4 2015-09-11 15:02:04.248280085 +0200 > +++ icedtea-web-1.6.1/acinclude.m4 2016-01-13 10:06:42.480544938 +0100 > @@ -500,6 +500,55 @@ > AC_PROVIDE([$0])dnl > ]) > > +dnl Macro to check for a Java class HexDumpEncoder > +AC_DEFUN([IT_CHECK_FOR_HEXDUMPENCODER],[ > +AC_REQUIRE([IT_FIND_JAVAC]) > +AC_REQUIRE([IT_FIND_JAVA]) > +AC_CACHE_CHECK([if HexDumpEncoder is available], it_cv_HEXDUMPENCODER, [ > +CLASS=sun/applet/Test.java > +BYTECODE=$(echo $CLASS|sed 's#\.java##') > +mkdir -p tmp.$$/$(dirname $CLASS) > +cd tmp.$$ > +cat << \EOF > $CLASS > +[/* [#]line __oline__ "configure" */ > +package sun.applet; Have it really to be sun.applet? Is new modular system preventing to have it in different package? > + > +import sun.misc.*; > +import sun.security.util.*; > + > +public class Test > +{ > + public static void main(String[] args) > + throws Exception > + { > + try { > + System.out.println(Class.forName("sun.misc.HexDumpEncoder")); > + } catch (ClassNotFoundException e) { > + System.out.println(Class.forName("sun.security.util.HexDumpEncoder")); Once this class is not found What is output of the macro (when used by configure). Simple "no" or the stacktrace? If whole stacktrace, then I would go with something: { public static void main(String[] args) throws Exception { try { System.out.println(Class.forName("sun.misc.HexDumpEncoder")); } catch (Exception e) { try { System.out.println(Class.forName("sun.security.util.HexDumpEncoder")); } catch (Exception e) { System.out.println("no"); System.exit(1) } } } } But I did not tried, so I may be compeltly worng. > + } > + } > +} > +] > +EOF > +if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then > + if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then > + it_cv_HEXDUMPENCODER=yes; > + else > + it_cv_HEXDUMPENCODER=no; > + fi > +else > + it_cv_HEXDUMPENCODER=no; > +fi > +]) > +rm -f $CLASS *.class > +cd .. > +# should be rmdir but has to be rm -rf due to sun.applet usage > +rm -rf tmp.$$ > +if test x"${it_cv_HEXDUMPENCODER}" = "xno"; then > + AC_MSG_ERROR([HexDumpEncoder not found.]) > +fi > +]) > + > AC_DEFUN_ONCE([IT_CHECK_FOR_MERCURIAL], > [ > AC_PATH_TOOL([HG],[hg]) > --- icedtea-web-1.6.1/configure.ac 2015-09-11 15:02:04.250280108 +0200 > +++ icedtea-web-1.6.1/configure.ac 2016-01-13 09:45:55.600618707 +0100 > @@ -68,7 +68,7 @@ > > dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin > dnl IT563 - NetX uses sun.security code > -dnl IT605 - NetX depends on sun.misc.HexDumpEncoder > +dnl IT605 - NetX depends on sun.misc HexDumpEncoder or sun.security.util.HexDumpEncoder > dnl IT570 - NetX depends on sun.applet.AppletViewPanel > dnl IT571 - NetX depends on com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager.java > dnl IT573 - Plugin depends on sun.awt,X11.XEmbeddedFrame.java > @@ -83,7 +83,7 @@ > IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_SECURITYCONSTANTS, [sun.security.util.SecurityConstants]) > IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_HOSTNAMECHECKER, [sun.security.util.HostnameChecker]) > IT_CHECK_FOR_CLASS(SUN_SECURITY_X509_X500NAME, [sun.security.x509.X500Name]) > -IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder]) > +IT_CHECK_FOR_HEXDUMPENCODER > IT_CHECK_FOR_CLASS(SUN_SECURITY_VALIDATOR_VALIDATOREXCEPTION, [sun.security.validator.ValidatorException]) > IT_CHECK_FOR_CLASS(COM_SUN_NET_SSL_INTERNAL_SSL_X509EXTENDEDTRUSTMANAGER, > [com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager]) > --- icedtea-web-1.6.1/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java 2015-09-11 15:02:04.346281206 +0200 > +++ icedtea-web-1.6.1/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java 2016-01-13 09:39:09.917717835 +0100 > @@ -44,7 +44,8 @@ > import java.security.cert.X509Certificate; > import java.security.MessageDigest; > > -import sun.misc.HexDumpEncoder; I would put comment there > +import sun.misc.*; and there, expalining why "*" is used. Most IDes is marking it as warning, so there is risk of evaluating thsoe stars and so reintroduce the bug. > +import sun.security.util.*; > import sun.security.x509.*; > import javax.swing.*; > import javax.swing.event.*; > Thanx! J. From fridrich.strba at suse.com Wed Jan 13 12:36:48 2016 From: fridrich.strba at suse.com (Fridrich Strba) Date: Wed, 13 Jan 2016 13:36:48 +0100 Subject: Another jdk9 patch :) In-Reply-To: <56964214.3040504@redhat.com> References: <569614F1.4020104@suse.com> <56964214.3040504@redhat.com> Message-ID: <569644E0.9030309@suse.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 13/01/16 13:24, Jiri Vanek wrote: > Have it really to be sun.applet? Is new modular system preventing > to have it in different package? I just kidnapped the previous macro that was testing for a generic class. But since it does not have a behaviour in case that class is not found, but just bombs with AC_MSG_ERROR, I modified it to look for the first location first and if not found for the second > Once this class is not found What is output of the macro (when used > by configure). Simple "no" or the stacktrace? The Class.forName("sun.security.util.HexDumpEncoder")) simply throws again the ClassNotFound exception and the result will be no and it will stop the configure with the AC_MSG_ERROR. >> -import sun.misc.HexDumpEncoder; > I would put comment there >> +import sun.misc.*; > and there, expalining why "*" is used. Most IDes is marking it as > warning, so there is risk of evaluating thsoe stars and so > reintroduce the bug. > >> +import sun.security.util.*; Yeah, let me comment there. It was basically the easiest way to handle that without having to know in the particular java file which full name the HexDumpEncoder has. I will comment about that. Cheers Fridrich -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlaWROAACgkQu9a1imXPdA+5KQCfdfBbP6Z52KyYMtAB5TGQCc3Y ubAAnj4TyQ5e81ZyX7+McRon4CbD6thP =7CBO -----END PGP SIGNATURE----- From jvanek at redhat.com Wed Jan 13 12:44:42 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 13 Jan 2016 13:44:42 +0100 Subject: Another jdk9 patch :) In-Reply-To: <569644E0.9030309@suse.com> References: <569614F1.4020104@suse.com> <56964214.3040504@redhat.com> <569644E0.9030309@suse.com> Message-ID: <569646BA.6020405@redhat.com> On 01/13/2016 01:36 PM, Fridrich Strba wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > On 13/01/16 13:24, Jiri Vanek wrote: >> Have it really to be sun.applet? Is new modular system preventing >> to have it in different package? > > I just kidnapped the previous macro that was testing for a generic Sure, I just saw the notes around the rm- rf a bit lower, so I thought its worthy to try in defualt package. > class. But since it does not have a behaviour in case that class is > not found, but just bombs with AC_MSG_ERROR, I modified it to look for > the first location first and if not found for the second > >> Once this class is not found What is output of the macro (when used >> by configure). Simple "no" or the stacktrace? > > The Class.forName("sun.security.util.HexDumpEncoder")) simply throws > again the ClassNotFound exception and the result will be no and it > will stop the configure with the AC_MSG_ERROR. good. > >>> -import sun.misc.HexDumpEncoder; >> I would put comment there >>> +import sun.misc.*; >> and there, expalining why "*" is used. Most IDes is marking it as >> warning, so there is risk of evaluating thsoe stars and so >> reintroduce the bug. >> >>> +import sun.security.util.*; > > Yeah, let me comment there. It was basically the easiest way to handle > that without having to know in the particular java file which full > name the HexDumpEncoder has. I will comment about that. Yes, thats what I have guessed. Nice workaround :) > > Cheers > > Fridrich > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2 > > iEYEARECAAYFAlaWROAACgkQu9a1imXPdA+5KQCfdfBbP6Z52KyYMtAB5TGQCc3Y > ubAAnj4TyQ5e81ZyX7+McRon4CbD6thP > =7CBO > -----END PGP SIGNATURE----- > From bugzilla-daemon at icedtea.classpath.org Wed Jan 13 16:13:44 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 13 Jan 2016 16:13:44 +0000 Subject: [Bug 1678] Could not read or parse the JNLP file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1678 --- Comment #5 from bej --- I have this same issue. I am trying to run Juniper VPN services on my FreeBSD machine. The way to do this on unix systems is clink on the link and download the jnlp file. You then run the jnlp file to start the VPN service. -- 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 13 16:39:13 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 13 Jan 2016 16:39:13 +0000 Subject: [Bug 1678] Could not read or parse the JNLP file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1678 --- Comment #6 from JiriVanek --- I will be happy to fix this, but I need url to test this. And I need to know that it is failing on latest 1.6. Can you pelase provide this? One juniper user was former ITW contributor, and he is silent for now. So maybe he is no longer juniper user or it is ok on latest release/head. -- 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 13 16:41:14 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 13 Jan 2016 16:41:14 +0000 Subject: [Bug 1678] Could not read or parse the JNLP file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1678 --- Comment #7 from JiriVanek --- But obviously there is something wrong with the jnupir jnlp file: parsing of the XML definition at line 1: Expected: '<' but got: '[' This is usually workaroundable by downlaoding file, fixing the error and running t from local hsot (or via fixing pipe) Still Iwould be happy to fix it (or to say you , to contact juniper developers to fix it:) -- 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 13 17:21:06 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 13 Jan 2016 17:21:06 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #2 from Franz.Preyser at gmx.at --- Hi! I am using Kubuntu 14.04 where IcedTea-web 1.5.3 is currently used. Still does not work... Installed IcedTea-web 1.6, but doesn't work either. Maybe something went wrong during installation... -- 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 13 18:08:11 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 13 Jan 2016 18:08:11 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #3 from JiriVanek --- May you please send me the url you are uisng? When I run the file in attachment, it is working really fine With future 1.6.2) 1.5 is terribly old. Ping kubuntu maintainers, they must update to 1.6.n (1.6.2 will go out pretty soon, as bugfixes multiplied) So hoepfully 1.6.2 will work for you (if it will not resoved before, which i hope) -- 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 13 18:24:36 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 13 Jan 2016 18:24:36 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #4 from Franz.Preyser at gmx.at --- >> May you please send me the url you are uisng? I am afraid, that is not possible, because you have to log in to reach that url... I am still not sure if I installed 1.6 correctly, however, I think I installed 1.6 and not 1.6.2. Actually I do not know where to get 1.6.2 from... Right at the moment I don't have the time to try around. I simply hope that Kubuntu will update to 1.6.n soon... In the meanwhile I'am using a wine-firefox-java - solution that works so far... However, thank you very much for addressing this 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 Wed Jan 13 18:34:27 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 13 Jan 2016 18:34:27 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #5 from JiriVanek --- yes, I know about login. I was trying also theirs web page so login dialog popped out. 1.6.1 is latest released ITW. 1.6.2 is under development, you would need to self build. I will try with *released* 1.6.1 tomorrow. -- 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 Wed Jan 13 18:40:08 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 13 Jan 2016 19:40:08 +0100 Subject: [rfc][icedtea-web] unconsistent behavior on NoClassDefFoundError Message-ID: <56969A08.2000603@redhat.com> Hello! In shadow of http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2219 and my resolution of http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2219#c4 I created reproducer to cover thisbehavior. jnlp-applet is behaving in contradiction abov taht #c4 statement of mine. It actually survives NoClassDefFoundError in init and start (unlike application and unlike browsers or -html ....) Currently I dont know how, but Iwill debug. Thoughts? J. -------------- next part -------------- A non-text attachment was scrubbed... Name: NoClassDeffReproducer.patch Type: text/x-patch Size: 52861 bytes Desc: not available URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 13 18:44:40 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 13 Jan 2016 18:44:40 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #6 from JiriVanek --- (In reply to JiriVanek from comment #5) > yes, I know about login. I was trying also theirs web page so login dialog > popped out. > > 1.6.1 is latest released ITW. 1.6.2 is under development, you would need to > self build. > I will try with *released* 1.6.1 tomorrow. Tried now. Worked. I wouyld be really happy if you can verify my results on 1.6.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 Wed Jan 13 19:00:12 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 13 Jan 2016 19:00:12 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #7 from Franz.Preyser at gmx.at --- Installed 1.6.1 now. Still does not work. Error-Message is: net.sourceforge.jnlp.LaunchException: Fatal: Lesefehler: Konnte die JNLP-Datei nicht lesen oder die Syntax analysieren. Die Datei kann m??glicherweise manuell heruntergeladen und als Fehlerbericht an das IcedTea-Web Team gesendet werden. at net.sourceforge.jnlp.Launcher.fromUrl(Launcher.java:490) at net.sourceforge.jnlp.Launcher.launch(Launcher.java:286) at net.sourceforge.jnlp.runtime.JnlpBoot.run(JnlpBoot.java:67) at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:245) at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:63) at java.security.AccessController.doPrivileged(Native Method) at net.sourceforge.jnlp.runtime.Boot.main(Boot.java:195) Caused by: net.sourceforge.jnlp.ParseException: Ung??ltige XML Dokumentsyntax. at net.sourceforge.jnlp.XMLParser.getRootNode(XmlParser.java:118) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at net.sourceforge.jnlp.Parser.getRootNode(Parser.java:1331) at net.sourceforge.jnlp.JNLPFile.parse(JNLPFile.java:781) at net.sourceforge.jnlp.JNLPFile.(JNLPFile.java:231) at net.sourceforge.jnlp.JNLPFile.(JNLPFile.java:213) at net.sourceforge.jnlp.JNLPFile.(JNLPFile.java:198) at net.sourceforge.jnlp.JNLPFile.(JNLPFile.java:184) at net.sourceforge.jnlp.Launcher.fromUrl(Launcher.java:454) ... 6 more Caused by: net.sourceforge.nanoxml.XMLParseException: XML Parse Exception during parsing of the XML definition at line 1: Expected: '<' but got: '???' at net.sourceforge.nanoxml.XMLElement.expectedInput(XMLElement.java:1172) at net.sourceforge.nanoxml.XMLElement.parseFromReader(XMLElement.java:500) at net.sourceforge.nanoxml.XMLElement.parseFromReader(XMLElement.java:461) at net.sourceforge.jnlp.XMLParser.getRootNode(XmlParser.java:114) ... 17 more -- 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 13 19:09:03 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 13 Jan 2016 19:09:03 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #8 from Franz.Preyser at gmx.at --- here is a link to the file, that is not working... https://www.dropbox.com/sh/n6olilo8clxf44w/AACMiGcEPtFN6q89jnnE9_fFa?dl=0 maybe it changed since the bug report in april... -- 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 13 22:06:39 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 13 Jan 2016 22:06:39 +0000 Subject: [Bug 2782] CACAO - Internal compiler error: java.lang.ArrayIndexOutOfBoundsException (ECJ race condition) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2782 --- Comment #2 from Stefan Ring --- That???s because not all memory barriers for the Java memory model have been implemented for ppc (neither for ppc64, so if it works, this is just pure luck). I hope I???ll have a chance to look into what???s missing 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 bugzilla-daemon at icedtea.classpath.org Thu Jan 14 08:03:20 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 08:03:20 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |INVALID --- Comment #9 from JiriVanek --- ok. Mystery solved. For some reason, your's distribution is building ITW without tagsoup. Please bug them. They may always reach me at http://mail.openjdk.java.net/mailman/listinfo/distro-pkg-dev if they needs help. And tehy definitely have to fix this. -- 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 14 09:07:19 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 14 Jan 2016 10:07:19 +0100 Subject: [rfc][icedtea-web] unconsistent behavior on NoClassDefFoundError In-Reply-To: <56969A08.2000603@redhat.com> References: <56969A08.2000603@redhat.com> Message-ID: <56976547.6010000@redhat.com> On 01/13/2016 07:40 PM, Jiri Vanek wrote: > Hello! > > In shadow of http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2219 > > and my resolution of http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2219#c4 > > I created reproducer to cover thisbehavior. > > jnlp-applet is behaving in contradiction abov taht #c4 statement of mine. It actually survives > NoClassDefFoundError in init and start (unlike application and unlike browsers or -html ....) > > > Currently I dont know how, but Iwill debug. > > Thoughts? > > > J. Ok. the behaviour seems moreover correct. The jnlpapplet dies, but its paint is calle d(with logic in star, it is usleless anyway). So pushing the reproducer and not dealing with issue aymore. J, From ptisnovs at icedtea.classpath.org Thu Jan 14 10:22:05 2016 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 14 Jan 2016 10:22:05 +0000 Subject: /hg/gfx-test: Added new tests into BitBltUsingBgColor. Message-ID: changeset cd5ed0b8ffd3 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=cd5ed0b8ffd3 author: Pavel Tisnovsky date: Thu Jan 14 11:25:33 2016 +0100 Added new tests into BitBltUsingBgColor. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 120 +++++++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) diffs (142 lines): diff -r 0693c9739a0f -r cd5ed0b8ffd3 ChangeLog --- a/ChangeLog Wed Jan 13 12:16:02 2016 +0100 +++ b/ChangeLog Thu Jan 14 11:25:33 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-14 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Added new tests into BitBltUsingBgColor. + 2016-01-13 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 0693c9739a0f -r cd5ed0b8ffd3 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Jan 13 12:16:02 2016 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Jan 14 11:25:33 2016 +0100 @@ -15256,6 +15256,126 @@ } /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGBbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGBbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGBbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGBbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGBbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGBbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGBbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB}. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGBbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB(image, graphics2d, Color.white); + } + + /** * Entry point to the test suite. * * @param args not used in this case From jvanek at icedtea.classpath.org Thu Jan 14 11:23:11 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 14 Jan 2016 11:23:11 +0000 Subject: /hg/icedtea-web: 4 new changesets Message-ID: changeset 2a1cb603f161 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2a1cb603f161 author: Jiri Vanek date: Thu Jan 14 10:28:14 2016 +0100 Added reprodcuer for NoClassDeffFoundError behavior changeset c888a5209fe4 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c888a5209fe4 author: Jiri Vanek date: Thu Jan 14 11:05:24 2016 +0100 Vendor desktop entry replaced by X-Vendor changeset bd6b07becb0b in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bd6b07becb0b author: Jiri Vanek date: Thu Jan 14 11:32:40 2016 +0100 Included maven artifacts and appstream metadata changeset 39239a9c6224 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=39239a9c6224 author: Jiri Vanek date: Thu Jan 14 12:22:37 2016 +0100 Added GenericName to desktop files, itweb-settings.desktop.in, javaws.desktop.in, policyeditor.desktop.in diffstat: ChangeLog | 43 + Makefile.am | 42 +- itweb-settings.desktop.in | 1 + javaws.desktop.in | 1 + metadata.in/icedtea-web-javaws.appdata.xml | 47 + metadata.in/icedtea-web-plugin.pom | 9 + metadata.in/icedtea-web.metainfo.xml | 12 + metadata.in/icedtea-web.pom | 9 + netx/net/sourceforge/jnlp/util/XDesktopEntry.java | 2 +- policyeditor.desktop.in | 1 + tests/reproducers/custom/NoClassDeff/resources/NoClassDeff.html.in | 47 + tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApp.jnlp.in | 56 + tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApplet.jnlp.in | 60 + tests/reproducers/custom/NoClassDeff/resources/NoClassDeffJnlpHref.html.in | 48 + tests/reproducers/custom/NoClassDeff/srcs/Makefile | 33 + tests/reproducers/custom/NoClassDeff/srcs/NoClassDeff.java | 154 ++ tests/reproducers/custom/NoClassDeff/testcases/NoClassDeffTest.java | 727 ++++++++++ 17 files changed, 1287 insertions(+), 5 deletions(-) diffs (truncated from 1426 to 500 lines): diff -r ea6a2a888131 -r 39239a9c6224 ChangeLog --- a/ChangeLog Thu Jan 07 16:59:45 2016 +0100 +++ b/ChangeLog Thu Jan 14 12:22:37 2016 +0100 @@ -1,3 +1,46 @@ +2016-01-14 Jiri Vanek + + Added GenericName to desktop files + * itweb-settings.desktop.in: + * javaws.desktop.in: + * policyeditor.desktop.in: + +2016-01-14 Jiri Vanek + + Included maven artifacts and appstream metadata + * .Makefile: (clean-local) and (.PHONY) now depends on clean-metadata. + ($(abs_top_builddir)/metadata) new target, copy metadata-in to metadata and + replace name, vendor and version check-meatdata, new stand alone target, checks + correctness of poms and xmls in metadata folder. (stamps/netx-dist.stamp) now + depends on $(abs_top_builddir)/metadata. clean-metadata, new target, removes + built metadata folder + * metadata.in/icedtea-web-javaws.appdata.xml: appstream metadata for javaws + * metadata.in/icedtea-web.metainfo.xml: appstream metadata for plugin + * metadata.in/icedtea-web-plugin.pom: pom for plugin.jar + * metadata.in/icedtea-web.pom: pom for netx jar + +2016-01-14 Jiri Vanek + + Vendor desktop entry replaced by X-Vendor + * ChangeLog: fixed date + * netx/net/sourceforge/jnlp/util/XDesktopEntry.java: if vendor is present in jnlp + instead of Vendor X-Vendor entry is generated to desktop file + +2016-01-14 Jiri Vanek + + Added reprodcuer for NoClassDeffFoundError behavior + * tests/reproducers/custom/NoClassDeff/srcs/NoClassDeff.java: small app including + inner class, which is missing in deployed jar. Then calling this class on demand + * tests/reproducers/custom/NoClassDeff/srcs/.Makefile: responsible for removing + the compiled inner class before jarring + * tests/reproducers/custom/NoClassDeff/testcases/NoClassDeffTest.java: + testing behavior when ClassNotFound/NoClassDefFound is thrown in various stages + * tests/reproducers/custom/NoClassDeff/resources/NoClassDeff.html.in: + * tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApp.jnlp.in: + * tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApplet.jnlp.in: + * tests/reproducers/custom/NoClassDeff/resources/NoClassDeffJnlpHref.html.in: + templates to launch app with instruction when to call LostClass and how to deal with it + 2016-01-07 David Cantrell Jiri Vanek Andrew John Hughes diff -r ea6a2a888131 -r 39239a9c6224 Makefile.am --- a/Makefile.am Thu Jan 07 16:59:45 2016 +0100 +++ b/Makefile.am Thu Jan 14 12:22:37 2016 +0100 @@ -221,7 +221,7 @@ export PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION) export EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in policyeditor.desktop.in icedteaweb-completion.in \ - itweb-settings.desktop.in launcher $(top_srcdir)/tests html-gen.sh NEW_LINE_IFS + itweb-settings.desktop.in launcher $(top_srcdir)/tests html-gen.sh NEW_LINE_IFS $(top_srcdir)/metadata.in # reproducers `D`shortcuts export DTEST_SERVER=-Dtest.server.dir=$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR) @@ -264,7 +264,7 @@ check-local: $(RHINO_TESTS) $(JUNIT_TESTS) clean-local: clean-netx clean-plugin clean-liveconnect \ - clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-icedteaweb-completion clean-tests clean-bootstrap-directory + clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-metadata clean-icedteaweb-completion clean-tests clean-bootstrap-directory if [ -e stamps ] ; then \ rmdir stamps ; \ fi @@ -272,7 +272,7 @@ .PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \ clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs clean-generated-docs clean-icedteaweb-completion\ clean-tests check-local clean-launchers stamps/check-pac-functions.stamp stamps/run-netx-unit-tests.stamp clean-netx-tests \ - clean-junit-runner clean-netx-unit-tests + clean-junit-runner clean-netx-unit-tests clean-metadata install-exec-local: ${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir) $(ICONS_DEST_DIR) $(BASH_CMPL_DEST_DIR) @@ -511,6 +511,37 @@ sed -i '/RhinoBasedPacEvaluator/ d' $@ endif +$(abs_top_builddir)/metadata: $(top_srcdir)/metadata.in + mkdir -p $(abs_top_builddir)/metadata-work ; \ + METAFILES=`ls $(top_srcdir)/metadata.in` ; \ + for F in $$METAFILES ; do \ + cat $(top_srcdir)/metadata.in/$$F | sed "s;%{name};$(PACKAGE_NAME);g" | sed "s;%{version};$(FULL_VERSION);g" > $(abs_top_builddir)/metadata-work/$$F ; \ + done ; \ + mv $(abs_top_builddir)/metadata-work $(abs_top_builddir)/metadata ; + +check-metadata: $(abs_top_builddir)/metadata + xmllint --noout $(abs_top_builddir)/metadata/* ; \ + if [ $$? -eq 0 ] ; then \ + echo "Passed: well formed" ; \ + else \ + echo "FAILED: well formed" ; \ + fi ; \ + xmllint --noout --schema http://maven.apache.org/xsd/maven-4.0.0.xsd $(abs_top_builddir)/metadata/*.pom ; \ + if [ $$? -eq 0 ] ; then \ + echo "Passed: valid poms" ; \ + else \ + echo "FAILED: valid poms" ; \ + fi ; \ + appstream-util validate $(abs_top_builddir)/metadata/*.appdata.xml $(abs_top_builddir)/metadata/*.metainfo.xml ; \ + if [ $$? -eq 0 ] ; then \ + echo "Passed: valid software descriptors" ; \ + else \ + echo "FAILED: valid software descriptors" ; \ + fi ; +# very strange results: +# appstreamcli validate $(abs_top_builddir)/metadata/*.appdata.xml $(abs_top_builddir)/metadata/*.metainfo.xml + + $(abs_top_builddir)/icedteaweb-completion: $(abs_top_srcdir)/icedteaweb-completion.in OPTIONS_COMMAND="$(SYSTEM_JRE_DIR)/bin/java -cp $(NETX_DIR) net.sourceforge.jnlp.OptionsDefinitions" ; \ JAVAWS=`$$OPTIONS_COMMAND javaws` ; \ @@ -590,7 +621,7 @@ mkdir -p stamps touch $@ -stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest stamps/generate-docs.stamp $(abs_top_builddir)/icedteaweb-completion +stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest stamps/generate-docs.stamp $(abs_top_builddir)/icedteaweb-completion $(abs_top_builddir)/metadata (cd $(NETX_DIR) ; \ mkdir -p lib ; \ $(SYSTEM_JDK_DIR)/bin/jar cfm lib/classes.jar \ @@ -708,6 +739,9 @@ clean-icedteaweb-completion: rm -f $(abs_top_builddir)/icedteaweb-completion +clean-metadata: + rm -rf $(abs_top_builddir)/metadata + # check # ========================== diff -r ea6a2a888131 -r 39239a9c6224 itweb-settings.desktop.in --- a/itweb-settings.desktop.in Thu Jan 07 16:59:45 2016 +0100 +++ b/itweb-settings.desktop.in Thu Jan 14 12:22:37 2016 +0100 @@ -3,6 +3,7 @@ Name[de]=IcedTea-Web Systemsteuerung Name[pl]=Panel sterowania IcedTea-Web Name[cs]=Ovl??dac?? panel IcedTea-Web +GenericName=Control Panel Comment=Configure IcedTea-Web (javaws and plugin) Comment[de]=Konfiguriert IcedTea-Web (javaws und Plug-in) Comment[pl]=Konfiguruj IcedTea-Web (javaws i wtyczk??) diff -r ea6a2a888131 -r 39239a9c6224 javaws.desktop.in --- a/javaws.desktop.in Thu Jan 07 16:59:45 2016 +0100 +++ b/javaws.desktop.in Thu Jan 14 12:22:37 2016 +0100 @@ -1,5 +1,6 @@ [Desktop Entry] Name=IcedTea Web Start +GenericName=Java Web Start Comment=IcedTea Application Launcher Exec=PATH_TO_JAVAWS %f Icon=javaws diff -r ea6a2a888131 -r 39239a9c6224 metadata.in/icedtea-web-javaws.appdata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.in/icedtea-web-javaws.appdata.xml Thu Jan 14 12:22:37 2016 +0100 @@ -0,0 +1,47 @@ + + + + javaws.desktop + %{name} + Java + Javaws implementation from OpenJDK + + +

+Free java implementation of jnlp launching protocol. +

+Originally based on NetX,but now bringing many improvements compared to proprietary implementations. +

+Powerful debug console, internal appletviewer, safe run-in-sandbox option, extendable "remember me" options and custom policy editor. +

+It have also possibility to turn all security off and just enjoy legacy web (on your own risk). All via simple itweb-settings gui. +

+ + http://icedtea.classpath.org/wiki/IcedTea-Web + CC0-1.0 + distro-pkg-dev at openjdk.java.net + +??? text/jnlp + + + + http://icedtea.classpath.org/wiki/images/Javaws_splash.png + Itw self describing splash screen + + + http://icedtea.classpath.org/wiki/images/Fullysigned.png + Run in sandbox dialog + + + http://icedtea.classpath.org/wiki/images/Policyeditor-in-use.png + Simplified view of policy editor + + + diff -r ea6a2a888131 -r 39239a9c6224 metadata.in/icedtea-web-plugin.pom --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.in/icedtea-web-plugin.pom Thu Jan 14 12:22:37 2016 +0100 @@ -0,0 +1,9 @@ + + 4.0.0 + sun.applet + %{name}-plugin + %{version} + diff -r ea6a2a888131 -r 39239a9c6224 metadata.in/icedtea-web.metainfo.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.in/icedtea-web.metainfo.xml Thu Jan 14 12:22:37 2016 +0100 @@ -0,0 +1,12 @@ + + + %{name} + epiphany.desktop + firefox.desktop + midori.desktop + Java + Browser plug-in implementation from OpenJDK. This plugin is running java applets + http://icedtea.classpath.org/wiki/IcedTea-Web + CC0-1.0 + distro-pkg-dev at openjdk.java.net + diff -r ea6a2a888131 -r 39239a9c6224 metadata.in/icedtea-web.pom --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.in/icedtea-web.pom Thu Jan 14 12:22:37 2016 +0100 @@ -0,0 +1,9 @@ + + 4.0.0 + net.sourceforge.jnlp + %{name} + %{version} + diff -r ea6a2a888131 -r 39239a9c6224 netx/net/sourceforge/jnlp/util/XDesktopEntry.java --- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Thu Jan 07 16:59:45 2016 +0100 +++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Thu Jan 14 12:22:37 2016 +0100 @@ -147,7 +147,7 @@ } if (file.getInformation().getVendor() != null) { - fileContents += "Vendor=" + sanitize(file.getInformation().getVendor()) + "\n"; + fileContents += "X-Vendor=" + sanitize(file.getInformation().getVendor()) + "\n"; } String exec; String title = "xdesktop writing"; diff -r ea6a2a888131 -r 39239a9c6224 policyeditor.desktop.in --- a/policyeditor.desktop.in Thu Jan 07 16:59:45 2016 +0100 +++ b/policyeditor.desktop.in Thu Jan 14 12:22:37 2016 +0100 @@ -1,5 +1,6 @@ [Desktop Entry] Name=IcedTea-Web Policy Editor +GenericName=Policy Tool Comment=Edit Java Applet policy and permission settings Exec=PATH_TO_POLICYEDITOR Icon=javaws diff -r ea6a2a888131 -r 39239a9c6224 tests/reproducers/custom/NoClassDeff/resources/NoClassDeff.html.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/NoClassDeff/resources/NoClassDeff.html.in Thu Jan 14 12:22:37 2016 +0100 @@ -0,0 +1,47 @@ + + + + + + + + + + + diff -r ea6a2a888131 -r 39239a9c6224 tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApp.jnlp.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApp.jnlp.in Thu Jan 14 12:22:37 2016 +0100 @@ -0,0 +1,56 @@ + + + + + + NoClassDeff + IcedTea + + PR2219 + + + + + + + + DIE_ON_STAGE + CATCH_ERROR + + diff -r ea6a2a888131 -r 39239a9c6224 tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApplet.jnlp.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApplet.jnlp.in Thu Jan 14 12:22:37 2016 +0100 @@ -0,0 +1,60 @@ + + + + + + NoClassDeff + IcedTea + + PR2219 + + + + + + + + + + + diff -r ea6a2a888131 -r 39239a9c6224 tests/reproducers/custom/NoClassDeff/resources/NoClassDeffJnlpHref.html.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/NoClassDeff/resources/NoClassDeffJnlpHref.html.in Thu Jan 14 12:22:37 2016 +0100 @@ -0,0 +1,48 @@ + + + + + + + + + + + + From bugzilla-daemon at icedtea.classpath.org Thu Jan 14 13:06:35 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 13:06:35 +0000 Subject: [Bug 2579] Spelling errors in console In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2579 --- Comment #3 from JiriVanek --- Thats generous offer. its single file: http://icedtea.classpath.org/hg/icedtea-web/file/39239a9c6224/netx/net/sourceforge/jnlp/resources/Messages.properties -- 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 14 13:06:49 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 13:06:49 +0000 Subject: [Bug 2518] If JNLP contains 'vendor' the generated .desktop-file contains invalid 'Vendor' entry key which invalidates file and inhibits installation In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2518 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #3 from JiriVanek --- will be in next 1.6 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 bugzilla-daemon at icedtea.classpath.org Thu Jan 14 13:11:35 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 13:11:35 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #4 from JiriVanek --- Ok. This is still broken. The workaround for you is to specify: deployment.manifest.attributes.check=NONE (or some subset you consider ok for you, see itweb-settings -verbose -help | grep deployment.manifest.attributes.check) to ~/.config/icedtea-web/deployment.properties I will try to fix this for 1.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 14 14:10:45 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 14:10:45 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #5 from Neon --- my RHEL 7 system, which now has been updated to 7.2 which upgraded to icedtea-web 1.6.1 (rhel-4.el7-x86_64), and now it no longer works: $ javaws.itweb http://nextmidas.techma.com/nxm343/htdocs/localshell.jnlp The application is a local file. Codebase validation is disabled. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details. The application is a local file. Codebase validation is disabled. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details. netx: Launch Error: Could not launch JNLP file. () net.sourceforge.jnlp.LaunchException: Fatal: Launch Error: Could not launch JNLP file. The application has not been initialized, for more information execute javaws/browser from the command line and send a bug report. at net.sourceforge.jnlp.Launcher.launchApplication(Launcher.java:580) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:936) Caused by: java.lang.NullPointerException at net.sourceforge.jnlp.SecurityDesc.getUrlPermissions(SecurityDesc.java:415) at net.sourceforge.jnlp.SecurityDesc.getSandBoxPermissions(SecurityDesc.java:382) at net.sourceforge.jnlp.SecurityDesc.getPermissions(SecurityDesc.java:325) at net.sourceforge.jnlp.runtime.ApplicationInstance.installEnvironment(ApplicationInstance.java:269) at net.sourceforge.jnlp.runtime.ApplicationInstance.initialize(ApplicationInstance.java:144) at net.sourceforge.jnlp.Launcher.launchApplication(Launcher.java:533) ... 1 more -- 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 14 14:22:45 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 14:22:45 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #6 from Neon --- adding deployment.manifest.attributes.check=NONE to to ~/.config/icedtea-web/deployment.properties did NOT workaround the issue both on my CentOS 6.7 icedtea-web 1.5.1 (rhel-1.el6-x86_64) nor my RHEL 7.2 icedtea-web 1.6.1 (rhel-4.el7-x86_64) - both continue to throw same NPE at net.sourceforge.jnlp.SecurityDesc.getUrlPermissions(SecurityDesc.java:415) -- 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 14 14:29:27 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 14:29:27 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #7 from JiriVanek --- I just tested and you are right. Sorry for that. This is known issue in 1.6, intorduced by run-in-sandbox feature and fixed by http://icedtea.classpath.org/hg/release/icedtea-web-1.6/rev/0d9faf51357d#l4.7 So This is alrady fixed in 1.6.2pre (so it will work for you with the workaround from next release). I had added your application to list of regularly run reproducers. Can you create red hat bugzilla, so I can propose 1.6.2 as 7.2 update? Up to now I did not planned this and it may be rejected form capacity reasons, but its worthy to try. Or can you live with self built 1.6.2? -- 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 14 14:30:59 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 14:30:59 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #8 from JiriVanek --- (In reply to Neon from comment #6) > adding deployment.manifest.attributes.check=NONE to to > ~/.config/icedtea-web/deployment.properties did NOT workaround the issue > both on my CentOS 6.7 icedtea-web 1.5.1 (rhel-1.el6-x86_64) nor my RHEL 7.2 > icedtea-web 1.6.1 (rhel-4.el7-x86_64) - both continue to throw same NPE at > net.sourceforge.jnlp.SecurityDesc.getUrlPermissions(SecurityDesc.java:415) Of course it did not. You have to set deployment.manifest.attributes.check=false to try simialr effect. But I did not tested in 1.5. 1.5 is not going ot have any updates and rhel 6 is moving to 1.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 Thu Jan 14 14:31:54 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 14:31:54 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Version|1.5 |hg -- 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 14 14:55:34 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 14:55:34 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #9 from Neon --- for icedtea-web 1.5.1 (rhel-1.el6-x86_64) setting deployment.manifest.attributes.check=false does work around the NPE. for icedtea-web 1.6.1 (rhel-4.el7-x86_64), I cannot set it to false. Setting deployment.manifest.attributes.check=NONE, did not address the NPE. rhel7.2 $ itweb-settings.itweb list | grep manifest Property "deployment.manifest.attributes.check" has incorrect value "false". Possible values (Values that can be used alone only): [ALL, NONE] (Values that can be used in combination separated by the delimiter "," with no space expected ): [ALAC, CODEBASE, ENTRYPOINT, PERMISSIONS, TRUSTED]. If RHEL 6 will be moving to icedtea-web 1.6.x, we really need this fix back-ported into 1.6.x. This issue is really for our end-users, so we cannot live with a self built 1.6.2. I will have to check with my sysadmin to see how we can submit a REDHAT support request. -- 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 14 15:03:54 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 15:03:54 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #10 from JiriVanek --- yes:) 1.6 deployment.manifest.attributes.check=NONE 1.5 deployment.manifest.attributes.check=false It is fixing the original issue of yours, but not the one from c#5 Issue from c#5 is fixed in 1.6.2 Please bug redhat with need of update of ITW to 1.6.2 for both rhel7 and rhel6.. I will be happy to update for you, but it may be harder to negotiate with management. But yes, they have thirs reason. (As in rhel 7 you request async z stream update for 7.2) -- 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 icedtea.classpath.org Thu Jan 14 15:29:04 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 14 Jan 2016 15:29:04 +0000 Subject: /hg/icedtea-web: Adapted to change in package of HexDumpEncoder ... Message-ID: changeset 968f54348b70 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=968f54348b70 author: Jiri Vanek date: Thu Jan 14 16:28:48 2016 +0100 Adapted to change in package of HexDumpEncoder (1.8 sun.misc.HexDumpEncoder, 1.9 sun.security.util.HexDumpEncoder) * acinclude.m4: added new macro IT_CHECK_FOR_HEXDUMPENCODER, which tries both locations of HexDumpEncoder * configure.ac: now uses IT_CHECK_FOR_HEXDUMPENCODER instead of IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder]) * netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java: added imports to both import sun.misc.*; and import sun.security.util.*; diffstat: ChangeLog | 12 ++ acinclude.m4 | 49 +++++++++++ configure.ac | 4 +- netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java | 9 +- 4 files changed, 71 insertions(+), 3 deletions(-) diffs (119 lines): diff -r 39239a9c6224 -r 968f54348b70 ChangeLog --- a/ChangeLog Thu Jan 14 12:22:37 2016 +0100 +++ b/ChangeLog Thu Jan 14 16:28:48 2016 +0100 @@ -1,3 +1,15 @@ +2016-01-14 Jiri Vanek + Fridrich Strba + + Adapted to change in package of HexDumpEncoder (1.8 sun.misc.HexDumpEncoder, + 1.9 sun.security.util.HexDumpEncoder) + * acinclude.m4: added new macro IT_CHECK_FOR_HEXDUMPENCODER, which tries both + locations of HexDumpEncoder + * configure.ac: now uses IT_CHECK_FOR_HEXDUMPENCODER instead of + IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder]) + * netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java: added imports + to both import sun.misc.*; and import sun.security.util.*; + 2016-01-14 Jiri Vanek Added GenericName to desktop files diff -r 39239a9c6224 -r 968f54348b70 acinclude.m4 --- a/acinclude.m4 Thu Jan 14 12:22:37 2016 +0100 +++ b/acinclude.m4 Thu Jan 14 16:28:48 2016 +0100 @@ -500,6 +500,55 @@ AC_PROVIDE([$0])dnl ]) +dnl Macro to check for a Java class HexDumpEncoder +AC_DEFUN([IT_CHECK_FOR_HEXDUMPENCODER],[ +AC_REQUIRE([IT_FIND_JAVAC]) +AC_REQUIRE([IT_FIND_JAVA]) +AC_CACHE_CHECK([if HexDumpEncoder is available], it_cv_HEXDUMPENCODER, [ +CLASS=sun/applet/Test.java +BYTECODE=$(echo $CLASS|sed 's#\.java##') +mkdir -p tmp.$$/$(dirname $CLASS) +cd tmp.$$ +cat << \EOF > $CLASS +[/* [#]line __oline__ "configure" */ +package sun.applet; + +import sun.misc.*; +import sun.security.util.*; + +public class Test +{ + public static void main(String[] args) + throws Exception + { + try { + System.out.println(Class.forName("sun.misc.HexDumpEncoder")); + } catch (ClassNotFoundException e) { + System.out.println(Class.forName("sun.security.util.HexDumpEncoder")); + } + } +} +] +EOF +if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_HEXDUMPENCODER=yes; + else + it_cv_HEXDUMPENCODER=no; + fi +else + it_cv_HEXDUMPENCODER=no; +fi +]) +rm -f $CLASS *.class +cd .. +# should be rmdir but has to be rm -rf due to sun.applet usage +rm -rf tmp.$$ +if test x"${it_cv_HEXDUMPENCODER}" = "xno"; then + AC_MSG_ERROR([HexDumpEncoder not found.]) +fi +]) + AC_DEFUN_ONCE([IT_CHECK_FOR_MERCURIAL], [ AC_PATH_TOOL([HG],[hg]) diff -r 39239a9c6224 -r 968f54348b70 configure.ac --- a/configure.ac Thu Jan 14 12:22:37 2016 +0100 +++ b/configure.ac Thu Jan 14 16:28:48 2016 +0100 @@ -68,7 +68,7 @@ dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin dnl IT563 - NetX uses sun.security code -dnl IT605 - NetX depends on sun.misc.HexDumpEncoder +dnl IT605 - NetX depends on sun.misc HexDumpEncoder or sun.security.util.HexDumpEncoder dnl IT570 - NetX depends on sun.applet.AppletViewPanel dnl IT571 - NetX depends on com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager.java dnl IT573 - Plugin depends on sun.awt,X11.XEmbeddedFrame.java @@ -83,7 +83,7 @@ IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_SECURITYCONSTANTS, [sun.security.util.SecurityConstants]) IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_HOSTNAMECHECKER, [sun.security.util.HostnameChecker]) IT_CHECK_FOR_CLASS(SUN_SECURITY_X509_X500NAME, [sun.security.x509.X500Name]) -IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder]) +IT_CHECK_FOR_HEXDUMPENCODER IT_CHECK_FOR_CLASS(SUN_SECURITY_VALIDATOR_VALIDATOREXCEPTION, [sun.security.validator.ValidatorException]) IT_CHECK_FOR_CLASS(COM_SUN_NET_SSL_INTERNAL_SSL_X509EXTENDEDTRUSTMANAGER, [com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager]) diff -r 39239a9c6224 -r 968f54348b70 netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java --- a/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java Thu Jan 14 12:22:37 2016 +0100 +++ b/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java Thu Jan 14 16:28:48 2016 +0100 @@ -43,8 +43,15 @@ import java.security.cert.CertPath; import java.security.cert.X509Certificate; import java.security.MessageDigest; +/** + * Do not remove this two unused imports, nor expands its "*" call. + * It is workaround to allow itw to run on jdk8 and older and also on jdk9 and newer + */ -import sun.misc.HexDumpEncoder; +// jdk8 is using sun.misc.HexDumpEncoder, +import sun.misc.*; +// jdk9 is using sun.security.util.HexDumpEncoder +import sun.security.util.*; import sun.security.x509.*; import javax.swing.*; import javax.swing.event.*; From bugzilla-daemon at icedtea.classpath.org Thu Jan 14 17:47:41 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 17:47:41 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu.andrew at redhat.com --- Comment #10 from Andrew John Hughes --- If tagsoup is required, isn't it an IcedTea-Web bug that it's allowing it to be built without it? -- 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 14 19:10:54 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 19:10:54 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #11 from JiriVanek --- (In reply to Andrew John Hughes from comment #10) > If tagsoup is required, isn't it an IcedTea-Web bug that it's allowing it to > be built without it? tagsoup is opttional since begginig. I agree that at least more visible warning is probaboy good idea[when itw is built/run without tagsoup] it is optional since 1.4 maybe its good idea to make it mandatory for 1.7. thoughts? -- 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 14 20:04:29 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 20:04:29 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #12 from Andrew John Hughes --- I remember it being optional, which is why I found your response odd. You can't really blame the distribution if you've allowed such a configuration. Thus, there is a bug here, if just that it should tell the user "Hey, you need to rebuild with TagSoup support. I can't handle this file without it.". The average user isn't going to guess that from an exception. Making it mandatory would make support easier, but I guess you might get some backlash from the additional dependencies that introduces. IcedTea-Web still tends to be associated with the JDK, because we bundled it with IcedTea for a good while and Oracle still bundle theirs. As tagsoup is Java itself, it's going to drag in a host of other Java dependencies too. It's worth discussing on the mailing list, I think. I notice Gentoo provide it as an option to users, and a vaguely remember there being some negative feedback about it before that. -- 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 14 20:31:28 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 20:31:28 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #11 from Neon --- I just created CASE 01567161 NullPointerException in icedtea-web 1.6.1 for RHEL 7.2 -- 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 14 21:40:51 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 21:40:51 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 James Le Cuirot changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |chewi at gentoo.org --- Comment #13 from James Le Cuirot --- As Gentoo Java lead, I would prefer that it is kept optional. Although tagsoup has no runtime dependencies, it does need either Xalan or Saxon at build time, both of which are quite heavy and have their own string of dependencies. I don't know exactly what tagsoup does for IcedTea-Web but I get the impression it isn't needed in most cases so if keeping it optional isn't inconvenient from a technical perspective then please don't change that. I imagine a helpful warning would be fairly trivial to add? Gentoo users would generally know what it means and what to do about it. -- 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 14 22:31:12 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 14 Jan 2016 22:31:12 +0000 Subject: [Bug 2786] New: IllegalStateException zip file closed when accessing Jar file over HTTP Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2786 Bug ID: 2786 Summary: IllegalStateException zip file closed when accessing Jar file over HTTP Product: IcedTea-Web Version: 1.5 Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P5 Component: NetX (javaws) Assignee: jvanek at redhat.com Reporter: trineo at gmail.com CC: unassigned at icedtea.classpath.org This works fine with Oracle's javaws from JDK 6, JDK 7, and JDK 8 $ javaws http://nextmidas.techma.com/nxm353/htdocs/shell.jnlp running with icedtea-web 1.5.1 (rhel-1.el6-x86_64) $ javaws.itweb http://nextmidas.techma.com/nxm353/htdocs/shell.jnlp .. [ITW-JAVAWS][MESSAGE_DEBUG][Thu Jan 14 15:57:21 EST 2016][net.sourceforge.jnlp.runtime.JNLPProxySelector.select(JNLPProxySelector.java:211)] NETX Thread# 1c5baf07, name NeXtMidas SHELLGUI 3.5.3 Selected proxies: [DIRECT] java.lang.IllegalStateException: zip file closed at java.util.zip.ZipFile.ensureOpen(ZipFile.java:634) at java.util.zip.ZipFile.getEntry(ZipFile.java:305) at java.util.jar.JarFile.getEntry(JarFile.java:227) at sun.net.www.protocol.jar.JarURLConnection.connect(JarURLConnection.java:132) at sun.net.www.protocol.jar.JarURLConnection.getJarFile(JarURLConnection.java:89) at nxm.sys.lib.JarResource.getFile(JarResource.java:102) at nxm.sys.lib.JarResource.exists(JarResource.java:110) at nxm.sys.lib.BaseFile.find(BaseFile.java:279) at nxm.sys.lib.Shell.configure(Shell.java:782) at nxm.sys.lib.Shell.open(Shell.java:318) at nxm.sys.lib.Shell.run(Shell.java:244) at nxm.sys.lib.Shell.run(Shell.java:218) at nxm.sys.lib.Shell.runNew(Shell.java:207) at nxm.sys.lib.Webstart.main(Webstart.java:25) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at net.sourceforge.jnlp.Launcher.launchApplication(Launcher.java:565) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:905) --- running with icedtea-web 1.6.1 (rhel-4.el7-x86_64) $ javaws.itweb http://nextmidas.techma.com/nxm353/htdocs/shell.jnlp java.lang.IllegalStateException: zip file closed at java.util.zip.ZipFile.ensureOpen(ZipFile.java:669) at java.util.zip.ZipFile.getEntry(ZipFile.java:309) at java.util.jar.JarFile.getEntry(JarFile.java:240) at sun.net.www.protocol.jar.JarURLConnection.connect(JarURLConnection.java:132) at sun.net.www.protocol.jar.JarURLConnection.getJarFile(JarURLConnection.java:89) at nxm.sys.lib.JarResource.getFile(JarResource.java:102) at nxm.sys.lib.JarResource.exists(JarResource.java:110) at nxm.sys.lib.BaseFile.find(BaseFile.java:279) at nxm.sys.lib.Shell.configure(Shell.java:782) at nxm.sys.lib.Shell.open(Shell.java:318) at nxm.sys.lib.Shell.run(Shell.java:244) at nxm.sys.lib.Shell.run(Shell.java:218) at nxm.sys.lib.Shell.runNew(Shell.java:207) at nxm.sys.lib.Webstart.main(Webstart.java:25) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:497) at net.sourceforge.jnlp.Launcher.launchApplication(Launcher.java:574) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:936) == our code is doing something like the below (shown without type checks) to show the flow: public boolean exists(String urlstr) { URL url = new URL(urlstr); // #1 JarURLConnection conn = (JarURLConnection) url.openConnection(); // #2 JarFile jarFile = conn.getJarFile(); // #3 // do some checks and set boolean results // #4 jarFile.close(); // #5 return result; // #6 } we call exists("jar:...."); multiple times pointing to the same URL which seems to be the cause of this issue. If we comment out line #5, we don't see the issue but this leave potential for a resource leak (at least with Oracle's Java) Again, with the above, it works fine with Oracle's javaws from JRE/JDK 6, 7, and 8. -- 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 15 08:34:55 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 15 Jan 2016 08:34:55 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #14 from JiriVanek --- Tagsoup is fixing malformed "xmls" (so jnlp files fo javaws and html files for javaws -html) to be well-formed. It have pros and cons. In ideal world, tagsoup would be not necessary. -- 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 15 09:41:15 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 15 Jan 2016 09:41:15 +0000 Subject: [Bug 2786] IllegalStateException zip file closed when accessing Jar file over HTTP In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2786 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Priority|P5 |P2 Status|NEW |ASSIGNED --- Comment #1 from JiriVanek --- Befor I look into this, isn't something like public boolean exists(String urlstr) { URL url = new URL(urlstr); // #1 JarURLConnection conn = (JarURLConnection) url.openConnection(); // #2 JarFile jarFile = conn.getJarFile(); // #3 // do some checks and set boolean results // #4 try{ jarFile.close(); // #5 }catch(exception ex){log(ex)} return result; // #6 } Obvious fix? If it is unacceptable why? This may not be itw, but openjdk bug. Also, may change to "public boolean exists(URL urlstr)" help? Maybe when url is garbagecollected, it closes. Proprietary javaws/plugin is including quite a lot of classes overrding base jre classes. Sometimes really weird things pass in it. -- 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 15 09:49:28 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 15 Jan 2016 09:49:28 +0000 Subject: [Bug 2137] IcedTea Web no longer works with Dell Poweredge Remote Access Consoles as of 1.5.1 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2137 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #3 from JiriVanek --- Hello! May you please try with 1.6? iDracs and other dell remote accesses are known to be working. But this exact case odes not sound familiar to me. Also, is there some url where I can debug(I doubt:( )? Attached files looks very valid, and ITW read them fine. But codebase is private network. The java.io.FileNotFoundException: /home/philip/.config/icedtea-web/deployment.properties is harmless exception (and removed in 1.6) The "netx: Read Error: Could not read or parse the JNLP file. (name can't be null)" msotly means that something was not even downloaded. Th eprivate network is https, there were changes in jdk in https security handling, and some older implementations were disabled. So if that private network was tesint machine, the used algorithms could be disabled. You cen reenable them in java.securty file of yours java installation. -- 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 15 09:56:15 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 15 Jan 2016 09:56:15 +0000 Subject: [Bug 2092] Error report: An exception has occurred In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2092 --- Comment #2 from JiriVanek --- Also: Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: A fatal error occurred while trying to verify jars. An exception has been thrown in class JarCertVerifier. Being unable to read the cacerts or trusted.certs files could be a possible cause for this exception.: Invalid signature file digest for Manifest main attributes Is qute suggesting message. Were you able to workaround the issue? Another helpers may be -nosecurity or -Xtrustall swithces. -- 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 15 10:01:59 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 15 Jan 2016 10:01:59 +0000 Subject: [Bug 2092] LaunchException: Fatal: Initialization Error: A fatal error occurred while trying to verify jars. An exception has been thrown in class JarCertVerifier In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2092 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Error report: An exception |LaunchException: Fatal: |has occurred |Initialization Error: A | |fatal error occurred while | |trying to verify jars. An | |exception has been thrown | |in class JarCertVerifier -- 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 icedtea.classpath.org Fri Jan 15 10:55:21 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Fri, 15 Jan 2016 10:55:21 +0000 Subject: /hg/release/icedtea-web-1.6: 5 new changesets Message-ID: changeset e017136a9c45 in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=e017136a9c45 author: Jiri Vanek date: Thu Jan 14 10:28:14 2016 +0100 Added reprodcuer for NoClassDeffFoundError behavior changeset 0d8f8380c811 in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=0d8f8380c811 author: Jiri Vanek date: Thu Jan 14 11:05:24 2016 +0100 Vendor desktop entry replaced by X-Vendor changeset fc1cd3b761d4 in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=fc1cd3b761d4 author: Jiri Vanek date: Fri Jan 15 11:54:22 2016 +0100 Included maven artifacts and appstream metadata changeset 030e419bfb61 in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=030e419bfb61 author: Jiri Vanek date: Thu Jan 14 12:22:37 2016 +0100 Added GenericName to desktop files, itweb-settings.desktop.in, javaws.desktop.in, policyeditor.desktop.in changeset 7a3e06b56eba in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=7a3e06b56eba author: Jiri Vanek date: Thu Jan 14 16:28:48 2016 +0100 Adapted to change in package of HexDumpEncoder (1.8 sun.misc.HexDumpEncoder, 1.9 sun.security.util.HexDumpEncoder) * acinclude.m4: added new macro IT_CHECK_FOR_HEXDUMPENCODER, which tries both locations of HexDumpEncoder * configure.ac: now uses IT_CHECK_FOR_HEXDUMPENCODER instead of IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder]) * netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java: added imports to both import sun.misc.*; and import sun.security.util.*; diffstat: ChangeLog | 55 + Makefile.am | 42 +- acinclude.m4 | 49 + configure.ac | 4 +- itweb-settings.desktop.in | 1 + javaws.desktop.in | 1 + metadata.in/icedtea-web-javaws.appdata.xml | 47 + metadata.in/icedtea-web-plugin.pom | 9 + metadata.in/icedtea-web.metainfo.xml | 12 + metadata.in/icedtea-web.pom | 9 + netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java | 9 +- netx/net/sourceforge/jnlp/util/XDesktopEntry.java | 2 +- policyeditor.desktop.in | 1 + tests/reproducers/custom/NoClassDeff/resources/NoClassDeff.html.in | 47 + tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApp.jnlp.in | 56 + tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApplet.jnlp.in | 60 + tests/reproducers/custom/NoClassDeff/resources/NoClassDeffJnlpHref.html.in | 48 + tests/reproducers/custom/NoClassDeff/srcs/Makefile | 33 + tests/reproducers/custom/NoClassDeff/srcs/NoClassDeff.java | 154 ++ tests/reproducers/custom/NoClassDeff/testcases/NoClassDeffTest.java | 727 ++++++++++ 20 files changed, 1358 insertions(+), 8 deletions(-) diffs (truncated from 1538 to 500 lines): diff -r 834746c2a271 -r 7a3e06b56eba ChangeLog --- a/ChangeLog Thu Jan 07 15:33:12 2016 +0100 +++ b/ChangeLog Thu Jan 14 16:28:48 2016 +0100 @@ -1,3 +1,58 @@ +2016-01-14 Jiri Vanek + Fridrich Strba + + Adapted to change in package of HexDumpEncoder (1.8 sun.misc.HexDumpEncoder, + 1.9 sun.security.util.HexDumpEncoder) + * acinclude.m4: added new macro IT_CHECK_FOR_HEXDUMPENCODER, which tries both + locations of HexDumpEncoder + * configure.ac: now uses IT_CHECK_FOR_HEXDUMPENCODER instead of + IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder]) + * netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java: added imports + to both import sun.misc.*; and import sun.security.util.*; + +2016-01-14 Jiri Vanek + + Added GenericName to desktop files + * itweb-settings.desktop.in: + * javaws.desktop.in: + * policyeditor.desktop.in: + +2016-01-14 Jiri Vanek + + Included maven artifacts and appstream metadata + * .Makefile: (clean-local) and (.PHONY) now depends on clean-metadata. + ($(abs_top_builddir)/metadata) new target, copy metadata-in to metadata and + replace name, vendor and version check-meatdata, new stand alone target, checks + correctness of poms and xmls in metadata folder. (stamps/netx-dist.stamp) now + depends on $(abs_top_builddir)/metadata. clean-metadata, new target, removes + built metadata folder + * metadata.in/icedtea-web-javaws.appdata.xml: appstream metadata for javaws + * metadata.in/icedtea-web.metainfo.xml: appstream metadata for plugin + * metadata.in/icedtea-web-plugin.pom: pom for plugin.jar + * metadata.in/icedtea-web.pom: pom for netx jar + +2016-01-14 Jiri Vanek + + Vendor desktop entry replaced by X-Vendor + * ChangeLog: fixed date + * netx/net/sourceforge/jnlp/util/XDesktopEntry.java: if vendor is present in jnlp + instead of Vendor X-Vendor entry is generated to desktop file + +2016-01-14 Jiri Vanek + + Added reprodcuer for NoClassDeffFoundError behavior + * tests/reproducers/custom/NoClassDeff/srcs/NoClassDeff.java: small app including + inner class, which is missing in deployed jar. Then calling this class on demand + * tests/reproducers/custom/NoClassDeff/srcs/.Makefile: responsible for removing + the compiled inner class before jarring + * tests/reproducers/custom/NoClassDeff/testcases/NoClassDeffTest.java: + testing behavior when ClassNotFound/NoClassDefFound is thrown in various stages + * tests/reproducers/custom/NoClassDeff/resources/NoClassDeff.html.in: + * tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApp.jnlp.in: + * tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApplet.jnlp.in: + * tests/reproducers/custom/NoClassDeff/resources/NoClassDeffJnlpHref.html.in: + templates to launch app with instruction when to call LostClass and how to deal with it + 2016-01-07 David Cantrell Jiri Vanek Andrew John Hughes diff -r 834746c2a271 -r 7a3e06b56eba Makefile.am --- a/Makefile.am Thu Jan 07 15:33:12 2016 +0100 +++ b/Makefile.am Thu Jan 14 16:28:48 2016 +0100 @@ -220,7 +220,7 @@ export PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION) export EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in policyeditor.desktop.in icedteaweb-completion \ - itweb-settings.desktop.in launcher $(top_srcdir)/tests html-gen.sh NEW_LINE_IFS + itweb-settings.desktop.in launcher $(top_srcdir)/tests html-gen.sh NEW_LINE_IFS $(top_srcdir)/metadata.in # reproducers `D`shortcuts export DTEST_SERVER=-Dtest.server.dir=$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR) @@ -263,7 +263,7 @@ check-local: $(RHINO_TESTS) $(JUNIT_TESTS) clean-local: clean-netx clean-plugin clean-liveconnect \ - clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-tests clean-bootstrap-directory + clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-metadata clean-tests clean-bootstrap-directory if [ -e stamps ] ; then \ rmdir stamps ; \ fi @@ -271,7 +271,7 @@ .PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \ clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs clean-generated-docs \ clean-tests check-local clean-launchers stamps/check-pac-functions.stamp stamps/run-netx-unit-tests.stamp clean-netx-tests \ - clean-junit-runner clean-netx-unit-tests + clean-junit-runner clean-netx-unit-tests clean-metadata install-exec-local: ${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir) $(ICONS_DEST_DIR) @@ -508,6 +508,37 @@ sed -i '/RhinoBasedPacEvaluator/ d' $@ endif +$(abs_top_builddir)/metadata: $(top_srcdir)/metadata.in + mkdir -p $(abs_top_builddir)/metadata-work ; \ + METAFILES=`ls $(top_srcdir)/metadata.in` ; \ + for F in $$METAFILES ; do \ + cat $(top_srcdir)/metadata.in/$$F | sed "s;%{name};$(PACKAGE_NAME);g" | sed "s;%{version};$(FULL_VERSION);g" > $(abs_top_builddir)/metadata-work/$$F ; \ + done ; \ + mv $(abs_top_builddir)/metadata-work $(abs_top_builddir)/metadata ; + +check-metadata: $(abs_top_builddir)/metadata + xmllint --noout $(abs_top_builddir)/metadata/* ; \ + if [ $$? -eq 0 ] ; then \ + echo "Passed: well formed" ; \ + else \ + echo "FAILED: well formed" ; \ + fi ; \ + xmllint --noout --schema http://maven.apache.org/xsd/maven-4.0.0.xsd $(abs_top_builddir)/metadata/*.pom ; \ + if [ $$? -eq 0 ] ; then \ + echo "Passed: valid poms" ; \ + else \ + echo "FAILED: valid poms" ; \ + fi ; \ + appstream-util validate $(abs_top_builddir)/metadata/*.appdata.xml $(abs_top_builddir)/metadata/*.metainfo.xml ; \ + if [ $$? -eq 0 ] ; then \ + echo "Passed: valid software descriptors" ; \ + else \ + echo "FAILED: valid software descriptors" ; \ + fi ; +# very strange results: +# appstreamcli validate $(abs_top_builddir)/metadata/*.appdata.xml $(abs_top_builddir)/metadata/*.metainfo.xml + + stamps/generate-docs.stamp: stamps/netx.stamp mkdir -p "$(DOCS_DIR)" ; \ HTML_DOCS_TARGET_DIR="$(DOCS_DIR)/html" ; \ @@ -575,7 +606,7 @@ mkdir -p stamps touch $@ -stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest stamps/generate-docs.stamp +stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest stamps/generate-docs.stamp $(abs_top_builddir)/metadata (cd $(NETX_DIR) ; \ mkdir -p lib ; \ $(SYSTEM_JDK_DIR)/bin/jar cfm lib/classes.jar \ @@ -691,6 +722,9 @@ rm -f stamps/generate-docs.stamp +clean-metadata: + rm -rf $(abs_top_builddir)/metadata + # check # ========================== diff -r 834746c2a271 -r 7a3e06b56eba acinclude.m4 --- a/acinclude.m4 Thu Jan 07 15:33:12 2016 +0100 +++ b/acinclude.m4 Thu Jan 14 16:28:48 2016 +0100 @@ -500,6 +500,55 @@ AC_PROVIDE([$0])dnl ]) +dnl Macro to check for a Java class HexDumpEncoder +AC_DEFUN([IT_CHECK_FOR_HEXDUMPENCODER],[ +AC_REQUIRE([IT_FIND_JAVAC]) +AC_REQUIRE([IT_FIND_JAVA]) +AC_CACHE_CHECK([if HexDumpEncoder is available], it_cv_HEXDUMPENCODER, [ +CLASS=sun/applet/Test.java +BYTECODE=$(echo $CLASS|sed 's#\.java##') +mkdir -p tmp.$$/$(dirname $CLASS) +cd tmp.$$ +cat << \EOF > $CLASS +[/* [#]line __oline__ "configure" */ +package sun.applet; + +import sun.misc.*; +import sun.security.util.*; + +public class Test +{ + public static void main(String[] args) + throws Exception + { + try { + System.out.println(Class.forName("sun.misc.HexDumpEncoder")); + } catch (ClassNotFoundException e) { + System.out.println(Class.forName("sun.security.util.HexDumpEncoder")); + } + } +} +] +EOF +if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_HEXDUMPENCODER=yes; + else + it_cv_HEXDUMPENCODER=no; + fi +else + it_cv_HEXDUMPENCODER=no; +fi +]) +rm -f $CLASS *.class +cd .. +# should be rmdir but has to be rm -rf due to sun.applet usage +rm -rf tmp.$$ +if test x"${it_cv_HEXDUMPENCODER}" = "xno"; then + AC_MSG_ERROR([HexDumpEncoder not found.]) +fi +]) + AC_DEFUN_ONCE([IT_CHECK_FOR_MERCURIAL], [ AC_PATH_TOOL([HG],[hg]) diff -r 834746c2a271 -r 7a3e06b56eba configure.ac --- a/configure.ac Thu Jan 07 15:33:12 2016 +0100 +++ b/configure.ac Thu Jan 14 16:28:48 2016 +0100 @@ -68,7 +68,7 @@ dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin dnl IT563 - NetX uses sun.security code -dnl IT605 - NetX depends on sun.misc.HexDumpEncoder +dnl IT605 - NetX depends on sun.misc HexDumpEncoder or sun.security.util.HexDumpEncoder dnl IT570 - NetX depends on sun.applet.AppletViewPanel dnl IT571 - NetX depends on com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager.java dnl IT573 - Plugin depends on sun.awt,X11.XEmbeddedFrame.java @@ -83,7 +83,7 @@ IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_SECURITYCONSTANTS, [sun.security.util.SecurityConstants]) IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_HOSTNAMECHECKER, [sun.security.util.HostnameChecker]) IT_CHECK_FOR_CLASS(SUN_SECURITY_X509_X500NAME, [sun.security.x509.X500Name]) -IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder]) +IT_CHECK_FOR_HEXDUMPENCODER IT_CHECK_FOR_CLASS(SUN_SECURITY_VALIDATOR_VALIDATOREXCEPTION, [sun.security.validator.ValidatorException]) IT_CHECK_FOR_CLASS(COM_SUN_NET_SSL_INTERNAL_SSL_X509EXTENDEDTRUSTMANAGER, [com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager]) diff -r 834746c2a271 -r 7a3e06b56eba itweb-settings.desktop.in --- a/itweb-settings.desktop.in Thu Jan 07 15:33:12 2016 +0100 +++ b/itweb-settings.desktop.in Thu Jan 14 16:28:48 2016 +0100 @@ -3,6 +3,7 @@ Name[de]=IcedTea-Web Systemsteuerung Name[pl]=Panel sterowania IcedTea-Web Name[cs]=Ovl??dac?? panel IcedTea-Web +GenericName=Control Panel Comment=Configure IcedTea-Web (javaws and plugin) Comment[de]=Konfiguriert IcedTea-Web (javaws und Plug-in) Comment[pl]=Konfiguruj IcedTea-Web (javaws i wtyczk??) diff -r 834746c2a271 -r 7a3e06b56eba javaws.desktop.in --- a/javaws.desktop.in Thu Jan 07 15:33:12 2016 +0100 +++ b/javaws.desktop.in Thu Jan 14 16:28:48 2016 +0100 @@ -1,5 +1,6 @@ [Desktop Entry] Name=IcedTea Web Start +GenericName=Java Web Start Comment=IcedTea Application Launcher Exec=PATH_TO_JAVAWS %f Icon=javaws diff -r 834746c2a271 -r 7a3e06b56eba metadata.in/icedtea-web-javaws.appdata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.in/icedtea-web-javaws.appdata.xml Thu Jan 14 16:28:48 2016 +0100 @@ -0,0 +1,47 @@ + + + + javaws.desktop + %{name} + Java + Javaws implementation from OpenJDK + + +

+Free java implementation of jnlp launching protocol. +

+Originally based on NetX,but now bringing many improvements compared to proprietary implementations. +

+Powerful debug console, internal appletviewer, safe run-in-sandbox option, extendable "remember me" options and custom policy editor. +

+It have also possibility to turn all security off and just enjoy legacy web (on your own risk). All via simple itweb-settings gui. +

+ + http://icedtea.classpath.org/wiki/IcedTea-Web + CC0-1.0 + distro-pkg-dev at openjdk.java.net + +??? text/jnlp + + + + http://icedtea.classpath.org/wiki/images/Javaws_splash.png + Itw self describing splash screen + + + http://icedtea.classpath.org/wiki/images/Fullysigned.png + Run in sandbox dialog + + + http://icedtea.classpath.org/wiki/images/Policyeditor-in-use.png + Simplified view of policy editor + + + diff -r 834746c2a271 -r 7a3e06b56eba metadata.in/icedtea-web-plugin.pom --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.in/icedtea-web-plugin.pom Thu Jan 14 16:28:48 2016 +0100 @@ -0,0 +1,9 @@ + + 4.0.0 + sun.applet + %{name}-plugin + %{version} + diff -r 834746c2a271 -r 7a3e06b56eba metadata.in/icedtea-web.metainfo.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.in/icedtea-web.metainfo.xml Thu Jan 14 16:28:48 2016 +0100 @@ -0,0 +1,12 @@ + + + %{name} + epiphany.desktop + firefox.desktop + midori.desktop + Java + Browser plug-in implementation from OpenJDK. This plugin is running java applets + http://icedtea.classpath.org/wiki/IcedTea-Web + CC0-1.0 + distro-pkg-dev at openjdk.java.net + diff -r 834746c2a271 -r 7a3e06b56eba metadata.in/icedtea-web.pom --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.in/icedtea-web.pom Thu Jan 14 16:28:48 2016 +0100 @@ -0,0 +1,9 @@ + + 4.0.0 + net.sourceforge.jnlp + %{name} + %{version} + diff -r 834746c2a271 -r 7a3e06b56eba netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java --- a/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java Thu Jan 07 15:33:12 2016 +0100 +++ b/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java Thu Jan 14 16:28:48 2016 +0100 @@ -43,8 +43,15 @@ import java.security.cert.CertPath; import java.security.cert.X509Certificate; import java.security.MessageDigest; +/** + * Do not remove this two unused imports, nor expands its "*" call. + * It is workaround to allow itw to run on jdk8 and older and also on jdk9 and newer + */ -import sun.misc.HexDumpEncoder; +// jdk8 is using sun.misc.HexDumpEncoder, +import sun.misc.*; +// jdk9 is using sun.security.util.HexDumpEncoder +import sun.security.util.*; import sun.security.x509.*; import javax.swing.*; import javax.swing.event.*; diff -r 834746c2a271 -r 7a3e06b56eba netx/net/sourceforge/jnlp/util/XDesktopEntry.java --- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Thu Jan 07 15:33:12 2016 +0100 +++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Thu Jan 14 16:28:48 2016 +0100 @@ -148,7 +148,7 @@ } if (file.getInformation().getVendor() != null) { - fileContents += "Vendor=" + sanitize(file.getInformation().getVendor()) + "\n"; + fileContents += "X-Vendor=" + sanitize(file.getInformation().getVendor()) + "\n"; } if (JNLPRuntime.isWebstartApplication()) { diff -r 834746c2a271 -r 7a3e06b56eba policyeditor.desktop.in --- a/policyeditor.desktop.in Thu Jan 07 15:33:12 2016 +0100 +++ b/policyeditor.desktop.in Thu Jan 14 16:28:48 2016 +0100 @@ -1,5 +1,6 @@ [Desktop Entry] Name=IcedTea-Web Policy Editor +GenericName=Policy Tool Comment=Edit Java Applet policy and permission settings Exec=PATH_TO_POLICYEDITOR Icon=javaws diff -r 834746c2a271 -r 7a3e06b56eba tests/reproducers/custom/NoClassDeff/resources/NoClassDeff.html.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/NoClassDeff/resources/NoClassDeff.html.in Thu Jan 14 16:28:48 2016 +0100 @@ -0,0 +1,47 @@ + + + + + + + + + + + diff -r 834746c2a271 -r 7a3e06b56eba tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApp.jnlp.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApp.jnlp.in Thu Jan 14 16:28:48 2016 +0100 @@ -0,0 +1,56 @@ + + + + + + NoClassDeff + IcedTea + + PR2219 + + + + + + + + DIE_ON_STAGE + CATCH_ERROR + + diff -r 834746c2a271 -r 7a3e06b56eba tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApplet.jnlp.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApplet.jnlp.in Thu Jan 14 16:28:48 2016 +0100 @@ -0,0 +1,60 @@ From ptisnovs at icedtea.classpath.org Fri Jan 15 12:49:57 2016 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 15 Jan 2016 12:49:57 +0000 Subject: /hg/gfx-test: Updated. Message-ID: changeset 6045d7f45ca8 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=6045d7f45ca8 author: Pavel Tisnovsky date: Fri Jan 15 13:53:18 2016 +0100 Updated. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 120 +++++++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) diffs (142 lines): diff -r cd5ed0b8ffd3 -r 6045d7f45ca8 ChangeLog --- a/ChangeLog Thu Jan 14 11:25:33 2016 +0100 +++ b/ChangeLog Fri Jan 15 13:53:18 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-15 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Updated. + 2016-01-14 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r cd5ed0b8ffd3 -r 6045d7f45ca8 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Jan 14 11:25:33 2016 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Fri Jan 15 13:53:18 2016 +0100 @@ -15376,6 +15376,126 @@ } /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGB_Pre_backgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGB_Pre_backgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGB_Pre_backgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGB_Pre_backgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGB_Pre_backgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGB_Pre_backgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGB_Pre_backgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeIntARGB_Pre_backgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeIntARGB_Pre(image, graphics2d, Color.white); + } + + /** * Entry point to the test suite. * * @param args not used in this case From bugzilla-daemon at icedtea.classpath.org Fri Jan 15 14:08:59 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 15 Jan 2016 14:08:59 +0000 Subject: [Bug 2786] IllegalStateException zip file closed when accessing Jar file over HTTP In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2786 --- Comment #2 from Neon --- adding the try catch around the JarFile.close() is not the fix. The problem after the first call, e.g. on 2nd call to JarURLConnection.getJarFile(). I believe the problem might be that URL.openConnection() or JarURLConnection.getJarFile() is caching the previous resource (which got closed after the first run). We can work around that by NOT calling JarFile.close(), but that causes a resource leak. -- 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 15 14:40:01 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 15 Jan 2016 14:40:01 +0000 Subject: [Bug 2137] IcedTea Web no longer works with Dell Poweredge Remote Access Consoles as of 1.5.1 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2137 E.Reyes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #4 from E.Reyes --- I can confirm that there is no issue with version 1.6.1. Thanks for taking care of this case. Cheers! -- 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 Fri Jan 15 14:44:57 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 15 Jan 2016 15:44:57 +0100 Subject: [rfc][icedtea-web] PR2489 - various NPEs when codebase is null Message-ID: <569905E9.3060107@redhat.com> Hello, this is - not sure how complex - fix for PR2489. The test is not finished, and I will not push before it is finished. Generally. our jnlpFile.codebase is based on value from jnlpFile/htmlAppletTag or deducete if it is "." or something like this. However, when codebase attribute is missing, it is null. I'm not sure how important parts of ITW are dealing with this, but all parts around extendedAppletsSecurity were designed with null==ignore. That appeared incorrect later, and now there is several NPE posibilities. I think it is not good idea to force getCodebase to not return null. The correct repalcement is getSourceLocation - see fix to "align jnlp_href to oracle jdk" for expalantion. But I'm not sure how widely to use I'm really scared to include it inside getCodebase. See you later with full version of test, bu I would be greategull for thoughts. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: PR2489fix+tests.patch Type: text/x-patch Size: 62737 bytes Desc: not available URL: From bugzilla-daemon at icedtea.classpath.org Sat Jan 16 18:16:40 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 16 Jan 2016 18:16:40 +0000 Subject: [Bug 2792] New: Crashed server Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2792 Bug ID: 2792 Summary: Crashed server Product: IcedTea Version: 7-hg Hardware: x86_64 OS: Windows Status: NEW Severity: enhancement Priority: P5 Component: Plugin Assignee: dbhole at redhat.com Reporter: misterexmine at hotmail.com CC: unassigned at icedtea.classpath.org 16.01 15:42:46 [Server] INFO # 16.01 15:42:46 [Server] INFO # A fatal error has been detected by the Java Runtime Environment: 16.01 15:42:46 [Server] INFO # 16.01 15:42:46 [Server] INFO # SIGSEGV (0xb) at pc=0x00007f6b0d66ff72, pid=6233, tid=140097413195520 16.01 15:42:46 [Server] INFO # 16.01 15:42:46 [Server] INFO # JRE version: OpenJDK Runtime Environment (7.0_91) (build 1.7.0_91-mockbuild_2015_10_21_19_56-b00) 16.01 15:42:46 [Server] INFO # Java VM: OpenJDK 64-Bit Server VM (24.91-b01 mixed mode linux-amd64 compressed oops) 16.01 15:42:46 [Server] INFO # Derivative: IcedTea 2.6.2 16.01 15:42:46 [Server] INFO # Distribution: CentOS release 6.7 (Final), package rhel-2.6.2.2.el6_7-x86_64 u91-b00 16.01 15:42:46 [Server] INFO # Problematic frame: 16.01 15:42:46 [Server] INFO # V [libjvm.so+0x613f72] 16.01 15:42:46 [Server] INFO # 16.01 15:42:46 [Server] INFO # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again 16.01 15:42:46 [Server] INFO # 16.01 15:42:46 [Server] INFO # An error report file with more information is saved as: 16.01 15:42:46 [Server] INFO # /tmp/jvm-6233/hs_error.log 16.01 15:42:46 [Server] INFO # 16.01 15:42:46 [Server] INFO # If you would like to submit a bug report, please include 16.01 15:42:46 [Server] INFO # instructions on how to reproduce the bug and visit: 16.01 15:42:46 [Server] INFO # http://icedtea.classpath.org/bugzilla 16.01 15:42:46 [Server] INFO # 16.01 15:42:46 [Multicraft] Server shut down (running) 16.01 15:42:46 [Multicraft] Restarting crashed server in 5 seconds 16.01 15:42:46 [Multicraft] Stopping server! 16.01 15:42:48 [Multicraft] Server stopped -- 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 18 10:16:22 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 Jan 2016 10:16:22 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #12 from JiriVanek --- (In reply to Neon from comment #11) > I just created CASE 01567161 NullPointerException in icedtea-web 1.6.1 for > RHEL 7.2 Ok. Please push on it. I will push from second side once 1.6.2 is out. -- 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 18 10:20:45 2016 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 18 Jan 2016 10:20:45 +0000 Subject: /hg/gfx-test: Updated. Message-ID: changeset 501c75daf75e in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=501c75daf75e author: Pavel Tisnovsky date: Mon Jan 18 11:24:12 2016 +0100 Updated. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 120 +++++++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) diffs (142 lines): diff -r 6045d7f45ca8 -r 501c75daf75e ChangeLog --- a/ChangeLog Fri Jan 15 13:53:18 2016 +0100 +++ b/ChangeLog Mon Jan 18 11:24:12 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-18 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Updated. + 2016-01-15 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 6045d7f45ca8 -r 501c75daf75e src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Fri Jan 15 13:53:18 2016 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Mon Jan 18 11:24:12 2016 +0100 @@ -15496,6 +15496,126 @@ } /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeByteBinaryBackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeByteBinary(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeByteBinaryBackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeByteBinary(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeByteBinaryBackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeByteBinary(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeByteBinaryBackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeByteBinary(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeByteBinaryBackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeByteBinary(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeByteBinaryBackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeByteBinary(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeByteBinaryBackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeByteBinary(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeByteBinaryBackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalGridBufferedImageTypeByteBinary(image, graphics2d, Color.white); + } + + /** * Entry point to the test suite. * * @param args not used in this case From bugzilla-daemon at icedtea.classpath.org Mon Jan 18 10:21:55 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 Jan 2016 10:21:55 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #15 from JiriVanek --- For now I will make tagsoup missing error more visibile. To make it mandatory may be question of another discussion. -- 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 18 10:35:01 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 18 Jan 2016 11:35:01 +0100 Subject: [rfc][icedtea-web] make missing tagsoup more visible Message-ID: <569CBFD5.8090102@redhat.com> This patch is making missing tagsoup during build more visisble. Intended for 1.6 and head. See also: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303#c9 and following comments J. -------------- next part -------------- A non-text attachment was scrubbed... Name: tagsoupScreem.patch Type: text/x-patch Size: 634 bytes Desc: not available URL: From bugzilla-daemon at icedtea.classpath.org Mon Jan 18 10:36:34 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 Jan 2016 10:36:34 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #16 from JiriVanek --- See: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2016-January/034568.html diff -r 968f54348b70 acinclude.m4 --- a/acinclude.m4 Thu Jan 14 16:28:48 2016 +0100 +++ b/acinclude.m4 Mon Jan 18 11:32:01 2016 +0100 @@ -446,6 +446,12 @@ done fi AC_MSG_RESULT(${TAGSOUP_JAR}) + if test -z "${TAGSOUP_JAR}"; then + AC_MSG_RESULT(***********************************************) + AC_MSG_RESULT(* Warning you are building without tagsoup *) + AC_MSG_RESULT(* Some jnlps and most htmls will be malformed *) + AC_MSG_RESULT(***********************************************) + fi AC_SUBST(TAGSOUP_JAR) AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno -a x$TAGSOUP_JAR != x ]) ]) Thoughts? -- 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 18 10:47:29 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 Jan 2016 10:47:29 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #17 from James Le Cuirot --- That's not really what I had in mind and Andrew would probably say the same. I meant a dialog would pop up in the browser when encountering malformed files, notifying the user that they need tagsoup support to proceed. Given that most users only need the browser plugin for one thing (e.g. their bank or their firewall), there's a good chance that they won't need tagsoup at all. -- 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 18 11:18:14 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 Jan 2016 11:18:14 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #18 from JiriVanek --- Ok. Fiar enough. I will get this info to XMLparse exception, so it is visible in error dialogue. -- 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 18 12:21:27 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 Jan 2016 12:21:27 +0000 Subject: [Bug 2792] Crashed server In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2792 Stanislav Baiduzhyi changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |baiduzhyi.devel at gmail.com --- Comment #1 from Stanislav Baiduzhyi --- This report mentions a file, /tmp/jvm-6233/hs_error.log. Could you please attach that file to the issue, or reproduce the issue once again and attach the file it will generate? -- 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 18 14:58:32 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 18 Jan 2016 15:58:32 +0100 Subject: [rfc][icedtea-web] make missing tagsoup more visible In-Reply-To: <569CBFD5.8090102@redhat.com> References: <569CBFD5.8090102@redhat.com> Message-ID: <569CFD98.1010202@redhat.com> On 01/18/2016 11:35 AM, Jiri Vanek wrote: > This patch is making missing tagsoup during build more visisble. > Intended for 1.6 and head. > > See also: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303#c9 and following comments > > J. As requested http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303#c17 here is also "runtime verbose version" J. -------------- next part -------------- A non-text attachment was scrubbed... Name: tagsoupScreem.patch Type: text/x-patch Size: 6562 bytes Desc: not available URL: From bugzilla-daemon at icedtea.classpath.org Mon Jan 18 14:59:44 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 Jan 2016 14:59:44 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #19 from JiriVanek --- Ok. I improved it a bit. http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2016-January/034573.html toughts? -- 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 18 15:11:27 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 18 Jan 2016 15:11:27 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #20 from James Le Cuirot --- Cool, just a typo there, "agains" should be "against". -- 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 19 04:43:11 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jan 2016 04:43:11 +0000 Subject: [Bug 2792] Crashed server In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2792 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu.andrew at redhat.com Component|Plugin |IcedTea Version|7-hg |2.6.2 Assignee|dbhole at redhat.com |gnu.andrew at redhat.com OS|Windows |Linux 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 19 04:57:02 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jan 2016 04:57:02 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|INVALID |--- --- Comment #21 from Andrew John Hughes --- Also, 'Malfomred' -> 'malformed'. Will this test be internationalised as the text in comment 7 was? How will it be displayed? My reading of the patch is that it will just be the exception message, not a dialog. Yes, I agree with James that this is something that should be relayed to the user at run-time. A message from configure is going to be lost in build logs on the servers of the distribution in many cases. -- 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 19 05:17:31 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jan 2016 05:17:31 +0000 Subject: [Bug 2791] Crashed server In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2791 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |unassigned at icedtea.classpat | |h.org Component|Fields & Values |IcedTea Product|Bug Database |IcedTea OS|Windows |Linux -- 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 19 05:18:01 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jan 2016 05:18:01 +0000 Subject: [Bug 2791] Crashed server In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2791 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |2.6.2 Severity|enhancement |normal --- Comment #1 from Andrew John Hughes --- Please attach the hs_error.log and give details on how to reproduce this crash. -- 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 19 08:24:59 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jan 2016 08:24:59 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |RESOLVED Resolution|--- |INVALID --- Comment #22 from JiriVanek --- This is fatal exception. And like that, it ends up in error dialogue. So the message will be printed at it. Yes it will be internationalized for head. Thanx for fixing the typo, but please don't reopen this bug. It is invalid to original assignment, but evolved to another bug in comments. If you wish some opened bug for it, then open new one. I'm happy with c#17 and patch and test -- 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 icedtea.classpath.org Tue Jan 19 19:26:05 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 19 Jan 2016 19:26:05 +0000 Subject: /hg/icedtea-web: When tagsoup is missing, parsing errors are mor... Message-ID: changeset 4e527d1b3fdf in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=4e527d1b3fdf author: Jiri Vanek date: Tue Jan 19 20:25:31 2016 +0100 When tagsoup is missing, parsing errors are more informative * acinclude.m4: when building without tagsoup, more verbose warning is printed * netx/net/sourceforge/jnlp/GuiLaunchHandler.java: (launchError) is now noting that BasicExceptionDialog will be shown. * netx/net/sourceforge/jnlp/MalformedXMLParser.java: Now react on NoClassDefFoundError by returning original stream. * netx/net/sourceforge/jnlp/ParseException.java: Stores information about parsers loading, and add this info to ParseException message. * netx/net/sourceforge/jnlp/Parser.java: (getRootNode) logic retrieving parser class extracted to separate method getParserInstance * netx/net/sourceforge/jnlp/resources/Messages.properties: added family of TAGSOUP for messages about its state * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: (exit) now waits for BasicExceptionDialog. * netx/net/sourceforge/jnlp/runtime/html/AppletExtractor.java: (cleanStreamIfPossible) now uses Parser.getParserInstance ratehr then its own. * netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java: Is now capable of publishing number of shown instances. diffstat: ChangeLog | 21 ++++ acinclude.m4 | 6 + netx/net/sourceforge/jnlp/GuiLaunchHandler.java | 2 + netx/net/sourceforge/jnlp/MalformedXMLParser.java | 10 +- netx/net/sourceforge/jnlp/ParseException.java | 48 ++++++++++- netx/net/sourceforge/jnlp/Parser.java | 55 ++++++++---- netx/net/sourceforge/jnlp/resources/Messages.properties | 6 + netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 4 + netx/net/sourceforge/jnlp/runtime/html/AppletExtractor.java | 14 ++- netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java | 16 +++ 10 files changed, 154 insertions(+), 28 deletions(-) diffs (356 lines): diff -r 968f54348b70 -r 4e527d1b3fdf ChangeLog --- a/ChangeLog Thu Jan 14 16:28:48 2016 +0100 +++ b/ChangeLog Tue Jan 19 20:25:31 2016 +0100 @@ -1,3 +1,24 @@ +2016-01-19 Jiri Vanek + + When tagsoup is missing, parsing errors are more informative + * acinclude.m4: when building without tagsoup, more verbose warning is printed + * netx/net/sourceforge/jnlp/GuiLaunchHandler.java: (launchError) is now noting + that BasicExceptionDialog will be shown. + * netx/net/sourceforge/jnlp/MalformedXMLParser.java: Now react on NoClassDefFoundError + by returning original stream. + * netx/net/sourceforge/jnlp/ParseException.java: Stores information about + parsers loading, and add this info to ParseException message. + * netx/net/sourceforge/jnlp/Parser.java: (getRootNode) logic retrieving parser + class extracted to separate method getParserInstance + * netx/net/sourceforge/jnlp/resources/Messages.properties: added family of TAGSOUP + for messages about its state + * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: (exit) now waits for + BasicExceptionDialog. + * netx/net/sourceforge/jnlp/runtime/html/AppletExtractor.java: (cleanStreamIfPossible) + now uses Parser.getParserInstance ratehr then its own. + * netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java: Is now capable of + publishing number of shown instances. + 2016-01-14 Jiri Vanek Fridrich Strba diff -r 968f54348b70 -r 4e527d1b3fdf acinclude.m4 --- a/acinclude.m4 Thu Jan 14 16:28:48 2016 +0100 +++ b/acinclude.m4 Tue Jan 19 20:25:31 2016 +0100 @@ -446,6 +446,12 @@ done fi AC_MSG_RESULT(${TAGSOUP_JAR}) + if test -z "${TAGSOUP_JAR}"; then + AC_MSG_RESULT(***********************************************) + AC_MSG_RESULT(* Warning you are building without tagsoup *) + AC_MSG_RESULT(* Some jnlps and most htmls will be malformed *) + AC_MSG_RESULT(***********************************************) + fi AC_SUBST(TAGSOUP_JAR) AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno -a x$TAGSOUP_JAR != x ]) ]) diff -r 968f54348b70 -r 4e527d1b3fdf netx/net/sourceforge/jnlp/GuiLaunchHandler.java --- a/netx/net/sourceforge/jnlp/GuiLaunchHandler.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/GuiLaunchHandler.java Tue Jan 19 20:25:31 2016 +0100 @@ -69,6 +69,7 @@ @Override public void launchError(final LaunchException exception) { + BasicExceptionDialog.willBeShown(); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { @@ -102,6 +103,7 @@ } @Override + @SuppressWarnings("empty-statement") public void launchInitialized(final JNLPFile file) { int preferredWidth = 500; diff -r 968f54348b70 -r 4e527d1b3fdf netx/net/sourceforge/jnlp/MalformedXMLParser.java --- a/netx/net/sourceforge/jnlp/MalformedXMLParser.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/MalformedXMLParser.java Tue Jan 19 20:25:31 2016 +0100 @@ -111,10 +111,12 @@ reader.parse(s); return new ByteArrayInputStream(out.toByteArray()); - } catch (SAXException e) { - throw new ParseException(R("PBadXML"), e); - } catch (IOException e) { - throw new ParseException(R("PBadXML"), e); + } catch (SAXException | IOException e1) { + throw new ParseException(R("PBadXML"), e1); + } catch (NoClassDefFoundError e2) { + OutputController.getLogger().log(e2); + ParseException.setUsed(null); + return original; } } diff -r 968f54348b70 -r 4e527d1b3fdf netx/net/sourceforge/jnlp/ParseException.java --- a/netx/net/sourceforge/jnlp/ParseException.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/ParseException.java Tue Jan 19 20:25:31 2016 +0100 @@ -16,6 +16,9 @@ package net.sourceforge.jnlp; +import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.runtime.Translator; + /** * Thrown to indicate that an error has occurred while parsing a * JNLP file. @@ -34,7 +37,7 @@ * @param message to be shown in exception */ public ParseException(String message) { - super(message); + super(getParserSettingsMessage() + message); } /** @@ -44,7 +47,48 @@ * @param cause cause of exception */ public ParseException(String message, Throwable cause) { - super(message, cause); + super(getParserSettingsMessage() + message, cause); } + public ParseException(Throwable cause) { + super(getParserSettingsMessage(), cause); + } + + + static enum UsedParsers { + + MALFORMED, NORMAL + } + + private static UsedParsers expected; + private static UsedParsers used; + + static void setExpected(UsedParsers ex) { + expected = ex; + } + + static void setUsed(UsedParsers us) { + used = us; + } + + private static String getParserSettingsMessage() { + final String tail = "" + + " " + + Translator.R("TAGSOUPtail") + + " "; + if (expected == UsedParsers.NORMAL && used == UsedParsers.NORMAL) { + //warn about xml mode + return Translator.R("TAGSOUPnotUsed", OptionsDefinitions.OPTIONS.XML.option)+tail; + } + if (expected == UsedParsers.MALFORMED && used != UsedParsers.MALFORMED) { + //warn about TagSoup + return Translator.R("TAGSOUPbroken") + tail; + } + if (JNLPRuntime.isDebug()) { + return expected + " " + used + "; "; + } else { + return ""; + } + } + } diff -r 968f54348b70 -r 4e527d1b3fdf netx/net/sourceforge/jnlp/Parser.java --- a/netx/net/sourceforge/jnlp/Parser.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/Parser.java Tue Jan 19 20:25:31 2016 +0100 @@ -1315,24 +1315,10 @@ * @throws ParseException if the JNLP file is invalid */ static Node getRootNode(InputStream input, ParserSettings settings) throws ParseException { - String className; - if (settings.isMalformedXmlAllowed()) { - className = MALFORMED_PARSER_CLASS; - } else { - className = NORMAL_PARSER_CLASS; - } - try { - Class klass; - try { - klass = Class.forName(className); - } catch (ClassNotFoundException e) { - klass = Class.forName(NORMAL_PARSER_CLASS); - } - Object instance = klass.newInstance(); - Method m = klass.getMethod("getRootNode", InputStream.class); - - return (Node) m.invoke(instance, input); + Object parser = getParserInstance(settings); + Method m = parser.getClass().getMethod("getRootNode", InputStream.class); + return (Node) m.invoke(parser, input); } catch (InvocationTargetException e) { if (e.getCause() instanceof ParseException) { throw (ParseException)(e.getCause()); @@ -1342,6 +1328,41 @@ throw new ParseException(R("PBadXML"), e); } } + + + public static Object getParserInstance(ParserSettings settings) throws ClassNotFoundException, IllegalAccessException, InstantiationException { + String className; + if (settings.isMalformedXmlAllowed()) { + className = MALFORMED_PARSER_CLASS; + ParseException.setExpected(ParseException.UsedParsers.MALFORMED); + } else { + className = NORMAL_PARSER_CLASS; + ParseException.setExpected(ParseException.UsedParsers.NORMAL); + } + + Class klass; + Object instance; + + try { + klass = Class.forName(className); + instance = klass.newInstance(); + //catch both, for case that tagsoup was removed after build + } catch (ClassNotFoundException | NoClassDefFoundError | InstantiationException e) { + OutputController.getLogger().log(e); + klass = Class.forName(NORMAL_PARSER_CLASS); + instance = klass.newInstance(); + } + + switch (instance.getClass().getName()) { + case MALFORMED_PARSER_CLASS: + ParseException.setUsed(ParseException.UsedParsers.MALFORMED); + break; + case NORMAL_PARSER_CLASS: + ParseException.setUsed(ParseException.UsedParsers.NORMAL); + break; + } + return instance; + } private String getOptionalMainClass(Node node) { try { diff -r 968f54348b70 -r 4e527d1b3fdf netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Jan 19 20:25:31 2016 +0100 @@ -1130,6 +1130,12 @@ FILEopera64=Location of plugin library for global purposes on opera compliant browser, 64-bit systems. FILEopera32=Location of plugin library for global purposes on opera compliant browser, 32-bit systems. +TAGSOUPtail=You may have missing tagsoup installation or your ITW was not built against it. Check your installation and/or consult distribution. +TAGSOUPnotUsed"You are not using Malformed parser. If you have set {0}, remove it. Or... +TAGSOUPbroken=Broken Malformed parser. +TAGSOUPhtmlNotUsed=Tagsoup''s html2xml cleaning is Disabled. Remove {0}. Parsing will probably fail. +TAGSOUPhtmlBroken=Tagsoup''s html2xml cleaning not loaded. Install tagsoup (and build ITW against). Parsing will probably fail. + FILEcache=Contains cached runtime entries. FILErecentlyUsed=Additional information about items in cache FILEappdata=Contains saved application data. diff -r 968f54348b70 -r 4e527d1b3fdf netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Tue Jan 19 20:25:31 2016 +0100 @@ -67,6 +67,7 @@ import net.sourceforge.jnlp.security.SecurityDialogMessageHandler; import net.sourceforge.jnlp.security.SecurityUtil; import net.sourceforge.jnlp.services.XServiceManagerStub; +import net.sourceforge.jnlp.util.BasicExceptionDialog; import net.sourceforge.jnlp.util.FileUtils; import net.sourceforge.jnlp.util.logging.JavaConsole; import net.sourceforge.jnlp.util.logging.LogConfig; @@ -882,6 +883,9 @@ public static void exit(int i) { try { OutputController.getLogger().close(); + while (BasicExceptionDialog.areShown()){ + Thread.sleep(100); + } } catch (Exception ex) { //to late } diff -r 968f54348b70 -r 4e527d1b3fdf netx/net/sourceforge/jnlp/runtime/html/AppletExtractor.java --- a/netx/net/sourceforge/jnlp/runtime/html/AppletExtractor.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/html/AppletExtractor.java Tue Jan 19 20:25:31 2016 +0100 @@ -46,10 +46,12 @@ import javax.xml.parsers.ParserConfigurationException; import net.sourceforge.jnlp.JNLPFile; import net.sourceforge.jnlp.OptionsDefinitions; +import net.sourceforge.jnlp.ParseException; import net.sourceforge.jnlp.Parser; import net.sourceforge.jnlp.ParserSettings; import net.sourceforge.jnlp.cache.UpdatePolicy; import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.runtime.Translator; import net.sourceforge.jnlp.util.logging.OutputController; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -88,14 +90,14 @@ private InputStream cleanStreamIfPossible(InputStream is) { try { if (ps != null && ps.isMalformedXmlAllowed()){ - Class klass = Class.forName(Parser.MALFORMED_PARSER_CLASS); - Method m = klass.getMethod("xmlizeInputStream", InputStream.class); + Object parser = Parser.getParserInstance(ps); + Method m = parser.getClass().getMethod("xmlizeInputStream", InputStream.class); return (InputStream) m.invoke(null, is); } else { - OutputController.getLogger().log(OutputController.Level.WARNING_DEBUG, "Tagsoup's html2xml cleaning is Disabled. Remove "+OptionsDefinitions.OPTIONS.XML.option+". Parsing will probably fail."); + OutputController.getLogger().log(OutputController.Level.WARNING_ALL, Translator.R("TAGSOUPhtmlNotUsed", OptionsDefinitions.OPTIONS.XML.option)); } } catch (Exception ex) { - OutputController.getLogger().log(OutputController.Level.WARNING_DEBUG, "Tagsoup's html2xml cleaning not loaded. Install tagsoup. Parsing will probably fail."); + OutputController.getLogger().log(OutputController.Level.WARNING_ALL, Translator.R("TAGSOUPhtmlBroken")); OutputController.getLogger().log(ex); } return is; @@ -104,7 +106,9 @@ public List findAppletsOnPage() { try{ return findAppletsOnPageImpl(openDocument(cleanStreamIfPossible(JNLPFile.openURL(html, null, UpdatePolicy.ALWAYS)))); - }catch (IOException | SAXException | ParserConfigurationException ex){ + } catch (SAXException sex) { + throw new RuntimeException(new ParseException(sex)); + } catch (IOException | ParserConfigurationException ex) { throw new RuntimeException(ex); } } diff -r 968f54348b70 -r 4e527d1b3fdf netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java --- a/netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java Tue Jan 19 20:25:31 2016 +0100 @@ -45,6 +45,7 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.concurrent.atomic.AtomicInteger; import javax.swing.BorderFactory; import javax.swing.BoxLayout; @@ -65,6 +66,7 @@ */ public class BasicExceptionDialog { + private static final AtomicInteger dialogInstancess = new AtomicInteger(); /** * Must be invoked from the Swing EDT. @@ -144,6 +146,7 @@ ScreenFinder.centerWindowsToCurrentScreen(errorDialog); errorDialog.setVisible(true); errorDialog.dispose(); + BasicExceptionDialog.willBeHidden(); } public static JButton getShowButton(final Component parent) { @@ -191,4 +194,17 @@ }); return clearAllButton; } + + private synchronized static int willBeHidden() { + return dialogInstancess.decrementAndGet(); + } + + //must be called out of EDT, otherise -- will happen before ++ + public synchronized static int willBeShown() { + return dialogInstancess.incrementAndGet(); + } + + public synchronized static boolean areShown() { + return dialogInstancess.intValue() > 0; + } } From jvanek at icedtea.classpath.org Tue Jan 19 20:14:25 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 19 Jan 2016 20:14:25 +0000 Subject: /hg/release/icedtea-web-1.6: When tagsoup is missing, parsing er... Message-ID: changeset 978b3c7070b7 in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=978b3c7070b7 author: Jiri Vanek date: Tue Jan 19 21:14:09 2016 +0100 When tagsoup is missing, parsing errors are more informative * acinclude.m4: when building without tagsoup, more verbose warning is printed * netx/net/sourceforge/jnlp/GuiLaunchHandler.java: (launchError) is now noting that BasicExceptionDialog will be shown. * netx/net/sourceforge/jnlp/MalformedXMLParser.java: Now react on NoClassDefFoundError by returning original stream. * netx/net/sourceforge/jnlp/ParseException.java: Stores information about parsers loading, and add this info to ParseException message. * netx/net/sourceforge/jnlp/Parser.java: (getRootNode) logic retrieving parser class extracted to separate method getParserInstance * netx/net/sourceforge/jnlp/resources/Messages.properties: added family of TAGSOUP for messages about its state * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: (exit) now waits for BasicExceptionDialog. * netx/net/sourceforge/jnlp/runtime/html/AppletExtractor.java: (cleanStreamIfPossible) now uses Parser.getParserInstance ratehr then its own. * netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java: Is now capable of publishing number of shown instances. diffstat: ChangeLog | 21 ++++ acinclude.m4 | 6 + netx/net/sourceforge/jnlp/GuiLaunchHandler.java | 2 + netx/net/sourceforge/jnlp/MalformedXMLParser.java | 10 +- netx/net/sourceforge/jnlp/ParseException.java | 48 ++++++++++- netx/net/sourceforge/jnlp/Parser.java | 55 ++++++++---- netx/net/sourceforge/jnlp/resources/Messages.properties | 6 + netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 4 + netx/net/sourceforge/jnlp/runtime/html/AppletExtractor.java | 14 ++- netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java | 16 +++ 10 files changed, 154 insertions(+), 28 deletions(-) diffs (356 lines): diff -r 7a3e06b56eba -r 978b3c7070b7 ChangeLog --- a/ChangeLog Thu Jan 14 16:28:48 2016 +0100 +++ b/ChangeLog Tue Jan 19 21:14:09 2016 +0100 @@ -1,3 +1,24 @@ +2016-01-19 Jiri Vanek + + When tagsoup is missing, parsing errors are more informative + * acinclude.m4: when building without tagsoup, more verbose warning is printed + * netx/net/sourceforge/jnlp/GuiLaunchHandler.java: (launchError) is now noting + that BasicExceptionDialog will be shown. + * netx/net/sourceforge/jnlp/MalformedXMLParser.java: Now react on NoClassDefFoundError + by returning original stream. + * netx/net/sourceforge/jnlp/ParseException.java: Stores information about + parsers loading, and add this info to ParseException message. + * netx/net/sourceforge/jnlp/Parser.java: (getRootNode) logic retrieving parser + class extracted to separate method getParserInstance + * netx/net/sourceforge/jnlp/resources/Messages.properties: added family of TAGSOUP + for messages about its state + * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: (exit) now waits for + BasicExceptionDialog. + * netx/net/sourceforge/jnlp/runtime/html/AppletExtractor.java: (cleanStreamIfPossible) + now uses Parser.getParserInstance ratehr then its own. + * netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java: Is now capable of + publishing number of shown instances. + 2016-01-14 Jiri Vanek Fridrich Strba diff -r 7a3e06b56eba -r 978b3c7070b7 acinclude.m4 --- a/acinclude.m4 Thu Jan 14 16:28:48 2016 +0100 +++ b/acinclude.m4 Tue Jan 19 21:14:09 2016 +0100 @@ -446,6 +446,12 @@ done fi AC_MSG_RESULT(${TAGSOUP_JAR}) + if test -z "${TAGSOUP_JAR}"; then + AC_MSG_RESULT(***********************************************) + AC_MSG_RESULT(* Warning you are building without tagsoup *) + AC_MSG_RESULT(* Some jnlps and most htmls will be malformed *) + AC_MSG_RESULT(***********************************************) + fi AC_SUBST(TAGSOUP_JAR) AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno -a x$TAGSOUP_JAR != x ]) ]) diff -r 7a3e06b56eba -r 978b3c7070b7 netx/net/sourceforge/jnlp/GuiLaunchHandler.java --- a/netx/net/sourceforge/jnlp/GuiLaunchHandler.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/GuiLaunchHandler.java Tue Jan 19 21:14:09 2016 +0100 @@ -69,6 +69,7 @@ @Override public void launchError(final LaunchException exception) { + BasicExceptionDialog.willBeShown(); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { @@ -102,6 +103,7 @@ } @Override + @SuppressWarnings("empty-statement") public void launchInitialized(final JNLPFile file) { int preferredWidth = 500; diff -r 7a3e06b56eba -r 978b3c7070b7 netx/net/sourceforge/jnlp/MalformedXMLParser.java --- a/netx/net/sourceforge/jnlp/MalformedXMLParser.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/MalformedXMLParser.java Tue Jan 19 21:14:09 2016 +0100 @@ -111,10 +111,12 @@ reader.parse(s); return new ByteArrayInputStream(out.toByteArray()); - } catch (SAXException e) { - throw new ParseException(R("PBadXML"), e); - } catch (IOException e) { - throw new ParseException(R("PBadXML"), e); + } catch (SAXException | IOException e1) { + throw new ParseException(R("PBadXML"), e1); + } catch (NoClassDefFoundError e2) { + OutputController.getLogger().log(e2); + ParseException.setUsed(null); + return original; } } diff -r 7a3e06b56eba -r 978b3c7070b7 netx/net/sourceforge/jnlp/ParseException.java --- a/netx/net/sourceforge/jnlp/ParseException.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/ParseException.java Tue Jan 19 21:14:09 2016 +0100 @@ -16,6 +16,9 @@ package net.sourceforge.jnlp; +import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.runtime.Translator; + /** * Thrown to indicate that an error has occurred while parsing a * JNLP file. @@ -34,7 +37,7 @@ * @param message to be shown in exception */ public ParseException(String message) { - super(message); + super(getParserSettingsMessage() + message); } /** @@ -44,7 +47,48 @@ * @param cause cause of exception */ public ParseException(String message, Throwable cause) { - super(message, cause); + super(getParserSettingsMessage() + message, cause); } + public ParseException(Throwable cause) { + super(getParserSettingsMessage(), cause); + } + + + static enum UsedParsers { + + MALFORMED, NORMAL + } + + private static UsedParsers expected; + private static UsedParsers used; + + static void setExpected(UsedParsers ex) { + expected = ex; + } + + static void setUsed(UsedParsers us) { + used = us; + } + + private static String getParserSettingsMessage() { + final String tail = "" + + " " + + Translator.R("TAGSOUPtail") + + " "; + if (expected == UsedParsers.NORMAL && used == UsedParsers.NORMAL) { + //warn about xml mode + return Translator.R("TAGSOUPnotUsed", OptionsDefinitions.OPTIONS.XML.option)+tail; + } + if (expected == UsedParsers.MALFORMED && used != UsedParsers.MALFORMED) { + //warn about TagSoup + return Translator.R("TAGSOUPbroken") + tail; + } + if (JNLPRuntime.isDebug()) { + return expected + " " + used + "; "; + } else { + return ""; + } + } + } diff -r 7a3e06b56eba -r 978b3c7070b7 netx/net/sourceforge/jnlp/Parser.java --- a/netx/net/sourceforge/jnlp/Parser.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/Parser.java Tue Jan 19 21:14:09 2016 +0100 @@ -1315,24 +1315,10 @@ * @throws ParseException if the JNLP file is invalid */ static Node getRootNode(InputStream input, ParserSettings settings) throws ParseException { - String className; - if (settings.isMalformedXmlAllowed()) { - className = MALFORMED_PARSER_CLASS; - } else { - className = NORMAL_PARSER_CLASS; - } - try { - Class klass; - try { - klass = Class.forName(className); - } catch (ClassNotFoundException e) { - klass = Class.forName(NORMAL_PARSER_CLASS); - } - Object instance = klass.newInstance(); - Method m = klass.getMethod("getRootNode", InputStream.class); - - return (Node) m.invoke(instance, input); + Object parser = getParserInstance(settings); + Method m = parser.getClass().getMethod("getRootNode", InputStream.class); + return (Node) m.invoke(parser, input); } catch (InvocationTargetException e) { if (e.getCause() instanceof ParseException) { throw (ParseException)(e.getCause()); @@ -1342,6 +1328,41 @@ throw new ParseException(R("PBadXML"), e); } } + + + public static Object getParserInstance(ParserSettings settings) throws ClassNotFoundException, IllegalAccessException, InstantiationException { + String className; + if (settings.isMalformedXmlAllowed()) { + className = MALFORMED_PARSER_CLASS; + ParseException.setExpected(ParseException.UsedParsers.MALFORMED); + } else { + className = NORMAL_PARSER_CLASS; + ParseException.setExpected(ParseException.UsedParsers.NORMAL); + } + + Class klass; + Object instance; + + try { + klass = Class.forName(className); + instance = klass.newInstance(); + //catch both, for case that tagsoup was removed after build + } catch (ClassNotFoundException | NoClassDefFoundError | InstantiationException e) { + OutputController.getLogger().log(e); + klass = Class.forName(NORMAL_PARSER_CLASS); + instance = klass.newInstance(); + } + + switch (instance.getClass().getName()) { + case MALFORMED_PARSER_CLASS: + ParseException.setUsed(ParseException.UsedParsers.MALFORMED); + break; + case NORMAL_PARSER_CLASS: + ParseException.setUsed(ParseException.UsedParsers.NORMAL); + break; + } + return instance; + } private String getOptionalMainClass(Node node) { try { diff -r 7a3e06b56eba -r 978b3c7070b7 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Jan 19 21:14:09 2016 +0100 @@ -1101,6 +1101,12 @@ FILEopera64=Location of plugin library for global purposes on opera compliant browser, 64-bit systems. FILEopera32=Location of plugin library for global purposes on opera compliant browser, 32-bit systems. +TAGSOUPtail=You may have missing tagsoup installation or your ITW was not built against it. Check your installation and/or consult distribution. +TAGSOUPnotUsed"You are not using Malformed parser. If you have set {0}, remove it. Or... +TAGSOUPbroken=Broken Malformed parser. +TAGSOUPhtmlNotUsed=Tagsoup''s html2xml cleaning is Disabled. Remove {0}. Parsing will probably fail. +TAGSOUPhtmlBroken=Tagsoup''s html2xml cleaning not loaded. Install tagsoup (and build ITW against). Parsing will probably fail. + FILEcache=Contains cached runtime entries. FILErecentlyUsed=Additional information about items in cache FILEappdata=Contains saved application data. diff -r 7a3e06b56eba -r 978b3c7070b7 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Tue Jan 19 21:14:09 2016 +0100 @@ -67,6 +67,7 @@ import net.sourceforge.jnlp.security.SecurityDialogMessageHandler; import net.sourceforge.jnlp.security.SecurityUtil; import net.sourceforge.jnlp.services.XServiceManagerStub; +import net.sourceforge.jnlp.util.BasicExceptionDialog; import net.sourceforge.jnlp.util.FileUtils; import net.sourceforge.jnlp.util.logging.JavaConsole; import net.sourceforge.jnlp.util.logging.LogConfig; @@ -882,6 +883,9 @@ public static void exit(int i) { try { OutputController.getLogger().close(); + while (BasicExceptionDialog.areShown()){ + Thread.sleep(100); + } } catch (Exception ex) { //to late } diff -r 7a3e06b56eba -r 978b3c7070b7 netx/net/sourceforge/jnlp/runtime/html/AppletExtractor.java --- a/netx/net/sourceforge/jnlp/runtime/html/AppletExtractor.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/html/AppletExtractor.java Tue Jan 19 21:14:09 2016 +0100 @@ -46,10 +46,12 @@ import javax.xml.parsers.ParserConfigurationException; import net.sourceforge.jnlp.JNLPFile; import net.sourceforge.jnlp.OptionsDefinitions; +import net.sourceforge.jnlp.ParseException; import net.sourceforge.jnlp.Parser; import net.sourceforge.jnlp.ParserSettings; import net.sourceforge.jnlp.cache.UpdatePolicy; import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.runtime.Translator; import net.sourceforge.jnlp.util.logging.OutputController; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -88,14 +90,14 @@ private InputStream cleanStreamIfPossible(InputStream is) { try { if (ps != null && ps.isMalformedXmlAllowed()){ - Class klass = Class.forName(Parser.MALFORMED_PARSER_CLASS); - Method m = klass.getMethod("xmlizeInputStream", InputStream.class); + Object parser = Parser.getParserInstance(ps); + Method m = parser.getClass().getMethod("xmlizeInputStream", InputStream.class); return (InputStream) m.invoke(null, is); } else { - OutputController.getLogger().log(OutputController.Level.WARNING_DEBUG, "Tagsoup's html2xml cleaning is Disabled. Remove "+OptionsDefinitions.OPTIONS.XML.option+". Parsing will probably fail."); + OutputController.getLogger().log(OutputController.Level.WARNING_ALL, Translator.R("TAGSOUPhtmlNotUsed", OptionsDefinitions.OPTIONS.XML.option)); } } catch (Exception ex) { - OutputController.getLogger().log(OutputController.Level.WARNING_DEBUG, "Tagsoup's html2xml cleaning not loaded. Install tagsoup. Parsing will probably fail."); + OutputController.getLogger().log(OutputController.Level.WARNING_ALL, Translator.R("TAGSOUPhtmlBroken")); OutputController.getLogger().log(ex); } return is; @@ -104,7 +106,9 @@ public List findAppletsOnPage() { try{ return findAppletsOnPageImpl(openDocument(cleanStreamIfPossible(JNLPFile.openURL(html, null, UpdatePolicy.ALWAYS)))); - }catch (IOException | SAXException | ParserConfigurationException ex){ + } catch (SAXException sex) { + throw new RuntimeException(new ParseException(sex)); + } catch (IOException | ParserConfigurationException ex) { throw new RuntimeException(ex); } } diff -r 7a3e06b56eba -r 978b3c7070b7 netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java --- a/netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java Thu Jan 14 16:28:48 2016 +0100 +++ b/netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java Tue Jan 19 21:14:09 2016 +0100 @@ -45,6 +45,7 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.concurrent.atomic.AtomicInteger; import javax.swing.BorderFactory; import javax.swing.BoxLayout; @@ -65,6 +66,7 @@ */ public class BasicExceptionDialog { + private static final AtomicInteger dialogInstancess = new AtomicInteger(); /** * Must be invoked from the Swing EDT. @@ -144,6 +146,7 @@ ScreenFinder.centerWindowsToCurrentScreen(errorDialog); errorDialog.setVisible(true); errorDialog.dispose(); + BasicExceptionDialog.willBeHidden(); } public static JButton getShowButton(final Component parent) { @@ -191,4 +194,17 @@ }); return clearAllButton; } + + private synchronized static int willBeHidden() { + return dialogInstancess.decrementAndGet(); + } + + //must be called out of EDT, otherise -- will happen before ++ + public synchronized static int willBeShown() { + return dialogInstancess.incrementAndGet(); + } + + public synchronized static boolean areShown() { + return dialogInstancess.intValue() > 0; + } } From jvanek at icedtea.classpath.org Tue Jan 19 20:15:02 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 19 Jan 2016 20:15:02 +0000 Subject: /hg/icedtea-web: Removed space in changelog Message-ID: changeset 1e58026203fb in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1e58026203fb author: Jiri Vanek date: Tue Jan 19 21:14:51 2016 +0100 Removed space in changelog diffstat: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4e527d1b3fdf -r 1e58026203fb ChangeLog --- a/ChangeLog Tue Jan 19 20:25:31 2016 +0100 +++ b/ChangeLog Tue Jan 19 21:14:51 2016 +0100 @@ -1,7 +1,7 @@ 2016-01-19 Jiri Vanek When tagsoup is missing, parsing errors are more informative - * acinclude.m4: when building without tagsoup, more verbose warning is printed + * acinclude.m4: when building without tagsoup, more verbose warning is printed * netx/net/sourceforge/jnlp/GuiLaunchHandler.java: (launchError) is now noting that BasicExceptionDialog will be shown. * netx/net/sourceforge/jnlp/MalformedXMLParser.java: Now react on NoClassDefFoundError From andrew at icedtea.classpath.org Tue Jan 19 21:46:57 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 19 Jan 2016 21:46:57 +0000 Subject: /hg/release/icedtea7-forest-2.6: 2 new changesets Message-ID: changeset 251bb2a6d5cf in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=251bb2a6d5cf author: andrew date: Mon Jan 18 00:07:36 2016 +0000 Added tag jdk7u95-b00 for changeset a28bc539342e changeset 4f1e498cad9c in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=4f1e498cad9c author: andrew date: Mon Jan 18 15:52:07 2016 +0000 Merge jdk7u95-b00 diffstat: .hgtags | 51 +++- .jcheck/conf | 2 - README-ppc.html | 689 +++++++++++++++++++++++++++++++++++++++++++++++ buildhybrid.sh | 61 ++++ buildnative.sh | 38 ++ common/bin/hgforest.sh | 190 ++++++++++++ get_source.sh | 4 +- make/Defs-internal.gmk | 1 + make/hotspot-rules.gmk | 14 + make/jdk-rules.gmk | 4 + make/scripts/hgforest.sh | 144 --------- 11 files changed, 1048 insertions(+), 150 deletions(-) diffs (truncated from 1381 to 500 lines): diff -r a28bc539342e -r 4f1e498cad9c .hgtags --- a/.hgtags Fri Nov 13 02:43:36 2015 +0000 +++ b/.hgtags Mon Jan 18 15:52:07 2016 +0000 @@ -50,6 +50,7 @@ 3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73 2c88089b6e1c053597418099a14232182c387edc jdk7-b74 d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75 +f0bfd9bd1a0e674288a8a4d17dcbb9e632b42e6d icedtea7-1.12 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78 @@ -63,6 +64,7 @@ 433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87 82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88 +195fcceefddce1963bb26ba32920de67806ed2db icedtea7-1.13 7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89 425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90 97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91 @@ -111,6 +113,7 @@ ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134 783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135 2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136 +d4aea1a51d625f5601c840714c7c94f1de5bc1af icedtea-1.14 7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137 fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138 7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139 @@ -123,6 +126,7 @@ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 +3defd24c2671eb2e7796b5dc45b98954341d73a7 icedtea-2.0-branchpoint 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04 @@ -141,6 +145,7 @@ b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12 c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21 +a66b58021165f5a43e3974fe5fb9fead29824098 icedtea-2.1-branchpoint e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u3-b02 becd013ae6072a6633ba015fc4f5862fca589cee jdk7u3-b03 d64361a28584728aa25dca3781cffbaf4199e088 jdk7u3-b04 @@ -157,6 +162,7 @@ 2b07c262a8a9ff78dc908efb9d7b3bb099df9ac4 jdk7u4-b10 1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11 e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12 +e7886f5ad6cc837092386fa513e670d4a770456c icedtea-2.2-branchpoint 9108e3c2f07ffa218641d93893ac9928e95d213a jdk7u4-b13 d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u4-b14 008753000680a2008175d14b25373356f531aa07 jdk7u4-b15 @@ -186,11 +192,15 @@ 5f3645aa920d373b26d01b21f3b8b30fc4e10a0d jdk7u6-b10 cd64596c2dd7f195a6d38b6269bab23e7fad4361 jdk7u6-b11 61cfcee1d00cb4af288e640216af2bccbc3c9ef0 jdk7u6-b12 +cdab3bfb573b8832d539a8fa3e9c20f9f4965132 ppc-aix-port-b01 +06179726206f1411ed254f786be3477ca5763e37 ppc-aix-port-b02 +50f2b3cacf77467befb95b7d4fea15bbdb4d650a ppc-aix-port-b03 9b9a6d318e8aa5b8f0e42d2d3d2c0c34cb3f986d jdk7u6-b13 eff9ea1ca63df8656ebef9fedca0c647a210d807 jdk7u6-b14 528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15 7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16 b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17 +0e7b94bd450d4270d4e9bd6c040c94fa4be714a6 icedtea-2.3-branchpoint 9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18 56291720b5e578046bc02761dcad2a575f99fd8e jdk7u6-b19 e79fa743fe5a801db4acc7a7daa68f581423e5d3 jdk7u6-b20 @@ -258,11 +268,13 @@ c3e42860af1cfd997fe1895594f652f0d1e9984e jdk7u12-b07 1a03ef4794dc8face4de605ae480d4c763e6b494 jdk7u12-b08 87cf81226f2012e5c21131adac7880f7e4da1133 jdk7u12-b09 +8a10a3c51f1cd88009008cf1b82071797b5f516d icedtea-2.4-branchpoint 745a15bb6d94765bb5c68048ff146590df9b8441 jdk7u14-b10 2d8fdaa5bb55b937028e385633ce58de4dcdb69c jdk7u14-b11 594dbbbb84add4aa310d51af7e298470d8cda458 jdk7u14-b12 ae5c1b29297dae0375277a0b6428c266d8d77c71 jdk7u14-b13 bb97ad0c9e5a0566e82b3b4bc43eabe680b89d97 jdk7u14-b14 +a20ac67cdbc245d1c14fec3061703232501f8334 ppc-aix-port-b04 b534282bd377e3886b9d0d4760f6fdaa1804bdd3 jdk7u14-b15 0e52db2d9bb8bc789f6c66f2cfb7cd2d3b0b16c6 jdk7u15-b01 0324fca94d073b3aad77658224f17679f25c18b1 jdk7u15-b02 @@ -379,6 +391,7 @@ f0cdb08a4624a623bdd178b04c4bf5a2fa4dc39a jdk7u45-b18 82f1f76c44124c31cb1151833fc15c13547ab280 jdk7u45-b30 f4373de4b75ba8d7f7a5d9c1f77e7884d9064b7e jdk7u45-b31 +11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00 b73c006b5d81528dfb4104a79b994b56675bf75d jdk7u45-b33 05742477836cb30235328181c8e6cae5d4bb06fd jdk7u45-b34 d0d5badd77abce0469830466ff7b910d3621d847 jdk7u45-b35 @@ -428,8 +441,11 @@ 11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00 88113cabda386320a087b288d43e792f523cc0ba jdk7u60-b01 6bdacebbc97f0a03be45be48a6d5b5cf2f7fe77d jdk7u60-b02 +ba9872fc05cc333e3960551ae9fa61d51b8d5e06 icedtea-2.5pre01 +fc5d15cc35b4b47fe403c57fe4bf224fcfe1426c icedtea-2.5pre02 87f2193da40d3a2eedca95108ae78403c7bdcd49 jdk7u60-b03 d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u60-b04 +9d6e6533c1e5f6c335a604f5b58e6f4f93b3e3dd icedtea-2.6pre01 ea798405286d97f643ef809abcb1e13024b4f951 jdk7u60-b05 b0940b205cab942512b5bca1338ab96a45a67832 jdk7u60-b06 cae7bacaa13bb8c42a42fa35b156a7660874e907 jdk7u60-b07 @@ -439,7 +455,11 @@ 798468b91bcbb81684aea8620dbb31eaceb24c6c jdk7u60-b11 e40360c10b2ce5b24b1eea63160b78e112aa5d3f jdk7u60-b12 5e540a4d55916519f5604a422bfbb7a0967d0594 jdk7u60-b13 +07a06f1124248527df6a0caec615198a75f54673 icedtea-2.6pre02 +edf01342f3cb375746dba3620d359ac9a6e50aa8 icedtea-2.6pre03 1ca6a368aec38ee91a41dc03899d7dc1037de44d jdk7u60-b14 +9f06098d4daa523fa85f5ee133ef91c3ecc1f242 icedtea-2.6pre04 +7c68cd21751684d6da92ef83e0128f473d2dddd6 icedtea-2.6pre05 a95b821a2627295b90fb4ae8f3b8bc2ff9c64acc jdk7u60-b15 19a3f6f48c541a8cf144eedffa0e52e108052e82 jdk7u60-b16 472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b17 @@ -579,10 +599,27 @@ 127bfeeddc9cf2f8cbf58052f32f6c8676fb8840 jdk7u79-b15 d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u80-b00 90564f0970e92b844122be27f051655aef6dc423 jdk7u80-b01 +390d699dae6114bbe08e4a9bb8da6fec390fb5d8 icedtea-2.6pre07 +b07e2aed0a26019953ce2ac6b88e73091374a541 icedtea-2.6pre06 +df23e37605061532939ee85bba23c8368425deee icedtea-2.6pre08 36e8397bf04d972519b80ca9e24e68a2ed1e4dbd jdk7u80-b02 +7faf56bdd78300c06ef2dae652877d17c9be0037 icedtea-2.6pre09 +200124c2f78dbf82ea3d023fab9ce4636c4fd073 icedtea-2.6pre10 +05e485acec14af17c2fc4d9d29d58b14f1a0f960 icedtea-2.6pre11 4093bbbc90009bfd9311ccd6373c7a2f2755c9d9 jdk7u80-b03 +b70554883dbd0b13fdb3a7230ac8102c7c61f475 icedtea-2.6pre12 +f16c298d91bda698cd428254df2c3d2d21cc83c0 icedtea-2.6pre13 +97260abdb038f6ff28ea93a19e82b69fd73a344c icedtea-2.6pre14 +bda108a874bc1678966b65e97a87fac293a54fc8 icedtea-2.6pre15 +78bdb9406195da1811f2f52b46dec790158ca364 icedtea-2.6pre16 +f92696272981c10e64a80cb91ca6a747d8de3188 icedtea-2.6pre17 928d01695cd2b65119bbfcd51032ae427a66f83d jdk7u80-b04 46d516760a680deaeffdb03e3221648bc14c0818 jdk7u80-b05 +e229119aa0a088058254ee783b0437ee441d0017 icedtea-2.6pre18 +55ce37199ce35e9c554fefb265a98ec137acbaa2 icedtea-2.6pre19 +10d65b91c33c9b87bc6012ce753daed42c840dde icedtea-2.6pre20 +513069c9fc2037af7038dc44b0f26057fa815584 icedtea-2.6pre21 +851deec2e741fcb09bf96fc7a15ae285890fb832 icedtea-2.6pre22 8fffdc2d1faaf2c61abff00ee41f50d28da2174a jdk7u80-b06 6d0aaea852b04d7270fde5c289827b00f2391374 jdk7u80-b07 e8daab5fb25eb513c53d6d766d50caf662131d79 jdk7u80-b08 @@ -595,9 +632,19 @@ 611f7d38d9346243b558dc78409b813241eb426f jdk7u80-b30 f19659de2034611095d307ccc68f777abc8b008e jdk7u80-b15 458545155c9326c27b4e84a8a087f4419e8f122e jdk7u80-b32 -3b6a81ffb63654d5148168c2ba00288dfc833fe4 jdk7u85-b00 -76707a6d46afa9a057756f4d3614c0da1320499c jdk7u85-b01 +88ad67ad5b51c1e7316828de177808d4776b5357 icedtea-2.6pre23 +dbfa75121acab9c4dfbf5b28e3eba0e58905c4ef icedtea-2.6pre24 +8d08525bb2541367a4908a5f97298e0b21c12280 jdk7u85-b00 +e3845b02b0d1bfe203ab4783941d852a2b2d412d jdk7u85-b01 +dbfa75121acab9c4dfbf5b28e3eba0e58905c4ef icedtea-2.6.0 +dbfa75121acab9c4dfbf5b28e3eba0e58905c4ef icedtea-2.6-branchpoint +39b2c4354d0a235a5bc20ce286374bb242e9c62d icedtea-2.6.1 bc294917c5eb1ea2e655a2fcbd8fbb2e7cbd3313 jdk7u85-b02 +2265879728d802e3af28bcd9078431c56a0e26e5 icedtea-2.6.2pre01 +d27c76db0808b7a59313916e9880deded3368ed2 icedtea-2.6.2pre02 63d687368ce5bca36efbe48db2cf26df171b162d jdk7u91-b00 03b03194afbe87a049a1c6d83f49788602c363d8 jdk7u91-b01 +601ca7147b8c551d394ad97b6288b01c9e763ea4 icedtea-2.6.2 2be0ab1a24b2b6910d8f31e3314ffa48f30f21df jdk7u91-b02 +f0e7f22f09ef0ddd583eb8ce9a14edcccfa4f7ea icedtea-2.6.3 +a28bc539342e4ca724a5abd2521c6a58f04c2113 jdk7u95-b00 diff -r a28bc539342e -r 4f1e498cad9c .jcheck/conf --- a/.jcheck/conf Fri Nov 13 02:43:36 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r a28bc539342e -r 4f1e498cad9c README-ppc.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README-ppc.html Mon Jan 18 15:52:07 2016 +0000 @@ -0,0 +1,689 @@ + + + + + + OpenJDK PowerPC/AIX Port + + + + + +

OpenJDK PowerPC Port

+ +

+This file contains some additional build instructions for +the OpenJDK PowerPC +Port for Linux and AIX. It complements the general +OpenJDK +README-builds.html file. +

+ +

Building on Linux/PPC64

+ +

+Currently, i.e. all versions after +revision ppc-aix-port-b01, +should successfully build and run on Linux/PPC64. Passing +CORE_BUILD=true on the build comamnd line will instruct the build +system to create an interpreter-only version of the VM which is in general about +an order of magnitude slower than a corresponding server VM with JIT +compiler. But it is still fully functional (e.g. it passes JVM98) and can even +be used to bootstrap itself. Starting with +revision ppc-aix-port-b03, +it is possible to build without CORE_BUILD=true and create a +JIT-enabled version of the VM (containing the C2 "Server" JIT +compiler). +

+ +

+Our current build system is a Power6 box running +SLES 10.3 with gcc version 4.1.2 (in general, more recent Linux distributions +should work as well). +

+ +

Building with the OpenJDK Linux/PPC64 port as bootstrap JDK

+ +

+A precompiled build of ppc-aix-port-b03 is available +for download. +With it and together with the other build dependencies fulfilled as described +in the +main +README-builds.html file you can build a debug version of the JDK from the +top-level source directory with the following command line (additionally +pass CORE_BUILD=true to build an interpreter-only version of the VM): +

+ +
+> make FT_CFLAGS=-m64 LANG=C \
+  ALT_BOOTDIR=<path_to>/jdk1.7.0-ppc-aix-port-b01 \
+  ARCH_DATA_MODEL=64 \
+  HOTSPOT_BUILD_JOBS=8 \
+  PARALLEL_COMPILE_JOBS=8 \
+  ALT_FREETYPE_LIB_PATH=/usr/local/lib \
+  ALT_FREETYPE_HEADERS_PATH=/usr/local/include \
+  ANT_HOME=/usr/local/apache-ant-1.8.4 \
+  VERBOSE=true \
+  CC_INTERP=true \
+  OPENJDK=true \
+  debug_build 2>&1 | tee build_ppc-aix-port_dbg.log
+
+ +

+After the build finished successfully the results can be found under +./build/linux-ppc64-debug/. Product and fastdebug versions can be +build with the make targets product_build and +fastdebug_build respectively (the build results will be located under +./build/linux-ppc64/ and ./build/linux-ppc64-fastdebug/). On +our transitional ppc-aix-port +project page you can find the build logs of our regular nightly makes. +

+ +

Problems with pre-installed ANT on newer Linux distros

+ +

+Notice that pre-installed ANT version (i.e. ANT versions installed with the +corresponding system package manager) may cause problems in conjunction with +our bootstrap JDK. This is because they use various scripts from the +jpackage project to locate specific Java +libraries and jar files. These scripts (in particular +set_jvm_dirs() +in /usr/share/java-utils/java-functions) expect that executing +"java -fullversion" will return a string starting with "java" but +our OpenJDK port returns a string starting with "openjdk" instead. +

From andrew at icedtea.classpath.org Tue Jan 19 21:47:04 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 19 Jan 2016 21:47:04 +0000 Subject: /hg/release/icedtea7-forest-2.6/corba: 2 new changesets Message-ID: changeset adda687205a9 in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=adda687205a9 author: andrew date: Mon Jan 18 00:07:38 2016 +0000 Added tag jdk7u95-b00 for changeset 96b735f85c61 changeset 2135da66cc53 in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=2135da66cc53 author: andrew date: Mon Jan 18 15:52:10 2016 +0000 Merge jdk7u95-b00 diffstat: .hgtags | 47 + .jcheck/conf | 2 - make/Makefile | 2 +- make/common/Defs-aix.gmk | 397 ++++++++++ make/common/shared/Defs-java.gmk | 8 +- make/common/shared/Platform.gmk | 12 + src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java | 2 +- 7 files changed, 464 insertions(+), 6 deletions(-) diffs (truncated from 650 to 500 lines): diff -r 96b735f85c61 -r 2135da66cc53 .hgtags --- a/.hgtags Fri Nov 13 02:43:39 2015 +0000 +++ b/.hgtags Mon Jan 18 15:52:10 2016 +0000 @@ -50,6 +50,7 @@ b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73 5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75 +d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12 937144222e2219939101b0129d26a872a7956b13 jdk7-b76 6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77 a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78 @@ -63,6 +64,7 @@ 6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86 09a41111a401d327f65e453384d976a10154d9ea jdk7-b87 39e14d2da687c7e592142137517aaf689544820f jdk7-b88 +e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13 bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89 56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90 bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91 @@ -111,6 +113,7 @@ 918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134 e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135 48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136 +b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14 a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137 78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138 60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139 @@ -123,6 +126,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147 +d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04 @@ -141,6 +145,7 @@ 56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12 456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13 62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21 +ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint 1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02 730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03 7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04 @@ -157,6 +162,7 @@ 23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10 bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11 fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12 +9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13 6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14 d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15 @@ -186,11 +192,15 @@ c9f6750370c9a99d149d73fd32c363d9959d19d1 jdk7u6-b10 a2089d3bf5a00be50764e1ced77e270ceddddb5d jdk7u6-b11 34354c623c450dc9f2f58981172fa3d66f51e89c jdk7u6-b12 +325250aef90af0f5cd04b141f83a81638ae1e478 ppc-aix-port-b01 +325250aef90af0f5cd04b141f83a81638ae1e478 ppc-aix-port-b02 +325250aef90af0f5cd04b141f83a81638ae1e478 ppc-aix-port-b03 76bee3576f61d4d96fef118902d5d237a4f3d219 jdk7u6-b13 731d5dbd7020dca232023f2e6c3e3e22caccccfb jdk7u6-b14 8da4015f405b0fa267cca4780d20cd012d0a9cb4 jdk7u6-b15 7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16 e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17 +68c35d6e9548bc7be9c3ce73774c6d53b0d72d3b icedtea-2.3-branchpoint b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18 5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19 f0c51b691d34b4a06c1e22c7960be71e0d0ee84e jdk7u6-b20 @@ -258,11 +268,13 @@ 7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07 6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08 c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09 +efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint 3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10 3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11 fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12 cd7aaec5accf3f8fbb693153f8d9be846e0f8a05 jdk7u14-b13 9e8bde2586a1a7fd95f654c7d0043d1eb18f0793 jdk7u14-b14 +70af8b7907a504f7b6e4be1882054ca9f3ad1875 ppc-aix-port-b04 2b1fcbe4e78557822b2269b43c8b589aa1f0b522 jdk7u14-b15 622e370c2d1e8c5f48d8f520f486dc6fcc1239c5 jdk7u15-b01 30188388048333e213a839363329ac2cb0cf0e0d jdk7u15-b02 @@ -381,6 +393,7 @@ 80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18 a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30 b7fb35bbe70d88eced3725b6e9070ad0b5b621ad jdk7u45-b31 +c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00 d641ac83157ec86219519c0cbaf3122bdc997136 jdk7u45-b33 aa24e046a2da95637257c9effeaabe254db0aa0b jdk7u45-b34 fab1423e6ab8ecf36da8b6bf2e454156ec701e8a jdk7u45-b35 @@ -430,8 +443,11 @@ c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00 a531112cc6d0b0a1e7d4ffdaa3ba53addcd25cf4 jdk7u60-b01 d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02 +47343904e95d315b5d2828cb3d60716e508656a9 icedtea-2.5pre01 +16906c5a09dab5f0f081a218f20be4a89137c8b1 icedtea-2.5pre02 d7e98ed925a3885380226f8375fe109a9a25397f jdk7u60-b03 1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u60-b04 +7224b2d0d3304b9d1d783de4d35d706dc7bcd00e icedtea-2.6pre01 753698a910167cc29c01490648a2adbcea1314cc jdk7u60-b05 9852efe6d6b992b73fdbf59e36fb3547a9535051 jdk7u60-b06 84a18429f247774fc7f1bc81de271da20b40845b jdk7u60-b07 @@ -441,7 +457,11 @@ a429ff635395688ded6c52cd21c0b4ce75e62168 jdk7u60-b11 d581875525aaf618afe901da31d679195ee35f4b jdk7u60-b12 2c8ba5f9487b0ac085874afd38f4c10a4127f62c jdk7u60-b13 +8293bea019e34e9cea722b46ba578fd4631f685f icedtea-2.6pre02 +35fa09c49527a46a29e210f174584cc1d806dbf8 icedtea-2.6pre03 02bdeb33754315f589bd650dde656d2c9947976d jdk7u60-b14 +d99431d571f8aa64a348b08c6bf7ac3a90c576ee icedtea-2.6pre04 +90a4103857ca9ff64a47acfa6b51ca1aa5a782c3 icedtea-2.6pre05 e5946b2cf82bdea3a4b85917e903168e65a543a7 jdk7u60-b15 e424fb8452851b56db202488a4e9a283934c4887 jdk7u60-b16 b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b17 @@ -581,10 +601,27 @@ 59faa52493939dccdf6ff9efe86371101769b8f9 jdk7u79-b15 1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u80-b00 df1decc820934ad8bf91c853e81c88d4f7590e25 jdk7u80-b01 +30f5a9254154b68dd16e2d93579d7606c79bd54b icedtea-2.6pre07 +250d1a2def5b39f99b2f2793821cac1d63b9629f icedtea-2.6pre06 +a756dcabdae6fcdff57a2d321088c42604b248a6 icedtea-2.6pre08 2444fa7df7e3e07f2533f6c875c3a8e408048f6c jdk7u80-b02 +4e8ca30ec092bcccd5dc54b3af2e2c7a2ee5399d icedtea-2.6pre09 +1a346ad4e322dab6bcf0fbfe989424a33dd6e394 icedtea-2.6pre10 +c11c54a2675c32eeb015450427424f277faaa95b icedtea-2.6pre11 fc6a39d6be24e0c1f7d9193e4f3ea4e474bb4dc3 jdk7u80-b03 +f2ef4247a9a496bb173a6592a6f13e716670b8d3 icedtea-2.6pre12 +9b3eb26f177e896dc081de80b5f0fe0bea12b5e4 icedtea-2.6pre13 +646234c2fd7be902c44261aa8f909dfd115f308d icedtea-2.6pre14 +9a9cde985e018164da97d4ed1b51a83cda59f93a icedtea-2.6pre15 +8eeadf4624006ab6af52354a15aee8f9a890fc16 icedtea-2.6pre16 +1eb2d75d86f049cd2f57c1ff35e3d569baec0650 icedtea-2.6pre17 d9ddd2aec6bee31e3bd8bb4eb258c27a624162c3 jdk7u80-b04 6696348644df30f1807acd3a38a603ebdf09480c jdk7u80-b05 +15250731630c137ff1bdbe1e9ecfe29deb7db609 icedtea-2.6pre18 +e4d788ed1e0747b9d1674127253cd25ce834a761 icedtea-2.6pre19 +4ca25161dc2a168bb21949f3986d33ae695e9d13 icedtea-2.6pre20 +0cc5634fda955189a1157ff5d899da6c6abf56c8 icedtea-2.6pre21 +c92957e8516c33f94e24e86ea1d3e536525c37f5 icedtea-2.6pre22 4362d8c11c43fb414a75b03616252cf8007eea61 jdk7u80-b06 1191862bb140612cc458492a0ffac5969f48c4df jdk7u80-b07 6a12979724faeb9abe3e6af347c64f173713e8a4 jdk7u80-b08 @@ -597,9 +634,19 @@ 52b7bbe24e490090f98bee27dbd5ec5715b31243 jdk7u80-b30 353be4a0a6ec19350d18e0e9ded5544ed5d7433f jdk7u80-b15 a97bddc81932c9772184182297291abacccc85c0 jdk7u80-b32 +9d5c92264131bcac8d8a032c055080cf51b18202 icedtea-2.6pre23 +e3445769412d69411988241bef34fd1d652a37d1 icedtea-2.6pre24 +e3445769412d69411988241bef34fd1d652a37d1 icedtea-2.6.0 02c5cee149d94496124f794b7ef89d860b8710ee jdk7u85-b00 a1436e2c0aa8c35b4c738004d19549df54448621 jdk7u85-b01 +e3445769412d69411988241bef34fd1d652a37d1 icedtea-2.6-branchpoint +2545636482d69e70bf482d41ba18dba27798f495 icedtea-2.6.1 7a91bf11c82bd794b7d6f63187345ebcbe07f37c jdk7u85-b02 +10bb9df77e39518afc9f65e7fdc7328bb0fb80dd icedtea-2.6.2pre01 +0445c54dcfb6cd523525a07eec0f2b26c43eb3c4 icedtea-2.6.2pre02 f9630ed441a06612f61a88bd3da39075015213a7 jdk7u91-b00 34be12b4b6ea5f30d364a916a92effeafdce678d jdk7u91-b01 +a4d55c5cec23631523672ca8b27767ec882eb835 icedtea-2.6.2 e3a6331d136ecac575730b498501f5b0dc4302e2 jdk7u91-b02 +9a3ca529125ad02ef3b0afd3c2f8fa6f80e0e46f icedtea-2.6.3 +96b735f85c61ad721113713551271106a5070742 jdk7u95-b00 diff -r 96b735f85c61 -r 2135da66cc53 .jcheck/conf --- a/.jcheck/conf Fri Nov 13 02:43:39 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 96b735f85c61 -r 2135da66cc53 make/Makefile --- a/make/Makefile Fri Nov 13 02:43:39 2015 +0000 +++ b/make/Makefile Mon Jan 18 15:52:10 2016 +0000 @@ -150,7 +150,7 @@ #----- bin.zip -BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl +BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl BIN_ZIP = $(LIB_DIR)/bin.zip $(BIN_ZIP): $(BIN_ZIP_FILES) diff -r 96b735f85c61 -r 2135da66cc53 make/common/Defs-aix.gmk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/common/Defs-aix.gmk Mon Jan 18 15:52:10 2016 +0000 @@ -0,0 +1,397 @@ +# +# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. 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. +# + +# +# Makefile to specify compiler flags for programs and libraries +# targeted to Solaris. Should not contain any rules. +# +# WARNING: This file is shared with other workspaces. +# So when it includes other files, it must use JDK_TOPDIR. +# + +# Warning: the following variables are overridden by Defs.gmk. Set +# values will be silently ignored: +# CFLAGS (set $(OTHER_CFLAGS) instead) +# CPPFLAGS (set $(OTHER_CPPFLAGS) instead) +# CXXFLAGS (set $(OTHER_CXXFLAGS) instead) +# LDFLAGS (set $(OTHER_LDFAGS) instead) +# LDLIBS (set $(EXTRA_LIBS) instead) +# LDLIBS_COMMON (set $(EXTRA_LIBS) instead) +# LINTFLAGS (set $(OTHER_LINTFLAGS) instead) +# +# Note: CPPFLAGS are used in C and C++ compiles. +# + +# Get shared JDK settings +include $(JDK_MAKE_SHARED_DIR)/Defs.gmk + +# define these to avoid picking up ones from aliases or from +# non-standard locations +# + +AR = $(USRBIN_PATH)ar +BASENAME = $(UNIXCOMMAND_PATH)basename +CAT = $(UNIXCOMMAND_PATH)cat +# SAPJVM: Moved to shared/Compiler-aix.gmk +#CC = $(COMPILER_PATH)xlc_r +#CPP = $(COMPILER_PATH)xlc_r -E +#CXX = $(COMPILER_PATH)xlC_r +CD = cd # intrinsic unix command +CHMOD = $(UNIXCOMMAND_PATH)chmod +CMP = $(USRBIN_PATH)cmp +COMPRESS = $(USRBIN_PATH)compress +CP = $(UNIXCOMMAND_PATH)cp +CPIO = $(UNIXCOMMAND_PATH)cpio +CUT = $(USRBIN_PATH)cut +DATE = $(UNIXCOMMAND_PATH)date +DF = $(UNIXCOMMAND_PATH)df +DIFF = $(USRBIN_PATH)diff +DIRNAME = $(USRBIN_PATH)dirname +ECHO = echo # intrinsic unix command, with backslash-escaped character interpretation +EGREP = $(UNIXCOMMAND_PATH)egrep +EXPR = $(USRBIN_PATH)expr + +FIND = $(UNIXCOMMAND_PATH)find + +HEAD = $(USRBIN_PATH)head +GREP = $(UNIXCOMMAND_PATH)grep +GUNZIP = $(UNIXCOMMAND_PATH)gunzip +LEX = $(USRBIN_PATH)lex +LN = $(UNIXCOMMAND_PATH)ln +LS = $(UNIXCOMMAND_PATH)ls +M4 = $(USRBIN_PATH)m4 +MKDIR = $(UNIXCOMMAND_PATH)mkdir +MV = $(UNIXCOMMAND_PATH)mv +NAWK = $(USRBIN_PATH)awk +PWD = $(UNIXCOMMAND_PATH)pwd +#RM is defined by GNU Make as 'rm -f' +RMDIR = $(UNIXCOMMAND_PATH)rmdir +RPM = $(UNIXCOMMAND_PATH)rpm +SED = $(UNIXCOMMAND_PATH)sed +SH = $(UNIXCOMMAND_PATH)sh +SORT = $(UNIXCOMMAND_PATH)sort +STRIP = $(USRBIN_PATH)strip +TAIL = $(USRBIN_PATH)tail + +# SAPJVM: catch (gnu) tool by PATH environment variable +TAR = /usr/local/bin/tar + +TEST = $(USRBIN_PATH)test +TOUCH = $(UNIXCOMMAND_PATH)touch +TR = $(USRBIN_PATH)tr +TRUE = $(UNIXCOMMAND_PATH)true +UNAME = $(UNIXCOMMAND_PATH)uname +UNIQ = $(USRBIN_PATH)uniq +UNZIPSFX = $(USRBIN_PATH)unzipsfx +YACC = $(USRBIN_PATH)yacc + +# SAPJVM: catch (gnu) tool by PATH environment variable +ZIPEXE = $(UNIXCOMMAND_PATH)zip + +OS_VERSION = $(shell $(UNAME) -v) +OS_NAME = aix + +ARCH_DATA_MODEL=64 + +LIBARCH = ppc64 + +# Value of Java os.arch property +ARCHPROP = $(LIBARCH) + +BINDIR = $(OUTPUTDIR)/bin + +# where is unwanted output to be delivered? +DEV_NULL = /dev/null +export DEV_NULL + +CLASSPATH_SEPARATOR = : + +ifndef PLATFORM_SRC + PLATFORM_SRC = $(BUILDDIR)/../src/solaris +endif # PLATFORM_SRC + +# Location of the various .properties files specific to Linux platform +ifndef PLATFORM_PROPERTIES + PLATFORM_PROPERTIES = $(BUILDDIR)/../src/solaris/lib +endif # PLATFORM_SRC + +# Platform specific closed sources +ifndef OPENJDK + ifndef CLOSED_PLATFORM_SRC + CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris + endif +endif + +# SAPJVM: Set the source for the platform dependent sources of express +SAPJVMEXPRESS_PLATFORM_SRC=$(JDK_TOPDIR)/../../common/j2se/src/solaris + +# platform specific include files +PLATFORM_INCLUDE_NAME = $(PLATFORM) +PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME) + +# SAPJVM: OBJECT_SUFFIX, LIBRARY_SUFFIX, EXE_SUFFICS etc. are set in +# j2se/make/common/shared/Platform.gmk . Just override those which differ for AIX. +# suffix used for make dependencies files. +# SAPJVM AIX: -qmakedep outputs .u, not .d +override DEPEND_SUFFIX = u +# suffix used for lint files +LINT_SUFFIX = ln +# The suffix applied to the library name for FDLIBM +FDDLIBM_SUFFIX = a +# The suffix applied to scripts (.bat for windows, nothing for unix) +SCRIPT_SUFFIX = +# CC compiler object code output directive flag value +CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required! +CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required! + +# On AIX we don't have any issues using javah and javah_g. +JAVAH_SUFFIX = $(SUFFIX) + +# +# Default optimization +# + +ifndef OPTIMIZATION_LEVEL + ifeq ($(PRODUCT), java) + OPTIMIZATION_LEVEL = HIGHER + else + OPTIMIZATION_LEVEL = LOWER + endif +endif +ifndef FASTDEBUG_OPTIMIZATION_LEVEL + FASTDEBUG_OPTIMIZATION_LEVEL = LOWER +endif + +CC_OPT/LOWER = -O2 +CC_OPT/HIGHER = -O3 + +CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL)) + +# +# Selection of warning messages +# +CFLAGS_SHARED_OPTION=-qmkshrobj +CXXFLAGS_SHARED_OPTION=-qmkshrobj + +# +# If -Xa is in CFLAGS_COMMON it will end up ahead of $(POPT) for the +# optimized build, and that ordering of the flags completely freaks +# out cc. Hence, -Xa is instead in each CFLAGS variant. +# The extra options to the C++ compiler prevent it from: +# - adding runpath (dump -Lv) to *your* C++ compile install dir +# - adding stubs to various things such as thr_getspecific (hence -nolib) +# - creating Templates.DB in current directory (arch specific) +CFLAGS_COMMON = -qchars=signed +PIC_CODE_LARGE = -qpic=large +PIC_CODE_SMALL = -qpic=small +GLOBAL_KPIC = $(PIC_CODE_LARGE) +CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS) +# SAPJVM: +# save compiler options into object file +CFLAGS_COMMON += -qsaveopt + +# SAPJVM +# preserve absolute source file infos in debug infos +CFLAGS_COMMON += -qfullpath + +# SAPJVM +# We want to be able to debug an opt build as well. +CFLAGS_OPT = -g $(POPT) +CFLAGS_DBG = -g + +CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS) +# SAPJVM +# We want to be able to debug an opt build as well. +CXXFLAGS_OPT = -g $(POPT) +CXXFLAGS_DBG = -g + +# FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java +ifeq ($(FASTDEBUG), true) + CFLAGS_DBG += -O2 + CXXFLAGS_DBG += -O2 +endif + +CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"' + +# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here) +ifneq ($(ARCH),alpha) + CPP_ARCH_FLAGS += -D$(ARCH) +else + CPP_ARCH_FLAGS += -D_$(ARCH)_ +endif + +# SAPJVM. turn `=' into `+='. +CPPFLAGS_COMMON += -D$(ARCH) -DARCH='"$(ARCH)"' -DAIX $(VERSION_DEFINES) \ + -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT + +# SAPJVM: AIX port: zip lib +CPPFLAGS_COMMON += -DSTDC + +# turn on USE_PTHREADS +CPPFLAGS_COMMON += -DUSE_PTHREADS +CFLAGS_COMMON += -DUSE_PTHREADS + +CFLAGS_COMMON += -q64 +CPPFLAGS_COMMON += -q64 + +# SAPJVM. define PPC64 +CFLAGS_COMMON += -DPPC64 +CPPFLAGS_COMMON += -DPPC64 + +# SAPJVM +LDFLAGS_COMMON += -b64 + +# SAPJVM: enable dynamic runtime linking & strip the absolute paths from the coff section +LDFLAGS_COMMON += -brtl -bnolibpath + +# SAPJVM: Additional link parameters for AIX +LDFLAGS_COMMON += -liconv + +CPPFLAGS_OPT = +CPPFLAGS_DBG += -DDEBUG + +LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) +LDFLAGS_OPT = +LDFLAGS_DBG = + +# SAPJVM +# Export symbols +OTHER_LDFLAGS += -bexpall + +# +# Post Processing of libraries/executables +# +ifeq ($(VARIANT), OPT) + ifneq ($(NO_STRIP), true) + ifneq ($(DEBUG_BINARIES), true) + # Debug 'strip -g' leaves local function Elf symbols (better stack + # traces) + # SAPJVM + # We want to be able to debug an opt build as well. + # POST_STRIP_PROCESS = $(STRIP) -g + endif + endif +endif + +# javac Boot Flags +JAVAC_BOOT_FLAGS = -J-Xmx128m + +# +# Use: ld $(LD_MAPFILE_FLAG) mapfile *.o +# +LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker + +# +# Support for Quantify. +# +ifdef QUANTIFY +QUANTIFY_CMD = quantify +QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes +LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS) +endif + +# +# Path and option to link against the VM, if you have to. Note that +# there are libraries that link against only -ljava, but they do get From andrew at icedtea.classpath.org Tue Jan 19 21:47:22 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 19 Jan 2016 21:47:22 +0000 Subject: /hg/release/icedtea7-forest-2.6/jaxp: 5 new changesets Message-ID: changeset 76ead37867a5 in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=76ead37867a5 author: aefimov date: Wed Sep 02 16:40:03 2015 +0300 8133962: More general limits Reviewed-by: dfuchs, lancea, ahgross changeset ab80a04a71a5 in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=ab80a04a71a5 author: aefimov date: Fri Sep 11 02:22:42 2015 +0300 8134861: XSLT: Extension func call cause exception if namespace URI contains partial package name Reviewed-by: joehw changeset 7c422316234f in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=7c422316234f author: asaha date: Wed Nov 25 00:13:23 2015 -0800 8143132: L10n resource file translation update Summary: L10n resource file translation update Reviewed-by: naoto Contributed-by: li.jiang at oracle.com changeset c029d7572a67 in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=c029d7572a67 author: andrew date: Mon Jan 18 00:07:40 2016 +0000 Added tag jdk7u95-b00 for changeset 7c422316234f changeset bc6edb6c12a7 in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=bc6edb6c12a7 author: andrew date: Mon Jan 18 15:52:13 2016 +0000 Merge jdk7u95-b00 diffstat: .hgtags | 47 ++++++++++ .jcheck/conf | 2 - make/Makefile | 4 +- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java | 2 +- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java | 2 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java | 6 +- src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java | 8 +- src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java | 2 +- src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java | 5 +- src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java | 12 +- src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java | 5 +- src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java | 2 +- src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java | 10 ++ src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java | 2 +- src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java | 6 +- src/com/sun/xml/internal/stream/Entity.java | 8 +- 16 files changed, 92 insertions(+), 31 deletions(-) diffs (443 lines): diff -r 41c6f1e54d42 -r bc6edb6c12a7 .hgtags --- a/.hgtags Fri Nov 13 02:43:40 2015 +0000 +++ b/.hgtags Mon Jan 18 15:52:13 2016 +0000 @@ -50,6 +50,7 @@ feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73 ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75 +fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76 bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78 @@ -63,6 +64,7 @@ 81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86 8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87 d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88 +826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13 d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89 c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90 b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91 @@ -111,6 +113,7 @@ d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136 +1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14 1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137 be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138 28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139 @@ -123,6 +126,7 @@ bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147 +b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04 @@ -141,6 +145,7 @@ 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21 +7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02 604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03 551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04 @@ -157,6 +162,7 @@ 7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10 3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11 b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12 +c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint 7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13 82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14 36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01 @@ -186,11 +192,15 @@ f4e80156296e43182a0fea5f54032d8c0fd0b41f jdk7u6-b10 5078a73b3448849f3328af5e0323b3e1b8d2d26c jdk7u6-b11 c378e596fb5b2ebeb60b89da7ad33f329d407e2d jdk7u6-b12 +15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b01 +15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b02 +15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b03 15b71daf5e69c169fcbd383c0251cfc99e558d8a jdk7u6-b13 da79c0fdf9a8b5403904e6ffdd8f5dc335d489d0 jdk7u6-b14 94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15 0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16 5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17 +445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint 1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18 3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19 4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20 @@ -258,12 +268,14 @@ 1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07 427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08 366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09 +14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint 23191c790e12841f81ac1cf956e7dbc0b45914ee jdk7u14-b10 825eda7553590ce19eb4fa0686c4405d97daafdb jdk7u14-b11 560e5cf5b57fc91e2bc6dd1809badd58c6eb25bd jdk7u14-b12 937bae61a48febcc948b7e10ae781c9077360241 jdk7u14-b13 7038ca4959e50a02f797e639daffe6b2b4065f86 jdk7u14-b14 aa6fb94c5e7bc645f478b6f60c5e6e06bebcc2bf jdk7u14-b15 +1d1e1fc3b88d2fda0c7da55ee3abb2b455e0d317 ppc-aix-port-b04 99c114990b191f32e72c6158072033aec5816aaf jdk7u15-b01 edbaa584f09a78d0ad3c73389faf20409a552e46 jdk7u15-b02 14a9b60a2086f4e2f6ec43bee3375042946f6510 jdk7u15-b30 @@ -382,6 +394,7 @@ 4beb90ab48f7fd46c7a9afbe66f8cccb230699ba jdk7u45-b18 a456c78a50e201a65c9f63565c8291b84a4fbd32 jdk7u45-b30 3c34f244296e98d8ebb94973c752f3395612391a jdk7u45-b31 +d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00 056494e83d15cd1c546d32a3b35bdb6f670b3876 jdk7u45-b33 b5a83862ed2ab9cc2de3719e38c72519481a4bbb jdk7u45-b34 7fda9b300e07738116b2b95b568229bdb4b31059 jdk7u45-b35 @@ -431,8 +444,11 @@ d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00 ad39e88c503948fc4fc01e97c75b6e3c24599d23 jdk7u60-b01 050986fd54e3ec4515032ee938bc59e86772b6c0 jdk7u60-b02 +74093b75ddd4fc2e578a3469d32b8bb2de3692d5 icedtea-2.5pre01 +d7085aad637fa90d027840c7f7066dba82b21667 icedtea-2.5pre02 359b79d99538d17eeb90927a1e4883fcec31661f jdk7u60-b03 7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u60-b04 +10314bfd5ba43a63f2f06353f3d219b877f5120f icedtea-2.6pre01 673ea3822e59de18ae5771de7a280c6ae435ef86 jdk7u60-b05 fd1cb0040a1d05086ca3bf32f10e1efd43f05116 jdk7u60-b06 cd7c8fa7a057e62e094cdde78dd632de54cedb8c jdk7u60-b07 @@ -442,7 +458,11 @@ e57490e0b99917ea8e1da1bb4d0c57fd5b7705f9 jdk7u60-b11 a9574b35f0af409fa1665aadd9b2997a0f9878dc jdk7u60-b12 92cf0b5c1c3e9b61d36671d8fb5070716e0f016b jdk7u60-b13 +a0138328f7db004859b30b9143ae61d598a21cf9 icedtea-2.6pre02 +33912ce9492d29c3faa5eb6787d5141f87ebb385 icedtea-2.6pre03 2814f43a6c73414dcb2b799e1a52d5b44688590d jdk7u60-b14 +c3178eab3782f4135ea21b060683d29bde3bbc7e icedtea-2.6pre04 +b9104a740dcd6ec07a868efd6f57dad3560e402c icedtea-2.6pre05 10eed57b66336660f71f7524f2283478bdf373dc jdk7u60-b15 fefd2d5c524b0be78876d9b98d926abda2828e79 jdk7u60-b16 ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b17 @@ -582,10 +602,27 @@ 6abf26813c3bd6047d5425e41dbc9dd1fd51cc63 jdk7u79-b15 7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u80-b00 4c959b6a32057ec18c9c722ada3d0d0c716a51c4 jdk7u80-b01 +614b7c12f276c52ebef06fb17c79cf0eadbcc774 icedtea-2.6pre07 +75513ef5e265955b432550ec73770b8404a4d36b icedtea-2.6pre06 +fbc3c0ab4c1d53059c32d330ca36cb33a3c04299 icedtea-2.6pre08 25a1b88d7a473e067471e00a5457236736e9a2e0 jdk7u80-b02 +f59ee51637102611d2ecce975da8f4271bdee85f icedtea-2.6pre09 +603009854864635cbfc36e95f39b6da4070f541a icedtea-2.6pre10 +79d217da0a7a03fb071e7f2e99fbd5fc7c38aed5 icedtea-2.6pre11 1853995499cef61fc16e0e4b840276223314669b jdk7u80-b03 +1edb9d1d6451a8e147d74e69021bc3f00622b8c6 icedtea-2.6pre12 +a2841c1a7f292ee7ba33121435b566d347b99ddb icedtea-2.6pre13 +35cfccb24a9c229f960169ec986beae2329b0688 icedtea-2.6pre14 +133c38a2d10fdb95e332ceefa4db8cf765c8b413 icedtea-2.6pre15 +a41b3447afd7011c7d08b5077549695687b70ea4 icedtea-2.6pre16 +54100657ce67cb5164cb0683ceb58ae60542fd79 icedtea-2.6pre17 3f6f053831796f654ad8fd77a6e4f99163742649 jdk7u80-b04 b93c3e02132fd13971aea6df3c5f6fcd4c3b1780 jdk7u80-b05 +8cc37ea6edf6a464d1ef01578df02da984d2c79f icedtea-2.6pre18 +0e0fc4440a3ba74f0df5df62da9306f353e1d574 icedtea-2.6pre19 +3bb57abb921fcc182015e3f87b796af29fce4b68 icedtea-2.6pre20 +522863522a4d0b82790915d674ea37ef3b39c2a7 icedtea-2.6pre21 +8904cf73c0483d713996c71bf4496b748e014d2c icedtea-2.6pre22 d220098f4f327db250263b6c2b460fecec19331a jdk7u80-b06 535bdb640a91a8562b96799cefe9de94724ed761 jdk7u80-b07 3999f9baa3f0a28f82c6a7a073ad2f7a8e12866d jdk7u80-b08 @@ -598,9 +635,19 @@ 1b435d2f2050ac43a7f89aadd0fdaa9bf0441e3d jdk7u80-b30 acfe75cb9d7a723fbaae0bf7e1b0fb3429df4ff8 jdk7u80-b15 b45dfccc8773ad062c128f63fa8073b0645f7848 jdk7u80-b32 +9150a16a7b801124e13a4f4b1260badecd96729a icedtea-2.6pre23 +e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6pre24 +e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6.0 b50728249c16d97369f0ed3e9d45302eae3943e4 jdk7u85-b00 e9190eeef373a9d2313829a9561e32cb722d68a9 jdk7u85-b01 +e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6-branchpoint +ffbe529eeac7aa3b4cedd78be2f843c2f00f603c icedtea-2.6.1 d42101f9c06eebe7722c38d84d5ef228c0280089 jdk7u85-b02 +a5f1374a47150e3cdda1cc9a8775417ceaa62657 icedtea-2.6.2pre01 +4e264c1f6b2f335e0068608e9ec4c312cddde7a4 icedtea-2.6.2pre02 e95e9042c8f31c5fe3149afdbe114592a3e32e91 jdk7u91-b00 9f5bcd95c8d54f8cf5ab922b0b9e94f7ea6cdeb8 jdk7u91-b01 +f1202fb276950491aa1ed30e214351d235c94920 icedtea-2.6.2 6d9a192976332443bb3be46d49d5b255d9781fe9 jdk7u91-b02 +f7bf82fcbd098bc520ceb92f97890ee6f7da3506 icedtea-2.6.3 +7c422316234f10b327fdbc181aedd5e74f31fd38 jdk7u95-b00 diff -r 41c6f1e54d42 -r bc6edb6c12a7 .jcheck/conf --- a/.jcheck/conf Fri Nov 13 02:43:40 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 41c6f1e54d42 -r bc6edb6c12a7 make/Makefile --- a/make/Makefile Fri Nov 13 02:43:40 2015 +0000 +++ b/make/Makefile Mon Jan 18 15:52:13 2016 +0000 @@ -118,13 +118,13 @@ ifdef ALT_LANGTOOLS_DIST ifdef ALT_BOOTDIR ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) - ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) + ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) -Djava.home=$(ALT_BOOTDIR) endif ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap else ifdef ALT_JDK_IMPORT_PATH ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH) - ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) + ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) -Djava.home=$(ALT_JDK_IMPORT_PATH) endif endif diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java --- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java Mon Jan 18 15:52:13 2016 +0000 @@ -1362,7 +1362,7 @@ { "optionE", " [-E (Entit\u00E4tsreferenzen nicht einblenden)]"}, { "optionV", " [-E (Entit\u00E4tsreferenzen nicht einblenden)]"}, { "optionQC", " [-QC (Stille Musterkonfliktwarnungen)]"}, - { "optionQ", " [-Q (Stiller Modus)]"}, + { "optionQ", " [-Q (Silent-Modus)]"}, { "optionLF", " [-LF (Nur Zeilenvorsch\u00FCbe bei Ausgabe verwenden {Standard ist CR/LF})]"}, { "optionCR", " [-CR (Nur Zeilenschaltungen bei Ausgabe verwenden {Standard ist CR/LF})]"}, { "optionESCAPE", " [-ESCAPE (Escapezeichen {Standard ist <>&\"'\r\n}]"}, diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java --- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java Mon Jan 18 15:52:13 2016 +0000 @@ -1213,7 +1213,7 @@ "Le nom de fonction ne peut pas \u00EAtre NULL."}, { ER_XPATH_RESOLVER_NEGATIVE_ARITY, - "Le nombre d'arguments ne peut pas \u00EAtre n\u00E9gatif."}, + "L'arit\u00E9 ne peut pas \u00EAtre n\u00E9gative."}, // Warnings... { WG_FOUND_CURLYBRACE, diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java --- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Mon Jan 18 15:52:13 2016 +0000 @@ -932,9 +932,9 @@ //Check if FSP and SM - only then proceed with loading if (namespace != null && isSecureProcessing && isExtensionFunctionEnabled - && (namespace.equals(JAVA_EXT_XALAN) - || namespace.equals(JAVA_EXT_XSLTC) - || namespace.equals(JAVA_EXT_XALAN_OLD) + && (namespace.startsWith(JAVA_EXT_XALAN) + || namespace.startsWith(JAVA_EXT_XSLTC) + || namespace.startsWith(JAVA_EXT_XALAN_OLD) || namespace.startsWith(XALAN_CLASSPACKAGE_NAMESPACE))) { _clazz = getXSLTC().loadExternalFunction(_className); } else { diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java --- a/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Mon Jan 18 15:52:13 2016 +0000 @@ -567,8 +567,12 @@ } public NodeList makeNodeList(DTMAxisIterator iter) { - // TODO: gather nodes from all DOMs ? - return _main.makeNodeList(iter); + int index = iter.next(); + if (index == DTM.NULL) { + return null; + } + iter.reset(); + return _adapters[getDTMId(index)].makeNodeList(iter); } public String getLanguage(int node) { diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java --- a/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java Mon Jan 18 15:52:13 2016 +0000 @@ -332,7 +332,7 @@ new Object[]{entityName}); } } - fEntityManager.startEntity(false, entityName, true); + fEntityManager.startEntity(true, entityName, true); } } } diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java --- a/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java Mon Jan 18 15:52:13 2016 +0000 @@ -905,7 +905,7 @@ } int length = fCurrentEntity.position - offset; fCurrentEntity.columnNumber += length - newlines; - if (fCurrentEntity.reference) { + if (fCurrentEntity.isGE) { checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length); } content.setValues(fCurrentEntity.ch, offset, length); @@ -1052,6 +1052,9 @@ } int length = fCurrentEntity.position - offset; fCurrentEntity.columnNumber += length - newlines; + if (fCurrentEntity.isGE) { + checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length); + } content.setValues(fCurrentEntity.ch, offset, length); // return next character diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java --- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Mon Jan 18 15:52:13 2016 +0000 @@ -1105,7 +1105,7 @@ /** * Starts a named entity. * - * @param reference flag to indicate whether the entity is an Entity Reference. + * @param isGE flag to indicate whether the entity is a General Entity * @param entityName The name of the entity to start. * @param literal True if this entity is started within a literal * value. @@ -1113,7 +1113,7 @@ * @throws IOException Thrown on i/o error. * @throws XNIException Thrown by entity handler to signal an error. */ - public void startEntity(boolean reference, String entityName, boolean literal) + public void startEntity(boolean isGE, String entityName, boolean literal) throws IOException, XNIException { // was entity declared? @@ -1237,7 +1237,7 @@ } // start the entity - startEntity(reference, entityName, xmlInputSource, literal, external); + startEntity(isGE, entityName, xmlInputSource, literal, external); } // startEntity(String,boolean) @@ -1286,7 +1286,7 @@ * This method can be used to insert an application defined XML * entity stream into the parsing stream. * - * @param reference flag to indicate whether the entity is an Entity Reference. + * @param isGE flag to indicate whether the entity is a General Entity * @param name The name of the entity. * @param xmlInputSource The input source of the entity. * @param literal True if this entity is started within a @@ -1296,12 +1296,12 @@ * @throws IOException Thrown on i/o error. * @throws XNIException Thrown by entity handler to signal an error. */ - public void startEntity(boolean reference, String name, + public void startEntity(boolean isGE, String name, XMLInputSource xmlInputSource, boolean literal, boolean isExternal) throws IOException, XNIException { - String encoding = setupCurrentEntity(reference, name, xmlInputSource, literal, isExternal); + String encoding = setupCurrentEntity(isGE, name, xmlInputSource, literal, isExternal); //when entity expansion limit is set by the Application, we need to //check for the entity expansion limit set by the parser, if number of entity diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java --- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Mon Jan 18 15:52:13 2016 +0000 @@ -1038,7 +1038,7 @@ } int length = fCurrentEntity.position - offset; fCurrentEntity.columnNumber += length - newlines; - if (fCurrentEntity.reference) { + if (fCurrentEntity.isGE) { checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length); } @@ -1215,6 +1215,9 @@ } int length = fCurrentEntity.position - offset; fCurrentEntity.columnNumber += length - newlines; + if (fCurrentEntity.isGE) { + checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length); + } content.setValues(fCurrentEntity.ch, offset, length); // return next character diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java --- a/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Mon Jan 18 15:52:13 2016 +0000 @@ -947,7 +947,7 @@ new Object[]{entityName}); } } - fEntityManager.startEntity(false, entityName, true); + fEntityManager.startEntity(true, entityName, true); } } } diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java --- a/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Mon Jan 18 15:52:13 2016 +0000 @@ -529,6 +529,16 @@ invalidByte(4, 4, b2); } + // check if output buffer is large enough to hold 2 surrogate chars + if (out + 1 >= ch.length) { + fBuffer[0] = (byte)b0; + fBuffer[1] = (byte)b1; + fBuffer[2] = (byte)b2; + fBuffer[3] = (byte)b3; + fOffset = 4; + return out - offset; + } + // decode bytes into surrogate characters int uuuuu = ((b0 << 2) & 0x001C) | ((b1 >> 4) & 0x0003); if (uuuuu > 0x10) { diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java --- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Mon Jan 18 15:52:13 2016 +0000 @@ -2116,7 +2116,7 @@ */ @Override public String getTextContent() throws DOMException { - return getNodeValue(); // overriden in some subclasses + return dtm.getStringValue(node).toString(); } /** diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java --- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Mon Jan 18 15:52:13 2016 +0000 @@ -3145,11 +3145,7 @@ m_data.elementAt(-dataIndex+1)); } } - else if (DTM.ELEMENT_NODE == type) - { - return getStringValueX(nodeHandle); - } - else if (DTM.DOCUMENT_FRAGMENT_NODE == type + else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type || DTM.DOCUMENT_NODE == type) { return null; diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/xml/internal/stream/Entity.java --- a/src/com/sun/xml/internal/stream/Entity.java Fri Nov 13 02:43:40 2015 +0000 +++ b/src/com/sun/xml/internal/stream/Entity.java Mon Jan 18 15:52:13 2016 +0000 @@ -344,8 +344,8 @@ // to know that prolog is read public boolean xmlDeclChunkRead = false; - // flag to indicate whether the Entity is an Entity Reference - public boolean reference = false; + // flag to indicate whether the Entity is a General Entity + public boolean isGE = false; /** returns the name of the current encoding * @return current encoding name @@ -391,11 +391,11 @@ // /** Constructs a scanned entity. */ - public ScannedEntity(boolean reference, String name, + public ScannedEntity(boolean isGE, String name, XMLResourceIdentifier entityLocation, InputStream stream, Reader reader, String encoding, boolean literal, boolean mayReadChunks, boolean isExternal) { - this.reference = reference; + this.isGE = isGE; this.name = name ; this.entityLocation = entityLocation; this.stream = stream; From andrew at icedtea.classpath.org Tue Jan 19 21:47:39 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 19 Jan 2016 21:47:39 +0000 Subject: /hg/release/icedtea7-forest-2.6/jaxws: 2 new changesets Message-ID: changeset e0764f20b289 in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=e0764f20b289 author: andrew date: Mon Jan 18 00:07:41 2016 +0000 Added tag jdk7u95-b00 for changeset 3427b35ce5a1 changeset 271b555de438 in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=271b555de438 author: andrew date: Mon Jan 18 15:52:15 2016 +0000 Merge jdk7u95-b00 diffstat: .hgtags | 47 ++++++++++ .jcheck/conf | 2 - build.properties | 3 + build.xml | 14 ++- make/Makefile | 4 +- src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java | 8 + 6 files changed, 70 insertions(+), 8 deletions(-) diffs (248 lines): diff -r 3427b35ce5a1 -r 271b555de438 .hgtags --- a/.hgtags Fri Nov 13 02:43:41 2015 +0000 +++ b/.hgtags Mon Jan 18 15:52:15 2016 +0000 @@ -50,6 +50,7 @@ 558985e26fe16f5a6ebb2edb9180a42e1c8e8202 jdk7-b73 f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74 fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75 +0dc08d528c998ca993e759b311e7b54c98e0ef28 icedtea7-1.12 765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76 5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77 fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78 @@ -63,6 +64,7 @@ 512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86 3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87 8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88 +1661166c82dc2102f3f0364e28d1e4211f25a4cf icedtea7-1.13 bf3675aa7f20fc6f241ce95760005aef2a30ff41 jdk7-b89 ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90 cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91 @@ -111,6 +113,7 @@ 545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134 d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135 c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136 +339c2d381d80dbf9b74604e6ba43ead276b8024e icedtea-1.14 ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137 cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138 c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139 @@ -123,6 +126,7 @@ 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147 +e6cd09c7ef22bbabe31c9f2a32c7e13cfa713fd3 icedtea-2.0-branchpoint 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04 @@ -141,6 +145,7 @@ 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21 +d26ff33070cb75a0a7349d965ec4f0930ded418d icedtea-2.1-branchpoint d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u3-b02 44e824502fa24440f907205ccdc3959d01bd8109 jdk7u3-b03 6e1cc321aacea944691aa06558f2bbad89baf5b3 jdk7u3-b04 @@ -157,6 +162,7 @@ 3891fe529057431278394c6341cfabaacd5061f5 jdk7u4-b10 2df5cd83fab91f050c4bac54aa06e174ecee38f4 jdk7u4-b11 4d3a9fe44f7531642bc739ec3c8efb2e6d9e08c7 jdk7u4-b12 +1854d8e2547cb18ebcf84db13c22d0987c49c274 icedtea-2.2-branchpoint c3b6659aa169b3f249246497a8d5a87baa1e798a jdk7u4-b13 0f8963feaefda21e72f84b8ea49834a289d537f3 jdk7u4-b14 61516652b59ec411678b38a232a84413652a4172 jdk7u5-b01 @@ -186,11 +192,15 @@ c08f88f5ae98917254cd38e204393adac22823a6 jdk7u6-b10 a37ad8f90c7bd215d11996480e37f03eb2776ce2 jdk7u6-b11 95a96a879b8c974707a7ddb94e4fcd00e93d469c jdk7u6-b12 +4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b01 +4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b02 +4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b03 e0a71584b8d84d28feac9594d7bb1a981d862d7c jdk7u6-b13 9ae31559fcce636b8c219180e5db1d54556db5d9 jdk7u6-b14 f1dba7ebe6a50c22ffcaf85b14b31462ce008556 jdk7u6-b15 e1d2afbb63d27600dd8c8a021eadff84a901a73c jdk7u6-b16 401bdbbf89c9187b51dc8906c0e2700ef0ffc8a3 jdk7u6-b17 +8888d2790217c31edbf13ea81d9ac06210092ad2 icedtea-2.3-branchpoint a1daf7097c61181216233e4850ef6ec56b0fe6b6 jdk7u6-b18 58c1c6ecf8f1e59db9b575ae57b2894d0152d319 jdk7u6-b19 6d17242f12edc643ecab4263e656003a1ca44c03 jdk7u6-b20 @@ -258,11 +268,13 @@ 42ba62cdc1f3c357b6d192612dd1c4b209df2662 jdk7u12-b07 66f36438f54812e44327d38129d9488e5ea59e73 jdk7u12-b08 c130f21b16a2b2e2b961362bc4baf40fde2be458 jdk7u12-b09 +a653d06d5b50cacf58aebbab8b55e7e00587cd4c icedtea-2.4-branchpoint 9207c72345c9e82d4445764df57706f7b33a7981 jdk7u14-b10 444aa84f38df2607140e9ce35a21fef0965d27a6 jdk7u14-b11 40afea757379cfaaadca13eeb7dcbc0fe195f73d jdk7u14-b12 4fe9a362c3277cd4c7a5149853e5cf59dbba7cb7 jdk7u14-b13 a2b2e716637acdb9884d21fc4b9aef3c8b59e702 jdk7u14-b14 +53bd8e6a5ffabdc878a312509cf84a72020ddf9a ppc-aix-port-b04 b5c8ac5253ef735e5aa770b7325843ec89b56633 jdk7u14-b15 abcaebcead605f89cd0919add20d8ac16637ddc2 jdk7u15-b01 62f9e7f5eb644fedd93dd93bd36bcf817a8d9c8a jdk7u15-b02 @@ -381,6 +393,7 @@ 65b0f3ccdc8bcff0d79e1b543a8cefb817529b3f jdk7u45-b18 c32c6a662d18d7195fc02125178c7543ce09bb00 jdk7u45-b30 6802a1c098c48b2c8336e06f1565254759025bab jdk7u45-b31 +cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00 e040abab3625fbced33b30cba7c0307236268211 jdk7u45-b33 e7df5d6b23c64509672d262187f51cde14db4e66 jdk7u45-b34 c654ba4b2392c2913f45b495a2ea0c53cc348d98 jdk7u45-b35 @@ -430,8 +443,11 @@ cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00 f675dfce1e61a6ed01732ae7cfbae941791cba74 jdk7u60-b01 8a3b9e8492a5ac4e2e0c166dbfc5d058be244377 jdk7u60-b02 +3f7212cae6eb1fe4b257adfbd05a7fce47c84bf0 icedtea-2.5pre01 +4aeccc3040fa45d7156dccb03984320cb75a0d73 icedtea-2.5pre02 d4ba4e1ed3ecdef1ef7c3b7aaf62ff69fc105cb2 jdk7u60-b03 bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u60-b04 +1569dc36a61c49f3690911ce1e3741b36a5c16fd icedtea-2.6pre01 30afd3e2e7044b2aa87ce00ab4301990e6d94d27 jdk7u60-b05 dc6017fb9cde43bce92d403abc2821b741cf977c jdk7u60-b06 0380cb9d4dc27ed8e2c4fc3502e3d94b0ae0c02d jdk7u60-b07 @@ -441,7 +457,11 @@ 5d848774565b5e188d7ba915ce1cb09d8f3fdb87 jdk7u60-b11 9d34f726e35b321072ce5bd0aad2e513b9fc972f jdk7u60-b12 d941a701cf5ca11b2777fd1d0238e05e3c963e89 jdk7u60-b13 +ad282d85bae91058e1fcd3c10be1a6cf2314fcb2 icedtea-2.6pre02 +ef698865ff56ed090d7196a67b86156202adde68 icedtea-2.6pre03 43b5a7cf08e7ee018b1fa42a89510b4c381dc4c5 jdk7u60-b14 +95bbd42cadc9ffc5e6baded38577ab18836c81c1 icedtea-2.6pre04 +5515daa647967f128ebb1fe5a0bdfdf853ee0dc0 icedtea-2.6pre05 d00389bf5439e5c42599604d2ebc909d26df8dcf jdk7u60-b15 2fc16d3a321212abc0cc93462b22c4be7f693ab9 jdk7u60-b16 b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b17 @@ -581,10 +601,27 @@ 4ed47474a15acb48cd7f7fd3a4d9d3f8f457d914 jdk7u79-b15 bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u80-b00 0eb2482c3d0663c39794ec4c268acc41c4cd387b jdk7u80-b01 +f21a65d1832ce426c02a7d87b9d83b1a4a64018c icedtea-2.6pre07 +37d1831108b5ced7f1e63e1cd58b46dba7b76cc9 icedtea-2.6pre06 +646981c9ac471feb9c600504585a4f2c59aa2f61 icedtea-2.6pre08 579128925dd9a0e9c529125c9e299dc0518037a5 jdk7u80-b02 +39dd7bed2325bd7f1436d48f2478bf4b0ef75ca3 icedtea-2.6pre09 +70a94bce8d6e7336c4efd50dab241310b0a0fce8 icedtea-2.6pre10 +2823343ab244aa3e78b2c351e719936592b05275 icedtea-2.6pre11 e24556d88882d7a683812d416e3409386dda4ceb jdk7u80-b03 +d4724872ee06431c99edda9b86115a2a7ec9c8a1 icedtea-2.6pre12 +26d6f6067c7ba517c98992828f9d9e87df20356d icedtea-2.6pre13 +8b238b2b6e64991f24d524a6e3ca878df11f1ba4 icedtea-2.6pre14 +8946500e8f3d879b28e1e257d3683efe38217b4b icedtea-2.6pre15 +4bd22fe291c59aaf427b15a64423bb38ebfff2e9 icedtea-2.6pre16 +f36becc08f6640b1f65e839d6d4c5bf7df23fcf4 icedtea-2.6pre17 aaa0e97579b680842c80b0cf14c5dfd14deddbb7 jdk7u80-b04 c104ccd5dec598e99b61ca9cb92fe4af26d450cc jdk7u80-b05 +5ee59be2092b1fcf93457a9c1a15f420146c7c0b icedtea-2.6pre18 +26c7686a4f96316531a1fccd53593b28d5d17416 icedtea-2.6pre19 +c901dec7bc96f09e9468207c130361f3cf0a727f icedtea-2.6pre20 +231ef27a86e2f79302aff0405298081d19f1344e icedtea-2.6pre21 +d4de5503ba9917a7b86e9f649343a80118ae5eca icedtea-2.6pre22 4f6bcbad3545ab33c0aa587c80abf22b23e08162 jdk7u80-b06 8cadb55300888be69636353d355bbcc85315f405 jdk7u80-b07 2fb372549f5be49aba26992ea1d44121b7671fd5 jdk7u80-b08 @@ -597,9 +634,19 @@ c1bf2f665c46d0e0b514bdeb227003f98a54a561 jdk7u80-b30 f6417ecaede6ee277f999f68e45959326dcd8f07 jdk7u80-b15 b0dd986766bc3e8b65dd6b3047574ddd3766e1ac jdk7u80-b32 +87290096a2fa347f3a0be0760743696c899d8076 icedtea-2.6pre23 +299588405837ef1e37f3653127c68261abc0ffdf icedtea-2.6pre24 +299588405837ef1e37f3653127c68261abc0ffdf icedtea-2.6.0 705d613d09cf73a0c583b79268a41cbb32139a5a jdk7u85-b00 bb46da1a45505cf19360d5a3c0d2b88bb46f7f3b jdk7u85-b01 +299588405837ef1e37f3653127c68261abc0ffdf icedtea-2.6-branchpoint +b9776fab65b80620f0c8108f255672db037f855c icedtea-2.6.1 902c8893132eb94b222850e23709f57c4f56e4db jdk7u85-b02 +26d406dd17b150fa1dc15549d67e294d869537dd icedtea-2.6.2pre01 +e8660c5ef3e5cce19f4459009e69270c52629312 icedtea-2.6.2pre02 8206da0912d36f48b023f983c0a3bd9235c33c12 jdk7u91-b00 3862008078f83ca7f7c669b1b9d1f0f2e256aad8 jdk7u91-b01 +14c411b1183cb5ef628c39cecae460a86357d24b icedtea-2.6.2 2230b8f8e03a8eaefc83acb577f30c4de88c45a7 jdk7u91-b02 +39ef53b9c4030cde1ced8232f94b143968f4d22e icedtea-2.6.3 +3427b35ce5a1a0143b4aedf3f5e0a1953ad7fd7f jdk7u95-b00 diff -r 3427b35ce5a1 -r 271b555de438 .jcheck/conf --- a/.jcheck/conf Fri Nov 13 02:43:41 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 3427b35ce5a1 -r 271b555de438 build.properties --- a/build.properties Fri Nov 13 02:43:41 2015 +0000 +++ b/build.properties Mon Jan 18 15:52:15 2016 +0000 @@ -58,6 +58,9 @@ build.dir=${output.dir}/build build.classes.dir=${build.dir}/classes +# JAXP built files +jaxp.classes.dir=${output.dir}/../jaxp/build/classes + # Distributed results dist.dir=${output.dir}/dist dist.lib.dir=${dist.dir}/lib diff -r 3427b35ce5a1 -r 271b555de438 build.xml --- a/build.xml Fri Nov 13 02:43:41 2015 +0000 +++ b/build.xml Mon Jan 18 15:52:15 2016 +0000 @@ -135,9 +135,15 @@ - + - + diff -r 3427b35ce5a1 -r 271b555de438 make/Makefile --- a/make/Makefile Fri Nov 13 02:43:41 2015 +0000 +++ b/make/Makefile Mon Jan 18 15:52:15 2016 +0000 @@ -101,13 +101,13 @@ ifdef ALT_LANGTOOLS_DIST ifdef ALT_BOOTDIR ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) - ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) + ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) -Djava.home=$(ALT_BOOTDIR) endif ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap else ifdef ALT_JDK_IMPORT_PATH ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH) - ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) + ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) -Djava.home=$(ALT_JDK_IMPORT_PATH) endif endif diff -r 3427b35ce5a1 -r 271b555de438 src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Fri Nov 13 02:43:41 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Mon Jan 18 15:52:15 2016 +0000 @@ -67,6 +67,14 @@ SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); sf.setErrorHandler(errorFilter); + try { + // By default the SchemaFactory imposes a limit of 5000 on + // xsd:sequence maxOccurs if a SecurityManager is + // installed. This breaks the specification of xjc, + // causing TCK failures. + sf.setProperty("http://apache.org/xml/properties/security-manager", null); + } catch (SAXException e) { + } if( entityResolver != null ) { sf.setResourceResolver(new LSResourceResolver() { public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) { From andrew at icedtea.classpath.org Tue Jan 19 21:47:45 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 19 Jan 2016 21:47:45 +0000 Subject: /hg/release/icedtea7-forest-2.6/langtools: 3 new changesets Message-ID: changeset 3c71abf74353 in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=3c71abf74353 author: jlahoda date: Thu Jan 14 21:36:10 2016 +0000 8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing Summary: Handling CompletionFailures inside the Javadoc API implementation. Reviewed-by: mcimadamore, ksrini, jjg changeset 93a2788178e6 in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=93a2788178e6 author: andrew date: Mon Jan 18 00:07:42 2016 +0000 Added tag jdk7u95-b00 for changeset 3c71abf74353 changeset fd0a34cb97b4 in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=fd0a34cb97b4 author: andrew date: Mon Jan 18 15:52:45 2016 +0000 Merge jdk7u95-b00 diffstat: .hgtags | 47 +++++++++++++ .jcheck/conf | 2 - make/Makefile | 4 + make/build.properties | 3 +- make/build.xml | 2 +- src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java | 14 ++- src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java | 17 ++++- src/share/classes/com/sun/tools/javadoc/TypeMaker.java | 16 ++++- test/Makefile | 3 + test/tools/javac/T5090006/broken.jar | Bin 10 files changed, 95 insertions(+), 13 deletions(-) diffs (324 lines): diff -r 057733ea4f82 -r fd0a34cb97b4 .hgtags --- a/.hgtags Fri Nov 13 02:43:43 2015 +0000 +++ b/.hgtags Mon Jan 18 15:52:45 2016 +0000 @@ -50,6 +50,7 @@ 9596dff460935f09684c11d156ce591f92584f0d jdk7-b73 1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74 2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75 +83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12 8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76 0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77 acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78 @@ -63,6 +64,7 @@ ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86 409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87 f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88 +681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13 6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89 71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90 97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91 @@ -111,6 +113,7 @@ 3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134 9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135 ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136 +8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14 a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139 @@ -123,6 +126,7 @@ 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146 d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147 +fb7fb3071b642334520e5b9f4a87ce28717af61c icedtea-2.0-branchpoint cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03 baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04 @@ -141,6 +145,7 @@ f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12 f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21 +58f6a950cd726220e81eddb126ca5c57e3b368f2 icedtea-2.1-branchpoint fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u3-b02 0ffc4995457773085f61c39f6d33edc242b41bcf jdk7u3-b03 f6de36b195cd315646213c7affd2cc15702edbfb jdk7u3-b04 @@ -157,6 +162,7 @@ 8919b2b02fcba65f833c68374f3bfdd9bc3ba814 jdk7u4-b10 4672e092f0968d503dc37f860b15ae7e2653f8d7 jdk7u4-b11 a4bf6a1aff54a98e9ff2b3fb53c719f658bec677 jdk7u4-b12 +e3537a4f75c7fcca16c349c3175bb0cdc2fbc29c icedtea-2.2-branchpoint 56eb9150d9ffdb71c47d72871e8ecc98b5f402de jdk7u4-b13 0e55881c2ee2984048c179d1e031cefb56a36bec jdk7u4-b14 0bea057f7ce1577e1b0306f2027c057e35394398 jdk7u5-b01 @@ -186,11 +192,15 @@ 21d2313dfeac8c52a04b837d13958c86346a4b12 jdk7u6-b10 13d3c624291615593b4299a273085441b1dd2f03 jdk7u6-b11 f0be10a26af08c33d9afe8fe51df29572d431bac jdk7u6-b12 +e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b01 +e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b02 +e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b03 fcebf337f5c1d342973573d9c6f758443c8aefcf jdk7u6-b13 35b2699c6243e9fb33648c2c25e97ec91d0e3553 jdk7u6-b14 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16 66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17 +cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint 6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18 474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19 32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20 @@ -258,11 +268,13 @@ 382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07 7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08 96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09 +85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10 db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11 f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12 5a52c6cc8db94b68eaacb42a9b4df30a40b09d82 jdk7u14-b13 5febc4e479fad801424cdcce90a0d463a2ef9223 jdk7u14-b14 +d52538e72925a1da7b1fcff051b591beeb2452b4 ppc-aix-port-b04 5fdb509d1f1a0533b14c61c92d77ff21e0ce2488 jdk7u14-b15 1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01 8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02 @@ -382,6 +394,7 @@ ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18 164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30 7f5cfaedb25c2c2774d6839810d6ae543557ca01 jdk7u45-b31 +849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00 ef7bdbe7f1fa42fd58723e541d9cdedcacb2649a jdk7u45-b33 bcb3e939d046d75436c7c8511600b6edce42e6da jdk7u45-b34 efbda7abd821f280ec3a3aa6819ad62d45595e55 jdk7u45-b35 @@ -430,8 +443,11 @@ 849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00 b19e375d9829daf207b1bdc7f908a3e1d548462c jdk7u60-b01 954e1616449af74f68aed57261cbeb62403377f1 jdk7u60-b02 +0d89cc5766d72e870eaf16696ec9b7b1ca4901fd icedtea-2.5pre01 +f75a642c2913e1ecbd22fc46812cffa2e7739169 icedtea-2.5pre02 4170784840d510b4e8ae7ae250b92279aaf5eb25 jdk7u60-b03 772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u60-b04 +702454ac1a074e81890fb07da06ebf00370e42ed icedtea-2.6pre01 744287fccf3b2c4fba2abf105863f0a44c3bd4da jdk7u60-b05 8f6db72756f3e4c3cca8731d20e978fb741846d2 jdk7u60-b06 02f050bc5569fb058ace44ed705bbb0f9022a6fe jdk7u60-b07 @@ -441,7 +457,11 @@ 3cc64ba8cf85942929b15c5ef21360f96db3b99c jdk7u60-b11 b79b8b1dc88faa73229b2bce04e979ff5ec854f5 jdk7u60-b12 3dc3e59e9580dfdf95dac57c54fe1a4209401125 jdk7u60-b13 +2040d4afc89815f6bf54a597ff58a70798b68e3d icedtea-2.6pre02 +2950924c2b80dc4d3933a8ab15a0ebb39522da5a icedtea-2.6pre03 a8b9c1929e50a9f3ae9ae1a23c06fa73a57afce3 jdk7u60-b14 +fa084876cf02f2f9996ad8a0ab353254f92c5564 icedtea-2.6pre04 +5f917c4b87a952a8bf79de08f3e2dd3e56c41657 icedtea-2.6pre05 7568ebdada118da1d1a6addcf6316ffda21801fd jdk7u60-b15 057caf9e0774e7c530c5710127f70c8d5f46deab jdk7u60-b16 b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b17 @@ -581,10 +601,27 @@ e5e807700ff84f7bd9159ebc828891ae3ddb859c jdk7u79-b15 772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u80-b00 6c307a0b7a94e002d8a2532ffd8146d6c53f42d3 jdk7u80-b01 +3eab691bd9ac5222c11dbabb7b5fbc8463c62df6 icedtea-2.6pre07 +f43a81252f827395020fe71099bfa62f2ca0de50 icedtea-2.6pre06 +cdf407c97754412b02ebfdda111319dbd3cb9ca9 icedtea-2.6pre08 5bd6f3adf690dc2de8881b6f9f48336db4af7865 jdk7u80-b02 +55486a406d9f111eea8996fdf6144befefd86aff icedtea-2.6pre09 +cf836e0ed10de1179ec398a7db323e702b60ca35 icedtea-2.6pre10 +510234036e06ec8d7ed2a39ee11faf1b9a4257b0 icedtea-2.6pre11 bcbd241df6cd0a643480c8de183c541a662dd506 jdk7u80-b03 +987d772301e91c896178f47f39d82d87e9da1e39 icedtea-2.6pre12 +a072de9f83ed85a6a86d052d13488009230d7d4b icedtea-2.6pre13 +ecf2ec173dd2c19b63d7cf543db23ec7d4f4732a icedtea-2.6pre14 +029dd486cd1a8f6d7684b1633aae41c613055dd2 icedtea-2.6pre15 +c802d4cdd4cbfa8116e4f612cf536de32d67221a icedtea-2.6pre16 +e1dd8fea9abd3663838008063715b4b7ab5a58a4 icedtea-2.6pre17 04b56f4312b62d8bdf4eb1159132de8437994d34 jdk7u80-b04 f40fb76025c798cab4fb0e1966be1bceb8234527 jdk7u80-b05 +bb9d09219d3e74954b46ad53cb99dc307e39e120 icedtea-2.6pre18 +4c600e18a7e415702f6a62073c8c60f6b2cbfc11 icedtea-2.6pre19 +1a60fa408f57762abe32f19e4f3d681fb9c4960b icedtea-2.6pre20 +5331b041c88950058f8bd8e9669b9763be6ee03f icedtea-2.6pre21 +a322987c412f5f8584b15fab0a4505b94c016c22 icedtea-2.6pre22 335ee524dc68a42863f3fa3f081b781586e7ba2d jdk7u80-b06 6f7b359c4e9f82cbd399edc93c3275c3e668d2ea jdk7u80-b07 e6db2a97b3696fb5e7786b23f77af346a935a370 jdk7u80-b08 @@ -597,9 +634,19 @@ d0cc1c8ace99283d7b2354d2c0e5cd58787163c8 jdk7u80-b30 f2b4d5e42318ed93d35006ff7d1b3b0313b5a71f jdk7u80-b15 f1ffea3bd4a4df0f74ce0c127aeacf6bd11ee612 jdk7u80-b32 +403eeedf70f4b0e3c88f094d324e5c85959610e2 icedtea-2.6pre23 +bc95d2472055d96a712db09ecd8ab42e52058481 icedtea-2.6pre24 +bc95d2472055d96a712db09ecd8ab42e52058481 icedtea-2.6.0 1b20ca77fa98bb29d1f5601f027b3055e9eb28ee jdk7u85-b00 dce5a828bdd56d228724f1e9c6253920f613cec5 jdk7u85-b01 +bc95d2472055d96a712db09ecd8ab42e52058481 icedtea-2.6-branchpoint +9c6e1de67d7d26809d02c8ce3d6629503cb67d19 icedtea-2.6.1 b22cdae823bac193338d928e86319cd3741ab5fd jdk7u85-b02 +aef681a80dc1e8a8b69c1a06b463bda7999801ea icedtea-2.6.2pre01 +d627a940b6ca8fb4353f844e4f91163a3dcde0bc icedtea-2.6.2pre02 2741575d96f3985d41de8ebe1ba7fae8afbb0fde jdk7u91-b00 1a9e2dcc91dc3d0c103b09c478b3ac31ac45733f jdk7u91-b01 +73356b81c5c773a29729ae3b641516e0ac4a015d icedtea-2.6.2 08e99c45e470ce8b87875c1cbe78ac2f341555a3 jdk7u91-b02 +91fdb0c83e50c398bee5f0550600d20650f2a6ef icedtea-2.6.3 +3c71abf7435352aee6e74ba2581274181ad3d17e jdk7u95-b00 diff -r 057733ea4f82 -r fd0a34cb97b4 .jcheck/conf --- a/.jcheck/conf Fri Nov 13 02:43:43 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 057733ea4f82 -r fd0a34cb97b4 make/Makefile --- a/make/Makefile Fri Nov 13 02:43:43 2015 +0000 +++ b/make/Makefile Mon Jan 18 15:52:45 2016 +0000 @@ -111,6 +111,10 @@ ANT_OPTIONS += -Ddebug.classfiles=true endif +ifeq ($(JAVAC_WARNINGS_FATAL), false) + ANT_OPTIONS += -Djavac.warnings.fatal= +endif + # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) # and the somewhat misnamed CLASS_VERSION (-target NN) ifdef TARGET_CLASS_VERSION diff -r 057733ea4f82 -r fd0a34cb97b4 make/build.properties --- a/make/build.properties Fri Nov 13 02:43:43 2015 +0000 +++ b/make/build.properties Mon Jan 18 15:52:45 2016 +0000 @@ -68,7 +68,8 @@ # set the following to -version to verify the versions of javac being used javac.version.opt = # in time, there should be no exceptions to -Xlint:all -javac.lint.opts = -Xlint:all,-deprecation -Werror +javac.warnings.fatal = -Werror +javac.lint.opts = -Xlint:all,-deprecation ${javac.warnings.fatal} # options for the task for javac #javadoc.jls3.url=http://java.sun.com/docs/books/jls/ diff -r 057733ea4f82 -r fd0a34cb97b4 make/build.xml --- a/make/build.xml Fri Nov 13 02:43:43 2015 +0000 +++ b/make/build.xml Mon Jan 18 15:52:45 2016 +0000 @@ -877,7 +877,7 @@ + classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/> diff -r 057733ea4f82 -r fd0a34cb97b4 src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java --- a/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Fri Nov 13 02:43:43 2015 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Mon Jan 18 15:52:45 2016 +0000 @@ -120,12 +120,14 @@ * Returns the flags of a ClassSymbol in terms of javac's flags */ static long getFlags(ClassSymbol clazz) { - while (true) { - try { - return clazz.flags(); - } catch (CompletionFailure ex) { - // quietly ignore completion failures - } + try { + return clazz.flags(); + } catch (CompletionFailure ex) { + /* Quietly ignore completion failures and try again - the type + * for which the CompletionFailure was thrown shouldn't be completed + * again by the completer that threw the CompletionFailure. + */ + return getFlags(clazz); } } diff -r 057733ea4f82 -r fd0a34cb97b4 src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java --- a/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java Fri Nov 13 02:43:43 2015 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java Mon Jan 18 15:52:45 2016 +0000 @@ -128,7 +128,7 @@ t.tag == TypeTags.CLASS; t = env.types.supertype(t)) { ClassSymbol c = (ClassSymbol)t.tsym; - for (Scope.Entry e = c.members().lookup(sym.name); e.scope != null; e = e.next()) { + for (Scope.Entry e = membersOf(c).lookup(sym.name); e.scope != null; e = e.next()) { if (sym.overrides(e.sym, origin, env.types, true)) { return TypeMaker.getType(env, t); } @@ -160,7 +160,7 @@ t.tag == TypeTags.CLASS; t = env.types.supertype(t)) { ClassSymbol c = (ClassSymbol)t.tsym; - for (Scope.Entry e = c.members().lookup(sym.name); e.scope != null; e = e.next()) { + for (Scope.Entry e = membersOf(c).lookup(sym.name); e.scope != null; e = e.next()) { if (sym.overrides(e.sym, origin, env.types, true)) { return env.getMethodDoc((MethodSymbol)e.sym); } @@ -169,6 +169,19 @@ return null; } + /**Retrieve members of c, ignoring any CompletionFailures that occur. */ + private Scope membersOf(ClassSymbol c) { + try { + return c.members(); + } catch (CompletionFailure cf) { + /* Quietly ignore completion failures and try again - the type + * for which the CompletionFailure was thrown shouldn't be completed + * again by the completer that threw the CompletionFailure. + */ + return membersOf(c); + } + } + /** * Tests whether this method overrides another. * The overridden method may be one declared in a superclass or diff -r 057733ea4f82 -r fd0a34cb97b4 src/share/classes/com/sun/tools/javadoc/TypeMaker.java --- a/src/share/classes/com/sun/tools/javadoc/TypeMaker.java Fri Nov 13 02:43:43 2015 +0000 +++ b/src/share/classes/com/sun/tools/javadoc/TypeMaker.java Mon Jan 18 15:52:45 2016 +0000 @@ -29,6 +29,7 @@ import com.sun.tools.javac.code.Symbol; import com.sun.tools.javac.code.Symbol.ClassSymbol; +import com.sun.tools.javac.code.Symbol.CompletionFailure; import com.sun.tools.javac.code.Type; import com.sun.tools.javac.code.Type.ClassType; import com.sun.tools.javac.code.Type.TypeVar; @@ -44,12 +45,25 @@ return getType(env, t, true); } + public static com.sun.javadoc.Type getType(DocEnv env, Type t, + boolean errToClassDoc) { + try { + return getTypeImpl(env, t, errToClassDoc); + } catch (CompletionFailure cf) { + /* Quietly ignore completion failures and try again - the type + * for which the CompletionFailure was thrown shouldn't be completed + * again by the completer that threw the CompletionFailure. + */ + return getType(env, t, errToClassDoc); + } + } + /** * @param errToClassDoc if true, ERROR type results in a ClassDoc; * false preserves legacy behavior */ @SuppressWarnings("fallthrough") - public static com.sun.javadoc.Type getType(DocEnv env, Type t, + private static com.sun.javadoc.Type getTypeImpl(DocEnv env, Type t, boolean errToClassDoc) { if (env.legacyDoclet) { t = env.types.erasure(t); diff -r 057733ea4f82 -r fd0a34cb97b4 test/Makefile --- a/test/Makefile Fri Nov 13 02:43:43 2015 +0000 +++ b/test/Makefile Mon Jan 18 15:52:45 2016 +0000 @@ -33,6 +33,9 @@ ifeq ($(ARCH), i386) ARCH=i586 endif + ifeq ($(ARCH), ppc64le) + ARCH=ppc64 + endif endif ifeq ($(OSNAME), Darwin) PLATFORM = bsd diff -r 057733ea4f82 -r fd0a34cb97b4 test/tools/javac/T5090006/broken.jar Binary file test/tools/javac/T5090006/broken.jar has changed From andrew at icedtea.classpath.org Tue Jan 19 21:48:04 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 19 Jan 2016 21:48:04 +0000 Subject: /hg/release/icedtea7-forest-2.6/hotspot: 6 new changesets Message-ID: changeset 822414177d3b in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=822414177d3b author: kevinw date: Thu Aug 06 00:08:57 2015 -0700 8075773: jps running as root fails after the fix of JDK-8050807 Reviewed-by: sla, dsamersoff, gthornbr Contributed-by: cheleswer.sahu at oracle.com changeset da5d72b33658 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=da5d72b33658 author: clanger date: Thu Jan 14 20:17:31 2016 +0000 8140244: Port fix of JDK-8075773 to MacOSX Reviewed-by: stuefe, dcubed changeset b3c5ff648bca in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=b3c5ff648bca author: asaha date: Thu Jan 14 20:45:31 2016 +0000 8131181: Increment minor version of HSx for 7u95 and initialize the build number Reviewed-by: andrew changeset 1caaac3ddf30 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=1caaac3ddf30 author: andrew date: Mon Jan 18 00:07:45 2016 +0000 Added tag jdk7u95-b00 for changeset b3c5ff648bca changeset add5f9eae281 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=add5f9eae281 author: andrew date: Mon Jan 18 15:52:28 2016 +0000 Merge jdk7u95-b00 changeset 19d919ae5506 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=19d919ae5506 author: clanger date: Wed Nov 04 16:23:08 2015 -0800 8140244: Port fix of JDK-8075773 to AIX Reviewed-by: stuefe, dcubed diffstat: .hgtags | 54 +- .jcheck/conf | 2 - agent/src/os/linux/LinuxDebuggerLocal.c | 3 +- agent/src/os/linux/Makefile | 11 +- agent/src/os/linux/libproc.h | 4 +- agent/src/os/linux/ps_proc.c | 54 +- agent/src/os/linux/salibelf.c | 1 + agent/src/os/linux/symtab.c | 2 +- make/Makefile | 37 + make/aix/Makefile | 380 + make/aix/adlc_updater | 20 + make/aix/build.sh | 99 + make/aix/makefiles/adjust-mflags.sh | 87 + make/aix/makefiles/adlc.make | 234 + make/aix/makefiles/build_vm_def.sh | 18 + make/aix/makefiles/buildtree.make | 510 + make/aix/makefiles/compiler2.make | 32 + make/aix/makefiles/core.make | 33 + make/aix/makefiles/defs.make | 233 + make/aix/makefiles/dtrace.make | 27 + make/aix/makefiles/fastdebug.make | 73 + make/aix/makefiles/jsig.make | 95 + make/aix/makefiles/jvmg.make | 42 + make/aix/makefiles/jvmti.make | 118 + make/aix/makefiles/launcher.make | 97 + make/aix/makefiles/mapfile-vers-debug | 270 + make/aix/makefiles/mapfile-vers-jsig | 38 + make/aix/makefiles/mapfile-vers-product | 265 + make/aix/makefiles/ppc64.make | 108 + make/aix/makefiles/product.make | 59 + make/aix/makefiles/rules.make | 203 + make/aix/makefiles/sa.make | 116 + make/aix/makefiles/saproc.make | 125 + make/aix/makefiles/top.make | 144 + make/aix/makefiles/trace.make | 121 + make/aix/makefiles/vm.make | 384 + make/aix/makefiles/xlc.make | 180 + make/aix/platform_ppc64 | 17 + make/bsd/Makefile | 30 +- make/bsd/makefiles/gcc.make | 14 + make/bsd/platform_zero.in | 2 +- make/defs.make | 43 +- make/hotspot_version | 4 +- make/linux/Makefile | 88 +- make/linux/makefiles/aarch64.make | 41 + make/linux/makefiles/adlc.make | 2 + make/linux/makefiles/buildtree.make | 24 +- make/linux/makefiles/defs.make | 95 +- make/linux/makefiles/dtrace.make | 4 +- make/linux/makefiles/gcc.make | 59 +- make/linux/makefiles/jsig.make | 6 +- make/linux/makefiles/ppc64.make | 76 + make/linux/makefiles/rules.make | 20 +- make/linux/makefiles/sa.make | 3 +- make/linux/makefiles/saproc.make | 8 +- make/linux/makefiles/vm.make | 79 +- make/linux/makefiles/zeroshark.make | 32 + make/linux/platform_aarch64 | 15 + make/linux/platform_ppc | 6 +- make/linux/platform_ppc64 | 17 + make/linux/platform_zero.in | 2 +- make/solaris/Makefile | 8 + make/solaris/makefiles/adlc.make | 6 +- make/solaris/makefiles/dtrace.make | 16 + make/solaris/makefiles/gcc.make | 4 +- make/solaris/makefiles/jsig.make | 4 + make/solaris/makefiles/rules.make | 10 - make/solaris/makefiles/saproc.make | 4 + make/solaris/makefiles/vm.make | 12 + make/windows/makefiles/vm.make | 8 + src/cpu/aarch64/vm/aarch64.ad | 11619 +++++++++ src/cpu/aarch64/vm/aarch64Test.cpp | 38 + src/cpu/aarch64/vm/aarch64_ad.m4 | 367 + src/cpu/aarch64/vm/aarch64_call.cpp | 197 + src/cpu/aarch64/vm/aarch64_linkage.S | 163 + src/cpu/aarch64/vm/ad_encode.m4 | 73 + src/cpu/aarch64/vm/assembler_aarch64.cpp | 5368 ++++ src/cpu/aarch64/vm/assembler_aarch64.hpp | 3539 ++ src/cpu/aarch64/vm/assembler_aarch64.inline.hpp | 44 + src/cpu/aarch64/vm/bytecodeInterpreter_aarch64.cpp | 51 + src/cpu/aarch64/vm/bytecodeInterpreter_aarch64.hpp | 117 + src/cpu/aarch64/vm/bytecodeInterpreter_aarch64.inline.hpp | 287 + src/cpu/aarch64/vm/bytecodes_aarch64.cpp | 39 + src/cpu/aarch64/vm/bytecodes_aarch64.hpp | 32 + src/cpu/aarch64/vm/bytes_aarch64.hpp | 76 + src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp | 431 + src/cpu/aarch64/vm/c1_Defs_aarch64.hpp | 82 + src/cpu/aarch64/vm/c1_FpuStackSim_aarch64.cpp | 203 + src/cpu/aarch64/vm/c1_FpuStackSim_aarch64.hpp | 74 + src/cpu/aarch64/vm/c1_FrameMap_aarch64.cpp | 345 + src/cpu/aarch64/vm/c1_FrameMap_aarch64.hpp | 142 + src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 2946 ++ src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp | 80 + src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp | 1428 + src/cpu/aarch64/vm/c1_LinearScan_aarch64.cpp | 39 + src/cpu/aarch64/vm/c1_LinearScan_aarch64.hpp | 78 + src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp | 456 + src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.hpp | 107 + src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp | 1352 + src/cpu/aarch64/vm/c1_globals_aarch64.hpp | 79 + src/cpu/aarch64/vm/c2_globals_aarch64.hpp | 87 + src/cpu/aarch64/vm/c2_init_aarch64.cpp | 37 + src/cpu/aarch64/vm/codeBuffer_aarch64.hpp | 36 + src/cpu/aarch64/vm/compile_aarch64.hpp | 40 + src/cpu/aarch64/vm/copy_aarch64.hpp | 62 + src/cpu/aarch64/vm/cppInterpreterGenerator_aarch64.hpp | 35 + src/cpu/aarch64/vm/cpustate_aarch64.hpp | 592 + src/cpu/aarch64/vm/debug_aarch64.cpp | 36 + src/cpu/aarch64/vm/decode_aarch64.hpp | 409 + src/cpu/aarch64/vm/depChecker_aarch64.cpp | 31 + src/cpu/aarch64/vm/depChecker_aarch64.hpp | 32 + src/cpu/aarch64/vm/disassembler_aarch64.hpp | 38 + src/cpu/aarch64/vm/dump_aarch64.cpp | 127 + src/cpu/aarch64/vm/frame_aarch64.cpp | 843 + src/cpu/aarch64/vm/frame_aarch64.hpp | 215 + src/cpu/aarch64/vm/frame_aarch64.inline.hpp | 332 + src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp | 32 + src/cpu/aarch64/vm/globals_aarch64.hpp | 127 + src/cpu/aarch64/vm/icBuffer_aarch64.cpp | 73 + src/cpu/aarch64/vm/icache_aarch64.cpp | 41 + src/cpu/aarch64/vm/icache_aarch64.hpp | 45 + src/cpu/aarch64/vm/immediate_aarch64.cpp | 312 + src/cpu/aarch64/vm/immediate_aarch64.hpp | 51 + src/cpu/aarch64/vm/interp_masm_aarch64.cpp | 1464 + src/cpu/aarch64/vm/interp_masm_aarch64.hpp | 283 + src/cpu/aarch64/vm/interpreterGenerator_aarch64.hpp | 57 + src/cpu/aarch64/vm/interpreterRT_aarch64.cpp | 429 + src/cpu/aarch64/vm/interpreterRT_aarch64.hpp | 66 + src/cpu/aarch64/vm/interpreter_aarch64.cpp | 314 + src/cpu/aarch64/vm/interpreter_aarch64.hpp | 44 + src/cpu/aarch64/vm/javaFrameAnchor_aarch64.hpp | 79 + src/cpu/aarch64/vm/jniFastGetField_aarch64.cpp | 175 + src/cpu/aarch64/vm/jniTypes_aarch64.hpp | 108 + src/cpu/aarch64/vm/jni_aarch64.h | 64 + src/cpu/aarch64/vm/methodHandles_aarch64.cpp | 445 + src/cpu/aarch64/vm/methodHandles_aarch64.hpp | 63 + src/cpu/aarch64/vm/nativeInst_aarch64.cpp | 233 + src/cpu/aarch64/vm/nativeInst_aarch64.hpp | 457 + src/cpu/aarch64/vm/registerMap_aarch64.hpp | 46 + src/cpu/aarch64/vm/register_aarch64.cpp | 55 + src/cpu/aarch64/vm/register_aarch64.hpp | 255 + src/cpu/aarch64/vm/register_definitions_aarch64.cpp | 156 + src/cpu/aarch64/vm/relocInfo_aarch64.cpp | 123 + src/cpu/aarch64/vm/relocInfo_aarch64.hpp | 39 + src/cpu/aarch64/vm/runtime_aarch64.cpp | 49 + src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp | 3108 ++ src/cpu/aarch64/vm/stubGenerator_aarch64.cpp | 2373 + src/cpu/aarch64/vm/stubRoutines_aarch64.cpp | 290 + src/cpu/aarch64/vm/stubRoutines_aarch64.hpp | 128 + src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.hpp | 36 + src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp | 2196 + src/cpu/aarch64/vm/templateInterpreter_aarch64.hpp | 40 + src/cpu/aarch64/vm/templateTable_aarch64.cpp | 3761 ++ src/cpu/aarch64/vm/templateTable_aarch64.hpp | 43 + src/cpu/aarch64/vm/vmStructs_aarch64.hpp | 70 + src/cpu/aarch64/vm/vm_version_aarch64.cpp | 207 + src/cpu/aarch64/vm/vm_version_aarch64.hpp | 91 + src/cpu/aarch64/vm/vmreg_aarch64.cpp | 52 + src/cpu/aarch64/vm/vmreg_aarch64.hpp | 35 + src/cpu/aarch64/vm/vmreg_aarch64.inline.hpp | 65 + src/cpu/aarch64/vm/vtableStubs_aarch64.cpp | 245 + src/cpu/ppc/vm/assembler_ppc.cpp | 700 + src/cpu/ppc/vm/assembler_ppc.hpp | 2000 + src/cpu/ppc/vm/assembler_ppc.inline.hpp | 836 + src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp | 105 + src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp | 290 + src/cpu/ppc/vm/bytecodes_ppc.cpp | 31 + src/cpu/ppc/vm/bytecodes_ppc.hpp | 31 + src/cpu/ppc/vm/bytes_ppc.hpp | 281 + src/cpu/ppc/vm/c2_globals_ppc.hpp | 95 + src/cpu/ppc/vm/c2_init_ppc.cpp | 48 + src/cpu/ppc/vm/codeBuffer_ppc.hpp | 35 + src/cpu/ppc/vm/compile_ppc.cpp | 91 + src/cpu/ppc/vm/compile_ppc.hpp | 42 + src/cpu/ppc/vm/copy_ppc.hpp | 171 + src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp | 43 + src/cpu/ppc/vm/cppInterpreter_ppc.cpp | 3038 ++ src/cpu/ppc/vm/cppInterpreter_ppc.hpp | 39 + src/cpu/ppc/vm/debug_ppc.cpp | 35 + src/cpu/ppc/vm/depChecker_ppc.hpp | 31 + src/cpu/ppc/vm/disassembler_ppc.hpp | 37 + src/cpu/ppc/vm/dump_ppc.cpp | 62 + src/cpu/ppc/vm/frame_ppc.cpp | 320 + src/cpu/ppc/vm/frame_ppc.hpp | 534 + src/cpu/ppc/vm/frame_ppc.inline.hpp | 303 + src/cpu/ppc/vm/globalDefinitions_ppc.hpp | 40 + src/cpu/ppc/vm/globals_ppc.hpp | 130 + src/cpu/ppc/vm/icBuffer_ppc.cpp | 71 + src/cpu/ppc/vm/icache_ppc.cpp | 77 + src/cpu/ppc/vm/icache_ppc.hpp | 52 + src/cpu/ppc/vm/interp_masm_ppc_64.cpp | 2258 + src/cpu/ppc/vm/interp_masm_ppc_64.hpp | 302 + src/cpu/ppc/vm/interpreterGenerator_ppc.hpp | 37 + src/cpu/ppc/vm/interpreterRT_ppc.cpp | 155 + src/cpu/ppc/vm/interpreterRT_ppc.hpp | 62 + src/cpu/ppc/vm/interpreter_ppc.cpp | 803 + src/cpu/ppc/vm/interpreter_ppc.hpp | 50 + src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp | 78 + src/cpu/ppc/vm/jniFastGetField_ppc.cpp | 75 + src/cpu/ppc/vm/jniTypes_ppc.hpp | 110 + src/cpu/ppc/vm/jni_ppc.h | 55 + src/cpu/ppc/vm/macroAssembler_ppc.cpp | 3061 ++ src/cpu/ppc/vm/macroAssembler_ppc.hpp | 705 + src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp | 422 + src/cpu/ppc/vm/methodHandles_ppc.cpp | 558 + src/cpu/ppc/vm/methodHandles_ppc.hpp | 64 + src/cpu/ppc/vm/nativeInst_ppc.cpp | 378 + src/cpu/ppc/vm/nativeInst_ppc.hpp | 395 + src/cpu/ppc/vm/ppc.ad | 12869 ++++++++++ src/cpu/ppc/vm/ppc_64.ad | 24 + src/cpu/ppc/vm/registerMap_ppc.hpp | 45 + src/cpu/ppc/vm/register_definitions_ppc.cpp | 42 + src/cpu/ppc/vm/register_ppc.cpp | 77 + src/cpu/ppc/vm/register_ppc.hpp | 662 + src/cpu/ppc/vm/relocInfo_ppc.cpp | 139 + src/cpu/ppc/vm/relocInfo_ppc.hpp | 46 + src/cpu/ppc/vm/runtime_ppc.cpp | 191 + src/cpu/ppc/vm/sharedRuntime_ppc.cpp | 3263 ++ src/cpu/ppc/vm/stubGenerator_ppc.cpp | 2119 + src/cpu/ppc/vm/stubRoutines_ppc_64.cpp | 29 + src/cpu/ppc/vm/stubRoutines_ppc_64.hpp | 40 + src/cpu/ppc/vm/templateInterpreterGenerator_ppc.hpp | 44 + src/cpu/ppc/vm/templateInterpreter_ppc.cpp | 1866 + src/cpu/ppc/vm/templateInterpreter_ppc.hpp | 41 + src/cpu/ppc/vm/templateTable_ppc_64.cpp | 4269 +++ src/cpu/ppc/vm/templateTable_ppc_64.hpp | 38 + src/cpu/ppc/vm/vmStructs_ppc.hpp | 41 + src/cpu/ppc/vm/vm_version_ppc.cpp | 487 + src/cpu/ppc/vm/vm_version_ppc.hpp | 96 + src/cpu/ppc/vm/vmreg_ppc.cpp | 51 + src/cpu/ppc/vm/vmreg_ppc.hpp | 35 + src/cpu/ppc/vm/vmreg_ppc.inline.hpp | 71 + src/cpu/ppc/vm/vtableStubs_ppc_64.cpp | 269 + src/cpu/sparc/vm/compile_sparc.hpp | 39 + src/cpu/sparc/vm/frame_sparc.inline.hpp | 4 + src/cpu/sparc/vm/globals_sparc.hpp | 5 + src/cpu/sparc/vm/methodHandles_sparc.hpp | 6 +- src/cpu/sparc/vm/sharedRuntime_sparc.cpp | 10 +- src/cpu/sparc/vm/sparc.ad | 28 +- src/cpu/sparc/vm/vm_version_sparc.cpp | 6 +- src/cpu/sparc/vm/vm_version_sparc.hpp | 8 +- src/cpu/x86/vm/assembler_x86.cpp | 14 +- src/cpu/x86/vm/c2_globals_x86.hpp | 2 +- src/cpu/x86/vm/compile_x86.hpp | 39 + src/cpu/x86/vm/frame_x86.inline.hpp | 4 + src/cpu/x86/vm/globals_x86.hpp | 7 +- src/cpu/x86/vm/methodHandles_x86.hpp | 6 +- src/cpu/x86/vm/sharedRuntime_x86_32.cpp | 11 +- src/cpu/x86/vm/sharedRuntime_x86_64.cpp | 11 +- src/cpu/x86/vm/stubGenerator_x86_32.cpp | 3 +- src/cpu/x86/vm/stubGenerator_x86_64.cpp | 6 +- src/cpu/x86/vm/x86_32.ad | 14 +- src/cpu/x86/vm/x86_64.ad | 75 +- src/cpu/zero/vm/arm32JIT.cpp | 8583 ++++++ src/cpu/zero/vm/arm_cas.S | 31 + src/cpu/zero/vm/asm_helper.cpp | 746 + src/cpu/zero/vm/bytecodes_arm.def | 7850 ++++++ src/cpu/zero/vm/bytecodes_zero.cpp | 52 +- src/cpu/zero/vm/bytecodes_zero.hpp | 41 +- src/cpu/zero/vm/compile_zero.hpp | 40 + src/cpu/zero/vm/cppInterpreter_arm.S | 7390 +++++ src/cpu/zero/vm/cppInterpreter_zero.cpp | 51 +- src/cpu/zero/vm/cppInterpreter_zero.hpp | 2 + src/cpu/zero/vm/globals_zero.hpp | 10 +- src/cpu/zero/vm/methodHandles_zero.hpp | 12 +- src/cpu/zero/vm/sharedRuntime_zero.cpp | 10 +- src/cpu/zero/vm/shark_globals_zero.hpp | 1 - src/cpu/zero/vm/stack_zero.hpp | 2 +- src/cpu/zero/vm/stack_zero.inline.hpp | 9 +- src/cpu/zero/vm/vm_version_zero.hpp | 11 + src/os/aix/vm/attachListener_aix.cpp | 574 + src/os/aix/vm/c2_globals_aix.hpp | 37 + src/os/aix/vm/chaitin_aix.cpp | 38 + src/os/aix/vm/decoder_aix.hpp | 48 + src/os/aix/vm/globals_aix.hpp | 63 + src/os/aix/vm/interfaceSupport_aix.hpp | 35 + src/os/aix/vm/jsig.c | 233 + src/os/aix/vm/jvm_aix.cpp | 201 + src/os/aix/vm/jvm_aix.h | 123 + src/os/aix/vm/libperfstat_aix.cpp | 124 + src/os/aix/vm/libperfstat_aix.hpp | 59 + src/os/aix/vm/loadlib_aix.cpp | 185 + src/os/aix/vm/loadlib_aix.hpp | 128 + src/os/aix/vm/mutex_aix.inline.hpp | 37 + src/os/aix/vm/osThread_aix.cpp | 58 + src/os/aix/vm/osThread_aix.hpp | 144 + src/os/aix/vm/os_aix.cpp | 5133 +++ src/os/aix/vm/os_aix.hpp | 381 + src/os/aix/vm/os_aix.inline.hpp | 294 + src/os/aix/vm/os_share_aix.hpp | 37 + src/os/aix/vm/perfMemory_aix.cpp | 1349 + src/os/aix/vm/porting_aix.cpp | 369 + src/os/aix/vm/porting_aix.hpp | 81 + src/os/aix/vm/threadCritical_aix.cpp | 68 + src/os/aix/vm/thread_aix.inline.hpp | 42 + src/os/aix/vm/vmError_aix.cpp | 122 + src/os/bsd/vm/os_bsd.cpp | 10 +- src/os/bsd/vm/perfMemory_bsd.cpp | 6 +- src/os/linux/vm/decoder_linux.cpp | 6 + src/os/linux/vm/osThread_linux.cpp | 3 + src/os/linux/vm/os_linux.cpp | 258 +- src/os/linux/vm/os_linux.hpp | 3 + src/os/linux/vm/os_linux.inline.hpp | 3 + src/os/linux/vm/perfMemory_linux.cpp | 6 +- src/os/linux/vm/thread_linux.inline.hpp | 5 + src/os/posix/launcher/java_md.c | 13 +- src/os/posix/vm/os_posix.cpp | 491 +- src/os/posix/vm/os_posix.hpp | 28 +- src/os/solaris/vm/os_solaris.hpp | 3 + src/os/solaris/vm/perfMemory_solaris.cpp | 6 +- src/os/windows/vm/os_windows.hpp | 3 + src/os_cpu/aix_ppc/vm/aix_ppc_64.ad | 24 + src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp | 401 + src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp | 54 + src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp | 151 + src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp | 567 + src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp | 35 + src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp | 58 + src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.cpp | 40 + src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.hpp | 36 + src/os_cpu/aix_ppc/vm/thread_aix_ppc.cpp | 36 + src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp | 79 + src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp | 66 + src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp | 8 +- src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp | 2 +- src/os_cpu/linux_aarch64/vm/assembler_linux_aarch64.cpp | 53 + src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.inline.hpp | 144 + src/os_cpu/linux_aarch64/vm/bytes_linux_aarch64.inline.hpp | 44 + src/os_cpu/linux_aarch64/vm/copy_linux_aarch64.inline.hpp | 124 + src/os_cpu/linux_aarch64/vm/globals_linux_aarch64.hpp | 46 + src/os_cpu/linux_aarch64/vm/linux_aarch64.S | 25 + src/os_cpu/linux_aarch64/vm/linux_aarch64.ad | 68 + src/os_cpu/linux_aarch64/vm/orderAccess_linux_aarch64.inline.hpp | 144 + src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 746 + src/os_cpu/linux_aarch64/vm/os_linux_aarch64.hpp | 58 + src/os_cpu/linux_aarch64/vm/os_linux_aarch64.inline.hpp | 39 + src/os_cpu/linux_aarch64/vm/prefetch_linux_aarch64.inline.hpp | 45 + src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.cpp | 41 + src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.hpp | 36 + src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp | 92 + src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.hpp | 85 + src/os_cpu/linux_aarch64/vm/vmStructs_linux_aarch64.hpp | 65 + src/os_cpu/linux_aarch64/vm/vm_version_linux_aarch64.cpp | 28 + src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp | 401 + src/os_cpu/linux_ppc/vm/bytes_linux_ppc.inline.hpp | 39 + src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp | 54 + src/os_cpu/linux_ppc/vm/linux_ppc_64.ad | 24 + src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp | 149 + src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp | 624 + src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp | 35 + src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp | 50 + src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp | 40 + src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp | 36 + src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp | 36 + src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp | 83 + src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp | 66 + src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 2 +- src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 22 +- src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 8 +- src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 47 +- src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 8 +- src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp | 242 +- src/share/tools/hsdis/Makefile | 20 +- src/share/tools/hsdis/hsdis-demo.c | 9 +- src/share/tools/hsdis/hsdis.c | 15 + src/share/vm/adlc/adlparse.cpp | 188 +- src/share/vm/adlc/adlparse.hpp | 4 +- src/share/vm/adlc/archDesc.hpp | 2 + src/share/vm/adlc/formssel.cpp | 89 +- src/share/vm/adlc/formssel.hpp | 3 + src/share/vm/adlc/main.cpp | 12 + src/share/vm/adlc/output_c.cpp | 187 +- src/share/vm/adlc/output_h.cpp | 41 +- src/share/vm/asm/assembler.cpp | 36 +- src/share/vm/asm/assembler.hpp | 29 +- src/share/vm/asm/codeBuffer.cpp | 15 +- src/share/vm/asm/codeBuffer.hpp | 9 +- src/share/vm/c1/c1_Canonicalizer.cpp | 7 + src/share/vm/c1/c1_Compilation.cpp | 26 + src/share/vm/c1/c1_Defs.hpp | 6 + src/share/vm/c1/c1_FpuStackSim.hpp | 3 + src/share/vm/c1/c1_FrameMap.cpp | 5 +- src/share/vm/c1/c1_FrameMap.hpp | 3 + src/share/vm/c1/c1_LIR.cpp | 49 +- src/share/vm/c1/c1_LIR.hpp | 56 +- src/share/vm/c1/c1_LIRAssembler.cpp | 7 + src/share/vm/c1/c1_LIRAssembler.hpp | 6 + src/share/vm/c1/c1_LIRGenerator.cpp | 10 +- src/share/vm/c1/c1_LIRGenerator.hpp | 3 + src/share/vm/c1/c1_LinearScan.cpp | 6 +- src/share/vm/c1/c1_LinearScan.hpp | 3 + src/share/vm/c1/c1_MacroAssembler.hpp | 6 + src/share/vm/c1/c1_Runtime1.cpp | 36 +- src/share/vm/c1/c1_globals.hpp | 6 + src/share/vm/ci/ciTypeFlow.cpp | 2 +- src/share/vm/classfile/classFileParser.cpp | 10 +- src/share/vm/classfile/classFileStream.hpp | 3 + src/share/vm/classfile/classLoader.cpp | 3 + src/share/vm/classfile/javaClasses.cpp | 24 +- src/share/vm/classfile/javaClasses.hpp | 1 + src/share/vm/classfile/stackMapTable.hpp | 3 + src/share/vm/classfile/systemDictionary.cpp | 1 - src/share/vm/classfile/verifier.cpp | 26 +- src/share/vm/classfile/vmSymbols.hpp | 12 + src/share/vm/code/codeBlob.cpp | 3 + src/share/vm/code/compiledIC.cpp | 11 +- src/share/vm/code/compiledIC.hpp | 7 + src/share/vm/code/icBuffer.cpp | 3 + src/share/vm/code/nmethod.cpp | 29 +- src/share/vm/code/nmethod.hpp | 7 +- src/share/vm/code/relocInfo.cpp | 41 + src/share/vm/code/relocInfo.hpp | 49 +- src/share/vm/code/stubs.hpp | 3 + src/share/vm/code/vmreg.hpp | 24 +- src/share/vm/compiler/disassembler.cpp | 3 + src/share/vm/compiler/disassembler.hpp | 6 + src/share/vm/compiler/methodLiveness.cpp | 12 +- src/share/vm/compiler/oopMap.cpp | 7 + src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp | 3 + src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp | 3 + src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp | 28 +- src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 18 +- src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp | 3 + src/share/vm/gc_implementation/g1/concurrentMark.cpp | 2 +- src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp | 3 + src/share/vm/gc_implementation/g1/g1AllocRegion.hpp | 7 +- src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 2 +- src/share/vm/gc_implementation/g1/g1MarkSweep.cpp | 11 + src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp | 1 + src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp | 13 +- src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp | 2 +- src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp | 2 +- src/share/vm/gc_implementation/g1/ptrQueue.cpp | 3 + src/share/vm/gc_implementation/parNew/parNewGeneration.cpp | 15 +- src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp | 5 +- src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp | 12 + src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp | 1 - src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 20 +- src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp | 2 +- src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp | 1 + src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp | 27 + src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp | 3 + src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp | 3 + src/share/vm/gc_interface/collectedHeap.cpp | 3 + src/share/vm/gc_interface/collectedHeap.inline.hpp | 3 + src/share/vm/interpreter/abstractInterpreter.hpp | 18 +- src/share/vm/interpreter/bytecode.hpp | 3 + src/share/vm/interpreter/bytecodeInterpreter.cpp | 996 +- src/share/vm/interpreter/bytecodeInterpreter.hpp | 31 +- src/share/vm/interpreter/bytecodeInterpreter.inline.hpp | 3 + src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp | 305 + src/share/vm/interpreter/bytecodeStream.hpp | 3 + src/share/vm/interpreter/bytecodes.cpp | 3 + src/share/vm/interpreter/bytecodes.hpp | 6 +- src/share/vm/interpreter/cppInterpreter.hpp | 3 + src/share/vm/interpreter/cppInterpreterGenerator.hpp | 3 + src/share/vm/interpreter/interpreter.hpp | 3 + src/share/vm/interpreter/interpreterGenerator.hpp | 3 + src/share/vm/interpreter/interpreterRuntime.cpp | 47 +- src/share/vm/interpreter/interpreterRuntime.hpp | 27 +- src/share/vm/interpreter/invocationCounter.hpp | 22 +- src/share/vm/interpreter/linkResolver.cpp | 3 + src/share/vm/interpreter/templateInterpreter.hpp | 3 + src/share/vm/interpreter/templateInterpreterGenerator.hpp | 3 + src/share/vm/interpreter/templateTable.cpp | 5 + src/share/vm/interpreter/templateTable.hpp | 20 +- src/share/vm/libadt/port.hpp | 5 +- src/share/vm/memory/allocation.cpp | 3 + src/share/vm/memory/allocation.hpp | 37 +- src/share/vm/memory/allocation.inline.hpp | 8 +- src/share/vm/memory/barrierSet.hpp | 4 +- src/share/vm/memory/barrierSet.inline.hpp | 6 +- src/share/vm/memory/cardTableModRefBS.cpp | 4 +- src/share/vm/memory/cardTableModRefBS.hpp | 11 +- src/share/vm/memory/collectorPolicy.cpp | 23 +- src/share/vm/memory/defNewGeneration.cpp | 16 +- src/share/vm/memory/gcLocker.hpp | 4 + src/share/vm/memory/genMarkSweep.cpp | 3 + src/share/vm/memory/generation.cpp | 12 + src/share/vm/memory/modRefBarrierSet.hpp | 2 +- src/share/vm/memory/resourceArea.cpp | 3 + src/share/vm/memory/resourceArea.hpp | 3 + src/share/vm/memory/space.hpp | 3 + src/share/vm/memory/tenuredGeneration.cpp | 12 + src/share/vm/memory/threadLocalAllocBuffer.cpp | 3 + src/share/vm/memory/universe.cpp | 13 +- src/share/vm/oops/constantPoolKlass.cpp | 3 + src/share/vm/oops/constantPoolOop.hpp | 3 + src/share/vm/oops/cpCacheOop.cpp | 4 +- src/share/vm/oops/cpCacheOop.hpp | 22 +- src/share/vm/oops/instanceKlass.cpp | 26 +- src/share/vm/oops/instanceKlass.hpp | 5 + src/share/vm/oops/markOop.cpp | 3 + src/share/vm/oops/methodDataOop.cpp | 6 + src/share/vm/oops/methodDataOop.hpp | 191 + src/share/vm/oops/methodOop.cpp | 16 + src/share/vm/oops/methodOop.hpp | 11 +- src/share/vm/oops/objArrayKlass.inline.hpp | 4 +- src/share/vm/oops/oop.cpp | 3 + src/share/vm/oops/oop.inline.hpp | 19 +- src/share/vm/oops/oopsHierarchy.cpp | 3 + src/share/vm/oops/typeArrayOop.hpp | 6 + src/share/vm/opto/block.cpp | 359 +- src/share/vm/opto/block.hpp | 8 +- src/share/vm/opto/buildOopMap.cpp | 3 + src/share/vm/opto/c2_globals.hpp | 15 +- src/share/vm/opto/c2compiler.cpp | 10 +- src/share/vm/opto/callGenerator.cpp | 2 +- src/share/vm/opto/callnode.cpp | 4 +- src/share/vm/opto/chaitin.cpp | 8 +- src/share/vm/opto/compile.cpp | 83 +- src/share/vm/opto/compile.hpp | 9 +- src/share/vm/opto/gcm.cpp | 11 +- src/share/vm/opto/generateOptoStub.cpp | 120 +- src/share/vm/opto/graphKit.cpp | 32 +- src/share/vm/opto/graphKit.hpp | 46 +- src/share/vm/opto/idealGraphPrinter.cpp | 4 +- src/share/vm/opto/idealKit.cpp | 8 +- src/share/vm/opto/idealKit.hpp | 3 +- src/share/vm/opto/lcm.cpp | 46 +- src/share/vm/opto/library_call.cpp | 28 +- src/share/vm/opto/locknode.hpp | 10 +- src/share/vm/opto/loopTransform.cpp | 25 +- src/share/vm/opto/machnode.cpp | 14 + src/share/vm/opto/machnode.hpp | 28 + src/share/vm/opto/macro.cpp | 2 +- src/share/vm/opto/matcher.cpp | 75 +- src/share/vm/opto/matcher.hpp | 5 + src/share/vm/opto/memnode.cpp | 61 +- src/share/vm/opto/memnode.hpp | 175 +- src/share/vm/opto/node.cpp | 10 +- src/share/vm/opto/node.hpp | 14 +- src/share/vm/opto/output.cpp | 27 +- src/share/vm/opto/output.hpp | 10 +- src/share/vm/opto/parse.hpp | 7 + src/share/vm/opto/parse1.cpp | 7 +- src/share/vm/opto/parse2.cpp | 4 +- src/share/vm/opto/parse3.cpp | 42 +- src/share/vm/opto/postaloc.cpp | 7 +- src/share/vm/opto/regalloc.cpp | 4 +- src/share/vm/opto/regmask.cpp | 10 +- src/share/vm/opto/regmask.hpp | 10 +- src/share/vm/opto/runtime.cpp | 33 +- src/share/vm/opto/type.cpp | 1 + src/share/vm/opto/type.hpp | 3 + src/share/vm/opto/vectornode.hpp | 2 +- src/share/vm/prims/forte.cpp | 8 +- src/share/vm/prims/jni.cpp | 90 +- src/share/vm/prims/jniCheck.cpp | 45 +- src/share/vm/prims/jni_md.h | 3 + src/share/vm/prims/jvm.cpp | 3 + src/share/vm/prims/jvm.h | 3 + src/share/vm/prims/jvmtiClassFileReconstituter.cpp | 3 + src/share/vm/prims/jvmtiEnv.cpp | 6 + src/share/vm/prims/jvmtiExport.cpp | 41 + src/share/vm/prims/jvmtiExport.hpp | 7 + src/share/vm/prims/jvmtiImpl.cpp | 3 + src/share/vm/prims/jvmtiManageCapabilities.cpp | 4 +- src/share/vm/prims/jvmtiTagMap.cpp | 8 +- src/share/vm/prims/methodHandles.cpp | 4 +- src/share/vm/prims/methodHandles.hpp | 3 + src/share/vm/prims/nativeLookup.cpp | 3 + src/share/vm/prims/unsafe.cpp | 4 +- src/share/vm/prims/whitebox.cpp | 2 +- src/share/vm/runtime/advancedThresholdPolicy.cpp | 2 +- src/share/vm/runtime/arguments.cpp | 60 +- src/share/vm/runtime/atomic.cpp | 9 + src/share/vm/runtime/biasedLocking.cpp | 6 +- src/share/vm/runtime/deoptimization.cpp | 13 +- src/share/vm/runtime/dtraceJSDT.hpp | 3 + src/share/vm/runtime/fprofiler.hpp | 3 + src/share/vm/runtime/frame.cpp | 18 +- src/share/vm/runtime/frame.hpp | 19 +- src/share/vm/runtime/frame.inline.hpp | 13 + src/share/vm/runtime/globals.hpp | 44 +- src/share/vm/runtime/handles.cpp | 4 + src/share/vm/runtime/handles.inline.hpp | 3 + src/share/vm/runtime/icache.hpp | 3 + src/share/vm/runtime/interfaceSupport.hpp | 6 + src/share/vm/runtime/java.cpp | 6 + src/share/vm/runtime/javaCalls.cpp | 3 + src/share/vm/runtime/javaCalls.hpp | 6 + src/share/vm/runtime/javaFrameAnchor.hpp | 9 + src/share/vm/runtime/jniHandles.cpp | 3 + src/share/vm/runtime/memprofiler.cpp | 3 + src/share/vm/runtime/mutex.cpp | 4 + src/share/vm/runtime/mutexLocker.cpp | 3 + src/share/vm/runtime/mutexLocker.hpp | 3 + src/share/vm/runtime/objectMonitor.cpp | 47 +- src/share/vm/runtime/os.cpp | 45 +- src/share/vm/runtime/os.hpp | 20 +- src/share/vm/runtime/osThread.hpp | 3 + src/share/vm/runtime/registerMap.hpp | 6 + src/share/vm/runtime/relocator.hpp | 3 + src/share/vm/runtime/safepoint.cpp | 9 +- src/share/vm/runtime/sharedRuntime.cpp | 95 +- src/share/vm/runtime/sharedRuntime.hpp | 27 +- src/share/vm/runtime/sharedRuntimeTrans.cpp | 4 + src/share/vm/runtime/sharedRuntimeTrig.cpp | 7 + src/share/vm/runtime/stackValueCollection.cpp | 3 + src/share/vm/runtime/statSampler.cpp | 3 + src/share/vm/runtime/stubCodeGenerator.cpp | 3 + src/share/vm/runtime/stubRoutines.cpp | 14 + src/share/vm/runtime/stubRoutines.hpp | 71 +- src/share/vm/runtime/sweeper.cpp | 3 +- src/share/vm/runtime/synchronizer.cpp | 17 +- src/share/vm/runtime/task.cpp | 4 + src/share/vm/runtime/thread.cpp | 7 + src/share/vm/runtime/thread.hpp | 35 +- src/share/vm/runtime/threadLocalStorage.cpp | 4 + src/share/vm/runtime/threadLocalStorage.hpp | 6 + src/share/vm/runtime/timer.cpp | 3 + src/share/vm/runtime/vframe.cpp | 3 +- src/share/vm/runtime/vframeArray.cpp | 2 +- src/share/vm/runtime/virtualspace.cpp | 3 + src/share/vm/runtime/vmStructs.cpp | 26 +- src/share/vm/runtime/vmThread.cpp | 3 + src/share/vm/runtime/vmThread.hpp | 3 + src/share/vm/runtime/vm_operations.cpp | 3 + src/share/vm/runtime/vm_version.cpp | 13 +- src/share/vm/shark/sharkCompiler.cpp | 6 +- src/share/vm/shark/shark_globals.hpp | 10 + src/share/vm/trace/trace.dtd | 3 - src/share/vm/utilities/accessFlags.cpp | 3 + src/share/vm/utilities/array.cpp | 3 + src/share/vm/utilities/bitMap.cpp | 3 + src/share/vm/utilities/bitMap.hpp | 2 +- src/share/vm/utilities/bitMap.inline.hpp | 20 +- src/share/vm/utilities/copy.hpp | 3 + src/share/vm/utilities/debug.cpp | 4 + src/share/vm/utilities/debug.hpp | 2 +- src/share/vm/utilities/decoder.cpp | 4 + src/share/vm/utilities/decoder_elf.cpp | 2 +- src/share/vm/utilities/decoder_elf.hpp | 4 +- src/share/vm/utilities/elfFile.cpp | 57 +- src/share/vm/utilities/elfFile.hpp | 8 +- src/share/vm/utilities/elfFuncDescTable.cpp | 104 + src/share/vm/utilities/elfFuncDescTable.hpp | 149 + src/share/vm/utilities/elfStringTable.cpp | 4 +- src/share/vm/utilities/elfStringTable.hpp | 2 +- src/share/vm/utilities/elfSymbolTable.cpp | 38 +- src/share/vm/utilities/elfSymbolTable.hpp | 6 +- src/share/vm/utilities/events.cpp | 3 + src/share/vm/utilities/exceptions.cpp | 3 + src/share/vm/utilities/globalDefinitions.hpp | 9 + src/share/vm/utilities/globalDefinitions_gcc.hpp | 8 - src/share/vm/utilities/globalDefinitions_sparcWorks.hpp | 9 - src/share/vm/utilities/globalDefinitions_xlc.hpp | 194 + src/share/vm/utilities/growableArray.cpp | 3 + src/share/vm/utilities/histogram.hpp | 3 + src/share/vm/utilities/macros.hpp | 56 +- src/share/vm/utilities/ostream.cpp | 7 +- src/share/vm/utilities/preserveException.hpp | 3 + src/share/vm/utilities/taskqueue.cpp | 3 + src/share/vm/utilities/taskqueue.hpp | 117 +- src/share/vm/utilities/vmError.cpp | 25 +- src/share/vm/utilities/vmError.hpp | 8 + src/share/vm/utilities/workgroup.hpp | 3 + test/compiler/codegen/IntRotateWithImmediate.java | 64 + test/compiler/loopopts/ConstFPVectorization.java | 63 + test/runtime/7020373/GenOOMCrashClass.java | 157 + test/runtime/7020373/Test7020373.sh | 4 + test/runtime/7020373/testcase.jar | Bin test/runtime/InitialThreadOverflow/DoOverflow.java | 41 + test/runtime/InitialThreadOverflow/invoke.cxx | 70 + test/runtime/InitialThreadOverflow/testme.sh | 73 + test/runtime/RedefineFinalizer/RedefineFinalizer.java | 64 + test/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java | 143 + test/runtime/stackMapCheck/BadMap.jasm | 152 + test/runtime/stackMapCheck/BadMapDstore.jasm | 79 + test/runtime/stackMapCheck/BadMapIstore.jasm | 79 + test/runtime/stackMapCheck/StackMapCheck.java | 63 + test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java | 82 + test/serviceability/jvmti/UnresolvedClassAgent.java | 69 + test/serviceability/jvmti/UnresolvedClassAgent.mf | 3 + test/testlibrary/RedefineClassHelper.java | 79 + test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java | 81 +- test/testlibrary/com/oracle/java/testlibrary/Utils.java | 263 + test/testlibrary_tests/RedefineClassTest.java | 54 + tools/mkbc.c | 607 + 680 files changed, 151180 insertions(+), 1369 deletions(-) diffs (truncated from 163570 to 500 lines): diff -r d61a34c5c764 -r 19d919ae5506 .hgtags --- a/.hgtags Fri Nov 13 02:43:44 2015 +0000 +++ b/.hgtags Wed Nov 04 16:23:08 2015 -0800 @@ -50,6 +50,7 @@ faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73 f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75 +b4ab978ce52c41bb7e8ee86285e6c9f28122bbe1 icedtea7-1.12 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76 455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77 e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78 @@ -87,6 +88,7 @@ 07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01 e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88 +a393ff93e7e54dd94cc4211892605a32f9c77dad icedtea7-1.13 15836273ac2494f36ef62088bc1cb6f3f011f565 jdk7-b89 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b hs18-b02 605c9707a766ff518cd841fc04f9bb4b36a3a30b jdk7-b90 @@ -160,6 +162,7 @@ b898f0fc3cedc972d884d31a751afd75969531cf hs21-b05 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 jdk7-b136 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 hs21-b06 +591c7dc0b2ee879f87a7b5519a5388e0d81520be icedtea-1.14 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f jdk7-b137 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f hs21-b07 0930dc920c185afbf40fed9a655290b8e5b16783 jdk7-b138 @@ -182,6 +185,7 @@ 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147 81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17 +7693eb0fce1f6b484cce96c233ea20bdad8a09e0 icedtea-2.0-branchpoint 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02 @@ -210,6 +214,7 @@ 3ba0bb2e7c8ddac172f5b995aae57329cdd2dafa hs22-b10 f17fe2f4b6aacc19cbb8ee39476f2f13a1c4d3cd jdk7u2-b13 0744602f85c6fe62255326df595785eb2b32166d jdk7u2-b21 +f8f4d3f9b16567b91bcef4caaa8417c8de8015f0 icedtea-2.1-branchpoint a40d238623e5b1ab1224ea6b36dc5b23d0a53880 jdk7u3-b02 6986bfb4c82e00b938c140f2202133350e6e73f8 jdk7u3-b03 8e6375b46717d74d4885f839b4e72d03f357a45f jdk7u3-b04 @@ -264,6 +269,7 @@ f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16 +a2c5354863dcb3d147b7b6f55ef514b1bfecf920 icedtea-2.2-branchpoint efb5f2662c96c472caa3327090268c75a86dd9c0 jdk7u4-b13 82e719a2e6416838b4421637646cbfd7104c7716 jdk7u4-b14 e5f7f95411fb9e837800b4152741c962118e5d7a jdk7u5-b01 @@ -302,6 +308,9 @@ e974e15945658e574e6c344c4a7ba225f5708c10 hs23.2-b03 f08a3a0e60c32cb0e8350e72fdc54849759096a4 jdk7u6-b12 7a8d3cd6562170f4c262e962270f679ac503f456 hs23.2-b04 +d72dd66fdc3d52aee909f8dd8f25f62f13569ffa ppc-aix-port-b01 +1efaab66c81d0a5701cc819e67376f1b27bfea47 ppc-aix-port-b02 +b69b779a26dfc5e2333504d0c82fc998ff915499 ppc-aix-port-b03 28746e6d615f27816f483485a53b790c7a463f0c jdk7u6-b13 202880d633e646d4936798d0fba6efc0cab04dc8 hs23.2-b05 6b0f178141388f5721aa5365cb542715acbf0cc7 jdk7u6-b14 @@ -311,6 +320,7 @@ cefe884c708aa6dfd63aff45f6c698a6bc346791 jdk7u6-b16 270a40a57b3d05ca64070208dcbb895b5b509d8e hs23.2-b08 7a37cec9d0d44ae6ea3d26a95407e42d99af6843 jdk7u6-b17 +354cfde7db2f1fd46312d883a63c8a76d5381bab icedtea-2.3-branchpoint df0df4ae5af2f40b7f630c53a86e8c3d68ef5b66 jdk7u6-b18 1257f4373a06f788bd656ae1c7a953a026a285b9 jdk7u6-b19 a0c2fa4baeb6aad6f33dc87b676b21345794d61e hs23.2-b09 @@ -440,6 +450,7 @@ 4f7ad6299356bfd2cfb448ea4c11e8ce0fbf69f4 jdk7u12-b07 3bb803664f3d9c831d094cbe22b4ee5757e780c8 jdk7u12-b08 92e382c3cccc0afbc7f72fccea4f996e05b66b3e jdk7u12-b09 +6e4feb17117d21e0e4360f2d0fbc68397ed3ba80 icedtea-2.4-branchpoint 7554f9b2bcc72204ac10ba8b08b8e648459504df hs24-b29 181528fd1e74863a902f171a2ad46270a2fb15e0 jdk7u14-b10 4008cf63c30133f2fac148a39903552fe7a33cea hs24-b30 @@ -496,6 +507,7 @@ 273e8afccd6ef9e10e9fe121f7b323755191f3cc jdk7u25-b32 e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14 860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34 +ca298f18e21dc66c6b5235600f8b50bcc9bbaa38 ppc-aix-port-b04 12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15 be21f8a4d42c03cafde4f616fd80ece791ba2f21 hs24-b35 10e0043bda0878dbc85f3f280157eab592b47c91 jdk7u14-b16 @@ -590,6 +602,9 @@ 12374864c655a2cefb0d65caaacf215d5365ec5f jdk7u45-b18 3677c8cc3c89c0fa608f485b84396e4cf755634b jdk7u45-b30 520b7b3d9153c1407791325946b07c5c222cf0d6 jdk7u45-b31 +ae4adc1492d1c90a70bd2d139a939fc0c8329be9 jdk7u60-b00 +af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60 +cc83359f5e5eb46dd9176b0a272390b1a0a51fdc hs24.60-b01 c373a733d5d5147f99eaa2b91d6b937c28214fc9 jdk7u45-b33 0bcb43482f2ac5615437541ffb8dc0f79ece3148 jdk7u45-b34 12ea8d416f105f5971c808c89dddc1006bfc4c53 jdk7u45-b35 @@ -646,6 +661,8 @@ 0025a2a965c8f21376278245c2493d8861386fba jdk7u60-b02 fa59add77d1a8f601a695f137248462fdc68cc2f hs24.60-b05 a59134ccb1b704b2cd05e157970d425af43e5437 hs24.60-b06 +bc178be7e9d6fcc97e09c909ffe79d96e2305218 icedtea-2.5pre01 +f30e87f16d90f1e659b935515a3fc083ab8a0156 icedtea-2.5pre02 2c971ed884cec0a9293ccff3def696da81823225 jdk7u60-b03 1afbeb8cb558429156d432f35e7582716053a9cb hs24.60-b07 05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u60-b04 @@ -810,13 +827,36 @@ ff18bcebe2943527cdbc094375c38c27ec7f2442 hs24.80-b03 1b9722b5134a8e565d8b8fe851849e034beff057 hs24.80-b04 04d6919c44db8c9d811ef0ac4775a579f854cdfc hs24.80-b05 +882a93010fb90f928331bf31a226992755d6cfb2 icedtea-2.6pre01 ee18e60e7e8da9f1912895af353564de0330a2b1 hs24.80-b06 +138ef7288fd40de0012a3a24839fa7cb3569ab43 icedtea-2.6pre02 +4ab69c6e4c85edf628c01c685bc12c591b9807d9 icedtea-2.6pre03 +b226be2040f971855626f5b88cb41a7d5299fea0 jdk7u60-b14 +2fd819c8b5066a480f9524d901dbd34f2cf563ad icedtea-2.6pre04 +fae3b09fe959294f7a091a6ecaae91daf1cb4f5c icedtea-2.6pre05 05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u80-b00 e2533d62ca887078e4b952a75a75680cfb7894b9 jdk7u80-b01 +8ffb87775f56ed5c602f320d2513351298ee4778 icedtea-2.6pre07 +b517477362d1b0d4f9b567c82db85136fd14bc6e icedtea-2.6pre06 +6d5ec408f4cac2c2004bf6120403df1b18051a21 icedtea-2.6pre08 bad107a5d096b070355c5a2d80aa50bc5576144b jdk7u80-b02 +4722cfd15c8386321c8e857951b3cb55461e858b icedtea-2.6pre09 +c8417820ac943736822e7b84518b5aca80f39593 icedtea-2.6pre10 +e13857ecc7870c28dbebca79ff36612693dac157 icedtea-2.6pre11 9d2b485d2a58ea57ab2b3c06b2128f456ab39a38 jdk7u80-b03 +0c2099cd04cd24778c5baccc7c8a72c311ef6f84 icedtea-2.6pre12 +c6fa18ed8a01a15e1210bf44dc7075463e0a514b icedtea-2.6pre13 +1d3d9e81c8e16bfe948da9bc0756e922a3802ca4 icedtea-2.6pre14 +5ad4c09169742e076305193c1e0b8256635cf33e icedtea-2.6pre15 +7891f0e7ae10d8f636fdbf29bcfe06f43d057e5f icedtea-2.6pre16 +4d25046abb67ae570ae1dbb5e3e48e7a63d93b88 icedtea-2.6pre17 a89267b51c40cba0b26fe84831478389723c8321 jdk7u80-b04 00402b4ff7a90a6deba09816192e335cadfdb4f0 jdk7u80-b05 +1792bfb4a54d87ff87438413a34004a6b6004987 icedtea-2.6pre18 +8f3c9cf0636f4d40e9c3647e03c7d0ca6d1019ee icedtea-2.6pre19 +904317834a259bdddd4568b74874c2472f119a3c icedtea-2.6pre20 +1939c010fd371d22de5c1baf2583a96e8f38da44 icedtea-2.6pre21 +cb42e88f9787c8aa28662f31484d605e550c6d53 icedtea-2.6pre22 87d4354a3ce8aafccf1f1cd9cb9d88a58731dde8 jdk7u80-b06 d496bd71dc129828c2b5962e2072cdb591454e4a jdk7u80-b07 5ce33a4444cf74e04c22fb11b1e1b76b68a6477a jdk7u80-b08 @@ -829,9 +869,19 @@ 27e0103f3b11f06bc3277914564ed9a1976fb3d5 jdk7u80-b30 426e09df7eda980317d1308af15c29ef691cd471 jdk7u80-b15 198c700d102cc2051b304fc382ac58c5d76e8d26 jdk7u80-b32 -ea2051eb6ee8be8e292711caaae05a7014466ddc jdk7u85-b00 -1c6c2bdf4321c0ece7723663341f7f1a35cac843 jdk7u85-b01 +1afefe2d5f90112e87034a4eac57fdad53fe5b9f icedtea-2.6pre23 +94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6pre24 +94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6.0 +501fc984fa3b3d51e1a7f1220f2de635a2b370b9 jdk7u85-b00 +3f1b4a1fe4a274cd1f89d9ec83d8018f7f4b7d01 jdk7u85-b01 +94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6-branchpoint +b19bc5aeaa099ac73ee8341e337a007180409593 icedtea-2.6.1 e45a07be1cac074dfbde6757f64b91f0608f30fb jdk7u85-b02 +25077ae8f6d2c512e74bfb3e5c1ed511b7c650de icedtea-2.6.2pre01 +1500c88d1b61914b3fbe7dfd8c521038bd95bde3 icedtea-2.6.2pre02 cce12560430861a962349343b61d3a9eb12c6571 jdk7u91-b00 5eaaa63440c4416cd9c03d586f72b3be8c7c73f8 jdk7u91-b01 +f40363c111917466319901436650f22f8403b749 icedtea-2.6.2 2f2d431ace967c9a71194e1bb46f38b35ea43512 jdk7u91-b02 +c3cde6774003850aa6c44315c9c3e4dfdac69798 icedtea-2.6.3 +b3c5ff648bcad305163b323ad15dde1b6234d501 jdk7u95-b00 diff -r d61a34c5c764 -r 19d919ae5506 .jcheck/conf --- a/.jcheck/conf Fri Nov 13 02:43:44 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r d61a34c5c764 -r 19d919ae5506 agent/src/os/linux/LinuxDebuggerLocal.c --- a/agent/src/os/linux/LinuxDebuggerLocal.c Fri Nov 13 02:43:44 2015 +0000 +++ b/agent/src/os/linux/LinuxDebuggerLocal.c Wed Nov 04 16:23:08 2015 -0800 @@ -23,6 +23,7 @@ */ #include +#include #include "libproc.h" #if defined(x86_64) && !defined(amd64) @@ -73,7 +74,7 @@ (JNIEnv *env, jclass cls) { jclass listClass; - if (init_libproc(getenv("LIBSAPROC_DEBUG")) != true) { + if (init_libproc(getenv("LIBSAPROC_DEBUG") != NULL) != true) { THROW_NEW_DEBUGGER_EXCEPTION("can't initialize libproc"); } diff -r d61a34c5c764 -r 19d919ae5506 agent/src/os/linux/Makefile --- a/agent/src/os/linux/Makefile Fri Nov 13 02:43:44 2015 +0000 +++ b/agent/src/os/linux/Makefile Wed Nov 04 16:23:08 2015 -0800 @@ -23,7 +23,12 @@ # ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) -GCC = gcc + +ifndef BUILD_GCC +BUILD_GCC = gcc +endif + +GCC = $(BUILD_GCC) JAVAH = ${JAVA_HOME}/bin/javah @@ -40,7 +45,7 @@ LIBS = -lthread_db -CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) -D_FILE_OFFSET_BITS=64 +CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) -D_FILE_OFFSET_BITS=64 LIBSA = $(ARCH)/libsaproc.so @@ -73,7 +78,7 @@ $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS) test.o: test.c - $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c + $(GCC) -c -o test.o -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) test.c test: test.o $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS) diff -r d61a34c5c764 -r 19d919ae5506 agent/src/os/linux/libproc.h --- a/agent/src/os/linux/libproc.h Fri Nov 13 02:43:44 2015 +0000 +++ b/agent/src/os/linux/libproc.h Wed Nov 04 16:23:08 2015 -0800 @@ -34,7 +34,7 @@ #include "libproc_md.h" #endif -#include +#include /************************************************************************************ @@ -76,7 +76,7 @@ }; #endif -#if defined(sparc) || defined(sparcv9) +#if defined(sparc) || defined(sparcv9) || defined(ppc64) #define user_regs_struct pt_regs #endif diff -r d61a34c5c764 -r 19d919ae5506 agent/src/os/linux/ps_proc.c --- a/agent/src/os/linux/ps_proc.c Fri Nov 13 02:43:44 2015 +0000 +++ b/agent/src/os/linux/ps_proc.c Wed Nov 04 16:23:08 2015 -0800 @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include #include "libproc_impl.h" @@ -261,7 +263,7 @@ static bool read_lib_info(struct ps_prochandle* ph) { char fname[32]; - char buf[256]; + char buf[PATH_MAX]; FILE *fp = NULL; sprintf(fname, "/proc/%d/maps", ph->pid); @@ -271,10 +273,52 @@ return false; } - while(fgets_no_cr(buf, 256, fp)){ - char * word[6]; - int nwords = split_n_str(buf, 6, word, ' ', '\0'); - if (nwords > 5 && find_lib(ph, word[5]) == false) { + while(fgets_no_cr(buf, PATH_MAX, fp)){ + char * word[7]; + int nwords = split_n_str(buf, 7, word, ' ', '\0'); + + if (nwords < 6) { + // not a shared library entry. ignore. + continue; + } + + if (word[5][0] == '[') { + // not a shared library entry. ignore. + if (strncmp(word[5],"[stack",6) == 0) { + continue; + } + if (strncmp(word[5],"[heap]",6) == 0) { + continue; + } + + // SA don't handle VDSO + if (strncmp(word[5],"[vdso]",6) == 0) { + continue; + } + if (strncmp(word[5],"[vsyscall]",6) == 0) { + continue; + } + } + + if (nwords > 6) { + // prelink altered mapfile when the program is running. + // Entries like one below have to be skipped + // /lib64/libc-2.15.so (deleted) + // SO name in entries like one below have to be stripped. + // /lib64/libpthread-2.15.so.#prelink#.EECVts + char *s = strstr(word[5],".#prelink#"); + if (s == NULL) { + // No prelink keyword. skip deleted library + print_debug("skip shared object %s deleted by prelink\n", word[5]); + continue; + } + + // Fall through + print_debug("rectifing shared object name %s changed by prelink\n", word[5]); + *s = 0; + } + + if (find_lib(ph, word[5]) == false) { intptr_t base; lib_info* lib; #ifdef _LP64 diff -r d61a34c5c764 -r 19d919ae5506 agent/src/os/linux/salibelf.c --- a/agent/src/os/linux/salibelf.c Fri Nov 13 02:43:44 2015 +0000 +++ b/agent/src/os/linux/salibelf.c Wed Nov 04 16:23:08 2015 -0800 @@ -25,6 +25,7 @@ #include "salibelf.h" #include #include +#include extern void print_debug(const char*,...); diff -r d61a34c5c764 -r 19d919ae5506 agent/src/os/linux/symtab.c --- a/agent/src/os/linux/symtab.c Fri Nov 13 02:43:44 2015 +0000 +++ b/agent/src/os/linux/symtab.c Wed Nov 04 16:23:08 2015 -0800 @@ -305,7 +305,7 @@ unsigned char *bytes = (unsigned char*)(note+1) + note->n_namesz; - unsigned char *filename + char *filename = (build_id_to_debug_filename (note->n_descsz, bytes)); fd = pathmap_open(filename); diff -r d61a34c5c764 -r 19d919ae5506 make/Makefile --- a/make/Makefile Fri Nov 13 02:43:44 2015 +0000 +++ b/make/Makefile Wed Nov 04 16:23:08 2015 -0800 @@ -85,6 +85,7 @@ # Typical C1/C2 targets made available with this Makefile C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1 C2_VM_TARGETS=product fastdebug optimized jvmg +CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark @@ -127,6 +128,12 @@ all_debugshark: jvmgshark docs export_debug all_optimizedshark: optimizedshark docs export_optimized +allcore: all_productcore all_fastdebugcore +all_productcore: productcore docs export_product +all_fastdebugcore: fastdebugcore docs export_fastdebug +all_debugcore: jvmgcore docs export_debug +all_optimizedcore: optimizedcore docs export_optimized + # Do everything world: all create_jdk @@ -151,6 +158,10 @@ $(CD) $(GAMMADIR)/make; \ $(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT) +$(CORE_VM_TARGETS): + $(CD) $(GAMMADIR)/make; \ + $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT) + $(ZERO_VM_TARGETS): $(CD) $(GAMMADIR)/make; \ $(MAKE) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ \ @@ -203,6 +214,12 @@ $(MAKE_ARGS) $(VM_TARGET) endif +generic_buildcore: + $(MKDIR) -p $(OUTPUTDIR) + $(CD) $(OUTPUTDIR); \ + $(MAKE) -f $(ABS_OS_MAKEFILE) \ + $(MAKE_ARGS) $(VM_TARGET) + generic_buildzero: $(MKDIR) -p $(OUTPUTDIR) $(CD) $(OUTPUTDIR); \ @@ -257,10 +274,12 @@ C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark +CORE_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR) C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR) ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR) SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR) +CORE_DIR=$(CORE_BASE_DIR)/$(VM_SUBDIR) ifeq ($(JVM_VARIANT_SERVER), true) MISC_DIR=$(C2_DIR) @@ -278,6 +297,10 @@ MISC_DIR=$(ZERO_DIR) GEN_DIR=$(ZERO_BASE_DIR)/generated endif +ifeq ($(JVM_VARIANT_CORE), true) + MISC_DIR=$(CORE_DIR) + GEN_DIR=$(CORE_BASE_DIR)/generated +endif # Bin files (windows) ifeq ($(OSNAME),windows) @@ -387,6 +410,20 @@ $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_DIR)/%.diz $(install-file) endif + ifeq ($(JVM_VARIANT_CORE), true) + $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX) + $(install-file) + $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX) + $(install-file) + $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(CORE_DIR)/%.debuginfo + $(install-file) + $(EXPORT_SERVER_DIR)/%.debuginfo: $(CORE_DIR)/%.debuginfo + $(install-file) + $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(CORE_DIR)/%.diz + $(install-file) + $(EXPORT_SERVER_DIR)/%.diz: $(CORE_DIR)/%.diz + $(install-file) + endif endif # Jar file (sa-jdi.jar) diff -r d61a34c5c764 -r 19d919ae5506 make/aix/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/aix/Makefile Wed Nov 04 16:23:08 2015 -0800 @@ -0,0 +1,380 @@ +# +# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012, 2013 SAP AG. 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. +# +# + +# This makefile creates a build tree and lights off a build. +# You can go back into the build tree and perform rebuilds or +# incremental builds as desired. Be sure to reestablish +# environment variable settings for LD_LIBRARY_PATH and JAVA_HOME. + +# The make process now relies on java and javac. These can be +# specified either implicitly on the PATH, by setting the +# (JDK-inherited) ALT_BOOTDIR environment variable to full path to a +# JDK in which bin/java and bin/javac are present and working (e.g., +# /usr/local/java/jdk1.3/solaris), or via the (JDK-inherited) +# default BOOTDIR path value. Note that one of ALT_BOOTDIR +# or BOOTDIR has to be set. We do *not* search javac, javah, rmic etc. +# from the PATH. +# +# One can set ALT_BOOTDIR or BOOTDIR to point to a jdk that runs on +# an architecture that differs from the target architecture, as long +# as the bootstrap jdk runs under the same flavor of OS as the target +# (i.e., if the target is linux, point to a jdk that runs on a linux +# box). In order to use such a bootstrap jdk, set the make variable +# REMOTE to the desired remote command mechanism, e.g., +# +# make REMOTE="rsh -l me myotherlinuxbox" + +# Along with VM, Serviceability Agent (SA) is built for SA/JDI binding. +# JDI binding on SA produces two binaries: +# 1. sa-jdi.jar - This is build before building libjvm[_g].so +# Please refer to ./makefiles/sa.make +# 2. libsa[_g].so - Native library for SA - This is built after +# libjsig[_g].so (signal interposition library) +# Please refer to ./makefiles/vm.make +# If $(GAMMADIR)/agent dir is not present, SA components are not built. + From andrew at icedtea.classpath.org Tue Jan 19 21:48:31 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 19 Jan 2016 21:48:31 +0000 Subject: /hg/release/icedtea7-forest-2.6/jdk: 28 new changesets Message-ID: changeset d5c475e50763 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=d5c475e50763 author: msheppar date: Fri Jan 15 01:59:44 2016 +0000 8059054: Better URL processing Reviewed-by: chegar, rriggs, ahgross, coffeys, igerasim changeset 954788797a1d in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=954788797a1d author: igerasim date: Mon Nov 30 16:28:18 2015 +0300 8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException Reviewed-by: rriggs changeset 4120a4b29644 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=4120a4b29644 author: igerasim date: Fri Jan 15 02:40:13 2016 +0000 8074068: Cleanup in src/share/classes/sun/security/x509/ Reviewed-by: mullan, ahgross, coffeys changeset 5d8adb4ef318 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=5d8adb4ef318 author: igerasim date: Fri Jan 15 02:49:55 2016 +0000 8081297: SSL Problem with Tomcat Reviewed-by: xuelei, jnimeh, ahgross changeset 45a09f89390b in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=45a09f89390b author: sjiang date: Thu Sep 03 09:33:04 2015 +0200 8130710: Better attributes processing Reviewed-by: jbachorik, dfuchs, ahgross changeset a66fd14824db in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a66fd14824db author: igerasim date: Fri Jan 15 04:00:30 2016 +0000 8132082: Let OracleUcrypto accept RSAPrivateKey Reviewed-by: xuelei, valeriep, coffeys Contributed-by: valerie.peng at oracle.com changeset a6397edd7cce in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a6397edd7cce author: sjiang date: Fri Sep 11 09:04:27 2015 +0200 8132210: Reinforce JMX collector internals Reviewed-by: dfuchs, ahgross changeset 854170c6904a in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=854170c6904a author: asaha date: Fri Jan 15 14:09:05 2016 +0000 8132988: Better printing dialogues Reviewed-by: van, vadim Contributed-by: nakul.natu at oracle.com changeset c9fd08459062 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=c9fd08459062 author: igerasim date: Fri Jan 15 14:31:35 2016 +0000 8134605: Partial rework of the fix for 8081297 Reviewed-by: xuelei, coffeys, valeriep changeset c04a405a57db in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=c04a405a57db author: sjiang date: Tue Oct 06 09:20:12 2015 +0200 8137060: JMX memory management improvements Reviewed-by: dfuchs, ahgross changeset 01f500d06f97 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=01f500d06f97 author: aefimov date: Mon Oct 05 19:20:06 2015 +0300 8138716: (tz) Support tzdata2015g Reviewed-by: peytoia changeset 929874ae4345 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=929874ae4345 author: vadim date: Wed Oct 21 20:59:47 2015 +0300 8139012: Better font substitutions Reviewed-by: prr, srl, mschoene changeset 65cc996815d4 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=65cc996815d4 author: vadim date: Fri Oct 16 14:12:35 2015 +0300 8139017: More stable image decoding Reviewed-by: prr, serb, mschoene changeset b5098a5ac2e1 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=b5098a5ac2e1 author: vadim date: Fri Oct 30 10:59:05 2015 +0300 8140543: Arrange font actions Reviewed-by: prr, srl, mschoene changeset af2e258da3ee in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=af2e258da3ee author: vadim date: Tue Nov 03 20:16:40 2015 +0300 8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS Reviewed-by: prr, serb changeset 3862276380cb in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=3862276380cb author: coffeys date: Fri Jan 15 17:05:04 2016 +0000 8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2 Reviewed-by: xuelei changeset 35dcc0db31dc in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=35dcc0db31dc author: andrew date: Fri Jan 15 17:35:32 2016 +0000 8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp Summary: Avoid optimisation of possible overflow comparisons in these files Reviewed-by: omajid changeset 5ac7150ed696 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=5ac7150ed696 author: xuelei date: Mon May 14 07:26:53 2012 -0700 7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified Reviewed-by: mullan changeset 820f69bc8689 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=820f69bc8689 author: asaha date: Tue Nov 24 11:55:33 2015 -0800 8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure Reviewed-by: coffeys changeset 56b6b6c82334 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=56b6b6c82334 author: asaha date: Wed Nov 25 00:15:08 2015 -0800 8143132: L10n resource file translation update Summary: L10n resource file translation update Reviewed-by: naoto Contributed-by: li.jiang at oracle.com changeset c49d87f190b2 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=c49d87f190b2 author: robm date: Tue Dec 01 22:38:16 2015 +0000 8143185: Cleanup for handling proxies Reviewed-by: chegar changeset 498fb4c9d052 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=498fb4c9d052 author: azvegint date: Tue Dec 08 22:22:28 2015 +0300 8143941: Update splashscreen displays Reviewed-by: ahgross, prr, serb changeset cc8732c2fad6 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=cc8732c2fad6 author: igerasim date: Sat Jan 16 01:17:12 2016 +0000 8144773: Further reduce use of MD5 Reviewed-by: mullan, wetmore, jnimeh, ahgross changeset e73ef9b53510 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=e73ef9b53510 author: azvegint date: Thu Dec 10 01:12:29 2015 +0300 8144955: Wrong changes were pushed with 8143942 Reviewed-by: prr, serb changeset 3a74fee9ba00 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=3a74fee9ba00 author: aivanov date: Tue Dec 22 09:58:49 2015 +0300 8145551: Test failed with Crash for Improved font lookups Reviewed-by: prr, vadim changeset a70af3aae22b in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a70af3aae22b author: andrew date: Mon Jan 18 00:07:47 2016 +0000 Added tag jdk7u95-b00 for changeset 3a74fee9ba00 changeset 1617d202b92f in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=1617d202b92f author: andrew date: Mon Jan 18 15:52:29 2016 +0000 Merge jdk7u95-b00 changeset dc86038147b2 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=dc86038147b2 author: andrew date: Mon Jan 18 18:22:09 2016 +0000 Bump to icedtea-2.6.4 diffstat: .hgtags | 51 +- .jcheck/conf | 2 - make/com/oracle/security/ucrypto/mapfile-vers | 4 +- make/com/sun/java/pack/Makefile | 7 +- make/com/sun/java/pack/mapfile-vers | 7 +- make/com/sun/java/pack/mapfile-vers-unpack200 | 7 +- make/com/sun/nio/Makefile | 7 +- make/com/sun/nio/sctp/Makefile | 17 +- make/com/sun/security/auth/module/Makefile | 6 +- make/com/sun/tools/attach/Exportedfiles.gmk | 5 + make/com/sun/tools/attach/FILES_c.gmk | 5 + make/com/sun/tools/attach/FILES_java.gmk | 9 +- make/common/Defs-aix.gmk | 391 + make/common/Defs-embedded.gmk | 4 +- make/common/Defs-linux.gmk | 62 +- make/common/Defs-macosx.gmk | 5 + make/common/Defs.gmk | 32 +- make/common/Demo.gmk | 2 +- make/common/Library.gmk | 42 +- make/common/Program.gmk | 107 +- make/common/Release.gmk | 32 +- make/common/shared/Compiler-gcc.gmk | 76 +- make/common/shared/Compiler-xlc_r.gmk | 37 + make/common/shared/Defs-aix.gmk | 167 + make/common/shared/Defs-java.gmk | 23 +- make/common/shared/Defs-utils.gmk | 4 + make/common/shared/Defs-versions.gmk | 7 +- make/common/shared/Defs.gmk | 2 +- make/common/shared/Platform.gmk | 33 +- make/common/shared/Sanity.gmk | 8 + make/docs/Makefile | 6 +- make/java/fdlibm/Makefile | 7 + make/java/instrument/Makefile | 6 +- make/java/java/Makefile | 7 + make/java/jli/Makefile | 31 +- make/java/main/java/mapfile-aarch64 | 39 + make/java/main/java/mapfile-ppc64 | 43 + make/java/management/Makefile | 6 + make/java/net/FILES_c.gmk | 11 + make/java/net/Makefile | 30 +- make/java/nio/Makefile | 263 +- make/java/npt/Makefile | 2 +- make/java/security/Makefile | 12 +- make/java/sun_nio/Makefile | 2 +- make/java/version/Makefile | 5 + make/javax/crypto/Makefile | 74 +- make/javax/sound/SoundDefs.gmk | 72 +- make/jdk_generic_profile.sh | 319 +- make/jpda/transport/socket/Makefile | 2 +- make/mkdemo/jvmti/waiters/Makefile | 4 + make/sun/Makefile | 2 +- make/sun/awt/FILES_c_unix.gmk | 10 + make/sun/awt/Makefile | 36 +- make/sun/awt/mawt.gmk | 42 +- make/sun/cmm/lcms/FILES_c_unix.gmk | 7 +- make/sun/cmm/lcms/Makefile | 7 +- make/sun/font/Makefile | 27 +- make/sun/gtk/FILES_c_unix.gmk | 41 + make/sun/gtk/FILES_export_unix.gmk | 31 + make/sun/gtk/Makefile | 84 + make/sun/gtk/mapfile-vers | 72 + make/sun/javazic/tzdata/VERSION | 2 +- make/sun/javazic/tzdata/asia | 14 +- make/sun/javazic/tzdata/australasia | 34 +- make/sun/javazic/tzdata/europe | 7 + make/sun/javazic/tzdata/northamerica | 22 + make/sun/javazic/tzdata/zone.tab | 1 + make/sun/jawt/Makefile | 11 + make/sun/jpeg/FILES_c.gmk | 6 +- make/sun/jpeg/Makefile | 11 +- make/sun/lwawt/FILES_c_macosx.gmk | 6 + make/sun/lwawt/Makefile | 7 +- make/sun/native2ascii/Makefile | 2 +- make/sun/net/FILES_java.gmk | 229 +- make/sun/nio/cs/Makefile | 4 +- make/sun/security/Makefile | 18 +- make/sun/security/ec/Makefile | 30 +- make/sun/security/ec/mapfile-vers | 2 + make/sun/security/jgss/wrapper/Makefile | 2 +- make/sun/security/krb5/Makefile | 8 +- make/sun/security/krb5/internal/ccache/Makefile | 49 + make/sun/security/mscapi/Makefile | 2 +- make/sun/security/pkcs11/Makefile | 6 +- make/sun/security/pkcs11/mapfile-vers | 4 +- make/sun/security/smartcardio/Makefile | 17 +- make/sun/splashscreen/FILES_c.gmk | 84 +- make/sun/splashscreen/Makefile | 37 +- make/sun/xawt/FILES_c_unix.gmk | 25 +- make/sun/xawt/FILES_export_unix.gmk | 3 +- make/sun/xawt/Makefile | 71 +- make/sun/xawt/mapfile-vers | 37 - make/tools/Makefile | 9 + make/tools/freetypecheck/Makefile | 21 +- make/tools/generate_nimbus/Makefile | 1 + make/tools/sharing/classlist.aix | 2406 ++++++ make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java | 22 +- make/tools/src/build/tools/compileproperties/CompileProperties.java | 9 +- make/tools/src/build/tools/dirdiff/DirDiff.java | 4 +- make/tools/src/build/tools/dtdbuilder/DTDBuilder.java | 34 +- make/tools/src/build/tools/dtdbuilder/DTDInputStream.java | 6 +- make/tools/src/build/tools/dtdbuilder/DTDParser.java | 44 +- make/tools/src/build/tools/dtdbuilder/PublicMapping.java | 6 +- make/tools/src/build/tools/generatebreakiteratordata/CharSet.java | 16 +- make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java | 8 +- make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java | 6 +- make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java | 201 +- make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java | 6 +- make/tools/src/build/tools/generatecharacter/GenerateCharacter.java | 4 +- make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java | 147 +- make/tools/src/build/tools/generatecharacter/UnicodeSpec.java | 22 +- make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 64 +- make/tools/src/build/tools/hasher/Hasher.java | 38 +- make/tools/src/build/tools/jarsplit/JarSplit.java | 5 +- make/tools/src/build/tools/javazic/Gen.java | 14 +- make/tools/src/build/tools/javazic/GenDoc.java | 16 +- make/tools/src/build/tools/javazic/Main.java | 3 +- make/tools/src/build/tools/javazic/Simple.java | 23 +- make/tools/src/build/tools/javazic/Time.java | 10 +- make/tools/src/build/tools/javazic/Zoneinfo.java | 18 +- make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java | 7 +- make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java | 7 +- make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java | 14 +- make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java | 26 +- make/tools/src/build/tools/jdwpgen/AltNode.java | 4 +- make/tools/src/build/tools/jdwpgen/CommandSetNode.java | 11 +- make/tools/src/build/tools/jdwpgen/ConstantSetNode.java | 9 +- make/tools/src/build/tools/jdwpgen/ErrorSetNode.java | 9 +- make/tools/src/build/tools/jdwpgen/Node.java | 25 +- make/tools/src/build/tools/jdwpgen/OutNode.java | 14 +- make/tools/src/build/tools/jdwpgen/RootNode.java | 10 +- make/tools/src/build/tools/jdwpgen/SelectNode.java | 10 +- make/tools/src/build/tools/makeclasslist/MakeClasslist.java | 15 +- make/tools/src/build/tools/stripproperties/StripProperties.java | 4 +- src/bsd/doc/man/jhat.1 | 4 +- src/linux/doc/man/jhat.1 | 4 +- src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java | 7 +- src/share/back/ThreadGroupReferenceImpl.c | 2 +- src/share/back/outStream.c | 4 +- src/share/bin/java.c | 8 +- src/share/bin/wildcard.c | 5 + src/share/classes/com/sun/crypto/provider/AESCipher.java | 113 +- src/share/classes/com/sun/crypto/provider/AESWrapCipher.java | 36 +- src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java | 18 +- src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java | 11 +- src/share/classes/com/sun/crypto/provider/HmacCore.java | 159 +- src/share/classes/com/sun/crypto/provider/HmacMD5.java | 92 +- src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java | 81 +- src/share/classes/com/sun/crypto/provider/HmacSHA1.java | 92 +- src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java | 63 +- src/share/classes/com/sun/crypto/provider/OAEPParameters.java | 4 +- src/share/classes/com/sun/crypto/provider/SunJCE.java | 95 +- src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java | 21 +- src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java | 11 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 2 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 2 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java | 3 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java | 10 +- src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java | 5 +- src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java | 2 + src/share/classes/com/sun/jndi/dns/DnsContextFactory.java | 2 +- src/share/classes/com/sun/jndi/ldap/ClientId.java | 13 +- src/share/classes/com/sun/jndi/ldap/Connection.java | 22 +- src/share/classes/com/sun/jndi/ldap/LdapClient.java | 10 +- src/share/classes/com/sun/jndi/ldap/LdapCtx.java | 3 +- src/share/classes/com/sun/jndi/ldap/LdapName.java | 12 +- src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java | 3 +- src/share/classes/com/sun/jndi/ldap/LdapURL.java | 64 +- src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java | 2 +- src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java | 15 +- src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 34 + src/share/classes/com/sun/naming/internal/ResourceManager.java | 42 +- src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java | 2 +- src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java | 8 +- src/share/classes/com/sun/script/javascript/RhinoTopLevel.java | 2 +- src/share/classes/com/sun/security/ntlm/Client.java | 31 +- src/share/classes/com/sun/security/ntlm/NTLM.java | 4 +- src/share/classes/com/sun/security/ntlm/Server.java | 10 +- src/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java | 12 +- src/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java | 6 +- src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java | 5 +- src/share/classes/java/awt/ScrollPane.java | 3 +- src/share/classes/java/awt/color/ICC_Profile.java | 4 +- src/share/classes/java/io/InputStream.java | 2 +- src/share/classes/java/net/Inet4Address.java | 2 + src/share/classes/java/net/InetAddress.java | 2 +- src/share/classes/java/net/SocksSocketImpl.java | 4 +- src/share/classes/java/net/URL.java | 241 +- src/share/classes/java/security/KeyRep.java | 3 +- src/share/classes/java/security/Policy.java | 1 - src/share/classes/java/security/Security.java | 9 +- src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java | 16 +- src/share/classes/java/security/spec/MGF1ParameterSpec.java | 3 +- src/share/classes/java/security/spec/PSSParameterSpec.java | 3 +- src/share/classes/java/util/Currency.java | 44 +- src/share/classes/java/util/CurrencyData.properties | 20 +- src/share/classes/javax/crypto/Cipher.java | 172 +- src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java | 7 +- src/share/classes/javax/management/remote/rmi/RMIConnector.java | 35 +- src/share/classes/javax/naming/NameImpl.java | 15 +- src/share/classes/javax/naming/directory/BasicAttributes.java | 7 +- src/share/classes/javax/naming/ldap/Rdn.java | 9 +- src/share/classes/javax/swing/JComponent.java | 13 +- src/share/classes/javax/swing/JDialog.java | 3 +- src/share/classes/javax/swing/JEditorPane.java | 11 +- src/share/classes/javax/swing/JFrame.java | 10 +- src/share/classes/javax/swing/JInternalFrame.java | 6 +- src/share/classes/javax/swing/JPopupMenu.java | 8 +- src/share/classes/javax/swing/MenuSelectionManager.java | 3 +- src/share/classes/javax/swing/PopupFactory.java | 14 +- src/share/classes/javax/swing/SortingFocusTraversalPolicy.java | 5 +- src/share/classes/javax/swing/SwingUtilities.java | 3 +- src/share/classes/javax/swing/SwingWorker.java | 2 +- src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java | 50 +- src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java | 29 +- src/share/classes/javax/swing/plaf/basic/BasicListUI.java | 5 +- src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java | 20 +- src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java | 2 +- src/share/classes/javax/swing/plaf/basic/BasicTableUI.java | 8 +- src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java | 3 +- src/share/classes/javax/swing/plaf/synth/ImagePainter.java | 5 +- src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java | 3 +- src/share/classes/javax/swing/text/JTextComponent.java | 6 +- src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java | 2 - src/share/classes/sun/applet/AppletPanel.java | 10 +- src/share/classes/sun/applet/AppletViewerPanel.java | 18 +- src/share/classes/sun/awt/AWTAccessor.java | 4 +- src/share/classes/sun/awt/image/JPEGImageDecoder.java | 2 +- src/share/classes/sun/font/FreetypeFontScaler.java | 8 +- src/share/classes/sun/java2d/cmm/lcms/LCMS.java | 2 +- src/share/classes/sun/management/GarbageCollectorImpl.java | 16 +- src/share/classes/sun/management/MemoryImpl.java | 13 +- src/share/classes/sun/misc/SharedSecrets.java | 7 +- src/share/classes/sun/misc/Version.java.template | 58 +- src/share/classes/sun/nio/ch/FileChannelImpl.java | 3 +- src/share/classes/sun/nio/ch/FileDispatcher.java | 12 +- src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java | 3 +- src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java | 2 +- src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java | 52 +- src/share/classes/sun/rmi/registry/RegistryImpl.java | 14 + src/share/classes/sun/rmi/server/LoaderHandler.java | 2 +- src/share/classes/sun/rmi/server/UnicastServerRef.java | 2 +- src/share/classes/sun/security/ec/ECDSASignature.java | 10 +- src/share/classes/sun/security/ec/SunEC.java | 19 + src/share/classes/sun/security/ec/SunECEntries.java | 20 +- src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java | 38 + src/share/classes/sun/security/jca/JCAUtil.java | 29 +- src/share/classes/sun/security/jgss/krb5/Krb5NameElement.java | 3 +- src/share/classes/sun/security/krb5/Config.java | 51 +- src/share/classes/sun/security/krb5/PrincipalName.java | 7 +- src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java | 90 +- src/share/classes/sun/security/pkcs11/Config.java | 3 + src/share/classes/sun/security/pkcs11/P11Cipher.java | 425 +- src/share/classes/sun/security/pkcs11/P11Digest.java | 190 +- src/share/classes/sun/security/pkcs11/P11Mac.java | 9 +- src/share/classes/sun/security/pkcs11/P11RSACipher.java | 113 +- src/share/classes/sun/security/pkcs11/P11Signature.java | 10 + src/share/classes/sun/security/pkcs11/P11Util.java | 2 +- src/share/classes/sun/security/pkcs11/Secmod.java | 19 +- src/share/classes/sun/security/pkcs11/SessionManager.java | 85 +- src/share/classes/sun/security/pkcs11/SunPKCS11.java | 95 +- src/share/classes/sun/security/pkcs11/wrapper/Functions.java | 5 + src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java | 377 +- src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java | 29 +- src/share/classes/sun/security/provider/DSA.java | 790 +- src/share/classes/sun/security/provider/DSAKeyPairGenerator.java | 92 +- src/share/classes/sun/security/provider/DSAParameterGenerator.java | 269 +- src/share/classes/sun/security/provider/DigestBase.java | 27 +- src/share/classes/sun/security/provider/JavaKeyStore.java | 2 +- src/share/classes/sun/security/provider/MD2.java | 21 +- src/share/classes/sun/security/provider/MD4.java | 18 +- src/share/classes/sun/security/provider/MD5.java | 18 +- src/share/classes/sun/security/provider/ParameterCache.java | 166 +- src/share/classes/sun/security/provider/SHA.java | 19 +- src/share/classes/sun/security/provider/SHA2.java | 74 +- src/share/classes/sun/security/provider/SHA5.java | 38 +- src/share/classes/sun/security/provider/SunEntries.java | 46 +- src/share/classes/sun/security/provider/certpath/OCSP.java | 18 +- src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java | 4 +- src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java | 3 +- src/share/classes/sun/security/rsa/RSASignature.java | 11 +- src/share/classes/sun/security/rsa/SunRsaSignEntries.java | 8 +- src/share/classes/sun/security/spec/DSAGenParameterSpec.java | 129 + src/share/classes/sun/security/ssl/ClientHandshaker.java | 117 +- src/share/classes/sun/security/ssl/HandshakeMessage.java | 4 +- src/share/classes/sun/security/ssl/Handshaker.java | 2 +- src/share/classes/sun/security/ssl/RSAClientKeyExchange.java | 62 +- src/share/classes/sun/security/ssl/SSLEngineImpl.java | 11 + src/share/classes/sun/security/ssl/SSLSessionContextImpl.java | 4 +- src/share/classes/sun/security/ssl/ServerHandshaker.java | 256 +- src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java | 71 +- src/share/classes/sun/security/tools/KeyStoreUtil.java | 4 +- src/share/classes/sun/security/util/HostnameChecker.java | 8 +- src/share/classes/sun/security/util/KeyUtil.java | 15 +- src/share/classes/sun/security/util/ObjectIdentifier.java | 2 +- src/share/classes/sun/security/x509/AlgorithmId.java | 51 +- src/share/classes/sun/security/x509/CRLDistributionPointsExtension.java | 8 +- src/share/classes/sun/security/x509/CRLNumberExtension.java | 7 +- src/share/classes/sun/security/x509/DNSName.java | 14 +- src/share/classes/sun/security/x509/EDIPartyName.java | 2 +- src/share/classes/sun/security/x509/GeneralSubtrees.java | 2 +- src/share/classes/sun/security/x509/IPAddressName.java | 20 +- src/share/classes/sun/security/x509/IssuingDistributionPointExtension.java | 2 +- src/share/classes/sun/security/x509/KeyIdentifier.java | 4 +- src/share/classes/sun/security/x509/PolicyMappingsExtension.java | 2 +- src/share/classes/sun/security/x509/PrivateKeyUsageExtension.java | 6 +- src/share/classes/sun/security/x509/RDN.java | 40 +- src/share/classes/sun/security/x509/RFC822Name.java | 2 +- src/share/classes/sun/security/x509/SubjectInfoAccessExtension.java | 4 +- src/share/classes/sun/security/x509/URIName.java | 2 +- src/share/classes/sun/security/x509/X500Name.java | 5 +- src/share/classes/sun/security/x509/X509AttributeName.java | 2 +- src/share/classes/sun/security/x509/X509CRLImpl.java | 8 +- src/share/classes/sun/security/x509/X509CertImpl.java | 4 +- src/share/classes/sun/swing/DefaultLookup.java | 3 +- src/share/classes/sun/swing/SwingUtilities2.java | 17 +- src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider | 1 + src/share/classes/sun/tools/jar/Main.java | 2 +- src/share/classes/sun/tools/jar/resources/jar_ja.properties | 2 +- src/share/classes/sun/tools/native2ascii/Main.java | 9 +- src/share/classes/sun/util/calendar/ZoneInfoFile.java | 41 +- src/share/classes/sun/util/resources/TimeZoneNames.java | 1 + src/share/classes/sun/util/resources/TimeZoneNames_de.java | 1 + src/share/classes/sun/util/resources/TimeZoneNames_es.java | 1 + src/share/classes/sun/util/resources/TimeZoneNames_fr.java | 1 + src/share/classes/sun/util/resources/TimeZoneNames_it.java | 1 + src/share/classes/sun/util/resources/TimeZoneNames_ja.java | 1 + src/share/classes/sun/util/resources/TimeZoneNames_ko.java | 1 + src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java | 1 + src/share/classes/sun/util/resources/TimeZoneNames_sv.java | 1 + src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java | 1 + src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java | 1 + src/share/demo/jvmti/gctest/sample.makefile.txt | 6 +- src/share/demo/jvmti/heapTracker/sample.makefile.txt | 19 +- src/share/demo/jvmti/heapViewer/sample.makefile.txt | 5 +- src/share/demo/jvmti/hprof/hprof_init.c | 2 +- src/share/demo/jvmti/hprof/sample.makefile.txt | 6 +- src/share/demo/jvmti/minst/sample.makefile.txt | 19 +- src/share/demo/jvmti/mtrace/sample.makefile.txt | 20 +- src/share/demo/jvmti/versionCheck/sample.makefile.txt | 6 +- src/share/demo/jvmti/waiters/sample.makefile.txt | 8 +- src/share/instrument/JarFacade.c | 4 +- src/share/lib/security/java.security-linux | 8 +- src/share/lib/security/java.security-macosx | 8 +- src/share/lib/security/java.security-solaris | 8 +- src/share/lib/security/java.security-windows | 8 +- src/share/lib/security/nss.cfg.in | 5 + src/share/lib/security/sunpkcs11-solaris.cfg | 14 +- src/share/native/com/sun/java/util/jar/pack/jni.cpp | 6 +- src/share/native/com/sun/java/util/jar/pack/unpack.cpp | 1 - src/share/native/com/sun/media/sound/SoundDefs.h | 10 + src/share/native/common/check_code.c | 35 + src/share/native/java/net/InetAddress.c | 3 + src/share/native/java/net/net_util.c | 10 + src/share/native/java/net/net_util.h | 1 + src/share/native/java/util/zip/Deflater.c | 6 +- src/share/native/java/util/zip/Inflater.c | 2 +- src/share/native/sun/awt/image/awt_ImageRep.c | 2 +- src/share/native/sun/awt/image/jpeg/README | 385 - src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 12 +- src/share/native/sun/awt/image/jpeg/jcapimin.c | 284 - src/share/native/sun/awt/image/jpeg/jcapistd.c | 165 - src/share/native/sun/awt/image/jpeg/jccoefct.c | 453 - src/share/native/sun/awt/image/jpeg/jccolor.c | 462 - src/share/native/sun/awt/image/jpeg/jcdctmgr.c | 391 - src/share/native/sun/awt/image/jpeg/jchuff.c | 913 -- src/share/native/sun/awt/image/jpeg/jchuff.h | 51 - src/share/native/sun/awt/image/jpeg/jcinit.c | 76 - src/share/native/sun/awt/image/jpeg/jcmainct.c | 297 - src/share/native/sun/awt/image/jpeg/jcmarker.c | 682 - src/share/native/sun/awt/image/jpeg/jcmaster.c | 594 - src/share/native/sun/awt/image/jpeg/jcomapi.c | 110 - src/share/native/sun/awt/image/jpeg/jconfig.h | 43 - src/share/native/sun/awt/image/jpeg/jcparam.c | 614 - src/share/native/sun/awt/image/jpeg/jcphuff.c | 837 -- src/share/native/sun/awt/image/jpeg/jcprepct.c | 358 - src/share/native/sun/awt/image/jpeg/jcsample.c | 523 - src/share/native/sun/awt/image/jpeg/jctrans.c | 392 - src/share/native/sun/awt/image/jpeg/jdapimin.c | 399 - src/share/native/sun/awt/image/jpeg/jdapistd.c | 279 - src/share/native/sun/awt/image/jpeg/jdcoefct.c | 740 - src/share/native/sun/awt/image/jpeg/jdcolor.c | 398 - src/share/native/sun/awt/image/jpeg/jdct.h | 180 - src/share/native/sun/awt/image/jpeg/jddctmgr.c | 273 - src/share/native/sun/awt/image/jpeg/jdhuff.c | 655 - src/share/native/sun/awt/image/jpeg/jdhuff.h | 205 - src/share/native/sun/awt/image/jpeg/jdinput.c | 385 - src/share/native/sun/awt/image/jpeg/jdmainct.c | 516 - src/share/native/sun/awt/image/jpeg/jdmarker.c | 1390 --- src/share/native/sun/awt/image/jpeg/jdmaster.c | 561 - src/share/native/sun/awt/image/jpeg/jdmerge.c | 404 - src/share/native/sun/awt/image/jpeg/jdphuff.c | 672 - src/share/native/sun/awt/image/jpeg/jdpostct.c | 294 - src/share/native/sun/awt/image/jpeg/jdsample.c | 482 - src/share/native/sun/awt/image/jpeg/jdtrans.c | 147 - src/share/native/sun/awt/image/jpeg/jerror.c | 272 - src/share/native/sun/awt/image/jpeg/jerror.h | 295 - src/share/native/sun/awt/image/jpeg/jfdctflt.c | 172 - src/share/native/sun/awt/image/jpeg/jfdctfst.c | 228 - src/share/native/sun/awt/image/jpeg/jfdctint.c | 287 - src/share/native/sun/awt/image/jpeg/jidctflt.c | 246 - src/share/native/sun/awt/image/jpeg/jidctfst.c | 372 - src/share/native/sun/awt/image/jpeg/jidctint.c | 393 - src/share/native/sun/awt/image/jpeg/jidctred.c | 402 - src/share/native/sun/awt/image/jpeg/jinclude.h | 95 - src/share/native/sun/awt/image/jpeg/jmemmgr.c | 1124 -- src/share/native/sun/awt/image/jpeg/jmemnobs.c | 113 - src/share/native/sun/awt/image/jpeg/jmemsys.h | 202 - src/share/native/sun/awt/image/jpeg/jmorecfg.h | 378 - src/share/native/sun/awt/image/jpeg/jpeg-6b/README | 385 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapimin.c | 284 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapistd.c | 165 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jccoefct.c | 453 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jccolor.c | 462 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcdctmgr.c | 391 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.c | 913 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.h | 51 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcinit.c | 76 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmainct.c | 297 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmarker.c | 682 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmaster.c | 594 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcomapi.c | 110 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jconfig.h | 43 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcparam.c | 614 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcphuff.c | 837 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jcprepct.c | 358 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jcsample.c | 523 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jctrans.c | 392 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapimin.c | 399 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapistd.c | 279 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcoefct.c | 740 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcolor.c | 398 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdct.h | 180 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jddctmgr.c | 273 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.c | 655 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.h | 205 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdinput.c | 385 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmainct.c | 516 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmarker.c | 1390 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmaster.c | 561 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmerge.c | 404 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdphuff.c | 672 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdpostct.c | 294 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdsample.c | 482 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jdtrans.c | 147 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.c | 272 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.h | 295 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctflt.c | 172 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctfst.c | 228 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctint.c | 287 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctflt.c | 246 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctfst.c | 372 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctint.c | 393 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctred.c | 402 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jinclude.h | 95 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemmgr.c | 1124 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemnobs.c | 113 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemsys.h | 202 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jmorecfg.h | 378 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jpegint.h | 396 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jpeglib.h | 1100 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant1.c | 860 ++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant2.c | 1314 +++ src/share/native/sun/awt/image/jpeg/jpeg-6b/jutils.c | 183 + src/share/native/sun/awt/image/jpeg/jpeg-6b/jversion.h | 18 + src/share/native/sun/awt/image/jpeg/jpegdecoder.c | 12 +- src/share/native/sun/awt/image/jpeg/jpegint.h | 396 - src/share/native/sun/awt/image/jpeg/jpeglib.h | 1100 -- src/share/native/sun/awt/image/jpeg/jquant1.c | 860 -- src/share/native/sun/awt/image/jpeg/jquant2.c | 1314 --- src/share/native/sun/awt/image/jpeg/jutils.c | 183 - src/share/native/sun/awt/image/jpeg/jversion.h | 18 - src/share/native/sun/awt/libpng/CHANGES | 413 +- src/share/native/sun/awt/libpng/LICENSE | 55 +- src/share/native/sun/awt/libpng/README | 4 +- src/share/native/sun/awt/libpng/png.c | 357 +- src/share/native/sun/awt/libpng/png.h | 602 +- src/share/native/sun/awt/libpng/pngconf.h | 50 +- src/share/native/sun/awt/libpng/pngdebug.h | 3 +- src/share/native/sun/awt/libpng/pngget.c | 36 +- src/share/native/sun/awt/libpng/pnginfo.h | 3 +- src/share/native/sun/awt/libpng/pnglibconf.h | 12 +- src/share/native/sun/awt/libpng/pngmem.c | 5 +- src/share/native/sun/awt/libpng/pngpread.c | 125 +- src/share/native/sun/awt/libpng/pngpriv.h | 127 +- src/share/native/sun/awt/libpng/pngread.c | 59 +- src/share/native/sun/awt/libpng/pngrio.c | 6 +- src/share/native/sun/awt/libpng/pngrtran.c | 89 +- src/share/native/sun/awt/libpng/pngrutil.c | 441 +- src/share/native/sun/awt/libpng/pngset.c | 100 +- src/share/native/sun/awt/libpng/pngstruct.h | 38 +- src/share/native/sun/awt/libpng/pngtest.c | 196 +- src/share/native/sun/awt/libpng/pngtrans.c | 10 +- src/share/native/sun/awt/libpng/pngwio.c | 2 +- src/share/native/sun/awt/libpng/pngwrite.c | 637 +- src/share/native/sun/awt/libpng/pngwtran.c | 16 +- src/share/native/sun/awt/libpng/pngwutil.c | 908 +- src/share/native/sun/awt/medialib/mlib_sys.c | 2 +- src/share/native/sun/awt/medialib/mlib_types.h | 7 +- src/share/native/sun/awt/splashscreen/splashscreen_gif.c | 24 +- src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 7 +- src/share/native/sun/awt/splashscreen/splashscreen_png.c | 3 +- src/share/native/sun/font/freetypeScaler.c | 231 +- src/share/native/sun/font/layout/CanonShaping.cpp | 10 + src/share/native/sun/font/layout/ContextualSubstSubtables.cpp | 78 +- src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp | 2 +- src/share/native/sun/font/layout/Features.cpp | 9 +- src/share/native/sun/font/layout/IndicLayoutEngine.cpp | 2 +- src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp | 6 +- src/share/native/sun/font/layout/IndicRearrangementProcessor.h | 4 +- src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp | 6 +- src/share/native/sun/font/layout/IndicRearrangementProcessor2.h | 4 +- src/share/native/sun/font/layout/IndicReordering.cpp | 6 +- src/share/native/sun/font/layout/IndicReordering.h | 2 +- src/share/native/sun/font/layout/LayoutEngine.cpp | 8 + src/share/native/sun/font/layout/Lookups.cpp | 2 + src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp | 2 +- src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp | 6 +- src/share/native/sun/font/layout/SunLayoutEngine.cpp | 4 + src/share/native/sun/java2d/cmm/lcms/cmscam02.c | 7 +- src/share/native/sun/java2d/cmm/lcms/cmscgats.c | 18 +- src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c | 128 +- src/share/native/sun/java2d/cmm/lcms/cmserr.c | 331 +- src/share/native/sun/java2d/cmm/lcms/cmsgamma.c | 95 +- src/share/native/sun/java2d/cmm/lcms/cmsgmt.c | 2 +- src/share/native/sun/java2d/cmm/lcms/cmsintrp.c | 47 +- src/share/native/sun/java2d/cmm/lcms/cmsio0.c | 341 +- src/share/native/sun/java2d/cmm/lcms/cmsio1.c | 172 +- src/share/native/sun/java2d/cmm/lcms/cmslut.c | 16 + src/share/native/sun/java2d/cmm/lcms/cmsnamed.c | 10 +- src/share/native/sun/java2d/cmm/lcms/cmsopt.c | 315 +- src/share/native/sun/java2d/cmm/lcms/cmspack.c | 578 +- src/share/native/sun/java2d/cmm/lcms/cmspcs.c | 9 + src/share/native/sun/java2d/cmm/lcms/cmsplugin.c | 390 +- src/share/native/sun/java2d/cmm/lcms/cmsps2.c | 4 +- src/share/native/sun/java2d/cmm/lcms/cmssamp.c | 27 +- src/share/native/sun/java2d/cmm/lcms/cmstypes.c | 280 +- src/share/native/sun/java2d/cmm/lcms/cmsvirt.c | 43 +- src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c | 2 +- src/share/native/sun/java2d/cmm/lcms/cmsxform.c | 316 +- src/share/native/sun/java2d/cmm/lcms/lcms2.h | 94 +- src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h | 449 +- src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h | 45 +- src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h | 6 +- src/share/native/sun/java2d/loops/TransformHelper.c | 11 +- src/share/native/sun/java2d/opengl/OGLContext.c | 2 + src/share/native/sun/java2d/opengl/OGLFuncs.h | 2 +- src/share/native/sun/security/ec/ECC_JNI.cpp | 59 +- src/share/native/sun/security/ec/ecc_impl.h | 298 + src/share/native/sun/security/ec/impl/ecc_impl.h | 264 - src/share/native/sun/security/jgss/wrapper/GSSLibStub.c | 49 +- src/share/native/sun/security/jgss/wrapper/NativeUtil.c | 12 + src/share/native/sun/security/pkcs11/wrapper/p11_convert.c | 38 +- src/share/native/sun/security/pkcs11/wrapper/p11_digest.c | 4 +- src/share/native/sun/security/pkcs11/wrapper/p11_dual.c | 8 +- src/share/native/sun/security/pkcs11/wrapper/p11_general.c | 7 +- src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c | 4 +- src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c | 58 +- src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c | 4 +- src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c | 12 +- src/share/native/sun/security/pkcs11/wrapper/p11_sign.c | 20 +- src/share/native/sun/security/pkcs11/wrapper/p11_util.c | 86 +- src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h | 9 +- src/share/npt/npt.h | 8 +- src/solaris/back/exec_md.c | 4 +- src/solaris/bin/aarch64/jvm.cfg | 36 + src/solaris/bin/java_md_solinux.c | 27 +- src/solaris/bin/ppc64/jvm.cfg | 33 + src/solaris/bin/ppc64le/jvm.cfg | 33 + src/solaris/classes/java/lang/UNIXProcess.java.aix | 470 + src/solaris/classes/sun/awt/UNIXToolkit.java | 6 + src/solaris/classes/sun/awt/X11/XFramePeer.java | 5 + src/solaris/classes/sun/awt/X11/XNETProtocol.java | 29 +- src/solaris/classes/sun/awt/X11/XToolkit.java | 30 +- src/solaris/classes/sun/awt/X11/XWM.java | 26 +- src/solaris/classes/sun/awt/X11/XWindowPeer.java | 2 + src/solaris/classes/sun/awt/fontconfigs/aix.fontconfig.properties | 75 + src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.10.properties | 377 + src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.11.properties | 420 + src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.12.properties | 420 + src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.9.properties | 377 + src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties | 73 +- src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties | 385 + src/solaris/classes/sun/awt/motif/MFontConfiguration.java | 3 + src/solaris/classes/sun/font/FcFontConfiguration.java | 2 +- src/solaris/classes/sun/java2d/xr/XRRenderer.java | 75 +- src/solaris/classes/sun/java2d/xr/XRUtils.java | 4 +- src/solaris/classes/sun/net/PortConfig.java | 7 + src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java | 9 + src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java | 9 +- src/solaris/classes/sun/nio/ch/AixAsynchronousChannelProvider.java | 91 + src/solaris/classes/sun/nio/ch/AixPollPort.java | 536 + src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java | 2 + src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java | 8 +- src/solaris/classes/sun/nio/ch/Port.java | 8 + src/solaris/classes/sun/nio/ch/SctpChannelImpl.java | 2 +- src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java | 2 +- src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java | 2 +- src/solaris/classes/sun/nio/fs/AixFileStore.java | 106 + src/solaris/classes/sun/nio/fs/AixFileSystem.java | 94 + src/solaris/classes/sun/nio/fs/AixFileSystemProvider.java | 58 + src/solaris/classes/sun/nio/fs/AixNativeDispatcher.java | 56 + src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java | 2 + src/solaris/classes/sun/nio/fs/UnixCopyFile.java | 8 +- src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java | 6 +- src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java | 4 +- src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java | 4 +- src/solaris/classes/sun/print/UnixPrintService.java | 73 +- src/solaris/classes/sun/print/UnixPrintServiceLookup.java | 97 +- src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java | 89 +- src/solaris/classes/sun/tools/attach/AixAttachProvider.java | 88 + src/solaris/classes/sun/tools/attach/AixVirtualMachine.java | 317 + src/solaris/demo/jvmti/hprof/hprof_md.c | 87 +- src/solaris/doc/sun/man/man1/jhat.1 | 4 +- src/solaris/javavm/export/jni_md.h | 18 +- src/solaris/native/com/sun/management/UnixOperatingSystem_md.c | 20 +- src/solaris/native/com/sun/security/auth/module/Solaris.c | 17 +- src/solaris/native/com/sun/security/auth/module/Unix.c | 102 +- src/solaris/native/common/deps/cups_fp.c | 104 + src/solaris/native/common/deps/cups_fp.h | 61 + src/solaris/native/common/deps/fontconfig2/fontconfig/fontconfig.h | 302 + src/solaris/native/common/deps/fontconfig2/fontconfig_fp.c | 208 + src/solaris/native/common/deps/fontconfig2/fontconfig_fp.h | 161 + src/solaris/native/common/deps/gconf2/gconf/gconf-client.h | 41 + src/solaris/native/common/deps/gconf2/gconf_fp.c | 76 + src/solaris/native/common/deps/gconf2/gconf_fp.h | 48 + src/solaris/native/common/deps/glib2/gio/gio_typedefs.h | 61 + src/solaris/native/common/deps/glib2/gio_fp.c | 183 + src/solaris/native/common/deps/glib2/gio_fp.h | 69 + src/solaris/native/common/deps/glib2/glib_fp.h | 70 + src/solaris/native/common/deps/gtk2/gtk/gtk.h | 567 + src/solaris/native/common/deps/gtk2/gtk_fp.c | 367 + src/solaris/native/common/deps/gtk2/gtk_fp.h | 460 + src/solaris/native/common/deps/gtk2/gtk_fp_check.c | 56 + src/solaris/native/common/deps/gtk2/gtk_fp_check.h | 47 + src/solaris/native/common/deps/syscalls_fp.c | 122 + src/solaris/native/common/deps/syscalls_fp.h | 79 + src/solaris/native/java/io/UnixFileSystem_md.c | 2 +- src/solaris/native/java/lang/UNIXProcess_md.c | 8 +- src/solaris/native/java/lang/java_props_md.c | 7 +- src/solaris/native/java/net/Inet4AddressImpl.c | 55 + src/solaris/native/java/net/NetworkInterface.c | 173 +- src/solaris/native/java/net/PlainSocketImpl.c | 2 +- src/solaris/native/java/net/linux_close.c | 59 +- src/solaris/native/java/net/net_util_md.c | 27 + src/solaris/native/java/net/net_util_md.h | 13 +- src/solaris/native/java/util/TimeZone_md.c | 70 +- src/solaris/native/sun/awt/CUPSfuncs.c | 137 +- src/solaris/native/sun/awt/awt_Font.c | 2 +- src/solaris/native/sun/awt/awt_GTKToolkit.c | 229 + src/solaris/native/sun/awt/awt_GraphicsEnv.c | 2 +- src/solaris/native/sun/awt/awt_LoadLibrary.c | 65 +- src/solaris/native/sun/awt/awt_UNIXToolkit.c | 200 +- src/solaris/native/sun/awt/fontconfig.h | 941 -- src/solaris/native/sun/awt/fontpath.c | 422 +- src/solaris/native/sun/awt/gtk2_interface.c | 987 +- src/solaris/native/sun/awt/gtk2_interface.h | 588 +- src/solaris/native/sun/awt/gtk2_interface_check.c | 34 + src/solaris/native/sun/awt/gtk2_interface_check.h | 42 + src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c | 7 + src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c | 68 +- src/solaris/native/sun/awt/swing_GTKEngine.c | 76 +- src/solaris/native/sun/awt/swing_GTKStyle.c | 20 +- src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h | 2 +- src/solaris/native/sun/java2d/x11/XRBackendNative.c | 6 +- src/solaris/native/sun/net/spi/DefaultProxySelector.c | 493 +- src/solaris/native/sun/nio/ch/AixPollPort.c | 181 + src/solaris/native/sun/nio/ch/DatagramChannelImpl.c | 2 +- src/solaris/native/sun/nio/ch/EPollArrayWrapper.c | 1 - src/solaris/native/sun/nio/ch/FileDispatcherImpl.c | 54 +- src/solaris/native/sun/nio/ch/Net.c | 126 +- src/solaris/native/sun/nio/ch/PollArrayWrapper.c | 51 +- src/solaris/native/sun/nio/ch/Sctp.h | 25 +- src/solaris/native/sun/nio/ch/SctpNet.c | 6 +- src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c | 9 + src/solaris/native/sun/nio/fs/AixNativeDispatcher.c | 224 + src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c | 134 +- src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c | 50 +- src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c | 181 +- src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c | 113 + src/solaris/native/sun/security/pkcs11/j2secmod_md.c | 9 +- src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h | 5 + src/solaris/native/sun/security/smartcardio/pcsc_md.c | 7 +- src/solaris/native/sun/security/smartcardio/pcsc_md.h | 40 + src/solaris/native/sun/tools/attach/AixVirtualMachine.c | 283 + src/solaris/native/sun/tools/attach/BsdVirtualMachine.c | 4 + src/solaris/native/sun/xawt/awt_Desktop.c | 108 +- src/windows/classes/sun/nio/ch/FileDispatcherImpl.java | 3 +- src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java | 3 +- src/windows/classes/sun/security/mscapi/RSASignature.java | 13 +- src/windows/classes/sun/security/mscapi/SunMSCAPI.java | 20 +- src/windows/native/sun/security/pkcs11/j2secmod_md.c | 4 +- src/windows/native/sun/security/pkcs11/wrapper/p11_md.h | 4 + src/windows/native/sun/windows/awt_Component.cpp | 8 +- test/ProblemList.txt | 3 + test/com/oracle/security/ucrypto/TestAES.java | 118 +- test/com/oracle/security/ucrypto/TestDigest.java | 24 +- test/com/oracle/security/ucrypto/TestRSA.java | 276 +- test/com/oracle/security/ucrypto/UcryptoTest.java | 28 +- test/com/sun/corba/cachedSocket/7056731.sh | 2 +- test/com/sun/crypto/provider/Cipher/RSA/TestOAEP.java | 16 +- test/com/sun/crypto/provider/Cipher/RSA/TestOAEPParameterSpec.java | 3 +- test/com/sun/crypto/provider/Cipher/RSA/TestOAEPWithParams.java | 6 +- test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java | 13 +- test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java | 38 +- test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java | 111 +- test/com/sun/crypto/provider/KeyGenerator/Test4628062.java | 68 +- test/com/sun/crypto/provider/Mac/MacClone.java | 46 +- test/com/sun/crypto/provider/Mac/MacKAT.java | 29 +- test/com/sun/jdi/AllLineLocations.java | 1 - test/com/sun/jdi/ClassesByName.java | 1 - test/com/sun/jdi/ExceptionEvents.java | 1 - test/com/sun/jdi/FilterMatch.java | 1 - test/com/sun/jdi/FilterNoMatch.java | 1 - test/com/sun/jdi/GetUninitializedStringValue.java | 91 + test/com/sun/jdi/ImmutableResourceTest.sh | 2 +- test/com/sun/jdi/JITDebug.sh | 2 +- test/com/sun/jdi/LaunchCommandLine.java | 1 - test/com/sun/jdi/ModificationWatchpoints.java | 1 - test/com/sun/jdi/NativeInstanceFilter.java | 1 - test/com/sun/jdi/NullThreadGroupNameTest.java | 112 + test/com/sun/jdi/ShellScaffold.sh | 4 +- test/com/sun/jdi/Solaris32AndSolaris64Test.sh | 2 +- test/com/sun/jdi/UnpreparedByName.java | 1 - test/com/sun/jdi/UnpreparedClasses.java | 1 - test/com/sun/jdi/Vars.java | 1 - test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh | 2 +- test/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java | 104 + test/com/sun/jndi/ldap/LdapURLOptionalFields.java | 62 + test/com/sun/security/sasl/ntlm/NTLMTest.java | 78 +- test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java | 9 + test/java/awt/Focus/8073453/AWTFocusTransitionTest.java | 115 + test/java/awt/Focus/8073453/SwingFocusTransitionTest.java | 131 + test/java/awt/Multiscreen/MultiScreenInsetsTest/MultiScreenInsetsTest.java | 89 + test/java/awt/ScrollPane/bug8077409Test.java | 115 + test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh | 8 + test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh | 8 + test/java/io/Serializable/evolution/RenamePackage/run.sh | 2 +- test/java/io/Serializable/serialver/classpath/run.sh | 2 +- test/java/io/Serializable/serialver/nested/run.sh | 2 +- test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh | 3 + test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh | 3 + test/java/lang/StringCoding/CheckEncodings.sh | 2 +- test/java/lang/annotation/loaderLeak/LoaderLeak.sh | 2 +- test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh | 4 + test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh | 2 +- test/java/net/Authenticator/B4933582.sh | 2 +- test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh | 2 +- test/java/net/InetAddress/getOriginalHostName.java | 71 + test/java/net/Socket/OldSocketImpl.sh | 2 +- test/java/net/URL/B5086147.sh | 2 +- test/java/net/URL/TestHttps.java | 34 + test/java/net/URL/runconstructor.sh | 2 +- test/java/net/URLClassLoader/B5077773.sh | 2 +- test/java/net/URLClassLoader/sealing/checksealed.sh | 2 +- test/java/net/URLConnection/6212146/test.sh | 2 +- test/java/nio/MappedByteBuffer/Basic.java | 91 +- test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java | 2 +- test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so | Bin test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so | Bin test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so | Bin test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so | Bin test/java/nio/charset/coders/CheckSJISMappingProp.sh | 2 +- test/java/nio/charset/spi/basic.sh | 4 +- test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh | 2 +- test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java | 9 +- test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java | 9 +- test/java/rmi/registry/readTest/readTest.sh | 2 +- test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh | 4 + test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh | 4 + test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh | 4 + test/java/security/Security/signedfirst/Dyn.sh | 4 + test/java/security/Security/signedfirst/Static.sh | 4 + test/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java | 12 +- test/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java | 12 +- test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java | 12 +- test/java/security/cert/CertPathValidator/OCSP/AIACheck.java | 13 +- test/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java | 20 +- test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevel.java | 13 +- test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java | 13 +- test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevel.java | 13 +- test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevelRevoked.java | 13 +- test/java/util/Currency/CurrencyTest.java | 40 +- test/java/util/Currency/PropertiesTest.java | 12 +- test/java/util/Currency/PropertiesTest.sh | 26 +- test/java/util/Currency/ValidateISO4217.java | 3 +- test/java/util/Currency/currency.properties | 17 +- test/java/util/Currency/tablea1.txt | 5 +- test/java/util/Locale/LocaleCategory.sh | 2 +- test/java/util/Locale/data/deflocale.rhel5 | 3924 ---------- test/java/util/Locale/data/deflocale.rhel5.fmtasdefault | 3924 ---------- test/java/util/Locale/data/deflocale.sol10 | 1725 ---- test/java/util/Locale/data/deflocale.sol10.fmtasdefault | 1725 ---- test/java/util/Locale/data/deflocale.win7 | 1494 --- test/java/util/Locale/data/deflocale.win7.fmtasdefault | 1494 --- test/java/util/PluggableLocale/ExecTest.sh | 2 +- test/java/util/ResourceBundle/Bug6299235Test.sh | 2 +- test/java/util/ResourceBundle/Control/ExpirationTest.sh | 2 +- test/java/util/ServiceLoader/basic.sh | 2 +- test/java/util/prefs/CheckUserPrefsStorage.sh | 2 +- test/javax/crypto/SecretKeyFactory/FailOverTest.sh | 2 +- test/javax/imageio/stream/StreamCloserLeak/run_test.sh | 8 + test/javax/naming/ldap/LdapName/CompareToEqualsTests.java | 87 +- test/javax/script/CommonSetup.sh | 2 +- test/javax/security/auth/Subject/doAs/Test.sh | 5 + test/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java | 182 + test/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java | 52 + test/javax/swing/JRadioButton/8075609/bug8075609.java | 115 + test/javax/xml/jaxp/testng/parse/jdk7156085/UTF8ReaderBug.java | 64 + test/lib/security/java.policy/Ext_AllPolicy.sh | 2 +- test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh | 2 +- test/sun/management/jmxremote/bootstrap/linux-i586/launcher | Bin test/sun/management/jmxremote/bootstrap/solaris-i586/launcher | Bin test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher | Bin test/sun/management/windows/revokeall.exe | Bin test/sun/misc/URLClassPath/ClassnameCharTest.sh | 2 +- test/sun/net/InetAddress/nameservice/dns/cname.sh | 2 +- test/sun/net/idn/nfscis.spp | Bin test/sun/net/idn/nfscsi.spp | Bin test/sun/net/idn/nfscss.spp | Bin test/sun/net/idn/nfsmxp.spp | Bin test/sun/net/idn/nfsmxs.spp | Bin test/sun/net/www/MarkResetTest.sh | 2 +- test/sun/net/www/http/HttpClient/RetryPost.sh | 2 +- test/sun/net/www/protocol/file/DirPermissionDenied.sh | 1 + test/sun/net/www/protocol/jar/B5105410.sh | 2 +- test/sun/net/www/protocol/jar/jarbug/run.sh | 2 +- test/sun/security/krb5/ConfPlusProp.java | 33 +- test/sun/security/krb5/DnsFallback.java | 48 +- test/sun/security/krb5/config/DNS.java | 12 +- test/sun/security/krb5/confplusprop.conf | 2 +- test/sun/security/krb5/confplusprop2.conf | 2 +- test/sun/security/krb5/runNameEquals.sh | 4 + test/sun/security/mscapi/SignUsingNONEwithRSA.java | 8 +- test/sun/security/mscapi/SignUsingSHA2withRSA.java | 6 +- test/sun/security/pkcs11/KeyStore/SecretKeysBasic.java | 30 +- test/sun/security/pkcs11/MessageDigest/DigestKAT.java | 8 +- test/sun/security/pkcs11/MessageDigest/TestCloning.java | 141 + test/sun/security/pkcs11/PKCS11Test.java | 232 +- test/sun/security/pkcs11/Provider/ConfigQuotedString.sh | 6 + test/sun/security/pkcs11/Provider/Login.sh | 6 + test/sun/security/pkcs11/README | 22 + test/sun/security/pkcs11/SecmodTest.java | 1 + test/sun/security/pkcs11/Signature/TestRSAKeyLength.java | 4 +- test/sun/security/pkcs11/ec/ReadCertificates.java | 16 +- test/sun/security/pkcs11/ec/TestCurves.java | 34 +- test/sun/security/pkcs11/ec/TestECDH.java | 8 +- test/sun/security/pkcs11/ec/TestECDH2.java | 134 + test/sun/security/pkcs11/ec/TestECDSA.java | 24 +- test/sun/security/pkcs11/ec/TestECDSA2.java | 129 + test/sun/security/pkcs11/ec/TestECGenSpec.java | 19 +- test/sun/security/pkcs11/ec/TestKeyFactory.java | 14 +- test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.chk | Bin test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so | Bin test/sun/security/pkcs11/nss/lib/linux-amd64/libnspr4.so | Bin test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so | Bin test/sun/security/pkcs11/nss/lib/linux-amd64/libnssckbi.so | Bin test/sun/security/pkcs11/nss/lib/linux-amd64/libplc4.so | Bin test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so | Bin test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.chk | Bin test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so | Bin test/sun/security/pkcs11/nss/lib/linux-i586/libnspr4.so | Bin test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so | Bin test/sun/security/pkcs11/nss/lib/linux-i586/libnssckbi.so | Bin test/sun/security/pkcs11/nss/lib/linux-i586/libplc4.so | Bin test/sun/security/pkcs11/nss/lib/linux-i586/libplds4.so | Bin test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so | Bin test/sun/security/pkcs11/nss/lib/solaris-amd64/libnspr4.so | Bin test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so | Bin test/sun/security/pkcs11/nss/lib/solaris-amd64/libnssckbi.so | Bin test/sun/security/pkcs11/nss/lib/solaris-amd64/libplc4.so | Bin test/sun/security/pkcs11/nss/lib/solaris-amd64/libplds4.so | Bin test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so | Bin test/sun/security/pkcs11/nss/lib/solaris-i586/libfreebl3.so | Bin test/sun/security/pkcs11/nss/lib/solaris-i586/libnspr4.so | Bin test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so | Bin test/sun/security/pkcs11/nss/lib/solaris-i586/libnssckbi.so | Bin test/sun/security/pkcs11/nss/lib/solaris-i586/libplc4.so | Bin test/sun/security/pkcs11/nss/lib/solaris-i586/libplds4.so | Bin test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk | Bin test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparc/libnspr4.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparc/libnssckbi.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparc/libplc4.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparc/libplds4.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.chk | Bin test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnssckbi.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplc4.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplds4.so | Bin test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so | Bin test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll | Bin test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll | Bin test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll | Bin test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll | Bin test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll | Bin test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll | Bin test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java | 3 +- test/sun/security/pkcs11/rsa/TestSignatures.java | 3 +- test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java | 4 + test/sun/security/provider/DSA/TestAlgParameterGenerator.java | 117 + test/sun/security/provider/DSA/TestDSA2.java | 96 + test/sun/security/provider/DSA/TestKeyPairGenerator.java | 6 +- test/sun/security/provider/MessageDigest/DigestKAT.java | 10 +- test/sun/security/provider/MessageDigest/Offsets.java | 3 +- test/sun/security/provider/MessageDigest/TestSHAClone.java | 6 +- test/sun/security/provider/PolicyFile/getinstance/getinstance.sh | 4 + test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java | 449 + test/sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java | 349 + test/sun/security/rsa/TestKeyPairGenerator.java | 5 +- test/sun/security/rsa/TestSignatures.java | 5 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java | 493 + test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh | 2 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java | 17 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java | 16 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh | 2 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/PreferredKey.java | 15 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java | 17 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/PKIXExtendedTM.java | 9 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java | 9 +- test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java | 9 +- test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/CriticalSubjectAltName.java | 13 +- test/sun/security/ssl/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java | 8 +- test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java | 4 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java | 9 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java | 9 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java | 9 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Identities.java | 9 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh | 2 +- test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh | 2 +- test/sun/security/tools/jarsigner/AlgOptions.sh | 2 +- test/sun/security/tools/jarsigner/PercentSign.sh | 2 +- test/sun/security/tools/jarsigner/diffend.sh | 2 +- test/sun/security/tools/jarsigner/oldsig.sh | 2 +- test/sun/security/tools/keytool/AltProviderPath.sh | 2 +- test/sun/security/tools/keytool/CloneKeyAskPassword.sh | 4 + test/sun/security/tools/keytool/NoExtNPE.sh | 4 + test/sun/security/tools/keytool/SecretKeyKS.sh | 2 +- test/sun/security/tools/keytool/StandardAlgName.sh | 2 +- test/sun/security/tools/keytool/autotest.sh | 8 +- test/sun/security/tools/keytool/printssl.sh | 2 +- test/sun/security/tools/keytool/resource.sh | 2 +- test/sun/security/tools/keytool/standard.sh | 2 +- test/sun/security/tools/policytool/Alias.sh | 2 +- test/sun/security/tools/policytool/ChangeUI.sh | 2 +- test/sun/security/tools/policytool/OpenPolicy.sh | 2 +- test/sun/security/tools/policytool/SaveAs.sh | 2 +- test/sun/security/tools/policytool/UpdatePermissions.sh | 2 +- test/sun/security/tools/policytool/UsePolicy.sh | 2 +- test/sun/security/tools/policytool/i18n.sh | 2 +- test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh | 2 +- test/tools/launcher/RunpathTest.java | 84 + test/tools/pack200/MemoryAllocatorTest.java | 369 + 956 files changed, 55280 insertions(+), 49984 deletions(-) diffs (truncated from 130142 to 500 lines): diff -r ab44843d5891 -r dc86038147b2 .hgtags --- a/.hgtags Fri Nov 13 02:43:47 2015 +0000 +++ b/.hgtags Mon Jan 18 18:22:09 2016 +0000 @@ -50,6 +50,7 @@ f708138c9aca4b389872838fe6773872fce3609e jdk7-b73 eacb36e30327e7ae33baa068e82ddccbd91eaae2 jdk7-b74 8885b22565077236a927e824ef450742e434a230 jdk7-b75 +fb2ee5e96b171ae9db67274d87ffaba941e8bfa6 icedtea7-1.12 8fb602395be0f7d5af4e7e93b7df2d960faf9d17 jdk7-b76 e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77 1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78 @@ -63,6 +64,7 @@ eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86 2cafbbe9825e911a6ca6c17d9a18eb1f0bf0873c jdk7-b87 b3c69282f6d3c90ec21056cd1ab70dc0c895b069 jdk7-b88 +2017795af50aebc00f500e58f708980b49bc7cd1 icedtea7-1.13 4a6abb7e224cc8d9a583c23c5782e4668739a119 jdk7-b89 7f90d0b9dbb7ab4c60d0b0233e4e77fb4fac597c jdk7-b90 08a31cab971fcad4695e913d0f3be7bde3a90747 jdk7-b91 @@ -111,6 +113,7 @@ 554adcfb615e63e62af530b1c10fcf7813a75b26 jdk7-b134 d8ced728159fbb2caa8b6adb477fd8efdbbdf179 jdk7-b135 aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136 +1571aa7abe47a54510c62a5b59a8c343cdaf67cb icedtea-1.14 29296ea6529a418037ccce95903249665ef31c11 jdk7-b137 60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138 d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139 @@ -123,6 +126,7 @@ 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146 69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01 f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147 +7ec1845521edfb1843cad3868217983727ece53d icedtea-2.0-branchpoint 2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02 a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03 b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04 @@ -141,6 +145,7 @@ 79c8c4608f60e1f981b17ba4077dfcaa2ed67be4 jdk7u2-b12 fb2980d7c9439e3d62ab12f40506a2a2db2df0f4 jdk7u2-b13 24e42f1f9029f9f5a9b1481d523facaf09452e5b jdk7u2-b21 +a75913596199fbb8583f9d74021f54dc76f87b14 icedtea-2.1-branchpoint e3790f3ce50aa4e2a1b03089ac0bcd48f9d1d2c2 jdk7u3-b02 7e8351342f0b22b694bd3c2db979643529f32e71 jdk7u3-b03 fc6b7b6ac837c9e867b073e13fc14e643f771028 jdk7u3-b04 @@ -157,6 +162,7 @@ 6485e842d7f736b6ca3d7e4a7cdc5de6bbdd870c jdk7u4-b10 d568e85567ccfdd75f3f0c42aa0d75c440422827 jdk7u4-b11 16781e84dcdb5f82c287a3b5387dde9f8aaf74e0 jdk7u4-b12 +907555f6191a0cd84886b07c4c40bc6ce498b8b1 icedtea-2.2-branchpoint c929e96aa059c8b79ab94d5b0b1a242ca53a5b32 jdk7u4-b13 09f612bac047b132bb9bf7d4aa8afe6ea4d5b938 jdk7u4-b14 9e15d1f3fa4b35b8c950323c76b9ed094d434b97 jdk7u5-b01 @@ -186,11 +192,15 @@ a2bd61800667c38d759a0e02a756063d47dbcdc0 jdk7u6-b10 18a1b4f0681ae6e748fc60162dd76e357de3304b jdk7u6-b11 76306dce87104d9f333db3371ca97c80cac9674a jdk7u6-b12 +35172a51cc7639a44fe06ffbd5be471e48b71a88 ppc-aix-port-b01 +3097457689ba2d41b1d692191c5ba2f2b30aff9e ppc-aix-port-b02 +3097457689ba2d41b1d692191c5ba2f2b30aff9e ppc-aix-port-b03 aa49fe7490963f0c53741fbca3a175e0fec93951 jdk7u6-b13 3ce621d9b988abcccd86b52a97ea39133006c245 jdk7u6-b14 e50c9a5f001c61f49e7e71b25b97ed4095d3557b jdk7u6-b15 966e21feb7f088e318a35b069c1a61ff6363e554 jdk7u6-b16 aa0ad405f70bc7a7af95fef109f114ceecf31232 jdk7u6-b17 +8ff5fca08814f1f0eeda40aaec6f2936076b7444 icedtea-2.3-branchpoint 4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18 a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19 09145b546a2b6ae1f44d5c8a7d2a37d48e4b39e2 jdk7u6-b20 @@ -258,11 +268,13 @@ cb81ee79a72d84f99b8e7d73b5ae73124b661fe7 jdk7u12-b07 b5e180ef18a0c823675bcd32edfbf2f5122d9722 jdk7u12-b08 2e7fe0208e9c928f2f539fecb6dc8a1401ecba9e jdk7u12-b09 +b171007921c3d01066848c88cbcb6a376df3f01c icedtea-2.4-branchpoint e012aace90500a88f51ce83fcd27791f5dbf493f jdk7u14-b10 9eb82fb221f3b34a5df97e7db3c949fdb0b6fee0 jdk7u14-b11 ee3ab2ed2371dd72ad5a75ebb6b6b69071e29390 jdk7u14-b12 7c0d4bfd9d2c183ebf8566013af5111927b472f6 jdk7u14-b13 3982fc37bc256b07a710f25215e5525cfbefe2ed jdk7u14-b14 +739869c45976bb154908af5d145b7ed98c6a7d47 ppc-aix-port-b04 2eb3ac105b7fe7609a20c9986ecbccab71f1609f jdk7u14-b15 835448d525a10bb826f4f7ebe272fc410bdb0f5d jdk7u15-b01 0443fe2d8023111b52f4c8db32e038f4a5a9f373 jdk7u15-b02 @@ -365,6 +377,7 @@ c5ca4daec23b5e7f99ac8d684f5016ff8bfebbb0 jdk7u45-b18 4797f984f6c93c433aa797e9b2d8f904cf083f96 jdk7u45-b30 8c343a783777b8728cb819938f387db0acf7f3ac jdk7u45-b31 +db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00 402d54c7d8ce95f3945cc3d698e528e4adec7b9b jdk7u45-b33 34e8f9f26ae612ebac36357eecbe70ea20e0233c jdk7u45-b34 3dbb06a924cdf73d39b8543824ec88ae501ba5c6 jdk7u45-b35 @@ -414,8 +427,11 @@ db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00 def34c4a798678c424786a8f0d0508e90185958d jdk7u60-b01 ff67c89658525e8903fb870861ed3645befd6bc5 jdk7u60-b02 +7d5b758810c20af12c6576b7d570477712360744 icedtea-2.5pre01 +3162252ff26b4e6788b0c79405b035b535afa018 icedtea-2.5pre02 b1bcc999a8f1b4b4452b59c6636153bb0154cf5a jdk7u60-b03 efc8886310cbccb941f826acfad2ad51a2891be5 jdk7u60-b04 +9b6aff2241bf0d6fa9eab38a75a4eccdf9bb7335 icedtea-2.6pre01 4fb749a3110727d5334c69793578a3254a053bf5 jdk7u60-b05 46ca1ce7550f1463d60c3eacaf7b8cdc44b0c66e jdk7u60-b06 d5a2f60006e3c4243abeee0f623e5c3f79372fd8 jdk7u60-b07 @@ -425,7 +441,11 @@ c2bb87dae8a08eab6f4f336ce5a59865aa0214d6 jdk7u60-b11 1a90de8005e3de2475fd9355dcdb6f5e60bf89cc jdk7u60-b12 b06d4ed71ae0bc6e13f5a8437cb6388f17c66e84 jdk7u60-b13 +6f22501ca73cc21960cfe45a2684a0c902f46133 icedtea-2.6pre02 +068d2b78bd73fc2159a1c8a88dca3ca2841c4e16 icedtea-2.6pre03 b7fbd9b4febf8961091fdf451d3da477602a8f1d jdk7u60-b14 +b69f22ae0ef3ddc153d391ee30efd95e4417043c icedtea-2.6pre04 +605610f355ce3f9944fe33d9e5e66631843beb8d icedtea-2.6pre05 04882f9a073e8de153ec7ad32486569fd9a087ec jdk7u60-b15 41547583c3a035c3924ffedfa8704e58d69e5c50 jdk7u60-b16 e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b17 @@ -553,8 +573,20 @@ 09f3004e9b123b457da8f314aec027a5f4c3977f jdk7u76-b31 efc8886310cbccb941f826acfad2ad51a2891be5 jdk7u80-b00 bc7f9d966c1df3748ef9c148eab25976cd065963 jdk7u80-b01 +0cc91db3a787da44e3775bdde4c3c222d3cd529f icedtea-2.6pre07 +21eee0ed9be97d4e283cdf626971281481e711f1 icedtea-2.6pre06 +9702c7936ed8da9befdc27d30b2cbf51718d810a icedtea-2.6pre08 2590a9c18fdba19086712bb91a28352e9239a2be jdk7u80-b02 +1ceeb31e72caa1b458194f7ae776cf4ec29731e7 icedtea-2.6pre09 +33a33bbea1ae3a7feef5f3216e85c56b708444f4 icedtea-2.6pre10 +8a445d1b5af50e8628b8b1367f734d4e5741d12a icedtea-2.6pre11 3796111298d5b013e46d5ce49f17c16fc3197be8 jdk7u80-b03 +3620a98d0295f2b5ba4483483e61bfc386e734c1 icedtea-2.6pre12 +13bd267f397d41749dcd08576a80f368cf3aaad7 icedtea-2.6pre13 +ccdc37cdfaa891e3c14174378a8e7a5871e8893b icedtea-2.6pre14 +6dd583aadca80b71e8c004d9f4f3deb1d779ccfb icedtea-2.6pre15 +2e8f3cd07f149eab799f60db51ff3629f6ab0664 icedtea-2.6pre16 +3ce28e98738c7f9bb238378a991d4708598058a2 icedtea-2.6pre17 54acd5cd04856e80a3c7d5d38ef9c7a44d1e215a jdk7u80-b04 45f30f5524d4eef7aa512e35d5399cc4d84af174 jdk7u79-b00 2879572fbbb7be4d44e2bcd815711590cc6538e9 jdk7u79-b01 @@ -572,6 +604,11 @@ da34e5f77e9e922844e7eb8d1e165d25245a8b40 jdk7u79-b30 ea77b684d424c40f983d1aff2c9f4ef6a9c572b0 jdk7u79-b15 d4bd8bd71ca7233c806357bd39514dcaeebaa0ee jdk7u80-b05 +19a30444897fca52d823d63f6e2fbbfac74e8b34 icedtea-2.6pre18 +29fdd3e4a4321604f113df9573b9d4d215cf1b1d icedtea-2.6pre19 +95e2e973f2708306632792991502a86907a8e2ca icedtea-2.6pre20 +533e9029af3503d09a95b70abb4c21ca3fc9ac89 icedtea-2.6pre21 +d17bcae64927f33e6e7e0e6132c62a7bf523dbc3 icedtea-2.6pre22 f33e6ea5f4832468dd86a8d48ef50479ce91111e jdk7u80-b06 feb04280659bf05b567dc725ff53e2a2077bdbb7 jdk7u80-b07 f1334857fa99e6472870986b6071f9405c29ced4 jdk7u80-b08 @@ -584,9 +621,19 @@ 75fb0553cc146fb238df4e93dbe90791435e84f9 jdk7u80-b30 daa5092b07a75c17356bb438adba03f83f94ef17 jdk7u80-b15 a942e0b5247772ea326705c717c5cd0ad1572aaa jdk7u80-b32 -a4521bae269393be804805432429c3f996239c1a jdk7u85-b00 -47954a92adb039f893e4732017213d8488b22a58 jdk7u85-b01 +ec336c81a5455ef96a20cff4716603e7f6ca01ad icedtea-2.6pre23 +444d55ffed65907640aad374ce84e7a01ba8dbe7 icedtea-2.6pre24 +2db5e90a399beb96d82086d2d961894246d0bfe5 icedtea-2.6.0 +ec192fcd997198899cc376b0afad2c53893dedad jdk7u85-b00 +fc2855d592b09fe16d0d47a24d09466f776dcb54 jdk7u85-b01 +2db5e90a399beb96d82086d2d961894246d0bfe5 icedtea-2.6-branchpoint +61d3e001dee639fddfed46879c81bf3ac518e445 icedtea-2.6.1 66eea0d727761bfbee10784baa6941f118bc06d1 jdk7u85-b02 +23413abdf0665020964936ecbc0865d2c0546a4a icedtea-2.6.2pre01 +7eedb55d47ce97c2426794fc2170d4af3f2b90a9 icedtea-2.6.2pre02 295856e8680fa7248dac54bc15b3d6ef697b27ce jdk7u91-b00 9fc5d7338840ef6b73d28290735bab11395824b0 jdk7u91-b01 +db69ae53157a504fa15e5cab22f75203277f5c52 icedtea-2.6.2 c434c67b8189677dec0a0034a109fb261497cd92 jdk7u91-b02 +5215185a1d57f11960998cdd3935b29c2b97ee25 icedtea-2.6.3 +3a74fee9ba00da3bd3a22492e1b069430a82574d jdk7u95-b00 diff -r ab44843d5891 -r dc86038147b2 .jcheck/conf --- a/.jcheck/conf Fri Nov 13 02:43:47 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r ab44843d5891 -r dc86038147b2 make/com/oracle/security/ucrypto/mapfile-vers --- a/make/com/oracle/security/ucrypto/mapfile-vers Fri Nov 13 02:43:47 2015 +0000 +++ b/make/com/oracle/security/ucrypto/mapfile-vers Mon Jan 18 18:22:09 2016 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 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 @@ -39,6 +39,7 @@ Java_com_oracle_security_ucrypto_NativeCipher_nativeUpdate; Java_com_oracle_security_ucrypto_NativeCipher_nativeFinal; Java_com_oracle_security_ucrypto_NativeKey_nativeFree; + Java_com_oracle_security_ucrypto_NativeKey_00024RSAPrivate_nativeInit; Java_com_oracle_security_ucrypto_NativeKey_00024RSAPrivateCrt_nativeInit; Java_com_oracle_security_ucrypto_NativeKey_00024RSAPublic_nativeInit; Java_com_oracle_security_ucrypto_NativeRSASignature_nativeInit; @@ -56,6 +57,7 @@ JavaCritical_com_oracle_security_ucrypto_NativeCipher_nativeUpdate; JavaCritical_com_oracle_security_ucrypto_NativeCipher_nativeFinal; JavaCritical_com_oracle_security_ucrypto_NativeKey_nativeFree; + JavaCritical_com_oracle_security_ucrypto_NativeKey_00024RSAPrivate_nativeInit; JavaCritical_com_oracle_security_ucrypto_NativeKey_00024RSAPrivateCrt_nativeInit; JavaCritical_com_oracle_security_ucrypto_NativeKey_00024RSAPublic_nativeInit; JavaCritical_com_oracle_security_ucrypto_NativeRSASignature_nativeInit; diff -r ab44843d5891 -r dc86038147b2 make/com/sun/java/pack/Makefile --- a/make/com/sun/java/pack/Makefile Fri Nov 13 02:43:47 2015 +0000 +++ b/make/com/sun/java/pack/Makefile Mon Jan 18 18:22:09 2016 +0000 @@ -75,7 +75,7 @@ OTHER_CXXFLAGS += $(ZINCLUDE) LDDFLAGS += $(ZIPOBJS) else - LDDFLAGS += $(ZLIB_LIBS) + OTHER_LDLIBS += $(ZLIB_LIBS) OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB endif else @@ -99,8 +99,7 @@ RES = $(OBJDIR)/$(PGRM).res else LDOUTPUT = -o #Have a space - LDDFLAGS += -lc - OTHER_LDLIBS += $(LIBCXX) + OTHER_LDLIBS += -lc $(LIBCXX) # setup the list of libraries to link in... ifeq ($(PLATFORM), linux) ifeq ("$(CC_VER_MAJOR)", "3") @@ -157,7 +156,7 @@ $(prep-target) $(RM) $(TEMPDIR)/mapfile-vers $(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers - $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) + $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) ifdef MT $(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1 endif diff -r ab44843d5891 -r dc86038147b2 make/com/sun/java/pack/mapfile-vers --- a/make/com/sun/java/pack/mapfile-vers Fri Nov 13 02:43:47 2015 +0000 +++ b/make/com/sun/java/pack/mapfile-vers Mon Jan 18 18:22:09 2016 +0000 @@ -26,7 +26,12 @@ # Define library interface. -SUNWprivate_1.1 { +# On older SuSE releases the linker will complain about: +# Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable +# So we better completely omit the version for now. +# + +{ global: Java_com_sun_java_util_jar_pack_NativeUnpack_finish; Java_com_sun_java_util_jar_pack_NativeUnpack_getNextFile; diff -r ab44843d5891 -r dc86038147b2 make/com/sun/java/pack/mapfile-vers-unpack200 --- a/make/com/sun/java/pack/mapfile-vers-unpack200 Fri Nov 13 02:43:47 2015 +0000 +++ b/make/com/sun/java/pack/mapfile-vers-unpack200 Mon Jan 18 18:22:09 2016 +0000 @@ -25,7 +25,12 @@ # Define library interface. -SUNWprivate_1.1 { +# On older SuSE releases the linker will complain about: +# Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable +# So we better completely omit the version for now. +# + +{ local: *; }; diff -r ab44843d5891 -r dc86038147b2 make/com/sun/nio/Makefile --- a/make/com/sun/nio/Makefile Fri Nov 13 02:43:47 2015 +0000 +++ b/make/com/sun/nio/Makefile Mon Jan 18 18:22:09 2016 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, 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 @@ -29,8 +29,13 @@ BUILDDIR = ../../.. include $(BUILDDIR)/common/Defs.gmk + +# MMM: disable for now +ifeq (, $(findstring $(PLATFORM), macosx aix)) include $(BUILDDIR)/common/Subdirs.gmk SUBDIRS = sctp +endif + all build clean clobber:: $(SUBDIRS-loop) diff -r ab44843d5891 -r dc86038147b2 make/com/sun/nio/sctp/Makefile --- a/make/com/sun/nio/sctp/Makefile Fri Nov 13 02:43:47 2015 +0000 +++ b/make/com/sun/nio/sctp/Makefile Mon Jan 18 18:22:09 2016 +0000 @@ -29,7 +29,7 @@ BUILDDIR = ../../../.. PACKAGE = com.sun.nio.sctp -LIBRARY = sctp +LIBRARY = javasctp PRODUCT = sun #OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint include $(BUILDDIR)/common/Defs.gmk @@ -67,10 +67,16 @@ -I$(PLATFORM_SRC)/native/java/net \ -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders +ifeq ($(SYSTEM_SCTP), true) + OTHER_INCLUDES += $(SCTP_CFLAGS) +endif + ifeq ($(PLATFORM), linux) +ifneq ($(COMPILER_WARNINGS_FATAL),false) COMPILER_WARNINGS_FATAL=true +endif #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl -OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl +OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread endif ifeq ($(PLATFORM), solaris) #LIBSCTP = -lsctp @@ -79,6 +85,13 @@ endif # macosx endif # windows +ifeq ($(SYSTEM_SCTP), true) + OTHER_LDLIBS += $(SCTP_LIBS) + OTHER_CFLAGS += -DUSE_SYSTEM_SCTP +else + OTHER_LDLIBS += -ldl +endif + clean clobber:: $(RM) -r $(CLASSDESTDIR)/com/sun/nio/sctp $(RM) -r $(CLASSDESTDIR)/sun/nio/ch diff -r ab44843d5891 -r dc86038147b2 make/com/sun/security/auth/module/Makefile --- a/make/com/sun/security/auth/module/Makefile Fri Nov 13 02:43:47 2015 +0000 +++ b/make/com/sun/security/auth/module/Makefile Mon Jan 18 18:22:09 2016 +0000 @@ -67,7 +67,7 @@ include FILES_c_solaris.gmk endif # solaris -ifneq (,$(findstring $(PLATFORM), linux macosx)) +ifneq (,$(findstring $(PLATFORM), linux macosx aix)) LIBRARY = jaas_unix include FILES_export_unix.gmk include FILES_c_unix.gmk @@ -78,7 +78,3 @@ # include $(BUILDDIR)/common/Library.gmk -# -# JVMDI implementation lives in the VM. -# -OTHER_LDLIBS = $(JVMLIB) diff -r ab44843d5891 -r dc86038147b2 make/com/sun/tools/attach/Exportedfiles.gmk --- a/make/com/sun/tools/attach/Exportedfiles.gmk Fri Nov 13 02:43:47 2015 +0000 +++ b/make/com/sun/tools/attach/Exportedfiles.gmk Mon Jan 18 18:22:09 2016 +0000 @@ -47,3 +47,8 @@ FILES_export = \ sun/tools/attach/BsdVirtualMachine.java endif + +ifeq ($(PLATFORM), aix) +FILES_export = \ + sun/tools/attach/AixVirtualMachine.java +endif diff -r ab44843d5891 -r dc86038147b2 make/com/sun/tools/attach/FILES_c.gmk --- a/make/com/sun/tools/attach/FILES_c.gmk Fri Nov 13 02:43:47 2015 +0000 +++ b/make/com/sun/tools/attach/FILES_c.gmk Mon Jan 18 18:22:09 2016 +0000 @@ -43,3 +43,8 @@ FILES_c = \ BsdVirtualMachine.c endif + +ifeq ($(PLATFORM), aix) +FILES_c = \ + AixVirtualMachine.c +endif diff -r ab44843d5891 -r dc86038147b2 make/com/sun/tools/attach/FILES_java.gmk --- a/make/com/sun/tools/attach/FILES_java.gmk Fri Nov 13 02:43:47 2015 +0000 +++ b/make/com/sun/tools/attach/FILES_java.gmk Mon Jan 18 18:22:09 2016 +0000 @@ -32,7 +32,7 @@ com/sun/tools/attach/spi/AttachProvider.java \ sun/tools/attach/HotSpotAttachProvider.java \ sun/tools/attach/HotSpotVirtualMachine.java - + ifeq ($(PLATFORM), solaris) FILES_java += \ sun/tools/attach/SolarisAttachProvider.java @@ -48,11 +48,16 @@ sun/tools/attach/BsdAttachProvider.java endif +ifeq ($(PLATFORM), aix) +FILES_java += \ + sun/tools/attach/AixAttachProvider.java +endif + # # Files that need to be copied # SERVICEDIR = $(CLASSBINDIR)/META-INF/services - + FILES_copy = \ $(SERVICEDIR)/com.sun.tools.attach.spi.AttachProvider diff -r ab44843d5891 -r dc86038147b2 make/common/Defs-aix.gmk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/common/Defs-aix.gmk Mon Jan 18 18:22:09 2016 +0000 @@ -0,0 +1,391 @@ +# +# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. 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. +# + +# +# Makefile to specify compiler flags for programs and libraries +# targeted to AIX. Should not contain any rules. +# +# WARNING: This file is shared with other workspaces. +# So when it includes other files, it must use JDK_TOPDIR. +# + +# Warning: the following variables are overridden by Defs.gmk. Set +# values will be silently ignored: +# CFLAGS (set $(OTHER_CFLAGS) instead) +# CPPFLAGS (set $(OTHER_CPPFLAGS) instead) +# CXXFLAGS (set $(OTHER_CXXFLAGS) instead) +# LDFLAGS (set $(OTHER_LDFAGS) instead) +# LDLIBS (set $(EXTRA_LIBS) instead) +# LDLIBS_COMMON (set $(EXTRA_LIBS) instead) +# LINTFLAGS (set $(OTHER_LINTFLAGS) instead) +# +# Note: CPPFLAGS are used in C and C++ compiles. +# + +# Get shared JDK settings +include $(JDK_MAKE_SHARED_DIR)/Defs.gmk + +# define these to avoid picking up ones from aliases or from +# non-standard locations +# + +AR = $(USRBIN_PATH)ar +BASENAME = $(UNIXCOMMAND_PATH)basename +CAT = $(UNIXCOMMAND_PATH)cat +CD = cd # intrinsic unix command +CHMOD = $(UNIXCOMMAND_PATH)chmod +CMP = $(USRBIN_PATH)cmp +COMPRESS = $(USRBIN_PATH)compress +CP = $(UNIXCOMMAND_PATH)cp +CPIO = $(UNIXCOMMAND_PATH)cpio +CUT = $(USRBIN_PATH)cut +DATE = $(UNIXCOMMAND_PATH)date +DF = $(UNIXCOMMAND_PATH)df +DIFF = $(USRBIN_PATH)diff +DIRNAME = $(USRBIN_PATH)dirname +ECHO = echo # intrinsic unix command, with backslash-escaped character interpretation +EGREP = $(UNIXCOMMAND_PATH)egrep +EXPR = $(USRBIN_PATH)expr + +FIND = $(UNIXCOMMAND_PATH)find + +HEAD = $(USRBIN_PATH)head +GREP = $(UNIXCOMMAND_PATH)grep +GUNZIP = $(UNIXCOMMAND_PATH)gunzip +LEX = $(USRBIN_PATH)lex +LN = $(UNIXCOMMAND_PATH)ln +LS = $(UNIXCOMMAND_PATH)ls +M4 = $(USRBIN_PATH)m4 +MKDIR = $(UNIXCOMMAND_PATH)mkdir +MV = $(UNIXCOMMAND_PATH)mv +NAWK = $(USRBIN_PATH)awk +PWD = $(UNIXCOMMAND_PATH)pwd +#RM is defined by GNU Make as 'rm -f' +RMDIR = $(UNIXCOMMAND_PATH)rmdir +RPM = $(UNIXCOMMAND_PATH)rpm +SED = $(UNIXCOMMAND_PATH)sed +SH = $(UNIXCOMMAND_PATH)sh From andrew at icedtea.classpath.org Wed Jan 20 03:36:47 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 20 Jan 2016 03:36:47 +0000 Subject: /hg/icedtea6: Add new backports for issues to be fixed in 1.13.10. Message-ID: changeset eab534910a1a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=eab534910a1a author: Andrew John Hughes date: Wed Jan 20 03:36:30 2016 +0000 Add new backports for issues to be fixed in 1.13.10. S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux 2016-01-19 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch, * patches/openjdk/8140620-pr2711-find_default.sf2.patch: New backports for issues to be fixed in 1.13.10. diffstat: ChangeLog | 9 + Makefile.am | 4 +- NEWS | 2 + patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch | 54 ++++++++++ patches/openjdk/8140620-pr2711-find_default.sf2.patch | 53 +++++++++ 5 files changed, 121 insertions(+), 1 deletions(-) diffs (159 lines): diff -r efe390605797 -r eab534910a1a ChangeLog --- a/ChangeLog Wed Nov 18 03:16:15 2015 +0000 +++ b/ChangeLog Wed Jan 20 03:36:30 2016 +0000 @@ -1,3 +1,12 @@ +2016-01-19 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated. + * patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch, + * patches/openjdk/8140620-pr2711-find_default.sf2.patch: + New backports for issues to be fixed in 1.13.10. + 2015-11-17 Andrew John Hughes * NEWS: Add 1.13.9 release notes. diff -r efe390605797 -r eab534910a1a Makefile.am --- a/Makefile.am Wed Nov 18 03:16:15 2015 +0000 +++ b/Makefile.am Wed Jan 20 03:36:30 2016 +0000 @@ -647,7 +647,9 @@ patches/openjdk/6763122-no_zipfile_ctor_exception.patch \ patches/openjdk/6599383-pr363-large_zip_files.patch \ patches/openjdk/6929479-pr363-disable_mmap_zip.patch \ - patches/pr2513-layoutengine_reset.patch + patches/pr2513-layoutengine_reset.patch \ + patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch \ + patches/openjdk/8140620-pr2711-find_default.sf2.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r efe390605797 -r eab534910a1a NEWS --- a/NEWS Wed Nov 18 03:16:15 2015 +0000 +++ b/NEWS Wed Jan 20 03:36:30 2016 +0000 @@ -20,8 +20,10 @@ - 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 + - S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F - 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 + - S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux * Bug fixes - PR1886: IcedTea does not checksum supplied tarballs - PR2083: Add support for building Zero on AArch64 diff -r efe390605797 -r eab534910a1a patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch Wed Jan 20 03:36:30 2016 +0000 @@ -0,0 +1,54 @@ +# HG changeset patch +# User rupashka +# Date 1342090033 -14400 +# Thu Jul 12 14:47:13 2012 +0400 +# Node ID 05c69338ee73c1e454aa632ced5cbc057420b404 +# Parent 0039f5c7fb512e1ec2e22bceb69ee324426a684f +7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F +Reviewed-by: kizune + +diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java +--- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Wed Jul 11 16:19:41 2012 -0700 ++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Thu Jul 12 14:47:13 2012 +0400 +@@ -796,9 +796,10 @@ + "Menu.margin", zeroInsets, + "Menu.cancelMode", "hideMenuTree", + "Menu.alignAcceleratorText", Boolean.FALSE, ++ "Menu.useMenuBarForTopLevelMenus", Boolean.TRUE, + + +- "MenuBar.windowBindings", new Object[] { ++ "MenuBar.windowBindings", new Object[] { + "F10", "takeFocus" }, + "MenuBar.font", new FontLazyValue(Region.MENU_BAR), + +diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java +--- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java Wed Jul 11 16:19:41 2012 -0700 ++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java Thu Jul 12 14:47:13 2012 +0400 +@@ -92,7 +92,13 @@ + boolean defaultCapable = btn.isDefaultCapable(); + key = new ComplexKey(wt, toolButton, defaultCapable); + } ++ } else if (id == Region.MENU) { ++ if (c instanceof JMenu && ((JMenu) c).isTopLevelMenu() && ++ UIManager.getBoolean("Menu.useMenuBarForTopLevelMenus")) { ++ wt = WidgetType.MENU_BAR; ++ } + } ++ + if (key == null) { + // Otherwise, just use the WidgetType as the key. + key = wt; +diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java +--- openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Wed Jul 11 16:19:41 2012 -0700 ++++ openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Thu Jul 12 14:47:13 2012 +0400 +@@ -299,7 +299,8 @@ + */ + @Override + public void propertyChange(PropertyChangeEvent e) { +- if (SynthLookAndFeel.shouldUpdateStyle(e)) { ++ if (SynthLookAndFeel.shouldUpdateStyle(e) || ++ (e.getPropertyName().equals("ancestor") && UIManager.getBoolean("Menu.useMenuBarForTopLevelMenus"))) { + updateStyle((JMenu)e.getSource()); + } + } diff -r efe390605797 -r eab534910a1a patches/openjdk/8140620-pr2711-find_default.sf2.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8140620-pr2711-find_default.sf2.patch Wed Jan 20 03:36:30 2016 +0000 @@ -0,0 +1,53 @@ +# HG changeset patch +# User omajid +# Date 1445973555 14400 +# Tue Oct 27 15:19:15 2015 -0400 +# Node ID 79e4644bd40482ec3ae557f086137e2869b3f50a +# Parent 09c2cc84d4517af288f26607a39ff0515a05e771 +8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux +Reviewed-by: serb + +diff -r 09c2cc84d451 -r 79e4644bd404 src/share/classes/com/sun/media/sound/SoftSynthesizer.java +--- openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Fri Nov 13 05:11:53 2015 +0000 ++++ openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Tue Oct 27 15:19:15 2015 -0400 +@@ -668,6 +668,40 @@ + actions.add(new PrivilegedAction() { + public InputStream run() { + if (System.getProperties().getProperty("os.name") ++ .startsWith("Linux")) { ++ ++ File[] systemSoundFontsDir = new File[] { ++ /* Arch, Fedora, Mageia */ ++ new File("/usr/share/soundfonts/"), ++ new File("/usr/local/share/soundfonts/"), ++ /* Debian, Gentoo, OpenSUSE, Ubuntu */ ++ new File("/usr/share/sounds/sf2/"), ++ new File("/usr/local/share/sounds/sf2/"), ++ }; ++ ++ /* ++ * Look for a default.sf2 ++ */ ++ for (File systemSoundFontDir : systemSoundFontsDir) { ++ if (systemSoundFontDir.exists()) { ++ File defaultSoundFont = new File(systemSoundFontDir, "default.sf2"); ++ if (defaultSoundFont.exists()) { ++ try { ++ return new FileInputStream(defaultSoundFont); ++ } catch (IOException e) { ++ // continue with lookup ++ } ++ } ++ } ++ } ++ } ++ return null; ++ } ++ }); ++ ++ actions.add(new PrivilegedAction() { ++ public InputStream run() { ++ if (System.getProperties().getProperty("os.name") + .startsWith("Windows")) { + File gm_dls = new File(System.getenv("SystemRoot") + + "\\system32\\drivers\\gm.dls"); From bugzilla-daemon at icedtea.classpath.org Wed Jan 20 03:37:27 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 20 Jan 2016 03:37:27 +0000 Subject: [Bug 2757] Unreadable menu bar with Ambiance theme in GTK L&F In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2757 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=eab534910a1a author: Andrew John Hughes date: Wed Jan 20 03:36:30 2016 +0000 Add new backports for issues to be fixed in 1.13.10. S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux 2016-01-19 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch, * patches/openjdk/8140620-pr2711-find_default.sf2.patch: New backports for issues to be fixed in 1.13.10. -- 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 20 03:37:34 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 20 Jan 2016 03:37:34 +0000 Subject: [Bug 2711] [IcedTea6] Backport "8140620: Find and load default.sf2 as the default soundbank on Linux" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2711 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=eab534910a1a author: Andrew John Hughes date: Wed Jan 20 03:36:30 2016 +0000 Add new backports for issues to be fixed in 1.13.10. S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux 2016-01-19 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch, * patches/openjdk/8140620-pr2711-find_default.sf2.patch: New backports for issues to be fixed in 1.13.10. -- 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 20 04:25:13 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 20 Jan 2016 04:25:13 +0000 Subject: /hg/release/icedtea7-2.6: Bump to icedtea-2.6.4. Message-ID: changeset c9ed028a5bd9 in /hg/release/icedtea7-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=c9ed028a5bd9 author: Andrew John Hughes date: Wed Jan 20 03:22:24 2016 +0000 Bump to icedtea-2.6.4. Upstream changes: - Bump to icedtea-2.6.4 - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified - S8059054: Better URL processing - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException - S8074068: Cleanup in src/share/classes/sun/security/x509/ - S8075773: jps running as root fails after the fix of JDK-8050807 - S8081297: SSL Problem with Tomcat - S8130710: Better attributes processing - S8131181: Increment minor version of HSx for 7u95 and initialize the build number - S8132082: Let OracleUcrypto accept RSAPrivateKey - S8132210: Reinforce JMX collector internals - S8132988: Better printing dialogues - S8133962: More general limits - S8134605: Partial rework of the fix for 8081297 - S8134861: XSLT: Extension func call cause exception if namespace URI contains partial package name - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing - S8137060: JMX memory management improvements - S8138716: (tz) Support tzdata2015g - S8139012: Better font substitutions - S8139017: More stable image decoding - S8140244: Port fix of JDK-8075773 to AIX - S8140244: Port fix of JDK-8075773 to MacOSX - S8140543: Arrange font actions - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2 - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure - S8143132: L10n resource file translation update - S8143185: Cleanup for handling proxies - S8143941: Update splashscreen displays - S8144773: Further reduce use of MD5 - S8144955: Wrong changes were pushed with 8143942 - S8145551: Test failed with Crash for Improved font lookups - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp 2016-01-19 Andrew John Hughes * Makefile.am, (JDK_UPDATE_VERSION): Bump to 95. (BUILD_VERSION): Reset to b00. (CORBA_CHANGESET): Update to icedtea-2.6.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: Update and set release date. * configure.ac: Bump to 2.6.4. * hotspot.map.in: Update to icedtea-2.6.4. * patches/boot/ecj-diamond.patch: Regenerated. Add new case in sun.reflect.annotation.AnnotationInvocationHandler. * patches/boot/ecj-multicatch.patch: Add new case in sun.security.ssl.RSAClientKeyExchange diffstat: ChangeLog | 26 + Makefile.am | 30 +- NEWS | 38 +- configure.ac | 2 +- hotspot.map.in | 2 +- patches/boot/ecj-diamond.patch | 1394 ++++++++++++++++++------------------ patches/boot/ecj-multicatch.patch | 25 + 7 files changed, 808 insertions(+), 709 deletions(-) diffs (truncated from 3993 to 500 lines): diff -r 26b02b8d7955 -r c9ed028a5bd9 ChangeLog --- a/ChangeLog Wed Nov 18 03:09:40 2015 +0000 +++ b/ChangeLog Wed Jan 20 03:22:24 2016 +0000 @@ -1,3 +1,29 @@ +2016-01-19 Andrew John Hughes + + * Makefile.am, + (JDK_UPDATE_VERSION): Bump to 95. + (BUILD_VERSION): Reset to b00. + (CORBA_CHANGESET): Update to icedtea-2.6.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: Update and set release date. + * configure.ac: Bump to 2.6.4. + * hotspot.map.in: Update to icedtea-2.6.4. + * patches/boot/ecj-diamond.patch: + Regenerated. Add new case in + sun.reflect.annotation.AnnotationInvocationHandler. + * patches/boot/ecj-multicatch.patch: + Add new case in sun.security.ssl.RSAClientKeyExchange + 2015-11-17 Andrew John Hughes * NEWS: Add 2.6.4 section. diff -r 26b02b8d7955 -r c9ed028a5bd9 Makefile.am --- a/Makefile.am Wed Nov 18 03:09:40 2015 +0000 +++ b/Makefile.am Wed Jan 20 03:22:24 2016 +0000 @@ -1,22 +1,22 @@ # Dependencies -JDK_UPDATE_VERSION = 91 -BUILD_VERSION = b02 +JDK_UPDATE_VERSION = 95 +BUILD_VERSION = b00 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = 9a3ca529125a -JAXP_CHANGESET = f7bf82fcbd09 -JAXWS_CHANGESET = 39ef53b9c403 -JDK_CHANGESET = 5215185a1d57 -LANGTOOLS_CHANGESET = 91fdb0c83e50 -OPENJDK_CHANGESET = f0e7f22f09ef - -CORBA_SHA256SUM = 1052ae3c70908aa3374818ada320685cb7abdc7bd7bbd3cfb4f26fbbe7435ec6 -JAXP_SHA256SUM = a0e978bc07371901560a746cae492edf0bcb22ddbb9e47b77319ffda1351806b -JAXWS_SHA256SUM = 55897d92e368ac7df3e04d4f235e9dba12ea8264e20d4bd6b68e8c13e5addc1e -JDK_SHA256SUM = 583898549b52e958521474db34f2ce535b6a0926c7df1fa99a3f0321b3a109f5 -LANGTOOLS_SHA256SUM = f14716df84e047b19884ac5b0830e87b6cdf1925d0951195255c9124e89df27e -OPENJDK_SHA256SUM = 9e5d26bb1888a8a1378e078953aa04314d4fb4f263ebbaf7f459110c21f8d46d +CORBA_CHANGESET = 2135da66cc53 +JAXP_CHANGESET = bc6edb6c12a7 +JAXWS_CHANGESET = 271b555de438 +JDK_CHANGESET = dc86038147b2 +LANGTOOLS_CHANGESET = fd0a34cb97b4 +OPENJDK_CHANGESET = 4f1e498cad9c + +CORBA_SHA256SUM = 26bbfae0504fb7e83fd5eaba08d9e44e0c07a609cdf7c04fb6832a097b56bc08 +JAXP_SHA256SUM = 097cb0423271b6439b36db190a66bab9d447dd03ee22e42a6089a3b3b8363f62 +JAXWS_SHA256SUM = da7604aaaedaab93ba9ad21ee5ee8f18c807606a97d60037ae8c3647e823dfa1 +JDK_SHA256SUM = 9d3199c0f9c39238c6920c941026cf8661a92e97845f75d74e9ff277532b5d63 +LANGTOOLS_SHA256SUM = f9b0ce14c73c263276d3dfe78601714869cd2c0463bd01c637c8556d52a7d7cc +OPENJDK_SHA256SUM = bb02e71972ad606e739c79fc11c6dc61b4840a526a41049a600a206cc37152e2 DROP_URL = http://icedtea.classpath.org/download/drops diff -r 26b02b8d7955 -r c9ed028a5bd9 NEWS --- a/NEWS Wed Nov 18 03:09:40 2015 +0000 +++ b/NEWS Wed Jan 20 03:22:24 2016 +0000 @@ -12,7 +12,43 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 2.6.4 (2016-01-XX): +New in release 2.6.4 (2016-01-19): + +* Security fixes + - S8059054, CVE-2016-0402: Better URL processing + - S8130710, CVE-2016-0448: Better attributes processing + - S8132210: Reinforce JMX collector internals + - S8132988: Better printing dialogues + - S8133962, CVE-2016-0466: More general limits + - S8137060: JMX memory management improvements + - S8139012: Better font substitutions + - S8139017, CVE-2016-0483: More stable image decoding + - S8140543, CVE-2016-0494: Arrange font actions + - S8143185: Cleanup for handling proxies + - S8143941, CVE-2015-8126, CVE-2015-8472: Update splashscreen displays + - S8144773, CVE-2015-7575: Further reduce use of MD5 (SLOTH) +* Import of OpenJDK 7 u95 build 0 + - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified + - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException + - S8074068: Cleanup in src/share/classes/sun/security/x509/ + - S8075773: jps running as root fails after the fix of JDK-8050807 + - S8081297: SSL Problem with Tomcat + - S8131181: Increment minor version of HSx for 7u95 and initialize the build number + - S8132082: Let OracleUcrypto accept RSAPrivateKey + - S8134605: Partial rework of the fix for 8081297 + - S8134861: XSLT: Extension func call cause exception if namespace URI contains partial package name + - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing + - S8138716: (tz) Support tzdata2015g + - S8140244: Port fix of JDK-8075773 to MacOSX + - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS + - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2 + - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure + - S8143132: L10n resource file translation update + - S8144955: Wrong changes were pushed with 8143942 + - S8145551: Test failed with Crash for Improved font lookups + - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp +* Backports + - S8140244: Port fix of JDK-8075773 to AIX New in release 2.6.3 (2015-11-13): diff -r 26b02b8d7955 -r c9ed028a5bd9 configure.ac --- a/configure.ac Wed Nov 18 03:09:40 2015 +0000 +++ b/configure.ac Wed Jan 20 03:22:24 2016 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.6.4pre00], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.6.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 26b02b8d7955 -r c9ed028a5bd9 hotspot.map.in --- a/hotspot.map.in Wed Nov 18 03:09:40 2015 +0000 +++ b/hotspot.map.in Wed Jan 20 03:22:24 2016 +0000 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ c3cde6774003 dd8f3771439b4d51fa84e3f9b384b80e6656cf1a19ee3492b4f2fe09b37eef0e +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 19d919ae5506 3747417c3ba69d1ff7d80dc6df19454c4f4023c35f8b711e47baefe2fc772e65 diff -r 26b02b8d7955 -r c9ed028a5bd9 patches/boot/ecj-diamond.patch --- a/patches/boot/ecj-diamond.patch Wed Nov 18 03:09:40 2015 +0000 +++ b/patches/boot/ecj-diamond.patch Wed Jan 20 03:22:24 2016 +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 2015-10-21 03:15:30.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-10-21 17:49:55.140534918 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-01-18 15:52:10.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-01-20 01:43:32.528245741 +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 2015-10-21 03:15:30.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2015-10-21 17:49:55.140534918 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-01-18 15:52:10.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-01-20 01:43:32.528245741 +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 2015-10-21 03:15:30.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-10-21 17:49:55.140534918 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-01-18 15:52:10.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-01-20 01:43:32.528245741 +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 2015-10-21 03:15:30.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-10-21 17:49:55.140534918 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-01-18 15:52:10.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-01-20 01:43:32.528245741 +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/xalan/internal/lib/ExsltSets.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2015-10-21 19:15:33.302018256 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-01-20 01:43:32.528245741 +0000 @@ -192,7 +192,7 @@ NodeSet dist = new NodeSet(); dist.setShouldCacheNodes(true); @@ -68,8 +68,8 @@ for (int i = 0; i < nl.getLength(); i++) { diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2015-10-21 18:37:37.644294241 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-01-20 01:43:32.528245741 +0000 @@ -220,7 +220,7 @@ public Map getEnvironmentHash() { @@ -188,8 +188,8 @@ jarVersions.put(new Long(440237), "xalan.jar from xalan-j_1_2"); jarVersions.put(new Long(436094), "xalan.jar from xalan-j_1_2_1"); diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2015-10-21 18:29:16.188748183 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-01-20 01:43:32.528245741 +0000 @@ -51,7 +51,7 @@ /** * Legal conversions between internal types. @@ -200,8 +200,8 @@ static { // Possible type conversions between internal types diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2015-10-21 18:29:40.548337191 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-01-20 01:43:32.528245741 +0000 @@ -139,7 +139,7 @@ private boolean _isStatic = false; @@ -225,8 +225,8 @@ // Possible conversions between Java and internal types java2Internal.put(Boolean.TYPE, Type.Boolean); diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2015-10-21 18:30:45.839235776 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-01-20 01:43:32.528245741 +0000 @@ -106,7 +106,7 @@ // Check if we have any declared namesaces @@ -273,8 +273,8 @@ SyntaxTreeNode n = _attributeElements.get(k); if (n instanceof LiteralAttribute) { diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2015-10-21 18:32:27.729517428 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2016-01-20 01:43:32.532245674 +0000 @@ -129,22 +129,22 @@ /** * A mapping between templates and test sequences. @@ -327,8 +327,8 @@ _rootPattern = null; diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2015-10-21 18:39:28.606425331 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2016-01-20 01:43:32.532245674 +0000 @@ -107,11 +107,11 @@ } @@ -365,8 +365,8 @@ _prefixMapping.put(prefix, uri); } diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2015-10-21 18:40:48.049087670 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2016-01-20 01:43:32.532245674 +0000 @@ -121,7 +121,7 @@ /** * Mapping between mode names and Mode instances. @@ -395,8 +395,8 @@ /** * A reference to the SourceLoader set by the user (a URIResolver diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2015-10-21 18:33:58.471987562 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2016-01-20 01:43:32.532245674 +0000 @@ -38,8 +38,8 @@ final class SymbolTable { @@ -479,8 +479,8 @@ // Register the namespace URI Integer refcnt = _excludedURI.get(uri); diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2015-10-21 18:39:59.809899888 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2016-01-20 01:43:32.532245674 +0000 @@ -70,7 +70,7 @@ protected SyntaxTreeNode _parent; // Parent node private Stylesheet _stylesheet; // Stylesheet ancestor node @@ -509,8 +509,8 @@ locals.add(varOrParamName); } diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2015-10-21 18:41:05.536793252 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2016-01-20 01:43:32.532245674 +0000 @@ -127,7 +127,7 @@ * times. Note that patterns whose kernels are "*", "node()" * and "@*" can between shared by test sequences. @@ -521,8 +521,8 @@ public MethodGenerator(int access_flags, Type return_type, diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2015-10-21 18:40:26.065457801 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2016-01-20 01:43:32.532245674 +0000 @@ -37,7 +37,7 @@ public final class MultiHashtable { static final long serialVersionUID = -6151608290510033572L; @@ -542,8 +542,8 @@ } set.add(value); diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2015-10-21 19:43:10.786389288 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2015-10-21 18:29:03.196967393 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2016-01-20 01:43:32.532245674 +0000 @@ -170,7 +170,7 @@ _parser = new Parser(this, useServicesMechanism); _featureManager = featureManager; @@ -572,8 +572,8 @@ _parser.init(); //_variableSerial = 1; diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2015-10-21 18:42:44.419128773 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2016-01-20 01:43:32.532245674 +0000 @@ -169,7 +169,7 @@ _count = 0; _current = 0; @@ -584,8 +584,8 @@ try { diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2015-10-21 18:41:27.832417911 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2016-01-20 01:43:32.532245674 +0000 @@ -60,7 +60,7 @@ */ public DOMWSFilter(AbstractTranslet translet) { @@ -596,8 +596,8 @@ if (translet instanceof StripFilter) { m_filter = (StripFilter) translet; diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2015-10-21 18:43:52.365985296 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2016-01-20 01:43:32.532245674 +0000 @@ -59,7 +59,7 @@ /** * A mapping from a document node to the mapping between values and nodesets @@ -626,8 +626,8 @@ } else { nodes = index.get(id); diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2015-10-21 18:44:02.925807604 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2016-01-20 01:43:32.532245674 +0000 @@ -56,7 +56,7 @@ private int _free; private int _size; @@ -638,8 +638,8 @@ private final class AxisIterator extends DTMAxisIteratorBase { // constitutive data diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2015-10-21 18:42:08.111739878 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2016-01-20 01:43:32.532245674 +0000 @@ -114,7 +114,7 @@ private int _namesSize = -1; @@ -659,8 +659,8 @@ } diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2015-10-21 18:44:48.173046279 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2016-01-20 01:43:32.532245674 +0000 @@ -279,7 +279,7 @@ */ public void addDecimalFormat(String name, DecimalFormatSymbols symbols) { @@ -689,8 +689,8 @@ } diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2015-10-21 19:14:41.126894929 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2016-01-20 01:43:32.532245674 +0000 @@ -58,7 +58,7 @@ private ContentHandler _sax = null; private LexicalHandler _lex = null; @@ -701,8 +701,8 @@ public DOM2SAX(Node root) { _dom = root; diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2015-10-21 19:15:02.634533539 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2016-01-20 01:43:32.536245607 +0000 @@ -407,7 +407,7 @@ _class = new Class[classCount]; @@ -713,8 +713,8 @@ for (int i = 0; i < classCount; i++) { diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2015-10-21 19:15:23.054190440 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2016-01-20 01:43:32.536245607 +0000 @@ -1189,7 +1189,7 @@ if (_isIdentity) { @@ -725,8 +725,8 @@ _parameters.put(name, value); } diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2015-10-21 19:44:40.056911371 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2016-01-20 01:43:32.536245607 +0000 @@ -393,7 +393,7 @@ if (identifiers != null) { @@ -828,8 +828,8 @@ } } // class CoreDocumentImpl diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2015-10-21 19:22:08.875388563 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2016-01-20 01:43:32.536245607 +0000 @@ -2059,7 +2059,7 @@ // create Map @@ -840,8 +840,8 @@ // save ID and its associated element diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2015-10-21 18:48:23.801419406 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2016-01-20 01:43:32.536245607 +0000 @@ -249,7 +249,7 @@ filter, entityReferenceExpansion); @@ -933,8 +933,8 @@ } } diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2015-10-21 19:18:19.011234346 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2016-01-20 01:43:32.536245607 +0000 @@ -478,7 +478,7 @@ public Object setUserData(String key, Object data, UserDataHandler handler) { @@ -962,8 +962,8 @@ } } // class DocumentTypeImpl diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2015-10-21 19:22:17.511244627 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2016-01-20 01:43:32.536245607 +0000 @@ -37,7 +37,7 @@ class LCount @@ -974,8 +974,8 @@ static LCount lookup(String evtName) diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2015-10-21 19:14:00.959569885 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2016-01-20 01:43:32.536245607 +0000 @@ -62,7 +62,7 @@ /** Default constructor. */ @@ -986,8 +986,8 @@ // diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2015-10-21 03:15:31.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2015-10-21 19:13:44.031854344 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2016-01-18 15:52:13.000000000 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2016-01-20 01:43:32.536245607 +0000 @@ -210,13 +210,13 @@ From bugzilla-daemon at icedtea.classpath.org Wed Jan 20 08:49:20 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 20 Jan 2016 08:49:20 +0000 Subject: [Bug 2303] INVEKOS GIS can't open file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2303 --- Comment #23 from JiriVanek --- So it is pushed 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 gnu_andrew at member.fsf.org Wed Jan 20 14:50:38 2016 From: gnu_andrew at member.fsf.org (Andrew Hughes) Date: Wed, 20 Jan 2016 14:50:38 +0000 Subject: [SECURITY] IcedTea 2.6.4 for OpenJDK 7 Released! Message-ID: <20160120145038.GA30658@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.6.x series with the January 2016 security fixes from OpenJDK 7 u95. 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.6.4 (2016-01-19): * Security fixes - S8059054, CVE-2016-0402: Better URL processing - S8130710, CVE-2016-0448: Better attributes processing - S8132210: Reinforce JMX collector internals - S8132988: Better printing dialogues - S8133962, CVE-2016-0466: More general limits - S8137060: JMX memory management improvements - S8139012: Better font substitutions - S8139017, CVE-2016-0483: More stable image decoding - S8140543, CVE-2016-0494: Arrange font actions - S8143185: Cleanup for handling proxies - S8143941, CVE-2015-8126, CVE-2015-8472: Update splashscreen displays - S8144773, CVE-2015-7575: Further reduce use of MD5 (SLOTH) * Import of OpenJDK 7 u95 build 0 - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException - S8074068: Cleanup in src/share/classes/sun/security/x509/ - S8075773: jps running as root fails after the fix of JDK-8050807 - S8081297: SSL Problem with Tomcat - S8131181: Increment minor version of HSx for 7u95 and initialize the build number - S8132082: Let OracleUcrypto accept RSAPrivateKey - S8134605: Partial rework of the fix for 8081297 - S8134861: XSLT: Extension func call cause exception if namespace URI contains partial package name - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing - S8138716: (tz) Support tzdata2015g - S8140244: Port fix of JDK-8075773 to MacOSX - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2 - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure - S8143132: L10n resource file translation update - S8144955: Wrong changes were pushed with 8143942 - S8145551: Test failed with Crash for Improved font lookups - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp * Backports - S8140244: Port fix of JDK-8075773 to AIX The tarballs can be downloaded from: * http://icedtea.classpath.org/download/source/icedtea-2.6.4.tar.gz * http://icedtea.classpath.org/download/source/icedtea-2.6.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.6.4.tar.gz.sig * http://icedtea.classpath.org/download/source/icedtea-2.6.4.tar.xz.sig These are produced using my public key. See details below. PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 GnuPG >= 2.1 is required to be able to handle this key. SHA256 checksums: ef5dd43c5f87742ac28519420055ad24acaca55b005b5b2e339cf3e451d716c1 icedtea-2.6.4.tar.gz 59acd169e88ab8071f37481351a70b04e4eacd341dba1ecc3588bf5d42ef6b7d icedtea-2.6.4.tar.gz.sig d20a365feea95a4c01c9f9db1f7562f471f638bc672db9de6c6e654d2d826164 icedtea-2.6.4.tar.xz fc90dc9a58db1309d2105766cc9b41f295c1c12981cf1fc0afc04efa860d3f61 icedtea-2.6.4.tar.xz.sig The checksums can be downloaded from: * http://icedtea.classpath.org/download/source/icedtea-2.6.4.sha256 The following people helped with these releases: * Andrew Hughes (all backports, release management) We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea-2.6.4.tar.gz or: $ tar x -I xz -f icedtea-2.6.4.tar.xz then: $ mkdir icedtea-build $ cd icedtea-build $ ../icedtea-2.6.4/configure $ make Full build requirements and instructions are available in the INSTALL file. Happy hacking! -- Andrew :) PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 213 bytes Desc: Digital signature URL: From bugzilla-daemon at icedtea.classpath.org Wed Jan 20 17:05:34 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 20 Jan 2016 17:05:34 +0000 Subject: [Bug 2709] Cannot access jnlp triggered dicom viewer In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2709 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |INVALID --- Comment #3 from JiriVanek --- I'm not abel to continue indebugging there. I need full stacktrasce or, better, reproducer (or app itself) Please try with latest ITW and in need reopen 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 Wed Jan 20 17:07:36 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 20 Jan 2016 17:07:36 +0000 Subject: [Bug 2579] Spelling errors in console In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2579 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|jvanek at redhat.com |gnu.andrew at redhat.com --- Comment #4 from JiriVanek --- Andrew, feel free to close if you find lack of time or just lack of enthusiasm. -- 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 20 17:09:10 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 20 Jan 2016 17:09:10 +0000 Subject: [Bug 2709] Cannot access jnlp triggered dicom viewer In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2709 --- Comment #4 from JiriVanek --- One thought which came form another bug - We fouond that ubuntu may be building ITW without tagsoup. Tagsoup is needed to read this jnlp file. Please ensure yo ahve tagsoup 9and itw is using it) before reopening. -- 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 20 17:10:01 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 20 Jan 2016 17:10:01 +0000 Subject: /hg/release/icedtea7-2.6: Added tag icedtea-2.6.4 for changeset ... Message-ID: changeset 4eb7d546cbb2 in /hg/release/icedtea7-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=4eb7d546cbb2 author: Andrew John Hughes date: Wed Jan 20 17:08:54 2016 +0000 Added tag icedtea-2.6.4 for changeset c9ed028a5bd9 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r c9ed028a5bd9 -r 4eb7d546cbb2 .hgtags --- a/.hgtags Wed Jan 20 03:22:24 2016 +0000 +++ b/.hgtags Wed Jan 20 17:08:54 2016 +0000 @@ -65,3 +65,4 @@ 723ef630c33266f7339980d3d59439dba7143bba icedtea-2.6.2pre02 aa92a611ed4ea7a55790b5ce81c486614bc213e2 icedtea-2.6.2 17770cf44bc6da12e4e465bfb65f7966dfac4ef9 icedtea-2.6.3 +c9ed028a5bd92024c7f7cb75e6baf994d7b0bc6a icedtea-2.6.4 From bugzilla-daemon at icedtea.classpath.org Wed Jan 20 17:23:01 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 20 Jan 2016 17:23:01 +0000 Subject: [Bug 2278] could not initialize applet sandbox In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2278 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #3 from JiriVanek --- Considered 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 21 01:21:04 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:21:04 +0000 Subject: [Bug 2798] New: A fatal error has been detected by the Java Runtime Environment: SIGBUS (0x7) at pc=0x00007f8f39041d70, pid=20320, tid=140252514039552 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2798 Bug ID: 2798 Summary: A fatal error has been detected by the Java Runtime Environment: SIGBUS (0x7) at pc=0x00007f8f39041d70, pid=20320, tid=140252514039552 Product: IcedTea Version: 6-hg Hardware: x86_64 OS: Windows Status: NEW Severity: blocker Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: phong.pham.android at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 1500 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1500&action=edit SIGBUS (0x7) at pc=0x00007f8f39041d70, pid=20320, tid=140252514039552 A fatal error has been detected by the Java Runtime Environment: SIGBUS (0x7) at pc=0x00007f8f39041d70, pid=20320, tid=140252514039552 JRE version: 7.0_09 Java VM: OpenJDK 64-Bit Server VM (23.2-b09 mixed mode linux-amd64 compressed oops) Problematic frame: v ~StubRoutines::jbyte_disjoint_arraycopy -- 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 21 01:21:24 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:21:24 +0000 Subject: [Bug 2798] A fatal error has been detected by the Java Runtime Environment: SIGBUS (0x7) at pc=0x00007f8f39041d70, pid=20320, tid=140252514039552 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2798 phong changed: What |Removed |Added ---------------------------------------------------------------------------- OS|Windows |Linux -- 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 21 01:23:25 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:23:25 +0000 Subject: /hg/release/icedtea6-1.13: Add new backports for issues to be fi... Message-ID: changeset 8554f062d23d in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=8554f062d23d author: Andrew John Hughes date: Thu Jan 21 01:22:57 2016 +0000 Add new backports for issues to be fixed in 1.13.10. S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux 2016-01-19 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch, * patches/openjdk/8140620-pr2711-find_default.sf2.patch: New backports for issues to be fixed in 1.13.10. diffstat: ChangeLog | 9 + Makefile.am | 4 +- NEWS | 4 + patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch | 54 ++++++++++ patches/openjdk/8140620-pr2711-find_default.sf2.patch | 53 +++++++++ 5 files changed, 123 insertions(+), 1 deletions(-) diffs (159 lines): diff -r cf929b8fdebc -r 8554f062d23d ChangeLog --- a/ChangeLog Wed Nov 18 03:11:24 2015 +0000 +++ b/ChangeLog Thu Jan 21 01:22:57 2016 +0000 @@ -1,3 +1,12 @@ +2016-01-19 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated. + * patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch, + * patches/openjdk/8140620-pr2711-find_default.sf2.patch: + New backports for issues to be fixed in 1.13.10. + 2015-11-17 Andrew John Hughes * NEWS: Add 1.13.10 section. diff -r cf929b8fdebc -r 8554f062d23d Makefile.am --- a/Makefile.am Wed Nov 18 03:11:24 2015 +0000 +++ b/Makefile.am Thu Jan 21 01:22:57 2016 +0000 @@ -639,7 +639,9 @@ patches/openjdk/6763122-no_zipfile_ctor_exception.patch \ patches/openjdk/6599383-pr363-large_zip_files.patch \ patches/openjdk/6929479-pr363-disable_mmap_zip.patch \ - patches/pr2513-layoutengine_reset.patch + patches/pr2513-layoutengine_reset.patch \ + patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch \ + patches/openjdk/8140620-pr2711-find_default.sf2.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r cf929b8fdebc -r 8554f062d23d NEWS --- a/NEWS Wed Nov 18 03:11:24 2015 +0000 +++ b/NEWS Thu Jan 21 01:22:57 2016 +0000 @@ -14,6 +14,10 @@ New in release 1.13.10 (2016-01-XX): +* Backports + - S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F + - S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux + New in release 1.13.9 (2015-11-13): * Security fixes diff -r cf929b8fdebc -r 8554f062d23d patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch Thu Jan 21 01:22:57 2016 +0000 @@ -0,0 +1,54 @@ +# HG changeset patch +# User rupashka +# Date 1342090033 -14400 +# Thu Jul 12 14:47:13 2012 +0400 +# Node ID 05c69338ee73c1e454aa632ced5cbc057420b404 +# Parent 0039f5c7fb512e1ec2e22bceb69ee324426a684f +7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F +Reviewed-by: kizune + +diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java +--- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Wed Jul 11 16:19:41 2012 -0700 ++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Thu Jul 12 14:47:13 2012 +0400 +@@ -796,9 +796,10 @@ + "Menu.margin", zeroInsets, + "Menu.cancelMode", "hideMenuTree", + "Menu.alignAcceleratorText", Boolean.FALSE, ++ "Menu.useMenuBarForTopLevelMenus", Boolean.TRUE, + + +- "MenuBar.windowBindings", new Object[] { ++ "MenuBar.windowBindings", new Object[] { + "F10", "takeFocus" }, + "MenuBar.font", new FontLazyValue(Region.MENU_BAR), + +diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java +--- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java Wed Jul 11 16:19:41 2012 -0700 ++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java Thu Jul 12 14:47:13 2012 +0400 +@@ -92,7 +92,13 @@ + boolean defaultCapable = btn.isDefaultCapable(); + key = new ComplexKey(wt, toolButton, defaultCapable); + } ++ } else if (id == Region.MENU) { ++ if (c instanceof JMenu && ((JMenu) c).isTopLevelMenu() && ++ UIManager.getBoolean("Menu.useMenuBarForTopLevelMenus")) { ++ wt = WidgetType.MENU_BAR; ++ } + } ++ + if (key == null) { + // Otherwise, just use the WidgetType as the key. + key = wt; +diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java +--- openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Wed Jul 11 16:19:41 2012 -0700 ++++ openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Thu Jul 12 14:47:13 2012 +0400 +@@ -299,7 +299,8 @@ + */ + @Override + public void propertyChange(PropertyChangeEvent e) { +- if (SynthLookAndFeel.shouldUpdateStyle(e)) { ++ if (SynthLookAndFeel.shouldUpdateStyle(e) || ++ (e.getPropertyName().equals("ancestor") && UIManager.getBoolean("Menu.useMenuBarForTopLevelMenus"))) { + updateStyle((JMenu)e.getSource()); + } + } diff -r cf929b8fdebc -r 8554f062d23d patches/openjdk/8140620-pr2711-find_default.sf2.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8140620-pr2711-find_default.sf2.patch Thu Jan 21 01:22:57 2016 +0000 @@ -0,0 +1,53 @@ +# HG changeset patch +# User omajid +# Date 1445973555 14400 +# Tue Oct 27 15:19:15 2015 -0400 +# Node ID 79e4644bd40482ec3ae557f086137e2869b3f50a +# Parent 09c2cc84d4517af288f26607a39ff0515a05e771 +8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux +Reviewed-by: serb + +diff -r 09c2cc84d451 -r 79e4644bd404 src/share/classes/com/sun/media/sound/SoftSynthesizer.java +--- openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Fri Nov 13 05:11:53 2015 +0000 ++++ openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Tue Oct 27 15:19:15 2015 -0400 +@@ -668,6 +668,40 @@ + actions.add(new PrivilegedAction() { + public InputStream run() { + if (System.getProperties().getProperty("os.name") ++ .startsWith("Linux")) { ++ ++ File[] systemSoundFontsDir = new File[] { ++ /* Arch, Fedora, Mageia */ ++ new File("/usr/share/soundfonts/"), ++ new File("/usr/local/share/soundfonts/"), ++ /* Debian, Gentoo, OpenSUSE, Ubuntu */ ++ new File("/usr/share/sounds/sf2/"), ++ new File("/usr/local/share/sounds/sf2/"), ++ }; ++ ++ /* ++ * Look for a default.sf2 ++ */ ++ for (File systemSoundFontDir : systemSoundFontsDir) { ++ if (systemSoundFontDir.exists()) { ++ File defaultSoundFont = new File(systemSoundFontDir, "default.sf2"); ++ if (defaultSoundFont.exists()) { ++ try { ++ return new FileInputStream(defaultSoundFont); ++ } catch (IOException e) { ++ // continue with lookup ++ } ++ } ++ } ++ } ++ } ++ return null; ++ } ++ }); ++ ++ actions.add(new PrivilegedAction() { ++ public InputStream run() { ++ if (System.getProperties().getProperty("os.name") + .startsWith("Windows")) { + File gm_dls = new File(System.getenv("SystemRoot") + + "\\system32\\drivers\\gm.dls"); From bugzilla-daemon at icedtea.classpath.org Thu Jan 21 01:23:33 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:23:33 +0000 Subject: [Bug 2757] Unreadable menu bar with Ambiance theme in GTK L&F In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2757 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=8554f062d23d author: Andrew John Hughes date: Thu Jan 21 01:22:57 2016 +0000 Add new backports for issues to be fixed in 1.13.10. S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux 2016-01-19 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch, * patches/openjdk/8140620-pr2711-find_default.sf2.patch: New backports for issues to be fixed in 1.13.10. -- 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 21 01:23:38 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:23:38 +0000 Subject: [Bug 2711] [IcedTea6] Backport "8140620: Find and load default.sf2 as the default soundbank on Linux" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2711 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea6-1.13?cmd=changeset;node=8554f062d23d author: Andrew John Hughes date: Thu Jan 21 01:22:57 2016 +0000 Add new backports for issues to be fixed in 1.13.10. S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux 2016-01-19 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch, * patches/openjdk/8140620-pr2711-find_default.sf2.patch: New backports for issues to be fixed in 1.13.10. -- 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 21 01:44:03 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:44:03 +0000 Subject: [Bug 2798] A fatal error has been detected by the Java Runtime Environment: SIGBUS (0x7) at pc=0x00007f8f39041d70, pid=20320, tid=140252514039552 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2798 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WONTFIX Severity|blocker |normal --- Comment #1 from Andrew John Hughes --- JRE version: 7.0_09 Java VM: OpenJDK 64-Bit Server VM (23.2-b09 mixed mode linux-amd64 compressed oops) This is a very old version from somewhere in the 2.3.x series. Currently, we only support 2.6.x. If you can reproduce this failure on a currently supported version, with details of how to do so, please re-open 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 Thu Jan 21 01:44:37 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:44:37 +0000 Subject: [Bug 2757] Unreadable menu bar with Ambiance theme in GTK L&F In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2757 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 21 01:45:01 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:45:01 +0000 Subject: [Bug 2711] [IcedTea6] Backport "8140620: Find and load default.sf2 as the default soundbank on Linux" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2711 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 21 01:46:48 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:46:48 +0000 Subject: [Bug 2757] [IcedTea6] Unreadable menu bar with Ambiance theme in GTK L&F In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2757 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Unreadable menu bar with |[IcedTea6] Unreadable menu |Ambiance theme in GTK L&F |bar with Ambiance theme in | |GTK L&F -- 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 21 01:47:25 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:47:25 +0000 Subject: /hg/release/icedtea7-forest-2.6: Added tag icedtea-2.6.4 for cha... Message-ID: changeset fe38e34a7b88 in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=fe38e34a7b88 author: andrew date: Wed Jan 20 17:09:40 2016 +0000 Added tag icedtea-2.6.4 for changeset 4f1e498cad9c diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 4f1e498cad9c -r fe38e34a7b88 .hgtags --- a/.hgtags Mon Jan 18 15:52:07 2016 +0000 +++ b/.hgtags Wed Jan 20 17:09:40 2016 +0000 @@ -648,3 +648,4 @@ 2be0ab1a24b2b6910d8f31e3314ffa48f30f21df jdk7u91-b02 f0e7f22f09ef0ddd583eb8ce9a14edcccfa4f7ea icedtea-2.6.3 a28bc539342e4ca724a5abd2521c6a58f04c2113 jdk7u95-b00 +4f1e498cad9c7bc7ab0b6df99ebb4a29a8ca1c5e icedtea-2.6.4 From andrew at icedtea.classpath.org Thu Jan 21 01:47:33 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:47:33 +0000 Subject: /hg/release/icedtea7-forest-2.6/corba: Added tag icedtea-2.6.4 f... Message-ID: changeset 08f674873b47 in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=08f674873b47 author: andrew date: Wed Jan 20 17:09:35 2016 +0000 Added tag icedtea-2.6.4 for changeset 2135da66cc53 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 2135da66cc53 -r 08f674873b47 .hgtags --- a/.hgtags Mon Jan 18 15:52:10 2016 +0000 +++ b/.hgtags Wed Jan 20 17:09:35 2016 +0000 @@ -650,3 +650,4 @@ e3a6331d136ecac575730b498501f5b0dc4302e2 jdk7u91-b02 9a3ca529125ad02ef3b0afd3c2f8fa6f80e0e46f icedtea-2.6.3 96b735f85c61ad721113713551271106a5070742 jdk7u95-b00 +2135da66cc53a606621024679ca16c06349eea58 icedtea-2.6.4 From andrew at icedtea.classpath.org Thu Jan 21 01:47:40 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:47:40 +0000 Subject: /hg/release/icedtea7-forest-2.6/jaxp: Added tag icedtea-2.6.4 fo... Message-ID: changeset 9690f0cea1ad in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=9690f0cea1ad author: andrew date: Wed Jan 20 17:09:36 2016 +0000 Added tag icedtea-2.6.4 for changeset bc6edb6c12a7 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r bc6edb6c12a7 -r 9690f0cea1ad .hgtags --- a/.hgtags Mon Jan 18 15:52:13 2016 +0000 +++ b/.hgtags Wed Jan 20 17:09:36 2016 +0000 @@ -651,3 +651,4 @@ 6d9a192976332443bb3be46d49d5b255d9781fe9 jdk7u91-b02 f7bf82fcbd098bc520ceb92f97890ee6f7da3506 icedtea-2.6.3 7c422316234f10b327fdbc181aedd5e74f31fd38 jdk7u95-b00 +bc6edb6c12a76b48a83ef8253dba8fe3007328e5 icedtea-2.6.4 From andrew at icedtea.classpath.org Thu Jan 21 01:47:47 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:47:47 +0000 Subject: /hg/release/icedtea7-forest-2.6/jaxws: Added tag icedtea-2.6.4 f... Message-ID: changeset 248662d9f483 in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=248662d9f483 author: andrew date: Wed Jan 20 17:09:37 2016 +0000 Added tag icedtea-2.6.4 for changeset 271b555de438 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 271b555de438 -r 248662d9f483 .hgtags --- a/.hgtags Mon Jan 18 15:52:15 2016 +0000 +++ b/.hgtags Wed Jan 20 17:09:37 2016 +0000 @@ -650,3 +650,4 @@ 2230b8f8e03a8eaefc83acb577f30c4de88c45a7 jdk7u91-b02 39ef53b9c4030cde1ced8232f94b143968f4d22e icedtea-2.6.3 3427b35ce5a1a0143b4aedf3f5e0a1953ad7fd7f jdk7u95-b00 +271b555de4386bd63e15dede60e4a18a8ce3199c icedtea-2.6.4 From andrew at icedtea.classpath.org Thu Jan 21 01:47:55 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:47:55 +0000 Subject: /hg/release/icedtea7-forest-2.6/langtools: Added tag icedtea-2.6... Message-ID: changeset 4dbacb09de90 in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=4dbacb09de90 author: andrew date: Wed Jan 20 17:09:40 2016 +0000 Added tag icedtea-2.6.4 for changeset fd0a34cb97b4 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r fd0a34cb97b4 -r 4dbacb09de90 .hgtags --- a/.hgtags Mon Jan 18 15:52:45 2016 +0000 +++ b/.hgtags Wed Jan 20 17:09:40 2016 +0000 @@ -650,3 +650,4 @@ 08e99c45e470ce8b87875c1cbe78ac2f341555a3 jdk7u91-b02 91fdb0c83e50c398bee5f0550600d20650f2a6ef icedtea-2.6.3 3c71abf7435352aee6e74ba2581274181ad3d17e jdk7u95-b00 +fd0a34cb97b40c622fc6d3370f5eca062e280979 icedtea-2.6.4 From andrew at icedtea.classpath.org Thu Jan 21 01:48:03 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:48:03 +0000 Subject: /hg/release/icedtea7-forest-2.6/hotspot: Added tag icedtea-2.6.4... Message-ID: changeset 29cba58bd519 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=29cba58bd519 author: andrew date: Wed Jan 20 17:09:41 2016 +0000 Added tag icedtea-2.6.4 for changeset 19d919ae5506 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 19d919ae5506 -r 29cba58bd519 .hgtags --- a/.hgtags Wed Nov 04 16:23:08 2015 -0800 +++ b/.hgtags Wed Jan 20 17:09:41 2016 +0000 @@ -885,3 +885,4 @@ 2f2d431ace967c9a71194e1bb46f38b35ea43512 jdk7u91-b02 c3cde6774003850aa6c44315c9c3e4dfdac69798 icedtea-2.6.3 b3c5ff648bcad305163b323ad15dde1b6234d501 jdk7u95-b00 +19d919ae5506a750e3a0bcc6bd176c66b7e1e65d icedtea-2.6.4 From andrew at icedtea.classpath.org Thu Jan 21 01:48:11 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 21 Jan 2016 01:48:11 +0000 Subject: /hg/release/icedtea7-forest-2.6/jdk: Added tag icedtea-2.6.4 for... Message-ID: changeset ab0f137e0eac in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=ab0f137e0eac author: andrew date: Wed Jan 20 17:09:38 2016 +0000 Added tag icedtea-2.6.4 for changeset dc86038147b2 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r dc86038147b2 -r ab0f137e0eac .hgtags --- a/.hgtags Mon Jan 18 18:22:09 2016 +0000 +++ b/.hgtags Wed Jan 20 17:09:38 2016 +0000 @@ -637,3 +637,4 @@ c434c67b8189677dec0a0034a109fb261497cd92 jdk7u91-b02 5215185a1d57f11960998cdd3935b29c2b97ee25 icedtea-2.6.3 3a74fee9ba00da3bd3a22492e1b069430a82574d jdk7u95-b00 +dc86038147b235413775e1400c32a7180e184811 icedtea-2.6.4 From bugzilla-daemon at icedtea.classpath.org Thu Jan 21 04:59:49 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 04:59:49 +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| |2769 -- 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 21 04:59:49 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 04:59:49 +0000 Subject: [Bug 2769] [IcedTea8] Backport "8140620: Find and load default.sf2 as the default soundbank on Linux" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2769 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 21 06:18:10 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 06:18:10 +0000 Subject: [Bug 2799] New: [IcedTea7] Files are missing from resources.jar Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2799 Bug ID: 2799 Summary: [IcedTea7] Files are missing from resources.jar 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 $ ls resources-7/META-INF/ MANIFEST.MF services/ $ ls resources-8/META-INF/ mailcap.default MANIFEST.MF mimetypes.default services/ -- 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 21 06:18:36 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 06:18:36 +0000 Subject: [Bug 2799] [IcedTea7] Files are missing from resources.jar In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2799 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED URL| |https://bugzilla.redhat.com | |/show_bug.cgi?id=1195203 -- 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 21 06:20:28 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 06:20:28 +0000 Subject: [Bug 2799] [IcedTea7] Files are missing from resources.jar In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2799 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|7-hg |2.6.3 Target Milestone|--- |2.6.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 21 06:21:19 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 06:21:19 +0000 Subject: [Bug 2800] New: [IcedTea6] Files are missing from resources.jar Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2800 Bug ID: 2800 Summary: [IcedTea6] Files are missing from resources.jar Product: IcedTea Version: 6-1.13.9 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 bug 2799 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 Thu Jan 21 06:21:31 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 06:21:31 +0000 Subject: [Bug 2800] [IcedTea6] Files are missing from resources.jar In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2800 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |6-1.13.11 -- 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 21 06:21:55 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 06:21:55 +0000 Subject: [Bug 2800] [IcedTea6] Files are missing from resources.jar In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2800 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- URL| |https://bugzilla.redhat.com | |/show_bug.cgi?id=1195203 -- 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 21 17:06:40 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 17:06:40 +0000 Subject: [Bug 2004] When accessing applet it will crash In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2004 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #8 from JiriVanek --- The web page seems no longer accessible. Do you still ahve an issue somewhere? -- 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 21 17:10:26 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 21 Jan 2016 17:10:26 +0000 Subject: [Bug 1991] ice tea problem with remote login to wdmycloud In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1991 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |jvanek at redhat.com --- Comment #2 from JiriVanek --- Hello, is there still some bug to investigate? After clicking the WD links above, I found no applets. -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jan 22 12:05:20 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 22 Jan 2016 12:05:20 +0000 Subject: [Bug 2803] New: [IcedTea7] Make system CUPS optional Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2803 Bug ID: 2803 Summary: [IcedTea7] Make system CUPS optional Product: IcedTea Version: 2.6.4 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 SYSTEM_CUPS=true/false should have a corresponding configure option, as do the others. -- 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 22 12:07:21 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 22 Jan 2016 12:07:21 +0000 Subject: [Bug 2781] CACAO - typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|2.6.4 |2.6.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 22 12:10:24 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 22 Jan 2016 12:10:24 +0000 Subject: [Bug 2803] [IcedTea7] Make system CUPS optional In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2803 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |2.6.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 gnu_andrew at member.fsf.org Fri Jan 22 17:52:16 2016 From: gnu_andrew at member.fsf.org (Andrew Hughes) Date: Fri, 22 Jan 2016 17:52:16 +0000 Subject: [SECURITY] IcedTea 1.13.10 for OpenJDK 6 Released! Message-ID: <20160122175208.GA23189@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 2016 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.10 (2016-01-22): * Security fixes - S8059054, CVE-2016-0402: Better URL processing - S8130710, CVE-2016-0448: Better attributes processing - S8133962, CVE-2016-0466: More general limits - S8137060: JMX memory management improvements - S8139012: Better font substitutions - S8139017, CVE-2016-0483: More stable image decoding - S8140543, CVE-2016-0494: Arrange font actions - S8143185: Cleanup for handling proxies - S8143941, CVE-2015-8126, CVE-2015-8472: Update splashscreen displays * Import of OpenJDK6 b38 - OJ69: Windows build broken after b37 changes - OJ70: Allow versions of ALSA >= 1.1.0 - S6720721: CRL check with circular depency support needed - S6852744: PIT b61: PKI test suite fails because self signed certificates are being rejected [Tests only] - S7166570: JSSE certificate validation has started to fail for certificate chains - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException - S8074068: Cleanup in src/share/classes/sun/security/x509/ - S8075773: jps running as root fails after the fix of JDK-8050807 - S8081297: SSL Problem with Tomcat - S8134605: Partial rework of the fix for 8081297 - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing - S8138716: (tz) Support tzdata2015g - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2 - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure - S8144955: Wrong changes were pushed with 8143942 - S8145551: Test failed with Crash for Improved font lookups - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp * Backports - S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F - S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux The tarballs can be downloaded from: * http://icedtea.classpath.org/download/source/icedtea6-1.13.10.tar.gz * http://icedtea.classpath.org/download/source/icedtea6-1.13.10.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.10.tar.gz.sig * http://icedtea.classpath.org/download/source/icedtea6-1.13.10.tar.xz.sig PGP Key: ed25519/35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 GnuPG >= 2.1 is required to be able to handle this key. SHA256 checksums: e467fbdbae88897c4447b400be32f3176a798d3c7d84a311b7a24420e955e93a icedtea6-1.13.10.tar.gz 59a4eef6f98a1ef5951e3fd64f94a3e8f818513fa2cf721ffb60b20601eed92d icedtea6-1.13.10.tar.gz.sig a08907fa5a99a84c1bb480c9a0438264ff01c6215a7e1618e08e4ae79d4600d7 icedtea6-1.13.10.tar.xz 4dac256f93799aa0e75062c94c242f956bd2372b1fb70c220dcb02d4b2d028a5 icedtea6-1.13.10.tar.xz.sig The checksums can be downloaded from: * http://icedtea.classpath.org/download/source/icedtea6-1.13.10.sha256 The following people helped with these releases: * Andrew Hughes (all backports and bug fixes, release management) We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea6-1.13.10.tar.gz or: $ tar x -I xz -f icedtea6-1.13.10.tar.xz then: $ mkdir icedtea-build $ cd icedtea-build $ ../icedtea6-1.13.10/configure $ make Full build requirements and instructions are available in the INSTALL file. Happy hacking! -- Andrew :) Senior 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 -------------- 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 Fri Jan 22 17:53:47 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 22 Jan 2016 17:53:47 +0000 Subject: /hg/release/icedtea6-1.13: 3 new changesets Message-ID: changeset 680136982d3c in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=680136982d3c author: Andrew John Hughes date: Thu Jan 21 02:39:18 2016 +0000 Update to build against the b38 tarball & January 2016 security fixes. Upstream changes: - OPENJDK6-69: Windows build broken after b37 changes - OPENJDK6-70: Allow versions of ALSA >= 1.1.0 - S4898461: Support for ECB and CBC/PKCS5Padding - S6720721: CRL check with circular depency support needed - S6852744: PIT b61: PKI test suite fails because self signed certificates are being rejected [Tests only] - S6867345: Turkish regional options cause NPE in sun.security.x509.AlgorithmId.algOID - S7166570: JSSE certificate validation has started to fail for certificate chains - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing - S8059054: Better URL processing - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException - S8074068: Cleanup in src/share/classes/sun/security/x509/ - S8075773: jps running as root fails after the fix of JDK-8050807 - S8081297: SSL Problem with Tomcat - S8130710: Better attributes processing - S8133962: More general limits - S8134605: Partial rework of the fix for 8081297 - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing - S8137060: JMX memory management improvements - S8138716: (tz) Support tzdata2015g - S8139012: Better font substitutions - S8139017: More stable image decoding - S8140543: Arrange font actions - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2 - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure - S8143185: Cleanup for handling proxies - S8143941: Update splashscreen displays - S8144955: Wrong changes were pushed with 8143942 - S8145551: Test failed with Crash for Improved font lookups - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp 2016-01-20 Andrew John Hughes * Makefile.am: (OPENJDK_DATE): Bump to b38 creation date; 20th of January, 2016. (OPENJDK_SHA256SUM): Update for b38 tarball. 2016-01-19 Andrew John Hughes * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch, * patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch: Removed; added upstream in OpenJDK 6 b38. * Makefile.am: (ICEDTEA_PATCHES): Remove above patches. * NEWS: Updated. * patches/openjdk/6799141-split_out_versions.patch: Regenerated following OPENJDK6-70. 2015-11-26 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Bump to next release, b38. changeset 81c995c33252 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=81c995c33252 author: Andrew John Hughes date: Tue Oct 27 18:58:03 2015 +0000 Prepare for 1.13.10 release. 2016-01-20 Andrew John Hughes * NEWS: Set release date to this Friday. * configure.ac: Bump to 1.13.10. changeset c5d3e1cd26c2 in /hg/release/icedtea6-1.13 details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=c5d3e1cd26c2 author: Andrew John Hughes date: Fri Jan 22 17:53:18 2016 +0000 Added tag icedtea6-1.13.10 for changeset 81c995c33252 diffstat: .hgtags | 1 + ChangeLog | 28 + Makefile.am | 8 +- NEWS | 35 +- configure.ac | 2 +- patches/openjdk/6799141-split_out_versions.patch | 2 +- patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch | 1169 ---------- patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch | 328 -- 8 files changed, 67 insertions(+), 1506 deletions(-) diffs (truncated from 1641 to 500 lines): diff -r 8554f062d23d -r c5d3e1cd26c2 .hgtags --- a/.hgtags Thu Jan 21 01:22:57 2016 +0000 +++ b/.hgtags Fri Jan 22 17:53:18 2016 +0000 @@ -36,3 +36,4 @@ 69d82d8f85f926ca35e610d01727d223519c1c98 icedtea6-1.13.7 6d96a13066ecea305dc0dcb97396c8d8fb5af49e icedtea6-1.13.8 16ccd05e93d3ead8ecbac25c7fcb9a3e46a93dbf icedtea6-1.13.9 +81c995c33252575ce57cebbdac561b072cf97cf9 icedtea6-1.13.10 diff -r 8554f062d23d -r c5d3e1cd26c2 ChangeLog --- a/ChangeLog Thu Jan 21 01:22:57 2016 +0000 +++ b/ChangeLog Fri Jan 22 17:53:18 2016 +0000 @@ -1,3 +1,31 @@ +2016-01-20 Andrew John Hughes + + * NEWS: Set release date to this Friday. + * configure.ac: Bump to 1.13.10. + +2016-01-20 Andrew John Hughes + + * Makefile.am: + (OPENJDK_DATE): Bump to b38 creation date; + 20th of January, 2016. + (OPENJDK_SHA256SUM): Update for b38 tarball. + +2016-01-19 Andrew John Hughes + + * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch, + * patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch: + Removed; added upstream in OpenJDK 6 b38. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + * NEWS: Updated. + * patches/openjdk/6799141-split_out_versions.patch: + Fixed to apply against OPENJDK6-70. + +2015-11-26 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b38. + 2016-01-19 Andrew John Hughes * Makefile.am: diff -r 8554f062d23d -r c5d3e1cd26c2 Makefile.am --- a/Makefile.am Thu Jan 21 01:22:57 2016 +0000 +++ b/Makefile.am Fri Jan 22 17:53:18 2016 +0000 @@ -1,8 +1,8 @@ # Dependencies -OPENJDK_DATE = 11_nov_2015 -OPENJDK_SHA256SUM = 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d -OPENJDK_VERSION = b37 +OPENJDK_DATE = 20_jan_2016 +OPENJDK_SHA256SUM = ff88dbcbda6c3c7d80b7cbd28065a455cdb009de9874fcf9ff9ca8205d38a257 +OPENJDK_VERSION = b38 OPENJDK_URL = https://java.net/downloads/openjdk6/ CACAO_VERSION = 68fe50ac34ec @@ -463,11 +463,9 @@ patches/remove-gcm-test.patch \ patches/skip_wrap_mode.patch \ patches/remove_multicatch_in_testrsa.patch \ - patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch \ patches/openjdk/p11cipher-6682411-fix_indexoutofboundsexception.patch \ patches/openjdk/p11cipher-6682417-fix_decrypted_data_not_multiple_of_blocks.patch \ patches/openjdk/p11cipher-6812738-native_cleanup.patch \ - patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch \ patches/openjdk/p11cipher-6687725-throw_illegalblocksizeexception.patch \ patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch \ patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch \ diff -r 8554f062d23d -r c5d3e1cd26c2 NEWS --- a/NEWS Thu Jan 21 01:22:57 2016 +0000 +++ b/NEWS Fri Jan 22 17:53:18 2016 +0000 @@ -12,8 +12,39 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.13.10 (2016-01-XX): - +New in release 1.13.10 (2016-01-22): + +* Security fixes + - S8059054, CVE-2016-0402: Better URL processing + - S8130710, CVE-2016-0448: Better attributes processing + - S8133962, CVE-2016-0466: More general limits + - S8137060: JMX memory management improvements + - S8139012: Better font substitutions + - S8139017, CVE-2016-0483: More stable image decoding + - S8140543, CVE-2016-0494: Arrange font actions + - S8143185: Cleanup for handling proxies + - S8143941, CVE-2015-8126, CVE-2015-8472: Update splashscreen displays +* Import of OpenJDK6 b38 + - OJ69: Windows build broken after b37 changes + - OJ70: Allow versions of ALSA >= 1.1.0 + - S6720721: CRL check with circular depency support needed + - S6852744: PIT b61: PKI test suite fails because self signed certificates are being rejected [Tests only] + - S7166570: JSSE certificate validation has started to fail for certificate chains + - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified + - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing + - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException + - S8074068: Cleanup in src/share/classes/sun/security/x509/ + - S8075773: jps running as root fails after the fix of JDK-8050807 + - S8081297: SSL Problem with Tomcat + - S8134605: Partial rework of the fix for 8081297 + - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing + - S8138716: (tz) Support tzdata2015g + - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS + - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2 + - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure + - S8144955: Wrong changes were pushed with 8143942 + - S8145551: Test failed with Crash for Improved font lookups + - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp * Backports - S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F - S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux diff -r 8554f062d23d -r c5d3e1cd26c2 configure.ac --- a/configure.ac Thu Jan 21 01:22:57 2016 +0000 +++ b/configure.ac Fri Jan 22 17:53:18 2016 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.13.10pre],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.13.10],[distro-pkg-dev at openjdk.java.net]) AC_CANONICAL_HOST AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) diff -r 8554f062d23d -r c5d3e1cd26c2 patches/openjdk/6799141-split_out_versions.patch --- a/patches/openjdk/6799141-split_out_versions.patch Thu Jan 21 01:22:57 2016 +0000 +++ b/patches/openjdk/6799141-split_out_versions.patch Fri Jan 22 17:53:18 2016 +0000 @@ -447,7 +447,7 @@ - endif - ifneq ($(ARCH), ia64) - # ALSA 0.9.1 and above -- REQUIRED_ALSA_VERSION = ^((0[.]9[.][1-9])|(1[.]0[.][0-9]))[0-9]* +- REQUIRED_ALSA_VERSION = ^((0[.]9[.][1-9])|(1[.][0-9][.][0-9]))[0-9]* - endif # How much RAM does this machine have: MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2) diff -r 8554f062d23d -r c5d3e1cd26c2 patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch --- a/patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch Thu Jan 21 01:22:57 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1169 +0,0 @@ -diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java ---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-10-23 18:00:58.332289584 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-10-23 18:10:13.013034333 +0100 -@@ -22,10 +22,10 @@ - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -- - package sun.security.pkcs11; - - import java.nio.ByteBuffer; -+import java.util.Arrays; - - import java.security.*; - import java.security.spec.*; -@@ -34,7 +34,6 @@ - import javax.crypto.spec.*; - - import sun.nio.ch.DirectBuffer; -- - import sun.security.pkcs11.wrapper.*; - import static sun.security.pkcs11.wrapper.PKCS11Constants.*; - -@@ -43,8 +42,8 @@ - * DES, DESede, AES, ARCFOUR, and Blowfish. - * - * This class is designed to support ECB and CBC with NoPadding and -- * PKCS5Padding for both. However, currently only CBC/NoPadding (and -- * ECB/NoPadding for stream ciphers) is functional. -+ * PKCS5Padding for both. It will use its own padding impl if the -+ * native mechanism does not support padding. - * - * Note that PKCS#11 current only supports ECB and CBC. There are no - * provisions for other modes such as CFB, OFB, PCBC, or CTR mode. -@@ -62,10 +61,56 @@ - private final static int MODE_CBC = 4; - - // padding constant for NoPadding -- private final static int PAD_NONE = 5; -+ private final static int PAD_NONE = 5; - // padding constant for PKCS5Padding - private final static int PAD_PKCS5 = 6; - -+ private static interface Padding { -+ // ENC: format the specified buffer with padding bytes and return the -+ // actual padding length -+ int setPaddingBytes(byte[] paddingBuffer, int padLen); -+ -+ // DEC: return the length of trailing padding bytes given the specified -+ // padded data -+ int unpad(byte[] paddedData, int ofs, int len) -+ throws BadPaddingException; -+ } -+ -+ private static class PKCS5Padding implements Padding { -+ -+ private final int blockSize; -+ -+ PKCS5Padding(int blockSize) -+ throws NoSuchPaddingException { -+ if (blockSize == 0) { -+ throw new NoSuchPaddingException -+ ("PKCS#5 padding not supported with stream ciphers"); -+ } -+ this.blockSize = blockSize; -+ } -+ -+ public int setPaddingBytes(byte[] paddingBuffer, int padLen) { -+ Arrays.fill(paddingBuffer, 0, padLen, (byte) (padLen & 0x007f)); -+ return padLen; -+ } -+ -+ public int unpad(byte[] paddedData, int ofs, int len) -+ throws BadPaddingException { -+ byte padValue = paddedData[ofs + len - 1]; -+ if (padValue < 1 || padValue > blockSize) { -+ throw new BadPaddingException("Invalid pad value!"); -+ } -+ // sanity check padding bytes -+ int padStartIndex = ofs + len - padValue; -+ for (int i = padStartIndex; i < len; i++) { -+ if (paddedData[i] != padValue) { -+ throw new BadPaddingException("Invalid pad bytes!"); -+ } -+ } -+ return padValue; -+ } -+ } -+ - // token instance - private final Token token; - -@@ -99,64 +144,92 @@ - // padding type, on of PAD_* above (PAD_NONE for stream ciphers) - private int paddingType; - -+ // when the padding is requested but unsupported by the native mechanism, -+ // we use the following to do padding and necessary data buffering. -+ // padding object which generate padding and unpad the decrypted data -+ private Padding paddingObj; -+ // buffer for holding back the block which contains padding bytes -+ private byte[] padBuffer; -+ private int padBufferLen; -+ - // original IV, if in MODE_CBC - private byte[] iv; - -- // total number of bytes processed -- private int bytesProcessed; -+ // number of bytes buffered internally by the native mechanism and padBuffer -+ // if we do the padding -+ private int bytesBuffered; - - P11Cipher(Token token, String algorithm, long mechanism) -- throws PKCS11Exception { -+ throws PKCS11Exception, NoSuchAlgorithmException { - super(); - this.token = token; - this.algorithm = algorithm; - this.mechanism = mechanism; -- keyAlgorithm = algorithm.split("/")[0]; -+ -+ String algoParts[] = algorithm.split("/"); -+ keyAlgorithm = algoParts[0]; -+ - if (keyAlgorithm.equals("AES")) { - blockSize = 16; -- blockMode = MODE_CBC; -- // XXX change default to PKCS5Padding -- paddingType = PAD_NONE; -- } else if (keyAlgorithm.equals("RC4") || keyAlgorithm.equals("ARCFOUR")) { -+ } else if (keyAlgorithm.equals("RC4") || -+ keyAlgorithm.equals("ARCFOUR")) { - blockSize = 0; -- blockMode = MODE_ECB; -- paddingType = PAD_NONE; - } else { // DES, DESede, Blowfish - blockSize = 8; -- blockMode = MODE_CBC; -- // XXX change default to PKCS5Padding -- paddingType = PAD_NONE; -+ } -+ this.blockMode = -+ (algoParts.length > 1 ? parseMode(algoParts[1]) : MODE_ECB); -+ -+ String defPadding = (blockSize == 0 ? "NoPadding" : "PKCS5Padding"); -+ String paddingStr = -+ (algoParts.length > 2 ? algoParts[2] : defPadding); -+ try { -+ engineSetPadding(paddingStr); -+ } catch (NoSuchPaddingException nspe) { -+ // should not happen -+ throw new ProviderException(nspe); - } - } - - protected void engineSetMode(String mode) throws NoSuchAlgorithmException { -+ // Disallow change of mode for now since currently it's explicitly -+ // defined in transformation strings -+ throw new NoSuchAlgorithmException("Unsupported mode " + mode); -+ } -+ -+ private int parseMode(String mode) throws NoSuchAlgorithmException { - mode = mode.toUpperCase(); -+ int result; - if (mode.equals("ECB")) { -- this.blockMode = MODE_ECB; -+ result = MODE_ECB; - } else if (mode.equals("CBC")) { - if (blockSize == 0) { - throw new NoSuchAlgorithmException - ("CBC mode not supported with stream ciphers"); - } -- this.blockMode = MODE_CBC; -+ result = MODE_CBC; - } else { - throw new NoSuchAlgorithmException("Unsupported mode " + mode); - } -+ return result; - } - - // see JCE spec - protected void engineSetPadding(String padding) - throws NoSuchPaddingException { -- if (padding.equalsIgnoreCase("NoPadding")) { -+ paddingObj = null; -+ padBuffer = null; -+ padding = padding.toUpperCase(); -+ if (padding.equals("NOPADDING")) { - paddingType = PAD_NONE; -- } else if (padding.equalsIgnoreCase("PKCS5Padding")) { -- if (blockSize == 0) { -- throw new NoSuchPaddingException -- ("PKCS#5 padding not supported with stream ciphers"); -- } -+ } else if (padding.equals("PKCS5PADDING")) { - paddingType = PAD_PKCS5; -- // XXX PKCS#5 not yet implemented -- throw new NoSuchPaddingException("pkcs5"); -+ if (mechanism != CKM_DES_CBC_PAD && mechanism != CKM_DES3_CBC_PAD && -+ mechanism != CKM_AES_CBC_PAD) { -+ // no native padding support; use our own padding impl -+ paddingObj = new PKCS5Padding(blockSize); -+ padBuffer = new byte[blockSize]; -+ } - } else { - throw new NoSuchPaddingException("Unsupported padding " + padding); - } -@@ -174,7 +247,7 @@ - - // see JCE spec - protected byte[] engineGetIV() { -- return (iv == null) ? null : (byte[])iv.clone(); -+ return (iv == null) ? null : (byte[]) iv.clone(); - } - - // see JCE spec -@@ -184,8 +257,9 @@ - } - IvParameterSpec ivSpec = new IvParameterSpec(iv); - try { -- AlgorithmParameters params = AlgorithmParameters.getInstance -- (keyAlgorithm, P11Util.getSunJceProvider()); -+ AlgorithmParameters params = -+ AlgorithmParameters.getInstance(keyAlgorithm, -+ P11Util.getSunJceProvider()); - params.init(ivSpec); - return params; - } catch (GeneralSecurityException e) { -@@ -209,38 +283,38 @@ - protected void engineInit(int opmode, Key key, - AlgorithmParameterSpec params, SecureRandom random) - throws InvalidKeyException, InvalidAlgorithmParameterException { -- byte[] iv; -+ byte[] ivValue; - if (params != null) { - if (params instanceof IvParameterSpec == false) { - throw new InvalidAlgorithmParameterException - ("Only IvParameterSpec supported"); - } -- IvParameterSpec ivSpec = (IvParameterSpec)params; -- iv = ivSpec.getIV(); -+ IvParameterSpec ivSpec = (IvParameterSpec) params; -+ ivValue = ivSpec.getIV(); - } else { -- iv = null; -+ ivValue = null; - } -- implInit(opmode, key, iv, random); -+ implInit(opmode, key, ivValue, random); - } - - // see JCE spec - protected void engineInit(int opmode, Key key, AlgorithmParameters params, - SecureRandom random) - throws InvalidKeyException, InvalidAlgorithmParameterException { -- byte[] iv; -+ byte[] ivValue; - if (params != null) { - try { - IvParameterSpec ivSpec = (IvParameterSpec) - params.getParameterSpec(IvParameterSpec.class); -- iv = ivSpec.getIV(); -+ ivValue = ivSpec.getIV(); - } catch (InvalidParameterSpecException e) { - throw new InvalidAlgorithmParameterException - ("Could not decode IV", e); - } - } else { -- iv = null; -+ ivValue = null; - } -- implInit(opmode, key, iv, random); -+ implInit(opmode, key, ivValue, random); - } - - // actual init() implementation -@@ -249,31 +323,31 @@ - throws InvalidKeyException, InvalidAlgorithmParameterException { - cancelOperation(); - switch (opmode) { -- case Cipher.ENCRYPT_MODE: -- encrypt = true; -- break; -- case Cipher.DECRYPT_MODE: -- encrypt = false; -- break; -- default: -- throw new InvalidAlgorithmParameterException -- ("Unsupported mode: " + opmode); -+ case Cipher.ENCRYPT_MODE: -+ encrypt = true; -+ break; -+ case Cipher.DECRYPT_MODE: -+ encrypt = false; -+ break; -+ default: -+ throw new InvalidAlgorithmParameterException -+ ("Unsupported mode: " + opmode); - } - if (blockMode == MODE_ECB) { // ECB or stream cipher - if (iv != null) { - if (blockSize == 0) { - throw new InvalidAlgorithmParameterException -- ("IV not used with stream ciphers"); -+ ("IV not used with stream ciphers"); - } else { - throw new InvalidAlgorithmParameterException -- ("IV not used in ECB mode"); -+ ("IV not used in ECB mode"); - } - } - } else { // MODE_CBC - if (iv == null) { - if (encrypt == false) { - throw new InvalidAlgorithmParameterException -- ("IV must be specified for decryption in CBC mode"); -+ ("IV must be specified for decryption in CBC mode"); - } - // generate random IV - if (random == null) { -@@ -284,7 +358,7 @@ - } else { - if (iv.length != blockSize) { - throw new InvalidAlgorithmParameterException -- ("IV length must match block size"); -+ ("IV length must match block size"); - } - } - } -@@ -330,63 +404,43 @@ - session = token.getOpSession(); - } - if (encrypt) { -- token.p11.C_EncryptInit -- (session.id(), new CK_MECHANISM(mechanism, iv), p11Key.keyID); -+ token.p11.C_EncryptInit(session.id(), -+ new CK_MECHANISM(mechanism, iv), p11Key.keyID); - } else { -- token.p11.C_DecryptInit -- (session.id(), new CK_MECHANISM(mechanism, iv), p11Key.keyID); -+ token.p11.C_DecryptInit(session.id(), -+ new CK_MECHANISM(mechanism, iv), p11Key.keyID); - } -- bytesProcessed = 0; -+ bytesBuffered = 0; -+ padBufferLen = 0; - initialized = true; - } - -- // XXX the calculations below assume the PKCS#11 implementation is smart. -- // conceivably, not all implementations are and we may need to estimate -- // more conservatively -- -- private int bytesBuffered(int totalLen) { -- if (paddingType == PAD_NONE) { -- // with NoPadding, buffer only the current unfinished block -- return totalLen & (blockSize - 1); -- } else { // PKCS5 -- // with PKCS5Padding in decrypt mode, the buffer must never From andrew at icedtea.classpath.org Fri Jan 22 17:54:24 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 22 Jan 2016 17:54:24 +0000 Subject: /hg/icedtea6: 4 new changesets Message-ID: changeset 896b78492d42 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=896b78492d42 author: Andrew John Hughes date: Thu Nov 26 19:24:15 2015 +0000 Bump to next release, b38. 2015-11-26 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Bump to next release, b38. changeset cc919eba91fa in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cc919eba91fa author: Andrew John Hughes date: Wed Jan 20 03:45:50 2016 +0000 Merge changeset 6df2ff9d8f54 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6df2ff9d8f54 author: Andrew John Hughes date: Wed Jan 20 05:19:11 2016 +0000 Update to build against January 2016 security fixes. Upstream changes: - OPENJDK6-69: Windows build broken after b37 changes - OPENJDK6-70: Allow versions of ALSA >= 1.1.0 - S4898461: Support for ECB and CBC/PKCS5Padding - S6720721: CRL check with circular depency support needed - S6852744: PIT b61: PKI test suite fails because self signed certificates are being rejected [Tests only] - S6867345: Turkish regional options cause NPE in sun.security.x509.AlgorithmId.algOID - S7166570: JSSE certificate validation has started to fail for certificate chains - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing - S8059054: Better URL processing - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException - S8074068: Cleanup in src/share/classes/sun/security/x509/ - S8075773: jps running as root fails after the fix of JDK-8050807 - S8081297: SSL Problem with Tomcat - S8130710: Better attributes processing - S8133962: More general limits - S8134605: Partial rework of the fix for 8081297 - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing - S8137060: JMX memory management improvements - S8138716: (tz) Support tzdata2015g - S8139012: Better font substitutions - S8139017: More stable image decoding - S8140543: Arrange font actions - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2 - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure - S8143185: Cleanup for handling proxies - S8143941: Update splashscreen displays - S8144955: Wrong changes were pushed with 8143942 - S8145551: Test failed with Crash for Improved font lookups - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp 2016-01-19 Andrew John Hughes * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch, * patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch: Removed; added upstream in OpenJDK 6 b38. * Makefile.am: (ICEDTEA_PATCHES): Remove above patches. * NEWS: Updated. * patches/openjdk/6799141-split_out_versions.patch: Regenerated following OPENJDK6-70. changeset eac2bcbee2d4 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=eac2bcbee2d4 author: Andrew John Hughes date: Thu Jan 21 01:17:36 2016 +0000 Update to b38 tarball. 2016-01-20 Andrew John Hughes * Makefile.am: (OPENJDK_DATE): Bump to b38 creation date; 20th of January, 2016. (OPENJDK_SHA256SUM): Update for b38 tarball. diffstat: ChangeLog | 32 + Makefile.am | 12 +- NEWS | 33 + patches/openjdk/6799141-split_out_versions.patch | 40 +- patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch | 54 + patches/openjdk/8140620-pr2711-find_default.sf2.patch | 53 + patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch | 1169 ---------- patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch | 328 -- 8 files changed, 198 insertions(+), 1523 deletions(-) diffs (truncated from 1866 to 500 lines): diff -r efe390605797 -r eac2bcbee2d4 ChangeLog --- a/ChangeLog Wed Nov 18 03:16:15 2015 +0000 +++ b/ChangeLog Thu Jan 21 01:17:36 2016 +0000 @@ -1,3 +1,35 @@ +2016-01-20 Andrew John Hughes + + * Makefile.am: + (OPENJDK_DATE): Bump to b38 creation date; + 20th of January, 2016. + (OPENJDK_SHA256SUM): Update for b38 tarball. + +2016-01-19 Andrew John Hughes + + * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch, + * patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch: + Removed; added upstream in OpenJDK 6 b38. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + * NEWS: Updated. + * patches/openjdk/6799141-split_out_versions.patch: + Regenerated following OPENJDK6-70. + +2016-01-19 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated. + * patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch, + * patches/openjdk/8140620-pr2711-find_default.sf2.patch: + New backports for issues to be fixed in 1.13.10. + +2015-11-26 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b38. + 2015-11-17 Andrew John Hughes * NEWS: Add 1.13.9 release notes. diff -r efe390605797 -r eac2bcbee2d4 Makefile.am --- a/Makefile.am Wed Nov 18 03:16:15 2015 +0000 +++ b/Makefile.am Thu Jan 21 01:17:36 2016 +0000 @@ -1,8 +1,8 @@ # Dependencies -OPENJDK_DATE = 11_nov_2015 -OPENJDK_SHA256SUM = 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d -OPENJDK_VERSION = b37 +OPENJDK_DATE = 20_jan_2016 +OPENJDK_SHA256SUM = ff88dbcbda6c3c7d80b7cbd28065a455cdb009de9874fcf9ff9ca8205d38a257 +OPENJDK_VERSION = b38 OPENJDK_URL = https://java.net/downloads/openjdk6/ CACAO_VERSION = 68fe50ac34ec @@ -463,11 +463,9 @@ patches/remove-gcm-test.patch \ patches/skip_wrap_mode.patch \ patches/remove_multicatch_in_testrsa.patch \ - patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch \ patches/openjdk/p11cipher-6682411-fix_indexoutofboundsexception.patch \ patches/openjdk/p11cipher-6682417-fix_decrypted_data_not_multiple_of_blocks.patch \ patches/openjdk/p11cipher-6812738-native_cleanup.patch \ - patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch \ patches/openjdk/p11cipher-6687725-throw_illegalblocksizeexception.patch \ patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch \ patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch \ @@ -647,7 +645,9 @@ patches/openjdk/6763122-no_zipfile_ctor_exception.patch \ patches/openjdk/6599383-pr363-large_zip_files.patch \ patches/openjdk/6929479-pr363-disable_mmap_zip.patch \ - patches/pr2513-layoutengine_reset.patch + patches/pr2513-layoutengine_reset.patch \ + patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch \ + patches/openjdk/8140620-pr2711-find_default.sf2.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r efe390605797 -r eac2bcbee2d4 NEWS --- a/NEWS Wed Nov 18 03:16:15 2015 +0000 +++ b/NEWS Thu Jan 21 01:17:36 2016 +0000 @@ -14,14 +14,47 @@ New in release 1.14.0 (201X-XX-XX): +* Security fixes + - S8059054, CVE-2016-0402: Better URL processing + - S8130710, CVE-2016-0448: Better attributes processing + - S8133962, CVE-2016-0466: More general limits + - S8137060: JMX memory management improvements + - S8139012: Better font substitutions + - S8139017, CVE-2016-0483: More stable image decoding + - S8140543, CVE-2016-0494: Arrange font actions + - S8143185: Cleanup for handling proxies + - S8143941, CVE-2015-8126, CVE-2015-8472: Update splashscreen displays +* Import of OpenJDK6 b38 + - OJ69: Windows build broken after b37 changes + - OJ70: Allow versions of ALSA >= 1.1.0 + - S6720721: CRL check with circular depency support needed + - S6852744: PIT b61: PKI test suite fails because self signed certificates are being rejected [Tests only] + - S7166570: JSSE certificate validation has started to fail for certificate chains + - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified + - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing + - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException + - S8074068: Cleanup in src/share/classes/sun/security/x509/ + - S8075773: jps running as root fails after the fix of JDK-8050807 + - S8081297: SSL Problem with Tomcat + - S8134605: Partial rework of the fix for 8081297 + - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing + - S8138716: (tz) Support tzdata2015g + - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS + - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2 + - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure + - S8144955: Wrong changes were pushed with 8143942 + - S8145551: Test failed with Crash for Improved font lookups + - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp * 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 + - S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F - 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 + - S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux * Bug fixes - PR1886: IcedTea does not checksum supplied tarballs - PR2083: Add support for building Zero on AArch64 diff -r efe390605797 -r eac2bcbee2d4 patches/openjdk/6799141-split_out_versions.patch --- a/patches/openjdk/6799141-split_out_versions.patch Wed Nov 18 03:16:15 2015 +0000 +++ b/patches/openjdk/6799141-split_out_versions.patch Thu Jan 21 01:17:36 2016 +0000 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk ---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2014-07-30 13:42:56.308105637 +0100 -+++ openjdk/jdk/make/common/Defs-linux.gmk 2014-07-30 13:47:55.596394090 +0100 +--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2016-01-20 04:02:31.642880064 +0000 ++++ openjdk/jdk/make/common/Defs-linux.gmk 2016-01-20 04:06:25.098914903 +0000 @@ -135,6 +135,14 @@ LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH)) endif @@ -17,8 +17,8 @@ # Selection of warning messages # diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2014-07-30 13:42:56.132103116 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2016-01-20 04:02:30.290903028 +0000 ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2016-01-20 04:06:25.098914903 +0000 @@ -143,18 +143,10 @@ CC = $(COMPILER_PATH)gcc CPP = $(COMPILER_PATH)gcc -E @@ -40,8 +40,8 @@ # Get gcc version diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-msvc.gmk openjdk/jdk/make/common/shared/Compiler-msvc.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-msvc.gmk 2014-07-14 04:24:43.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-msvc.gmk 2014-07-30 13:49:10.217463061 +0100 +--- openjdk.orig/jdk/make/common/shared/Compiler-msvc.gmk 2016-01-20 01:41:59.589809293 +0000 ++++ openjdk/jdk/make/common/shared/Compiler-msvc.gmk 2016-01-20 04:06:25.098914903 +0000 @@ -47,8 +47,6 @@ # Fill in unknown values COMPILER_NAME=Unknown MSVC Compiler @@ -52,8 +52,8 @@ # unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake NMAKE = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-sun.gmk openjdk/jdk/make/common/shared/Compiler-sun.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-sun.gmk 2014-07-30 13:42:56.296105466 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-sun.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Compiler-sun.gmk 2016-01-20 04:02:31.598880811 +0000 ++++ openjdk/jdk/make/common/shared/Compiler-sun.gmk 2016-01-20 04:06:25.098914903 +0000 @@ -33,29 +33,20 @@ ifeq ($(PLATFORM), solaris) # FIXUP: Change to SS12 when validated @@ -87,8 +87,8 @@ CPP = $(COMPILER_PATH)cc -E CXX = $(COMPILER_PATH)CC diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2014-07-30 13:42:56.312105695 +0100 -+++ openjdk/jdk/make/common/shared/Defs.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Defs.gmk 2016-01-20 04:02:31.646879996 +0000 ++++ openjdk/jdk/make/common/shared/Defs.gmk 2016-01-20 04:06:25.102914835 +0000 @@ -113,9 +113,9 @@ fi) endef @@ -152,7 +152,7 @@ + diff -Nru openjdk.orig/jdk/make/common/shared/Defs-versions.gmk openjdk/jdk/make/common/shared/Defs-versions.gmk --- openjdk.orig/jdk/make/common/shared/Defs-versions.gmk 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2014-07-30 13:47:55.600394147 +0100 ++++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2016-01-20 04:06:25.102914835 +0000 @@ -0,0 +1,183 @@ +# +# Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. @@ -338,8 +338,8 @@ +REQUIRED_ZIP_VER = 2.2 + diff -Nru openjdk.orig/jdk/make/common/shared/Defs-windows.gmk openjdk/jdk/make/common/shared/Defs-windows.gmk ---- openjdk.orig/jdk/make/common/shared/Defs-windows.gmk 2014-07-14 04:24:43.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Defs-windows.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Defs-windows.gmk 2016-01-20 01:41:59.597809158 +0000 ++++ openjdk/jdk/make/common/shared/Defs-windows.gmk 2016-01-20 04:06:25.102914835 +0000 @@ -147,10 +147,7 @@ UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH) @@ -353,8 +353,8 @@ MKS_VER :=$(call GetVersion,$(_MKS_VER)) # At this point, we can re-define FullPath to use DOSNAME_CMD diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk ---- openjdk.orig/jdk/make/common/shared/Platform.gmk 2014-07-30 13:42:56.132103116 +0100 -+++ openjdk/jdk/make/common/shared/Platform.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2016-01-20 04:02:30.290903028 +0000 ++++ openjdk/jdk/make/common/shared/Platform.gmk 2016-01-20 04:06:57.042372407 +0000 @@ -51,8 +51,6 @@ # USER login name of user (minus blanks) # PLATFORM windows, solaris, or linux @@ -447,7 +447,7 @@ - endif - ifneq ($(ARCH), ia64) - # ALSA 0.9.1 and above -- REQUIRED_ALSA_VERSION = ^((0[.]9[.][1-9])|(1[.]0[.][0-9]))[0-9]* +- REQUIRED_ALSA_VERSION = ^((0[.]9[.][1-9])|(1[.][0-9][.][0-9]))[0-9]* - endif # How much RAM does this machine have: MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2) @@ -513,8 +513,8 @@ ifneq ($(PLATFORM), windows) # Temporary disk area diff -Nru openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk ---- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2014-07-30 13:42:53.596066769 +0100 -+++ openjdk/jdk/make/common/shared/Sanity.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2016-01-20 04:02:27.542949705 +0000 ++++ openjdk/jdk/make/common/shared/Sanity.gmk 2016-01-20 04:06:25.102914835 +0000 @@ -44,54 +44,100 @@ SANITY_FILES = $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE) @@ -861,8 +861,8 @@ " The compiler was obtained from the following location: \n" \ " $(GCC_COMPILER_PATH) \n" \ diff -Nru openjdk.orig/jdk/make/common/shared/Sanity-Settings.gmk openjdk/jdk/make/common/shared/Sanity-Settings.gmk ---- openjdk.orig/jdk/make/common/shared/Sanity-Settings.gmk 2014-07-14 04:24:43.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Sanity-Settings.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Sanity-Settings.gmk 2016-01-20 01:42:00.025801958 +0000 ++++ openjdk/jdk/make/common/shared/Sanity-Settings.gmk 2016-01-20 04:06:25.102914835 +0000 @@ -177,8 +177,6 @@ ifeq ($(PLATFORM),windows) ALL_SETTINGS+=$(call addRequiredSetting,PROCESSOR_ARCHITECTURE) diff -r efe390605797 -r eac2bcbee2d4 patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch Thu Jan 21 01:17:36 2016 +0000 @@ -0,0 +1,54 @@ +# HG changeset patch +# User rupashka +# Date 1342090033 -14400 +# Thu Jul 12 14:47:13 2012 +0400 +# Node ID 05c69338ee73c1e454aa632ced5cbc057420b404 +# Parent 0039f5c7fb512e1ec2e22bceb69ee324426a684f +7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F +Reviewed-by: kizune + +diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java +--- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Wed Jul 11 16:19:41 2012 -0700 ++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Thu Jul 12 14:47:13 2012 +0400 +@@ -796,9 +796,10 @@ + "Menu.margin", zeroInsets, + "Menu.cancelMode", "hideMenuTree", + "Menu.alignAcceleratorText", Boolean.FALSE, ++ "Menu.useMenuBarForTopLevelMenus", Boolean.TRUE, + + +- "MenuBar.windowBindings", new Object[] { ++ "MenuBar.windowBindings", new Object[] { + "F10", "takeFocus" }, + "MenuBar.font", new FontLazyValue(Region.MENU_BAR), + +diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java +--- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java Wed Jul 11 16:19:41 2012 -0700 ++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java Thu Jul 12 14:47:13 2012 +0400 +@@ -92,7 +92,13 @@ + boolean defaultCapable = btn.isDefaultCapable(); + key = new ComplexKey(wt, toolButton, defaultCapable); + } ++ } else if (id == Region.MENU) { ++ if (c instanceof JMenu && ((JMenu) c).isTopLevelMenu() && ++ UIManager.getBoolean("Menu.useMenuBarForTopLevelMenus")) { ++ wt = WidgetType.MENU_BAR; ++ } + } ++ + if (key == null) { + // Otherwise, just use the WidgetType as the key. + key = wt; +diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java +--- openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Wed Jul 11 16:19:41 2012 -0700 ++++ openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Thu Jul 12 14:47:13 2012 +0400 +@@ -299,7 +299,8 @@ + */ + @Override + public void propertyChange(PropertyChangeEvent e) { +- if (SynthLookAndFeel.shouldUpdateStyle(e)) { ++ if (SynthLookAndFeel.shouldUpdateStyle(e) || ++ (e.getPropertyName().equals("ancestor") && UIManager.getBoolean("Menu.useMenuBarForTopLevelMenus"))) { + updateStyle((JMenu)e.getSource()); + } + } diff -r efe390605797 -r eac2bcbee2d4 patches/openjdk/8140620-pr2711-find_default.sf2.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8140620-pr2711-find_default.sf2.patch Thu Jan 21 01:17:36 2016 +0000 @@ -0,0 +1,53 @@ +# HG changeset patch +# User omajid +# Date 1445973555 14400 +# Tue Oct 27 15:19:15 2015 -0400 +# Node ID 79e4644bd40482ec3ae557f086137e2869b3f50a +# Parent 09c2cc84d4517af288f26607a39ff0515a05e771 +8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux +Reviewed-by: serb + +diff -r 09c2cc84d451 -r 79e4644bd404 src/share/classes/com/sun/media/sound/SoftSynthesizer.java +--- openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Fri Nov 13 05:11:53 2015 +0000 ++++ openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Tue Oct 27 15:19:15 2015 -0400 +@@ -668,6 +668,40 @@ + actions.add(new PrivilegedAction() { + public InputStream run() { + if (System.getProperties().getProperty("os.name") ++ .startsWith("Linux")) { ++ ++ File[] systemSoundFontsDir = new File[] { ++ /* Arch, Fedora, Mageia */ ++ new File("/usr/share/soundfonts/"), ++ new File("/usr/local/share/soundfonts/"), ++ /* Debian, Gentoo, OpenSUSE, Ubuntu */ ++ new File("/usr/share/sounds/sf2/"), ++ new File("/usr/local/share/sounds/sf2/"), ++ }; ++ ++ /* ++ * Look for a default.sf2 ++ */ ++ for (File systemSoundFontDir : systemSoundFontsDir) { ++ if (systemSoundFontDir.exists()) { ++ File defaultSoundFont = new File(systemSoundFontDir, "default.sf2"); ++ if (defaultSoundFont.exists()) { ++ try { ++ return new FileInputStream(defaultSoundFont); ++ } catch (IOException e) { ++ // continue with lookup ++ } ++ } ++ } ++ } ++ } ++ return null; ++ } ++ }); ++ ++ actions.add(new PrivilegedAction() { ++ public InputStream run() { ++ if (System.getProperties().getProperty("os.name") + .startsWith("Windows")) { + File gm_dls = new File(System.getenv("SystemRoot") + + "\\system32\\drivers\\gm.dls"); diff -r efe390605797 -r eac2bcbee2d4 patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch --- a/patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch Wed Nov 18 03:16:15 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1169 +0,0 @@ -diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java ---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-10-23 18:00:58.332289584 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-10-23 18:10:13.013034333 +0100 -@@ -22,10 +22,10 @@ - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -- - package sun.security.pkcs11; - - import java.nio.ByteBuffer; -+import java.util.Arrays; - - import java.security.*; - import java.security.spec.*; -@@ -34,7 +34,6 @@ - import javax.crypto.spec.*; - - import sun.nio.ch.DirectBuffer; -- - import sun.security.pkcs11.wrapper.*; - import static sun.security.pkcs11.wrapper.PKCS11Constants.*; - -@@ -43,8 +42,8 @@ - * DES, DESede, AES, ARCFOUR, and Blowfish. - * - * This class is designed to support ECB and CBC with NoPadding and -- * PKCS5Padding for both. However, currently only CBC/NoPadding (and -- * ECB/NoPadding for stream ciphers) is functional. -+ * PKCS5Padding for both. It will use its own padding impl if the -+ * native mechanism does not support padding. - * - * Note that PKCS#11 current only supports ECB and CBC. There are no - * provisions for other modes such as CFB, OFB, PCBC, or CTR mode. -@@ -62,10 +61,56 @@ - private final static int MODE_CBC = 4; - - // padding constant for NoPadding -- private final static int PAD_NONE = 5; -+ private final static int PAD_NONE = 5; - // padding constant for PKCS5Padding - private final static int PAD_PKCS5 = 6; - -+ private static interface Padding { -+ // ENC: format the specified buffer with padding bytes and return the -+ // actual padding length -+ int setPaddingBytes(byte[] paddingBuffer, int padLen); -+ -+ // DEC: return the length of trailing padding bytes given the specified -+ // padded data -+ int unpad(byte[] paddedData, int ofs, int len) -+ throws BadPaddingException; -+ } -+ -+ private static class PKCS5Padding implements Padding { -+ -+ private final int blockSize; -+ -+ PKCS5Padding(int blockSize) -+ throws NoSuchPaddingException { -+ if (blockSize == 0) { -+ throw new NoSuchPaddingException -+ ("PKCS#5 padding not supported with stream ciphers"); -+ } -+ this.blockSize = blockSize; -+ } -+ -+ public int setPaddingBytes(byte[] paddingBuffer, int padLen) { -+ Arrays.fill(paddingBuffer, 0, padLen, (byte) (padLen & 0x007f)); -+ return padLen; -+ } -+ -+ public int unpad(byte[] paddedData, int ofs, int len) -+ throws BadPaddingException { -+ byte padValue = paddedData[ofs + len - 1]; -+ if (padValue < 1 || padValue > blockSize) { -+ throw new BadPaddingException("Invalid pad value!"); -+ } -+ // sanity check padding bytes -+ int padStartIndex = ofs + len - padValue; -+ for (int i = padStartIndex; i < len; i++) { -+ if (paddedData[i] != padValue) { -+ throw new BadPaddingException("Invalid pad bytes!"); -+ } -+ } -+ return padValue; -+ } -+ } -+ - // token instance - private final Token token; - -@@ -99,64 +144,92 @@ - // padding type, on of PAD_* above (PAD_NONE for stream ciphers) - private int paddingType; - -+ // when the padding is requested but unsupported by the native mechanism, -+ // we use the following to do padding and necessary data buffering. -+ // padding object which generate padding and unpad the decrypted data -+ private Padding paddingObj; -+ // buffer for holding back the block which contains padding bytes -+ private byte[] padBuffer; -+ private int padBufferLen; -+ - // original IV, if in MODE_CBC - private byte[] iv; - -- // total number of bytes processed -- private int bytesProcessed; -+ // number of bytes buffered internally by the native mechanism and padBuffer -+ // if we do the padding -+ private int bytesBuffered; - - P11Cipher(Token token, String algorithm, long mechanism) -- throws PKCS11Exception { -+ throws PKCS11Exception, NoSuchAlgorithmException { - super(); - this.token = token; - this.algorithm = algorithm; - this.mechanism = mechanism; -- keyAlgorithm = algorithm.split("/")[0]; -+ -+ String algoParts[] = algorithm.split("/"); -+ keyAlgorithm = algoParts[0]; -+ - if (keyAlgorithm.equals("AES")) { - blockSize = 16; -- blockMode = MODE_CBC; -- // XXX change default to PKCS5Padding -- paddingType = PAD_NONE; -- } else if (keyAlgorithm.equals("RC4") || keyAlgorithm.equals("ARCFOUR")) { -+ } else if (keyAlgorithm.equals("RC4") || -+ keyAlgorithm.equals("ARCFOUR")) { - blockSize = 0; -- blockMode = MODE_ECB; From bugzilla-daemon at icedtea.classpath.org Fri Jan 22 22:21:42 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 22 Jan 2016 22:21:42 +0000 Subject: [Bug 2804] New: test/tapset/jstaptest.pl should be executable Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2804 Bug ID: 2804 Summary: test/tapset/jstaptest.pl should be executable Product: IcedTea Version: 8-hg Hardware: x86_64 OS: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: chewi at gentoo.org CC: unassigned at icedtea.classpath.org "make check" works relatively well under icedtea 3 but test/tapset/jstaptest.pl needs to be executable for it to run. This is not the case in 3.0.0_pre07. -- 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 24 14:27:26 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 24 Jan 2016 14:27:26 +0000 Subject: [Bug 2368] Segmentation fault when building 2.5.5 on ppc64 with HotSpot In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2368 James Le Cuirot changed: What |Removed |Added ---------------------------------------------------------------------------- Version|2.6.2 |2.6.4 --- Comment #8 from James Le Cuirot --- Still a problem in 2.6.4. I did try to reproduce this under QEMU but I struggled to get an SMP guest working and even when I did, it was a bit unstable and seemed too slow to reproduce the problem. -- 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 25 06:11:14 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 25 Jan 2016 06:11:14 +0000 Subject: [Bug 2806] New: Bug Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2806 Bug ID: 2806 Summary: Bug Product: IcedTea Version: unspecified Hardware: x86_64 OS: Linux Status: NEW Severity: critical Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: sukhotskiy at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 1501 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1501&action=edit error log by application with second shell During an opening second shell and opening browser in it !ENTRY org.eclipse.ui 4 4 2016-01-25 12:00:02.187 !MESSAGE Unable to create menu item "org.eclipse.ui.update.findAndInstallUpdates", command "org.eclipse.ui.update.findAndInstallUpdates" not defined !ENTRY org.eclipse.ui 4 4 2016-01-25 12:00:02.188 !MESSAGE Unable to create menu item "org.eclipse.ui.update.manageConfiguration", command "org.eclipse.ui.update.manageConfiguration" not defined ---------------sdf--------------file:/home/harry/my/sss1-eq/com.bps.queue.ui.op.res/res/temp.htm ---------------sdf--------------/home/harry/my/sss1-eq/com.bps.queue.ui.op.res/res/temp.htm # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007f59a644a884, pid=3641, tid=140023907452672 # # JRE version: OpenJDK Runtime Environment (7.0_91-b02) (build 1.7.0_91-b02) # Java VM: OpenJDK 64-Bit Server VM (24.91-b01 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea 2.6.3 # Distribution: Ubuntu 14.04 LTS, package 7u91-2.6.3-0ubuntu0.14.04.1 # Problematic frame: # C [libgdk-x11-2.0.so.0+0x6e884] gdk_window_configure_finished+0x4 # # -- 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 icedtea.classpath.org Mon Jan 25 14:10:46 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Mon, 25 Jan 2016 14:10:46 +0000 Subject: /hg/icedtea-web: Fixed various cosmetic NPEs when codebase is nu... Message-ID: changeset 96d8378c37c6 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=96d8378c37c6 author: Jiri Vanek date: Mon Jan 25 15:10:29 2016 +0100 Fixed various cosmetic NPEs when codebase is null (+tests) diffstat: ChangeLog | 62 + NEWS | 1 + netx/net/sourceforge/jnlp/JNLPFile.java | 20 + netx/net/sourceforge/jnlp/PluginBridge.java | 4 +- netx/net/sourceforge/jnlp/SecurityDesc.java | 6 +- netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 2 +- netx/net/sourceforge/jnlp/security/SecurityDialog.java | 2 +- netx/net/sourceforge/jnlp/security/SecurityDialogs.java | 2 +- netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java | 8 +- netx/net/sourceforge/jnlp/security/dialogs/TemporaryPermissionsButton.java | 2 +- netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/PartiallySignedAppTrustWarningPanel.java | 2 +- netx/net/sourceforge/jnlp/util/UrlUtils.java | 6 + tests/junit-runner/JunitLikeXmlOutputListener.java | 16 + tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSigned.html.in | 46 + tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedApp.jnlp.in | 55 + tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedApplet.jnlp.in | 59 + tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedJnlpHref.html.in | 47 + tests/reproducers/signed/CodebasesAttsSigned/srcs/CodebasesAttsSigned.java | 86 + tests/reproducers/signed/CodebasesAttsSigned/testcases/CodebasesAttsSignedDialogsTest1.java | 532 +++++++ tests/reproducers/simple/CodebasesAtts/resources/CodebasesAtts.html.in | 46 + tests/reproducers/simple/CodebasesAtts/resources/CodebasesAttsApp.jnlp.in | 55 + tests/reproducers/simple/CodebasesAtts/resources/CodebasesAttsApplet.jnlp.in | 59 + tests/reproducers/simple/CodebasesAtts/resources/CodebasesAttsJnlpHref.html.in | 47 + tests/reproducers/simple/CodebasesAtts/srcs/CodebasesAtts.java | 86 + tests/reproducers/simple/CodebasesAtts/testcases/CodebasesAttsDialogsTest1.java | 233 +++ tests/reproducers/simple/CodebasesAtts/testcases/CodebasesAttsNoDialogsTest1.java | 699 ++++++++++ tests/reproducers/simple/CodebasesAtts/testcases/CodebasesAttsNoDialogsTest2.java | 432 ++++++ tests/reproducers/simple/CodebasesAtts/testcases/CodebasesAttsNoDialogsTest3.java | 308 ++++ tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java | 21 +- tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/firefox/FirefoxProfilesOperator.java | 4 +- tests/test-extensions/net/sourceforge/jnlp/closinglisteners/AutoErrorClosingListener.java | 66 +- tests/test-extensions/net/sourceforge/jnlp/closinglisteners/StringBasedClosingListener.java | 2 +- 32 files changed, 2967 insertions(+), 49 deletions(-) diffs (truncated from 3309 to 500 lines): diff -r 1e58026203fb -r 96d8378c37c6 ChangeLog --- a/ChangeLog Tue Jan 19 21:14:51 2016 +0100 +++ b/ChangeLog Mon Jan 25 15:10:29 2016 +0100 @@ -1,3 +1,65 @@ +2016-01-25 Jiri Vanek + + Fixed various cosmetic NPEs when codebase is null (+tests) + * NEWS: mentioned PR2489 + * netx/net/sourceforge/jnlp/JNLPFile.java: added method getNotNullProbalbeCodeBase + workaround cases when codebase is null (for various output reasons) + * netx/net/sourceforge/jnlp/PluginBridge.java: using getNotNullProbalbeCodeBase + when fixing codebase during generation of jnlp stub. + * netx/net/sourceforge/jnlp/SecurityDesc.java: same for generating uri for policies + record + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (manageExternalJars) + same for ref string comparsion + * netx/net/sourceforge/jnlp/security/SecurityDialog.java: same for visible form of + codebase + * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: same + * netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java: + same + * netx/net/sourceforge/jnlp/security/dialogs/TemporaryPermissionsButton.java: + same + * netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/PartiallySignedAppTrustWarningPanel.java: + same + * netx/net/sourceforge/jnlp/util/UrlUtils.java: (normalizeUrlAndStripParams) and + (removeFileName) when input is null, return null. + * tests/junit-runner/JunitLikeXmlOutputListener.java: now supports hg commits + * tests/reproducers/signed/CodebasesAttsSigned/srcs/CodebasesAttsSigned.java: + test printing "hardocded" id and paramet to know jar and calling jnlp/html source + * tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSigned.html.in: + resouirce capable of substitue id param, codebase, jar and htmlHref + * tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedApp.jnlp.in: + same + * tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedApplet.jnlp.in: + same + * tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedJnlpHref.html.in: + same + * tests/reproducers/signed/CodebasesAttsSigned/testcases/CodebasesAttsSignedDialogsTest1.java: + Test testing various dialogues of signed app. Including tests for corrupted signature + * tests/reproducers/simple/CodebasesAtts/srcs/CodebasesAtts.java: same as CodebasesAttsSigned + but not signed + * tests/reproducers/simple/CodebasesAtts/resources/CodebasesAtts.html.in: + same as signed ones + * tests/reproducers/simple/CodebasesAtts/resources/CodebasesAttsApp.jnlp.in: + same + * tests/reproducers/simple/CodebasesAtts/resources/CodebasesAttsApplet.jnlp.in: + same + * tests/reproducers/simple/CodebasesAtts/resources/CodebasesAttsJnlpHref.html.in: + same + * tests/reproducers/simple/CodebasesAtts/testcases/CodebasesAttsDialogsTest1.java: + same + * tests/reproducers/simple/CodebasesAtts/testcases/CodebasesAttsNoDialogsTest1.java: + * tests/reproducers/simple/CodebasesAtts/testcases/CodebasesAttsNoDialogsTest2.java: + * tests/reproducers/simple/CodebasesAtts/testcases/CodebasesAttsNoDialogsTest3.java: + Again tests for various substituted values + * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: + added stubs to create independent instance upon tmp folder and execute browser + upon url. + * tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/firefox/FirefoxProfilesOperator.java: + (copyFile) moved to autocloseable + * tests/test-extensions/net/sourceforge/jnlp/closinglisteners/AutoErrorClosingListener.java: + fixed to not to close on rhino exception + * tests/test-extensions/net/sourceforge/jnlp/closinglisteners/StringBasedClosingListener.java: + condition made protected + 2016-01-19 Jiri Vanek When tagsoup is missing, parsing errors are more informative diff -r 1e58026203fb -r 96d8378c37c6 NEWS --- a/NEWS Tue Jan 19 21:14:51 2016 +0100 +++ b/NEWS Mon Jan 25 15:10:29 2016 +0100 @@ -17,6 +17,7 @@ * PR2591 - IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet * PR2690 - Can't run BOM into JNLP file * PR2669 - remove bash-specific syntax from top level Makefile.am +* PR2489 - various NPEs when codebase is null * comments in deployment.properties now should persists load/save * fixed bug in caching of files with query * fixed issues with recreating of existing shortcut diff -r 1e58026203fb -r 96d8378c37c6 netx/net/sourceforge/jnlp/JNLPFile.java --- a/netx/net/sourceforge/jnlp/JNLPFile.java Tue Jan 19 21:14:51 2016 +0100 +++ b/netx/net/sourceforge/jnlp/JNLPFile.java Mon Jan 25 15:10:29 2016 +0100 @@ -37,6 +37,7 @@ import net.sourceforge.jnlp.runtime.JNLPClassLoader; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.util.ClasspathMatcher; +import net.sourceforge.jnlp.util.UrlUtils; import net.sourceforge.jnlp.util.logging.OutputController; /** @@ -419,6 +420,25 @@ public URL getCodeBase() { return codeBase; } + + /** + * It is not recommended to use this method for internals of itw - use normal getCodeBase rather, as null is expected always except toString calls. + * + * If you are not sure, use getCodeBase and chek null as you need. See that this method is used mostly for xtendedAppletSecuriyty dialogs. + * + * @return the codebase URL for the JNLP file or url of location of calling file (jnlp, hreffed jnlp, or directly html) + */ + public URL getNotNullProbalbeCodeBase() { + if (getCodeBase()!=null){ + return getCodeBase(); + } + try { + return UrlUtils.removeFileName(getSourceLocation()); + } catch (Exception ex) { + OutputController.getLogger().log(ex); + } + return getSourceLocation(); + } /** * @return the information section of the JNLP file as viewed diff -r 1e58026203fb -r 96d8378c37c6 netx/net/sourceforge/jnlp/PluginBridge.java --- a/netx/net/sourceforge/jnlp/PluginBridge.java Tue Jan 19 21:14:51 2016 +0100 +++ b/netx/net/sourceforge/jnlp/PluginBridge.java Mon Jan 25 15:10:29 2016 +0100 @@ -475,7 +475,7 @@ } else { StringBuilder s = new StringBuilder(); s.append("\n" - + "\n") + + "\n") .append(" \n" + " ").append(createJnlpTitle()).append("\n" + " ").append(createJnlpVendor()).append("\n" @@ -540,7 +540,7 @@ } private String fixCommonIsuses(boolean needSecurity, String orig) { - String codebase = getCodeBase().toString(); + String codebase = getNotNullProbalbeCodeBase().toString(); return fixCommonIsuses(needSecurity, orig, codebase, createJnlpTitle(), createJnlpVendor()); } diff -r 1e58026203fb -r 96d8378c37c6 netx/net/sourceforge/jnlp/SecurityDesc.java --- a/netx/net/sourceforge/jnlp/SecurityDesc.java Tue Jan 19 21:14:51 2016 +0100 +++ b/netx/net/sourceforge/jnlp/SecurityDesc.java Mon Jan 25 15:10:29 2016 +0100 @@ -415,11 +415,7 @@ } } try { - URL codebaseOriginal = file.getCodeBase(); - if (codebaseOriginal == null){ - codebaseOriginal =file.fileLocation; - } - final URI codebase = codebaseOriginal.toURI().normalize(); + final URI codebase = file.getNotNullProbalbeCodeBase().toURI().normalize(); final URI host = getHost(codebase); final String codebaseHostUriString = host.toString(); final String urlPermissionUrlString = appendRecursiveSubdirToCodebaseHostString(codebaseHostUriString); diff -r 1e58026203fb -r 96d8378c37c6 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Jan 19 21:14:51 2016 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Jan 25 15:10:29 2016 +0100 @@ -2157,7 +2157,7 @@ if (foundLoader != null) approved = true; - else if (ref.toString().startsWith(file.getCodeBase().toString())) + else if (ref.toString().startsWith(file.getNotNullProbalbeCodeBase().toString())) approved = true; else if (SecurityDesc.ALL_PERMISSIONS.equals(security.getSecurityType())) approved = true; diff -r 1e58026203fb -r 96d8378c37c6 netx/net/sourceforge/jnlp/security/SecurityDialog.java --- a/netx/net/sourceforge/jnlp/security/SecurityDialog.java Tue Jan 19 21:14:51 2016 +0100 +++ b/netx/net/sourceforge/jnlp/security/SecurityDialog.java Mon Jan 25 15:10:29 2016 +0100 @@ -336,7 +336,7 @@ } else if (type == DialogType.AUTHENTICATION) { lpanel = new PasswordAuthenticationPane(sd, sd.extras); } else if (type == DialogType.UNSIGNED_EAS_NO_PERMISSIONS_WARNING) { - lpanel = new MissingPermissionsAttributePanel(sd, sd.file.getTitle(), sd.file.getCodeBase().toExternalForm()); + lpanel = new MissingPermissionsAttributePanel(sd, sd.file.getTitle(), sd.file.getNotNullProbalbeCodeBase().toExternalForm()); } else if (type == DialogType.MISSING_ALACA) { lpanel = new MissingALACAttributePanel(sd, sd.file.getTitle(), (String) sd.extras[0], (String) sd.extras[1]); } else if (type == DialogType.MATCHING_ALACA) { diff -r 1e58026203fb -r 96d8378c37c6 netx/net/sourceforge/jnlp/security/SecurityDialogs.java --- a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Tue Jan 19 21:14:51 2016 +0100 +++ b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Mon Jan 25 15:10:29 2016 +0100 @@ -232,7 +232,7 @@ SecurityDialogMessage message = new SecurityDialogMessage(file); message.dialogType = DialogType.MISSING_ALACA; - String urlToShow = "unknown url"; + String urlToShow = file.getNotNullProbalbeCodeBase().toExternalForm(); if (codeBase != null) { urlToShow = codeBase.toString(); } else { diff -r 1e58026203fb -r 96d8378c37c6 netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java --- a/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java Tue Jan 19 21:14:51 2016 +0100 +++ b/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java Mon Jan 25 15:10:29 2016 +0100 @@ -116,8 +116,8 @@ private static UnsignedAppletActionEntry getMatchingItem(UnsignedAppletActionStorage actionStorage, JNLPFile file, Class id) { return actionStorage.getMatchingItem( UrlUtils.normalizeUrlAndStripParams(file.getSourceLocation(), true /* encode local files */).toString(), - UrlUtils.normalizeUrlAndStripParams(file.getCodeBase(), true /* encode local files */).toString(), - toRelativePaths(getJars(file), file.getCodeBase().toString()), id); + UrlUtils.normalizeUrlAndStripParams(file.getNotNullProbalbeCodeBase(), true /* encode local files */).toString(), + toRelativePaths(getJars(file), file.getNotNullProbalbeCodeBase().toExternalForm()), id); } /* Extract the archives as relative paths */ @@ -140,7 +140,7 @@ try { UnsignedAppletActionEntry oldEntry = getMatchingItem(userActionStorage, file, id); - URL codebase = UrlUtils.normalizeUrlAndStripParams(file.getCodeBase(), true /* encode local files */); + URL codebase = UrlUtils.normalizeUrlAndStripParams(file.getNotNullProbalbeCodeBase(), true /* encode local files */); URL documentbase = UrlUtils.normalizeUrlAndStripParams(file.getSourceLocation(), true /* encode local files */); UrlRegEx codebaseRegex = null; @@ -153,7 +153,7 @@ if (!rememberForCodeBase) { documentbaseRegex = UrlRegEx.quote(documentbase.toExternalForm()); // Match only this applet - archiveMatches = toRelativePaths(getJars(file), file.getCodeBase().toString()); // Match only this applet + archiveMatches = toRelativePaths(getJars(file), file.getNotNullProbalbeCodeBase().toString()); // Match only this applet } else { documentbaseRegex = UrlRegEx.quoteAndStar(UrlUtils.stripFile(documentbase)); // Match any from codebase and sourceFile "base" } diff -r 1e58026203fb -r 96d8378c37c6 netx/net/sourceforge/jnlp/security/dialogs/TemporaryPermissionsButton.java --- a/netx/net/sourceforge/jnlp/security/dialogs/TemporaryPermissionsButton.java Tue Jan 19 21:14:51 2016 +0100 +++ b/netx/net/sourceforge/jnlp/security/dialogs/TemporaryPermissionsButton.java Mon Jan 25 15:10:29 2016 +0100 @@ -178,7 +178,7 @@ policyEditorWindow.asWindow().repaint(); } policyEditorWindow.setModalityType(ModalityType.DOCUMENT_MODAL); - policyEditorWindow.getPolicyEditor().addNewEntry(new PolicyIdentifier(null, Collections.emptySet(), file.getCodeBase().toString())); + policyEditorWindow.getPolicyEditor().addNewEntry(new PolicyIdentifier(null, Collections.emptySet(), file.getNotNullProbalbeCodeBase().toString())); policyEditorWindow.asWindow().setVisible(true); menu.setVisible(false); } diff -r 1e58026203fb -r 96d8378c37c6 netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/PartiallySignedAppTrustWarningPanel.java --- a/netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/PartiallySignedAppTrustWarningPanel.java Tue Jan 19 21:14:51 2016 +0100 +++ b/netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/PartiallySignedAppTrustWarningPanel.java Mon Jan 25 15:10:29 2016 +0100 @@ -100,7 +100,7 @@ try { if (file instanceof PluginBridge) { - from = file.getCodeBase().toExternalForm(); + from = file.getNotNullProbalbeCodeBase().toExternalForm(); } else { from = file.getInformation().getHomepage().toExternalForm(); } diff -r 1e58026203fb -r 96d8378c37c6 netx/net/sourceforge/jnlp/util/UrlUtils.java --- a/netx/net/sourceforge/jnlp/util/UrlUtils.java Tue Jan 19 21:14:51 2016 +0100 +++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java Mon Jan 25 15:10:29 2016 +0100 @@ -52,6 +52,9 @@ private static final String UTF8 = "utf-8"; public static URL normalizeUrlAndStripParams(URL url, boolean encodeFileUrls) { + if (url == null) { + return null; + } try { String[] urlParts = url.toString().split("\\?"); URL strippedUrl = new URL(urlParts[0]); @@ -165,6 +168,9 @@ * @return src without file */ public static URL removeFileName(final URL src) { + if (src == null) { + return src; + } URL nsrc = normalizeUrlAndStripParams(src); String s = nsrc.getPath(); int i1 = s.lastIndexOf("/"); diff -r 1e58026203fb -r 96d8378c37c6 tests/junit-runner/JunitLikeXmlOutputListener.java --- a/tests/junit-runner/JunitLikeXmlOutputListener.java Tue Jan 19 21:14:51 2016 +0100 +++ b/tests/junit-runner/JunitLikeXmlOutputListener.java Mon Jan 25 15:10:29 2016 +0100 @@ -424,6 +424,8 @@ String distro = "http://mail.openjdk.java.net/pipermail/distro-pkg-dev/"; String openjdk = "http://mail.openjdk.java.net/pipermail/"; + String pushHead = "http://icedtea.classpath.org/hg/"; + String pushBranch = "http://icedtea.classpath.org/hg/release/"; if (string.startsWith(distro)) { r[0] = "distro-pkg"; return r; @@ -432,6 +434,14 @@ r[0] = "openjdk"; return r; } + if (string.startsWith(pushBranch)) { + r[0] = "push (branch)"; + return r; + } + if (string.startsWith(pushHead)) { + r[0] = "push (head)"; + return r; + } return r; } @@ -459,5 +469,11 @@ q = createBug("http://lists.fedoraproject.org/pipermail/chinese/2012-January/008868.html"); System.out.println(q[0] + " : " + q[1]); + + q = createBug("http://icedtea.classpath.org/hg/icedtea-web/rev/22b7becd48a7"); + System.out.println(q[0] + " : " + q[1]); + + q = createBug("http://icedtea.classpath.org/hg/release/icedtea-web-1.6/rev/0d9faf51357d"); + System.out.println(q[0] + " : " + q[1]); } } diff -r 1e58026203fb -r 96d8378c37c6 tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSigned.html.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSigned.html.in Mon Jan 25 15:10:29 2016 +0100 @@ -0,0 +1,46 @@ + + + + + + + + + + diff -r 1e58026203fb -r 96d8378c37c6 tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedApp.jnlp.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedApp.jnlp.in Mon Jan 25 15:10:29 2016 +0100 @@ -0,0 +1,55 @@ + + + + + + CodebasesAttsSigned + IcedTea + + PR2489 + + + + + + + + @ID@ + + diff -r 1e58026203fb -r 96d8378c37c6 tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedApplet.jnlp.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedApplet.jnlp.in Mon Jan 25 15:10:29 2016 +0100 @@ -0,0 +1,59 @@ + + + + + + CodebasesAttsSigned + IcedTea + + PR2489 + + + + + + + + + + diff -r 1e58026203fb -r 96d8378c37c6 tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedJnlpHref.html.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedJnlpHref.html.in Mon Jan 25 15:10:29 2016 +0100 @@ -0,0 +1,47 @@ + + + + + + + + + + diff -r 978b3c7070b7 -r 530bb97e9f08 tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedApp.jnlp.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedApp.jnlp.in Wed Jan 27 17:03:41 2016 +0100 @@ -0,0 +1,55 @@ + + + + + + CodebasesAttsSigned + IcedTea + + PR2489 + + + + + + + + @ID@ + + diff -r 978b3c7070b7 -r 530bb97e9f08 tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedApplet.jnlp.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedApplet.jnlp.in Wed Jan 27 17:03:41 2016 +0100 @@ -0,0 +1,59 @@ + + + + + + CodebasesAttsSigned + IcedTea + + PR2489 + + + + + + + + + + diff -r 978b3c7070b7 -r 530bb97e9f08 tests/reproducers/signed/CodebasesAttsSigned/resources/CodebasesAttsSignedJnlpHref.html.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 From jvanek at icedtea.classpath.org Wed Jan 27 16:04:47 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 27 Jan 2016 16:04:47 +0000 Subject: /hg/release/icedtea-web-1.6: 2 new changesets Message-ID: changeset 24ae6bdef1fb in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=24ae6bdef1fb author: Jiri Vanek date: Tue Jan 26 14:20:39 2016 +0100 Revisited some jnlp_href tests. changeset 263e152a6084 in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=263e152a6084 author: Jiri Vanek date: Tue Jan 26 15:18:30 2016 +0100 Messages for Invalid JDK dialog improved a bit. diffstat: ChangeLog | 25 + netx/net/sourceforge/jnlp/resources/Messages.properties | 4 +- netx/net/sourceforge/jnlp/resources/Messages_cs.properties | 4 +- netx/net/sourceforge/jnlp/resources/Messages_de.properties | 4 +- netx/net/sourceforge/jnlp/resources/Messages_pl.properties | 4 +- tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java | 190 +++++++-- tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntrySignedMatching.java | 2 - tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntrySignedNotMatching.java | 10 +- tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntryUnsignedMatching.java | 10 +- tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntryUnsignedNotMatching.java | 10 +- tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java | 14 + 11 files changed, 204 insertions(+), 73 deletions(-) diffs (truncated from 552 to 500 lines): diff -r 530bb97e9f08 -r 263e152a6084 ChangeLog --- a/ChangeLog Wed Jan 27 17:03:41 2016 +0100 +++ b/ChangeLog Tue Jan 26 15:18:30 2016 +0100 @@ -1,3 +1,28 @@ +2016-01-26 Jiri Vanek + + Messages for Invalid JDK dialog improved a bit. + * netx/net/sourceforge/jnlp/resources/Messages.properties: + * netx/net/sourceforge/jnlp/resources/Messages_cs.properties: + * netx/net/sourceforge/jnlp/resources/Messages_de.properties: + * netx/net/sourceforge/jnlp/resources/Messages_pl.properties: + +2016-01-26 Jiri Vanek + + Revisited some jnlp_href tests. + * tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java: + explained why localtests on "." are passing (removed KnownToFail) and added + (correctly failing) tests in various dirs + * tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntrySignedMatching.java: + used diamond + * tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntrySignedNotMatching.java: + same + * tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntryUnsignedMatching.java: + same + * tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntryUnsignedNotMatching.java: + same + * tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java: + fixed midori incompatible tests + 2016-01-25 Jiri Vanek Fixed various cosmetic NPEs when codebase is null (+tests) diff -r 530bb97e9f08 -r 263e152a6084 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Wed Jan 27 17:03:41 2016 +0100 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Jan 26 15:18:30 2016 +0100 @@ -582,8 +582,8 @@ CPJVMnoRtJar=Error, the directory you chose does not contain lib/rt.jar CPJVMrtJar=Ok, the directory you chose contains lib/rt.jar. CPJVMPluginAllowTTValidation=Validate JRE immediately -CPJVMNotokMessage1=You have entered invalid JDK value ({0}) with following error message: -CPJVMNotokMessage2=You might be seeing this message because:
* Some validity tests have not been passed
* Non-OpenJDK is detected
With invalid JDK IcedTea-Web will probably not be able to start.
You will have to modify or remove {0} property in your configuration file {1}.
You should try to search for OpenJDK in your system or be sure you know what you are doing. +CPJVMNotokMessage1=You have entered invalid JDK value:
  • {0}
with following error message: +CPJVMNotokMessage2=You might be seeing this message because:
* Some validity tests have not been passed
* Non-OpenJDK is detected
With invalid JDK IcedTea-Web will probably not be able to start.
If it will break, you have to modify or remove {0} property in your configuration file:
  • {1}
You should trust yours admin or at least try to search for OpenJDK in your system or be sure you know what you are doing. CPJVMconfirmInvalidJdkTitle=Confirm invalid JDK CPJVMconfirmReset=Reset to default? CPPolicyDetail=View or edit your user-level Java Policy File. This allows you to grant or deny runtime permissions to applets regardless of the standard security sandboxing rules. diff -r 530bb97e9f08 -r 263e152a6084 netx/net/sourceforge/jnlp/resources/Messages_cs.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Wed Jan 27 17:03:41 2016 +0100 +++ b/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Tue Jan 26 15:18:30 2016 +0100 @@ -537,8 +537,8 @@ CPJVMnoRtJar=Chyba: adres\u00e1\u0159, kter\u00fd jste vybrali, neobsahuje podadres\u00e1\u0159 a soubor \u201elib/rt.jar\u201c. CPJVMrtJar=OK, adres\u00e1\u0159, kter\u00fd jste vybrali, obsahuje podadres\u00e1\u0159 a soubor \u201elib/rt.jar\u201c. CPJVMPluginAllowTTValidation=Ov\u011b\u0159it prost\u0159ed\u00ed JRE ihned -CPJVMNotokMessage1=Zadali jste neplatnou hodnotu ({0}) prost\u0159ed\u00ed JDK. Chybov\u00e1 zpr\u00e1va: -CPJVMNotokMessage2=Tuto zpr\u00e1vu vid\u00edte pravd\u011bpodobn\u011b proto\u017ee:
* V\u00e1\u0161 syst\u00e9m nepro\u0161el n\u011bkter\u00fdm z ov\u011b\u0159ovac\u00edch test\u016f
* Bylo detekov\u00e1no jin\u00e9 prost\u0159ed\u00ed ne\u017e OpenJDK
S neplatn\u00fdm prost\u0159ed\u00edm JDK nebude se pravd\u011bpodobn\u011b nebude aplikace IcedTea-Web schopna spustit.
Budete muset upravit nebo odstranit vlastnost {0} ve va\u0161em konfigura\u010dn\u00edm souboru {1}.
M\u011bli byste ve sv\u00e9m syst\u00e9mu nal\u00e9zt prost\u0159ed\u00ed OpenJDK, nebo byste m\u011bli dob\u0159e v\u011bd\u011bt, co d\u011bl\u00e1te. +CPJVMNotokMessage1=Zadali jste neplatnou hodnotu:
  • {0}
prost\u0159ed\u00ed JDK. Chybov\u00e1 zpr\u00e1va: +CPJVMNotokMessage2=Tuto zpr\u00e1vu vid\u00edte pravd\u011bpodobn\u011b proto\u017ee:
* V\u00e1\u0161 syst\u00e9m nepro\u0161el n\u011bkter\u00fdm z ov\u011b\u0159ovac\u00edch test\u016f
* Bylo detekov\u00e1no jin\u00e9 prost\u0159ed\u00ed ne\u017e OpenJDK
S neplatn\u00fdm prost\u0159ed\u00edm JDK nebude se pravd\u011bpodobn\u011b nebude aplikace IcedTea-Web schopna spustit.
Pokud se ITW rozbije, pudete muset upravit nebo odstranit vlastnost
  • {1}
ve va\u0161em konfigura\u010dn\u00edm souboru {1}.
Rad\u011bji v\u011b\u0159te sv\u00e9mu adminovi, nebo aleso\u0148 ve sv\u00e9m syst\u00e9mu najd\u011bte prost\u0159ed\u00ed OpenJDK, nebo byste m\u011bli dob\u0159e v\u011bd\u011bt, co d\u011bl\u00e1te. CPJVMconfirmInvalidJdkTitle=Potvrzen\u00ed neplatn\u00e9ho prost\u0159ed\u00ed JDK CPJVMconfirmReset=Obnovit v\u00fdchoz\u00ed nastaven\u00ed? CPPolicyDetail=Zobrazen\u00ed nebo upravov\u00e1n\u00ed va\u0161eho u\u017eivatelsk\u00e9ho souboru se z\u00e1sadami prost\u0159ed\u00ed Java: Toto nastaven\u00ed v\u00e1m umo\u017en\u00ed ud\u011blit nebo odep\u0159\u00edt opr\u00e1vn\u011bn\u00ed modulu runtime pro aplet bez ohledu na standardn\u00ed bezpe\u010dnostn\u00ed pravidla pro pr\u00e1ci v izolovan\u00e9m prostoru (sandbox). diff -r 530bb97e9f08 -r 263e152a6084 netx/net/sourceforge/jnlp/resources/Messages_de.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_de.properties Wed Jan 27 17:03:41 2016 +0100 +++ b/netx/net/sourceforge/jnlp/resources/Messages_de.properties Tue Jan 26 15:18:30 2016 +0100 @@ -578,8 +578,8 @@ CPJVMnoRtJar=Fehler: Das gew\u00e4hlte Verzeichnis enth\u00e4lt lib/rt.jar nicht. CPJVMrtJar=Das Verzeichnis enth\u00e4lt lib/rt.jar. CPJVMPluginAllowTTValidation=JRE sofort pr\u00fcfen -CPJVMNotokMessage1=Es wurde der ung\u00fcltige JDK-Wert ({0}) mit folgender Fehlermeldung eingegeben: -CPJVMNotokMessage2=M\u00f6gliche Gr\u00fcnde f\u00fcr diese Meldung sind:
* Einige Pr\u00fcftests wurden nicht bestanden
* Es wurde kein OpenJDK erkannt
Wegen eines ungeeigneten JDKs wird IcedTea-Web wahrscheinlich nicht starten k\u00f6nnen.
Die Eigenschaft {0} in der Konfigurationsdatei {1} m\u00fcsste angepasst oder entfernt werden.
Es wird empfohlen nach OpenJDK auf diesem System zu suchen. +CPJVMNotokMessage1=Es wurde der ung\u00fcltige JDK-Wert
  • {0}
mit folgender Fehlermeldung eingegeben: +CPJVMNotokMessage2=M\u00f6gliche Gr\u00fcnde f\u00fcr diese Meldung sind:
* Einige Pr\u00fcftests wurden nicht bestanden
* Es wurde kein OpenJDK erkannt
Wegen eines ungeeigneten JDKs wird IcedTea-Web wahrscheinlich nicht starten k\u00f6nnen.
Die Eigenschaft {0} in der Konfigurationsdatei
  • {1}
m\u00fcsste angepasst oder entfernt werden.
Es wird empfohlen nach OpenJDK auf diesem System zu suchen. CPJVMconfirmInvalidJdkTitle=Ungeeignetes JDK CPJVMconfirmReset=Auf Standard zur\u00fccksetzen? CPPolicyDetail=Die Java-Richtliniendatei des aktuellen Benutzers anschauen und bearbeiten.
Dies erlaubt Laufzeitberechtigungen an Applets zu gew\u00e4hren oder abzulehnen, unabh\u00e4ngig von den Sandbox-Standardsicherheitsregeln. diff -r 530bb97e9f08 -r 263e152a6084 netx/net/sourceforge/jnlp/resources/Messages_pl.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_pl.properties Wed Jan 27 17:03:41 2016 +0100 +++ b/netx/net/sourceforge/jnlp/resources/Messages_pl.properties Tue Jan 26 15:18:30 2016 +0100 @@ -423,8 +423,8 @@ CPJVMnoRtJar=B\u0142\u0105d: Wybrana \u015bcie\u017cka nie zawiera lib/rt.jar. CPJVMrtJar=Wybrana \u015bcie\u017cka zawiera lib/rt.jar. CPJVMPluginAllowTTValidation=Sprawd\u017a JRE bezzw\u0142ocznie -CPJVMNotokMessage1=Wprowadzono nieprawid\u0142ow\u0105 warto\u015b\u0107 JDK ({0}) z nast\u0119puj\u0105cym komunikatem o b\u0142\u0119dzie: -CPJVMNotokMessage2=Przyczyn\u0105 tego komunikatu mog\u0105 by\u0107:
* Nie zaliczono niekt\u00f3rych sprawdzian\u00f3w
* Wykryto inny ni\u017c OpenJDK
Ze wzgl\u0119du na nieprawid\u0142owy JDK IcedTea-Web prawdopodobnie nie b\u0119dzie w stanie wystartowa\u0107.
Trzeba b\u0119dzie dostosowa\u0107 lub usun\u0105\u0107 w\u0142a\u015bciwo\u015b\u0107 \u201e{0}\u201d w pliku konfiguracyjnym \u201e{1}\u201d.
Przeszukaj system za OpenJDK. +CPJVMNotokMessage1=Wprowadzono nieprawid\u0142ow\u0105 warto\u015b\u0107 JDK
  • {0}
z nast\u0119puj\u0105cym komunikatem o b\u0142\u0119dzie: +CPJVMNotokMessage2=Przyczyn\u0105 tego komunikatu mog\u0105 by\u0107:
* Nie zaliczono niekt\u00f3rych sprawdzian\u00f3w
* Wykryto inny ni\u017c OpenJDK
Ze wzgl\u0119du na nieprawid\u0142owy JDK IcedTea-Web prawdopodobnie nie b\u0119dzie w stanie wystartowa\u0107.
Trzeba b\u0119dzie dostosowa\u0107 lub usun\u0105\u0107 w\u0142a\u015bciwo\u015b\u0107 \u201e{0}\u201d w pliku konfiguracyjnym
  • {1}

Przeszukaj system za OpenJDK. CPJVMconfirmInvalidJdkTitle=Nieprawid\u0142owy JDK CPJVMconfirmReset=Przywr\u00f3ci\u0107 stan domy\u015blny? CPPolicyDetail=Przegl\u0105daj i edytuj plik u\u017cytkownika wytycznej Java. Pozwala na udzielanie lub odmawianie praw applet-om, niezale\u017cnie od standardowych regu\u0142 bezpiecze\u0144stwa piaskownicy. diff -r 530bb97e9f08 -r 263e152a6084 tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java --- a/tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java Wed Jan 27 17:03:41 2016 +0100 +++ b/tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java Tue Jan 26 15:18:30 2016 +0100 @@ -1,59 +1,74 @@ /* ClasspathManifestTest.java -Copyright (C) 2012 Red Hat, Inc. + Copyright (C) 2012 Red Hat, Inc. -This file is part of IcedTea. + This file is part of IcedTea. -IcedTea is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 2. + IcedTea is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2. -IcedTea 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 for more details. + IcedTea 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 for more details. -You should have received a copy of the GNU General Public License -along with IcedTea; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. + You should have received a copy of the GNU General Public License + along with IcedTea; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. */ +import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import net.sourceforge.jnlp.ProcessResult; import net.sourceforge.jnlp.ServerAccess; -import net.sourceforge.jnlp.annotations.KnownToFail; import net.sourceforge.jnlp.annotations.NeedsDisplay; import net.sourceforge.jnlp.annotations.TestInBrowsers; import net.sourceforge.jnlp.browsertesting.BrowserTest; import net.sourceforge.jnlp.browsertesting.Browsers; +import net.sourceforge.jnlp.browsertesting.browsers.firefox.FirefoxProfilesOperator; +import net.sourceforge.jnlp.util.FileUtils; +import org.junit.AfterClass; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; public class ClasspathManifestTest extends BrowserTest { - private static String s1 = "Searching for CheckForClasspath."; - private static String s2 = "CheckForClasspath found on classpath."; - private static String ss = "xception"; + private static final String s1 = "Searching for CheckForClasspath."; + private static final String s2 = "CheckForClasspath found on classpath."; + private static final String ss = "xception"; + + private static final String n1 = "ClasspathManifestJNLPHrefTest.html"; + private static final String n4 = "ClasspathManifestApplicationTest.jnlp"; + private static final String n2 = "ClasspathManifestAppletTest.jnlp"; + private static final String n3 = "ClasspathManifestAppletTest.html"; + private static final String[] ns = new String[]{n1, n2, n3, n4}; + private static final String n0 = "ClasspathManifestTest.jar"; + + private static File newRoot; + private static File newRoot1; public void checkAppFails(ProcessResult pr, String testName) { Assert.assertTrue("ClasspathManifest." + testName + " stdout should contain " + s1 + " but didn't", pr.stdout.contains(s1)); @@ -61,69 +76,148 @@ Assert.assertTrue("ClasspathManifest." + testName + " stderr should contain " + ss + " but didn't", pr.stderr.contains(ss)); } + public void checkAppPass(ProcessResult pr, String testName) { + Assert.assertTrue("ClasspathManifest." + testName + " stdout should contain " + s1 + " but didn't", pr.stdout.contains(s1)); + Assert.assertTrue("ClasspathManifest." + testName + " stdout should not contain " + s2 + " but did", pr.stdout.contains(s2)); + Assert.assertFalse("ClasspathManifest." + testName + " stderr should contain " + ss + " but didn't", pr.stderr.contains(ss)); + } + + @AfterClass + public static void removeAlternativeLocalDirs() throws IOException { + FirefoxProfilesOperator.deleteRecursively(newRoot); + } + + @BeforeClass + public static void createAlternativeLocalDirs() throws IOException { + newRoot = File.createTempFile("itw", "ClasspathManifestTest"); + newRoot.delete(); + newRoot.mkdirs(); + newRoot.deleteOnExit(); + newRoot1 = new File(newRoot, "r1"); + newRoot1.mkdir(); + FirefoxProfilesOperator.copyRecursively(new File(server.getDir(), "Classpath"), newRoot); + + for (String n : ns) { + copyTextFile(new File(server.getDir(), n), new File(newRoot, n)); + } + FirefoxProfilesOperator.copyFile(new File(server.getDir(), n0), new File(newRoot1, n0)); + } + + public static void copyTextFile(File from, File to) throws IOException { + String s = FileUtils.loadFileAsString(from); +// for (String n : ns) { +// s = s.replaceAll(n, newRoot1.getName()+"/" + n); +// } + s = s.replaceAll(n0, newRoot1.getName() + "/" + n0); + FileUtils.saveFile(s, to); + } + @NeedsDisplay @Test public void ApplicationJNLPRemoteTest() throws Exception { - ProcessResult pr = server.executeJavawsHeadless(null, "/ClasspathManifestApplicationTest.jnlp"); + ProcessResult pr = server.executeJavawsHeadless(null, "/" + n4); checkAppFails(pr, "ApplicationJNLPRemoteTest"); } + /** + * See the difference between *LocalTest() and *LocalTest_differentDir(). + * + * Itw always have "." on classpath. So + * + * ./jnlp or ./html (calling to jar.jar) + ./jar.jar + + * ./Codebase/../second.jar are all on classapth but ./jnlp or ./html + * (calling to someDir/jar.jar)+ ./someDir/jar.jar + + * ./Codebase/../second.jar Is making the jar.jar laodable for startup, but + * diapearing after encauntering Class-Path: in Manifest.mf + * + * @throws Exception + */ @NeedsDisplay - @KnownToFail @Test public void ApplicationJNLPLocalTest() throws Exception { - List commands=new ArrayList(3); + List commands = new ArrayList<>(3); commands.add(server.getJavawsLocation()); commands.add(ServerAccess.HEADLES_OPTION); - commands.add("ClasspathManifestApplicationTest.jnlp"); + commands.add(n4); ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir()); - checkAppFails(pr, "ApplicationJNLPLocalTest"); + checkAppPass(pr, "ApplicationJNLPLocalTest"); + } + + @NeedsDisplay + @Test + public void ApplicationJNLPLocalTest_differentDir() throws Exception { + List commands = new ArrayList<>(3); + commands.add(server.getJavawsLocation()); + commands.add(ServerAccess.HEADLES_OPTION); + commands.add(n4); + ProcessResult pr = ServerAccess.executeProcess(commands, newRoot); + checkAppFails(pr, "ApplicationJNLPLocalTest_differentDir"); } @NeedsDisplay @Test public void AppletJNLPRemoteTest() throws Exception { - ProcessResult pr = server.executeJavawsHeadless(null, "/ClasspathManifestAppletTest.jnlp"); + ProcessResult pr = server.executeJavawsHeadless(null, "/" + n2); checkAppFails(pr, "AppletJNLPRemoteTest"); } @NeedsDisplay - @KnownToFail @Test public void AppletJNLPRLocalTest() throws Exception { - List commands=new ArrayList(3); + List commands = new ArrayList<>(3); commands.add(server.getJavawsLocation()); commands.add(ServerAccess.HEADLES_OPTION); - commands.add("ClasspathManifestAppletTest.jnlp"); + commands.add(n2); ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir()); - checkAppFails(pr, "AppletJNLPRLocalTest"); + checkAppPass(pr, "AppletJNLPRLocalTest"); + } + + @NeedsDisplay + @Test + public void AppletJNLPRLocalTest_differentDir() throws Exception { + List commands = new ArrayList<>(3); + commands.add(server.getJavawsLocation()); + commands.add(ServerAccess.HEADLES_OPTION); + commands.add(n2); + ProcessResult pr = ServerAccess.executeProcess(commands, newRoot); + checkAppFails(pr, "AppletJNLPRLocalTest_differentDir"); } @NeedsDisplay @TestInBrowsers(testIn = {Browsers.one}) @Test public void BrowserJNLPHrefRemoteTest() throws Exception { - ProcessResult pr = server.executeBrowser("/ClasspathManifestJNLPHrefTest.html"); + ProcessResult pr = server.executeBrowser("/" + n1); checkAppFails(pr, "BrowserJNLPHrefRemoteTest"); } @NeedsDisplay @TestInBrowsers(testIn = {Browsers.one}) - @KnownToFail @Test public void BrowserJNLPHrefLocalTest() throws Exception { - List commands=new ArrayList(2); + List commands = new ArrayList<>(2); commands.add(server.getBrowserLocation()); - commands.add("ClasspathManifestJNLPHrefTest.html"); + commands.add(n1); ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir()); - checkAppFails(pr, "BrowserJNLPHrefLocalTest"); + checkAppPass(pr, "BrowserJNLPHrefLocalTest"); + } + + @NeedsDisplay + @TestInBrowsers(testIn = {Browsers.one}) + @Test + public void BrowserJNLPHrefLocalTest_differentDir() throws Exception { + List commands = new ArrayList<>(2); + commands.add(server.getBrowserLocation()); + commands.add(n1); + ProcessResult pr = ServerAccess.executeProcess(commands, newRoot); + checkAppFails(pr, "BrowserJNLPHrefLocalTest_differentDir"); } @NeedsDisplay @TestInBrowsers(testIn = {Browsers.one}) @Test public void BrowserAppletRemoteTest() throws Exception { - ProcessResult pr = server.executeBrowser("/ClasspathManifestAppletTest.html"); + ProcessResult pr = server.executeBrowser("/" + n3); Assert.assertTrue("ClasspathManifest.BrowserAppletRemoteTest stdout should contain " + s1 + " but didn't", pr.stdout.contains(s1)); // Should be the only one to search manifest for classpath. Assert.assertTrue("ClasspathManifest.BrowserAppletRemoteTest stdout should contain " + s2 + " but didn't", pr.stdout.contains(s2)); diff -r 530bb97e9f08 -r 263e152a6084 tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntrySignedMatching.java --- a/tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntrySignedMatching.java Wed Jan 27 17:03:41 2016 +0100 +++ b/tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntrySignedMatching.java Tue Jan 26 15:18:30 2016 +0100 @@ -37,10 +37,8 @@ import java.io.File; import java.io.IOException; -import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; -import java.util.PropertyResourceBundle; import net.sourceforge.jnlp.ProcessResult; import net.sourceforge.jnlp.ServerAccess; import net.sourceforge.jnlp.annotations.NeedsDisplay; diff -r 530bb97e9f08 -r 263e152a6084 tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntrySignedNotMatching.java --- a/tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntrySignedNotMatching.java Wed Jan 27 17:03:41 2016 +0100 +++ b/tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntrySignedNotMatching.java Tue Jan 26 15:18:30 2016 +0100 @@ -74,7 +74,7 @@ @NeedsDisplay @Test public void ApplicationJNLPLocalTest() throws Exception { - List commands = new ArrayList(3); + List commands = new ArrayList<>(3); commands.add(server.getJavawsLocation()); commands.add(ServerAccess.HEADLES_OPTION); commands.add(GENERAL_NAME + SIGNATURE + ".jnlp"); @@ -90,7 +90,7 @@ @Test public void ApplicationJNLPLocalTestWithRemoteCodebase() throws Exception { prepareCopyFile(); - List commands = new ArrayList(3); + List commands = new ArrayList<>(3); commands.add(server.getJavawsLocation()); commands.add(ServerAccess.HEADLES_OPTION); commands.add(GENERAL_NAME + SIGNATURE + "_copy.jnlp"); @@ -109,7 +109,7 @@ @NeedsDisplay @Test public void AppletJNLPRLocalTest() throws Exception { - List commands = new ArrayList(3); + List commands = new ArrayList<>(3); commands.add(server.getJavawsLocation()); commands.add(ServerAccess.HEADLES_OPTION); commands.add(GENERAL_NAME + SIGNATURE + "Applet.jnlp"); @@ -132,7 +132,7 @@ @TestInBrowsers(testIn = {Browsers.one}) @Test public void BrowserJNLPHrefLocalTest() throws Exception { - List commands = new ArrayList(2); + List commands = new ArrayList<>(2); commands.add(server.getBrowserLocation()); commands.add(GENERAL_NAME + SIGNATURE + "Jnlp.html"); ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir(), new AutoOkClosingListener(), null); @@ -144,7 +144,7 @@ @TestInBrowsers(testIn = {Browsers.one}) @Test public void BrowserAppletLocalTest() throws Exception { - List commands = new ArrayList(2); + List commands = new ArrayList<>(2); commands.add(server.getBrowserLocation()); commands.add(GENERAL_NAME + SIGNATURE + ".html"); ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir(), new AutoOkClosingListener(), null); diff -r 530bb97e9f08 -r 263e152a6084 tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntryUnsignedMatching.java --- a/tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntryUnsignedMatching.java Wed Jan 27 17:03:41 2016 +0100 +++ b/tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntryUnsignedMatching.java Tue Jan 26 15:18:30 2016 +0100 @@ -71,7 +71,7 @@ @Test public void ApplicationJNLPLocalTest() throws Exception { - List commands = new ArrayList(3); + List commands = new ArrayList<>(3); commands.add(server.getJavawsLocation()); commands.add(ServerAccess.HEADLES_OPTION); commands.add(GENERAL_NAME + SIGNATURE + ".jnlp"); @@ -86,7 +86,7 @@ @Test public void ApplicationJNLPLocalTestWithRemoteCodebase() throws Exception { prepareCopyFile(); - List commands = new ArrayList(3); + List commands = new ArrayList<>(3); commands.add(server.getJavawsLocation()); commands.add(ServerAccess.HEADLES_OPTION); commands.add(GENERAL_NAME + SIGNATURE + "_copy.jnlp"); @@ -106,7 +106,7 @@ @NeedsDisplay @Test public void AppletJNLPRLocalTest() throws Exception { - List commands = new ArrayList(3); + List commands = new ArrayList<>(3); commands.add(server.getJavawsLocation()); commands.add(ServerAccess.HEADLES_OPTION); commands.add(GENERAL_NAME + SIGNATURE + "Applet.jnlp"); @@ -128,7 +128,7 @@ @TestInBrowsers(testIn = {Browsers.one}) @Test public void BrowserJNLPHrefLocalTest() throws Exception { - List commands = new ArrayList(2); + List commands = new ArrayList<>(2); commands.add(server.getBrowserLocation()); commands.add(GENERAL_NAME + SIGNATURE + "Jnlp.html"); ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir(), new AutoOkClosingListener(), null); @@ -140,7 +140,7 @@ @TestInBrowsers(testIn = {Browsers.one}) @Test public void BrowserAppletLocalTest() throws Exception { - List commands = new ArrayList(2); + List commands = new ArrayList<>(2); commands.add(server.getBrowserLocation()); commands.add(GENERAL_NAME + SIGNATURE + ".html"); ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir(), new AutoOkClosingListener(), null); diff -r 530bb97e9f08 -r 263e152a6084 tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntryUnsignedNotMatching.java --- a/tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntryUnsignedNotMatching.java Wed Jan 27 17:03:41 2016 +0100 +++ b/tests/reproducers/signed/CodeBaseManifestEntrySignedMatching/testcases/CodeBaseManifestEntryUnsignedNotMatching.java Tue Jan 26 15:18:30 2016 +0100 @@ -73,7 +73,7 @@ @Test public void ApplicationJNLPLocalTest() throws Exception { - List commands = new ArrayList(3); + List commands = new ArrayList<>(3); commands.add(server.getJavawsLocation()); commands.add(ServerAccess.HEADLES_OPTION); commands.add(GENERAL_NAME + SIGNATURE + ".jnlp"); @@ -88,7 +88,7 @@ @Test public void ApplicationJNLPLocalTestWithRemoteCodebase() throws Exception { prepareCopyFile(); - List commands = new ArrayList(3); + List commands = new ArrayList<>(3); commands.add(server.getJavawsLocation()); commands.add(ServerAccess.HEADLES_OPTION); commands.add(GENERAL_NAME + SIGNATURE + "_copy.jnlp"); @@ -108,7 +108,7 @@ @NeedsDisplay @Test public void AppletJNLPRLocalTest() throws Exception { - List commands = new ArrayList(3); + List commands = new ArrayList<>(3); From aph at redhat.com Wed Jan 27 16:06:27 2016 From: aph at redhat.com (Andrew Haley) Date: Wed, 27 Jan 2016 16:06:27 +0000 Subject: RFR: aarch64: Backports from jdk8 to jdk7 In-Reply-To: <1453910495.4666.6.camel@mylittlepony.linaroharston> References: <1453910495.4666.6.camel@mylittlepony.linaroharston> Message-ID: <56A8EB03.4030303@redhat.com> On 01/27/2016 04:01 PM, Edward Nevill wrote: > Is it OK to backport the following changesets from jdk8 to jdk7? Only aarch64 specific files are changed. Yes, please. These are all nasty crasher bugs. Andrew. From bugzilla-daemon at icedtea.classpath.org Wed Jan 27 16:07:37 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jan 2016 16:07:37 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #14 from JiriVanek --- Hello 2. Neon! http://icedtea.classpath.org/hg/release/icedtea-web-1.6/ The patch is backported (with a bit of blood) to 1.6) If you will be able to test this branch on your case before release of 1.6.2, it would be really really helpful. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From enevill at icedtea.classpath.org Wed Jan 27 16:09:25 2016 From: enevill at icedtea.classpath.org (enevill at icedtea.classpath.org) Date: Wed, 27 Jan 2016 16:09:25 +0000 Subject: /hg/icedtea7-forest/hotspot: 5 new changesets Message-ID: changeset bf7090ef17e9 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=bf7090ef17e9 author: hshi date: Thu Nov 26 15:37:04 2015 +0000 8143584: Load constant pool tag and class status with load acquire Reviewed-by: roland, aph changeset 450160531b54 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=450160531b54 author: aph date: Wed Dec 16 11:35:59 2015 +0000 8144582: AArch64 does not generate correct branch profile data Reviewed-by: kvn changeset 06ae64257dad in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=06ae64257dad author: fyang date: Mon Dec 07 21:14:56 2015 +0800 8144201: aarch64: jdk/test/com/sun/net/httpserver/Test6a.java fails with --enable-unlimited-crypto Summary: Fix typo in stub generate_cipherBlockChaining_decryptAESCrypt Reviewed-by: roland changeset c07fdacd4144 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=c07fdacd4144 author: hshi date: Wed Jan 20 04:56:51 2016 -0800 8147805: aarch64: C1 segmentation fault due to inline Unsafe.getAndSetObject Summary: In Aarch64 LIR_Assembler.atomic_op, keep stored data reference register in decompressed forms as it may be used later Reviewed-by: aph Contributed-by: hui.shi at linaro.org, felix.yang at linaro.org changeset f0eabae221c8 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=f0eabae221c8 author: enevill date: Tue Jan 26 14:04:01 2016 +0000 8148240: aarch64: random infrequent null pointer exceptions in javac Summary: Disable fp as an allocatable register Reviewed-by: aph diffstat: src/cpu/aarch64/vm/aarch64.ad | 4 ++-- src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 3 ++- src/cpu/aarch64/vm/stubGenerator_aarch64.cpp | 2 +- src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp | 2 +- src/cpu/aarch64/vm/templateTable_aarch64.cpp | 12 ++++++++---- 5 files changed, 14 insertions(+), 9 deletions(-) diffs (101 lines): diff -r bd546c6e4aa5 -r f0eabae221c8 src/cpu/aarch64/vm/aarch64.ad --- a/src/cpu/aarch64/vm/aarch64.ad Mon Jan 11 18:14:16 2016 +0000 +++ b/src/cpu/aarch64/vm/aarch64.ad Tue Jan 26 14:04:01 2016 +0000 @@ -447,7 +447,7 @@ R26 /* R27, */ // heapbase /* R28, */ // thread - R29, // fp + /* R29, */ // fp /* R30, */ // lr /* R31 */ // sp ); @@ -481,7 +481,7 @@ R26, R26_H, /* R27, R27_H, */ // heapbase /* R28, R28_H, */ // thread - R29, R29_H, // fp + /* R29, R29_H, */ // fp /* R30, R30_H, */ // lr /* R31, R31_H */ // sp ); diff -r bd546c6e4aa5 -r f0eabae221c8 src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp --- a/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp Mon Jan 11 18:14:16 2016 +0000 +++ b/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp Tue Jan 26 14:04:01 2016 +0000 @@ -2911,7 +2911,8 @@ Register obj = as_reg(data); Register dst = as_reg(dest); if (is_oop && UseCompressedOops) { - __ encode_heap_oop(obj); + __ encode_heap_oop(rscratch1, obj); + obj = rscratch1; } assert_different_registers(obj, addr.base(), tmp, rscratch2, dst); Label again; diff -r bd546c6e4aa5 -r f0eabae221c8 src/cpu/aarch64/vm/stubGenerator_aarch64.cpp --- a/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp Mon Jan 11 18:14:16 2016 +0000 +++ b/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp Tue Jan 26 14:04:01 2016 +0000 @@ -2053,7 +2053,7 @@ __ br(Assembler::EQ, L_rounds_52); __ aesd(v0, v17); __ aesimc(v0, v0); - __ aesd(v0, v17); __ aesimc(v0, v0); + __ aesd(v0, v18); __ aesimc(v0, v0); __ BIND(L_rounds_52); __ aesd(v0, v19); __ aesimc(v0, v0); __ aesd(v0, v20); __ aesimc(v0, v0); diff -r bd546c6e4aa5 -r f0eabae221c8 src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp --- a/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp Mon Jan 11 18:14:16 2016 +0000 +++ b/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp Tue Jan 26 14:04:01 2016 +0000 @@ -400,7 +400,7 @@ __ br(Assembler::LT, *profile_method_continue); // if no method data exists, go to profile_method - __ test_method_data_pointer(r0, *profile_method); + __ test_method_data_pointer(rscratch2, *profile_method); } { diff -r bd546c6e4aa5 -r f0eabae221c8 src/cpu/aarch64/vm/templateTable_aarch64.cpp --- a/src/cpu/aarch64/vm/templateTable_aarch64.cpp Mon Jan 11 18:14:16 2016 +0000 +++ b/src/cpu/aarch64/vm/templateTable_aarch64.cpp Tue Jan 26 14:04:01 2016 +0000 @@ -387,7 +387,8 @@ // get type __ add(r3, r1, tags_offset); - __ ldrb(r3, Address(r0, r3)); + __ lea(r3, Address(r0, r3)); + __ ldarb(r3, r3); // unresolved string - get the resolved string __ cmp(r3, JVM_CONSTANT_UnresolvedString); @@ -3378,7 +3379,8 @@ // how Constant Pool is updated (see constantPoolOopDesc::klass_at_put) const int tags_offset = typeArrayOopDesc::header_size(T_BYTE) * wordSize; __ lea(rscratch1, Address(r0, r3, Address::lsl(0))); - __ ldrb(rscratch1, Address(rscratch1, tags_offset)); + __ lea(rscratch1, Address(rscratch1, tags_offset)); + __ ldarb(rscratch1, rscratch1); __ cmp(rscratch1, JVM_CONSTANT_Class); __ br(Assembler::NE, slow_case); @@ -3520,7 +3522,8 @@ __ get_unsigned_2_byte_index_at_bcp(r19, 1); // r19=index // See if bytecode has already been quicked __ add(rscratch1, r3, typeArrayOopDesc::header_size(T_BYTE) * wordSize); - __ ldrb(r1, Address(rscratch1, r19)); + __ lea(r1, Address(rscratch1, r19)); + __ ldarb(r1, r1); __ cmp(r1, JVM_CONSTANT_Class); __ br(Assembler::EQ, quicked); @@ -3572,7 +3575,8 @@ __ get_unsigned_2_byte_index_at_bcp(r19, 1); // r19=index // See if bytecode has already been quicked __ add(rscratch1, r3, typeArrayOopDesc::header_size(T_BYTE) * wordSize); - __ ldrb(r1, Address(rscratch1, r19)); + __ lea(r1, Address(rscratch1, r19)); + __ ldarb(r1, r1); __ cmp(r1, JVM_CONSTANT_Class); __ br(Assembler::EQ, quicked); From jvanek at redhat.com Wed Jan 27 16:39:53 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 27 Jan 2016 17:39:53 +0100 Subject: Upcoming release of IcedTea-Web-1.6.2 Message-ID: <56A8F2D9.7080604@redhat.com> Hello! 1.6 got quite a lot of bugfixes in last few weeks, and I consider it stable enough to release it. Still I will test it even more deeply, and in meantime I would like to ask any volunteers (or people depending on itw just to ensure yourself) ... To clone http://icedtea.classpath.org/hg/release/icedtea-web-1.6/ (current head is http://icedtea.classpath.org/hg/release/icedtea-web-1.6/rev/263e152a6084) build and test :) If nobody stops me, I will tag and release In few day, no later then in start of next week. Thanx! J. From bugzilla-daemon at icedtea.classpath.org Wed Jan 27 17:49:58 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jan 2016 17:49:58 +0000 Subject: [Bug 2807] Joomgallery Foto-Upload Java Plugin Firefox IcedTea hang In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2807 --- Comment #2 from 563757 at gleisnetze.de --- Hello, I have answered about the Daemon (mail), because I have sent credentials. -- 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 27 22:32:42 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jan 2016 22:32:42 +0000 Subject: [Bug 796] Linking of the plugin does not respect LDFLAGS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=796 James Le Cuirot changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #583 is|0 |1 obsolete| | CC| |chewi at gentoo.org --- Comment #2 from James Le Cuirot --- Created attachment 1502 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1502&action=edit Updated patch to respect LDFLAGS in Makefile.am Jiri, I saw that you are about to release 1.6.2. It would be good to strike this one off the list as it is still an issue for us. Here is an updated patch that adds LDFLAGS in all the relevant places, not just the main plugin target. -- 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 27 22:33:21 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jan 2016 22:33:21 +0000 Subject: [Bug 796] Linking of the plugin does not respect LDFLAGS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=796 James Le Cuirot changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |hg -- 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 27 23:28:25 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jan 2016 23:28:25 +0000 Subject: [Bug 796] Linking of the plugin does not respect LDFLAGS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=796 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu.andrew at redhat.com --- Comment #3 from Andrew John Hughes --- I think you may have gone a bit overboard there; the rules that produce object files (%.o) don't need linker flags. Incidentally, I spot in the context that a bare 'ar' is being used. This needs to be 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 28 01:58:07 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 01:58:07 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #15 from Neon --- we have been snowed out this week with 30" (2.5 ft) of snow. I have not built IcedTea-Web from source, but will look into building the latest 1.6.x from the above URL so that I can validate it on my end here. Do you have any pointers for this? I will be doing this on an el6 system. -- 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 28 02:46:57 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 02:46:57 +0000 Subject: [Bug 2768] [IcedTea8] Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2768 --- Comment #1 from Andrew John Hughes --- This was added to resolve bug 476, but I'm not seeing that failure without the patch. Removing. -- 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 28 03:02:10 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 28 Jan 2016 03:02:10 +0000 Subject: /hg/icedtea8-forest/hotspot: PR2777: Fix MAX/MIN template usage ... Message-ID: changeset c313c4782bb3 in /hg/icedtea8-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea8-forest/hotspot?cmd=changeset;node=c313c4782bb3 author: andrew date: Thu Jan 28 02:50:10 2016 +0000 PR2777: Fix MAX/MIN template usage on s390 Summary: The templates can't be used without casting on s390 as size_t != uintx diffstat: src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp | 2 +- src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 6 ++-- src/share/vm/gc_implementation/g1/concurrentMark.cpp | 2 +- src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 2 +- src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp | 2 +- src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp | 2 +- src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp | 2 +- src/share/vm/gc_implementation/g1/heapRegion.cpp | 2 +- src/share/vm/gc_implementation/parNew/parNewGeneration.cpp | 2 +- src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 4 +- src/share/vm/memory/collectorPolicy.cpp | 14 +++++----- src/share/vm/memory/metaspace.cpp | 8 ++-- src/share/vm/oops/objArrayKlass.inline.hpp | 4 +- src/share/vm/runtime/arguments.cpp | 6 ++-- 14 files changed, 29 insertions(+), 29 deletions(-) diffs (290 lines): diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp --- a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Thu Jan 28 02:50:10 2016 +0000 @@ -2659,7 +2659,7 @@ if (ResizeOldPLAB && CMSOldPLABResizeQuicker) { size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks); n_blks += CMSOldPLABReactivityFactor*multiple*n_blks; - n_blks = MIN2(n_blks, CMSOldPLABMax); + n_blks = MIN2(n_blks, (size_t) CMSOldPLABMax); } assert(n_blks > 0, "Error"); _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl); diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp --- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Thu Jan 28 02:50:10 2016 +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"); - size_t expand_bytes = MAX2(desired_capacity - capacity(), MinHeapDeltaBytes); + size_t expand_bytes = MAX2(desired_capacity - capacity(), (size_t) MinHeapDeltaBytes); if (PrintGCDetails && Verbose) { size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage)); gclog_or_tty->print_cr("\nFrom compute_new_size: "); @@ -6589,7 +6589,7 @@ HeapWord* curAddr = _markBitMap.startWord(); while (curAddr < _markBitMap.endWord()) { size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr); - MemRegion chunk(curAddr, MIN2(CMSBitMapYieldQuantum, remaining)); + MemRegion chunk(curAddr, MIN2((size_t) CMSBitMapYieldQuantum, remaining)); _markBitMap.clear_large_range(chunk); if (ConcurrentMarkSweepThread::should_yield() && !foregroundGCIsActive() && @@ -6887,7 +6887,7 @@ return; } // Double capacity if possible - size_t new_capacity = MIN2(_capacity*2, MarkStackSizeMax); + size_t new_capacity = MIN2(_capacity*2, (size_t) MarkStackSizeMax); // 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 -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/g1/concurrentMark.cpp --- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp Thu Jan 28 02:50:10 2016 +0000 @@ -3903,7 +3903,7 @@ // of things to do) or totally (at the very end). size_t target_size; if (partially) { - target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize); + target_size = MIN2((size_t)_task_queue->max_elems()/3, (size_t) GCDrainStackTargetSize); } else { target_size = 0; } diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu Jan 28 02:50:10 2016 +0000 @@ -1726,7 +1726,7 @@ verify_region_sets_optional(); - size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes); + size_t expand_bytes = MAX2(word_size * HeapWordSize, (size_t) MinHeapDeltaBytes); ergo_verbose1(ErgoHeapSizing, "attempt heap expansion", ergo_format_reason("allocation request failed") diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp --- a/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp Thu Jan 28 02:50:10 2016 +0000 @@ -89,7 +89,7 @@ void pretouch_internal(size_t start_page, size_t end_page); // Returns the index of the page which contains the given address. - uintptr_t addr_to_page_index(char* addr) const; + size_t addr_to_page_index(char* addr) const; // Returns the address of the given page index. char* page_start(size_t index) const; diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp --- a/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp Thu Jan 28 02:50:10 2016 +0000 @@ -38,7 +38,7 @@ _cancel(false), _empty(true), _dropped(0) { - _nqueues = MAX2(ParallelGCThreads, (size_t)1); + _nqueues = MAX2((size_t) ParallelGCThreads, (size_t)1); _queues = NEW_C_HEAP_ARRAY(G1StringDedupWorkerQueue, _nqueues, mtGC); for (size_t i = 0; i < _nqueues; i++) { new (_queues + i) G1StringDedupWorkerQueue(G1StringDedupWorkerQueue::default_segment_size(), _max_cache_size, _max_size); diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp --- a/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Thu Jan 28 02:50:10 2016 +0000 @@ -110,7 +110,7 @@ }; G1StringDedupEntryCache::G1StringDedupEntryCache() { - _nlists = MAX2(ParallelGCThreads, (size_t)1); + _nlists = MAX2((size_t) ParallelGCThreads, (size_t)1); _lists = PaddedArray::create_unfreeable((uint)_nlists); } diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/g1/heapRegion.cpp --- a/src/share/vm/gc_implementation/g1/heapRegion.cpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/gc_implementation/g1/heapRegion.cpp Thu Jan 28 02:50:10 2016 +0000 @@ -108,7 +108,7 @@ uintx region_size = G1HeapRegionSize; if (FLAG_IS_DEFAULT(G1HeapRegionSize)) { size_t average_heap_size = (initial_heap_size + max_heap_size) / 2; - region_size = MAX2(average_heap_size / HeapRegionBounds::target_number(), + region_size = MAX2((uintx) (average_heap_size / HeapRegionBounds::target_number()), (uintx) HeapRegionBounds::min_size()); } diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/parNew/parNewGeneration.cpp --- a/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp Thu Jan 28 02:50:10 2016 +0000 @@ -200,7 +200,7 @@ const size_t num_overflow_elems = of_stack->size(); const size_t space_available = queue->max_elems() - queue->size(); const size_t num_take_elems = MIN3(space_available / 4, - ParGCDesiredObjsFromOverflowList, + (size_t) ParGCDesiredObjsFromOverflowList, num_overflow_elems); // Transfer the most recent num_take_elems from the overflow // stack to our work queue. diff -r be477dd4629d -r c313c4782bb3 src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp --- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Thu Jan 28 02:50:10 2016 +0000 @@ -920,8 +920,8 @@ void PSParallelCompact::initialize_dead_wood_limiter() { const size_t max = 100; - _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0; - _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0; + _dwl_mean = double(MIN2((size_t) ParallelOldDeadWoodLimiterMean, max)) / 100.0; + _dwl_std_dev = double(MIN2((size_t) ParallelOldDeadWoodLimiterStdDev, max)) / 100.0; _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 -r be477dd4629d -r c313c4782bb3 src/share/vm/memory/collectorPolicy.cpp --- a/src/share/vm/memory/collectorPolicy.cpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/memory/collectorPolicy.cpp Thu Jan 28 02:50:10 2016 +0000 @@ -385,7 +385,7 @@ uintx calculated_size = NewSize + OldSize; double shrink_factor = (double) MaxHeapSize / calculated_size; uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment); - FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(), smaller_new_size)); + FLAG_SET_ERGO(uintx, NewSize, MAX2((uintx) young_gen_size_lower_bound(), smaller_new_size)); _initial_gen0_size = NewSize; // OldSize is already aligned because above we aligned MaxHeapSize to @@ -423,7 +423,7 @@ // Determine maximum size of gen0 - size_t max_new_size = 0; + uintx max_new_size = 0; if (!FLAG_IS_DEFAULT(MaxNewSize)) { max_new_size = MaxNewSize; } else { @@ -448,7 +448,7 @@ _initial_gen0_size = max_new_size; _max_gen0_size = max_new_size; } else { - size_t desired_new_size = 0; + uintx desired_new_size = 0; if (FLAG_IS_CMDLINE(NewSize)) { // If NewSize is set on the command line, we must use it as // the initial size and it also makes sense to use it as the @@ -461,7 +461,7 @@ // limit, but use NewRatio to calculate the initial size. _min_gen0_size = NewSize; desired_new_size = - MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize); + MAX2((uintx) (scale_by_NewRatio_aligned(_initial_heap_byte_size)), NewSize); max_new_size = MAX2(max_new_size, NewSize); } else { // For the case where NewSize is the default, use NewRatio @@ -469,9 +469,9 @@ // Use the default NewSize as the floor for these values. If // NewRatio is overly large, the resulting sizes can be too // small. - _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), NewSize); + _min_gen0_size = MAX2((uintx) (scale_by_NewRatio_aligned(_min_heap_byte_size)), NewSize); desired_new_size = - MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize); + MAX2((uintx) (scale_by_NewRatio_aligned(_initial_heap_byte_size)), NewSize); } assert(_min_gen0_size > 0, "Sanity check"); @@ -573,7 +573,7 @@ } else { // It's been explicitly set on the command line. Use the // OldSize and then determine the consequences. - _min_gen1_size = MIN2(OldSize, _min_heap_byte_size - _min_gen0_size); + _min_gen1_size = MIN2(OldSize, (uintx) (_min_heap_byte_size - _min_gen0_size)); _initial_gen1_size = OldSize; // If the user has explicitly set an OldSize that is inconsistent diff -r be477dd4629d -r c313c4782bb3 src/share/vm/memory/metaspace.cpp --- a/src/share/vm/memory/metaspace.cpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/memory/metaspace.cpp Thu Jan 28 02:50:10 2016 +0000 @@ -1455,7 +1455,7 @@ void MetaspaceGC::post_initialize() { // Reset the high-water mark once the VM initialization is done. - _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), MetaspaceSize); + _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), (size_t) MetaspaceSize); } bool MetaspaceGC::can_expand(size_t word_size, bool is_class) { @@ -1515,7 +1515,7 @@ (size_t)MIN2(min_tmp, double(max_uintx)); // Don't shrink less than the initial generation size minimum_desired_capacity = MAX2(minimum_desired_capacity, - MetaspaceSize); + (size_t) MetaspaceSize); if (PrintGCDetails && Verbose) { gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: "); @@ -1573,7 +1573,7 @@ const double max_tmp = used_after_gc / minimum_used_percentage; size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx)); maximum_desired_capacity = MAX2(maximum_desired_capacity, - MetaspaceSize); + (size_t) MetaspaceSize); if (PrintGCDetails && Verbose) { gclog_or_tty->print_cr(" " " maximum_free_percentage: %6.2f" @@ -3285,7 +3285,7 @@ // on the medium chunk list. The next chunk will be small and progress // from there. This size calculated by -version. _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6, - (CompressedClassSpaceSize/BytesPerWord)*2); + (size_t) ((CompressedClassSpaceSize/BytesPerWord)*2)); _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size); // Arbitrarily set the initial virtual space to a multiple // of the boot class loader size. diff -r be477dd4629d -r c313c4782bb3 src/share/vm/oops/objArrayKlass.inline.hpp --- a/src/share/vm/oops/objArrayKlass.inline.hpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/oops/objArrayKlass.inline.hpp Thu Jan 28 02:50:10 2016 +0000 @@ -48,7 +48,7 @@ const size_t beg_index = size_t(index); assert(beg_index < len || len == 0, "index too large"); - const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride); + const size_t stride = MIN2(len - beg_index, (size_t) ObjArrayMarkingStride); const size_t end_index = beg_index + stride; T* const base = (T*)a->base(); T* const beg = base + beg_index; @@ -82,7 +82,7 @@ const size_t beg_index = size_t(index); assert(beg_index < len || len == 0, "index too large"); - const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride); + const size_t stride = MIN2(len - beg_index, (size_t) ObjArrayMarkingStride); const size_t end_index = beg_index + stride; T* const base = (T*)a->base(); T* const beg = base + beg_index; diff -r be477dd4629d -r c313c4782bb3 src/share/vm/runtime/arguments.cpp --- a/src/share/vm/runtime/arguments.cpp Mon Jan 11 17:16:42 2016 +0000 +++ b/src/share/vm/runtime/arguments.cpp Thu Jan 28 02:50:10 2016 +0000 @@ -1264,7 +1264,7 @@ (ParallelGCThreads == 0 ? 1 : ParallelGCThreads); const size_t preferred_max_new_size_unaligned = MIN2(max_heap/(NewRatio+1), ScaleForWordSize(young_gen_per_worker * parallel_gc_threads)); - size_t preferred_max_new_size = + uintx preferred_max_new_size = (uintx) align_size_up(preferred_max_new_size_unaligned, os::vm_page_size()); // Unless explicitly requested otherwise, size young gen @@ -1295,7 +1295,7 @@ " max_heap: " SIZE_FORMAT, min_heap_size(), InitialHeapSize, max_heap); } - size_t min_new = preferred_max_new_size; + uintx min_new = preferred_max_new_size; if (FLAG_IS_CMDLINE(NewSize)) { min_new = NewSize; } @@ -1314,7 +1314,7 @@ // so it's NewRatio x of NewSize. if (FLAG_IS_DEFAULT(OldSize)) { if (max_heap > NewSize) { - FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, max_heap - NewSize)); + FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, (uintx) (max_heap - NewSize))); if (PrintGCDetails && Verbose) { // Too early to use gclog_or_tty tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize); From bugzilla-daemon at icedtea.classpath.org Thu Jan 28 03:02:16 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 03:02:16 +0000 Subject: [Bug 2777] [IcedTea8] Fix MAX/MIN template usage on s390 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2777 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea8-forest/hotspot?cmd=changeset;node=c313c4782bb3 author: andrew date: Thu Jan 28 02:50:10 2016 +0000 PR2777: Fix MAX/MIN template usage on s390 Summary: The templates can't be used without casting on s390 as size_t != uintx -- 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 28 03:02:27 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 28 Jan 2016 03:02:27 +0000 Subject: /hg/icedtea8-forest/jdk: 3 new changesets Message-ID: changeset edf1cacfe015 in /hg/icedtea8-forest/jdk details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=edf1cacfe015 author: andrew date: Thu Jan 28 02:36:08 2016 +0000 PR2459: Policy JAR files should be timestamped with the date of the policy file they hold Summary: Timestamp the policy files with their original creation dates and propogate to manifest and JAR file. changeset d7fa6efaf02a in /hg/icedtea8-forest/jdk details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=d7fa6efaf02a author: andrew date: Thu Jan 28 02:39:11 2016 +0000 PR2767: Remove remaining rogue binaries from OpenJDK tree changeset 809d98eeda49 in /hg/icedtea8-forest/jdk details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=809d98eeda49 author: omajid date: Tue Oct 27 15:19:15 2015 -0400 8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux Reviewed-by: serb diffstat: make/CreateSecurityJars.gmk | 57 ++++++--- src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 34 +++++ test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so | Bin test/sun/management/jmxremote/bootstrap/linux-amd64/launcher | Bin test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher | Bin test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher | Bin test/sun/net/idn/nfscis.spp | Bin test/sun/net/idn/nfscsi.spp | Bin test/sun/net/idn/nfscss.spp | Bin test/sun/net/idn/nfsmxp.spp | Bin test/sun/net/idn/nfsmxs.spp | Bin 11 files changed, 71 insertions(+), 20 deletions(-) diffs (170 lines): diff -r 26e2e029ee25 -r 809d98eeda49 make/CreateSecurityJars.gmk --- a/make/CreateSecurityJars.gmk Wed Jan 27 04:02:27 2016 +0000 +++ b/make/CreateSecurityJars.gmk Tue Oct 27 15:19:15 2015 -0400 @@ -179,6 +179,8 @@ ########################################################################################## +POLICY_CREATION_DATE := 200712010000 + US_EXPORT_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/US_export_policy.jar ifneq ($(BUILD_CRYPTO), no) @@ -204,23 +206,28 @@ $(US_EXPORT_POLICY_JAR_TMP)/%: $(US_EXPORT_POLICY_JAR_SRC_DIR)/% $(install-file) + $(TOUCH) -t $(POLICY_CREATION_DATE) $@ - $(US_EXPORT_POLICY_JAR_MANIFEST_FILE): + $(US_EXPORT_POLICY_JAR_MANIFEST_FILE): $(US_EXPORT_POLICY_JAR_POLICIES) $(MKDIR) -p $(US_EXPORT_POLICY_JAR_TMP)/META-INF - $(ECHO) "Manifest-Version: 1.0" > $(US_EXPORT_POLICY_JAR_MANIFEST_FILE) - $(ECHO) "Crypto-Strength: unlimited" >> $(US_EXPORT_POLICY_JAR_MANIFEST_FILE) - $(TOUCH) -t 198001010000 $(US_EXPORT_POLICY_JAR_TMP)/META-INF - $(TOUCH) -r $(US_EXPORT_POLICY_JAR_TMP)/META-INF $(US_EXPORT_POLICY_JAR_MANIFEST_FILE) + $(ECHO) "Manifest-Version: 1.0" > $@ + $(ECHO) "Crypto-Strength: unlimited" >> $@ + $(TOUCH) -r $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy \ + $(US_EXPORT_POLICY_JAR_TMP)/META-INF + $(TOUCH) -r $(US_EXPORT_POLICY_JAR_TMP)/META-INF $@ - US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy \ - $(US_EXPORT_POLICY_JAR_MANIFEST_FILE) + US_EXPORT_POLICY_JAR_POLICIES := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy + + US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_POLICIES) $(US_EXPORT_POLICY_JAR_MANIFEST_FILE) $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED): $(US_EXPORT_POLICY_JAR_DEPS) ( $(CD) $(US_EXPORT_POLICY_JAR_TMP) && $(ZIP) -Xr $@ META-INF *.policy ) + $(TOUCH) -r $(US_EXPORT_POLICY_JAR_MANIFEST_FILE) $@ $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED): $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED) $(ECHO) $(LOG_INFO) Copying unlimited $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(install-file) + $(TOUCH) -r $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED) $@ TARGETS += $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED) \ $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED) @@ -271,36 +278,46 @@ $(LOCAL_POLICY_JAR_LIMITED_TMP)/%: $(JDK_TOPDIR)/make/data/cryptopolicy/limited/% $(install-file) + $(TOUCH) -t $(POLICY_CREATION_DATE) $@ - $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE): + $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE): $(LOCAL_POLICY_JAR_LIMITED_POLICIES) $(MKDIR) -p $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF - $(ECHO) "Manifest-Version: 1.0" > $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE) - $(ECHO) "Crypto-Strength: limited" >> $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE) - $(TOUCH) -t 198001010000 $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF - $(TOUCH) -r $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE) + $(ECHO) "Manifest-Version: 1.0" > $@ + $(ECHO) "Crypto-Strength: limited" >> $@ + $(TOUCH) -r $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \ + $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF + $(TOUCH) -r $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF $@ - LOCAL_POLICY_JAR_LIMITED_DEPS := $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \ - $(LOCAL_POLICY_JAR_LIMITED_TMP)/default_local.policy \ + LOCAL_POLICY_JAR_LIMITED_POLICIES := $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \ + $(LOCAL_POLICY_JAR_LIMITED_TMP)/default_local.policy + + LOCAL_POLICY_JAR_LIMITED_DEPS := $(LOCAL_POLICY_JAR_LIMITED_POLICIES) \ $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE) $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED): $(LOCAL_POLICY_JAR_LIMITED_DEPS) ( $(CD) $(LOCAL_POLICY_JAR_LIMITED_TMP) && $(ZIP) -Xr $@ META-INF *.policy ) + $(TOUCH) -r $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE) $@ $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/%: $(JDK_TOPDIR)/make/data/cryptopolicy/unlimited/% $(install-file) + $(TOUCH) -t $(POLICY_CREATION_DATE) $@ - $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE): + $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE): $(LOCAL_POLICY_JAR_UNLIMITED_POLICIES) $(MKDIR) -p $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF - $(ECHO) "Manifest-Version: 1.0" > $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE) - $(ECHO) "Crypto-Strength: unlimited" >> $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE) - $(TOUCH) -t 198001010000 $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF - $(TOUCH) -r $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE) + $(ECHO) "Manifest-Version: 1.0" > $@ + $(ECHO) "Crypto-Strength: unlimited" >> $@ + $(TOUCH) -r $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy \ + $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF + $(TOUCH) -r $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF $@ - LOCAL_POLICY_JAR_UNLIMITED_DEPS := $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy \ + LOCAL_POLICY_JAR_UNLIMITED_POLICIES := $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy + + LOCAL_POLICY_JAR_UNLIMITED_DEPS := $(LOCAL_POLICY_JAR_UNLIMITED_POLICIES) \ $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE) $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED): $(LOCAL_POLICY_JAR_UNLIMITED_DEPS) ( $(CD) $(LOCAL_POLICY_JAR_UNLIMITED_TMP) && $(ZIP) -Xr $@ META-INF *.policy ) + $(TOUCH) -r $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE) $@ TARGETS += $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED) $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED) diff -r 26e2e029ee25 -r 809d98eeda49 src/share/classes/com/sun/media/sound/SoftSynthesizer.java --- a/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Wed Jan 27 04:02:27 2016 +0000 +++ b/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Tue Oct 27 15:19:15 2015 -0400 @@ -669,6 +669,40 @@ actions.add(new PrivilegedAction() { public InputStream run() { if (System.getProperties().getProperty("os.name") + .startsWith("Linux")) { + + File[] systemSoundFontsDir = new File[] { + /* Arch, Fedora, Mageia */ + new File("/usr/share/soundfonts/"), + new File("/usr/local/share/soundfonts/"), + /* Debian, Gentoo, OpenSUSE, Ubuntu */ + new File("/usr/share/sounds/sf2/"), + new File("/usr/local/share/sounds/sf2/"), + }; + + /* + * Look for a default.sf2 + */ + for (File systemSoundFontDir : systemSoundFontsDir) { + if (systemSoundFontDir.exists()) { + File defaultSoundFont = new File(systemSoundFontDir, "default.sf2"); + if (defaultSoundFont.exists()) { + try { + return new FileInputStream(defaultSoundFont); + } catch (IOException e) { + // continue with lookup + } + } + } + } + } + return null; + } + }); + + actions.add(new PrivilegedAction() { + public InputStream run() { + if (System.getProperties().getProperty("os.name") .startsWith("Windows")) { File gm_dls = new File(System.getenv("SystemRoot") + "\\system32\\drivers\\gm.dls"); diff -r 26e2e029ee25 -r 809d98eeda49 test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so Binary file test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so has changed diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/management/jmxremote/bootstrap/linux-amd64/launcher Binary file test/sun/management/jmxremote/bootstrap/linux-amd64/launcher has changed diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher Binary file test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher has changed diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher Binary file test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher has changed diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/net/idn/nfscis.spp Binary file test/sun/net/idn/nfscis.spp has changed diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/net/idn/nfscsi.spp Binary file test/sun/net/idn/nfscsi.spp has changed diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/net/idn/nfscss.spp Binary file test/sun/net/idn/nfscss.spp has changed diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/net/idn/nfsmxp.spp Binary file test/sun/net/idn/nfsmxp.spp has changed diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/net/idn/nfsmxs.spp Binary file test/sun/net/idn/nfsmxs.spp has changed From bugzilla-daemon at icedtea.classpath.org Thu Jan 28 03:02:33 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 03:02:33 +0000 Subject: [Bug 2459] [IcedTea8] Policy JAR files should be timestamped with the date of the policy file they hold In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2459 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea8-forest/jdk?cmd=changeset;node=edf1cacfe015 author: andrew date: Thu Jan 28 02:36:08 2016 +0000 PR2459: Policy JAR files should be timestamped with the date of the policy file they hold Summary: Timestamp the policy files with their original creation dates and propogate to manifest and JAR 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 28 03:02:38 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 03:02:38 +0000 Subject: [Bug 2767] [IcedTea8] Remove remaining rogue binaries from OpenJDK tree In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2767 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea8-forest/jdk?cmd=changeset;node=d7fa6efaf02a author: andrew date: Thu Jan 28 02:39:11 2016 +0000 PR2767: Remove remaining rogue binaries from OpenJDK tree -- 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 28 03:02:43 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 03:02:43 +0000 Subject: [Bug 2769] [IcedTea8] Backport "8140620: Find and load default.sf2 as the default soundbank on Linux" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2769 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea8-forest/jdk?cmd=changeset;node=809d98eeda49 author: omajid date: Tue Oct 27 15:19:15 2015 -0400 8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux Reviewed-by: serb -- 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 28 09:50:39 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 09:50:39 +0000 Subject: [Bug 2807] Joomgallery Foto-Upload Java Plugin Firefox IcedTea hang In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2807 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #3 from JiriVanek --- Thank you for trust. i was debugging it today, and was nicely surprised that I found no issues with current 1.6.2 It would be really nice if you can rebuilt http://icedtea.classpath.org/hg/release/icedtea-web-1.6/ and check if it is working also for you. 1.6.2 is latest planed release of 1.6 so it would be nice it really keep working for you. -- 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 28 11:16:16 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 11:16:16 +0000 Subject: [Bug 796] Linking of the plugin does not respect LDFLAGS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=796 James Le Cuirot changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #1502|0 |1 is obsolete| | --- Comment #4 from James Le Cuirot --- Created attachment 1503 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1503&action=edit Updated patch to respect LDFLAGS in Makefile.am Right you are, here's a better 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 jvanek at icedtea.classpath.org Thu Jan 28 12:41:04 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 28 Jan 2016 12:41:04 +0000 Subject: /hg/icedtea-web: Makefile: (stamps/generate-docs.stamp) added qu... Message-ID: changeset 213ea33a35b2 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=213ea33a35b2 author: Jiri Vanek date: Thu Jan 28 13:40:08 2016 +0100 Makefile: (stamps/generate-docs.stamp) added quotes around HTML_DOCS_INDEX diffstat: ChangeLog | 5 +++++ Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 45ba4cdd406e -r 213ea33a35b2 ChangeLog --- a/ChangeLog Tue Jan 26 15:18:30 2016 +0100 +++ b/ChangeLog Thu Jan 28 13:40:08 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-28 Matthias Klose + Jiri Vanek + + * Makefile: (stamps/generate-docs.stamp) added quotes around HTML_DOCS_INDEX + 2016-01-26 Jiri Vanek Messages for Invalid JDK dialog improved a bit. diff -r 45ba4cdd406e -r 213ea33a35b2 Makefile.am --- a/Makefile.am Tue Jan 26 15:18:30 2016 +0100 +++ b/Makefile.am Thu Jan 28 13:40:08 2016 +0100 @@ -567,7 +567,7 @@ TP_TAIL="false $(FULL_VERSION)" ; \ LANG_BACKUP=$$LANG ; \ echo "$(PLUGIN_VERSION)" > "$$HTML_DOCS_INDEX" ; \ - echo "

$(PLUGIN_VERSION) docs:

" >> $$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 -` ; \ From jvanek at icedtea.classpath.org Thu Jan 28 12:42:07 2016 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 28 Jan 2016 12:42:07 +0000 Subject: /hg/release/icedtea-web-1.6: Makefile: (stamps/generate-docs.sta... Message-ID: changeset 5be0492c4e4b in /hg/release/icedtea-web-1.6 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=5be0492c4e4b author: Jiri Vanek date: Thu Jan 28 13:40:08 2016 +0100 Makefile: (stamps/generate-docs.stamp) added quotes around HTML_DOCS_INDEX diffstat: ChangeLog | 5 +++++ Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 263e152a6084 -r 5be0492c4e4b ChangeLog --- a/ChangeLog Tue Jan 26 15:18:30 2016 +0100 +++ b/ChangeLog Thu Jan 28 13:40:08 2016 +0100 @@ -1,3 +1,8 @@ +2016-01-28 Matthias Klose + Jiri Vanek + + * Makefile: (stamps/generate-docs.stamp) added quotes around HTML_DOCS_INDEX + 2016-01-26 Jiri Vanek Messages for Invalid JDK dialog improved a bit. diff -r 263e152a6084 -r 5be0492c4e4b Makefile.am --- a/Makefile.am Tue Jan 26 15:18:30 2016 +0100 +++ b/Makefile.am Thu Jan 28 13:40:08 2016 +0100 @@ -552,7 +552,7 @@ TP_TAIL="false $(FULL_VERSION)" ; \ LANG_BACKUP=$$LANG ; \ echo "$(PLUGIN_VERSION)" > "$$HTML_DOCS_INDEX" ; \ - echo "

$(PLUGIN_VERSION) docs:

" >> $$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 -` ; \ From bugzilla-daemon at icedtea.classpath.org Thu Jan 28 14:18:04 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 14:18:04 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #16 from Neon --- I have verified latest icedtea-web-1.6-5be0492c4e4b (Jan 28, 2016 9AM EST) address issue running our application via: javaws http://nextmidas.techma.com/nxm343/htdocs/localshell.jnlp Thank-you -- 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 28 14:24:17 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 14:24:17 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 --- Comment #17 from JiriVanek --- Hello! TYVM. I have jsut finished RPMS for you to simplify your life... But you have simplified my very very much. Thank YOU. J. -- 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 28 14:25:06 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 14:25:06 +0000 Subject: [Bug 2489] jnlp.LaunchException: Fatal: Initialization Error - NullPointerException SecurityDialogs.showMissingALACAttributePanel when codebase not specified In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2489 JiriVanek 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 28 14:25:13 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 14:25:13 +0000 Subject: [Bug 2807] Joomgallery Foto-Upload Java Plugin Firefox IcedTea hang In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2807 JiriVanek 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 28 14:27:10 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 14:27:10 +0000 Subject: [Bug 2687] [1.5-2+deb8u1] Impossible to interact with some buttons on a Java application hosted on the embedded web server of a Mitsubishi air conditioner controller In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2687 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |INVALID -- 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 28 14:27:24 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 14:27:24 +0000 Subject: [Bug 2092] LaunchException: Fatal: Initialization Error: A fatal error occurred while trying to verify jars. An exception has been thrown in class JarCertVerifier In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2092 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |INVALID -- 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 28 15:01:03 2016 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 28 Jan 2016 16:01:03 +0100 Subject: Upcoming release of IcedTea-Web-1.6.2 In-Reply-To: <56A8F2D9.7080604@redhat.com> References: <56A8F2D9.7080604@redhat.com> Message-ID: <56AA2D2F.6000606@redhat.com> On 01/27/2016 05:39 PM, Jiri Vanek wrote: > Hello! > > 1.6 got quite a lot of bugfixes in last few weeks, and I consider it stable enough to release it. > Still I will test it even more deeply, and in meantime I would like to ask any volunteers (or people > depending on itw just to ensure yourself) > ... > To clone http://icedtea.classpath.org/hg/release/icedtea-web-1.6/ (current head is > http://icedtea.classpath.org/hg/release/icedtea-web-1.6/rev/263e152a6084) > > build and test :) For interested people, there is my rawhide build for fedora: http://koji.fedoraproject.org/koji/taskinfo?taskID=12711678 Generously created binaries for Ubuntu: (note, Especially for cc-ed mr. Franz:) https://launchpad.net/ubuntu/+source/icedtea-web/1.6.1-4ubuntu1 and debian: http://incoming.debian.org/debian-buildd/pool/main/i/icedtea-web/ ( you need to search for 1.6.1-4 on your own as I need to leave before they are finished) (TYVM doko!) and some (very quickly done) scratches for rhel6: https://jvanek.fedorapeople.org/66.el6/ > > > If nobody stops me, I will tag and release In few day, no later then in start of next week. > > > Thanx! > > J. From bugzilla-daemon at icedtea.classpath.org Thu Jan 28 15:09:04 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 15:09:04 +0000 Subject: [Bug 2075] Log: java.text.ParseException: Unparseable date In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2075 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #3 from JiriVanek --- Hello! I guess your defaule locales are somehting like de_DE.utf8 and os some German-like date is going from plugin to java. I think I will just silence this exception, and if it ocure, the original value will br printed. (as date of even is going in as long) I iwll look into this and do try some workaround for upcoming 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 bugzilla-daemon at icedtea.classpath.org Thu Jan 28 15:20:13 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 15:20:13 +0000 Subject: [Bug 2075] Log: java.text.ParseException: Unparseable date In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2075 --- Comment #4 from JiriVanek --- I stopped guessing and Tried to reproduce. No sucess. So I probably need to know yours LANG and also need some verification if it is still presented in 1.6. For testing: Binaries from http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2016-January/034732.html May be useful. Thanx! -- 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 28 21:33:40 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 21:33:40 +0000 Subject: [Bug 2075] Log: java.text.ParseException: Unparseable date In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2075 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu.andrew at redhat.com --- Comment #5 from Andrew John Hughes --- Well, the log message is over a year old and that line in PluginMessage.java doesn't seem to call parse any more. It does seem odd that DateFormat wouldn't be able to parse a Date String the JDK itself produced, unless the two are running under different Locale settings. You need to provide a recent log failure and your setting of LANG to move further with this. -- 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 28 21:40:15 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 21:40:15 +0000 Subject: [Bug 2819] New: [IcedTea7] Java application menu misbehaves when running multiple screen stacked vertically Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2819 Bug ID: 2819 Summary: [IcedTea7] Java application menu misbehaves when running multiple screen stacked vertically 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 Clone of bug 2399 for 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 28 21:40:29 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 21:40:29 +0000 Subject: [Bug 2819] [IcedTea7] Java application menu misbehaves when running multiple screen stacked vertically In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2819 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |2.6.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 28 21:41:20 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 21:41:20 +0000 Subject: [Bug 2820] New: [IcedTea6] Java application menu misbehaves when running multiple screen stacked vertically Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2820 Bug ID: 2820 Summary: [IcedTea6] Java application menu misbehaves when running multiple screen stacked vertically 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 bug 2399 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 Thu Jan 28 21:41:32 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 21:41:32 +0000 Subject: [Bug 2820] [IcedTea6] Java application menu misbehaves when running multiple screen stacked vertically In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2820 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |6-1.13.11 -- 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 28 21:42:30 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 28 Jan 2016 21:42:30 +0000 Subject: [Bug 2758] cant start java Application In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2758 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Component|IcedTea |NetX (javaws) Assignee|gnu.andrew at redhat.com |jvanek at redhat.com Product|IcedTea |IcedTea-Web 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 doko at ubuntu.com Fri Jan 29 01:36:30 2016 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 29 Jan 2016 02:36:30 +0100 Subject: Upcoming release of IcedTea-Web-1.6.2 In-Reply-To: <56AA2D2F.6000606@redhat.com> References: <56A8F2D9.7080604@redhat.com> <56AA2D2F.6000606@redhat.com> Message-ID: <56AAC21E.8030004@ubuntu.com> On 28.01.2016 16:01, Jiri Vanek wrote: > For interested people, there is my rawhide build for fedora: > http://koji.fedoraproject.org/koji/taskinfo?taskID=12711678 > > Generously created binaries for Ubuntu: > (note, Especially for cc-ed mr. Franz:) > https://launchpad.net/ubuntu/+source/icedtea-web/1.6.1-4ubuntu1 > and debian: > http://incoming.debian.org/debian-buildd/pool/main/i/icedtea-web/ ( you need to > search for 1.6.1-4 on your own as I need to leave before they are finished) these are now available in Debian unstable, no need for incoming anymore. From bugzilla-daemon at icedtea.classpath.org Fri Jan 29 08:26:33 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 08:26:33 +0000 Subject: [Bug 2758] cant start java Application In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2758 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |INVALID -- 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 29 21:11:27 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:11:27 +0000 Subject: [Bug 2821] New: [IcedTea8] Support building OpenJDK with --disable-headful Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2821 Bug ID: 2821 Summary: [IcedTea8] Support building OpenJDK with --disable-headful Product: IcedTea Version: 8-hg Hardware: all OS: All 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 OpenJDK 8+ has an option to build without the headful X11 AWT implementation. We should make this accessible from IcedTea. -- 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 29 21:11:44 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:11:44 +0000 Subject: [Bug 1740] [TRACKER] IcedTea 3.1.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1740 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |2821 -- 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 29 21:11:44 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:11:44 +0000 Subject: [Bug 2821] [IcedTea8] Support building OpenJDK with --disable-headful In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2821 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1740 Target Milestone|--- |3.1.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 Fri Jan 29 21:13:18 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:13:18 +0000 Subject: [Bug 2822] New: [IcedTea8] Feed LIBS & CFLAGS into configure rather than make to avoid re-discovery by OpenJDK configure Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2822 Bug ID: 2822 Summary: [IcedTea8] Feed LIBS & CFLAGS into configure rather than make to avoid re-discovery by OpenJDK configure Product: IcedTea Version: 8-hg 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 OpenJDK now has its own configure machinery. We should pass CFLAGS and LDFLAGS discovered during the IcedTea configure to this rather than letting it find its own values, then overriding them in make. -- 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 29 21:13:34 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:13:34 +0000 Subject: [Bug 2822] [IcedTea8] Feed LIBS & CFLAGS into configure rather than make to avoid re-discovery by OpenJDK configure In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2822 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1740 Target Milestone|--- |3.1.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 Fri Jan 29 21:13:34 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:13:34 +0000 Subject: [Bug 1740] [TRACKER] IcedTea 3.1.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1740 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |2822 -- 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 29 21:15:28 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:15:28 +0000 Subject: [Bug 2823] New: [IcedTea7] Backport "command line selection of MToolkit by -Dawt.toolkit=sun.awt.motif.MToolkit fails from jdk7 b21 on" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2823 Bug ID: 2823 Summary: [IcedTea7] Backport "command line selection of MToolkit by -Dawt.toolkit=sun.awt.motif.MToolkit fails from jdk7 b21 on" Product: IcedTea Version: 7-hg Hardware: all OS: All Status: NEW Severity: minor Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org -Dawt.toolkit=sun.awt.motif.MToolkit fails with an UnsatisfiedLinkError on IcedTea 2.x. We should backport this fix from OpenJDK 8 that removes the remaining Motif detritus left lying around. -- 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 29 21:16:29 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:16:29 +0000 Subject: [Bug 2823] [IcedTea7] Backport "command line selection of MToolkit by -Dawt.toolkit=sun.awt.motif.MToolkit fails from jdk7 b21 on" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2823 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |2393 Target Milestone|--- |2.7.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 Fri Jan 29 21:16:29 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:16:29 +0000 Subject: [Bug 2393] [TRACKER] IcedTea 2.7.0 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2393 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |2823 -- 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 29 21:17:30 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:17:30 +0000 Subject: [Bug 2824] New: [IcedTea6] Backport "command line selection of MToolkit by -Dawt.toolkit=sun.awt.motif.MToolkit fails from jdk7 b21 on" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2824 Bug ID: 2824 Summary: [IcedTea6] Backport "command line selection of MToolkit by -Dawt.toolkit=sun.awt.motif.MToolkit fails from jdk7 b21 on" 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 -Dawt.toolkit=sun.awt.motif.MToolkit fails with an UnsatisfiedLinkError on IcedTea 1.x. We should backport this fix from OpenJDK 8 that removes the remaining Motif detritus left lying around. -- 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 29 21:17:59 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:17:59 +0000 Subject: [Bug 2823] [IcedTea7] Backport "6996291: command line selection of MToolkit by -Dawt.toolkit=sun.awt.motif.MToolkit fails from jdk7 b21 on" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2823 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|[IcedTea7] Backport |[IcedTea7] Backport |"command line selection of |"6996291: command line |MToolkit by |selection of MToolkit by |-Dawt.toolkit=sun.awt.motif |-Dawt.toolkit=sun.awt.motif |.MToolkit fails from jdk7 |.MToolkit fails from jdk7 |b21 on" |b21 on" -- 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 29 21:18:04 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:18:04 +0000 Subject: [Bug 2824] [IcedTea6] Backport "6996291: command line selection of MToolkit by -Dawt.toolkit=sun.awt.motif.MToolkit fails from jdk7 b21 on" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2824 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|[IcedTea6] Backport |[IcedTea6] Backport |"command line selection of |"6996291: command line |MToolkit by |selection of MToolkit by |-Dawt.toolkit=sun.awt.motif |-Dawt.toolkit=sun.awt.motif |.MToolkit fails from jdk7 |.MToolkit fails from jdk7 |b21 on" |b21 on" -- 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 29 21:18:38 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:18:38 +0000 Subject: [Bug 2824] [IcedTea6] Backport "6996291: command line selection of MToolkit by -Dawt.toolkit=sun.awt.motif.MToolkit fails from jdk7 b21 on" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2824 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |1503 Target Milestone|--- |6-1.14.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 Fri Jan 29 21:18:38 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:18:38 +0000 Subject: [Bug 1503] [TRACKER] IcedTea6 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1503 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |2824 -- 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 Fri Jan 29 21:19:40 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:19:40 +0000 Subject: /hg/icedtea6-hg: 3 new changesets Message-ID: changeset eab534910a1a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=eab534910a1a author: Andrew John Hughes date: Wed Jan 20 03:36:30 2016 +0000 Add new backports for issues to be fixed in 1.13.10. S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux 2016-01-19 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch, * patches/openjdk/8140620-pr2711-find_default.sf2.patch: New backports for issues to be fixed in 1.13.10. changeset cc919eba91fa in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cc919eba91fa author: Andrew John Hughes date: Wed Jan 20 03:45:50 2016 +0000 Merge changeset 6df2ff9d8f54 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6df2ff9d8f54 author: Andrew John Hughes date: Wed Jan 20 05:19:11 2016 +0000 Update to build against January 2016 security fixes. Upstream changes: - OPENJDK6-69: Windows build broken after b37 changes - OPENJDK6-70: Allow versions of ALSA >= 1.1.0 - S4898461: Support for ECB and CBC/PKCS5Padding - S6720721: CRL check with circular depency support needed - S6852744: PIT b61: PKI test suite fails because self signed certificates are being rejected [Tests only] - S6867345: Turkish regional options cause NPE in sun.security.x509.AlgorithmId.algOID - S7166570: JSSE certificate validation has started to fail for certificate chains - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing - S8059054: Better URL processing - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException - S8074068: Cleanup in src/share/classes/sun/security/x509/ - S8075773: jps running as root fails after the fix of JDK-8050807 - S8081297: SSL Problem with Tomcat - S8130710: Better attributes processing - S8133962: More general limits - S8134605: Partial rework of the fix for 8081297 - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing - S8137060: JMX memory management improvements - S8138716: (tz) Support tzdata2015g - S8139012: Better font substitutions - S8139017: More stable image decoding - S8140543: Arrange font actions - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2 - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure - S8143185: Cleanup for handling proxies - S8143941: Update splashscreen displays - S8144955: Wrong changes were pushed with 8143942 - S8145551: Test failed with Crash for Improved font lookups - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp 2016-01-19 Andrew John Hughes * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch, * patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch: Removed; added upstream in OpenJDK 6 b38. * Makefile.am: (ICEDTEA_PATCHES): Remove above patches. * NEWS: Updated. * patches/openjdk/6799141-split_out_versions.patch: Regenerated following OPENJDK6-70. diffstat: ChangeLog | 25 + Makefile.am | 8 +- NEWS | 33 + patches/openjdk/6799141-split_out_versions.patch | 40 +- patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch | 54 + patches/openjdk/8140620-pr2711-find_default.sf2.patch | 53 + patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch | 1169 ---------- patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch | 328 -- 8 files changed, 189 insertions(+), 1521 deletions(-) diffs (truncated from 1856 to 500 lines): diff -r efe390605797 -r 6df2ff9d8f54 ChangeLog --- a/ChangeLog Wed Nov 18 03:16:15 2015 +0000 +++ b/ChangeLog Wed Jan 20 05:19:11 2016 +0000 @@ -1,3 +1,28 @@ +2016-01-19 Andrew John Hughes + + * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch, + * patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch: + Removed; added upstream in OpenJDK 6 b38. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + * NEWS: Updated. + * patches/openjdk/6799141-split_out_versions.patch: + Regenerated following OPENJDK6-70. + +2016-01-19 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated. + * patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch, + * patches/openjdk/8140620-pr2711-find_default.sf2.patch: + New backports for issues to be fixed in 1.13.10. + +2015-11-26 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b38. + 2015-11-17 Andrew John Hughes * NEWS: Add 1.13.9 release notes. diff -r efe390605797 -r 6df2ff9d8f54 Makefile.am --- a/Makefile.am Wed Nov 18 03:16:15 2015 +0000 +++ b/Makefile.am Wed Jan 20 05:19:11 2016 +0000 @@ -2,7 +2,7 @@ OPENJDK_DATE = 11_nov_2015 OPENJDK_SHA256SUM = 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d -OPENJDK_VERSION = b37 +OPENJDK_VERSION = b38 OPENJDK_URL = https://java.net/downloads/openjdk6/ CACAO_VERSION = 68fe50ac34ec @@ -463,11 +463,9 @@ patches/remove-gcm-test.patch \ patches/skip_wrap_mode.patch \ patches/remove_multicatch_in_testrsa.patch \ - patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch \ patches/openjdk/p11cipher-6682411-fix_indexoutofboundsexception.patch \ patches/openjdk/p11cipher-6682417-fix_decrypted_data_not_multiple_of_blocks.patch \ patches/openjdk/p11cipher-6812738-native_cleanup.patch \ - patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch \ patches/openjdk/p11cipher-6687725-throw_illegalblocksizeexception.patch \ patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch \ patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch \ @@ -647,7 +645,9 @@ patches/openjdk/6763122-no_zipfile_ctor_exception.patch \ patches/openjdk/6599383-pr363-large_zip_files.patch \ patches/openjdk/6929479-pr363-disable_mmap_zip.patch \ - patches/pr2513-layoutengine_reset.patch + patches/pr2513-layoutengine_reset.patch \ + patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch \ + patches/openjdk/8140620-pr2711-find_default.sf2.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r efe390605797 -r 6df2ff9d8f54 NEWS --- a/NEWS Wed Nov 18 03:16:15 2015 +0000 +++ b/NEWS Wed Jan 20 05:19:11 2016 +0000 @@ -14,14 +14,47 @@ New in release 1.14.0 (201X-XX-XX): +* Security fixes + - S8059054, CVE-2016-0402: Better URL processing + - S8130710, CVE-2016-0448: Better attributes processing + - S8133962, CVE-2016-0466: More general limits + - S8137060: JMX memory management improvements + - S8139012: Better font substitutions + - S8139017, CVE-2016-0483: More stable image decoding + - S8140543, CVE-2016-0494: Arrange font actions + - S8143185: Cleanup for handling proxies + - S8143941, CVE-2015-8126, CVE-2015-8472: Update splashscreen displays +* Import of OpenJDK6 b38 + - OJ69: Windows build broken after b37 changes + - OJ70: Allow versions of ALSA >= 1.1.0 + - S6720721: CRL check with circular depency support needed + - S6852744: PIT b61: PKI test suite fails because self signed certificates are being rejected [Tests only] + - S7166570: JSSE certificate validation has started to fail for certificate chains + - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified + - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing + - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException + - S8074068: Cleanup in src/share/classes/sun/security/x509/ + - S8075773: jps running as root fails after the fix of JDK-8050807 + - S8081297: SSL Problem with Tomcat + - S8134605: Partial rework of the fix for 8081297 + - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing + - S8138716: (tz) Support tzdata2015g + - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS + - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2 + - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure + - S8144955: Wrong changes were pushed with 8143942 + - S8145551: Test failed with Crash for Improved font lookups + - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp * 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 + - S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F - 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 + - S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux * Bug fixes - PR1886: IcedTea does not checksum supplied tarballs - PR2083: Add support for building Zero on AArch64 diff -r efe390605797 -r 6df2ff9d8f54 patches/openjdk/6799141-split_out_versions.patch --- a/patches/openjdk/6799141-split_out_versions.patch Wed Nov 18 03:16:15 2015 +0000 +++ b/patches/openjdk/6799141-split_out_versions.patch Wed Jan 20 05:19:11 2016 +0000 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk ---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2014-07-30 13:42:56.308105637 +0100 -+++ openjdk/jdk/make/common/Defs-linux.gmk 2014-07-30 13:47:55.596394090 +0100 +--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2016-01-20 04:02:31.642880064 +0000 ++++ openjdk/jdk/make/common/Defs-linux.gmk 2016-01-20 04:06:25.098914903 +0000 @@ -135,6 +135,14 @@ LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH)) endif @@ -17,8 +17,8 @@ # Selection of warning messages # diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2014-07-30 13:42:56.132103116 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2016-01-20 04:02:30.290903028 +0000 ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2016-01-20 04:06:25.098914903 +0000 @@ -143,18 +143,10 @@ CC = $(COMPILER_PATH)gcc CPP = $(COMPILER_PATH)gcc -E @@ -40,8 +40,8 @@ # Get gcc version diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-msvc.gmk openjdk/jdk/make/common/shared/Compiler-msvc.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-msvc.gmk 2014-07-14 04:24:43.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-msvc.gmk 2014-07-30 13:49:10.217463061 +0100 +--- openjdk.orig/jdk/make/common/shared/Compiler-msvc.gmk 2016-01-20 01:41:59.589809293 +0000 ++++ openjdk/jdk/make/common/shared/Compiler-msvc.gmk 2016-01-20 04:06:25.098914903 +0000 @@ -47,8 +47,6 @@ # Fill in unknown values COMPILER_NAME=Unknown MSVC Compiler @@ -52,8 +52,8 @@ # unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake NMAKE = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-sun.gmk openjdk/jdk/make/common/shared/Compiler-sun.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-sun.gmk 2014-07-30 13:42:56.296105466 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-sun.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Compiler-sun.gmk 2016-01-20 04:02:31.598880811 +0000 ++++ openjdk/jdk/make/common/shared/Compiler-sun.gmk 2016-01-20 04:06:25.098914903 +0000 @@ -33,29 +33,20 @@ ifeq ($(PLATFORM), solaris) # FIXUP: Change to SS12 when validated @@ -87,8 +87,8 @@ CPP = $(COMPILER_PATH)cc -E CXX = $(COMPILER_PATH)CC diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2014-07-30 13:42:56.312105695 +0100 -+++ openjdk/jdk/make/common/shared/Defs.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Defs.gmk 2016-01-20 04:02:31.646879996 +0000 ++++ openjdk/jdk/make/common/shared/Defs.gmk 2016-01-20 04:06:25.102914835 +0000 @@ -113,9 +113,9 @@ fi) endef @@ -152,7 +152,7 @@ + diff -Nru openjdk.orig/jdk/make/common/shared/Defs-versions.gmk openjdk/jdk/make/common/shared/Defs-versions.gmk --- openjdk.orig/jdk/make/common/shared/Defs-versions.gmk 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2014-07-30 13:47:55.600394147 +0100 ++++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2016-01-20 04:06:25.102914835 +0000 @@ -0,0 +1,183 @@ +# +# Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. @@ -338,8 +338,8 @@ +REQUIRED_ZIP_VER = 2.2 + diff -Nru openjdk.orig/jdk/make/common/shared/Defs-windows.gmk openjdk/jdk/make/common/shared/Defs-windows.gmk ---- openjdk.orig/jdk/make/common/shared/Defs-windows.gmk 2014-07-14 04:24:43.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Defs-windows.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Defs-windows.gmk 2016-01-20 01:41:59.597809158 +0000 ++++ openjdk/jdk/make/common/shared/Defs-windows.gmk 2016-01-20 04:06:25.102914835 +0000 @@ -147,10 +147,7 @@ UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH) @@ -353,8 +353,8 @@ MKS_VER :=$(call GetVersion,$(_MKS_VER)) # At this point, we can re-define FullPath to use DOSNAME_CMD diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk ---- openjdk.orig/jdk/make/common/shared/Platform.gmk 2014-07-30 13:42:56.132103116 +0100 -+++ openjdk/jdk/make/common/shared/Platform.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2016-01-20 04:02:30.290903028 +0000 ++++ openjdk/jdk/make/common/shared/Platform.gmk 2016-01-20 04:06:57.042372407 +0000 @@ -51,8 +51,6 @@ # USER login name of user (minus blanks) # PLATFORM windows, solaris, or linux @@ -447,7 +447,7 @@ - endif - ifneq ($(ARCH), ia64) - # ALSA 0.9.1 and above -- REQUIRED_ALSA_VERSION = ^((0[.]9[.][1-9])|(1[.]0[.][0-9]))[0-9]* +- REQUIRED_ALSA_VERSION = ^((0[.]9[.][1-9])|(1[.][0-9][.][0-9]))[0-9]* - endif # How much RAM does this machine have: MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2) @@ -513,8 +513,8 @@ ifneq ($(PLATFORM), windows) # Temporary disk area diff -Nru openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk ---- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2014-07-30 13:42:53.596066769 +0100 -+++ openjdk/jdk/make/common/shared/Sanity.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2016-01-20 04:02:27.542949705 +0000 ++++ openjdk/jdk/make/common/shared/Sanity.gmk 2016-01-20 04:06:25.102914835 +0000 @@ -44,54 +44,100 @@ SANITY_FILES = $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE) @@ -861,8 +861,8 @@ " The compiler was obtained from the following location: \n" \ " $(GCC_COMPILER_PATH) \n" \ diff -Nru openjdk.orig/jdk/make/common/shared/Sanity-Settings.gmk openjdk/jdk/make/common/shared/Sanity-Settings.gmk ---- openjdk.orig/jdk/make/common/shared/Sanity-Settings.gmk 2014-07-14 04:24:43.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Sanity-Settings.gmk 2014-07-30 13:47:55.600394147 +0100 +--- openjdk.orig/jdk/make/common/shared/Sanity-Settings.gmk 2016-01-20 01:42:00.025801958 +0000 ++++ openjdk/jdk/make/common/shared/Sanity-Settings.gmk 2016-01-20 04:06:25.102914835 +0000 @@ -177,8 +177,6 @@ ifeq ($(PLATFORM),windows) ALL_SETTINGS+=$(call addRequiredSetting,PROCESSOR_ARCHITECTURE) diff -r efe390605797 -r 6df2ff9d8f54 patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch Wed Jan 20 05:19:11 2016 +0000 @@ -0,0 +1,54 @@ +# HG changeset patch +# User rupashka +# Date 1342090033 -14400 +# Thu Jul 12 14:47:13 2012 +0400 +# Node ID 05c69338ee73c1e454aa632ced5cbc057420b404 +# Parent 0039f5c7fb512e1ec2e22bceb69ee324426a684f +7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F +Reviewed-by: kizune + +diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java +--- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Wed Jul 11 16:19:41 2012 -0700 ++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Thu Jul 12 14:47:13 2012 +0400 +@@ -796,9 +796,10 @@ + "Menu.margin", zeroInsets, + "Menu.cancelMode", "hideMenuTree", + "Menu.alignAcceleratorText", Boolean.FALSE, ++ "Menu.useMenuBarForTopLevelMenus", Boolean.TRUE, + + +- "MenuBar.windowBindings", new Object[] { ++ "MenuBar.windowBindings", new Object[] { + "F10", "takeFocus" }, + "MenuBar.font", new FontLazyValue(Region.MENU_BAR), + +diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java +--- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java Wed Jul 11 16:19:41 2012 -0700 ++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java Thu Jul 12 14:47:13 2012 +0400 +@@ -92,7 +92,13 @@ + boolean defaultCapable = btn.isDefaultCapable(); + key = new ComplexKey(wt, toolButton, defaultCapable); + } ++ } else if (id == Region.MENU) { ++ if (c instanceof JMenu && ((JMenu) c).isTopLevelMenu() && ++ UIManager.getBoolean("Menu.useMenuBarForTopLevelMenus")) { ++ wt = WidgetType.MENU_BAR; ++ } + } ++ + if (key == null) { + // Otherwise, just use the WidgetType as the key. + key = wt; +diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java +--- openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Wed Jul 11 16:19:41 2012 -0700 ++++ openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Thu Jul 12 14:47:13 2012 +0400 +@@ -299,7 +299,8 @@ + */ + @Override + public void propertyChange(PropertyChangeEvent e) { +- if (SynthLookAndFeel.shouldUpdateStyle(e)) { ++ if (SynthLookAndFeel.shouldUpdateStyle(e) || ++ (e.getPropertyName().equals("ancestor") && UIManager.getBoolean("Menu.useMenuBarForTopLevelMenus"))) { + updateStyle((JMenu)e.getSource()); + } + } diff -r efe390605797 -r 6df2ff9d8f54 patches/openjdk/8140620-pr2711-find_default.sf2.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8140620-pr2711-find_default.sf2.patch Wed Jan 20 05:19:11 2016 +0000 @@ -0,0 +1,53 @@ +# HG changeset patch +# User omajid +# Date 1445973555 14400 +# Tue Oct 27 15:19:15 2015 -0400 +# Node ID 79e4644bd40482ec3ae557f086137e2869b3f50a +# Parent 09c2cc84d4517af288f26607a39ff0515a05e771 +8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux +Reviewed-by: serb + +diff -r 09c2cc84d451 -r 79e4644bd404 src/share/classes/com/sun/media/sound/SoftSynthesizer.java +--- openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Fri Nov 13 05:11:53 2015 +0000 ++++ openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Tue Oct 27 15:19:15 2015 -0400 +@@ -668,6 +668,40 @@ + actions.add(new PrivilegedAction() { + public InputStream run() { + if (System.getProperties().getProperty("os.name") ++ .startsWith("Linux")) { ++ ++ File[] systemSoundFontsDir = new File[] { ++ /* Arch, Fedora, Mageia */ ++ new File("/usr/share/soundfonts/"), ++ new File("/usr/local/share/soundfonts/"), ++ /* Debian, Gentoo, OpenSUSE, Ubuntu */ ++ new File("/usr/share/sounds/sf2/"), ++ new File("/usr/local/share/sounds/sf2/"), ++ }; ++ ++ /* ++ * Look for a default.sf2 ++ */ ++ for (File systemSoundFontDir : systemSoundFontsDir) { ++ if (systemSoundFontDir.exists()) { ++ File defaultSoundFont = new File(systemSoundFontDir, "default.sf2"); ++ if (defaultSoundFont.exists()) { ++ try { ++ return new FileInputStream(defaultSoundFont); ++ } catch (IOException e) { ++ // continue with lookup ++ } ++ } ++ } ++ } ++ } ++ return null; ++ } ++ }); ++ ++ actions.add(new PrivilegedAction() { ++ public InputStream run() { ++ if (System.getProperties().getProperty("os.name") + .startsWith("Windows")) { + File gm_dls = new File(System.getenv("SystemRoot") + + "\\system32\\drivers\\gm.dls"); diff -r efe390605797 -r 6df2ff9d8f54 patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch --- a/patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch Wed Nov 18 03:16:15 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1169 +0,0 @@ -diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java ---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-10-23 18:00:58.332289584 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-10-23 18:10:13.013034333 +0100 -@@ -22,10 +22,10 @@ - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -- - package sun.security.pkcs11; - - import java.nio.ByteBuffer; -+import java.util.Arrays; - - import java.security.*; - import java.security.spec.*; -@@ -34,7 +34,6 @@ - import javax.crypto.spec.*; - - import sun.nio.ch.DirectBuffer; -- - import sun.security.pkcs11.wrapper.*; - import static sun.security.pkcs11.wrapper.PKCS11Constants.*; - -@@ -43,8 +42,8 @@ - * DES, DESede, AES, ARCFOUR, and Blowfish. - * - * This class is designed to support ECB and CBC with NoPadding and -- * PKCS5Padding for both. However, currently only CBC/NoPadding (and -- * ECB/NoPadding for stream ciphers) is functional. -+ * PKCS5Padding for both. It will use its own padding impl if the -+ * native mechanism does not support padding. - * - * Note that PKCS#11 current only supports ECB and CBC. There are no - * provisions for other modes such as CFB, OFB, PCBC, or CTR mode. -@@ -62,10 +61,56 @@ - private final static int MODE_CBC = 4; - - // padding constant for NoPadding -- private final static int PAD_NONE = 5; -+ private final static int PAD_NONE = 5; - // padding constant for PKCS5Padding - private final static int PAD_PKCS5 = 6; - -+ private static interface Padding { -+ // ENC: format the specified buffer with padding bytes and return the -+ // actual padding length -+ int setPaddingBytes(byte[] paddingBuffer, int padLen); -+ -+ // DEC: return the length of trailing padding bytes given the specified -+ // padded data -+ int unpad(byte[] paddedData, int ofs, int len) -+ throws BadPaddingException; -+ } -+ -+ private static class PKCS5Padding implements Padding { -+ -+ private final int blockSize; -+ -+ PKCS5Padding(int blockSize) -+ throws NoSuchPaddingException { -+ if (blockSize == 0) { -+ throw new NoSuchPaddingException -+ ("PKCS#5 padding not supported with stream ciphers"); -+ } -+ this.blockSize = blockSize; -+ } -+ -+ public int setPaddingBytes(byte[] paddingBuffer, int padLen) { -+ Arrays.fill(paddingBuffer, 0, padLen, (byte) (padLen & 0x007f)); -+ return padLen; -+ } -+ -+ public int unpad(byte[] paddedData, int ofs, int len) -+ throws BadPaddingException { -+ byte padValue = paddedData[ofs + len - 1]; -+ if (padValue < 1 || padValue > blockSize) { -+ throw new BadPaddingException("Invalid pad value!"); -+ } -+ // sanity check padding bytes -+ int padStartIndex = ofs + len - padValue; -+ for (int i = padStartIndex; i < len; i++) { -+ if (paddedData[i] != padValue) { -+ throw new BadPaddingException("Invalid pad bytes!"); -+ } -+ } -+ return padValue; -+ } -+ } -+ - // token instance - private final Token token; - -@@ -99,64 +144,92 @@ - // padding type, on of PAD_* above (PAD_NONE for stream ciphers) - private int paddingType; - -+ // when the padding is requested but unsupported by the native mechanism, -+ // we use the following to do padding and necessary data buffering. -+ // padding object which generate padding and unpad the decrypted data -+ private Padding paddingObj; -+ // buffer for holding back the block which contains padding bytes -+ private byte[] padBuffer; -+ private int padBufferLen; -+ - // original IV, if in MODE_CBC - private byte[] iv; - -- // total number of bytes processed -- private int bytesProcessed; -+ // number of bytes buffered internally by the native mechanism and padBuffer -+ // if we do the padding -+ private int bytesBuffered; - - P11Cipher(Token token, String algorithm, long mechanism) -- throws PKCS11Exception { -+ throws PKCS11Exception, NoSuchAlgorithmException { - super(); - this.token = token; - this.algorithm = algorithm; - this.mechanism = mechanism; -- keyAlgorithm = algorithm.split("/")[0]; -+ -+ String algoParts[] = algorithm.split("/"); -+ keyAlgorithm = algoParts[0]; -+ - if (keyAlgorithm.equals("AES")) { - blockSize = 16; -- blockMode = MODE_CBC; -- // XXX change default to PKCS5Padding -- paddingType = PAD_NONE; -- } else if (keyAlgorithm.equals("RC4") || keyAlgorithm.equals("ARCFOUR")) { -+ } else if (keyAlgorithm.equals("RC4") || -+ keyAlgorithm.equals("ARCFOUR")) { - blockSize = 0; -- blockMode = MODE_ECB; -- paddingType = PAD_NONE; - } else { // DES, DESede, Blowfish - blockSize = 8; -- blockMode = MODE_CBC; -- // XXX change default to PKCS5Padding -- paddingType = PAD_NONE; -+ } -+ this.blockMode = -+ (algoParts.length > 1 ? parseMode(algoParts[1]) : MODE_ECB); -+ From andrew at icedtea.classpath.org Fri Jan 29 21:40:44 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 29 Jan 2016 21:40:44 +0000 Subject: /hg/icedtea6-hg: 4 new changesets Message-ID: changeset eac2bcbee2d4 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=eac2bcbee2d4 author: Andrew John Hughes date: Thu Jan 21 01:17:36 2016 +0000 Update to b38 tarball. 2016-01-20 Andrew John Hughes * Makefile.am: (OPENJDK_DATE): Bump to b38 creation date; 20th of January, 2016. (OPENJDK_SHA256SUM): Update for b38 tarball. changeset 33e9441c53fc in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=33e9441c53fc author: Andrew John Hughes date: Mon Jan 25 19:10:54 2016 +0000 Add 1.13.10 release notes. 2016-01-25 Andrew John Hughes * NEWS: Add 1.13.10 release notes. changeset 412e3ce4141e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=412e3ce4141e author: Andrew John Hughes date: Mon Jan 25 22:06:42 2016 +0000 S8076221, PR2808: Disable RC4 cipher suites 2016-01-25 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/8076221-pr2808-disable_rc4_cipher_suites.patch: Backport of 8076221 to OpenJDK 6 b38. * patches/openjdk/8078823-disabledalgorithms_fails_intermittently.patch: Improve reliability of DisabledAlgorithms test. * patches/pr2808-fix_disabled_algorithms_test.patch: Remove Java 7 features from new DisabledAlgorithms test. changeset 9e1c6190ff58 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9e1c6190ff58 author: Andrew John Hughes date: Fri Jan 29 21:40:32 2016 +0000 Bump to next release, b39. 2016-01-29 Andrew John Hughes * Makefile.am: (OPENJDK_VERSION): Bump to next release, b39. diffstat: ChangeLog | 28 + Makefile.am | 11 +- NEWS | 25 +- patches/openjdk/8076221-pr2808-disable_rc4_cipher_suites.patch | 553 ++++++++++ patches/openjdk/8078823-disabledalgorithms_fails_intermittently.patch | 58 + patches/pr2808-fix_disabled_algorithms_test.patch | 226 ++++ 6 files changed, 887 insertions(+), 14 deletions(-) diffs (truncated from 955 to 500 lines): diff -r 6df2ff9d8f54 -r 9e1c6190ff58 ChangeLog --- a/ChangeLog Wed Jan 20 05:19:11 2016 +0000 +++ b/ChangeLog Fri Jan 29 21:40:32 2016 +0000 @@ -1,3 +1,31 @@ +2016-01-29 Andrew John Hughes + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b39. + +2016-01-25 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated. + * patches/openjdk/8076221-pr2808-disable_rc4_cipher_suites.patch: + Backport of 8076221 to OpenJDK 6 b38. + * patches/openjdk/8078823-disabledalgorithms_fails_intermittently.patch: + Improve reliability of DisabledAlgorithms test. + * patches/pr2808-fix_disabled_algorithms_test.patch: + Remove Java 7 features from new DisabledAlgorithms test. + +2016-01-25 Andrew John Hughes + + * NEWS: Add 1.13.10 release notes. + +2016-01-20 Andrew John Hughes + + * Makefile.am: + (OPENJDK_DATE): Bump to b38 creation date; + 20th of January, 2016. + (OPENJDK_SHA256SUM): Update for b38 tarball. + 2016-01-19 Andrew John Hughes * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch, diff -r 6df2ff9d8f54 -r 9e1c6190ff58 Makefile.am --- a/Makefile.am Wed Jan 20 05:19:11 2016 +0000 +++ b/Makefile.am Fri Jan 29 21:40:32 2016 +0000 @@ -1,8 +1,8 @@ # Dependencies -OPENJDK_DATE = 11_nov_2015 -OPENJDK_SHA256SUM = 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d -OPENJDK_VERSION = b38 +OPENJDK_DATE = 20_jan_2016 +OPENJDK_SHA256SUM = ff88dbcbda6c3c7d80b7cbd28065a455cdb009de9874fcf9ff9ca8205d38a257 +OPENJDK_VERSION = b39 OPENJDK_URL = https://java.net/downloads/openjdk6/ CACAO_VERSION = 68fe50ac34ec @@ -647,7 +647,10 @@ patches/openjdk/6929479-pr363-disable_mmap_zip.patch \ patches/pr2513-layoutengine_reset.patch \ patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch \ - patches/openjdk/8140620-pr2711-find_default.sf2.patch + patches/openjdk/8140620-pr2711-find_default.sf2.patch \ + patches/openjdk/8076221-pr2808-disable_rc4_cipher_suites.patch \ + patches/openjdk/8078823-disabledalgorithms_fails_intermittently.patch \ + patches/pr2808-fix_disabled_algorithms_test.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 6df2ff9d8f54 -r 9e1c6190ff58 NEWS --- a/NEWS Wed Jan 20 05:19:11 2016 +0000 +++ b/NEWS Fri Jan 29 21:40:32 2016 +0000 @@ -14,6 +14,21 @@ New in release 1.14.0 (201X-XX-XX): +* 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 + - 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 + - S8076221, PR2808: Disable RC4 cipher suites +* Bug fixes + - PR1886: IcedTea does not checksum supplied tarballs + - PR2083: Add support for building Zero on AArch64 + +New in release 1.13.10 (2016-01-22): + * Security fixes - S8059054, CVE-2016-0402: Better URL processing - S8130710, CVE-2016-0448: Better attributes processing @@ -46,18 +61,8 @@ - S8145551: Test failed with Crash for Improved font lookups - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp * 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 - S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F - - 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 - S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux -* Bug fixes - - PR1886: IcedTea does not checksum supplied tarballs - - PR2083: Add support for building Zero on AArch64 New in release 1.13.9 (2015-11-13): diff -r 6df2ff9d8f54 -r 9e1c6190ff58 patches/openjdk/8076221-pr2808-disable_rc4_cipher_suites.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8076221-pr2808-disable_rc4_cipher_suites.patch Fri Jan 29 21:40:32 2016 +0000 @@ -0,0 +1,553 @@ +# HG changeset patch +# User xuelei +# Date 1429096621 0 +# Wed Apr 15 11:17:01 2015 +0000 +# Node ID 6a24fc5e32a359335538bfa453040fc2d9ba13e9 +# Parent fe93a8cd20a56dc59e5f2464d7e6bd0d52b807b3 +8076221: Disable RC4 cipher suites +Reviewed-by: xuelei, wetmore + +diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security-linux openjdk/jdk/src/share/lib/security/java.security-linux +--- openjdk.orig/jdk/src/share/lib/security/java.security-linux 2016-01-20 01:47:58.000000000 +0000 ++++ openjdk/jdk/src/share/lib/security/java.security-linux 2016-01-25 20:25:35.722972332 +0000 +@@ -451,7 +451,7 @@ + # + # Example: + # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 +-jdk.tls.disabledAlgorithms=SSLv3, DH keySize < 768 ++jdk.tls.disabledAlgorithms=SSLv3, RC4, DH keySize < 768 + + # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) + # processing in JSSE implementation. +diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security-solaris openjdk/jdk/src/share/lib/security/java.security-solaris +--- openjdk.orig/jdk/src/share/lib/security/java.security-solaris 2016-01-20 01:47:58.000000000 +0000 ++++ openjdk/jdk/src/share/lib/security/java.security-solaris 2016-01-25 20:24:27.088115212 +0000 +@@ -411,7 +411,7 @@ + # + # Example: + # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 +-jdk.tls.disabledAlgorithms=SSLv3, DH keySize < 768 ++jdk.tls.disabledAlgorithms=SSLv3, RC4, DH keySize < 768 + + # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) + # processing in JSSE implementation. +diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security-windows openjdk/jdk/src/share/lib/security/java.security-windows +--- openjdk.orig/jdk/src/share/lib/security/java.security-windows 2016-01-20 01:47:58.000000000 +0000 ++++ openjdk/jdk/src/share/lib/security/java.security-windows 2016-01-25 20:23:50.300727758 +0000 +@@ -428,7 +428,7 @@ + # + # Example: + # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 +-jdk.tls.disabledAlgorithms=SSLv3, DH keySize < 768 ++jdk.tls.disabledAlgorithms=SSLv3, RC4, DH keySize < 768 + + # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) + # processing in JSSE implementation. +diff -Nru openjdk.orig/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java openjdk/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java +--- openjdk.orig/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java 2016-01-25 20:17:49.902742622 +0000 +@@ -0,0 +1,362 @@ ++/* ++ * Copyright (c) 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 ++ * 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. ++ */ ++ ++import java.io.BufferedInputStream; ++import java.io.BufferedOutputStream; ++import java.io.IOException; ++import java.io.InputStream; ++import java.io.OutputStream; ++import java.security.NoSuchAlgorithmException; ++import java.security.Security; ++import java.util.concurrent.TimeUnit; ++import javax.net.ssl.SSLContext; ++import javax.net.ssl.SSLHandshakeException; ++import javax.net.ssl.SSLServerSocket; ++import javax.net.ssl.SSLServerSocketFactory; ++import javax.net.ssl.SSLSocket; ++import javax.net.ssl.SSLSocketFactory; ++ ++/** ++ * @test ++ * @bug 8076221 ++ * @summary Check if weak cipher suites are disabled ++ * @run main/othervm DisabledAlgorithms default ++ * @run main/othervm DisabledAlgorithms empty ++ */ ++public class DisabledAlgorithms { ++ ++ private static final String pathToStores = ++ "../../../../sun/security/ssl/etc"; ++ private static final String keyStoreFile = "keystore"; ++ private static final String trustStoreFile = "truststore"; ++ private static final String passwd = "passphrase"; ++ ++ private static final String keyFilename = ++ System.getProperty("test.src", "./") + "/" + pathToStores + ++ "/" + keyStoreFile; ++ ++ private static final String trustFilename = ++ System.getProperty("test.src", "./") + "/" + pathToStores + ++ "/" + trustStoreFile; ++ ++ // supported RC4 cipher suites ++ // it does not contain KRB5 cipher suites because they need a KDC ++ private static final String[] rc4_ciphersuites = new String[] { ++ "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA", ++ "TLS_ECDHE_RSA_WITH_RC4_128_SHA", ++ "SSL_RSA_WITH_RC4_128_SHA", ++ "TLS_ECDH_ECDSA_WITH_RC4_128_SHA", ++ "TLS_ECDH_RSA_WITH_RC4_128_SHA", ++ "SSL_RSA_WITH_RC4_128_MD5", ++ "TLS_ECDH_anon_WITH_RC4_128_SHA", ++ "SSL_DH_anon_WITH_RC4_128_MD5" ++ }; ++ ++ public static void main(String[] args) throws Exception { ++ if (args.length < 1) { ++ throw new RuntimeException("No parameters specified"); ++ } ++ ++ System.setProperty("javax.net.ssl.keyStore", keyFilename); ++ System.setProperty("javax.net.ssl.keyStorePassword", passwd); ++ System.setProperty("javax.net.ssl.trustStore", trustFilename); ++ System.setProperty("javax.net.ssl.trustStorePassword", passwd); ++ ++ switch (args[0]) { ++ case "default": ++ // use default jdk.tls.disabledAlgorithms ++ System.out.println("jdk.tls.disabledAlgorithms = " ++ + Security.getProperty("jdk.tls.disabledAlgorithms")); ++ ++ // check if RC4 cipher suites can't be used by default ++ checkFailure(rc4_ciphersuites); ++ break; ++ case "empty": ++ // reset jdk.tls.disabledAlgorithms ++ Security.setProperty("jdk.tls.disabledAlgorithms", ""); ++ System.out.println("jdk.tls.disabledAlgorithms = " ++ + Security.getProperty("jdk.tls.disabledAlgorithms")); ++ ++ // check if RC4 cipher suites can be used ++ // if jdk.tls.disabledAlgorithms is empty ++ checkSuccess(rc4_ciphersuites); ++ break; ++ default: ++ throw new RuntimeException("Wrong parameter: " + args[0]); ++ } ++ } ++ ++ /* ++ * Checks if that specified cipher suites cannot be used. ++ */ ++ private static void checkFailure(String[] ciphersuites) throws Exception { ++ try (SSLServer server = SSLServer.init(ciphersuites)) { ++ startNewThread(server); ++ while (!server.isRunning()) { ++ sleep(); ++ } ++ ++ int port = server.getPort(); ++ for (String ciphersuite : ciphersuites) { ++ try (SSLClient client = SSLClient.init(port, ciphersuite)) { ++ client.connect(); ++ throw new RuntimeException("Expected SSLHandshakeException " ++ + "not thrown"); ++ } catch (SSLHandshakeException e) { ++ System.out.println("Expected exception on client side: " ++ + e); ++ } ++ } ++ ++ server.stop(); ++ while (server.isRunning()) { ++ sleep(); ++ } ++ ++ if (!server.sslError()) { ++ throw new RuntimeException("Expected SSL exception " ++ + "not thrown on server side"); ++ } ++ } ++ ++ } ++ ++ /* ++ * Checks if specified cipher suites can be used. ++ */ ++ private static void checkSuccess(String[] ciphersuites) throws Exception { ++ try (SSLServer server = SSLServer.init(ciphersuites)) { ++ startNewThread(server); ++ while (!server.isRunning()) { ++ sleep(); ++ } ++ ++ int port = server.getPort(); ++ for (String ciphersuite : ciphersuites) { ++ try (SSLClient client = SSLClient.init(port, ciphersuite)) { ++ client.connect(); ++ String negotiated = client.getNegotiatedCipherSuite(); ++ System.out.println("Negotiated cipher suite: " ++ + negotiated); ++ if (!negotiated.equals(ciphersuite)) { ++ throw new RuntimeException("Unexpected cipher suite: " ++ + negotiated); ++ } ++ } ++ } ++ ++ server.stop(); ++ while (server.isRunning()) { ++ sleep(); ++ } ++ ++ if (server.error()) { ++ throw new RuntimeException("Unexpected error on server side"); ++ } ++ } ++ ++ } ++ ++ private static Thread startNewThread(SSLServer server) { ++ Thread serverThread = new Thread(server, "SSL server thread"); ++ serverThread.setDaemon(true); ++ serverThread.start(); ++ return serverThread; ++ } ++ ++ private static void sleep() { ++ try { ++ TimeUnit.MILLISECONDS.sleep(50); ++ } catch (InterruptedException e) { ++ // do nothing ++ } ++ } ++ ++ static class SSLServer implements Runnable, AutoCloseable { ++ ++ private final SSLServerSocket ssocket; ++ private volatile boolean stopped = false; ++ private volatile boolean running = false; ++ private volatile boolean sslError = false; ++ private volatile boolean otherError = false; ++ ++ private SSLServer(SSLServerSocket ssocket) { ++ this.ssocket = ssocket; ++ } ++ ++ @Override ++ public void run() { ++ System.out.println("Server: started"); ++ running = true; ++ while (!stopped) { ++ try (SSLSocket socket = (SSLSocket) ssocket.accept()) { ++ System.out.println("Server: accepted client connection"); ++ InputStream in = socket.getInputStream(); ++ OutputStream out = socket.getOutputStream(); ++ int b = in.read(); ++ if (b < 0) { ++ throw new IOException("Unexpected EOF"); ++ } ++ System.out.println("Server: send data: " + b); ++ out.write(b); ++ out.flush(); ++ socket.getSession().invalidate(); ++ } catch (SSLHandshakeException e) { ++ System.out.println("Server: run: " + e); ++ sslError = true; ++ } catch (IOException e) { ++ if (!stopped) { ++ System.out.println("Server: run: " + e); ++ e.printStackTrace(); ++ otherError = true; ++ } ++ } ++ } ++ ++ System.out.println("Server: finished"); ++ running = false; ++ } ++ ++ int getPort() { ++ return ssocket.getLocalPort(); ++ } ++ ++ String[] getEnabledCiperSuites() { ++ return ssocket.getEnabledCipherSuites(); ++ } ++ ++ boolean isRunning() { ++ return running; ++ } ++ ++ boolean sslError() { ++ return sslError; ++ } ++ ++ boolean error() { ++ return sslError || otherError; ++ } ++ ++ void stop() { ++ stopped = true; ++ if (!ssocket.isClosed()) { ++ try { ++ ssocket.close(); ++ } catch (IOException e) { ++ System.out.println("Server: close: " + e); ++ } ++ } ++ } ++ ++ @Override ++ public void close() { ++ stop(); ++ } ++ ++ static SSLServer init(String[] ciphersuites) ++ throws IOException { ++ SSLServerSocketFactory ssf = (SSLServerSocketFactory) ++ SSLServerSocketFactory.getDefault(); ++ SSLServerSocket ssocket = (SSLServerSocket) ++ ssf.createServerSocket(0); ++ ++ if (ciphersuites != null) { ++ System.out.println("Server: enable cipher suites: " ++ + java.util.Arrays.toString(ciphersuites)); ++ ssocket.setEnabledCipherSuites(ciphersuites); ++ } ++ ++ return new SSLServer(ssocket); ++ } ++ } ++ ++ static class SSLClient implements AutoCloseable { ++ ++ private final SSLSocket socket; ++ ++ private SSLClient(SSLSocket socket) { ++ this.socket = socket; ++ } ++ ++ void connect() throws IOException { ++ System.out.println("Client: connect to server"); ++ try ( ++ BufferedInputStream bis = new BufferedInputStream( ++ socket.getInputStream()); ++ BufferedOutputStream bos = new BufferedOutputStream( ++ socket.getOutputStream())) { ++ bos.write('x'); ++ bos.flush(); ++ ++ int read = bis.read(); ++ if (read < 0) { ++ throw new IOException("Client: couldn't read a response"); ++ } ++ socket.getSession().invalidate(); ++ } ++ } ++ ++ String[] getEnabledCiperSuites() { ++ return socket.getEnabledCipherSuites(); ++ } ++ ++ String getNegotiatedCipherSuite() { ++ return socket.getSession().getCipherSuite(); ++ } ++ ++ @Override ++ public void close() throws Exception { ++ if (!socket.isClosed()) { ++ try { ++ socket.close(); ++ } catch (IOException e) { ++ System.out.println("Client: close: " + e); ++ } ++ } ++ } ++ ++ static SSLClient init(int port) ++ throws NoSuchAlgorithmException, IOException { ++ return init(port, null); ++ } From bugzilla-daemon at icedtea.classpath.org Fri Jan 29 22:45:42 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:45:42 +0000 Subject: [Bug 2804] test/tapset/jstaptest.pl should be executable In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2804 --- Comment #1 from Andrew John Hughes --- Rather than making the script executable, I've added a check for Perl and used that to invoke the script. I think that's a more flexible solution than relying on the hard-coded she-bang in the script. -- 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 Fri Jan 29 22:47:51 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:47:51 +0000 Subject: /hg/icedtea: 5 new changesets Message-ID: changeset 77d56f3ec0cf in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=77d56f3ec0cf author: Andrew John Hughes date: Fri Jan 29 14:18:11 2016 +0000 Bump to icedtea-3.0.0pre08. Upstream changes: - PR1368: Ensure debug data is available for all libraries and binaries without redundant files - PR1983: Support using the system installation of NSS with the SunEC provider - PR2127: SunEC provider crashes when built using system NSS - PR2321: Checksum of policy JAR files changes on every build - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold - PR2767: Remove remaining rogue binaries from OpenJDK tree - PR2777: Fix MAX/MIN template usage on s390 - PR2815: Race condition in SunEC provider with system NSS - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux ChangeLog: 2016-01-28 Andrew John Hughes Bump to icedtea-3.0.0pre08. * patches/pr2777.patch: Removed; upstream. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (NASHORN_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (NASHORN_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove pr2777 patch. * NEWS: Updated. * configure.ac: Bump to 3.0.0pre08. * fsg.sh.in: Remove deletions of files which have now been deleted upstream (PR2767) * hotspot.map.in: Update to icedtea-3.0.0pre08 tag. changeset 241cf3509015 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=241cf3509015 author: Andrew John Hughes date: Fri Jan 29 14:24:16 2016 +0000 PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed 2016-01-29 Andrew John Hughes PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed * patches/systemtap-gcc-4.5.patch: Removed; seems to be no longer needed. * Makefile.am: (ICEDTEA_PATCHES): Remove above patch. * NEWS: Updated. changeset a84cfe9142fd in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a84cfe9142fd author: Andrew John Hughes date: Fri Jan 29 17:41:08 2016 +0000 PR1983: Support using the system installation of NSS with the SunEC provider 2016-01-29 Andrew John Hughes PR1983: Support using the system installation of NSS with the SunEC provider * INSTALL: Fix header from 'IcedTea7' to 'IcedTea'. * Makefile.am: (ICEDTEA_PATCHES): Make disable-intree-ec patch conditional on whether or not the SunEC provider is enabled. Add new variants of the NSS/PKCS11 configuration patch for cases where it is not applied. (ICEDTEA_CONFIGURE): Pass --enable-system-nss or --disable-system-nss, depending on whether or not the SunEC provider is enabled. (ICEDTEA_ENV): Remove DISABLE_INTREE_EC which is not applicable in OpenJDK 8. * README: Fix header from 'IcedTea7' to 'IcedTea'. * patches/nss-config-with-sunec.patch, * patches/nss-not-enabled-config-with-sunec.patch: New variants of nss-config.patch and nss-not-enabled-config.patch which apply when the SunEC provider is also enabled. 2015-07-06 Andrew John Hughes * INSTALL: Document the SunEC provider. 2014-05-09 Andrew John Hughes PR1762: Undefined references when building with NSS 3.16.1 * acinclude.m4: (IT_ENABLE_SUNEC): For NSS >= 3.16.1, add -lfreebl to SUNEC_LIBS, not SUNEC_CFLAGS, and use NSS_LIBS as the base, not NSS_SOFTOKN_LIBS. 2014-04-23 Andrew John Hughes PR1742: Allow SunEC provider to be built with changes in NSS >= 3.16.1 * Makefile.am: (ICEDTEA_ENV): Use SUNEC_LIBS and SUNEC_CFLAGS instead of NSS_LIBS and NSS_CFLAGS respectively. * acinclude.m4: (IT_ENABLE_SUNEC): Use SUNEC_CFLAGS and SUNEC_LIBS for clarity as NSS_CFLAGS and NSS_LIBS are also set by the NSS detection. 2014-04-18 Andrew John Hughes PR1699: Support building the SunEC provider with system NSS * Makefile.am: (ICEDTEA_ENV): Set NSS_LIBS and NSS_CFLAGS when ENABLE_SUNEC is set. * acinclude.m4: (IT_LOCATE_NSS): Fix wording to make it clear that this is the PKCS11 provider, using NSS as the implementation. (IT_ENABLE_SUNEC): Allow the Sun elliptic curve crypto provider to be enabled. * configure.ac: Replace IT_LOCATE_NSS with IT_ENABLE_SUNEC (which depends on the former). * fsg.sh.in: Only delete the SunEC implementation code at this level. This is the part that is legally dubious, due to the use of many more elliptic curves than those provided by the NSS version. * remove-intree-libraries.sh.in: Include the remaining SunEC deletion from fsg.sh here and make it optional. changeset 969d84a2df36 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=969d84a2df36 author: Andrew John Hughes date: Fri Jan 29 22:46:53 2016 +0000 PR2804: test/tapset/jstaptest.pl should be executable 2016-01-29 Andrew John Hughes PR2804: test/tapset/jstaptest.pl should be executable * Makefile.am: (check-tapset-probes): Check that Perl is available and, if, so use it to invoke the script. Replace BUILD_OUTPUT_DIR with the OpenJDK 8 equivalent, BUILD_IMAGE_DIR. (check-tapset-jstack): Likewise. * NEWS: Updated. * configure.ac: Check for Perl if SystemTap is found, so the tests can be run if required. changeset 0883b7a8311a in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0883b7a8311a author: Andrew John Hughes date: Fri Jan 29 22:47:27 2016 +0000 Added tag icedtea-3.0.0pre08 for changeset 969d84a2df36 diffstat: .hgtags | 1 + ChangeLog | 120 +++++++++ INSTALL | 17 +- Makefile.am | 76 ++++-- NEWS | 10 + README | 4 +- acinclude.m4 | 41 +++- configure.ac | 12 +- fsg.sh.in | 24 +- hotspot.map.in | 2 +- patches/nss-config-with-sunec.patch | 11 + patches/nss-not-enabled-config-with-sunec.patch | 13 + patches/pr2777.patch | 290 ------------------------ patches/systemtap-gcc-4.5.patch | 12 - remove-intree-libraries.sh.in | 8 + 15 files changed, 280 insertions(+), 361 deletions(-) diffs (truncated from 898 to 500 lines): diff -r 7442a0ce54ca -r 0883b7a8311a .hgtags --- a/.hgtags Thu Dec 24 17:46:14 2015 +0000 +++ b/.hgtags Fri Jan 29 22:47:27 2016 +0000 @@ -35,3 +35,4 @@ f731589b0b250e4d63437c0ac7e9592e3386529a icedtea-3.0.0pre05 a9817b9f8a21ed88b203bc3983c2ffbec81fe65d icedtea-3.0.0pre06 7836b5436b70b9a9b1a48f663f55643eb1e28570 icedtea-3.0.0pre07 +969d84a2df36cffb274951ecb25c3a44e0ee2081 icedtea-3.0.0pre08 diff -r 7442a0ce54ca -r 0883b7a8311a ChangeLog --- a/ChangeLog Thu Dec 24 17:46:14 2015 +0000 +++ b/ChangeLog Fri Jan 29 22:47:27 2016 +0000 @@ -1,3 +1,123 @@ +2016-01-29 Andrew John Hughes + + PR2804: test/tapset/jstaptest.pl should be executable + * Makefile.am: + (check-tapset-probes): Check that Perl is available + and, if, so use it to invoke the script. Replace + BUILD_OUTPUT_DIR with the OpenJDK 8 equivalent, + BUILD_IMAGE_DIR. + (check-tapset-jstack): Likewise. + * NEWS: Updated. + * configure.ac: + Check for Perl if SystemTap is found, so the + tests can be run if required. + +2016-01-29 Andrew John Hughes + + PR1983: Support using the system installation + of NSS with the SunEC provider + * INSTALL: Fix header from 'IcedTea7' to 'IcedTea'. + * Makefile.am: + (ICEDTEA_PATCHES): Make disable-intree-ec patch + conditional on whether or not the SunEC provider + is enabled. Add new variants of the NSS/PKCS11 + configuration patch for cases where it is not applied. + (ICEDTEA_CONFIGURE): Pass --enable-system-nss or + --disable-system-nss, depending on whether or + not the SunEC provider is enabled. + (ICEDTEA_ENV): Remove DISABLE_INTREE_EC which + is not applicable in OpenJDK 8. + * README: Fix header from 'IcedTea7' to 'IcedTea'. + * patches/nss-config-with-sunec.patch, + * patches/nss-not-enabled-config-with-sunec.patch: + New variants of nss-config.patch and nss-not-enabled-config.patch + which apply when the SunEC provider is also enabled. + +2015-07-06 Andrew John Hughes + + * INSTALL: Document the SunEC provider. + +2014-05-09 Andrew John Hughes + + PR1762: Undefined references when building with NSS 3.16.1 + * acinclude.m4: + (IT_ENABLE_SUNEC): For NSS >= 3.16.1, add -lfreebl + to SUNEC_LIBS, not SUNEC_CFLAGS, and use NSS_LIBS as + the base, not NSS_SOFTOKN_LIBS. + +2014-04-23 Andrew John Hughes + + PR1742: Allow SunEC provider to be built with changes + in NSS >= 3.16.1 + * Makefile.am: + (ICEDTEA_ENV): Use SUNEC_LIBS and SUNEC_CFLAGS + instead of NSS_LIBS and NSS_CFLAGS respectively. + * acinclude.m4: + (IT_ENABLE_SUNEC): Use SUNEC_CFLAGS and SUNEC_LIBS + for clarity as NSS_CFLAGS and NSS_LIBS are also set + by the NSS detection. + +2014-04-18 Andrew John Hughes + + PR1699: Support building the SunEC provider + with system NSS + * Makefile.am: + (ICEDTEA_ENV): Set NSS_LIBS and NSS_CFLAGS + when ENABLE_SUNEC is set. + * acinclude.m4: + (IT_LOCATE_NSS): Fix wording to make it clear that + this is the PKCS11 provider, using NSS as the + implementation. + (IT_ENABLE_SUNEC): Allow the Sun elliptic curve + crypto provider to be enabled. + * configure.ac: + Replace IT_LOCATE_NSS with IT_ENABLE_SUNEC (which + depends on the former). + * fsg.sh.in: + Only delete the SunEC implementation code at this + level. This is the part that is legally dubious, + due to the use of many more elliptic curves than + those provided by the NSS version. + * remove-intree-libraries.sh.in: + Include the remaining SunEC deletion from fsg.sh + here and make it optional. + +2016-01-29 Andrew John Hughes + + PR2768: Move SystemTap GCC 4.5 patch to OpenJDK + tree or discard if no longer needed + * patches/systemtap-gcc-4.5.patch: + Removed; seems to be no longer needed. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patch. + * NEWS: Updated. + +2016-01-28 Andrew John Hughes + + Bump to icedtea-3.0.0pre08. + * patches/pr2777.patch: Removed; upstream. + * Makefile.am: + (CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (NASHORN_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + (NASHORN_SHA256SUM): Likewise. + (ICEDTEA_PATCHES): Remove pr2777 patch. + * NEWS: Updated. + * configure.ac: Bump to 3.0.0pre08. + * fsg.sh.in: Remove deletions of files which have + now been deleted upstream (PR2767) + * hotspot.map.in: Update to icedtea-3.0.0pre08 tag. + 2015-12-23 Andrew John Hughes * Makefile.am: diff -r 7442a0ce54ca -r 0883b7a8311a INSTALL --- a/INSTALL Thu Dec 24 17:46:14 2015 +0000 +++ b/INSTALL Fri Jan 29 22:47:27 2016 +0000 @@ -1,5 +1,5 @@ -Building IcedTea7 -================= +Building IcedTea +================ For convenience we've provided make targets that automatically download, extract and patch the source code from the IcedTea forest @@ -159,6 +159,7 @@ * --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK. * --with-additional-vms=vm-list: Additional VMs to build using the system described below. +* --enable-sunec: Build the SunEC crypto provider against system NSS. Testing ======= @@ -205,8 +206,8 @@ /usr/lib/jvm/java-1.6.0-openjdk, then you should specify --with-abs-install-dir=/usr/lib/jvm/java-1.6.0-openjdk. -NSS Security Provider -===================== +The NSS PKCS11 Security Provider and Elliptic Curve Cryptography +================================================================ OpenJDK includes an NSS-based security provider in the form of sun.security.pkcs11.SunPKCS11. However, as this needs to know the @@ -217,6 +218,14 @@ this configuration will be turned on in lib/security/java.security. This can also be done manually at a later date. +The PKCS11 option was originally added as it was the only way that +elliptic curve cryptography support could be provided. From OpenJDK 7 +onwards, there is another provider, SunEC. This also utilises NSS, but +directly via its ECC functions rather than the PKCS11 interface. +Specifying --enable-sunec will build this provider, linked against +NSS. Version 3.16.1 or later of NSS is required so that the +appropriate softokn ABI is available to the provider. + CACAO ===== diff -r 7442a0ce54ca -r 0883b7a8311a Makefile.am --- a/Makefile.am Thu Dec 24 17:46:14 2015 +0000 +++ b/Makefile.am Fri Jan 29 22:47:27 2016 +0000 @@ -4,21 +4,21 @@ BUILD_VERSION = b24 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = 7418bb690047 -JAXP_CHANGESET = c08ba71fef66 -JAXWS_CHANGESET = 2012603e0e90 -JDK_CHANGESET = c4b25140f059 -LANGTOOLS_CHANGESET = 3c76eafe1b70 -OPENJDK_CHANGESET = 4b05cb9c5a4c -NASHORN_CHANGESET = fd478ce27023 +CORBA_CHANGESET = ebc2780ebeb3 +JAXP_CHANGESET = ac52a8eed353 +JAXWS_CHANGESET = 26a1fdce80b7 +JDK_CHANGESET = 809d98eeda49 +LANGTOOLS_CHANGESET = 0d3479e0bac6 +OPENJDK_CHANGESET = f0635543beb3 +NASHORN_CHANGESET = 7babac6e7ecf -CORBA_SHA256SUM = e47d271bd2d0490d07d194480ae3943bc2617dc260b6cc2ef080697f588bbc62 -JAXP_SHA256SUM = ce0e1a6c850420735233e06667b32d32f91051ae4abb57f76c86343fbe3aa7d3 -JAXWS_SHA256SUM = 3b30942316cc58b2f461587f5032841d072cc31c1c4f4c62c60b9cc49713065e -JDK_SHA256SUM = 8136f803b78577a35be6e481733b327831069723f1828f0c964c6d8689f459cc -LANGTOOLS_SHA256SUM = d48f5de5ede27c075def8c79d2e3668223def1da671cc5b8a69b80fc7aeb2207 -OPENJDK_SHA256SUM = 12d6348124c133ed43cc1ac0dad0ce3eafb2e42947c36cc87df2f5163674a805 -NASHORN_SHA256SUM = e3a6e093e574a6a9d2cefc25184510c023ad4bd65fbb060085e969e23050a515 +CORBA_SHA256SUM = 330c609920179ee0c73fd40140c915bf1497ee00742d223d721babeb48d4ec66 +JAXP_SHA256SUM = e6771d28027925157e0f3573c7f2b58607d7ae4bb0fd77a6d38f154e7008c09b +JAXWS_SHA256SUM = be44c6810e3b8dc8de0ca62dce7111016bb035e9b334af40cffdd9c27cca1ec2 +JDK_SHA256SUM = 55d51096e311e743533b0ccf7974e20588c1df08ac790edf226f06d49a699e25 +LANGTOOLS_SHA256SUM = 536db72b9440ef1ce11d1f87b15a2052a3f362fab04d5bedcd185839e742db86 +OPENJDK_SHA256SUM = fa45e6d4b7b2f114cb1d7388ab57f419b6f733e7be744cac4def586959da64b8 +NASHORN_SHA256SUM = b2509a50adfa4b29c0ae6e8c5b601fc2a76e9cc63da1d34443c6e0bf11a7c150 HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`" HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`" @@ -229,9 +229,7 @@ ICEDTEA_PATCHES = \ patches/memory-limits.patch \ patches/override-redirect-metacity.patch \ - patches/rh1022017.patch \ - patches/disable-intree-ec.patch \ - patches/pr2777.patch + patches/rh1022017.patch # Conditional patches @@ -256,20 +254,29 @@ patches/pulse-soundproperties.patch endif -if ENABLE_SYSTEMTAP -ICEDTEA_PATCHES += patches/systemtap-gcc-4.5.patch -endif - if BUILD_JAMVM ICEDTEA_PATCHES += \ patches/jamvm/find_class_from_caller.patch endif +if !ENABLE_SUNEC +ICEDTEA_PATCHES += \ + patches/disable-intree-ec.patch +endif + if ENABLE_NSS +if ENABLE_SUNEC +ICEDTEA_PATCHES += patches/nss-config-with-sunec.patch +else ICEDTEA_PATCHES += patches/nss-config.patch +endif +else +if ENABLE_SUNEC +ICEDTEA_PATCHES += patches/nss-not-enabled-config-with-sunec.patch else ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch endif +endif ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) @@ -350,6 +357,14 @@ --with-giflib=bundled endif +if ENABLE_SUNEC +ICEDTEA_CONFIGURE += \ + --enable-system-nss +else +ICEDTEA_CONFIGURE += \ + --disable-system-nss +endif + if ZERO_BUILD ICEDTEA_CONFIGURE += \ --with-jvm-variants=zero @@ -395,7 +410,6 @@ DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ DEBUG_CLASSFILES="true" \ DEBUG_BINARIES="true" \ - DISABLE_INTREE_EC="true" \ LOG="debug" SCTP_WERROR= \ POST_STRIP_CMD= STRIP_POLICY="no_strip" \ JOBS="$(PARALLEL_JOBS)" @@ -464,6 +478,12 @@ GIF_CFLAGS="${GIF_CFLAGS}" endif +if ENABLE_SUNEC +ICEDTEA_ENV += \ + NSS_LIBS="${SUNEC_LIBS}" \ + NSS_CFLAGS="${SUNEC_CFLAGS}" +endif + # OpenJDK boot build environment. ICEDTEA_CONFIGURE_BOOT = $(ICEDTEA_CONFIGURE) ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \ @@ -2292,15 +2312,21 @@ check-tapset-probes: if ENABLE_SYSTEMTAP - $(abs_top_srcdir)/test/tapset/jstaptest.pl \ - -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \ + if test "x${PERL}" = "x"; then \ + echo "ERROR: Perl not found"; exit -1; \ + fi + ${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \ + -B $(BUILD_IMAGE_DIR) -A $(BUILD_ARCH_DIR) \ -S $(abs_top_srcdir)/test/tapset \ -a test/check-stap.log -p endif check-tapset-jstack: if ENABLE_SYSTEMTAP - $(abs_top_srcdir)/test/tapset/jstaptest.pl \ + if test "x${PERL}" = "x"; then \ + echo "ERROR: Perl not found"; exit -1; \ + fi + ${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \ -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \ -S $(abs_top_srcdir)/test/tapset \ -a test/check-stap.log -j diff -r 7442a0ce54ca -r 0883b7a8311a NEWS --- a/NEWS Thu Dec 24 17:46:14 2015 +0000 +++ b/NEWS Fri Jan 29 22:47:27 2016 +0000 @@ -27,6 +27,7 @@ - S8087218, PR2740: Constant fold loads from final instance fields in VM anonymous classes - S8139932, PR2739: Typo in makefile changes for 8043805 [Allow using a system-installed libjpeg] - S8140483, PR2740: Atomic*FieldUpdaters final fields should be trusted + - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux * Bug fixes - S8041658: Use of -fdevirtualize on macroAssembler_x86.o (via -O2) with gcc 4.9.0 creates broken VM - PR94: empty install target in Makefile.am @@ -44,6 +45,7 @@ - PR1359: Check for /usr/lib64 JVMs and generic JPackage alternative - PR1364: Replace hgforest support - PR1367: Support using the system installation of LCMS + - PR1368: Ensure debug data is available for all libraries and binaries without redundant files - PR1369: Remove outdated bootstrap configure tests or make them fail on error - PR1377: Forwardport javac detection / usability test from IcedTea 2.x - PR1379: Add build support for Zero AArch64 @@ -71,11 +73,13 @@ - PR1979: Support using the system installation of libjpeg - PR1980: Support using the system installation of giflib - PR1981: Support using the system installation of libpng + - PR1983: Support using the system installation of NSS with the SunEC provider - PR1994: make dist broken - PR2001: Synchronise HEAD tarball paths with release branch paths - PR2066: Unset OS before running OpenJDK build - PR2095, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure - PR2126: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS + - PR2127: SunEC provider crashes when built using system NSS - PR2199: Support giflib 5.1.0 - PR2212: DGifCloseFile call should check the return value, not the error code, for failure - PR2227: giflib 5.1 conditional excludes 6.0, 7.0, etc. @@ -83,6 +87,7 @@ - PR2248: HotSpot tarball fails verification after download - PR2256: Add SystemTap tests - PR2257: clean-extract-nashorn rule is never run + - PR2321: Checksum of policy JAR files changes on every build - PR2329: jamvm parallel unpack failures - PR2339: Fail early if there is no native HotSpot JIT & all other options are disabled - PR2348: Avoid following symlinks for CACAO and JamVM patches @@ -112,6 +117,7 @@ - PR2448: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does - PR2454: install-data-local needs to check that classes.jsa actually exists - PR2456: Installation path for hotspot_gc.stp is wrong, due to changed j2sdk-image location + - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold - PR2511: Reset success following calls in LayoutManager.cpp - PR2631: jvm.cfg missing for ppc64le - PR2633: s390 builds still fail as BUILD_NUM_BITS is never set @@ -121,7 +127,11 @@ - PR2738: java.lang.UnsatisfiedLinkError: no javalcms in java.library.path - PR2743: Remove bad AArch64 merge fragment - PR2759: LCMS library should be named javalcms, not lcms, to avoid potential conflicts with the system library + - PR2767: Remove remaining rogue binaries from OpenJDK tree + - PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed - PR2777: Fix MAX/MIN template usage on s390 + - PR2804: test/tapset/jstaptest.pl should be executable + - PR2815: Race condition in SunEC provider with system NSS - Don't substitute 'j' for '-j' inside -I directives - Extend 8041658 to all files in the HotSpot build. - Remove jcheck diff -r 7442a0ce54ca -r 0883b7a8311a README --- a/README Thu Dec 24 17:46:14 2015 +0000 +++ b/README Fri Jan 29 22:47:27 2016 +0000 @@ -1,5 +1,5 @@ -IcedTea7 -======== +IcedTea +======= The IcedTea project provides a harness to build the source code from openjdk.java.net using Free Software tools and dependencies. diff -r 7442a0ce54ca -r 0883b7a8311a acinclude.m4 --- a/acinclude.m4 Thu Dec 24 17:46:14 2015 +0000 +++ b/acinclude.m4 Fri Jan 29 22:47:27 2016 +0000 @@ -1396,10 +1396,10 @@ AC_DEFUN_ONCE([IT_LOCATE_NSS], [ AC_REQUIRE([IT_OBTAIN_DEFAULT_LIBDIR]) -AC_MSG_CHECKING([whether to enable the NSS-based security provider]) +AC_MSG_CHECKING([whether to enable the PKCS11 crypto provider using NSS]) AC_ARG_ENABLE([nss], [AS_HELP_STRING([--enable-nss], - [Enable inclusion of NSS security provider])], + [Enable inclusion of PKCS11 crypto provider using NSS])], [ENABLE_NSS="${enableval}"], [ENABLE_NSS='no']) AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes]) if test "x${ENABLE_NSS}" = "xyes" @@ -1943,3 +1943,40 @@ AC_MSG_RESULT([$has_native_hotspot_port]) ]) +AC_DEFUN_ONCE([IT_ENABLE_SUNEC], +[ + AC_REQUIRE([IT_LOCATE_NSS]) + AC_MSG_CHECKING([whether to enable the Sun elliptic curve crypto provider]) + AC_ARG_ENABLE([sunec], + [AS_HELP_STRING(--enable-sunec,build the Sun elliptic curve crypto provider [[default=no]])], + [ + case "${enableval}" in + yes) + enable_sunec=yes + ;; + *) + enable_sunec=no + ;; + esac + ], + [ + enable_sunec=no + ]) + AC_MSG_RESULT([$enable_sunec]) + AM_CONDITIONAL([ENABLE_SUNEC], test x"${enable_sunec}" = "xyes") + if test x"${enable_sunec}" = "xyes"; then + PKG_CHECK_MODULES(NSS_SOFTOKN, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no]) + PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no]) + if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then + SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS; + SUNEC_LIBS="$NSS_LIBS -lfreebl"; + elif test "x${NSS_JAVA_FOUND}" = "xyes"; then + SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS"; + SUNEC_LIBS=$NSS_JAVA_LIBS; + else + AC_MSG_ERROR([Could not find a suitable NSS installation to use for the SunEC provider.]) + fi + AC_SUBST(SUNEC_CFLAGS) + AC_SUBST(SUNEC_LIBS) + fi +]) diff -r 7442a0ce54ca -r 0883b7a8311a configure.ac --- a/configure.ac Thu Dec 24 17:46:14 2015 +0000 +++ b/configure.ac Fri Jan 29 22:47:27 2016 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [3.0.0pre07], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [3.0.0pre08], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile]) @@ -58,6 +58,7 @@ IT_DISABLE_HOTSPOT_TESTS IT_DISABLE_LANGTOOLS_TESTS IT_DISABLE_JDK_TESTS +IT_ENABLE_SUNEC # 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], []) @@ -79,7 +80,6 @@ AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes]) AC_MSG_RESULT(${ENABLE_DOCS}) -IT_LOCATE_NSS IT_GET_PKGVERSION IT_GET_LSB_DATA @@ -252,6 +252,14 @@ inst.method(24); ]])], [AC_MSG_RESULT([yes])], [SDT_H_FOUND='no'; AC_MSG_WARN([systemtap sdt.h or g++ too old])]) AC_LANG_POP([C++]) +if test "x${SDT_H_FOUND}" = "xyes"; then + AC_PATH_TOOL([PERL],[perl]) + if test x"${PERL}" = x ; then + AC_MSG_WARN([Perl not found in PATH; SystemTap tests will not be able to run]) + fi + AC_SUBST(PERL) +fi + AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$SDT_H_FOUND = xyes]) AC_MSG_CHECKING([for absolute java home install dir]) diff -r 7442a0ce54ca -r 0883b7a8311a fsg.sh.in --- a/fsg.sh.in Thu Dec 24 17:46:14 2015 +0000 +++ b/fsg.sh.in Fri Jan 29 22:47:27 2016 +0000 @@ -5,35 +5,13 @@ # 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/Oracle bug database (https://bugs.openjdk.java.net/browse/JDK-X) From bugzilla-daemon at icedtea.classpath.org Fri Jan 29 22:48:41 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:48:41 +0000 Subject: [Bug 2769] [IcedTea8] Backport "8140620: Find and load default.sf2 as the default soundbank on Linux" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2769 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=77d56f3ec0cf author: Andrew John Hughes date: Fri Jan 29 14:18:11 2016 +0000 Bump to icedtea-3.0.0pre08. Upstream changes: - PR1368: Ensure debug data is available for all libraries and binaries without redundant files - PR1983: Support using the system installation of NSS with the SunEC provider - PR2127: SunEC provider crashes when built using system NSS - PR2321: Checksum of policy JAR files changes on every build - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold - PR2767: Remove remaining rogue binaries from OpenJDK tree - PR2777: Fix MAX/MIN template usage on s390 - PR2815: Race condition in SunEC provider with system NSS - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux ChangeLog: 2016-01-28 Andrew John Hughes Bump to icedtea-3.0.0pre08. * patches/pr2777.patch: Removed; upstream. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (NASHORN_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (NASHORN_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove pr2777 patch. * NEWS: Updated. * configure.ac: Bump to 3.0.0pre08. * fsg.sh.in: Remove deletions of files which have now been deleted upstream (PR2767) * hotspot.map.in: Update to icedtea-3.0.0pre08 tag. -- 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 29 22:48:50 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:48:50 +0000 Subject: [Bug 2321] [IcedTea8] Checksum of policy JAR files changes on every build In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2321 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=77d56f3ec0cf author: Andrew John Hughes date: Fri Jan 29 14:18:11 2016 +0000 Bump to icedtea-3.0.0pre08. Upstream changes: - PR1368: Ensure debug data is available for all libraries and binaries without redundant files - PR1983: Support using the system installation of NSS with the SunEC provider - PR2127: SunEC provider crashes when built using system NSS - PR2321: Checksum of policy JAR files changes on every build - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold - PR2767: Remove remaining rogue binaries from OpenJDK tree - PR2777: Fix MAX/MIN template usage on s390 - PR2815: Race condition in SunEC provider with system NSS - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux ChangeLog: 2016-01-28 Andrew John Hughes Bump to icedtea-3.0.0pre08. * patches/pr2777.patch: Removed; upstream. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (NASHORN_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (NASHORN_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove pr2777 patch. * NEWS: Updated. * configure.ac: Bump to 3.0.0pre08. * fsg.sh.in: Remove deletions of files which have now been deleted upstream (PR2767) * hotspot.map.in: Update to icedtea-3.0.0pre08 tag. -- 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 29 22:48:53 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:48:53 +0000 Subject: [Bug 2815] [IcedTea8] Race condition in SunEC provider with system NSS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2815 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=77d56f3ec0cf author: Andrew John Hughes date: Fri Jan 29 14:18:11 2016 +0000 Bump to icedtea-3.0.0pre08. Upstream changes: - PR1368: Ensure debug data is available for all libraries and binaries without redundant files - PR1983: Support using the system installation of NSS with the SunEC provider - PR2127: SunEC provider crashes when built using system NSS - PR2321: Checksum of policy JAR files changes on every build - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold - PR2767: Remove remaining rogue binaries from OpenJDK tree - PR2777: Fix MAX/MIN template usage on s390 - PR2815: Race condition in SunEC provider with system NSS - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux ChangeLog: 2016-01-28 Andrew John Hughes Bump to icedtea-3.0.0pre08. * patches/pr2777.patch: Removed; upstream. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (NASHORN_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (NASHORN_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove pr2777 patch. * NEWS: Updated. * configure.ac: Bump to 3.0.0pre08. * fsg.sh.in: Remove deletions of files which have now been deleted upstream (PR2767) * hotspot.map.in: Update to icedtea-3.0.0pre08 tag. -- 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 29 22:48:46 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:48:46 +0000 Subject: [Bug 2127] [IcedTea8] SunEC provider crashes when built using system NSS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2127 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=77d56f3ec0cf author: Andrew John Hughes date: Fri Jan 29 14:18:11 2016 +0000 Bump to icedtea-3.0.0pre08. Upstream changes: - PR1368: Ensure debug data is available for all libraries and binaries without redundant files - PR1983: Support using the system installation of NSS with the SunEC provider - PR2127: SunEC provider crashes when built using system NSS - PR2321: Checksum of policy JAR files changes on every build - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold - PR2767: Remove remaining rogue binaries from OpenJDK tree - PR2777: Fix MAX/MIN template usage on s390 - PR2815: Race condition in SunEC provider with system NSS - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux ChangeLog: 2016-01-28 Andrew John Hughes Bump to icedtea-3.0.0pre08. * patches/pr2777.patch: Removed; upstream. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (NASHORN_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (NASHORN_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove pr2777 patch. * NEWS: Updated. * configure.ac: Bump to 3.0.0pre08. * fsg.sh.in: Remove deletions of files which have now been deleted upstream (PR2767) * hotspot.map.in: Update to icedtea-3.0.0pre08 tag. -- 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 29 22:48:55 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:48:55 +0000 Subject: [Bug 1368] [IcedTea8] Ensure debug data is available for all libraries and binaries without redundant files In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1368 --- Comment #9 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=77d56f3ec0cf author: Andrew John Hughes date: Fri Jan 29 14:18:11 2016 +0000 Bump to icedtea-3.0.0pre08. Upstream changes: - PR1368: Ensure debug data is available for all libraries and binaries without redundant files - PR1983: Support using the system installation of NSS with the SunEC provider - PR2127: SunEC provider crashes when built using system NSS - PR2321: Checksum of policy JAR files changes on every build - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold - PR2767: Remove remaining rogue binaries from OpenJDK tree - PR2777: Fix MAX/MIN template usage on s390 - PR2815: Race condition in SunEC provider with system NSS - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux ChangeLog: 2016-01-28 Andrew John Hughes Bump to icedtea-3.0.0pre08. * patches/pr2777.patch: Removed; upstream. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (NASHORN_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (NASHORN_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove pr2777 patch. * NEWS: Updated. * configure.ac: Bump to 3.0.0pre08. * fsg.sh.in: Remove deletions of files which have now been deleted upstream (PR2767) * hotspot.map.in: Update to icedtea-3.0.0pre08 tag. -- 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 29 22:49:07 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:49:07 +0000 Subject: [Bug 2459] [IcedTea8] Policy JAR files should be timestamped with the date of the policy file they hold In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2459 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=77d56f3ec0cf author: Andrew John Hughes date: Fri Jan 29 14:18:11 2016 +0000 Bump to icedtea-3.0.0pre08. Upstream changes: - PR1368: Ensure debug data is available for all libraries and binaries without redundant files - PR1983: Support using the system installation of NSS with the SunEC provider - PR2127: SunEC provider crashes when built using system NSS - PR2321: Checksum of policy JAR files changes on every build - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold - PR2767: Remove remaining rogue binaries from OpenJDK tree - PR2777: Fix MAX/MIN template usage on s390 - PR2815: Race condition in SunEC provider with system NSS - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux ChangeLog: 2016-01-28 Andrew John Hughes Bump to icedtea-3.0.0pre08. * patches/pr2777.patch: Removed; upstream. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (NASHORN_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (NASHORN_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove pr2777 patch. * NEWS: Updated. * configure.ac: Bump to 3.0.0pre08. * fsg.sh.in: Remove deletions of files which have now been deleted upstream (PR2767) * hotspot.map.in: Update to icedtea-3.0.0pre08 tag. -- 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 29 22:49:04 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:49:04 +0000 Subject: [Bug 2777] [IcedTea8] Fix MAX/MIN template usage on s390 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2777 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=77d56f3ec0cf author: Andrew John Hughes date: Fri Jan 29 14:18:11 2016 +0000 Bump to icedtea-3.0.0pre08. Upstream changes: - PR1368: Ensure debug data is available for all libraries and binaries without redundant files - PR1983: Support using the system installation of NSS with the SunEC provider - PR2127: SunEC provider crashes when built using system NSS - PR2321: Checksum of policy JAR files changes on every build - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold - PR2767: Remove remaining rogue binaries from OpenJDK tree - PR2777: Fix MAX/MIN template usage on s390 - PR2815: Race condition in SunEC provider with system NSS - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux ChangeLog: 2016-01-28 Andrew John Hughes Bump to icedtea-3.0.0pre08. * patches/pr2777.patch: Removed; upstream. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (NASHORN_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (NASHORN_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove pr2777 patch. * NEWS: Updated. * configure.ac: Bump to 3.0.0pre08. * fsg.sh.in: Remove deletions of files which have now been deleted upstream (PR2767) * hotspot.map.in: Update to icedtea-3.0.0pre08 tag. -- 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 29 22:49:12 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:49:12 +0000 Subject: [Bug 1983] [IcedTea8] Support using the system installation of NSS with the SunEC provider In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1983 --- Comment #5 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=77d56f3ec0cf author: Andrew John Hughes date: Fri Jan 29 14:18:11 2016 +0000 Bump to icedtea-3.0.0pre08. Upstream changes: - PR1368: Ensure debug data is available for all libraries and binaries without redundant files - PR1983: Support using the system installation of NSS with the SunEC provider - PR2127: SunEC provider crashes when built using system NSS - PR2321: Checksum of policy JAR files changes on every build - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold - PR2767: Remove remaining rogue binaries from OpenJDK tree - PR2777: Fix MAX/MIN template usage on s390 - PR2815: Race condition in SunEC provider with system NSS - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux ChangeLog: 2016-01-28 Andrew John Hughes Bump to icedtea-3.0.0pre08. * patches/pr2777.patch: Removed; upstream. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (NASHORN_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (NASHORN_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove pr2777 patch. * NEWS: Updated. * configure.ac: Bump to 3.0.0pre08. * fsg.sh.in: Remove deletions of files which have now been deleted upstream (PR2767) * hotspot.map.in: Update to icedtea-3.0.0pre08 tag. -- 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 29 22:49:10 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:49:10 +0000 Subject: [Bug 2767] [IcedTea8] Remove remaining rogue binaries from OpenJDK tree In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2767 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=77d56f3ec0cf author: Andrew John Hughes date: Fri Jan 29 14:18:11 2016 +0000 Bump to icedtea-3.0.0pre08. Upstream changes: - PR1368: Ensure debug data is available for all libraries and binaries without redundant files - PR1983: Support using the system installation of NSS with the SunEC provider - PR2127: SunEC provider crashes when built using system NSS - PR2321: Checksum of policy JAR files changes on every build - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold - PR2767: Remove remaining rogue binaries from OpenJDK tree - PR2777: Fix MAX/MIN template usage on s390 - PR2815: Race condition in SunEC provider with system NSS - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux ChangeLog: 2016-01-28 Andrew John Hughes Bump to icedtea-3.0.0pre08. * patches/pr2777.patch: Removed; upstream. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (NASHORN_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (NASHORN_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove pr2777 patch. * NEWS: Updated. * configure.ac: Bump to 3.0.0pre08. * fsg.sh.in: Remove deletions of files which have now been deleted upstream (PR2767) * hotspot.map.in: Update to icedtea-3.0.0pre08 tag. -- 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 29 22:49:18 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:49:18 +0000 Subject: [Bug 2768] [IcedTea8] Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2768 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=241cf3509015 author: Andrew John Hughes date: Fri Jan 29 14:24:16 2016 +0000 PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed 2016-01-29 Andrew John Hughes PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed * patches/systemtap-gcc-4.5.patch: Removed; seems to be no longer needed. * Makefile.am: (ICEDTEA_PATCHES): Remove above patch. * 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 Fri Jan 29 22:49:27 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:49:27 +0000 Subject: [Bug 1762] [IcedTea7] Undefined references when building with NSS 3.16.1 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1762 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=a84cfe9142fd author: Andrew John Hughes date: Fri Jan 29 17:41:08 2016 +0000 PR1983: Support using the system installation of NSS with the SunEC provider 2016-01-29 Andrew John Hughes PR1983: Support using the system installation of NSS with the SunEC provider * INSTALL: Fix header from 'IcedTea7' to 'IcedTea'. * Makefile.am: (ICEDTEA_PATCHES): Make disable-intree-ec patch conditional on whether or not the SunEC provider is enabled. Add new variants of the NSS/PKCS11 configuration patch for cases where it is not applied. (ICEDTEA_CONFIGURE): Pass --enable-system-nss or --disable-system-nss, depending on whether or not the SunEC provider is enabled. (ICEDTEA_ENV): Remove DISABLE_INTREE_EC which is not applicable in OpenJDK 8. * README: Fix header from 'IcedTea7' to 'IcedTea'. * patches/nss-config-with-sunec.patch, * patches/nss-not-enabled-config-with-sunec.patch: New variants of nss-config.patch and nss-not-enabled-config.patch which apply when the SunEC provider is also enabled. 2015-07-06 Andrew John Hughes * INSTALL: Document the SunEC provider. 2014-05-09 Andrew John Hughes PR1762: Undefined references when building with NSS 3.16.1 * acinclude.m4: (IT_ENABLE_SUNEC): For NSS >= 3.16.1, add -lfreebl to SUNEC_LIBS, not SUNEC_CFLAGS, and use NSS_LIBS as the base, not NSS_SOFTOKN_LIBS. 2014-04-23 Andrew John Hughes PR1742: Allow SunEC provider to be built with changes in NSS >= 3.16.1 * Makefile.am: (ICEDTEA_ENV): Use SUNEC_LIBS and SUNEC_CFLAGS instead of NSS_LIBS and NSS_CFLAGS respectively. * acinclude.m4: (IT_ENABLE_SUNEC): Use SUNEC_CFLAGS and SUNEC_LIBS for clarity as NSS_CFLAGS and NSS_LIBS are also set by the NSS detection. 2014-04-18 Andrew John Hughes PR1699: Support building the SunEC provider with system NSS * Makefile.am: (ICEDTEA_ENV): Set NSS_LIBS and NSS_CFLAGS when ENABLE_SUNEC is set. * acinclude.m4: (IT_LOCATE_NSS): Fix wording to make it clear that this is the PKCS11 provider, using NSS as the implementation. (IT_ENABLE_SUNEC): Allow the Sun elliptic curve crypto provider to be enabled. * configure.ac: Replace IT_LOCATE_NSS with IT_ENABLE_SUNEC (which depends on the former). * fsg.sh.in: Only delete the SunEC implementation code at this level. This is the part that is legally dubious, due to the use of many more elliptic curves than those provided by the NSS version. * remove-intree-libraries.sh.in: Include the remaining SunEC deletion from fsg.sh here and make it optional. -- 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 29 22:49:32 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:49:32 +0000 Subject: [Bug 1699] [IcedTea7] Support building the SunEC provider with system NSS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1699 --- Comment #5 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=a84cfe9142fd author: Andrew John Hughes date: Fri Jan 29 17:41:08 2016 +0000 PR1983: Support using the system installation of NSS with the SunEC provider 2016-01-29 Andrew John Hughes PR1983: Support using the system installation of NSS with the SunEC provider * INSTALL: Fix header from 'IcedTea7' to 'IcedTea'. * Makefile.am: (ICEDTEA_PATCHES): Make disable-intree-ec patch conditional on whether or not the SunEC provider is enabled. Add new variants of the NSS/PKCS11 configuration patch for cases where it is not applied. (ICEDTEA_CONFIGURE): Pass --enable-system-nss or --disable-system-nss, depending on whether or not the SunEC provider is enabled. (ICEDTEA_ENV): Remove DISABLE_INTREE_EC which is not applicable in OpenJDK 8. * README: Fix header from 'IcedTea7' to 'IcedTea'. * patches/nss-config-with-sunec.patch, * patches/nss-not-enabled-config-with-sunec.patch: New variants of nss-config.patch and nss-not-enabled-config.patch which apply when the SunEC provider is also enabled. 2015-07-06 Andrew John Hughes * INSTALL: Document the SunEC provider. 2014-05-09 Andrew John Hughes PR1762: Undefined references when building with NSS 3.16.1 * acinclude.m4: (IT_ENABLE_SUNEC): For NSS >= 3.16.1, add -lfreebl to SUNEC_LIBS, not SUNEC_CFLAGS, and use NSS_LIBS as the base, not NSS_SOFTOKN_LIBS. 2014-04-23 Andrew John Hughes PR1742: Allow SunEC provider to be built with changes in NSS >= 3.16.1 * Makefile.am: (ICEDTEA_ENV): Use SUNEC_LIBS and SUNEC_CFLAGS instead of NSS_LIBS and NSS_CFLAGS respectively. * acinclude.m4: (IT_ENABLE_SUNEC): Use SUNEC_CFLAGS and SUNEC_LIBS for clarity as NSS_CFLAGS and NSS_LIBS are also set by the NSS detection. 2014-04-18 Andrew John Hughes PR1699: Support building the SunEC provider with system NSS * Makefile.am: (ICEDTEA_ENV): Set NSS_LIBS and NSS_CFLAGS when ENABLE_SUNEC is set. * acinclude.m4: (IT_LOCATE_NSS): Fix wording to make it clear that this is the PKCS11 provider, using NSS as the implementation. (IT_ENABLE_SUNEC): Allow the Sun elliptic curve crypto provider to be enabled. * configure.ac: Replace IT_LOCATE_NSS with IT_ENABLE_SUNEC (which depends on the former). * fsg.sh.in: Only delete the SunEC implementation code at this level. This is the part that is legally dubious, due to the use of many more elliptic curves than those provided by the NSS version. * remove-intree-libraries.sh.in: Include the remaining SunEC deletion from fsg.sh here and make it optional. -- 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 29 22:49:36 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:49:36 +0000 Subject: [Bug 1742] [IcedTea7] Allow SunEC provider to be built with changes in NSS >= 3.16.1 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1742 --- Comment #6 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=a84cfe9142fd author: Andrew John Hughes date: Fri Jan 29 17:41:08 2016 +0000 PR1983: Support using the system installation of NSS with the SunEC provider 2016-01-29 Andrew John Hughes PR1983: Support using the system installation of NSS with the SunEC provider * INSTALL: Fix header from 'IcedTea7' to 'IcedTea'. * Makefile.am: (ICEDTEA_PATCHES): Make disable-intree-ec patch conditional on whether or not the SunEC provider is enabled. Add new variants of the NSS/PKCS11 configuration patch for cases where it is not applied. (ICEDTEA_CONFIGURE): Pass --enable-system-nss or --disable-system-nss, depending on whether or not the SunEC provider is enabled. (ICEDTEA_ENV): Remove DISABLE_INTREE_EC which is not applicable in OpenJDK 8. * README: Fix header from 'IcedTea7' to 'IcedTea'. * patches/nss-config-with-sunec.patch, * patches/nss-not-enabled-config-with-sunec.patch: New variants of nss-config.patch and nss-not-enabled-config.patch which apply when the SunEC provider is also enabled. 2015-07-06 Andrew John Hughes * INSTALL: Document the SunEC provider. 2014-05-09 Andrew John Hughes PR1762: Undefined references when building with NSS 3.16.1 * acinclude.m4: (IT_ENABLE_SUNEC): For NSS >= 3.16.1, add -lfreebl to SUNEC_LIBS, not SUNEC_CFLAGS, and use NSS_LIBS as the base, not NSS_SOFTOKN_LIBS. 2014-04-23 Andrew John Hughes PR1742: Allow SunEC provider to be built with changes in NSS >= 3.16.1 * Makefile.am: (ICEDTEA_ENV): Use SUNEC_LIBS and SUNEC_CFLAGS instead of NSS_LIBS and NSS_CFLAGS respectively. * acinclude.m4: (IT_ENABLE_SUNEC): Use SUNEC_CFLAGS and SUNEC_LIBS for clarity as NSS_CFLAGS and NSS_LIBS are also set by the NSS detection. 2014-04-18 Andrew John Hughes PR1699: Support building the SunEC provider with system NSS * Makefile.am: (ICEDTEA_ENV): Set NSS_LIBS and NSS_CFLAGS when ENABLE_SUNEC is set. * acinclude.m4: (IT_LOCATE_NSS): Fix wording to make it clear that this is the PKCS11 provider, using NSS as the implementation. (IT_ENABLE_SUNEC): Allow the Sun elliptic curve crypto provider to be enabled. * configure.ac: Replace IT_LOCATE_NSS with IT_ENABLE_SUNEC (which depends on the former). * fsg.sh.in: Only delete the SunEC implementation code at this level. This is the part that is legally dubious, due to the use of many more elliptic curves than those provided by the NSS version. * remove-intree-libraries.sh.in: Include the remaining SunEC deletion from fsg.sh here and make it optional. -- 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 29 22:49:46 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:49:46 +0000 Subject: [Bug 2804] test/tapset/jstaptest.pl should be executable In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2804 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=969d84a2df36 author: Andrew John Hughes date: Fri Jan 29 22:46:53 2016 +0000 PR2804: test/tapset/jstaptest.pl should be executable 2016-01-29 Andrew John Hughes PR2804: test/tapset/jstaptest.pl should be executable * Makefile.am: (check-tapset-probes): Check that Perl is available and, if, so use it to invoke the script. Replace BUILD_OUTPUT_DIR with the OpenJDK 8 equivalent, BUILD_IMAGE_DIR. (check-tapset-jstack): Likewise. * NEWS: Updated. * configure.ac: Check for Perl if SystemTap is found, so the tests can be run if required. -- 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 29 22:49:40 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:49:40 +0000 Subject: [Bug 1983] [IcedTea8] Support using the system installation of NSS with the SunEC provider In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1983 --- Comment #6 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=a84cfe9142fd author: Andrew John Hughes date: Fri Jan 29 17:41:08 2016 +0000 PR1983: Support using the system installation of NSS with the SunEC provider 2016-01-29 Andrew John Hughes PR1983: Support using the system installation of NSS with the SunEC provider * INSTALL: Fix header from 'IcedTea7' to 'IcedTea'. * Makefile.am: (ICEDTEA_PATCHES): Make disable-intree-ec patch conditional on whether or not the SunEC provider is enabled. Add new variants of the NSS/PKCS11 configuration patch for cases where it is not applied. (ICEDTEA_CONFIGURE): Pass --enable-system-nss or --disable-system-nss, depending on whether or not the SunEC provider is enabled. (ICEDTEA_ENV): Remove DISABLE_INTREE_EC which is not applicable in OpenJDK 8. * README: Fix header from 'IcedTea7' to 'IcedTea'. * patches/nss-config-with-sunec.patch, * patches/nss-not-enabled-config-with-sunec.patch: New variants of nss-config.patch and nss-not-enabled-config.patch which apply when the SunEC provider is also enabled. 2015-07-06 Andrew John Hughes * INSTALL: Document the SunEC provider. 2014-05-09 Andrew John Hughes PR1762: Undefined references when building with NSS 3.16.1 * acinclude.m4: (IT_ENABLE_SUNEC): For NSS >= 3.16.1, add -lfreebl to SUNEC_LIBS, not SUNEC_CFLAGS, and use NSS_LIBS as the base, not NSS_SOFTOKN_LIBS. 2014-04-23 Andrew John Hughes PR1742: Allow SunEC provider to be built with changes in NSS >= 3.16.1 * Makefile.am: (ICEDTEA_ENV): Use SUNEC_LIBS and SUNEC_CFLAGS instead of NSS_LIBS and NSS_CFLAGS respectively. * acinclude.m4: (IT_ENABLE_SUNEC): Use SUNEC_CFLAGS and SUNEC_LIBS for clarity as NSS_CFLAGS and NSS_LIBS are also set by the NSS detection. 2014-04-18 Andrew John Hughes PR1699: Support building the SunEC provider with system NSS * Makefile.am: (ICEDTEA_ENV): Set NSS_LIBS and NSS_CFLAGS when ENABLE_SUNEC is set. * acinclude.m4: (IT_LOCATE_NSS): Fix wording to make it clear that this is the PKCS11 provider, using NSS as the implementation. (IT_ENABLE_SUNEC): Allow the Sun elliptic curve crypto provider to be enabled. * configure.ac: Replace IT_LOCATE_NSS with IT_ENABLE_SUNEC (which depends on the former). * fsg.sh.in: Only delete the SunEC implementation code at this level. This is the part that is legally dubious, due to the use of many more elliptic curves than those provided by the NSS version. * remove-intree-libraries.sh.in: Include the remaining SunEC deletion from fsg.sh here and make it optional. -- 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 29 22:50:56 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:50:56 +0000 Subject: [Bug 2804] test/tapset/jstaptest.pl should be executable In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2804 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #3 from Andrew John Hughes --- $ make check-tapset-probes if test "x/usr/bin/perl" = "x"; then \ echo "ERROR: Perl not found"; exit -1; \ fi /usr/bin/perl /home/andrew/projects/openjdk/icedtea8/test/tapset/jstaptest.pl \ -B /tmp/it8/openjdk.build/images -A amd64 \ -S /home/andrew/projects/openjdk/icedtea8/test/tapset \ -a test/check-stap.log -p Compiling tests. Check whether we have enough privs to run systemtap script... Use of uninitialized value in join or string at /home/andrew/projects/openjdk/icedtea8/test/tapset/jstaptest.pl line 733. Use of uninitialized value in join or string at /home/andrew/projects/openjdk/icedtea8/test/tapset/jstaptest.pl line 733. Use of uninitialized value in join or string at /home/andrew/projects/openjdk/icedtea8/test/tapset/jstaptest.pl line 733. You are trying to run systemtap as a normal user. You should either be root, or be part of the group "stapusr" and possibly one of the groups "stapsys" or "stapdev". [man stap] Try '--help' for more information. Cannot run simple stap script, skipping probe tests. Testing if systemtap can match probes. .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................. Removing compiled test files. Seems to work better 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 Fri Jan 29 22:50:57 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:50:57 +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 Bug 1282 depends on bug 2804, which changed state. Bug 2804 Summary: test/tapset/jstaptest.pl should be executable http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2804 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 Fri Jan 29 22:51:44 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:51:44 +0000 Subject: [Bug 1983] [IcedTea8] Support using the system installation of NSS with the SunEC provider In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1983 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 Fri Jan 29 22:51:45 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 22:51:45 +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 Bug 1282 depends on bug 1983, which changed state. Bug 1983 Summary: [IcedTea8] Support using the system installation of NSS with the SunEC provider http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1983 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 Fri Jan 29 23:19:41 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 23:19:41 +0000 Subject: [Bug 2804] [IcedTea8] test/tapset/jstaptest.pl should be executable In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2804 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|test/tapset/jstaptest.pl |[IcedTea8] |should be executable |test/tapset/jstaptest.pl | |should be executable -- 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 29 23:23:50 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 23:23:50 +0000 Subject: [Bug 2825] New: [IcedTea8] Placement of -lfreebl matters when using bfd linker Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2825 Bug ID: 2825 Summary: [IcedTea8] Placement of -lfreebl matters when using bfd linker Product: IcedTea Version: 8-hg Hardware: x86_64 OS: Linux 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 /usr/bin/g++ -Wl,--as-needed -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -Xlinker -z -Xlinker defs -Xlinker -O1 -shared -L/mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk.build-boot/jdk/lib/amd64 -L/mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk.build-boot/jdk/lib/amd64/server -Xlinker -version-script=/mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk-boot/jdk/make/mapfiles/libsunec/mapfile-vers -Xlinker -soname=libsunec.so -o /mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk.build-boot/jdk/lib/amd64/libsunec.so /mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk.build-boot/jdk/objs/libsunec/ECC_JNI.o -lstdc++ -lc -lfreebl `pkg-config --libs nss` * succeeds * /usr/bin/g++ -Wl,--as-needed -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -Xlinker -z -Xlinker defs -Xlinker -O1 -shared -L/mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk.build-boot/jdk/lib/amd64 -L/mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk.build-boot/jdk/lib/amd64/server -Xlinker -version-script=/mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk-boot/jdk/make/mapfiles/libsunec/mapfile-vers -Xlinker -soname=libsunec.so -o /mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk.build-boot/jdk/lib/amd64/libsunec.so /mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk.build-boot/jdk/objs/libsunec/ECC_JNI.o -lstdc++ -lc `pkg-config --libs nss` -lfreebl /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/../../../../lib64/libfreebl.a(loader.o): In function `loader_LoadLibInReferenceDir': /mnt/builder/portage.build/portage/dev-libs/nss-3.21-r1/work/nss-3.21/nss-abi_x86_64.amd64/lib/freebl/genload.c:91: undefined reference to `PR_GetDirectorySeparator' /mnt/builder/portage.build/portage/dev-libs/nss-3.21-r1/work/nss-3.21/nss-abi_x86_64.amd64/lib/freebl/genload.c:104: undefined reference to `PR_LoadLibraryWithFlags' etc. /usr/bin/g++ -Wl,--as-needed -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -Xlinker -z -Xlinker defs -Xlinker -O1 -shared -L/mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk.build-boot/jdk/lib/amd64 -L/mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk.build-boot/jdk/lib/amd64/server -Xlinker -version-script=/mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk-boot/jdk/make/mapfiles/libsunec/mapfile-vers -Xlinker -soname=libsunec.so -o /mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk.build-boot/jdk/lib/amd64/libsunec.so /mnt/builder/portage.build/portage/dev-java/icedtea-3.0.0_pre08/work/icedtea-3.0.0/openjdk.build-boot/jdk/objs/libsunec/ECC_JNI.o -fuse-ld=gold -lstdc++ -lc `pkg-config --libs nss` -lfreebl * succeeds * -- 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 29 23:24:07 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 23:24:07 +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| |2825 -- 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 29 23:24:07 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jan 2016 23:24:07 +0000 Subject: [Bug 2825] [IcedTea8] Placement of -lfreebl matters when using bfd linker In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2825 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 andrew at icedtea.classpath.org Sat Jan 30 01:15:32 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sat, 30 Jan 2016 01:15:32 +0000 Subject: /hg/icedtea: 3 new changesets Message-ID: changeset b88b51676601 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b88b51676601 author: Andrew John Hughes date: Sat Jan 30 01:10:54 2016 +0000 PR2825: Placement of -lfreebl matters when using bfd linker 2016-01-29 Andrew John Hughes PR2825: Placement of -lfreebl matters when using bfd linker * NEWS: Updated. * acinclude.m4: (IT_ENABLE_SUNEC): Move -lfreebl to start of SUNEC_LIBS. changeset 48e97835c600 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=48e97835c600 author: Andrew John Hughes date: Sat Jan 30 01:13:48 2016 +0000 PR2804: test/tapset/jstaptest.pl should be executable 2016-01-29 Andrew John Hughes PR2804: test/tapset/jstaptest.pl should be executable * Makefile.am: (check-tapset-jstack): Actually replace BUILD_OUTPUT_DIR as mentioned in previous commit. * test/tapset/jstaptest.pl: Fix capitalisation of "IcedTea". changeset e4660f6210fa in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e4660f6210fa author: Andrew John Hughes date: Sat Jan 30 01:15:16 2016 +0000 PR1983: Support using the system installation of NSS with the SunEC provider 2016-01-29 Andrew John Hughes PR1983: Support using the system installation of NSS with the SunEC provider * Makefile.am: (check-ecc): Argument passed to the test should now be "yes". diffstat: ChangeLog | 26 ++++++++++++++++++++++++++ Makefile.am | 4 ++-- NEWS | 1 + acinclude.m4 | 2 +- test/tapset/jstaptest.pl | 2 +- 5 files changed, 31 insertions(+), 4 deletions(-) diffs (89 lines): diff -r 0883b7a8311a -r e4660f6210fa ChangeLog --- a/ChangeLog Fri Jan 29 22:47:27 2016 +0000 +++ b/ChangeLog Sat Jan 30 01:15:16 2016 +0000 @@ -1,3 +1,29 @@ +2016-01-29 Andrew John Hughes + + PR1983: Support using the system installation + of NSS with the SunEC provider + * Makefile.am: + (check-ecc): Argument passed to the test should + now be "yes". + +2016-01-29 Andrew John Hughes + + PR2804: test/tapset/jstaptest.pl should be executable + * Makefile.am: + (check-tapset-jstack): Actually replace BUILD_OUTPUT_DIR + as mentioned in previous commit. + * test/tapset/jstaptest.pl: Fix capitalisation of + "IcedTea". + +2016-01-29 Andrew John Hughes + + PR2825: Placement of -lfreebl matters when + using bfd linker + * NEWS: Updated. + * acinclude.m4: + (IT_ENABLE_SUNEC): Move -lfreebl to start of + SUNEC_LIBS. + 2016-01-29 Andrew John Hughes PR2804: test/tapset/jstaptest.pl should be executable diff -r 0883b7a8311a -r e4660f6210fa Makefile.am --- a/Makefile.am Fri Jan 29 22:47:27 2016 +0000 +++ b/Makefile.am Sat Jan 30 01:15:16 2016 +0000 @@ -2327,7 +2327,7 @@ echo "ERROR: Perl not found"; exit -1; \ fi ${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \ - -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \ + -B $(BUILD_IMAGE_DIR) -A $(BUILD_ARCH_DIR) \ -S $(abs_top_srcdir)/test/tapset \ -a test/check-stap.log -j endif @@ -2367,7 +2367,7 @@ stamps/check-ecc.stamp: stamps/ecccheck.stamp stamps/icedtea.stamp if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \ - $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport no ; \ + $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport yes ; \ fi mkdir -p stamps touch $@ diff -r 0883b7a8311a -r e4660f6210fa NEWS --- a/NEWS Fri Jan 29 22:47:27 2016 +0000 +++ b/NEWS Sat Jan 30 01:15:16 2016 +0000 @@ -132,6 +132,7 @@ - PR2777: Fix MAX/MIN template usage on s390 - PR2804: test/tapset/jstaptest.pl should be executable - PR2815: Race condition in SunEC provider with system NSS + - PR2825: Placement of -lfreebl matters when using bfd linker - Don't substitute 'j' for '-j' inside -I directives - Extend 8041658 to all files in the HotSpot build. - Remove jcheck diff -r 0883b7a8311a -r e4660f6210fa acinclude.m4 --- a/acinclude.m4 Fri Jan 29 22:47:27 2016 +0000 +++ b/acinclude.m4 Sat Jan 30 01:15:16 2016 +0000 @@ -1969,7 +1969,7 @@ PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no]) if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS; - SUNEC_LIBS="$NSS_LIBS -lfreebl"; + SUNEC_LIBS="-lfreebl $NSS_LIBS"; elif test "x${NSS_JAVA_FOUND}" = "xyes"; then SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS"; SUNEC_LIBS=$NSS_JAVA_LIBS; diff -r 0883b7a8311a -r e4660f6210fa test/tapset/jstaptest.pl --- a/test/tapset/jstaptest.pl Fri Jan 29 22:47:27 2016 +0000 +++ b/test/tapset/jstaptest.pl Sat Jan 30 01:15:16 2016 +0000 @@ -597,7 +597,7 @@ || ($opt_p && $opt_j)); # -p and -j are mutually exclusive. if ($opt_B && $opt_A) { die "Directory $opt_B not found." unless (-d $opt_B); - die "Directory $opt_B/j2sdk-image/tapset not found.\nTry rebuilding Icedtea with systemtap support.\n" + die "Directory $opt_B/j2sdk-image/tapset not found.\nTry rebuilding IcedTea with systemtap support.\n" unless (-d "$opt_B/j2sdk-image/tapset"); push(@tapset_dirs, "-I$opt_B/j2sdk-image/tapset"); set_java_vars("$opt_B/j2sdk-image", $opt_A); From bugzilla-daemon at icedtea.classpath.org Sat Jan 30 01:16:12 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 30 Jan 2016 01:16:12 +0000 Subject: [Bug 2825] [IcedTea8] Placement of -lfreebl matters when using bfd linker In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2825 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=b88b51676601 author: Andrew John Hughes date: Sat Jan 30 01:10:54 2016 +0000 PR2825: Placement of -lfreebl matters when using bfd linker 2016-01-29 Andrew John Hughes PR2825: Placement of -lfreebl matters when using bfd linker * NEWS: Updated. * acinclude.m4: (IT_ENABLE_SUNEC): Move -lfreebl to start of SUNEC_LIBS. -- 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 30 01:16:19 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 30 Jan 2016 01:16:19 +0000 Subject: [Bug 2804] [IcedTea8] test/tapset/jstaptest.pl should be executable In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2804 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=48e97835c600 author: Andrew John Hughes date: Sat Jan 30 01:13:48 2016 +0000 PR2804: test/tapset/jstaptest.pl should be executable 2016-01-29 Andrew John Hughes PR2804: test/tapset/jstaptest.pl should be executable * Makefile.am: (check-tapset-jstack): Actually replace BUILD_OUTPUT_DIR as mentioned in previous commit. * test/tapset/jstaptest.pl: Fix capitalisation of "IcedTea". -- 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 30 01:16:26 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 30 Jan 2016 01:16:26 +0000 Subject: [Bug 1983] [IcedTea8] Support using the system installation of NSS with the SunEC provider In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1983 --- Comment #7 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=e4660f6210fa author: Andrew John Hughes date: Sat Jan 30 01:15:16 2016 +0000 PR1983: Support using the system installation of NSS with the SunEC provider 2016-01-29 Andrew John Hughes PR1983: Support using the system installation of NSS with the SunEC provider * Makefile.am: (check-ecc): Argument passed to the test should now be "yes". -- 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 30 01:37:05 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 30 Jan 2016 01:37:05 +0000 Subject: [Bug 2826] New: [IcedTea8] Provide option to disable SystemTap tests Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2826 Bug ID: 2826 Summary: [IcedTea8] Provide option to disable SystemTap tests Product: IcedTea Version: 8-hg Hardware: all OS: All 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 It should be possible to disable the running of the SystemTap tests in the same way that the JTreg tests can be disabled. They are long-running and don't seem to work on all installations. -- 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 30 01:38:16 2016 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sat, 30 Jan 2016 01:38:16 +0000 Subject: /hg/icedtea: PR1983: Support using the system installation of NS... Message-ID: changeset 130888a5c713 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=130888a5c713 author: Andrew John Hughes date: Sat Jan 30 01:25:06 2016 +0000 PR1983: Support using the system installation of NSS with the SunEC provider 2016-01-29 Andrew John Hughes PR1983: Support using the system installation of NSS with the SunEC provider * Makefile.am: (check-ecc): Make argument dependent on whether the SunEC provider is enabled or not. diffstat: ChangeLog | 8 ++++++++ Makefile.am | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diffs (40 lines): diff -r e4660f6210fa -r 130888a5c713 ChangeLog --- a/ChangeLog Sat Jan 30 01:15:16 2016 +0000 +++ b/ChangeLog Sat Jan 30 01:25:06 2016 +0000 @@ -1,3 +1,11 @@ +2016-01-29 Andrew John Hughes + + PR1983: Support using the system installation + of NSS with the SunEC provider + * Makefile.am: + (check-ecc): Make argument dependent on whether + the SunEC provider is enabled or not. + 2016-01-29 Andrew John Hughes PR1983: Support using the system installation diff -r e4660f6210fa -r 130888a5c713 Makefile.am --- a/Makefile.am Sat Jan 30 01:15:16 2016 +0000 +++ b/Makefile.am Sat Jan 30 01:25:06 2016 +0000 @@ -209,6 +209,12 @@ TESTS_TO_RUN = jtreg $(addprefix check-,$(TEST_SUITES)) endif +if ENABLE_SUNEC +ECC_RESULT = yes +else +ECC_RESULT = no +endif + # Target to ensure a patched OpenJDK tree containing Zero & Shark # and any overlays is available in $(abs_top_builddir)/openjdk OPENJDK_TREE = stamps/overlay.stamp @@ -2367,7 +2373,7 @@ stamps/check-ecc.stamp: stamps/ecccheck.stamp stamps/icedtea.stamp if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \ - $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport yes ; \ + $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport $(ECC_RESULT) ; \ fi mkdir -p stamps touch $@ From bugzilla-daemon at icedtea.classpath.org Sat Jan 30 01:38:53 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 30 Jan 2016 01:38:53 +0000 Subject: [Bug 1983] [IcedTea8] Support using the system installation of NSS with the SunEC provider In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1983 --- Comment #8 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea?cmd=changeset;node=130888a5c713 author: Andrew John Hughes date: Sat Jan 30 01:25:06 2016 +0000 PR1983: Support using the system installation of NSS with the SunEC provider 2016-01-29 Andrew John Hughes PR1983: Support using the system installation of NSS with the SunEC provider * Makefile.am: (check-ecc): Make argument dependent on whether the SunEC provider is enabled or not. -- 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 30 07:47:51 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 30 Jan 2016 07:47:51 +0000 Subject: [Bug 2825] [IcedTea8] Placement of -lfreebl matters when using bfd linker In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2825 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 Sat Jan 30 07:47:52 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 30 Jan 2016 07:47:52 +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 Bug 1282 depends on bug 2825, which changed state. Bug 2825 Summary: [IcedTea8] Placement of -lfreebl matters when using bfd linker http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2825 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 Sun Jan 31 09:19:13 2016 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 31 Jan 2016 09:19:13 +0000 Subject: [Bug 2781] CACAO - typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781 --- Comment #10 from James Le Cuirot --- Please remember to merge this so Andrew can include it in the next release. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: