From nobody Sat Dec 11 16:37:57 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F26CD18D68F6; Sat, 11 Dec 2021 16:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JBD394vRsz4Tm3; Sat, 11 Dec 2021 16:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8782C11648; Sat, 11 Dec 2021 16:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BBGbv9d013004; Sat, 11 Dec 2021 16:37:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BBGbvEl013003; Sat, 11 Dec 2021 16:37:57 GMT (envelope-from git) Date: Sat, 11 Dec 2021 16:37:57 GMT Message-Id: <202112111637.1BBGbvEl013003@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 943d12bac228 - main - www/rubygem-passenger: fix failed build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 943d12bac228f11a4836dfb813e8a82076cc505f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639240677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TMzexTIRJqVqaf54T+AAEbQwop44sZllcewLVkOkwmk=; b=jSZ7q+lJ3aTFbO0bQ5v6Wy/pfheNvVJd+Dg62oVRHyikH3Nhr+mdHNnOBrlVQPQdTdtCNv 3nTxisnUleQeF5UbrzD8dwGWhLpwyEef7unacJCFPhA2fmw10NjSEm01/kczQJfNj+Wf2U JEgiNEqDumZc2dPrO7Y/BWmVOXlHTiJ+o7jrGxeP7tbL0oTyxpCx/zo0aeX7/e9NvpQ1eX 2V4vArV/FcQtd4Iu1K6aM3/qJYT4vQuFMe0+u547rd5GIryvAhjtfCwdzQRadajgEfpi84 bu2xfH/ZSCMwjqA9XaYQFt+YU8IspxIU3q72XNGv/4QZF7tj7NODt/GeGq7D8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639240677; a=rsa-sha256; cv=none; b=JlYQCLKfjzGS4D9G8vfD5JTmLA6t4Kkv+H/6Tolp6I4VnuOpyO1kX9OLS1Z/XIj13JtAci cWXf9SDtRSdJCJEpkZO2GmrgSHFRIJd1mG2RpAIuOTNFKuWwyd0eSC7qe35VComRkeReZX fITMp9z4dCllI1Im3egaOFKmnpf+aDGe/Y8Zh7qQp/LZ8zBIeaYiyKgYPuSB7m+gnvxK+4 I7PXP5Tdvw4ujJ0jTIuR5EdKMk/1VF+oIxQ18pMiEl+yCJpqJiFI41HFzo8W+TAgc+N5OA +2BjY/xSPy1SkGMfcR9051mC17rwj7yEHhdPXiQJpLddyoCsXJGyri8loEQmGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=943d12bac228f11a4836dfb813e8a82076cc505f commit 943d12bac228f11a4836dfb813e8a82076cc505f Author: Sergey A. Osokin AuthorDate: 2021-12-11 16:32:47 +0000 Commit: Sergey A. Osokin CommitDate: 2021-12-11 16:37:50 +0000 www/rubygem-passenger: fix failed build Do not bump PORTREVISION cause there where no successful build since recent update to 6.0.12. Patch provided by Camden Narzt in a private email. --- www/rubygem-passenger/Makefile | 2 + www/rubygem-passenger/distinfo | 4 +- .../files/patch-aligned_alloc.hpp | 55 ++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile index 0ac772b56460..72c12195fb04 100644 --- a/www/rubygem-passenger/Makefile +++ b/www/rubygem-passenger/Makefile @@ -4,6 +4,8 @@ PORTNAME= passenger PORTVERSION= 6.0.12 CATEGORIES= www rubygems MASTER_SITES= RG +PATCH_SITES= https://github.com/phusion/passenger/commit/ +PATCHFILES= 4c8d0a1316000db93eb4484480b2e14188560e14.patch:-p1 MAINTAINER= osa@FreeBSD.org COMMENT= Modules for running Ruby on Rails and Rack applications diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo index 5ba0e57a61df..472e79baf132 100644 --- a/www/rubygem-passenger/distinfo +++ b/www/rubygem-passenger/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1638983871 +TIMESTAMP = 1639239547 SHA256 (rubygem/passenger-6.0.12.gem) = d0416639cedc9157044783266f6782a6ff61a84ca31a54b823a215501c6c1c01 SIZE (rubygem/passenger-6.0.12.gem) = 8118784 +SHA256 (rubygem/4c8d0a1316000db93eb4484480b2e14188560e14.patch) = 55d5a825a27c64978bea524293c694b53c207976be241aaee679623e43969101 +SIZE (rubygem/4c8d0a1316000db93eb4484480b2e14188560e14.patch) = 10527 diff --git a/www/rubygem-passenger/files/patch-aligned_alloc.hpp b/www/rubygem-passenger/files/patch-aligned_alloc.hpp new file mode 100644 index 000000000000..09e8c4723597 --- /dev/null +++ b/www/rubygem-passenger/files/patch-aligned_alloc.hpp @@ -0,0 +1,55 @@ +--- /dev/null 2021-12-11 11:24:33.892890000 -0500 ++++ src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc.hpp 2021-12-10 13:34:33.000000000 -0500 +@@ -0,0 +1,52 @@ ++/* ++Copyright 2014-2015 Glen Joseph Fernandes ++(glenjofe@gmail.com) ++ ++Distributed under the Boost Software License, Version 1.0. ++(http://www.boost.org/LICENSE_1_0.txt) ++*/ ++#ifndef BOOST_ALIGN_DETAIL_ALIGNED_ALLOC_HPP ++#define BOOST_ALIGN_DETAIL_ALIGNED_ALLOC_HPP ++ ++#include ++#include ++#include ++#include ++#include ++ ++namespace boost { ++namespace alignment { ++ ++inline void* ++aligned_alloc(std::size_t alignment, std::size_t size) BOOST_NOEXCEPT ++{ ++ BOOST_ASSERT(detail::is_alignment(alignment)); ++ enum { ++ N = alignment_of::value ++ }; ++ if (alignment < N) { ++ alignment = N; ++ } ++ std::size_t n = size + alignment - N; ++ void* p = std::malloc(sizeof(void*) + n); ++ if (p) { ++ void* r = static_cast(p) + sizeof(void*); ++ (void)boost::alignment::align(alignment, size, r, n); ++ *(static_cast(r) - 1) = p; ++ p = r; ++ } ++ return p; ++} ++ ++inline void ++aligned_free(void* ptr) BOOST_NOEXCEPT ++{ ++ if (ptr) { ++ std::free(*(static_cast(ptr) - 1)); ++ } ++} ++ ++} /* alignment */ ++} /* boost */ ++ ++#endif