--- a/ChangeLog	Thu Apr 09 18:39:41 2015 +0100
+++ b/ChangeLog	Thu Apr 09 03:44:56 2015 +0100
@@ -1,3 +1,12 @@
+2015-04-09  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* patches/g356743-libpng-1.5.patch:
+	Removed; applied upstream as part of S7088287.
+	* Makefile.am: Remove above patch.
+	* patches/openjdk/4963723-implement_sha-224.patch:
+	Drop copyright header change to RSASignature.java
+	as S8071726 upstream updates it to 2015.
+
 2015-04-09  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch,

--- a/Makefile.am	Thu Apr 09 18:39:41 2015 +0100
+++ b/Makefile.am	Thu Apr 09 03:44:56 2015 +0100
@@ -410,7 +410,6 @@
 	patches/openjdk/7023591-AAShapePipe.patch \
 	patches/openjdk/7027667-AAShapePipeRegTest.patch \
 	patches/openjdk/7019861-AA-regression-fix.patch \
-	patches/g356743-libpng-1.5.patch \
 	patches/openjdk/6986968-crash_on_xim_restart.patch \
 	patches/openjdk/7036754-stroker-nan.patch \
 	patches/openjdk/pgram-pipe-regression.patch \

--- a/patches/g356743-libpng-1.5.patch	Thu Apr 09 18:39:41 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
-@@ -36,7 +36,7 @@ my_png_read_stream(png_structp png_ptr,
- {
-     png_uint_32 check;
- 
--    SplashStream * stream = (SplashStream*)png_ptr->io_ptr;
-+    SplashStream * stream = (SplashStream*)png_get_io_ptr(png_ptr);
-     check = stream->read(stream, data, length);
-     if (check != length)
-         png_error(png_ptr, "Read Error");
-@@ -71,12 +71,11 @@ SplashDecodePng(Splash * splash, png_rw_
-         goto done;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         goto done;
-     }
- 
--    png_ptr->io_ptr = io_ptr;
--    png_ptr->read_data_fn = read_func;
-+    png_set_read_fn(png_ptr, io_ptr, read_func);
- 
-     png_set_sig_bytes(png_ptr, SIG_BYTES);      /* we already read the 8 signature bytes */
- 

--- a/patches/openjdk/4963723-implement_sha-224.patch	Thu Apr 09 18:39:41 2015 +0100
+++ b/patches/openjdk/4963723-implement_sha-224.patch	Thu Apr 09 03:44:56 2015 +0100
@@ -1520,13 +1520,6 @@
 diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/rsa/RSASignature.java openjdk/jdk/src/share/classes/sun/security/rsa/RSASignature.java
 --- openjdk.orig/jdk/src/share/classes/sun/security/rsa/RSASignature.java	2013-08-21 20:33:03.348317196 +0100
 +++ openjdk/jdk/src/share/classes/sun/security/rsa/RSASignature.java	2014-12-24 19:58:20.004164123 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2003, 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
 @@ -40,8 +40,8 @@
   * PKCS#1 RSA signatures with the various message digest algorithms.
   * This file contains an abstract base class with all the logic plus