summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorL. Bradley LaBoon2019-10-21 18:54:27 -0400
committerL. Bradley LaBoon2019-10-21 18:54:27 -0400
commitfb240eafdb62e16bf4b8cefb4f3d63dff70af75c (patch)
tree7f5e81b095ac8708a3eaf465cd2b9c188158f5c0
parent9f4cea3150248068fa8b013a56be8c1cccce18b4 (diff)
downloadaur-fb240eafdb62e16bf4b8cefb4f3d63dff70af75c.tar.gz
Updated to 6.7.1
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD9
2 files changed, 10 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 54880ccb3968..0c29ae7fe974 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = puppetserver
pkgdesc = Server automation framework and application
- pkgver = 6.6.0
+ pkgver = 6.7.1
pkgrel = 1
url = https://docs.puppetlabs.com/puppetserver/latest/services_master_puppetserver.html
install = puppetserver.install
@@ -8,7 +8,7 @@ pkgbase = puppetserver
license = APACHE
depends = ruby
depends = puppet>=6
- depends = java-runtime-headless=8
+ depends = java-runtime-headless
depends = logrotate
depends = jruby
depends = facter
@@ -24,10 +24,10 @@ pkgbase = puppetserver
backup = etc/puppetlabs/puppetserver/logback.xml
backup = etc/puppetlabs/puppetserver/request-logging.xml
backup = etc/puppetlabs/puppetserver/services.d/ca.cfg
- source = puppetserver-6.6.0.tar.gz::https://downloads.puppetlabs.com/puppet/puppetserver-6.6.0.tar.gz
- source = puppetserver-6.6.0.tar.gz.asc::https://downloads.puppetlabs.com/puppet/puppetserver-6.6.0.tar.gz.asc
+ source = puppetserver-6.7.1.tar.gz::https://downloads.puppetlabs.com/puppet/puppetserver-6.7.1.tar.gz
+ source = puppetserver-6.7.1.tar.gz.asc::https://downloads.puppetlabs.com/puppet/puppetserver-6.7.1.tar.gz.asc
validpgpkeys = 6F6B15509CF8E59E6E469F327F438280EF8D349F
- sha512sums = 2b43092752e246027a437398d6d23a4085caa2956a1453cec2e62f1001fca1c98bddca0a9d90c178ce9c89a06c26edcaee49416c1b8a4941e2bc4b6b5bb1fe0e
+ sha512sums = 80af1266d122f131f8d5385acbcf712d3042e7665eb739491d1d3d06adec8c0d78009aaec86161ed4fdb180bf529a48b2964c784ec728d40319f63c6d2f8f0df
sha512sums = SKIP
pkgname = puppetserver
diff --git a/PKGBUILD b/PKGBUILD
index 9d88562356a9..7d00d04b3025 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@
# Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
pkgname=puppetserver
-pkgver=6.6.0
+pkgver=6.7.1
pkgrel=1
pkgdesc="Server automation framework and application"
arch=('any')
url="https://docs.puppetlabs.com/puppetserver/latest/services_master_puppetserver.html"
license=("APACHE")
-depends=("ruby" "puppet>=6" "java-runtime-headless=8" "logrotate" "jruby"
+depends=("ruby" "puppet>=6" "java-runtime-headless" "logrotate" "jruby"
"facter" "net-tools")
backup=('etc/default/puppetserver'
'etc/logrotate.d/puppetserver'
@@ -26,14 +26,14 @@ backup=('etc/default/puppetserver'
install="${pkgname}.install"
source=("${pkgname}-${pkgver}.tar.gz::https://downloads.puppetlabs.com/puppet/${pkgname}-${pkgver}.tar.gz"
"${pkgname}-${pkgver}.tar.gz.asc::https://downloads.puppetlabs.com/puppet/${pkgname}-${pkgver}.tar.gz.asc")
-sha512sums=('2b43092752e246027a437398d6d23a4085caa2956a1453cec2e62f1001fca1c98bddca0a9d90c178ce9c89a06c26edcaee49416c1b8a4941e2bc4b6b5bb1fe0e'
+sha512sums=('80af1266d122f131f8d5385acbcf712d3042e7665eb739491d1d3d06adec8c0d78009aaec86161ed4fdb180bf529a48b2964c784ec728d40319f63c6d2f8f0df'
'SKIP')
validpgpkeys=('6F6B15509CF8E59E6E469F327F438280EF8D349F')
prepare() {
cd "${pkgname}-${pkgver}"
- echo 'hiera-eyaml 2.1.0' >> ext/build-scripts/jruby-gem-list.txt
+ echo 'hiera-eyaml 3.0.0' >> ext/build-scripts/jruby-gem-list.txt
sed -i 's:sysconfig:default:' ext/redhat/puppetserver.service
sed -i "s:\[/opt/puppetlabs/puppet/lib/ruby/vendor_ruby\]:\[$( ruby -e \
'puts RbConfig::CONFIG["vendorlibdir"]' ),$( ruby -e \
@@ -42,6 +42,7 @@ prepare() {
'puts Gem.default_dir' ):" \
ext/build-scripts/install-vendored-gems.sh
sed -i 's:#!/opt/.*/ruby:#!/usr/bin/ruby:' ext/cli/ca
+ sed -i 's/\/opt\/puppetlabs\/puppet\/lib\/ruby\/vendor_ruby/\/usr\/lib\/ruby\/vendor_ruby/g' ext/cli_defaults/cli-defaults.sh
}
package() {