view patches/security/20111018/7046794.patch @ 2356:28de6deb3971

Add remaining security patches. 2011-10-14 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Add additional patches. * NEWS: List JAXWS fix. * patches/icedtea-xjc.patch: Update against 7046794. * patches/security/20111018/7046794.patch, * patches/security/20111018/7077466.patch: Additional security patches.
author Andrew John Hughes <ahughes@redhat.com>
date Fri, 14 Oct 2011 11:37:14 +0100
parents
children
line wrap: on
line source

diff -Nru jaxws.old/build.properties jaxws/build.properties
--- openjdk.orig/jaxws/build.properties	2011-10-13 17:21:36.000000000 +0100
+++ openjdk/jaxws/build.properties	2011-10-14 03:09:28.000000000 +0100
@@ -78,7 +78,7 @@
 patches.dir=patches
 
 # Patches to apply
-jaxws_src.patch.list=7013971.patch
+jaxws_src.patch.list=7013971.patch 7046794.patch
 
 # Sanity information
 sanity.info= Sanity Settings:${line.separator}\
diff -Nru jaxws.old/patches/jaxws_src/7046794.patch jaxws/patches/jaxws_src/7046794.patch
--- openjdk.orig/jaxws/patches/jaxws_src/7046794.patch	1970-01-01 01:00:00.000000000 +0100
+++ openjdk/jaxws/patches/jaxws_src/7046794.patch	2011-10-14 03:08:45.000000000 +0100
@@ -0,0 +1,24 @@
+diff -Nru src.old/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java src/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java
+--- src.old/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java	2010-06-04 22:01:07.000000000 +0100
++++ src/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java	2011-10-14 03:08:04.238126095 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -520,11 +520,11 @@
+      */
+     public static boolean captureStackTrace;
+ 
+-    /*package*/ static final String CAPTURE_STACK_TRACE_PROPERTY = SOAPFaultBuilder.class.getName()+".disableCaptureStackTrace";
++    /*package*/ static final String CAPTURE_STACK_TRACE_PROPERTY = SOAPFaultBuilder.class.getName()+".captureStackTrace";
+ 
+     static {
+         try {
+-            captureStackTrace = System.getProperty(CAPTURE_STACK_TRACE_PROPERTY)==null;
++            captureStackTrace = Boolean.getBoolean(CAPTURE_STACK_TRACE_PROPERTY);
+         } catch (SecurityException e) {
+             // ignore
+         }