[csw-devel] SF.net SVN: gar:[13191] csw/mgar/pkg/puppet/trunk

[wahwah at users.sourceforge.net]

Revision: 13191
          http://gar.svn.sourceforge.net/gar/?rev=13191&view=rev
Author:   wahwah
Date:     2011-02-04 15:36:17 +0000 (Fri, 04 Feb 2011)

Log Message:
-----------
puppet: Update to 2.6.4

Also, removing one /usr/share reference.

Modified Paths:
--------------
    csw/mgar/pkg/puppet/trunk/Makefile
    csw/mgar/pkg/puppet/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/puppet/trunk/files/0003-Use-opt-csw-share-puppet-modules-as-default.patch

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2011-02-04 14:08:34 UTC (rev 13190)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2011-02-04 15:36:17 UTC (rev 13191)
@@ -7,7 +7,7 @@
 # [1] http://garylaw.net/packages/puppet-build.sh
 
 NAME = puppet
-VERSION = 0.25.4
+VERSION = 2.6.4
 CATEGORIES = apps
 
 define BLURB
@@ -40,6 +40,7 @@
 RUNTIME_DEP_PKGS                  = CSWfacter
 RUNTIME_DEP_PKGS                 += CSWruby
 RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet
+RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby
 
 PKGFILES_CSWpuppetmaster  = $(sysconfdir)/init\.d/cswpuppetmasterd
 PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd
@@ -58,7 +59,14 @@
 
 PATCHFILES  = 0001-pkgutil-support.patch
 PATCHFILES += 0002-Using-the-single-option-of-pkgutil.patch
+PATCHFILES += 0003-Use-opt-csw-share-puppet-modules-as-default.patch
 
+CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter
+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
+
 include gar/category.mk
 
 install-puppet:
@@ -84,4 +92,7 @@
 	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
+	rm $(DESTDIR)$(libdir)/ruby/site_ruby/1.8/puppet/provider/package/yumhelper.py
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/puppet/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet/trunk/checksums	2011-02-04 14:08:34 UTC (rev 13190)
+++ csw/mgar/pkg/puppet/trunk/checksums	2011-02-04 15:36:17 UTC (rev 13191)
@@ -1,6 +1 @@
-abaa404420106f9f28e9e1218b4e365b  0001-pkgutil-support.patch
-9c27c0cdca051eae986b56b91ef889ca  0002-Using-the-single-option-of-pkgutil.patch
-f4a95dece2231805abf4754d72471de4  cswpuppetd
-aba2c79e589b9bd1c881a22aa663a213  cswpuppetmasterd
-3ab0d4f9801075bc78b68b766b496fc7  cswusergroup
-69c97019fda5620f9f45f6ad64407e3b  puppet-0.25.4.tar.gz
+c0b86f40c8000dae2f0f7f2f91579c2a  puppet-2.6.4.tar.gz

Added: csw/mgar/pkg/puppet/trunk/files/0003-Use-opt-csw-share-puppet-modules-as-default.patch
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/0003-Use-opt-csw-share-puppet-modules-as-default.patch	                        (rev 0)
+++ csw/mgar/pkg/puppet/trunk/files/0003-Use-opt-csw-share-puppet-modules-as-default.patch	2011-02-04 15:36:17 UTC (rev 13191)
@@ -0,0 +1,25 @@
+From b7667135e124a195d33790fcddcc9f2c9d42f638 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 4 Feb 2011 16:32:56 +0100
+Subject: [PATCH] Use /opt/csw/share/puppet/modules as default
+
+---
+ lib/puppet/defaults.rb |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
+index 4521a59..9912c7b 100644
+--- a/lib/puppet/defaults.rb
++++ b/lib/puppet/defaults.rb
+@@ -421,7 +421,7 @@ module Puppet
+       authorization system for `puppet master`."
+     ],
+     :ca => [true, "Wether the master should function as a certificate authority."],
+-    :modulepath => {:default => "$confdir/modules:/usr/share/puppet/modules",
++    :modulepath => {:default => "$confdir/modules:/opt/csw/share/puppet/modules",
+       :desc => "The search path for modules as a colon-separated list of
+       directories.", :type => :setting }, # We don't want this to be considered a file, since it's multiple files.
+     :ssl_client_header => ["HTTP_X_CLIENT_DN", "The header containing an authenticated
+-- 
+1.7.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.