mirror of
https://git.freebsd.org/ports.git
synced 2026-06-02 11:08:52 +00:00
java/openjdk11: Update to 11.0.29
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
PORTNAME= openjdk
|
||||
DISTVERSIONPREFIX= jdk-
|
||||
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= java devel
|
||||
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
|
||||
|
||||
@@ -67,8 +66,8 @@ NOPRECIOUSMAKEVARS= yes
|
||||
|
||||
JDK_MAJOR_VERSION= 11
|
||||
JDK_MINOR_VERSION= 0
|
||||
JDK_PATCH_VERSION= 27
|
||||
JDK_BUILD_NUMBER= 6
|
||||
JDK_PATCH_VERSION= 29
|
||||
JDK_BUILD_NUMBER= 7
|
||||
BSD_JDK_VERSION= 1
|
||||
|
||||
JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
TIMESTAMP = 1745123589
|
||||
TIMESTAMP = 1762095114
|
||||
SHA256 (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682
|
||||
SIZE (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 8173207
|
||||
SHA256 (battleblow-jdk11u-jdk-11.0.27+6-1_GH0.tar.gz) = 64afcb0ad19c6a03591757d906355d0f263f8a529dea5654ba518e9399f13b1f
|
||||
SIZE (battleblow-jdk11u-jdk-11.0.27+6-1_GH0.tar.gz) = 116708083
|
||||
SHA256 (battleblow-jdk11u-jdk-11.0.29+7-1_GH0.tar.gz) = ed1fed0a7d6571e5bff9a07272872258451643ba6741c002a8f58bdfd8fc9803
|
||||
SIZE (battleblow-jdk11u-jdk-11.0.29+7-1_GH0.tar.gz) = 116785204
|
||||
|
||||
-89
@@ -1,89 +0,0 @@
|
||||
--- src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c.orig 2025-04-19 23:57:10 UTC
|
||||
+++ src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c
|
||||
@@ -58,6 +58,7 @@
|
||||
#include <unistd.h>
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
+#include <sys/user.h>
|
||||
#include <vm/vm_param.h>
|
||||
#endif
|
||||
|
||||
@@ -261,23 +262,43 @@ Java_com_sun_management_internal_OperatingSystemImpl_g
|
||||
}
|
||||
return t_info.virtual_size;
|
||||
#elif defined(__FreeBSD__)
|
||||
- FILE *fp;
|
||||
- unsigned long end, start;
|
||||
- jlong total = 0;
|
||||
+ int mib[4];
|
||||
+ struct kinfo_vmentry *kve;
|
||||
+ long total = 0;
|
||||
+ size_t len = 0;
|
||||
+ int error;
|
||||
+ char *buf, *bp, *eb;
|
||||
|
||||
- if ((fp = fopen("/proc/curproc/map", "r")) == NULL) {
|
||||
- throw_internal_error(env, "Unable to open /proc/curproc/map");
|
||||
+ mib[0] = CTL_KERN;
|
||||
+ mib[1] = KERN_PROC;
|
||||
+ mib[2] = KERN_PROC_VMMAP;
|
||||
+ mib[3] = getpid();
|
||||
+ error = sysctl(mib, 4, NULL, &len, NULL, 0);
|
||||
+ if (error) {
|
||||
+ throw_internal_error(env, "Cannot sysctl(kern.proc.vvmap)");
|
||||
return -1;
|
||||
}
|
||||
-
|
||||
- for (;;) {
|
||||
- // Ignore everything except start and end entries
|
||||
- if (fscanf(fp, "0x%lx 0x%lx %*[^\n]\n", &start, &end) != 2 || start > end)
|
||||
- break;
|
||||
- total += end - start;
|
||||
+ len = len * 4 / 3;
|
||||
+ buf = malloc(len);
|
||||
+ if (buf == NULL) {
|
||||
+ throw_internal_error(env, "Fail to allocate memory");
|
||||
+ return -1;
|
||||
}
|
||||
-
|
||||
- fclose(fp);
|
||||
+ error = sysctl(mib, 4, buf, &len, NULL, 0);
|
||||
+ if (error) {
|
||||
+ throw_internal_error(env, "Cannot sysctl(kern.proc.vvmap)");
|
||||
+ return -1;
|
||||
+ }
|
||||
+ bp = buf;
|
||||
+ eb = buf + len;
|
||||
+ while (bp < eb) {
|
||||
+ kve = (struct kinfo_vmentry *)(uintptr_t)bp;
|
||||
+ if (kve->kve_structsize == 0)
|
||||
+ break;
|
||||
+ bp += kve->kve_structsize;
|
||||
+ total += kve->kve_end - kve->kve_start;
|
||||
+ }
|
||||
+ free(buf);
|
||||
return total;
|
||||
#else /* _ALLBSD_SOURCE */
|
||||
/*
|
||||
@@ -487,6 +508,21 @@ Java_com_sun_management_internal_OperatingSystemImpl_g
|
||||
return nfiles;
|
||||
#elif defined(__OpenBSD__)
|
||||
return getdtablecount();
|
||||
+#elif defined(__FreeBSD__)
|
||||
+ int mib[4];
|
||||
+ int error;
|
||||
+ int nfds;
|
||||
+ size_t len;
|
||||
+
|
||||
+ len = sizeof(nfds);
|
||||
+ mib[0] = CTL_KERN;
|
||||
+ mib[1] = KERN_PROC;
|
||||
+ mib[2] = KERN_PROC_NFDS;
|
||||
+ mib[3] = 0;
|
||||
+
|
||||
+ if (sysctl(mib, 4, &nfds, &len, NULL, 0) == -1)
|
||||
+ return -1;
|
||||
+ return nfds;
|
||||
#else /* solaris/linux */
|
||||
DIR *dirp;
|
||||
struct dirent64* dentp;
|
||||
Reference in New Issue
Block a user