puppet 3.2.4 → 3.3.0.rc2

data/ext/debian/puppet.manpages

@@ -1,32 +0,0 @@
-man/man8/puppet-agent.8
-man/man8/puppet-apply.8
-man/man8/puppet-catalog.8
-man/man8/puppet-describe.8
-man/man8/puppet-cert.8
-man/man8/puppet-certificate.8
-man/man8/puppet-certificate_request.8
-man/man8/puppet-certificate_revocation_list.8
-man/man8/puppet-config.8
-man/man8/puppet-device.8
-man/man8/puppet-doc.8
-man/man8/puppet-facts.8
-man/man8/puppet-file.8
-man/man8/puppet-filebucket.8
-man/man8/puppet-help.8
-man/man8/puppet-inspect.8
-man/man8/puppet-instrumentation_data.8
-man/man8/puppet-instrumentation_listener.8
-man/man8/puppet-instrumentation_probe.8
-man/man8/puppet-key.8
-man/man8/puppet-kick.8
-man/man8/puppet-man.8
-man/man8/puppet-module.8
-man/man8/puppet-node.8
-man/man8/puppet-parser.8
-man/man8/puppet-plugin.8
-man/man8/puppet-queue.8
-man/man8/puppet-report.8
-man/man8/puppet-resource.8
-man/man8/puppet-resource_type.8
-man/man8/puppet-secret_agent.8
-man/man8/puppet-status.8

data/ext/osx/PackageInfo.plist

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>CFBundleIdentifier</key>
-    <string>com.reductivelabs.puppet</string>
-    <key>CFBundleShortVersionString</key>
-    <string>{SHORTVERSION}</string>
-    <key>IFMajorVersion</key>
-    <integer>{MAJORVERSION}</integer>
-    <key>IFMinorVersion</key>
-    <integer>{MINORVERSION}</integer>
-    <key>IFPkgFlagAllowBackRev</key>
-    <false/>
-    <key>IFPkgFlagAuthorizationAction</key>
-    <string>RootAuthorization</string>
-    <key>IFPkgFlagDefaultLocation</key>
-    <string>/</string>
-    <key>IFPkgFlagFollowLinks</key>
-    <true/>
-    <key>IFPkgFlagInstallFat</key>
-    <false/>
-    <key>IFPkgFlagIsRequired</key>
-    <false/>
-    <key>IFPkgFlagOverwritePermissions</key>
-    <false/>
-    <key>IFPkgFlagRelocatable</key>
-    <false/>
-    <key>IFPkgFlagRestartAction</key>
-    <string>None</string>
-    <key>IFPkgFlagRootVolumeOnly</key>
-    <true/>
-    <key>IFPkgFlagUpdateInstalledLanguages</key>
-    <false/>
-</dict>
-</plist>

data/ext/osx/createpackage.sh

