CVS commit: pkgsrc/www/passenger

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Thu Jan 19 15:46:29 UTC 2023

Modified Files:
        pkgsrc/www/passenger: Makefile Makefile.common distinfo
Added Files:
        pkgsrc/www/passenger/patches:
            patch-src_ruby__supportlib_phusion__passenger_platform__info_operating__system.rb

Log Message:
www/passenger: Ruby 3.2 compatibility

Add Ruby 3.2 compatibility fix.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/passenger/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/passenger/Makefile.common
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/passenger/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/passenger/patches/patch-src_ruby__supportlib_phusion__passenger_platform__info_operating__system.rb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/passenger/Makefile
diff -u pkgsrc/www/passenger/Makefile:1.18 pkgsrc/www/passenger/Makefile:1.19
--- pkgsrc/www/passenger/Makefile:1.18  Wed Oct 26 10:32:05 2022
+++ pkgsrc/www/passenger/Makefile       Thu Jan 19 15:46:29 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2022/10/26 10:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2023/01/19 15:46:29 taca Exp $
 
 COMMENT=               Web and application server for Ruby, Python and Node.js
-PKGREVISION=           12
+PKGREVISION=           13
 
 .include "Makefile.common"
 

Index: pkgsrc/www/passenger/Makefile.common
diff -u pkgsrc/www/passenger/Makefile.common:1.12 pkgsrc/www/passenger/Makefile.common:1.13
--- pkgsrc/www/passenger/Makefile.common:1.12   Mon Sep 12 20:42:15 2022
+++ pkgsrc/www/passenger/Makefile.common        Thu Jan 19 15:46:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2022/09/12 20:42:15 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.13 2023/01/19 15:46:29 taca Exp $
 # used by www/ap2-passenger/Makefile
 # used by www/passenger/Makefile
 
@@ -47,8 +47,10 @@ MAKE_ENV+=           LIBEV_EXTRA_ARGS=ac_cv_heade
 .endif
 
 pre-install:
-       ${RM} -f ${WRKSRC}/src/ruby_supportlib/phusion_passenger/packaging.rb.orig \
-                ${WRKSRC}/src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb.orig
+       cd ${WRKSRC}/src/ruby_supportlib/phusion_passenger && \
+       ${RM} -f packaging.rb.orig \
+                platform_info/cxx_portability.rb.orig \
+                platform_info/operating_system.rb.orig
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../lang/ruby/modules.mk"

Index: pkgsrc/www/passenger/distinfo
diff -u pkgsrc/www/passenger/distinfo:1.14 pkgsrc/www/passenger/distinfo:1.15
--- pkgsrc/www/passenger/distinfo:1.14  Tue Oct 26 11:30:22 2021
+++ pkgsrc/www/passenger/distinfo       Thu Jan 19 15:46:29 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 11:30:22 nia Exp $
+$NetBSD: distinfo,v 1.15 2023/01/19 15:46:29 taca Exp $
 
 BLAKE2s (passenger-5.3.7.tar.gz) = 4b0f78b7de007b84c781b0b23cfe33975996e1f110a1c1c48f78fef0a97a8ea6
 SHA512 (passenger-5.3.7.tar.gz) = bbef4881e0e0c698b29b10ff8a7afbc001c31d14fb80ffa27ed6867a92ad23712319733e6162be1f7720ebda421630af2f258f8167fa73c7b5ea594bc8247158
@@ -15,3 +15,4 @@ SHA1 (patch-src_cxx__supportlib_vendor-m
 SHA1 (patch-src_ruby__supportlib_phusion__passenger.rb) = b5bf22b8ef94f9c64e0f02ed97e4c104eddf7cb6
 SHA1 (patch-src_ruby__supportlib_phusion__passenger_packaging.rb) = 74134ef6c360bc65ffb4f74e7ebcc36bf7b6e9f7
 SHA1 (patch-src_ruby__supportlib_phusion__passenger_platform__info_cxx__portability.rb) = a3ad34fe1b5917c1971b49c8831d8aea9dbb090a
+SHA1 (patch-src_ruby__supportlib_phusion__passenger_platform__info_operating__system.rb) = 8a251dc99d4b551067e886b541b4c4fb8d4ab7cc

Added files:

Index: pkgsrc/www/passenger/patches/patch-src_ruby__supportlib_phusion__passenger_platform__info_operating__system.rb
diff -u /dev/null pkgsrc/www/passenger/patches/patch-src_ruby__supportlib_phusion__passenger_platform__info_operating__system.rb:1.1
--- /dev/null   Thu Jan 19 15:46:29 2023
+++ pkgsrc/www/passenger/patches/patch-src_ruby__supportlib_phusion__passenger_platform__info_operating__system.rb      Thu Jan 19 15:46:29 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_ruby__supportlib_phusion__passenger_platform__info_operating__system.rb,v 1.1 2023/01/19 15:46:29 taca Exp $
+
+Ruby 3.2 compatibility.
+
+--- src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb.orig       2013-10-27 00:00:00.000000000 +0000
++++ src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb
+@@ -236,7 +236,7 @@ module PhusionPassenger
+     memoize :supports_lfence_instruction?, true
+ 
+     def self.requires_no_tls_direct_seg_refs?
+-      return File.exists?("/proc/xen/capabilities") && cpu_architectures[0] == "x86"
++      return File.exist?("/proc/xen/capabilities") && cpu_architectures[0] == "x86"
+     end
+     memoize :requires_no_tls_direct_seg_refs?, true
+   end