Update to 8u272

6 files changed, 5 insertions, 78 deletions

diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 0cde981f7a4c..d166779a33c2 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -51,8 +51,8 @@ INSTALLDIR=	${PREFIX}/${PKGBASE}
 NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	8
-JDK_UPDATE_VERSION=	265
-JDK_BUILD_NUMBER=	01
+JDK_UPDATE_VERSION=	272
+JDK_BUILD_NUMBER=	10
 BSD_JDK_VERSION=	1
 JTREG_VERSION=		4.1
 JTREG_BUILD_NUMBER=	b08
@@ -243,8 +243,6 @@ post-patch:
 	    ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \
 	    ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java \
 	    ${WRKSRC}/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java
-	@${REINPLACE_CMD} -e 's|/usr/local/share/java/classes|${LOCALBASE}/share/java/classes|' \
-	    ${WRKSRC}/jdk/src/bsd/doc/man/*.1
 	@${REINPLACE_CMD} -e 's|%%ICONV_CPPFLAGS%%|${ICONV_CPPFLAGS}|' \
 	    -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \
 	    ${WRKSRC}/jdk/make/lib/Awt2dLibraries.gmk \
diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo
index b3df302ebf66..9bb8ed152be1 100644
--- a/java/openjdk8/distinfo
+++ b/java/openjdk8/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1596250843
+TIMESTAMP = 1603421029
 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c
 SIZE (jtreg4.1-b08.tar.gz) = 6834252
-SHA256 (battleblow-openjdk-jdk8u-8.265.01.1-jdk8u265-b01.1_GH0.tar.gz) = 296489b556e6ef62bf120658c7de2e8d445dac86dae76b271e0711e5a7391ba6
-SIZE (battleblow-openjdk-jdk8u-8.265.01.1-jdk8u265-b01.1_GH0.tar.gz) = 87131122
+SHA256 (battleblow-openjdk-jdk8u-8.272.10.1-jdk8u272-b10.1_GH0.tar.gz) = e10b7a4bccdd2e54be0854402ad9231f7b092dddbe383e5c0fcaf9e78b17c2c2
+SIZE (battleblow-openjdk-jdk8u-8.272.10.1-jdk8u272-b10.1_GH0.tar.gz) = 87646644
diff --git a/java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.c b/java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.c
deleted file mode 100644
index 13cf826b7a8a..000000000000
--- a/java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- jdk/src/solaris/native/java/lang/childproc.c.orig	2020-08-01 01:24:39 UTC
-+++ jdk/src/solaris/native/java/lang/childproc.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2013, 2020, 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
-@@ -33,6 +33,7 @@
- 
- #include "childproc.h"
- 
-+const char * const *parentPathv;
- 
- ssize_t
- restartableWrite(int fd, const void *buf, size_t count)
diff --git a/java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.h b/java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.h
deleted file mode 100644
index 39ab4e0d96ce..000000000000
--- a/java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- jdk/src/solaris/native/java/lang/childproc.h.orig	2020-08-01 01:24:39 UTC
-+++ jdk/src/solaris/native/java/lang/childproc.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2013, 2020, 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
-@@ -119,7 +119,7 @@ typedef struct _SpawnInfo {
-  * The cached and split version of the JDK's effective PATH.
-  * (We don't support putenv("PATH=...") in native code)
-  */
--const char * const *parentPathv;
-+extern const char * const *parentPathv;
- 
- ssize_t restartableWrite(int fd, const void *buf, size_t count);
- int restartableDup2(int fd_from, int fd_to);
diff --git a/java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c b/java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c
deleted file mode 100644
index 7626da868e03..000000000000
--- a/java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c.orig	2020-08-01 01:24:39 UTC
-+++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2020, 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
-@@ -27,6 +27,9 @@
- #include <stdlib.h>
- #include <dlfcn.h>
- #include "NativeFunc.h"
-+
-+/* global GSS function table */
-+GSS_FUNCTION_TABLE_PTR ftab;
- 
- /* standard GSS method names (ordering is from mapfile) */
- static const char RELEASE_NAME[]                = "gss_release_name";
diff --git a/java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h b/java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h
deleted file mode 100644
index e1300e34988a..000000000000
--- a/java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h.orig	2020-08-01 01:24:39 UTC
-+++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2020, 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
-@@ -265,6 +265,6 @@ typedef struct GSS_FUNCTION_TABLE {
- typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
- 
- /* global GSS function table */
--GSS_FUNCTION_TABLE_PTR ftab;
-+extern GSS_FUNCTION_TABLE_PTR ftab;
- 
- #endif