Update puppet to 2.7.5, includes security fixes for

CVE-2011-3484, CVE-2011-3869, CVE-2011-3870 and CVE-2011-3871 ok robert@ (MAINTAINER), aja@
avsm · Oct 5, 2011 · b61d848 · b61d848
1 parent cf67a5f
commit b61d848
Show file tree

Hide file tree

Showing 6 changed files with 796 additions and 784 deletions.
diff --git a/sysutils/ruby-puppet/Makefile b/sysutils/ruby-puppet/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.34 2011/09/16 11:41:40 espie Exp $
+# $OpenBSD: Makefile,v 1.35 2011/10/05 07:41:43 jasper Exp $
 
 COMMENT=	centralised configuration management for networks
 
-VERSION=	2.7.3
+VERSION=	2.7.5
 DISTNAME=	puppet-${VERSION}
-REVISION=	0
 PKGNAME=	ruby-${DISTNAME}
 CATEGORIES=	sysutils net
 

diff --git a/sysutils/ruby-puppet/distinfo b/sysutils/ruby-puppet/distinfo
@@ -1,5 +1,5 @@
-MD5 (puppet-2.7.3.tar.gz) = 9g2BGO4fPWiyODrPPddtOA==
-RMD160 (puppet-2.7.3.tar.gz) = KKVi8ylQLO5aZDyRoDgtk7kjqT8=
-SHA1 (puppet-2.7.3.tar.gz) = N95lFuFRFU5sm9P95yJFDYY6sxY=
-SHA256 (puppet-2.7.3.tar.gz) = Od+bH/4GwTMfTrptIeYyrP+3hZ5PS54vrt3ZuLaFywk=
-SIZE (puppet-2.7.3.tar.gz) = 1710562
+MD5 (puppet-2.7.5.tar.gz) = vSXw5HLECUl+Ck9kjqtIuw==
+RMD160 (puppet-2.7.5.tar.gz) = 72f+GocuKbvkzUzRHoOTMMxBuf0=
+SHA1 (puppet-2.7.5.tar.gz) = NTFingHAbf+NmebXKsilcF9jYyY=
+SHA256 (puppet-2.7.5.tar.gz) = XWbcAxY2Ekx1tiFLBiRmGcppGQSSYO79kZtqG5uwDyw=
+SIZE (puppet-2.7.5.tar.gz) = 1732436
diff --git a/sysutils/ruby-puppet/patches/patch-install_rb b/sysutils/ruby-puppet/patches/patch-install_rb
@@ -1,10 +1,10 @@
-$OpenBSD: patch-install_rb,v 1.2 2010/10/24 10:23:48 robert Exp $
+$OpenBSD: patch-install_rb,v 1.3 2011/10/05 07:41:43 jasper Exp $
 
 Don't gzip(1) the manual pages.
 
---- install.rb.orig	Thu Oct  7 21:01:33 2010
-+++ install.rb	Sat Oct 23 19:34:17 2010
-@@ -124,9 +124,6 @@ def do_man(man, strip = 'man/')
+--- install.rb.orig	Fri Sep 30 19:51:10 2011
++++ install.rb	Tue Oct  4 23:26:25 2011
+@@ -125,9 +125,6 @@ def do_man(man, strip = 'man/')
        FileUtils.chmod(0755, om)
        FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
      end

diff --git a/sysutils/ruby-puppet/patches/patch-lib_puppet_defaults_rb b/sysutils/ruby-puppet/patches/patch-lib_puppet_defaults_rb
@@ -1,7 +1,7 @@
-$OpenBSD: patch-lib_puppet_defaults_rb,v 1.4 2010/11/04 07:20:57 robert Exp $
---- lib/puppet/defaults.rb.orig	Fri Oct 29 09:57:15 2010
-+++ lib/puppet/defaults.rb	Fri Oct 29 09:58:43 2010
-@@ -379,8 +379,8 @@ module Puppet
+$OpenBSD: patch-lib_puppet_defaults_rb,v 1.5 2011/10/05 07:41:43 jasper Exp $
+--- lib/puppet/defaults.rb.orig	Fri Sep 30 19:51:10 2011
++++ lib/puppet/defaults.rb	Tue Oct  4 23:26:25 2011
+@@ -400,8 +400,8 @@ module Puppet
    )
 
    setdefaults(:master,

diff --git a/sysutils/ruby-puppet/patches/patch-lib_puppet_util_run_mode_rb b/sysutils/ruby-puppet/patches/patch-lib_puppet_util_run_mode_rb
@@ -1,12 +1,12 @@
-$OpenBSD: patch-lib_puppet_util_run_mode_rb,v 1.1 2010/10/24 10:23:48 robert Exp $
---- lib/puppet/util/run_mode.rb.orig	Sun Oct 24 12:20:37 2010
-+++ lib/puppet/util/run_mode.rb	Sun Oct 24 12:20:40 2010
+$OpenBSD: patch-lib_puppet_util_run_mode_rb,v 1.2 2011/10/05 07:41:43 jasper Exp $
+--- lib/puppet/util/run_mode.rb.orig	Tue Oct  4 23:25:45 2011
++++ lib/puppet/util/run_mode.rb	Tue Oct  4 23:25:59 2011
 @@ -34,7 +34,7 @@ module Puppet
 
        def var_dir
          which_dir(
--          (Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS, "puppet", "var") : "/var/lib/puppet"),
-+          (Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS, "puppet", "var") : "/var/puppet"),
+-          (Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var") : "/var/lib/puppet"),
++          (Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var") : "/var/puppet"),
            "~/.puppet/var"
          )
        end