SF.net SVN: gar:[24232] csw/mgar/pkg/puppet3/trunk

[tosmi at users.sourceforge.net]

Revision: 24232
          http://sourceforge.net/p/gar/code/24232
Author:   tosmi
Date:     2014-10-30 21:14:09 +0000 (Thu, 30 Oct 2014)
Log Message:
-----------
update puppet3 to 3.6.2

we now require ruby20 as ruby18 is old and unmaintained. this
also adds a new dependency on hiera.

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

Modified: csw/mgar/pkg/puppet3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet3/trunk/Makefile	2014-10-30 21:13:31 UTC (rev 24231)
+++ csw/mgar/pkg/puppet3/trunk/Makefile	2014-10-30 21:14:09 UTC (rev 24232)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = puppet3
-VERSION = 3.4.1
+VERSION = 3.6.2
 GARTYPE = v2
 
 define BLURB
@@ -44,13 +44,15 @@
 SPKG_DESC_CSWpuppet3       = System configuration management tool, client daemon
 SPKG_DESC_CSWpuppetmaster3 = System configuration management tool, server
 
-RUNTIME_DEP_PKGS                  = CSWfacter
-RUNTIME_DEP_PKGS                  += CSWruby18
-RUNTIME_DEP_PKGS				  += CSWrubyaugeas
-RUNTIME_DEP_PKGS_CSWpuppetmaster3 += CSWpuppet3
-RUNTIME_DEP_PKGS_CSWpuppetmaster3 += CSWruby18
-BUILD_DEP_PKGS  				  = $(RUNTIME_DEP_PKGS)
+RUNTIME_DEP_PKGS = CSWfacter
+RUNTIME_DEP_PKGS += CSWrubyaugeas
+RUNTIME_DEP_PKGS += CSWruby20
 
+RUNTIME_DEP_PKGS_CSWpuppetmaster3 = $(RUNTIME_DEP_PKGS)
+RUNTIME_DEP_PKGS_CSWpuppetmaster3 += CSWhiera
+
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWpuppetmaster3)
+
 PKGFILES_CSWpuppetmaster3  = $(sysconfdir)/init\.d/cswpuppetmasterd
 PKGFILES_CSWpuppetmaster3 += $(sbindir)/puppetmasterd
 PKGFILES_CSWpuppetmaster3 += $(mandir)/man8/puppetmasterd.8
@@ -68,9 +70,8 @@
 TEST_SCRIPTS      =
 INSTALL_SCRIPTS   = puppet
 
-CHECKPKG_OVERRIDES_CSWpuppetmaster3  = surplus-dependency|CSWruby18
+CHECKPKG_OVERRIDES_CSWpuppetmaster3  = surplus-dependency|CSWruby20
 CHECKPKG_OVERRIDES_CSWpuppet3        = surplus-dependency|CSWfacter
-CHECKPKG_OVERRIDES_CSWpuppet3	    += surplus-dependency|CSWrubyaugeas
 CHECKPKG_OVERRIDES_CSWpuppet3       += missing-dependency|CSWpython
 # Puppet has hardcoded paths to look at for many OSes, many of which involve
 # /usr/share and /usr/local.
@@ -102,11 +103,14 @@
 	ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d
 	ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d
 	ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)/etc$(prefix)/init.d
-	cd $(WORKSRC) && $(INSTALL_ENV) ruby install.rb \
+	cd $(WORKSRC) && ruby2.0 install.rb \
+		--destdir=$(DESTDIR) \
 		--configdir=$(sysconfdir)/puppet \
 		--bindir=$(bindir) \
 		--sbindir=$(sbindir) \
 		--full
+	# we depend on ruby20 so fix the shebang
+	find $(DESTDIR)$(bindir) -type f -depth -print | xargs -n 1 gsed -i -e '1 s|ruby$$|ruby2.0|g'
 	cd $(DESTDIR)$(mandir)/man8 && gunzip *
 	mv $(DESTDIR)$(sysconfdir)/puppet/auth.conf $(DESTDIR)$(sysconfdir)/puppet/auth.conf.example
 	ginstall -m 644 $(FILEDIR)/puppet.conf.example-CSW $(DESTDIR)$(sysconfdir)/puppet/puppet.conf.example

Modified: csw/mgar/pkg/puppet3/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet3/trunk/checksums	2014-10-30 21:13:31 UTC (rev 24231)
+++ csw/mgar/pkg/puppet3/trunk/checksums	2014-10-30 21:14:09 UTC (rev 24232)
@@ -1,8 +1 @@
-2117e3a1964ac54fcd36d926eed3db94  puppet-3.0.1.tar.gz
-4cbdcc9dfcda677c820175375a500651  puppet-3.1.0.tar.gz
-e942079612703a460a9fdb52e6bcae4a  puppet-3.1.1.tar.gz
-a9bce4fe7a68aebcb6e97256e7faac5b  puppet-3.2.1.tar.gz
-318de47ab9e7d41cce98c1cbc5d33cc1  puppet-3.2.2.tar.gz
-7084f61bea287ba6720ed2ccccd1fb03  puppet-3.2.4.tar.gz
-e553c381df75b24c8eda00ecc6dcef8a  puppet-3.3.1.tar.gz
-25e230a05fbf6a23ff477869994de8b8  puppet-3.4.1.tar.gz
+7e2981dcab39771b8243432bfd359d46  puppet-3.6.2.tar.gz

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