Revision: 14861
http://gar.svn.sourceforge.net/gar/?rev=14861&view=rev
Author: phipsy
Date: 2011-06-23 13:09:21 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
Puppet 2.7.1
Modified Paths:
--------------
csw/mgar/pkg/puppet/trunk/Makefile
csw/mgar/pkg/puppet/trunk/checksums
Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile 2011-06-23 13:04:22 UTC (rev 14860)
+++ csw/mgar/pkg/puppet/trunk/Makefile 2011-06-23 13:09:21 UTC (rev 14861)
@@ -7,7 +7,7 @@
# [1] http://garylaw.net/packages/puppet-build.sh
NAME = puppet
-VERSION = 2.6.8
+VERSION = 2.7.1
CATEGORIES = apps
define BLURB
@@ -28,10 +28,12 @@
DISTFILES += CSWpuppet.postinstall
# pkgutil.rb is from
https://github.com/gw42/puppet/blob/tickets%2Fmaster%2F4258-dev/lib/puppet/provider/package/pkgutil.rb
# Dom Cleal of RedHat has advised this is a good working version
-DISTFILES += pkgutil.rb
+# DISTFILES += pkgutil.rb
DISTFILES += README.CSW
DISTFILES += puppet.conf.example-CSW
SPKG_SOURCEURL = http://puppetlabs.com/
+LICENSE_CSWpuppet = LICENSE
+LICENSE_CSWpuppetmaster = LICENSE
INITSMF += $(sysconfdir)/init\.d/cswpuppetd
INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd
@@ -69,19 +71,14 @@
INSTALL_SCRIPTS = puppet
PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch
-# https://projects.puppetlabs.com/issues/6324
-PATCHFILES += 0004-patch-to-smf-provider-6324.patch
-CHECKPKG_OVERRIDES_CSWpuppetmaster = surplus-dependency|CSWruby
-
+CHECKPKG_OVERRIDES_CSWpuppetmaster = surplus-dependency|CSWruby18
CHECKPKG_OVERRIDES_CSWpuppet = surplus-dependency|CSWfacter
CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWrubyaugeas
CHECKPKG_OVERRIDES_CSWpuppet += missing-dependency|CSWpython
-
# 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
-
# 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
@@ -106,7 +103,6 @@
--bindir=$(bindir) \
--sbindir=$(sbindir) \
--full
- ginstall -m 755 $(FILEDIR)/pkgutil.rb
$(DESTDIR)$(rubysitelibdir)/puppet/provider/package
cd $(DESTDIR)$(mandir)/man8 && gunzip *
(cd $(WORKSRC)/examples/etc/puppet && \
for f in *; do \
Modified: csw/mgar/pkg/puppet/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet/trunk/checksums 2011-06-23 13:04:22 UTC (rev 14860)
+++ csw/mgar/pkg/puppet/trunk/checksums 2011-06-23 13:09:21 UTC (rev 14861)
@@ -2,3 +2,4 @@
645543a18050f1d991796d865c53f9a4 puppet-2.6.5.tar.gz
58315e94ff00aedc4a19177877c3e865 puppet-2.6.6.tar.gz
588dc3343ea66983010e8c4eb58af6af puppet-2.6.8.tar.gz
+7a0346758af0222dc5e2b2b1a99c44ec puppet-2.7.1.tar.gz
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
