[arch-commits] Commit in puppet/trunk (PKGBUILD ruby30.patch)

[Anatol Pomozov]

    Date: Friday, March 19, 2021 @ 22:10:10
  Author: anatolik
Revision: 895279

Add ruby3.0 patch for keyword arguments

Added:
  puppet/trunk/ruby30.patch
Modified:
  puppet/trunk/PKGBUILD

--------------+
 PKGBUILD     |    6 +++++-
 ruby30.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-19 22:10:00 UTC (rev 895278)
+++ PKGBUILD	2021-03-19 22:10:10 UTC (rev 895279)
@@ -46,6 +46,7 @@
         "yumrepo_core::git+https://github.com/puppetlabs/puppetlabs-yumrepo_core#commit=${_yumrepo_commit}"
         "zfs_core::git+https://github.com/puppetlabs/puppetlabs-zfs_core#commit=${_zfs_commit}"
         "zone_core::git+https://github.com/puppetlabs/puppetlabs-zone_core#commit=${_zone_commit}"
+	"ruby30.patch"
         )
 sha512sums=('f62cfbd78412a9b4379c9f2e2a1cd3126faf5caddc444396d20f2e3f97b35d04960dfa258b9f66aee404e17d0e7ed2ff72bf1d0d1031a84a90d0dcc9ca07575e'
             'SKIP'
@@ -56,7 +57,8 @@
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            '09e1732fc8b38f3c5061cc85e620ee1af9e558b44900f1c6e2064dc0b5b8980c6c10f21cfc21dafb6d2eb9fa05942c7655e45df7352ffce379a407c92cb34147')
 conflicts=('puppet5')
 provides=('puppet')
 
@@ -65,6 +67,8 @@
 
   # FS#45044: fix file location
   sed -i 's_/opt/puppetlabs/puppet_/usr_' ext/systemd/puppet.service
+
+  patch -p1 < ../ruby30.patch
 }
 
 check() {

Added: ruby30.patch
===================================================================
--- ruby30.patch	                        (rev 0)
+++ ruby30.patch	2021-03-19 22:10:10 UTC (rev 895279)
@@ -0,0 +1,49 @@
+diff --git a/install.rb b/install.rb
+index 8ac9600cfd..ac13a94d10 100755
+--- a/install.rb
++++ b/install.rb
+@@ -60,7 +60,7 @@ def do_configs(configs, target, strip = 'conf/')
+   Dir.mkdir(target) unless File.directory? target
+   configs.each do |cf|
+     ocf = File.join(InstallOptions.config_dir, cf.gsub(/#{strip}/, ''))
+-    FileUtils.install(cf, ocf, {:mode => 0644, :preserve => true, :verbose => true})
++    FileUtils.install(cf, ocf, :mode => 0644, :preserve => true, :verbose => true)
+   end
+ end
+ 
+@@ -77,9 +77,9 @@ def do_libs(libs, strip = 'lib/')
+     next if File.directory? lf
+     olf = File.join(InstallOptions.site_dir, lf.sub(/^#{strip}/, ''))
+     op = File.dirname(olf)
+-    FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
++    FileUtils.makedirs(op, :mode => 0755, :verbose => true)
+     FileUtils.chmod(0755, op)
+-    FileUtils.install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true})
++    FileUtils.install(lf, olf, :mode => 0644, :preserve => true, :verbose => true)
+   end
+ end
+ 
+@@ -87,9 +87,9 @@ def do_man(man, strip = 'man/')
+   man.each do |mf|
+     omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
+     om = File.dirname(omf)
+-    FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
++    FileUtils.makedirs(om, :mode => 0755, :verbose => true)
+     FileUtils.chmod(0755, om)
+-    FileUtils.install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true})
++    FileUtils.install(mf, omf, :mode => 0644, :preserve => true, :verbose => true)
+     # Solaris does not support gzipped man pages. When called with
+     # --no-check-prereqs/without facter the default gzip behavior still applies
+     unless $operatingsystem == "Solaris"
+@@ -105,9 +105,9 @@ def do_locales(locale, strip = 'locales/')
+     next if File.directory? lf
+     olf = File.join(InstallOptions.locale_dir, lf.sub(/^#{strip}/, ''))
+     op = File.dirname(olf)
+-    FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
++    FileUtils.makedirs(op, :mode => 0755, :verbose => true)
+     FileUtils.chmod(0755, op)
+-    FileUtils.install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true})
++    FileUtils.install(lf, olf, :mode => 0644, :preserve => true, :verbose => true)
+   end
+ end
+