Attachment #223278 for bug #254294

View | Details | Raw Unified | Return to bug 254294
Collapse All | Expand All

Lines 1-8 Link Here

(-)Makefile (-3 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= mesos	3	PORTNAME= mesos
4	PORTVERSION= 1.10.0	4	PORTVERSION= 1.11.0
5	PORTREVISION= 6	5	PORTREVISION= 0
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= APACHE/mesos/${PORTVERSION}:mesos	7	MASTER_SITES= APACHE/mesos/${PORTVERSION}:mesos
8	PKGNAMEPREFIX= apache-	8	PKGNAMEPREFIX= apache-
Lines 82-88 Link Here
82	JAVA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_java_mesos.pom.in	82	JAVA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_java_mesos.pom.in
83		83
84	# REVIEW: Can we figure out the current Protobuf version in ports instead of hardcoding???	84	# REVIEW: Can we figure out the current Protobuf version in ports instead of hardcoding???
85	PROTOBUF_VERSION= 3.12.2	85	PROTOBUF_VERSION= 3.14.0
86		86
87	MAVEN_CMD= mvn	87	MAVEN_CMD= mvn
88	MAVEN_REPO= ${WRKDIR}/mesos-maven-deps-${PORTVERSION}	88	MAVEN_REPO= ${WRKDIR}/mesos-maven-deps-${PORTVERSION}

Lines 1-5 Link Here

(-)distinfo (-5 / +5 lines)
1	TIMESTAMP = 1593259602	1	TIMESTAMP = 1615762466
2	SHA256 (apache-mesos/mesos-1.10.0.tar.gz) = f4b9e8a1e9f905334adf4d349a2ed33a4cfa43278381cd34fb4fc7e9df9e12a1	2	SHA256 (apache-mesos/mesos-1.11.0.tar.gz) = ce08cb648a21502a4a0c45d240a596d9ac860fcaf717f9a3dc986da9d406fe34
3	SIZE (apache-mesos/mesos-1.10.0.tar.gz) = 71760072	3	SIZE (apache-mesos/mesos-1.11.0.tar.gz) = 72210031
4	SHA256 (apache-mesos/mesos-maven-deps-1.10.0.tar.gz) = b119a72e99499b67e1455a32bbbba80a15ae5ef21315eab76119f941f96f3d36	4	SHA256 (apache-mesos/mesos-maven-deps-1.11.0.tar.gz) = 98acd50b2d22018f5c79127ea14245e863c4c1bd0092c65c85ef9a147d488def
5	SIZE (apache-mesos/mesos-maven-deps-1.10.0.tar.gz) = 36000010	5	SIZE (apache-mesos/mesos-maven-deps-1.11.0.tar.gz) = 36003620

Lines 3-9 Link Here

(-)files/maven-deps.pom (-1 / +1 lines)
3	<groupId>org.apache.mesos</groupId>	3	<groupId>org.apache.mesos</groupId>
4	<artifactId>mesos</artifactId>	4	<artifactId>mesos</artifactId>
5	<name>mesos</name>	5	<name>mesos</name>
6	<version>1.10.0</version>	6	<version>1.11.0</version>
7	<description>The Apache Mesos Java API jar.</description>	7	<description>The Apache Mesos Java API jar.</description>
8	<url>http://mesos.apache.org</url>	8	<url>http://mesos.apache.org</url>
9	<parent>	9	<parent>




--- 3rdparty/stout/include/stout/os/freebsd.hpp.orig	2020-05-22 20:48:06 UTC
+++ 3rdparty/stout/include/stout/os/freebsd.hpp
@@ -88,18 +88,29 @@ inline Try<Memory> memory()
   const size_t pageSize = os::pagesize();
 
   unsigned int freeCount;
-  size_t length = sizeof(freeCount);
-
+  size_t freeCountLength = sizeof(freeCount);
   if (sysctlbyname(
-      "vm.stats.v_free_count",
+      "vm.stats.vm.v_free_count",
       &freeCount,
-      &length,
+      &freeCountLength,
       nullptr,
       0) != 0) {
     return ErrnoError();
   }
-  memory.free = Bytes(freeCount * pageSize);
 
+  unsigned int inactiveCount;
+  size_t inactiveCountLength = sizeof(inactiveCount);
+  if (sysctlbyname(
+      "vm.stats.vm.v_inactive_count",
+      &inactiveCount,
+      &inactiveCountLength,
+      nullptr,
+      0) != 0) {
+    return ErrnoError();
+  }
+
+  memory.free = Bytes((freeCount + inactiveCount) * pageSize);
+
   int totalBlocks = 0;
   int usedBlocks = 0;
 
@@ -112,8 +123,9 @@ inline Try<Memory> memory()
   // FreeBSD supports multiple swap devices. Here we sum across all of them.
   struct xswdev xswd;
   size_t xswdSize = sizeof(xswd);
-  int* mibDevice = &(mib[mibSize + 1]);
-  for (*mibDevice = 0; ; (*mibDevice)++) {
+  for (int ndev = 0; ; ndev++) {
+      mib[mibSize] = ndev;
+
       if (::sysctl(mib, 3, &xswd, &xswdSize, nullptr, 0) != 0) {
           if (errno == ENOENT) {
               break;




include/mesos/authorizer/authorizer.hpp
include/mesos/authorizer/authorizer.pb.h
include/mesos/authorizer/authorizer.proto
include/mesos/csi/types.hpp
include/mesos/csi/types.pb.h
include/mesos/csi/types.proto
include/mesos/csi/v0.hpp
include/mesos/csi/v1.hpp
include/mesos/docker/spec.hpp

include/stout/windows/mac.hpp
include/stout/windows/net.hpp
include/stout/windows/os.hpp
lib/libfixed_resource_estimator-1.11.0.so
lib/libfixed_resource_estimator.so
lib/libload_qos_controller-1.11.0.so
lib/libload_qos_controller.so
lib/liblogrotate_container_logger-1.11.0.so
lib/liblogrotate_container_logger.so
lib/libmesos-1.11.0.so
lib/libmesos.so
lib/mesos/modules/libfixed_resource_estimator-1.11.0.so
lib/mesos/modules/libfixed_resource_estimator.so
lib/mesos/modules/libload_qos_controller-1.11.0.so
lib/mesos/modules/libload_qos_controller.so
lib/mesos/modules/liblogrotate_container_logger-1.11.0.so
lib/mesos/modules/liblogrotate_container_logger.so
lib/mesos/modules/liburi_disk_profile_adaptor-1.11.0.so
lib/mesos/modules/liburi_disk_profile_adaptor.so
libdata/pkgconfig/mesos.pc
libexec/mesos/mesos-containerizer

Return to bug 254294

Lines 1-49 Link Here

(-)files/patch-3rdparty_stout_include_stout_os_freebsd.hpp (-49 lines)
1	--- 3rdparty/stout/include/stout/os/freebsd.hpp.orig 2020-05-22 20:48:06 UTC
2	+++ 3rdparty/stout/include/stout/os/freebsd.hpp
3	@@ -88,18 +88,29 @@ inline Try<Memory> memory()
4	const size_t pageSize = os::pagesize();
5
6	unsigned int freeCount;
7	- size_t length = sizeof(freeCount);
8	-
9	+ size_t freeCountLength = sizeof(freeCount);
10	if (sysctlbyname(
11	- "vm.stats.v_free_count",
12	+ "vm.stats.vm.v_free_count",
13	&freeCount,
14	- &length,
15	+ &freeCountLength,
16	nullptr,
17	0) != 0) {
18	return ErrnoError();
19	}
20	- memory.free = Bytes(freeCount * pageSize);
21
22	+ unsigned int inactiveCount;
23	+ size_t inactiveCountLength = sizeof(inactiveCount);
24	+ if (sysctlbyname(
25	+ "vm.stats.vm.v_inactive_count",
26	+ &inactiveCount,
27	+ &inactiveCountLength,
28	+ nullptr,
29	+ 0) != 0) {
30	+ return ErrnoError();
31	+ }
32	+
33	+ memory.free = Bytes((freeCount + inactiveCount) * pageSize);
34	+
35	int totalBlocks = 0;
36	int usedBlocks = 0;
37
38	@@ -112,8 +123,9 @@ inline Try<Memory> memory()
39	// FreeBSD supports multiple swap devices. Here we sum across all of them.
40	struct xswdev xswd;
41	size_t xswdSize = sizeof(xswd);
42	- int* mibDevice = &(mib[mibSize + 1]);
43	- for (mibDevice = 0; ; (mibDevice)++) {
44	+ for (int ndev = 0; ; ndev++) {
45	+ mib[mibSize] = ndev;
46	+
47	if (::sysctl(mib, 3, &xswd, &xswdSize, nullptr, 0) != 0) {
48	if (errno == ENOENT) {
49	break;

Lines 52-60 Link Here

(-)pkg-plist (-11 / +8 lines)
52	include/mesos/authorizer/authorizer.hpp	52	include/mesos/authorizer/authorizer.hpp
53	include/mesos/authorizer/authorizer.pb.h	53	include/mesos/authorizer/authorizer.pb.h
54	include/mesos/authorizer/authorizer.proto	54	include/mesos/authorizer/authorizer.proto
55	include/mesos/csi/types.hpp
56	include/mesos/csi/types.pb.h
57	include/mesos/csi/types.proto
58	include/mesos/csi/v0.hpp	55	include/mesos/csi/v0.hpp
59	include/mesos/csi/v1.hpp	56	include/mesos/csi/v1.hpp
60	include/mesos/docker/spec.hpp	57	include/mesos/docker/spec.hpp
Lines 494-514 Link Here
494	include/stout/windows/mac.hpp	491	include/stout/windows/mac.hpp
495	include/stout/windows/net.hpp	492	include/stout/windows/net.hpp
496	include/stout/windows/os.hpp	493	include/stout/windows/os.hpp
497	lib/libfixed_resource_estimator-1.10.0.so	494	lib/libfixed_resource_estimator-1.11.0.so
498	lib/libfixed_resource_estimator.so	495	lib/libfixed_resource_estimator.so
499	lib/libload_qos_controller-1.10.0.so	496	lib/libload_qos_controller-1.11.0.so
500	lib/libload_qos_controller.so	497	lib/libload_qos_controller.so
501	lib/liblogrotate_container_logger-1.10.0.so	498	lib/liblogrotate_container_logger-1.11.0.so
502	lib/liblogrotate_container_logger.so	499	lib/liblogrotate_container_logger.so
503	lib/libmesos-1.10.0.so	500	lib/libmesos-1.11.0.so
504	lib/libmesos.so	501	lib/libmesos.so
505	lib/mesos/modules/libfixed_resource_estimator-1.10.0.so	502	lib/mesos/modules/libfixed_resource_estimator-1.11.0.so
506	lib/mesos/modules/libfixed_resource_estimator.so	503	lib/mesos/modules/libfixed_resource_estimator.so
507	lib/mesos/modules/libload_qos_controller-1.10.0.so	504	lib/mesos/modules/libload_qos_controller-1.11.0.so
508	lib/mesos/modules/libload_qos_controller.so	505	lib/mesos/modules/libload_qos_controller.so
509	lib/mesos/modules/liblogrotate_container_logger-1.10.0.so	506	lib/mesos/modules/liblogrotate_container_logger-1.11.0.so
510	lib/mesos/modules/liblogrotate_container_logger.so	507	lib/mesos/modules/liblogrotate_container_logger.so
511	lib/mesos/modules/liburi_disk_profile_adaptor-1.10.0.so	508	lib/mesos/modules/liburi_disk_profile_adaptor-1.11.0.so
512	lib/mesos/modules/liburi_disk_profile_adaptor.so	509	lib/mesos/modules/liburi_disk_profile_adaptor.so
513	libdata/pkgconfig/mesos.pc	510	libdata/pkgconfig/mesos.pc
514	libexec/mesos/mesos-containerizer	511	libexec/mesos/mesos-containerizer