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

[Jonathan Steel]

    Date: Sunday, April 19, 2015 @ 21:52:17
  Author: jsteel
Revision: 131729

upgpkg: puppet 4.0.0-1

Modified:
  puppet/trunk/PKGBUILD
  puppet/trunk/puppet.install

----------------+
 PKGBUILD       |   29 +++++++++--------------------
 puppet.install |   11 +++++++++--
 2 files changed, 18 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-19 19:15:11 UTC (rev 131728)
+++ PKGBUILD	2015-04-19 19:52:17 UTC (rev 131729)
@@ -9,7 +9,7 @@
 # Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
 
 pkgname=puppet
-pkgver=3.7.5
+pkgver=4.0.0
 pkgrel=1
 pkgdesc="Server automation framework and application"
 arch=('any')
@@ -18,39 +18,28 @@
 depends=('facter' 'hiera')
 optdepends=('ruby-shadow: user password management'
             'logrotate')
-backup=('etc/puppet/auth.conf' 'etc/puppet/fileserver.conf'
-        'etc/puppet/puppet.conf' 'etc/puppet/tagmail.conf')
+backup=('etc/puppetlabs/puppet/auth.conf'
+        'etc/puppetlabs/puppet/fileserver.conf'
+        'etc/puppetlabs/puppet/puppet.conf'
+        'etc/logrotate.d/puppet')
 install=$pkgname.install
 source=($pkgname-$pkgver.tar.gz::http://github.com/puppetlabs/$pkgname/archive/$pkgver.tar.gz)
-md5sums=('c32ef680c48b9b884eb067ccff5e6ee9')
+md5sums=('fe40c3d9a9845155df083c411f39d943')
 
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Ruby 2.2 fixes
-  sed -i 's/: "syck"$/: (defined?(Psych) \&\& YAML == Psych ? "psych" : "syck")/' \
-    lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
-  sed -i 485,488d lib/puppet/defaults.rb
-}
-
 package() {
   cd $pkgname-$pkgver
 
   ruby install.rb --destdir="$pkgdir" --sitelibdir="$( ruby -e \
-    'puts RbConfig::CONFIG["vendorlibdir"]' )"
+    'puts RbConfig::CONFIG["vendorlibdir"]' )" --rundir=/run
 
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/redhat/$pkgname.conf \
-    "$pkgdir"/etc/$pkgname/$pkgname.conf
   install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/redhat/logrotate \
     "$pkgdir"/etc/logrotate.d/$pkgname
   install -Dm644 "$srcdir"/$pkgname-$pkgver/conf/fileserver.conf \
-    "$pkgdir"/etc/$pkgname/fileserver.conf
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/conf/tagmail.conf \
-    "$pkgdir"/etc/$pkgname/tagmail.conf
+    "$pkgdir"/etc/puppetlabs/$pkgname/fileserver.conf
 
   install -d "$pkgdir"/{var/lib/$pkgname,usr/lib/tmpfiles.d}
 
-  echo "d /var/run/$pkgname 0755 $pkgname $pkgname -" > \
+  echo "d /run/puppetlabs 0755 $pkgname $pkgname -" > \
     "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
 
   # systemd

Modified: puppet.install
===================================================================
--- puppet.install	2015-04-19 19:15:11 UTC (rev 131728)
+++ puppet.install	2015-04-19 19:52:17 UTC (rev 131729)
@@ -6,14 +6,21 @@
 
 pre_upgrade() {
   pre_install
+
+  if  [ "$(vercmp 4 "$2")" -eq 1 ]; then
+    echo '==> Version 4 beaks compatibility with version 3; you will need
+==> to follow upgrade instructions for your servers and clients:
+==> https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html
+==> https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html'
+  fi
 }
 
 pre_remove() {
-  if [[ -f /var/run/puppet/master.pid ]]; then
+  if [[ -f /run/puppetlabs/master.pid ]]; then
     systemctl stop puppetmaster
   fi
 
-  if [[ -f /var/run/puppet/agent.pid ]]; then
+  if [[ -f /run/puppetlabs/agent.pid ]]; then
     systemctl stop puppet
   fi
 }