[arch-commits] Commit in puppet/repos/community-testing-any (4 files)
Jonathan Steel
jsteel at archlinux.org
Mon Jan 5 21:52:14 UTC 2015
Date: Monday, January 5, 2015 @ 22:52:14
Author: jsteel
Revision: 125459
archrelease: copy trunk to community-testing-any
Added:
puppet/repos/community-testing-any/PKGBUILD
(from rev 125458, puppet/trunk/PKGBUILD)
puppet/repos/community-testing-any/puppet.install
(from rev 125458, puppet/trunk/puppet.install)
Deleted:
puppet/repos/community-testing-any/PKGBUILD
puppet/repos/community-testing-any/puppet.install
----------------+
PKGBUILD | 137 +++++++++++++++++++++++++++++--------------------------
puppet.install | 46 +++++++++---------
2 files changed, 96 insertions(+), 87 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-01-05 21:52:00 UTC (rev 125458)
+++ PKGBUILD 2015-01-05 21:52:14 UTC (rev 125459)
@@ -1,64 +0,0 @@
-# $Id$
-# 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
-pkgver=3.7.3
-pkgrel=2
-pkgdesc="Server automation framework and application"
-arch=('any')
-url="http://puppetlabs.com/puppet/puppet-open-source"
-license=('APACHE')
-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')
-install=$pkgname.install
-source=($pkgname-$pkgver.tar.gz::http://github.com/puppetlabs/$pkgname/archive/$pkgver.tar.gz)
-md5sums=('30664a0277c73a0028997d5aae24d38b')
-
-package() {
- cd $pkgname-$pkgver
-
- ruby install.rb --destdir="$pkgdir"/ --sitelibdir="$( ruby -e \
- 'puts RbConfig::CONFIG["vendorlibdir"]' )"
-
- 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
-
- install -d "$pkgdir"/{var/lib/$pkgname,usr/lib/tmpfiles.d}/
-
- echo "d /var/run/$pkgname 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 "$srcdir"/$pkgname-$pkgver/ext/systemd/${pkgname}master.service \
- "$pkgdir"/usr/lib/systemd/system/${pkgname}master.service
-
- # vim and emacs
- install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/vim/ftdetect/$pkgname.vim \
- "$pkgdir"/usr/share/vim/vimfiles/ftdetect/$pkgname.vim
- install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/vim/syntax/$pkgname.vim \
- "$pkgdir"/usr/share/vim/vimfiles/syntax/$pkgname.vim
- install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/emacs/$pkgname-mode.el \
- "$pkgdir"/usr/share/emacs/site-lisp/$pkgname-mode.el
- install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/emacs/$pkgname-mode-init.el \
- "$pkgdir"/usr/share/emacs/site-lisp/site-start.d/$pkgname-mode-init.el
-
- install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: puppet/repos/community-testing-any/PKGBUILD (from rev 125458, puppet/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-01-05 21:52:14 UTC (rev 125459)
@@ -0,0 +1,73 @@
+# $Id$
+# 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
+pkgver=3.7.3
+pkgrel=3
+pkgdesc="Server automation framework and application"
+arch=('any')
+url="http://puppetlabs.com/puppet/puppet-open-source"
+license=('APACHE')
+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')
+install=$pkgname.install
+source=($pkgname-$pkgver.tar.gz::http://github.com/puppetlabs/$pkgname/archive/$pkgver.tar.gz)
+md5sums=('30664a0277c73a0028997d5aae24d38b')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Ruby 2.2 fixes
+ sed -i 's/: "syck"$/: (defined?(Psych) \&\& YAML == Psych ? "psych" : "skcy")/' \
+ lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
+ sed -i 466,469d lib/puppet/defaults.rb
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ ruby install.rb --destdir="$pkgdir"/ --sitelibdir="$( ruby -e \
+ 'puts RbConfig::CONFIG["vendorlibdir"]' )"
+
+ 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
+
+ install -d "$pkgdir"/{var/lib/$pkgname,usr/lib/tmpfiles.d}/
+
+ echo "d /var/run/$pkgname 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 "$srcdir"/$pkgname-$pkgver/ext/systemd/${pkgname}master.service \
+ "$pkgdir"/usr/lib/systemd/system/${pkgname}master.service
+
+ # vim and emacs
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/vim/ftdetect/$pkgname.vim \
+ "$pkgdir"/usr/share/vim/vimfiles/ftdetect/$pkgname.vim
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/vim/syntax/$pkgname.vim \
+ "$pkgdir"/usr/share/vim/vimfiles/syntax/$pkgname.vim
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/emacs/$pkgname-mode.el \
+ "$pkgdir"/usr/share/emacs/site-lisp/$pkgname-mode.el
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/emacs/$pkgname-mode-init.el \
+ "$pkgdir"/usr/share/emacs/site-lisp/site-start.d/$pkgname-mode-init.el
+
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: puppet.install
===================================================================
--- puppet.install 2015-01-05 21:52:00 UTC (rev 125458)
+++ puppet.install 2015-01-05 21:52:14 UTC (rev 125459)
@@ -1,23 +0,0 @@
-pre_install() {
- 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 /sbin/nologin -c "Puppet" puppet
-}
-
-pre_upgrade() {
- pre_install
-}
-
-pre_remove() {
- if [[ -f /var/run/puppet/master.pid ]]; then
- systemctl stop puppetmaster
- fi
-
- if [[ -f /var/run/puppet/agent.pid ]]; then
- systemctl stop puppet
- fi
-}
-
-post_remove() {
- userdel puppet
-}
Copied: puppet/repos/community-testing-any/puppet.install (from rev 125458, puppet/trunk/puppet.install)
===================================================================
--- puppet.install (rev 0)
+++ puppet.install 2015-01-05 21:52:14 UTC (rev 125459)
@@ -0,0 +1,23 @@
+pre_install() {
+ 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 /sbin/nologin -c "Puppet" puppet
+}
+
+pre_upgrade() {
+ pre_install
+}
+
+pre_remove() {
+ if [[ -f /var/run/puppet/master.pid ]]; then
+ systemctl stop puppetmaster
+ fi
+
+ if [[ -f /var/run/puppet/agent.pid ]]; then
+ systemctl stop puppet
+ fi
+}
+
+post_remove() {
+ userdel puppet
+}
More information about the arch-commits
mailing list