Date: Friday, March 19, 2021 @ 21:24:49 Author: anatolik Revision: 895144
Add ruby3.0 fix for keyword parameters Added: puppet5/trunk/ruby30.patch Modified: puppet5/trunk/PKGBUILD --------------+ PKGBUILD | 8 ++++++-- ruby30.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-03-19 21:21:39 UTC (rev 895143) +++ PKGBUILD 2021-03-19 21:24:49 UTC (rev 895144) @@ -20,9 +20,11 @@ backup=('etc/puppetlabs/puppet/auth.conf' 'etc/puppetlabs/puppet/puppet.conf') install=$_pkgname.install -source=("https://downloads.puppetlabs.com/$_pkgname/$_pkgname-$pkgver.tar.gz"{,.asc}) +source=("https://downloads.puppetlabs.com/$_pkgname/$_pkgname-$pkgver.tar.gz"{,.asc} + ruby30.patch) sha512sums=('5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58' - 'SKIP') + 'SKIP' + '09e1732fc8b38f3c5061cc85e620ee1af9e558b44900f1c6e2064dc0b5b8980c6c10f21cfc21dafb6d2eb9fa05942c7655e45df7352ffce379a407c92cb34147') validpgpkeys=('6F6B15509CF8E59E6E469F327F438280EF8D349F') conflicts=('puppet') provides=('puppet') @@ -32,6 +34,8 @@ # FS#45044: fix file location sed -i 's_/opt/puppetlabs/puppet_/usr_' ext/systemd/puppet.service + + patch -p1 < ../ruby30.patch } package() { Added: ruby30.patch =================================================================== --- ruby30.patch (rev 0) +++ ruby30.patch 2021-03-19 21:24:49 UTC (rev 895144) @@ -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 +