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

[Jonathan Steel]

    Date: Thursday, July 23, 2015 @ 22:32:32
  Author: jsteel
Revision: 137337

upgpkg: puppet 4.2.1-1

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

----------------+
 PKGBUILD       |   10 +++++-----
 puppet.install |   12 +++++-------
 2 files changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-23 18:20:26 UTC (rev 137336)
+++ PKGBUILD	2015-07-23 20:32:32 UTC (rev 137337)
@@ -9,7 +9,7 @@
 # Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
 
 pkgname=puppet
-pkgver=4.2.0
+pkgver=4.2.1
 pkgrel=1
 pkgdesc="Server automation framework and application"
 arch=('any')
@@ -21,9 +21,9 @@
         'etc/puppetlabs/puppet/fileserver.conf'
         'etc/puppetlabs/puppet/puppet.conf')
 install=$pkgname.install
-source=($pkgname-$pkgver.tar.gz::http://github.com/puppetlabs/$pkgname/archive/$pkgver.tar.gz
+source=(https://downloads.puppetlabs.com/$pkgname/$pkgname-$pkgver.tar.gz
         puppetmaster.service)
-md5sums=('71b7d749da9abd36ea7af29d481fe081'
+md5sums=('ec058dd9ac38dce720a9248fea23a98b'
          '23ef9536a87288402b57b2b500b9385a')
 
 prepare() {
@@ -37,7 +37,7 @@
   cd $pkgname-$pkgver
 
   ruby install.rb --destdir="$pkgdir" --sitelibdir="$( ruby -e \
-    'puts RbConfig::CONFIG["vendorlibdir"]' )" --rundir=/run
+    'puts RbConfig::CONFIG["vendorlibdir"]' )"
 
   install -Dm644 "$srcdir"/$pkgname-$pkgver/conf/fileserver.conf \
     "$pkgdir"/etc/puppetlabs/$pkgname/fileserver.conf
@@ -67,5 +67,5 @@
 
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 
-  rm -r "$pkgdir"/run
+  rm -r "$pkgdir"/var/run
 }

Modified: puppet.install
===================================================================
--- puppet.install	2015-07-23 18:20:26 UTC (rev 137336)
+++ puppet.install	2015-07-23 20:32:32 UTC (rev 137337)
@@ -2,17 +2,15 @@
   getent group puppet &>/dev/null || groupadd -r puppet -g 52
   getent passwd puppet &>/dev/null || useradd -r -u 52 -g puppet \
     -d /var/lib/puppet -s /usr/bin/nologin -c "Puppet" puppet
+
+  echo '==> Upstream have removed the puppetmaster.service file in
+==> preparation for version 5 where "puppet master" will be deprecated. We
+==> will remove the service file on the next update; you should migrate
+==> your puppet masters to puppetserver'
 }
 
 pre_upgrade() {
   pre_install
-
-  if  [ "$(vercmp 4 "$2")" -eq 1 ]; then
-    echo '==> Version 4 breaks 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() {