Attachment 223278 Details for Bug 254294 – sysutils/apache-mesos diff

[patch] sysutils/apache-mesos diff

apache-mesos.diff (text/plain), 5.38 KB, created by James Wright on 2021-03-15 02:45:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Wright

Created: 2021-03-15 02:45:45 UTC

Size: 5.38 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 568404)
>+++ Makefile	(working copy)
>@@ -1,8 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	mesos
>-PORTVERSION=	1.10.0
>-PORTREVISION=	6
>+PORTVERSION=	1.11.0
>+PORTREVISION=	0
> CATEGORIES=	sysutils
> MASTER_SITES=	APACHE/mesos/${PORTVERSION}:mesos
> PKGNAMEPREFIX=	apache-
>@@ -82,7 +82,7 @@
> JAVA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_java_mesos.pom.in
> 
> # REVIEW: Can we figure out the current Protobuf version in ports instead of hardcoding???
>-PROTOBUF_VERSION=	3.12.2
>+PROTOBUF_VERSION=	3.14.0
> 
> MAVEN_CMD=		mvn
> MAVEN_REPO=		${WRKDIR}/mesos-maven-deps-${PORTVERSION}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 568404)
>+++ distinfo	(working copy)
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1593259602
>-SHA256 (apache-mesos/mesos-1.10.0.tar.gz) = f4b9e8a1e9f905334adf4d349a2ed33a4cfa43278381cd34fb4fc7e9df9e12a1
>-SIZE (apache-mesos/mesos-1.10.0.tar.gz) = 71760072
>-SHA256 (apache-mesos/mesos-maven-deps-1.10.0.tar.gz) = b119a72e99499b67e1455a32bbbba80a15ae5ef21315eab76119f941f96f3d36
>-SIZE (apache-mesos/mesos-maven-deps-1.10.0.tar.gz) = 36000010
>+TIMESTAMP = 1615762466
>+SHA256 (apache-mesos/mesos-1.11.0.tar.gz) = ce08cb648a21502a4a0c45d240a596d9ac860fcaf717f9a3dc986da9d406fe34
>+SIZE (apache-mesos/mesos-1.11.0.tar.gz) = 72210031
>+SHA256 (apache-mesos/mesos-maven-deps-1.11.0.tar.gz) = 98acd50b2d22018f5c79127ea14245e863c4c1bd0092c65c85ef9a147d488def
>+SIZE (apache-mesos/mesos-maven-deps-1.11.0.tar.gz) = 36003620
>Index: files/maven-deps.pom
>===================================================================
>--- files/maven-deps.pom	(revision 568418)
>+++ files/maven-deps.pom	(working copy)
>@@ -3,7 +3,7 @@
>   <groupId>org.apache.mesos</groupId>
>   <artifactId>mesos</artifactId>
>   <name>mesos</name>
>-  <version>1.10.0</version>
>+  <version>1.11.0</version>
>   <description>The Apache Mesos Java API jar.</description>
>   <url>http://mesos.apache.org</url>
>   <parent>
>Index: files/patch-3rdparty_stout_include_stout_os_freebsd.hpp
>===================================================================
>--- files/patch-3rdparty_stout_include_stout_os_freebsd.hpp	(revision 568418)
>+++ files/patch-3rdparty_stout_include_stout_os_freebsd.hpp	(nonexistent)
>@@ -1,49 +0,0 @@
>---- 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;
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 568404)
>+++ pkg-plist	(working copy)
>@@ -52,9 +52,6 @@
> 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
>@@ -494,21 +491,21 @@
> include/stout/windows/mac.hpp
> include/stout/windows/net.hpp
> include/stout/windows/os.hpp
>-lib/libfixed_resource_estimator-1.10.0.so
>+lib/libfixed_resource_estimator-1.11.0.so
> lib/libfixed_resource_estimator.so
>-lib/libload_qos_controller-1.10.0.so
>+lib/libload_qos_controller-1.11.0.so
> lib/libload_qos_controller.so
>-lib/liblogrotate_container_logger-1.10.0.so
>+lib/liblogrotate_container_logger-1.11.0.so
> lib/liblogrotate_container_logger.so
>-lib/libmesos-1.10.0.so
>+lib/libmesos-1.11.0.so
> lib/libmesos.so
>-lib/mesos/modules/libfixed_resource_estimator-1.10.0.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.10.0.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.10.0.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.10.0.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

Flags:

james.wright: maintainer-approval+

Actions: View | Diff

Attachments on bug 254294: 223278