git: 25a7c9540329 - main - www/*: update Passenger 6.0.12 -> 6.0.15

From: Sergey A. Osokin <osa_at_FreeBSD.org>
Date: Tue, 04 Oct 2022 16:53:46 UTC 
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=25a7c9540329c712028a65cf3dcd3b2854ec15d6

commit 25a7c9540329c712028a65cf3dcd3b2854ec15d6
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2022-10-04 16:51:51 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2022-10-04 16:53:37 +0000

    www/*: update Passenger 6.0.12 -> 6.0.15
    
    Update third-party Passenger module for www/nginx-devel.
---
 www/nginx-devel/Makefile                           |  2 +-
 www/nginx-devel/Makefile.extmod                    |  2 +-
 www/nginx-devel/distinfo                           |  6 +--
 .../files/extra-patch-passenger-build-nginx.rb     |  4 +-
 .../files/extra-patch-passenger-disable-telemetry  |  4 +-
 www/rubygem-passenger/Makefile                     |  6 +--
 www/rubygem-passenger/distinfo                     | 10 ++--
 .../files/patch-aligned_alloc.hpp                  | 55 ----------------------
 8 files changed, 13 insertions(+), 76 deletions(-)

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index f120fb399770..04ad98d69b85 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME?=	nginx
 PORTVERSION=	1.23.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index fabb3c6d1c00..c722bc05e931 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -257,7 +257,7 @@ OPENTRACING_LIB_DEPENDS=	libopentracing.so:devel/libopentracing
 OPENTRACING_VARS=		DSO_EXTMODS+=opentracing OPENTRACING_SUBDIR=/opentracing
 OPENTRACING_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-opentracing-opentracing-config
 
-PASSENGER_NGINX_VER=	6.0.12
+PASSENGER_NGINX_VER=	6.0.15
 PASSENGER_CATEGORIES=	ruby
 PASSENGER_USE=		ruby=yes
 PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 5177335b7b7a..11c9ebf07435 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1664111770
+TIMESTAMP = 1664901181
 SHA256 (nginx-1.23.1.tar.gz) = 5eee1bd1c23e3b9477a45532f1f36ae6178b43d571a9607e6953cef26d5df1e2
 SIZE (nginx-1.23.1.tar.gz) = 1104352
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -7,8 +7,8 @@ SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401
 SIZE (nginx_mod_h264_streaming-2.2.7.tar.gz) = 44012
 SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b255ef14f9c26e3847a6f26f46
 SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051
-SHA256 (passenger-6.0.12.tar.gz) = 4d15063dea6bce195e251d2b42e7bb67fab0049b8d6c423188566bc11ce9a8ad
-SIZE (passenger-6.0.12.tar.gz) = 8234023
+SHA256 (passenger-6.0.15.tar.gz) = 73fa22da5a11e4bc4ad6b95c13a0e393ba18109e6e07bd1953c45b2f0c0aae80
+SIZE (passenger-6.0.15.tar.gz) = 8379463
 SHA256 (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c
 SIZE (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 110807
 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
diff --git a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
index 292e8b790a5b..68d166abab64 100644
--- a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
+++ b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
@@ -1,5 +1,5 @@
---- ../passenger-6.0.12/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-6.0.12/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
+--- ../passenger-6.0.15/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
++++ ../passenger-6.0.15/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
 @@ -33,13 +33,12 @@
  desc "Build Nginx support files"
  task :nginx => [
diff --git a/www/nginx-devel/files/extra-patch-passenger-disable-telemetry b/www/nginx-devel/files/extra-patch-passenger-disable-telemetry
index 283ee8eedf33..9749f2327db1 100644
--- a/www/nginx-devel/files/extra-patch-passenger-disable-telemetry
+++ b/www/nginx-devel/files/extra-patch-passenger-disable-telemetry
@@ -1,5 +1,5 @@
---- ../passenger-6.0.12/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig	2018-12-03 12:23:06.980728000 -0500
-+++ ../passenger-6.0.12/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb	2018-12-03 12:23:32.978924000 -0500
+--- ../passenger-6.0.15/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig	2018-12-03 12:23:06.980728000 -0500
++++ ../passenger-6.0.15/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb	2018-12-03 12:23:32.978924000 -0500
 @@ -204,7 +204,7 @@
      :name     => 'passenger_disable_anonymous_telemetry',
      :scope    => :global,
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 7453a851e6d2..ffa2852dab4f 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -1,11 +1,7 @@
 PORTNAME=	passenger
-PORTVERSION=	6.0.12
-PORTREVISION=	2
+PORTVERSION=	6.0.15
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
-PATCH_SITES=	https://github.com/phusion/passenger/commit/
-PATCHFILES=	4c8d0a1316000db93eb4484480b2e14188560e14.patch:-p1 \
-		9640816af708867d0994bd2eddb80ac24399f855.patch:-p1
 
 MAINTAINER=	ports@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 443f0706dec5..c215d3eaf2a5 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1639981721
-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
-SHA256 (rubygem/9640816af708867d0994bd2eddb80ac24399f855.patch) = c614cceb0f7438e9b971fe8909879b68a5efee6afb6742c204366c43df63b320
-SIZE (rubygem/9640816af708867d0994bd2eddb80ac24399f855.patch) = 4080
+TIMESTAMP = 1664899545
+SHA256 (rubygem/passenger-6.0.15.gem) = bd1a9bd05439e18eafd1f901a451245c2d80c14e8aeeaed65c449c75e97abe14
+SIZE (rubygem/passenger-6.0.15.gem) = 8256000
diff --git a/www/rubygem-passenger/files/patch-aligned_alloc.hpp b/www/rubygem-passenger/files/patch-aligned_alloc.hpp
deleted file mode 100644
index 09e8c4723597..000000000000
--- a/www/rubygem-passenger/files/patch-aligned_alloc.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
---- /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 <boost/align/detail/is_alignment.hpp>
-+#include <boost/align/align.hpp>
-+#include <boost/align/alignment_of.hpp>
-+#include <boost/assert.hpp>
-+#include <cstdlib>
-+
-+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<void*>::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<char*>(p) + sizeof(void*);
-+        (void)boost::alignment::align(alignment, size, r, n);
-+        *(static_cast<void**>(r) - 1) = p;
-+        p = r;
-+    }
-+    return p;
-+}
-+
-+inline void
-+aligned_free(void* ptr) BOOST_NOEXCEPT
-+{
-+    if (ptr) {
-+        std::free(*(static_cast<void**>(ptr) - 1));
-+    }
-+}
-+
-+} /* alignment */
-+} /* boost */
-+
-+#endif