[arch-commits] Commit in mcollective/trunk (PKGBUILD ruby30.patch)
Anatol Pomozov
anatolik at archlinux.org
Fri Mar 19 23:39:04 UTC 2021
Date: Friday, March 19, 2021 @ 23:39:03
Author: anatolik
Revision: 895423
Add ruby3.0 patch for keyword arguments and removed constants
Added:
mcollective/trunk/ruby30.patch
Modified:
mcollective/trunk/PKGBUILD
--------------+
PKGBUILD | 9 ++++++++-
ruby30.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-19 23:38:51 UTC (rev 895422)
+++ PKGBUILD 2021-03-19 23:39:03 UTC (rev 895423)
@@ -17,14 +17,21 @@
source=(
"https://downloads.puppetlabs.com/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc}
'mcollective.service'
+ 'ruby30.patch'
)
sha512sums=('f24c971a816f89196085574416a209ccf5584e61975a6a301aa6c697debf675a3ef49acf5ad3c772b8225d50fd149848afa79e7a5666b471299beb11e213cd57'
'SKIP'
- '132cdf7d4262ed3969ab09d2951bf79a3182e2a795a2778bd6f4d5d66b53b17f170a7b106e4499f73acdd4a0b29b48eb34fb7a1cd5cba36b70570a9775fda9b1')
+ '132cdf7d4262ed3969ab09d2951bf79a3182e2a795a2778bd6f4d5d66b53b17f170a7b106e4499f73acdd4a0b29b48eb34fb7a1cd5cba36b70570a9775fda9b1'
+ 'cd1e76378e3f6c3d759d2d9cb52825484c7f0efc11a577cf317a937dcd1597b1d7f7c5ae2049a2be5fb6f922b731a94851c7c7d10415e63f8b9928383536a614')
validpgpkeys=(
'6F6B15509CF8E59E6E469F327F438280EF8D349F' # Puppet, Inc. Release Key
)
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 < ../ruby30.patch
+}
+
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
Added: ruby30.patch
===================================================================
--- ruby30.patch (rev 0)
+++ ruby30.patch 2021-03-19 23:39:03 UTC (rev 895423)
@@ -0,0 +1,52 @@
+commit b03686459ad1eca67c8ddb64e90284e0623ae3b1
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date: Fri Mar 19 16:35:03 2021 -0700
+
+ Port to ruby 3.0
+
+ Ruby 3.0 removed long deprecated constants
+ https://bigbinary.com/blog/ruby-2-4-has-depecated-constants-true-false-and-nil
+
+ Use keyword arguments
+
+diff --git a/install.rb b/install.rb
+index 902d5e8..98f5704 100755
+--- a/install.rb
++++ b/install.rb
+@@ -46,9 +46,9 @@ rescue LoadError
+ end
+
+ if (defined?(RbConfig) ? RbConfig : Config)::CONFIG['host_os'] =~ /mswin|win32|dos|mingw|cygwin/i
+- WINDOWS = TRUE
++ WINDOWS = true
+ else
+- WINDOWS = FALSE
++ WINDOWS = false
+ end
+
+ PREREQS = %w{}
+@@ -79,8 +79,8 @@ def do_configs(configs, target, strip = 'etc/')
+ configs.each do |cf|
+ ocf = File.join(target, cf.gsub(Regexp.new(strip), ''))
+ oc = File.dirname(ocf)
+- makedirs(oc, {:mode => 0755, :verbose => true})
+- install(cf, ocf, {:mode => 0644, :preserve => true, :verbose => true})
++ makedirs(oc, :mode => 0755, :verbose => true)
++ install(cf, ocf, :mode => 0644, :preserve => true, :verbose => true)
+ end
+ end
+
+@@ -97,10 +97,10 @@ def do_libs(libs, target, strip = 'lib/')
+ olf = File.join(target, lf.sub(/^#{strip}/, ''))
+ op = File.dirname(olf)
+ if File.directory?(lf)
+- makedirs(olf, {:mode => 0755, :verbose => true})
++ makedirs(olf, :mode => 0755, :verbose => true)
+ else
+- makedirs(op, {:mode => 0755, :verbose => true})
+- install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true})
++ makedirs(op, :mode => 0755, :verbose => true)
++ install(lf, olf, :mode => 0644, :preserve => true, :verbose => true)
+ end
+ end
+ end
More information about the arch-commits
mailing list