[arch-commits] Commit in puppet/repos/community-any (6 files)
Tim Meusel
bastelfreak at archlinux.org
Sun Jun 27 19:50:21 UTC 2021
Date: Sunday, June 27, 2021 @ 19:50:21
Author: bastelfreak
Revision: 967610
archrelease: copy trunk to community-any
Added:
puppet/repos/community-any/PKGBUILD
(from rev 967609, puppet/trunk/PKGBUILD)
puppet/repos/community-any/puppet.install
(from rev 967609, puppet/trunk/puppet.install)
puppet/repos/community-any/ruby30.patch
(from rev 967609, puppet/trunk/ruby30.patch)
Deleted:
puppet/repos/community-any/PKGBUILD
puppet/repos/community-any/puppet.install
puppet/repos/community-any/ruby30.patch
----------------+
PKGBUILD | 233 +++++++++++++++++++++++++++----------------------------
puppet.install | 10 +-
ruby30.patch | 98 +++++++++++------------
3 files changed, 170 insertions(+), 171 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-27 19:50:11 UTC (rev 967609)
+++ PKGBUILD 2021-06-27 19:50:21 UTC (rev 967610)
@@ -1,117 +0,0 @@
-# Maintainer: Tim Meusel <tim at bastelfreak.de>
-# Contributor: Christian Rebischke <chris.rebischke at archlinux.org>
-# Contributor: 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>
-# Contributor: Tim Meusel <tim (at) bastelfreak (dot) de>
-
-pkgname=puppet
-pkgver=6.22.1
-pkgrel=1
-pkgdesc='Server automation framework and application'
-arch=('any')
-url='https://puppet.com/products/open-source-projects'
-license=('Apache')
-depends=('ruby2.7' 'facter' 'hiera' 'ruby27-semantic_puppet' 'ruby27-augeas'
-'ruby27-shadow' 'ruby27-concurrent' 'ruby27-multi_json' 'ruby27-puppet-resource_api'
-'ruby27-httpclient' 'ruby27-deep_merge' 'ruby27-sync')
-makedepends=('git' 'ruby27-rake')
-#checkdepends=('ruby-rspec' 'ruby-yard')
-backup=('etc/puppetlabs/puppet/auth.conf'
- 'etc/puppetlabs/puppet/puppet.conf'
- 'etc/puppetlabs/puppet/hiera.yaml')
-install="$pkgname.install"
-
-_augeas_commit=8e2d9aa99f43941a37cdd08e191efb6d5bba154a
-_cron_commit=b4e1054fdc2f819b6f45821afe954e7b24620958
-_host_commit=34dca65fe54ba08bd764691e2619371c213df70b
-_mount_commit=1e56e2588058551360269472823bf3426c5e1900
-_selinux_commit=d07dfb309c575a0528396f16673780ec9d4a39d4
-_sshkeys_commit=313a6cfa7580141a8e9a1c07c187b9ad7643435e
-_yumrepo_commit=4bf78c89309e2539342aaed5b9c92ea6a0a96281
-_zfs_commit=04da7f3099541216600167587d4b1dd82144b038
-_zone_commit=7880999cdcf15b9a3594b78a06e47399c78baba1
-
-source=("https://github.com/puppetlabs/puppet/archive/${pkgver}/puppet-${pkgver}.tar.gz"
- "augeas_core::git+https://github.com/puppetlabs/puppetlabs-augeas_core#commit=${_augeas_commit}"
- "cron_core::git+https://github.com/puppetlabs/puppetlabs-cron_core#commit=${_cron_commit}"
- "host_core::git+https://github.com/puppetlabs/puppetlabs-host_core#commit=${_host_commit}"
- "mount_core::git+https://github.com/puppetlabs/puppetlabs-mount_core#commit=${_mount_commit}"
- "selinux_core::git+https://github.com/puppetlabs/puppetlabs-selinux_core#commit=${_selinux_commit}"
- "sshkeys_core::git+https://github.com/puppetlabs/puppetlabs-sshkeys_core#commit=${_sshkeys_commit}"
- "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}"
- )
-sha512sums=('b69622141546d14a600d69fb04ed91ddc9aeee4f8ff25c979b5f640aed16c271d25ce8abb7e6408fa55f7d8a09321ef68355e12088c629c7b3f8a721cdaa8b37'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP')
-conflicts=('puppet5')
-provides=('puppet')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
-
- # FS#45044: fix file location
- sed -i 's_/opt/puppetlabs/puppet_/usr_' ext/systemd/puppet.service
-}
-
-check() {
- cd "${pkgname}-${pkgver}"
- # This breaks right now due to missing dependencies
- #rake --tasks # show all tasks
- #rake commits # requires a git repo
- #rake warnings # requires a git repo
- #rake spec # run tests single threaded
- #rake parallel:spec[8]
-}
-
-package() {
- cd $pkgname-$pkgver
-
- local _gemdir="$(gem-2.7 env gemdir)"
-
- # install the gemspec file
- # this allows other gems to load puppet as a library (for example puppet-strings)
- install -Dm644 .gemspec "${pkgdir}/${_gemdir}/specifications/puppet-${pkgver}.gemspec"
-
- # generate manpages | this breaks right now..
- #rake gen_manpages
-
- ruby-2.7 install.rb --destdir="$pkgdir" --sitelibdir="$( ruby-2.7 -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
-
- cd ..
- install --directory "${pkgdir}/opt/puppetlabs/puppet/vendor_modules/"
- mv *_core "${pkgdir}/opt/puppetlabs/puppet/vendor_modules/"
- # Search for unwanted directories and files and delete them
- find "${pkgdir}/opt/puppetlabs/puppet/vendor_modules/" -type d -name .git -or -name spec -exec rm -rf {} +
- find "${pkgdir}/opt/puppetlabs/puppet/vendor_modules/" -name '.*' -exec rm -rf {} +
-}
Copied: puppet/repos/community-any/PKGBUILD (from rev 967609, puppet/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-06-27 19:50:21 UTC (rev 967610)
@@ -0,0 +1,116 @@
+# Maintainer: Tim Meusel <tim at bastelfreak.de>
+# Contributor: Christian Rebischke <chris.rebischke at archlinux.org>
+# Contributor: 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
+pkgver=6.23.0
+pkgrel=1
+pkgdesc='Server automation framework and application'
+arch=('any')
+url='https://puppet.com/products/open-source-projects'
+license=('Apache')
+depends=('ruby2.7' 'facter' 'hiera' 'ruby27-semantic_puppet' 'ruby27-augeas'
+'ruby27-shadow' 'ruby27-concurrent' 'ruby27-multi_json' 'ruby27-puppet-resource_api'
+'ruby27-httpclient' 'ruby27-deep_merge' 'ruby27-sync')
+makedepends=('git' 'ruby27-rake')
+#checkdepends=('ruby-rspec' 'ruby-yard')
+backup=('etc/puppetlabs/puppet/auth.conf'
+ 'etc/puppetlabs/puppet/puppet.conf'
+ 'etc/puppetlabs/puppet/hiera.yaml')
+install="$pkgname.install"
+
+_augeas_commit=8e2d9aa99f43941a37cdd08e191efb6d5bba154a
+_cron_commit=b4e1054fdc2f819b6f45821afe954e7b24620958
+_host_commit=34dca65fe54ba08bd764691e2619371c213df70b
+_mount_commit=1e56e2588058551360269472823bf3426c5e1900
+_selinux_commit=d07dfb309c575a0528396f16673780ec9d4a39d4
+_sshkeys_commit=313a6cfa7580141a8e9a1c07c187b9ad7643435e
+_yumrepo_commit=4bf78c89309e2539342aaed5b9c92ea6a0a96281
+_zfs_commit=04da7f3099541216600167587d4b1dd82144b038
+_zone_commit=7880999cdcf15b9a3594b78a06e47399c78baba1
+
+source=("https://github.com/puppetlabs/puppet/archive/${pkgver}/puppet-${pkgver}.tar.gz"
+ "augeas_core::git+https://github.com/puppetlabs/puppetlabs-augeas_core#commit=${_augeas_commit}"
+ "cron_core::git+https://github.com/puppetlabs/puppetlabs-cron_core#commit=${_cron_commit}"
+ "host_core::git+https://github.com/puppetlabs/puppetlabs-host_core#commit=${_host_commit}"
+ "mount_core::git+https://github.com/puppetlabs/puppetlabs-mount_core#commit=${_mount_commit}"
+ "selinux_core::git+https://github.com/puppetlabs/puppetlabs-selinux_core#commit=${_selinux_commit}"
+ "sshkeys_core::git+https://github.com/puppetlabs/puppetlabs-sshkeys_core#commit=${_sshkeys_commit}"
+ "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}"
+ )
+sha512sums=('229dbf63df563aa2aefd31524e9cf02c5107cae68abd0b0dafdf2272aa847cfd22391bc8927008f868e7fb4805608ef2a17a512f86b9f143a66c7ce459e27a2a'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
+conflicts=('puppet5')
+provides=('puppet')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+
+ # FS#45044: fix file location
+ sed -i 's_/opt/puppetlabs/puppet_/usr_' ext/systemd/puppet.service
+}
+
+check() {
+ cd "${pkgname}-${pkgver}"
+ # This breaks right now due to missing dependencies
+ #rake --tasks # show all tasks
+ #rake commits # requires a git repo
+ #rake warnings # requires a git repo
+ #rake spec # run tests single threaded
+ #rake parallel:spec[8]
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ local _gemdir="$(gem-2.7 env gemdir)"
+
+ # install the gemspec file
+ # this allows other gems to load puppet as a library (for example puppet-strings)
+ install -Dm644 .gemspec "${pkgdir}/${_gemdir}/specifications/puppet-${pkgver}.gemspec"
+
+ # generate manpages | this breaks right now..
+ #rake gen_manpages
+
+ ruby-2.7 install.rb --destdir="$pkgdir" --sitelibdir="$( ruby-2.7 -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
+
+ cd ..
+ install --directory "${pkgdir}/opt/puppetlabs/puppet/vendor_modules/"
+ mv *_core "${pkgdir}/opt/puppetlabs/puppet/vendor_modules/"
+ # Search for unwanted directories and files and delete them
+ find "${pkgdir}/opt/puppetlabs/puppet/vendor_modules/" -type d -name .git -or -name spec -exec rm -rf {} +
+ find "${pkgdir}/opt/puppetlabs/puppet/vendor_modules/" -name '.*' -exec rm -rf {} +
+}
Deleted: puppet.install
===================================================================
--- puppet.install 2021-06-27 19:50:11 UTC (rev 967609)
+++ puppet.install 2021-06-27 19:50:21 UTC (rev 967610)
@@ -1,5 +0,0 @@
-pre_remove() {
- if [[ -f /run/puppetlabs/agent.pid ]]; then
- systemctl stop puppet
- fi
-}
Copied: puppet/repos/community-any/puppet.install (from rev 967609, puppet/trunk/puppet.install)
===================================================================
--- puppet.install (rev 0)
+++ puppet.install 2021-06-27 19:50:21 UTC (rev 967610)
@@ -0,0 +1,5 @@
+pre_remove() {
+ if [[ -f /run/puppetlabs/agent.pid ]]; then
+ systemctl stop puppet
+ fi
+}
Deleted: ruby30.patch
===================================================================
--- ruby30.patch 2021-06-27 19:50:11 UTC (rev 967609)
+++ ruby30.patch 2021-06-27 19:50:21 UTC (rev 967610)
@@ -1,49 +0,0 @@
-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
-
Copied: puppet/repos/community-any/ruby30.patch (from rev 967609, puppet/trunk/ruby30.patch)
===================================================================
--- ruby30.patch (rev 0)
+++ ruby30.patch 2021-06-27 19:50:21 UTC (rev 967610)
@@ -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
+
More information about the arch-commits
mailing list