passenger 6.0.15 → 6.0.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -88,6 +88,7 @@ module PhusionPassenger
88
88
  '**/.DS_Store',
89
89
  '**/*.gch',
90
90
  '**/.editorconfig',
91
+ '**/.clangd',
91
92
  '.externalToolBuilders/**/*',
92
93
  '.github/**/*',
93
94
  '.settings/**/*',
@@ -687,11 +687,12 @@ module PhusionPassenger
687
687
  # Running 'file' on the Apache executable usually outputs something
688
688
  # like this:
689
689
  #
690
- # /usr/sbin/httpd: Mach-O universal binary with 4 architectures
690
+ # /usr/sbin/httpd: Mach-O universal binary with 5 architectures
691
691
  # /usr/sbin/httpd (for architecture ppc7400): Mach-O executable ppc
692
692
  # /usr/sbin/httpd (for architecture ppc64): Mach-O 64-bit executable ppc64
693
693
  # /usr/sbin/httpd (for architecture i386): Mach-O executable i386
694
694
  # /usr/sbin/httpd (for architecture x86_64): Mach-O 64-bit executable x86_64
695
+ # /usr/sbin/httpd (for architecture arm64e): Mach-O 64-bit executable arm64e
695
696
  #
696
697
  # But on some machines, it may output just:
697
698
  #
@@ -700,7 +701,7 @@ module PhusionPassenger
700
701
  # (http://code.google.com/p/phusion-passenger/issues/detail?id=236)
701
702
  output = `file "#{httpd}"`.strip
702
703
  if output =~ /Mach-O fat file/ && output !~ /for architecture/
703
- architectures = ["i386", "ppc", "x86_64", "ppc64"]
704
+ architectures = ["i386", "ppc", "x86_64", "ppc64", "arm64e"]
704
705
  else
705
706
  architectures = []
706
707
  output.split("\n").grep(/for architecture/).each do |line|
@@ -72,7 +72,7 @@ module PhusionPassenger
72
72
  # some OS X print something like:
73
73
  # "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable"
74
74
  if output =~ /arm64/
75
- ruby_arch = "arm"
75
+ ruby_arch = "arm64"
76
76
  elsif output =~ /Mach-O 64-bit/
77
77
  ruby_arch = "x86_64"
78
78
  else
@@ -161,12 +161,12 @@ module PhusionPassenger
161
161
  major, minor, *rest = os_version.split(".").map(&:to_i)
162
162
  if major >= 11 || (major == 10 && minor >= 16)
163
163
  # Since Big Sur aarch64 is supported, and default on m1 macs.
164
- if `uname -m` =~ /arm64/
165
- ["arm", "x86_64"]
164
+ if `#{uname_command} -m` =~ /arm64/
165
+ ["arm64", "x86_64"]
166
166
  elsif `sysctl -in sysctl.proc_translated` == "1"
167
- ["arm", "x86_64"]
167
+ ["arm64", "x86_64"]
168
168
  else
169
- ["x86_64", "arm"]
169
+ ["x86_64", "arm64"]
170
170
  end
171
171
  elsif minor == 15
172
172
  # Since Catalina x86 is gone.
@@ -31,7 +31,7 @@ module PhusionPassenger
31
31
 
32
32
  PACKAGE_NAME = 'passenger'
33
33
  # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
34
- VERSION_STRING = '6.0.15'
34
+ VERSION_STRING = '6.0.16'
35
35
 
36
36
  # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
37
37
  PREFERRED_NGINX_VERSION = '1.20.2'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: passenger
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.15
4
+ version: 6.0.16
5
5
  platform: ruby
6
6
  authors:
7
7
  - Phusion - http://www.phusion.nl/
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-09-19 00:00:00.000000000 Z
11
+ date: 2022-12-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake