Version bumped, bug #388449.

(Portage version: 2.1.10.29/cvs/Linux x86_64)

3 files changed, 0 insertions, 262 deletions

diff --git a/app-admin/puppet/files/puppet-0.25.4-r1-rrd.patch b/app-admin/puppet/files/puppet-0.25.4-r1-rrd.patch
deleted file mode 100644
index 23d17af0d727..000000000000
--- a/app-admin/puppet/files/puppet-0.25.4-r1-rrd.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff -Naur puppet-0.25.4.orig//lib/puppet/feature/base.rb puppet-0.25.4//lib/puppet/feature/base.rb
---- puppet-0.25.4.orig//lib/puppet/feature/base.rb	2010-01-28 12:48:33.000000000 +0900
-+++ puppet-0.25.4//lib/puppet/feature/base.rb	2010-02-28 11:36:28.000000000 +0900
-@@ -27,7 +27,7 @@
- Puppet.features.add(:augeas, :libs => ["augeas"])
- 
- # We have RRD available
--Puppet.features.add(:rrd, :libs => ["RRDtool"])
-+Puppet.features.add(:rrd, :libs => ["RRD"])
- 
- # We have OpenSSL
- Puppet.features.add(:openssl, :libs => ["openssl"])
-diff -Naur puppet-0.25.4.orig//lib/puppet/reports/rrdgraph.rb puppet-0.25.4//lib/puppet/reports/rrdgraph.rb
---- puppet-0.25.4.orig//lib/puppet/reports/rrdgraph.rb	2010-01-28 12:48:34.000000000 +0900
-+++ puppet-0.25.4//lib/puppet/reports/rrdgraph.rb	2010-02-28 11:35:34.000000000 +0900
-@@ -1,12 +1,13 @@
- Puppet::Reports.register_report(:rrdgraph) do
-     desc "Graph all available data about hosts using the RRD library.  You
-         must have the Ruby RRDtool library installed to use this report, which
--        you can get from `the RubyRRDTool RubyForge page`_.  This package may also
--        be available as ``ruby-rrd`` or ``rrdtool-ruby`` in your distribution's package
-+        is bundled in RRDtool, which you can get from  `the RRDTool homepage`_.  
-+        This package may also be available as ``librrd-ruby``, ``ruby-rrd`` or 
-+        ``rrdtool-ruby`` in your distribution's package
-         management system.  The library and/or package will both require the binary
-         ``rrdtool`` package from your distribution to be installed.
- 
--        .. _the RubyRRDTool RubyForge page: http://rubyforge.org/projects/rubyrrdtool/
-+        .. _the RRDTool homepage: http://oss.oetiker.ch/rrdtool/download.en.html
- 
-         This report will create, manage, and graph RRD database files for each
-         of the metrics generated during transactions, and it will create a
-diff -Naur puppet-0.25.4.orig//lib/puppet/util/metric.rb puppet-0.25.4//lib/puppet/util/metric.rb
---- puppet-0.25.4.orig//lib/puppet/util/metric.rb	2010-01-28 12:48:34.000000000 +0900
-+++ puppet-0.25.4//lib/puppet/util/metric.rb	2010-03-02 20:19:40.000000000 +0900
-@@ -31,7 +31,6 @@
- 
-         start ||= Time.now.to_i - 5
- 
--        @rrd = RRDtool.new(self.path)
-         args = []
- 
-         values.each { |value|
-@@ -42,14 +41,17 @@
-         args.push "RRA:AVERAGE:0.5:1:300"
- 
-         begin
--            @rrd.create( Puppet[:rrdinterval].to_i, start, args)
-+        RRD.create(self.path,
-+                "--start", start.to_s,
-+                "--step", Puppet[:rrdinterval].to_i,
-+                *args)
-         rescue => detail
-             raise "Could not create RRD file %s: %s" % [path,detail]
-         end
-     end
- 
-     def dump
--        puts @rrd.info
-+        puts RRD.info(self.path)
-     end
- 
-     def graph(range = nil)
-@@ -84,12 +86,12 @@
-             if range
-                 args.push("--start",range[0],"--end",range[1])
-             else
--                args.push("--start", Time.now.to_i - time, "--end", Time.now.to_i)
-+                args.push("--start", (Time.now.to_i - time).to_s, "--end", Time.now.to_i.to_s)
-             end
- 
-             begin
--                #Puppet.warning "args = #{args}"
--                RRDtool.graph( args )
-+                #Puppet.warning "args = #{args.join("|")}"
-+                RRD.graph( * args )
-             rescue => detail
-                 Puppet.err "Failed to graph %s: %s" % [self.name,detail]
-             end
-@@ -122,7 +124,6 @@
-             self.create(time - 5)
-         end
- 
--        @rrd ||= RRDtool.new(self.path)
- 
-         # XXX this is not terribly error-resistant
-         args = [time]
-@@ -135,7 +136,9 @@
-         arg = args.join(":")
-         template = temps.join(":")
-         begin
--            @rrd.update( template, [ arg ] )
-+            RRD.update(self.path, 
-+                "--template", template, 
-+                arg )
-             #system("rrdtool updatev %s '%s'" % [self.path, arg])
-         rescue => detail
-             raise Puppet::Error, "Failed to update %s: %s" % [self.name,detail]
-diff -Naur puppet-0.25.4.orig//spec/unit/util/metric.rb puppet-0.25.4//spec/unit/util/metric.rb
---- puppet-0.25.4.orig//spec/unit/util/metric.rb	2010-01-28 12:48:34.000000000 +0900
-+++ puppet-0.25.4//spec/unit/util/metric.rb	2010-02-28 11:35:34.000000000 +0900
-@@ -7,6 +7,13 @@
- describe Puppet::Util::Metric do
-     before do
-         @metric = Puppet::Util::Metric.new("foo")
-+        #if we don't retrive it before the test the :rrddir test will
-+        #fail at after
-+        @basedir = @metric.basedir
-+    end
-+
-+    after do
-+        FileUtils.rm_rf(@basedir) if File.directory?(@basedir)
-     end
- 
-     it "should be aliased to Puppet::Metric" do
-@@ -84,12 +91,46 @@
-         @metric[:foo].should be_nil
-     end
- 
--    # LAK: I'm not taking the time to develop these tests right now.
--    # I expect they should actually be extracted into a separate class
--    # anyway.
--    it "should be able to graph metrics using RRDTool"
--
--    it "should be able to create a new RRDTool database"
--
--    it "should be able to store metrics into an RRDTool database"
-+    it "should be able to graph metrics using RRDTool" do
-+        ensure_rrd_folder
-+        populate_metric
-+        @metric.graph
-+    end
-+
-+    it "should be able to create a new RRDTool database" do
-+        ensure_rrd_folder
-+        add_random_values_to_metric
-+        @metric.create
-+        File.exist?(@metric.path).should == true
-+    end
-+
-+    it "should be able to store metrics into an RRDTool database" do
-+        ensure_rrd_folder
-+        populate_metric
-+        File.exist?(@metric.path).should == true
-+    end
-+
-+    def ensure_rrd_folder()
-+        #in normal runs puppet does this for us (not sure where)
-+        FileUtils.mkdir_p(@basedir) unless File.directory?(@basedir)
-+    end
-+
-+    def populate_metric()
-+        time = Time.now.to_i
-+        time -= 100 * 1800
-+        200.times {
-+            @metric = Puppet::Util::Metric.new("foo")
-+            add_random_values_to_metric
-+            @metric.store(time)
-+            time += 1800
-+        }
-+    end
-+
-+    def add_random_values_to_metric()
-+        @metric.values.clear
-+        random_params = { :data1 => 10, :data2 => 30, :data3 => 100 }
-+        random_params.each { | label, maxvalue |
-+            @metric.newvalue(label, rand(maxvalue))
-+    }
-+    end
- end
-diff -Naur puppet-0.25.4.orig//test/util/metrics.rb puppet-0.25.4//test/util/metrics.rb
---- puppet-0.25.4.orig//test/util/metrics.rb	2010-01-28 12:48:34.000000000 +0900
-+++ puppet-0.25.4//test/util/metrics.rb	2010-02-28 11:35:34.000000000 +0900
-@@ -53,6 +53,8 @@
-         report = Puppet::Transaction::Report.new
-         time = Time.now.to_i
-         start = time
-+        #in normal runs puppet does this for us (not sure where)
-+        Dir.mkdir(Puppet[:rrddir]) unless File.directory?(Puppet[:rrddir])
-         10.times {
-             rundata(report, time)
-             time += 300
diff --git a/app-admin/puppet/files/puppet-0.25.init b/app-admin/puppet/files/puppet-0.25.init
deleted file mode 100755
index 2a11820351de..000000000000
--- a/app-admin/puppet/files/puppet-0.25.init
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount net
-	use dns logger puppetmaster netmount nfsmount
-}
-
-checkconfig() {
-	if [ ! -d "${PUPPET_PID_DIR}" ] ; then
-		eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	local options=""
-	[ -n "${PUPPET_EXTRA_OPTS}" ] && options="${options} ${PUPPET_EXTRA_OPTS}"
-
-	ebegin "Starting puppet"
-	start-stop-daemon --start --quiet \
-		--pidfile "${PUPPET_PID_DIR}/puppetd.pid" \
-		--exec /usr/sbin/puppetd -- ${options}
-	eend $? "Failed to start puppet"
-}
-
-stop() {
-	ebegin "Stopping puppet"
-	start-stop-daemon --stop --quiet \
-		--pidfile "${PUPPET_PID_DIR}/puppetd.pid"
-	local ret=$?
-	eend ${ret} "Failed to stop puppet"
-	rm -f "${PUPPET_PID_DIR}/puppetd.pid"
-	return ${ret}
-}
diff --git a/app-admin/puppet/files/puppetmaster-0.25.init b/app-admin/puppet/files/puppetmaster-0.25.init
deleted file mode 100755
index a543e99405a2..000000000000
--- a/app-admin/puppet/files/puppetmaster-0.25.init
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount net
-	use dns logger slapd netmount nfsmount
-}
-
-checkconfig() {
-	if [ ! -d "${PUPPETMASTER_PID_DIR}" ] ; then
-		eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory"
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	local options=""
-	[ -n "${PUPPETMASTER_EXTRA_OPTS}" ] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
-
-	ebegin "Starting puppetmaster"
-	start-stop-daemon --start --quiet \
-		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid" \
-		--exec /usr/sbin/puppetmasterd -- ${options}
-	eend $? "Failed to start puppetmaster"
-}
-
-stop() {
-	ebegin "Stopping puppetmaster"
-	start-stop-daemon --stop --quiet \
-		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
-	local ret=$?
-	eend ${ret} "Failed to stop puppetmaster"
-	rm -f "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
-	return ${ret}
-}