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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Fri Feb 4 17:16:55 CET 2011 

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

Log Message:
-----------
puppet: Hand-merge of two branches

Modified Paths:
--------------
    csw/mgar/pkg/puppet/branches/puppet-2.6.x/Makefile
    csw/mgar/pkg/puppet/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/puppet/trunk/files/CSWpuppet.cron.root

Modified: csw/mgar/pkg/puppet/branches/puppet-2.6.x/Makefile
===================================================================
--- csw/mgar/pkg/puppet/branches/puppet-2.6.x/Makefile	2011-02-04 15:36:17 UTC (rev 13191)
+++ csw/mgar/pkg/puppet/branches/puppet-2.6.x/Makefile	2011-02-04 16:16:54 UTC (rev 13192)
@@ -7,7 +7,7 @@
 # [1] http://garylaw.net/packages/puppet-build.sh
 
 NAME = puppet
-VERSION = 2.6.1
+VERSION = 2.6.4
 CATEGORIES = apps
 
 define BLURB
@@ -36,7 +36,7 @@
 # Disabling SMF support for puppetd.  There are problems with it.  It's a
 # better choice to run it from cron.
 # INITSMF  = $(sysconfdir)/init\.d/cswpuppetd
-INITSMF += /etc$(prefix)/init\.d/cswpuppetmasterd
+INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd
 USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup
 
 # Creating a separate package CSWpuppetmaster so that the cswpuppetmaster
@@ -52,7 +52,7 @@
 RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet
 RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby
 
-PKGFILES_CSWpuppetmaster  = $(prefix)/etc/init\.d/cswpuppetmasterd
+PKGFILES_CSWpuppetmaster  = $(sysconfdir)/init\.d/cswpuppetmasterd
 PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd
 PKGFILES_CSWpuppetmaster += $(mandir)/man8/puppetmasterd.8
 PKGFILES_CSWpuppetmaster += $(libdir)/.*/puppet/application/puppetmasterd.rb
@@ -84,13 +84,12 @@
 	ginstall -m 755 -d $(DESTDIR)
 	ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/puppet
 	ginstall -m 755 -d $(DESTDIR)$(localstatedir)/puppet/run
-	ginstall -m 755 -d $(DESTDIR)/etc$(prefix)/init.d
-	# $(sysconfdir)/pkg/<pkgname>/crontabs
 	ginstall -m 755 -d $(DESTDIR)$(CRONDIR)
 	ginstall -m 644 \
 		$(FILEDIR)/CSWpuppet.cron.root \
 		$(DESTDIR)$(CRONDIR)/root
-	ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)/etc$(prefix)/init.d
+	ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d
+	ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d
 	ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)/etc$(prefix)/init.d
 	(cd $(WORKSRC) && \
 	gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2011-02-04 15:36:17 UTC (rev 13191)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2011-02-04 16:16:54 UTC (rev 13192)
@@ -22,17 +22,23 @@
 
 MASTER_SITES = http://reductivelabs.com/downloads/puppet/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup
+DISTFILES += cswpuppetd
+DISTFILES += cswpuppetmasterd
+DISTFILES += cswusergroup
+DISTFILES += CSWpuppet.cron.root
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/
+SPKG_SOURCEURL = http://www.puppetlabs.com/
 
-INITSMF  = $(sysconfdir)/init\.d/cswpuppetd
+# Disabling SMF support for puppetd.  There are problems with it.  It's a
+# better choice to run it from cron.
+# INITSMF  = $(sysconfdir)/init\.d/cswpuppetd
 INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd
 USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup
 
 # Creating a separate package CSWpuppetmaster so that the cswpuppetmaster
 # service isn't started upon the installation of CSWpuppet.
-PACKAGES = CSWpuppet CSWpuppetmaster
+PACKAGES += CSWpuppetmaster
+PACKAGES += CSWpuppet
 
 SPKG_DESC_CSWpuppet       = System configuration management tool, client daemon
 SPKG_DESC_CSWpuppetmaster = System configuration management tool, server
@@ -61,7 +67,12 @@
 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_CSWpuppet       += surplus-dependency|CSWfacter
+CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet
+
+CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs
+CRONTABS = $(CRONDIR)/root
+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.
@@ -73,9 +84,14 @@
 	ginstall -m 755 -d $(DESTDIR)
 	ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/puppet
 	ginstall -m 755 -d $(DESTDIR)$(localstatedir)/puppet/run
+	ginstall -m 755 -d $(DESTDIR)$(CRONDIR)
+	ginstall -m 644 \
+		$(FILEDIR)/CSWpuppet.cron.root \
+		$(DESTDIR)$(CRONDIR)/root
 	ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d
 	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) && \
 	gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \
 	gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \
@@ -94,5 +110,9 @@
 		$(DESTDIR)$(sysconfdir)/pkg/puppet/cswusergroup
 	( [ -d $(DESTDIR)/var/lib ] && echo "$(DESTDIR)/var/lib" must not exist && false ) || true
 	mkdir -p $(DESTDIR)$(localstatedir)/lib
+	# For this file to run, CSWpuppet would need to depend on CSWpython,
+	# and we don't want that. It could be split off to another package, but
+	# this file doesn't seem to be of any use on Solaris, so we can safely
+	# remove it.
 	rm $(DESTDIR)$(libdir)/ruby/site_ruby/1.8/puppet/provider/package/yumhelper.py
 	@$(MAKECOOKIE)

Copied: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.cron.root (from rev 13190, csw/mgar/pkg/puppet/branches/puppet-2.6.x/files/CSWpuppet.cron.root)
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.cron.root	                        (rev 0)
+++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.cron.root	2011-02-04 16:16:54 UTC (rev 13192)
@@ -0,0 +1 @@
+0,30 * * * * /opt/csw/sbin/puppetd --no-daemon --onetime


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

More information about the devel mailing list