Revision: 14590
http://gar.svn.sourceforge.net/gar/?rev=14590&view=rev
Author: phipsy
Date: 2011-05-17 15:47:19 +0000 (Tue, 17 May 2011)
Log Message:
-----------
Upped Puppet to 2.6.8
Modified Paths:
--------------
csw/mgar/pkg/puppet/trunk/Makefile
csw/mgar/pkg/puppet/trunk/checksums
csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall
Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile 2011-05-17 12:49:59 UTC (rev 14589)
+++ csw/mgar/pkg/puppet/trunk/Makefile 2011-05-17 15:47:19 UTC (rev 14590)
@@ -7,7 +7,7 @@
# [1] http://garylaw.net/packages/puppet-build.sh
NAME = puppet
-VERSION = 2.6.6
+VERSION = 2.6.8
CATEGORIES = apps
define BLURB
@@ -47,6 +47,7 @@
RUNTIME_DEP_PKGS = CSWfacter
RUNTIME_DEP_PKGS += CSWruby
+RUNTIME_DEP_PKGS += CSWrubyaugeas
RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet
RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby
@@ -71,23 +72,22 @@
# https://projects.puppetlabs.com/issues/6324
PATCHFILES += 0004-patch-to-smf-provider-6324.patch
-CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter
+CHECKPKG_OVERRIDES_CSWpuppetmaster = surplus-dependency|CSWruby
+
+CHECKPKG_OVERRIDES_CSWpuppet = surplus-dependency|CSWfacter
+CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWrubyaugeas
CHECKPKG_OVERRIDES_CSWpuppet += missing-dependency|CSWpython
-CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet
-CHECKPKG_OVERRIDES_CSWpuppet +=
init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswpuppetd|class=none
-CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWruby
# Puppet has hardcoded paths to look at for many OSes, many of which involve
# /usr/share and /usr/local.
-CHECKPKG_OVERRIDES_CSWpuppet += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWpuppet += file-with-bad-content
-# These two files are quite deliberate - without them users will not get
-# CSW behaviour. The README explains
-CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet
-CHECKPKG_OVERRIDES_CSWpuppet +=
bad-location-of-file|file=/etc/puppet/README.CSW
-CHECKPKG_OVERRIDES_CSWpuppet +=
bad-location-of-file|file=/etc/puppet/puppet.conf.example-CSW
+# These files are quite deliberate - without them users will not get CSW
+# behaviour. The README explains
+CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet
+CHECKPKG_OVERRIDES_CSWpuppet +=
bad-location-of-file|file=/etc/puppet/README.CSW
+CHECKPKG_OVERRIDES_CSWpuppet +=
bad-location-of-file|file=/etc/puppet/puppet.conf.example-CSW
-
include gar/category.mk
install-puppet:
@@ -120,6 +120,5 @@
ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/puppet
ginstall -m 644 $(FILEDIR)/cswusergroup \
$(DESTDIR)$(sysconfdir)/pkg/puppet/cswusergroup
- # ( [ -d $(DESTDIR)/var/lib ] && echo "$(DESTDIR)/var/lib" must not
exist && false ) || true
mkdir -p $(DESTDIR)$(localstatedir)/lib
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/puppet/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet/trunk/checksums 2011-05-17 12:49:59 UTC (rev 14589)
+++ csw/mgar/pkg/puppet/trunk/checksums 2011-05-17 15:47:19 UTC (rev 14590)
@@ -1,3 +1,4 @@
c0b86f40c8000dae2f0f7f2f91579c2a puppet-2.6.4.tar.gz
645543a18050f1d991796d865c53f9a4 puppet-2.6.5.tar.gz
58315e94ff00aedc4a19177877c3e865 puppet-2.6.6.tar.gz
+588dc3343ea66983010e8c4eb58af6af puppet-2.6.8.tar.gz
Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2011-05-17
12:49:59 UTC (rev 14589)
+++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2011-05-17
15:47:19 UTC (rev 14590)
@@ -15,6 +15,7 @@
if [ ! -d $PKG_INSTALL_ROOT/var/lib ]; then
/usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/mkdir -p /var/lib/puppet
+ /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/chown puppet /var/lib/puppet
if [ ! -d $PKG_INSTALL_ROOT/var/opt/csw/puppet ]; then
/usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/lib/puppet
/var/opt/csw/puppet
fi
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
