diff options
| -rw-r--r-- | java/openjdk8/Makefile | 7 | ||||
| -rw-r--r-- | java/openjdk8/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-hotspot_agent_src_os_bsd_ps__proc.c | 12 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_os__bsd__x86.cpp | 12 |
4 files changed, 6 insertions, 31 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index df828db9e825..862d9345ba5a 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= openjdk -PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}.${BSD_JDK_VERSION} -PORTREVISION= 2 +PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} CATEGORIES= java devel MASTER_SITES= LOCAL/jkim:jtreg PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -54,8 +53,8 @@ INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 222 -JDK_BUILD_NUMBER= 10 +JDK_UPDATE_VERSION= 232 +JDK_BUILD_NUMBER= 09 BSD_JDK_VERSION= 1 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo index 7eb240580b9d..fc1bb9174aa6 100644 --- a/java/openjdk8/distinfo +++ b/java/openjdk8/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1563551584 +TIMESTAMP = 1571191646 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c SIZE (jtreg4.1-b08.tar.gz) = 6834252 -SHA256 (battleblow-openjdk-jdk8u-8.222.10.1-jdk8u222-b10.1_GH0.tar.gz) = 1b2e31b4c67896e3292d390960afaf274f283a8b6feb3a12022feb2c7b1c3a7d -SIZE (battleblow-openjdk-jdk8u-8.222.10.1-jdk8u222-b10.1_GH0.tar.gz) = 85692163 +SHA256 (battleblow-openjdk-jdk8u-8.232.09.1-jdk8u232-b09.1_GH0.tar.gz) = f6796bfb8a0a30fd045b608e8a2e6a8b8ae02748fbb6a647dd3669914040f319 +SIZE (battleblow-openjdk-jdk8u-8.232.09.1-jdk8u232-b09.1_GH0.tar.gz) = 85766372 diff --git a/java/openjdk8/files/patch-hotspot_agent_src_os_bsd_ps__proc.c b/java/openjdk8/files/patch-hotspot_agent_src_os_bsd_ps__proc.c deleted file mode 100644 index a6b4a8c32865..000000000000 --- a/java/openjdk8/files/patch-hotspot_agent_src_os_bsd_ps__proc.c +++ /dev/null @@ -1,12 +0,0 @@ ---- hotspot/agent/src/os/bsd/ps_proc.c.orig 2019-07-21 20:24:28 UTC -+++ hotspot/agent/src/os/bsd/ps_proc.c -@@ -27,8 +27,8 @@ - #include <stdlib.h> - #include <string.h> - #include <errno.h> --#include <sys/sysctl.h> - #include <sys/types.h> -+#include <sys/sysctl.h> - #include <sys/wait.h> - #include <sys/ptrace.h> - #include <sys/param.h> diff --git a/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_os__bsd__x86.cpp b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_os__bsd__x86.cpp deleted file mode 100644 index f90ed6a5ba19..000000000000 --- a/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_os__bsd__x86.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig 2019-08-11 09:24:22.211149000 -0700 -+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2019-08-11 09:25:08.826582000 -0700 -@@ -470,6 +470,9 @@ - // Handle ALL stack overflow variations here - if (sig == SIGSEGV || sig == SIGBUS) { - address addr = (address) info->si_addr; -+#ifdef __FreeBSD__ -+ addr = (unsigned char*) align_ptr_down(addr, os::vm_page_size()); -+#endif - - // check if fault address is within thread stack - if (addr < thread->stack_base() && |