Date: Friday, March 19, 2021 @ 21:26:12 Author: felixonmars Revision: 895146
archrelease: copy trunk to community-staging-any Added: puppet5/repos/community-staging-any/ puppet5/repos/community-staging-any/PKGBUILD (from rev 895145, puppet5/trunk/PKGBUILD) puppet5/repos/community-staging-any/puppet.install (from rev 895145, puppet5/trunk/puppet.install) puppet5/repos/community-staging-any/ruby30.patch (from rev 895145, puppet5/trunk/ruby30.patch) ----------------+ PKGBUILD | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ puppet.install | 5 ++++ ruby30.patch | 49 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+) Copied: puppet5/repos/community-staging-any/PKGBUILD (from rev 895145, puppet5/trunk/PKGBUILD) =================================================================== --- community-staging-any/PKGBUILD (rev 0) +++ community-staging-any/PKGBUILD 2021-03-19 21:26:12 UTC (rev 895146) @@ -0,0 +1,65 @@ +# Maintainer: Jonathan Steel <jsteel at archlinux.org> +# Contributor: Greg Sutcliffe <puppet-aur (at) emeraldreverie (dot) org> +# Contributor: Hyacinthe Cartiaux <hyacinthe (dot) cartiaux (at) free (dot) fr> +# Contributor: Thomas S Hatch <thatch45 (at) Gmail (dot) com> +# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com> +# Contributor: Miah Johnson <miah (at) chia-pet dot org> +# Contributor: Dave Simons <miouhpi (at) Gmail (dot) com> +# Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com> + +_pkgname=puppet +pkgname=puppet5 +pkgver=5.5.22 +pkgrel=2 +pkgdesc="Server automation framework and application" +arch=('any') +url="https://puppet.com/products/open-source-projects" +license=('Apache') +depends=('facter' 'hiera' 'ruby-multi_json' 'ruby-augeas' 'ruby-shadow' +'ruby-sync') +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} + ruby30.patch) +sha512sums=('5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58' + 'SKIP' + '09e1732fc8b38f3c5061cc85e620ee1af9e558b44900f1c6e2064dc0b5b8980c6c10f21cfc21dafb6d2eb9fa05942c7655e45df7352ffce379a407c92cb34147') +validpgpkeys=('6F6B15509CF8E59E6E469F327F438280EF8D349F') +conflicts=('puppet') +provides=('puppet') + +prepare() { + cd $_pkgname-$pkgver + + # FS#45044: fix file location + sed -i 's_/opt/puppetlabs/puppet_/usr_' ext/systemd/puppet.service + + patch -p1 < ../ruby30.patch +} + +package() { + cd $_pkgname-$pkgver + + ruby install.rb --destdir="$pkgdir" --sitelibdir="$( ruby -e \ + 'puts RbConfig::CONFIG["vendorlibdir"]' )" + + install -d "$pkgdir"/usr/lib/{sysusers.d,tmpfiles.d} + + echo 'u puppet 52 "Puppet" /var/lib/puppet' > \ + "$pkgdir"/usr/lib/sysusers.d/$_pkgname.conf + echo "d /run/puppetlabs 0755 $_pkgname $_pkgname -" > \ + "$pkgdir"/usr/lib/tmpfiles.d/$_pkgname.conf + + # systemd + install -Dm644 "$srcdir"/$_pkgname-$pkgver/ext/systemd/$_pkgname.service \ + "$pkgdir"/usr/lib/systemd/system/$_pkgname.service + + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$_pkgname/LICENSE + + # Match permissions that puppet sets when running + install -dm775 "$pkgdir"/var/lib/puppet + chmod 750 "$pkgdir"/var/log/puppetlabs/puppet + + rm -r "$pkgdir"/var/run +} Copied: puppet5/repos/community-staging-any/puppet.install (from rev 895145, puppet5/trunk/puppet.install) =================================================================== --- community-staging-any/puppet.install (rev 0) +++ community-staging-any/puppet.install 2021-03-19 21:26:12 UTC (rev 895146) @@ -0,0 +1,5 @@ +pre_remove() { + if [[ -f /run/puppetlabs/agent.pid ]]; then + systemctl stop puppet + fi +} Copied: puppet5/repos/community-staging-any/ruby30.patch (from rev 895145, puppet5/trunk/ruby30.patch) =================================================================== --- community-staging-any/ruby30.patch (rev 0) +++ community-staging-any/ruby30.patch 2021-03-19 21:26:12 UTC (rev 895146) @@ -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 +