Page MenuHomeFreeBSD

D20251.id62897.diff
No OneTemporary

D20251.id62897.diff

Index: sysutils/Makefile
===================================================================
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -44,6 +44,7 @@
SUBDIR += ansible26
SUBDIR += ansible27
SUBDIR += anvil
+ SUBDIR += apache-mesos
SUBDIR += apachetop
SUBDIR += apcpwr
SUBDIR += apcupsd
Index: sysutils/apache-mesos/Makefile
===================================================================
--- sysutils/apache-mesos/Makefile
+++ sysutils/apache-mesos/Makefile
@@ -0,0 +1,67 @@
+# $FreeBSD$
+
+PORTNAME= mesos
+PORTVERSION= 1.9.0
+CATEGORIES= sysutils
+MASTER_SITES= APACHE/mesos/${PORTVERSION}
+PKGNAMEPREFIX= apache-
+
+MAINTAINER= james.wright@digital-chaos.com
+COMMENT= Cluster manager providing resource isolation and sharing
+
+LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+BUILD_DEPENDS= boost-libs>0:devel/boost-libs \
+ elfio>0:devel/elfio \
+ http-parser>0:www/http-parser \
+ leveldb>0:databases/leveldb \
+ picojson>0:devel/picojson \
+ protobuf>0:devel/protobuf \
+ rapidjson>0:devel/rapidjson \
+ libzookeeper>0:devel/libzookeeper
+LIB_DEPENDS= libapr-1.so:devel/apr1 \
+ libcurl.so:ftp/curl \
+ libgpr.so:devel/grpc \
+ libglog.so:devel/glog \
+ libhttp_parser.so:www/http-parser \
+ libev.so:devel/libev \
+ libleveldb.so:databases/leveldb \
+ libprotobuf.so:devel/protobuf \
+ libsasl2.so:security/cyrus-sasl2 \
+ libsvn_delta-1.so:devel/subversion \
+ libsvn_subr-1.so:devel/subversion \
+ libzookeeper_mt.so:devel/libzookeeper
+
+USES= gmake libarchive libtool python:run shebangfix
+USE_LDCONFIG= yes
+SHEBANG_FILES= src/cli/mesos-cat src/cli/mesos-ps src/cli/mesos-scp src/cli/mesos-tail
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-java \
+ --disable-python \
+ --disable-werror \
+ --with-apr=${LOCALBASE} \
+ --with-boost=${LOCALBASE} \
+ --with-elfio=${LOCALBASE} \
+ --with-glog=${LOCALBASE} \
+ --with-grpc=${LOCALBASE} \
+ --with-http_parser=${LOCALBASE} \
+ --with-leveldb=${LOCALBASE} \
+ --with-libarchive=${LOCALBASE} \
+ --with-libev=${LOCALBASE} \
+ --with-protobuf=${LOCALBASE} \
+ --with-picojson=${LOCALBASE} \
+ --with-rapidjson=${LOCALBASE} \
+ --with-sasl=${LOCALBASE} \
+ --with-svn=${LOCALBASE} \
+ --with-zookeeper=${LOCALBASE}
+
+INSTALL_TARGET= install-strip
+
+OPTIONS_DEFINE= DEPLOY
+OPTIONS_SUB= yes
+
+DEPLOY_DESC= Install deploy scripts
+
+.include <bsd.port.mk>
Index: sysutils/apache-mesos/distinfo
===================================================================
--- sysutils/apache-mesos/distinfo
+++ sysutils/apache-mesos/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1569880247
+SHA256 (mesos-1.9.0.tar.gz) = 7a7ec5ea3dac9fe6cd8369437c57b5edd526a89627e02584009967c06a64a6b9
+SIZE (mesos-1.9.0.tar.gz) = 72158658
Index: sysutils/apache-mesos/files/patch-src_common_protobuf__utils.cpp
===================================================================
--- sysutils/apache-mesos/files/patch-src_common_protobuf__utils.cpp
+++ sysutils/apache-mesos/files/patch-src_common_protobuf__utils.cpp
@@ -0,0 +1,20 @@
+--- 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: sysutils/apache-mesos/files/patch-src_common_resources__utils.cpp
===================================================================
--- sysutils/apache-mesos/files/patch-src_common_resources__utils.cpp
+++ sysutils/apache-mesos/files/patch-src_common_resources__utils.cpp
@@ -0,0 +1,20 @@
+--- 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<Resource> 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<Resource> resourceVector = resources;
+
+- random_shuffle(resourceVector.begin(), resourceVector.end());
++ std::random_shuffle(resourceVector.begin(), resourceVector.end());
+
+ Resources result;
+ foreach (Resource resource, resourceVector) {
Index: sysutils/apache-mesos/files/patch-src_master_quota.cpp
===================================================================
--- sysutils/apache-mesos/files/patch-src_master_quota.cpp
+++ sysutils/apache-mesos/files/patch-src_master_quota.cpp
@@ -0,0 +1,20 @@
+--- src/master/quota.cpp.orig 2019-10-01 20:10:13 UTC
++++ src/master/quota.cpp
+@@ -62,7 +62,7 @@ Try<bool> 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<bool> UpdateQuota::perform(
+ google::protobuf::RepeatedPtrField<Registry::Quota>& quotas =
+ *registry->mutable_quotas();
+
+- int quotaIndex = find_if(
++ int quotaIndex = std::find_if(
+ quotas.begin(),
+ quotas.end(),
+ [&](const Registry::Quota& quota) {
Index: sysutils/apache-mesos/pkg-descr
===================================================================
--- sysutils/apache-mesos/pkg-descr
+++ sysutils/apache-mesos/pkg-descr
@@ -0,0 +1,5 @@
+Apache Mesos abstracts CPU, memory, storage, and other compute resources away
+from machines (physical or virtual), enabling fault-tolerant and elastic
+distributed systems to easily be built and run effectively.
+
+WWW: http://mesos.apache.org/
Index: sysutils/apache-mesos/pkg-plist
===================================================================
--- sysutils/apache-mesos/pkg-plist
+++ sysutils/apache-mesos/pkg-plist
@@ -0,0 +1,261 @@
+bin/mesos
+bin/mesos-cat
+bin/mesos-execute
+bin/mesos-local
+bin/mesos-log
+bin/mesos-ps
+bin/mesos-resolve
+bin/mesos-scp
+bin/mesos-tail
+%%DEPLOY%%@sample %%ETCDIR%%/mesos-agent-env.sh.template %%ETCDIR%%/mesos-agent-env.sh
+%%DEPLOY%%@sample %%ETCDIR%%/mesos-deploy-env.sh.template %%ETCDIR%%/mesos-deploy-env.sh
+%%DEPLOY%%@sample %%ETCDIR%%/mesos-master-env.sh.template %%ETCDIR%%/mesos-master-env.sh
+%%DEPLOY%%@sample %%ETCDIR%%/mesos-slave-env.sh.template %%ETCDIR%%/mesos-slave-env.sh
+include/mesos/agent/agent.hpp
+include/mesos/agent/agent.pb.h
+include/mesos/agent/agent.proto
+include/mesos/agent/container_logger.hpp
+include/mesos/agent/containerizer.hpp
+include/mesos/agent/containerizer.pb.h
+include/mesos/agent/isolator.hpp
+include/mesos/agent/oversubscription.hpp
+include/mesos/agent/oversubscription.pb.h
+include/mesos/agent/oversubscription.proto
+include/mesos/agent/qos_controller.hpp
+include/mesos/agent/resource_estimator.hpp
+include/mesos/allocator/allocator.hpp
+include/mesos/allocator/allocator.pb.h
+include/mesos/allocator/allocator.proto
+include/mesos/appc/spec.hpp
+include/mesos/appc/spec.pb.h
+include/mesos/appc/spec.proto
+include/mesos/attributes.hpp
+include/mesos/authentication/authenticatee.hpp
+include/mesos/authentication/authentication.hpp
+include/mesos/authentication/authentication.pb.h
+include/mesos/authentication/authentication.proto
+include/mesos/authentication/authenticator.hpp
+include/mesos/authentication/http/authenticatee.hpp
+include/mesos/authentication/http/basic_authenticator_factory.hpp
+include/mesos/authentication/http/combined_authenticator.hpp
+include/mesos/authentication/secret_generator.hpp
+include/mesos/authorizer/acls.hpp
+include/mesos/authorizer/acls.pb.h
+include/mesos/authorizer/acls.proto
+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/mesos/docker/spec.pb.h
+include/mesos/docker/spec.proto
+include/mesos/docker/v1.hpp
+include/mesos/docker/v1.pb.h
+include/mesos/docker/v1.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
+include/mesos/executor/executor.proto
+include/mesos/fetcher/fetcher.hpp
+include/mesos/fetcher/fetcher.pb.h
+include/mesos/fetcher/fetcher.proto
+include/mesos/hook.hpp
+include/mesos/http.hpp
+include/mesos/log/log.hpp
+include/mesos/maintenance/maintenance.hpp
+include/mesos/maintenance/maintenance.pb.h
+include/mesos/maintenance/maintenance.proto
+include/mesos/master/contender.hpp
+include/mesos/master/detector.hpp
+include/mesos/master/master.hpp
+include/mesos/master/master.pb.h
+include/mesos/master/master.proto
+include/mesos/mesos.hpp
+include/mesos/mesos.pb.h
+include/mesos/mesos.proto
+include/mesos/module.hpp
+include/mesos/module/allocator.hpp
+include/mesos/module/anonymous.hpp
+include/mesos/module/authenticatee.hpp
+include/mesos/module/authenticator.hpp
+include/mesos/module/authorizer.hpp
+include/mesos/module/container_logger.hpp
+include/mesos/module/contender.hpp
+include/mesos/module/detector.hpp
+include/mesos/module/disk_profile_adaptor.hpp
+include/mesos/module/hook.hpp
+include/mesos/module/hook.pb.h
+include/mesos/module/hook.proto
+include/mesos/module/http_authenticatee.hpp
+include/mesos/module/http_authenticator.hpp
+include/mesos/module/isolator.hpp
+include/mesos/module/module.hpp
+include/mesos/module/module.pb.h
+include/mesos/module/module.proto
+include/mesos/module/qos_controller.hpp
+include/mesos/module/resource_estimator.hpp
+include/mesos/module/secret_generator.hpp
+include/mesos/module/secret_resolver.hpp
+include/mesos/oci/spec.hpp
+include/mesos/oci/spec.pb.h
+include/mesos/oci/spec.proto
+include/mesos/quota/quota.hpp
+include/mesos/quota/quota.pb.h
+include/mesos/quota/quota.proto
+include/mesos/resource_provider/resource_provider.hpp
+include/mesos/resource_provider/resource_provider.pb.h
+include/mesos/resource_provider/resource_provider.proto
+include/mesos/resource_provider/storage/disk_profile_adaptor.hpp
+include/mesos/resource_quantities.hpp
+include/mesos/resources.hpp
+include/mesos/roles.hpp
+include/mesos/scheduler.hpp
+include/mesos/scheduler/scheduler.hpp
+include/mesos/scheduler/scheduler.pb.h
+include/mesos/scheduler/scheduler.proto
+include/mesos/seccomp/seccomp.hpp
+include/mesos/seccomp/seccomp.pb.h
+include/mesos/seccomp/seccomp.proto
+include/mesos/secret/resolver.hpp
+include/mesos/slave
+include/mesos/state/in_memory.hpp
+include/mesos/state/leveldb.hpp
+include/mesos/state/log.hpp
+include/mesos/state/protobuf.hpp
+include/mesos/state/state.hpp
+include/mesos/state/state.pb.h
+include/mesos/state/state.proto
+include/mesos/state/storage.hpp
+include/mesos/state/zookeeper.hpp
+include/mesos/type_utils.hpp
+include/mesos/uri/fetcher.hpp
+include/mesos/uri/uri.hpp
+include/mesos/uri/uri.pb.h
+include/mesos/uri/uri.proto
+include/mesos/v1/agent/agent.hpp
+include/mesos/v1/agent/agent.pb.h
+include/mesos/v1/agent/agent.proto
+include/mesos/v1/allocator/allocator.pb.h
+include/mesos/v1/allocator/allocator.proto
+include/mesos/v1/attributes.hpp
+include/mesos/v1/executor.hpp
+include/mesos/v1/executor/executor.hpp
+include/mesos/v1/executor/executor.pb.h
+include/mesos/v1/executor/executor.proto
+include/mesos/v1/maintenance/maintenance.hpp
+include/mesos/v1/maintenance/maintenance.pb.h
+include/mesos/v1/maintenance/maintenance.proto
+include/mesos/v1/master/master.hpp
+include/mesos/v1/master/master.pb.h
+include/mesos/v1/master/master.proto
+include/mesos/v1/mesos.hpp
+include/mesos/v1/mesos.pb.h
+include/mesos/v1/mesos.proto
+include/mesos/v1/quota/quota.pb.h
+include/mesos/v1/quota/quota.proto
+include/mesos/v1/resource_provider.hpp
+include/mesos/v1/resource_provider/resource_provider.hpp
+include/mesos/v1/resource_provider/resource_provider.pb.h
+include/mesos/v1/resource_provider/resource_provider.proto
+include/mesos/v1/resources.hpp
+include/mesos/v1/scheduler.hpp
+include/mesos/v1/scheduler/scheduler.hpp
+include/mesos/v1/scheduler/scheduler.pb.h
+include/mesos/v1/scheduler/scheduler.proto
+include/mesos/v1/values.hpp
+include/mesos/values.hpp
+include/mesos/version.hpp
+include/mesos/zookeeper/authentication.hpp
+include/mesos/zookeeper/contender.hpp
+include/mesos/zookeeper/detector.hpp
+include/mesos/zookeeper/group.hpp
+include/mesos/zookeeper/url.hpp
+include/mesos/zookeeper/watcher.hpp
+include/mesos/zookeeper/zookeeper.hpp
+lib/libfixed_resource_estimator-1.9.0.so
+lib/libfixed_resource_estimator.so
+lib/libload_qos_controller-1.9.0.so
+lib/libload_qos_controller.so
+lib/liblogrotate_container_logger-1.9.0.so
+lib/liblogrotate_container_logger.so
+lib/libmesos-1.9.0.so
+lib/libmesos.so
+lib/mesos/modules/libfixed_resource_estimator-1.9.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.so
+lib/mesos/modules/liblogrotate_container_logger-1.9.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.so
+libdata/pkgconfig/mesos.pc
+libexec/mesos/mesos-containerizer
+libexec/mesos/mesos-default-executor
+libexec/mesos/mesos-docker-executor
+libexec/mesos/mesos-executor
+libexec/mesos/mesos-fetcher
+libexec/mesos/mesos-io-switchboard
+libexec/mesos/mesos-logrotate-logger
+libexec/mesos/mesos-tcp-connect
+libexec/mesos/mesos-usage
+sbin/mesos-agent
+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
+%%DEPLOY%%sbin/mesos-start-slaves.sh
+%%DEPLOY%%sbin/mesos-stop-agents.sh
+%%DEPLOY%%sbin/mesos-stop-cluster.sh
+%%DEPLOY%%sbin/mesos-stop-masters.sh
+%%DEPLOY%%sbin/mesos-stop-slaves.sh
+%%DATADIR%%/webui/app/agents/agent-browse.html
+%%DATADIR%%/webui/app/agents/agent-executor.html
+%%DATADIR%%/webui/app/agents/agent-framework.html
+%%DATADIR%%/webui/app/agents/agent.html
+%%DATADIR%%/webui/app/agents/agents.html
+%%DATADIR%%/webui/app/app.js
+%%DATADIR%%/webui/app/controllers.js
+%%DATADIR%%/webui/app/frameworks/framework.html
+%%DATADIR%%/webui/app/frameworks/frameworks.html
+%%DATADIR%%/webui/app/home.html
+%%DATADIR%%/webui/app/maintenance/maintenance.html
+%%DATADIR%%/webui/app/offers/offers.html
+%%DATADIR%%/webui/app/roles/roles.html
+%%DATADIR%%/webui/app/services.js
+%%DATADIR%%/webui/app/shared/pagination.html
+%%DATADIR%%/webui/app/shared/pailer.html
+%%DATADIR%%/webui/app/shared/table-header.html
+%%DATADIR%%/webui/app/shared/timestamp.html
+%%DATADIR%%/webui/assets/css/bootstrap-3.3.6.min.css
+%%DATADIR%%/webui/assets/css/bootstrap-table-1.11.1.min.css
+%%DATADIR%%/webui/assets/css/mesos.css
+%%DATADIR%%/webui/assets/fonts/glyphicons-halflings-regular.eot
+%%DATADIR%%/webui/assets/fonts/glyphicons-halflings-regular.svg
+%%DATADIR%%/webui/assets/fonts/glyphicons-halflings-regular.ttf
+%%DATADIR%%/webui/assets/fonts/glyphicons-halflings-regular.woff
+%%DATADIR%%/webui/assets/fonts/glyphicons-halflings-regular.woff2
+%%DATADIR%%/webui/assets/ico/favicon.ico
+%%DATADIR%%/webui/assets/img/loading.gif
+%%DATADIR%%/webui/assets/img/mesos-logo.png
+%%DATADIR%%/webui/assets/libs/angular-1.2.32.min.js
+%%DATADIR%%/webui/assets/libs/angular-route-1.2.32.min.js
+%%DATADIR%%/webui/assets/libs/bootstrap-table-1.11.1.min.js
+%%DATADIR%%/webui/assets/libs/clipboard-1.5.16.min.js
+%%DATADIR%%/webui/assets/libs/jquery-3.2.1.min.js
+%%DATADIR%%/webui/assets/libs/jquery.pailer.js
+%%DATADIR%%/webui/assets/libs/relative-date.js
+%%DATADIR%%/webui/assets/libs/ui-bootstrap-tpls-0.9.0.min.js
+%%DATADIR%%/webui/assets/libs/underscore-1.4.3.min.js
+%%DATADIR%%/webui/index.html

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 4, 11:49 PM (14 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30852882
Default Alt Text
D20251.id62897.diff (16 KB)

Event Timeline