Index: head/sysutils/apache-mesos/Makefile =================================================================== --- head/sysutils/apache-mesos/Makefile +++ head/sysutils/apache-mesos/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= mesos -PORTVERSION= 1.9.0 -PORTREVISION= 5 +PORTVERSION= 1.10.0 CATEGORIES= sysutils MASTER_SITES= APACHE/mesos/${PORTVERSION} PKGNAMEPREFIX= apache- Index: head/sysutils/apache-mesos/distinfo =================================================================== --- head/sysutils/apache-mesos/distinfo +++ head/sysutils/apache-mesos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1569880247 -SHA256 (mesos-1.9.0.tar.gz) = 7a7ec5ea3dac9fe6cd8369437c57b5edd526a89627e02584009967c06a64a6b9 -SIZE (mesos-1.9.0.tar.gz) = 72158658 +TIMESTAMP = 1590786317 +SHA256 (mesos-1.10.0.tar.gz) = f4b9e8a1e9f905334adf4d349a2ed33a4cfa43278381cd34fb4fc7e9df9e12a1 +SIZE (mesos-1.10.0.tar.gz) = 71760072 Index: head/sysutils/apache-mesos/files/patch-src_common_protobuf__utils.cpp =================================================================== --- head/sysutils/apache-mesos/files/patch-src_common_protobuf__utils.cpp +++ head/sysutils/apache-mesos/files/patch-src_common_protobuf__utils.cpp @@ -1,20 +0,0 @@ ---- src/common/protobuf_utils.cpp.orig 2019-10-01 20:45:10 UTC -+++ src/common/protobuf_utils.cpp -@@ -1375,7 +1375,7 @@ void addMinimumCapability( - const MasterInfo::Capability::Type& capability) - { - int capabilityIndex = -- find_if( -+ std::find_if( - capabilities->begin(), - capabilities->end(), - [&](const Registry::MinimumCapability& mc) { -@@ -1396,7 +1396,7 @@ void removeMinimumCapability( - const MasterInfo::Capability::Type& capability) - { - int capabilityIndex = -- find_if( -+ std::find_if( - capabilities->begin(), - capabilities->end(), - [&](const Registry::MinimumCapability& mc) { Index: head/sysutils/apache-mesos/files/patch-src_common_resources__utils.cpp =================================================================== --- head/sysutils/apache-mesos/files/patch-src_common_resources__utils.cpp +++ head/sysutils/apache-mesos/files/patch-src_common_resources__utils.cpp @@ -1,20 +0,0 @@ ---- src/common/resources_utils.cpp.orig 2019-10-01 20:28:10 UTC -+++ src/common/resources_utils.cpp -@@ -914,7 +914,7 @@ Resources shrinkResources(const Resources& resources, - // TODO(mzhu): Add a `shuffle()` method in `Resources` to avoid this copy. - google::protobuf::RepeatedPtrField resourceVector = resources; - -- random_shuffle(resourceVector.begin(), resourceVector.end()); -+ std::random_shuffle(resourceVector.begin(), resourceVector.end()); - - Resources result; - foreach (Resource& resource, resourceVector) { -@@ -947,7 +947,7 @@ Resources shrinkResources(const Resources& resources, - // TODO(mzhu): Add a `shuffle()` method in `Resources` to avoid this copy. - google::protobuf::RepeatedPtrField resourceVector = resources; - -- random_shuffle(resourceVector.begin(), resourceVector.end()); -+ std::random_shuffle(resourceVector.begin(), resourceVector.end()); - - Resources result; - foreach (Resource resource, resourceVector) { Index: head/sysutils/apache-mesos/files/patch-src_master_quota.cpp =================================================================== --- head/sysutils/apache-mesos/files/patch-src_master_quota.cpp +++ head/sysutils/apache-mesos/files/patch-src_master_quota.cpp @@ -1,20 +0,0 @@ ---- src/master/quota.cpp.orig 2019-10-01 20:10:13 UTC -+++ src/master/quota.cpp -@@ -62,7 +62,7 @@ Try UpdateQuota::perform( - - foreach (const QuotaConfig& config, configs) { - // Check if there is already quota stored for the role. -- int configIndex = find_if( -+ int configIndex = std::find_if( - registryConfigs.begin(), - registryConfigs.end(), - [&](const QuotaConfig& registryConfig) { -@@ -91,7 +91,7 @@ Try UpdateQuota::perform( - google::protobuf::RepeatedPtrField& quotas = - *registry->mutable_quotas(); - -- int quotaIndex = find_if( -+ int quotaIndex = std::find_if( - quotas.begin(), - quotas.end(), - [&](const Registry::Quota& quota) { Index: head/sysutils/apache-mesos/pkg-plist =================================================================== --- head/sysutils/apache-mesos/pkg-plist +++ head/sysutils/apache-mesos/pkg-plist @@ -63,12 +63,12 @@ include/mesos/docker/v1.hpp include/mesos/docker/v1.pb.h include/mesos/docker/v1.proto -include/mesos/docker/v2_2.hpp -include/mesos/docker/v2_2.pb.h -include/mesos/docker/v2_2.proto include/mesos/docker/v2.hpp include/mesos/docker/v2.pb.h include/mesos/docker/v2.proto +include/mesos/docker/v2_2.hpp +include/mesos/docker/v2_2.pb.h +include/mesos/docker/v2_2.proto include/mesos/executor.hpp include/mesos/executor/executor.hpp include/mesos/executor/executor.pb.h @@ -208,8 +208,8 @@ include/process/future.hpp include/process/gmock.hpp include/process/grpc.hpp -include/process/gtest_constants.hpp include/process/gtest.hpp +include/process/gtest_constants.hpp include/process/help.hpp include/process/http.hpp include/process/id.hpp @@ -317,6 +317,7 @@ include/stout/os/copyfile.hpp include/stout/os/dup.hpp include/stout/os/environment.hpp +include/stout/os/exec.hpp include/stout/os/exists.hpp include/stout/os/fcntl.hpp include/stout/os/find.hpp @@ -350,6 +351,7 @@ include/stout/os/posix/copyfile.hpp include/stout/os/posix/dup.hpp include/stout/os/posix/environment.hpp +include/stout/os/posix/exec.hpp include/stout/os/posix/exists.hpp include/stout/os/posix/fcntl.hpp include/stout/os/posix/fork.hpp @@ -412,6 +414,7 @@ include/stout/os/windows/copyfile.hpp include/stout/os/windows/dup.hpp include/stout/os/windows/environment.hpp +include/stout/os/windows/exec.hpp include/stout/os/windows/exists.hpp include/stout/os/windows/fcntl.hpp include/stout/os/windows/fd.hpp @@ -461,8 +464,8 @@ include/stout/protobuf.hpp include/stout/recordio.hpp include/stout/representation.hpp -include/stout/result_of.hpp include/stout/result.hpp +include/stout/result_of.hpp include/stout/set.hpp include/stout/some.hpp include/stout/stopwatch.hpp @@ -491,21 +494,21 @@ include/stout/windows/mac.hpp include/stout/windows/net.hpp include/stout/windows/os.hpp -lib/libfixed_resource_estimator-1.9.0.so +lib/libfixed_resource_estimator-1.10.0.so lib/libfixed_resource_estimator.so -lib/libload_qos_controller-1.9.0.so +lib/libload_qos_controller-1.10.0.so lib/libload_qos_controller.so -lib/liblogrotate_container_logger-1.9.0.so +lib/liblogrotate_container_logger-1.10.0.so lib/liblogrotate_container_logger.so -lib/libmesos-1.9.0.so +lib/libmesos-1.10.0.so lib/libmesos.so -lib/mesos/modules/libfixed_resource_estimator-1.9.0.so +lib/mesos/modules/libfixed_resource_estimator-1.10.0.so lib/mesos/modules/libfixed_resource_estimator.so -lib/mesos/modules/libload_qos_controller-1.9.0.so +lib/mesos/modules/libload_qos_controller-1.10.0.so lib/mesos/modules/libload_qos_controller.so -lib/mesos/modules/liblogrotate_container_logger-1.9.0.so +lib/mesos/modules/liblogrotate_container_logger-1.10.0.so lib/mesos/modules/liblogrotate_container_logger.so -lib/mesos/modules/liburi_disk_profile_adaptor-1.9.0.so +lib/mesos/modules/liburi_disk_profile_adaptor-1.10.0.so lib/mesos/modules/liburi_disk_profile_adaptor.so libdata/pkgconfig/mesos.pc libexec/mesos/mesos-containerizer @@ -518,9 +521,9 @@ libexec/mesos/mesos-tcp-connect libexec/mesos/mesos-usage sbin/mesos-agent +%%DEPLOY%%sbin/mesos-daemon.sh sbin/mesos-master sbin/mesos-slave -%%DEPLOY%%sbin/mesos-daemon.sh %%DEPLOY%%sbin/mesos-start-agents.sh %%DEPLOY%%sbin/mesos-start-cluster.sh %%DEPLOY%%sbin/mesos-start-masters.sh @@ -538,6 +541,9 @@ %%DATADIR%%/webui/app/controllers.js %%DATADIR%%/webui/app/frameworks/framework.html %%DATADIR%%/webui/app/frameworks/frameworks.html +%%DATADIR%%/webui/app/frameworks/roles-tree-root.html +%%DATADIR%%/webui/app/frameworks/roles-tree.html +%%DATADIR%%/webui/app/frameworks/roles.html %%DATADIR%%/webui/app/home.html %%DATADIR%%/webui/app/maintenance/maintenance.html %%DATADIR%%/webui/app/offers/offers.html