@@ -1,187 +0,0 @@
-#!/bin/bash
-#
-# Script to build an "old style" not flat pkg out of the puppet repository.
-#
-# Author: Nigel Kersten (nigelk@google.com)
-#
-# Last Updated: 2008-07-31
-#
-# Copyright 2008 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-
-INSTALLRB="install.rb"
-BINDIR="/usr/bin"
-SBINDIR="/usr/sbin"
-SITELIBDIR="/usr/lib/ruby/site_ruby/1.8"
-PACKAGEMAKER="/Developer/usr/bin/packagemaker"
-PROTO_PLIST="PackageInfo.plist"
-PREFLIGHT="preflight"
-
-
-function find_installer() {
-  # we walk up three directories to make this executable from the root,
-  # root/conf or root/conf/osx
-  if [ -f "./${INSTALLRB}" ]; then
-    installer="$(pwd)/${INSTALLRB}"
-  elif [ -f "../${INSTALLRB}" ]; then
-    installer="$(pwd)/../${INSTALLRB}"
-  elif [ -f "../../${INSTALLRB}" ]; then
-    installer="$(pwd)/../../${INSTALLRB}"
-  else
-    installer=""
-  fi
-}
-
-function find_puppet_root() {
-  puppet_root=$(dirname "${installer}")
-}
-
-function install_puppet() {
-  echo "Installing Puppet to ${pkgroot}"
-  "${installer}" --destdir="${pkgroot}" --bindir="${BINDIR}" --sbindir="${SBINDIR}" --sitelibdir="${SITELIBDIR}"
-  mkdir -p ${pkgroot}/var/lib/puppet
-  chown -R root:admin "${pkgroot}"
-  chmod -R go-w "${pkgroot}"
-}
-
-function install_docs() {
-  echo "Installing docs to ${pkgroot}"
-  docdir="${pkgroot}/usr/share/doc/puppet" 
-  mkdir -p "${docdir}"
-  for docfile in COPYING LICENSE README README.queueing README.rst; do
-    install -m 0644 "${puppet_root}/${docfile}" "${docdir}"
-  done
-  chown -R root:wheel "${docdir}"
-  chmod 0755 "${docdir}"
-}
-
-function get_puppet_version() {
-  puppet_version=$(RUBYLIB="${pkgroot}/${SITELIBDIR}:${RUBYLIB}" ruby -e "require 'puppet'; puts Puppet.version")
-}
-
-function prepare_package() {
-  # As we can't specify to follow symlinks from the command line, we have
-  # to go through the hassle of creating an Info.plist file for packagemaker
-  # to look at for package creation and substitue the version strings out.
-  # Major/Minor versions can only be integers, so we have "0" and "245" for
-  # puppet version 0.24.5
-  # Note too that for 10.5 compatibility this Info.plist *must* be set to
-  # follow symlinks.
-  VER1=$(echo ${puppet_version} | awk -F "." '{print $1}')
-  VER2=$(echo ${puppet_version} | awk -F "." '{print $2}')
-  VER3=$(echo ${puppet_version} | awk -F "." '{print $3}')
-  major_version="${VER1}"
-  minor_version="${VER2}${VER3}"
-  cp "${puppet_root}/conf/osx/${PROTO_PLIST}" "${pkgtemp}"
-  sed -i '' "s/{SHORTVERSION}/${puppet_version}/g" "${pkgtemp}/${PROTO_PLIST}"
-  sed -i '' "s/{MAJORVERSION}/${major_version}/g" "${pkgtemp}/${PROTO_PLIST}"
-  sed -i '' "s/{MINORVERSION}/${minor_version}/g" "${pkgtemp}/${PROTO_PLIST}"
-
-  # We need to create a preflight script to remove traces of previous
-  # puppet installs due to limitations in Apple's pkg format.
-  mkdir "${pkgtemp}/scripts"
-  cp "${puppet_root}/conf/osx/${PREFLIGHT}" "${pkgtemp}/scripts"
-
-  # substitute in the sitelibdir specified above on the assumption that this
-  # is where any previous puppet install exists that should be cleaned out.
-  sed -i '' "s|{SITELIBDIR}|${SITELIBDIR}|g" "${pkgtemp}/scripts/${PREFLIGHT}"
-  # substitute in the bindir sepcified on the assumption that this is where
-  # any old executables that have moved from bindir->sbindir should be
-  # cleaned out from.
-  sed -i '' "s|{BINDIR}|${BINDIR}|g" "${pkgtemp}/scripts/${PREFLIGHT}"
-  chmod 0755 "${pkgtemp}/scripts/${PREFLIGHT}"
-}
-
-function create_package() {
-  rm -fr "$(pwd)/puppet-${puppet_version}.pkg"
-  echo "Building package"
-  echo "Note that packagemaker is reknowned for spurious errors. Don't panic."
-  "${PACKAGEMAKER}" --verbose --no-recommend --no-relocate \
-                    --root "${pkgroot}" \
-                    --info "${pkgtemp}/${PROTO_PLIST}" \
-                    --scripts ${pkgtemp}/scripts \
-                    --out "$(pwd)/puppet-${puppet_version}.pkg"
-  if [ $? -ne 0 ]; then
-    echo "There was a problem building the package."
-    cleanup_and_exit 1
-    exit 1
-  else
-    echo "The package has been built at:"
-    echo "$(pwd)/puppet-${puppet_version}.pkg"
-  fi
-}
-
-function cleanup_and_exit() {
-  if [ -d "${pkgroot}" ]; then
-    rm -fr "${pkgroot}"
-  fi
-  if [ -d "${pkgtemp}" ]; then
-    rm -fr "${pkgtemp}"
-  fi
-  exit $1
-}
-
-# Program entry point
-function main() {
-
-  if [ $(whoami) != "root" ]; then
-    echo "This script needs to be run as root via su or sudo."
-    cleanup_and_exit 1
-  fi
-
-  find_installer
-
-  if [ ! "${installer}" ]; then
-    echo "Unable to find ${INSTALLRB}"
-    cleanup_and_exit 1
-  fi
-
-  find_puppet_root
-
-  if [ ! "${puppet_root}" ]; then
-    echo "Unable to find puppet repository root."
-    cleanup_and_exit 1
-  fi
-
-  pkgroot=$(mktemp -d -t puppetpkg)
-
-  if [ ! "${pkgroot}" ]; then
-    echo "Unable to create temporary package root."
-    cleanup_and_exit 1
-  fi
-
-  pkgtemp=$(mktemp -d -t puppettmp)
-
-  if [ ! "${pkgtemp}" ]; then
-    echo "Unable to create temporary package root."
-    cleanup_and_exit 1
-  fi
-
-  install_puppet
-  install_docs
-  get_puppet_version
-
-  if [ ! "${puppet_version}" ]; then
-    echo "Unable to retrieve puppet version"
-    cleanup_and_exit 1
-  fi
-
-  prepare_package
-  create_package
-
-  cleanup_and_exit 0
-}
-
-main "$@"

data/ext/redhat/rundir-perms.patch

@@ -1,28 +0,0 @@
-From c181799a30427966cbe028fde7b390cac9cf44e9 Mon Sep 17 00:00:00 2001
-From: Matthaus Litteken <matthaus@puppetlabs.com>
-Date: Fri, 4 May 2012 10:59:26 -0700
-Subject: [PATCH] Tighten rundir perms (rhbz #495096)
-
-The loose default permissions are not required for Red Hat systems
-installed via rpm packages because the packages create the required
-service user/group.
----
- 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 dc498e7..eef36d2 100644
---- a/lib/puppet/defaults.rb
-+++ b/lib/puppet/defaults.rb
-@@ -84,7 +84,7 @@ module Puppet
-     :rundir => {
-       :default  => nil,
-       :type     => :directory,
--      :mode     => 01777,
-+      :mode     => 0755,
-       :desc     => "Where Puppet PID files are kept."
-     },
-     :genconfig => {
--- 
-1.7.7.6
-

data/lib/puppet/external/base64.rb

@@ -1,19 +0,0 @@
-# a stupid hack class to get rid of all of the warnings but
-# still make the encode/decode methods available
-
-# 1.8.2 has a Base64 class, but 1.8.1 just imports the methods directly
-# into Object
-
-require 'base64'
-
-unless defined?(Base64)
-  class Base64
-    def Base64.encode64(*args)
-      Object.method(:encode64).call(*args)
-    end
-
-    def Base64.decode64(*args)
-      Object.method(:decode64).call(*args)
-    end
-  end
-end

data/lib/puppet/util/graph.rb

@@ -1,27 +0,0 @@
-require 'puppet'
-require 'puppet/simple_graph'
-
-# A module that handles the small amount of graph stuff in Puppet.
-module Puppet::Util::Graph
-  # Make a graph where each of our children gets converted to
-  # the receiving end of an edge.  Call the same thing on all
-  # of our children, optionally using a block
-  def to_graph(graph = nil, &block)
-    # Allow our calling function to send in a graph, so that we
-    # can call this recursively with one graph.
-    graph ||= Puppet::SimpleGraph.new
-
-    self.each do |child|
-      unless block_given? and ! yield(child)
-        graph.add_edge(self, child)
-
-        child.to_graph(graph, &block) if child.respond_to?(:to_graph)
-      end
-    end
-
-    # Do a topsort, which will throw an exception if the graph is cyclic.
-
-    graph
-  end
-end
-

data/lib/puppet/util/loadedfile.rb

@@ -1,61 +0,0 @@
-# A simple class that tells us when a file has changed and thus whether we
-# should reload it
-
-require 'puppet'
-
-module Puppet
-  class NoSuchFile < Puppet::Error; end
-  class Util::LoadedFile
-    attr_reader :file, :statted
-
-    # Provide a hook for setting the timestamp during testing, so we don't
-    # have to depend on the granularity of the filesystem.
-    attr_writer :tstamp
-
-    # Determine whether the file has changed and thus whether it should
-    # be reparsed.
-    def changed?
-      # Allow the timeout to be disabled entirely.
-      return true if Puppet[:filetimeout] < 0
-      tmp = stamp
-
-      # We use a different internal variable than the stamp method
-      # because it doesn't keep historical state and we do -- that is,
-      # we will always be comparing two timestamps, whereas
-      # stamp just always wants the latest one.
-      if tmp == @tstamp
-        return false
-      else
-        @tstamp = tmp
-        return @tstamp
-      end
-    end
-
-    # Create the file.  Must be passed the file path.
-    def initialize(file)
-      @file = file
-      @statted = 0
-      @stamp = nil
-      @tstamp = stamp
-    end
-
-    # Retrieve the filestamp, but only refresh it if we're beyond our
-    # filetimeout
-    def stamp
-      if @stamp.nil? or (Time.now.to_i - @statted >= Puppet[:filetimeout])
-        @statted = Time.now.to_i
-        begin
-          @stamp = File.stat(@file).ctime
-        rescue Errno::ENOENT, Errno::ENOTDIR
-          @stamp = Time.now
-        end
-      end
-      @stamp
-    end
-
-    def to_s
-      @file
-    end
-  end
-end
-

data/lib/puppet/util/log_paths.rb

@@ -1,22 +0,0 @@
-module Puppet::Util::LogPaths
-  # return the full path to us, for logging and rollback
-  # some classes (e.g., FileTypeRecords) will have to override this
-  def path
-    @path ||= '/' + pathbuilder.join('/')
-  end
-
-  def source_descriptors
-    descriptors = {}
-
-    descriptors[:tags] = tags
-
-    [:path, :file, :line].each do |param|
-      next unless value = send(param)
-      descriptors[param] = value
-    end
-
-    descriptors
-  end
-
-end
-

data/lib/puppet/util/subclass_loader.rb

@@ -1,78 +0,0 @@
-# A module for loading subclasses into an array and retrieving
-# them by name.  Also sets up a method for each class so
-# that you can just do Klass.subclass, rather than Klass.subclass(:subclass).
-#
-# This module is currently used by network handlers and clients.
-module Puppet::Util::SubclassLoader
-  attr_accessor :loader, :classloader
-
-  # Iterate over each of the subclasses.
-  def each
-    @subclasses ||= []
-    @subclasses.each { |c| yield c }
-  end
-
-  # The hook method that sets up subclass loading.  We need the name
-  # of the method to create and the path in which to look for them.
-  def handle_subclasses(name, path)
-    raise ArgumentError, "Must be a class to use SubclassLoader" unless self.is_a?(Class)
-    @subclasses = []
-
-    @loader = Puppet::Util::Autoload.new(self, path, :wrap => false)
-
-    @subclassname = name
-
-    @classloader = self
-
-    # Now create a method for retrieving these subclasses by name.  Note
-    # that we're defining a class method here, not an instance.
-    meta_def(name) do |subname|
-      subname = subname.to_s.downcase
-
-      unless c = @subclasses.find { |c| c.name.to_s.downcase == subname }
-        loader.load(subname)
-        c = @subclasses.find { |c| c.name.to_s.downcase == subname }
-
-        # Now make the method that returns this subclass.  This way we
-        # normally avoid the method_missing method.
-        define_method(subname) { c } if c and ! respond_to?(subname)
-      end
-      return c
-    end
-  end
-
-  # Add a new class to our list.  Note that this has to handle subclasses of
-  # subclasses, thus the reason we're keeping track of the @@classloader.
-  def inherited(sub)
-    @subclasses ||= []
-    sub.classloader = self.classloader
-    if self.classloader == self
-      @subclasses << sub
-    else
-      @classloader.inherited(sub)
-    end
-  end
-
-  # See if we can load a class.
-  def method_missing(method, *args)
-    unless self == self.classloader
-      super
-    end
-    return nil unless defined?(@subclassname)
-    self.send(@subclassname, method) || nil
-  end
-
-  # Retrieve or calculate a name.
-  def name(dummy_argument=:work_arround_for_ruby_GC_bug)
-    @name ||= self.to_s.sub(/.+::/, '').intern
-
-    @name
-  end
-
-  # Provide a list of all subclasses.
-  def subclasses
-    @loader.loadall
-    @subclasses.collect { |klass| klass.name }
-  end
-end
-