1
Description: Undocumented upstream changes
2
This patch has been created by dpkg-source during the package build
3
but it might have accumulated changes from several uploads. Please
4
check the changelog to (hopefully) learn more on those changes.
6
--- puppet-2.7.1.orig/Rakefile
7
+++ puppet-2.7.1/Rakefile
1
Description: <short summary of the patch>
2
TODO: Put a short summary on the line above and replace this paragraph
3
with a longer explanation of this change. Complete the meta-information
4
with other relevant fields (see below for details). To make it easier, the
5
information below has been extracted from the changelog. Adjust it or drop
8
puppet (2.7.6-1) unstable; urgency=high
10
* New upstream release (CVE-2011-3872)
11
* Remove cherry-picked "groupadd_aix_warning" patch
12
* Install all new manpages
13
Author: Stig Sandbeck Mathisen <ssm@debian.org>
16
The information above should follow the Patch Tagging Guidelines, please
17
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
18
are templates for supplementary fields that you might want to add:
20
Origin: <vendor|upstream|other>, <url of original patch>
21
Bug: <url in upstream bugtracker>
22
Bug-Debian: http://bugs.debian.org/<bugnumber>
23
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
24
Forwarded: <no|not-needed|url proving that it has been forwarded>
25
Reviewed-By: <name and email of someone who approved the patch>
26
Last-Update: <YYYY-MM-DD>
28
--- puppet-2.7.6.orig/Rakefile
29
+++ puppet-2.7.6/Rakefile
8
30
@@ -9,7 +9,7 @@ require 'rspec'
9
31
require "rspec/core/rake_task"
16
38
Dir['tasks/**/*.rake'].each { |t| load t }
17
--- puppet-2.7.1.orig/test/lib/puppettest/fakes.rb
18
+++ puppet-2.7.1/test/lib/puppettest/fakes.rb
39
--- puppet-2.7.6.orig/test/lib/puppettest/fakes.rb
40
+++ puppet-2.7.6/test/lib/puppettest/fakes.rb
20
42
-require File.expand_path(File.join(File.dirname(__FILE__), '../../../lib/puppet/util'))
21
43
+require '/usr/lib/ruby/1.8/puppet/util'
24
46
# A baseclass for the faketypes.
25
--- puppet-2.7.1.orig/lib/puppet/provider/service/init.rb
26
+++ puppet-2.7.1/lib/puppet/provider/service/init.rb
47
--- puppet-2.7.6.orig/lib/puppet/provider/service/init.rb
48
+++ puppet-2.7.6/lib/puppet/provider/service/init.rb
27
49
@@ -134,7 +134,15 @@ Puppet::Type.type(:service).provide :ini
28
50
# we just return that; otherwise, we return false, which causes it to
29
51
# fallback to other mechanisms.
44
--- puppet-2.7.1.orig/ext/rack/files/apache2.conf
45
+++ puppet-2.7.1/ext/rack/files/apache2.conf
66
--- puppet-2.7.6.orig/ext/rack/files/apache2.conf
67
+++ puppet-2.7.6/ext/rack/files/apache2.conf
48
70
-# you probably want to tune these settings
98
120
AllowOverride None
100
--- puppet-2.7.1.orig/lib/puppet/network/rest_authconfig.rb
101
+++ puppet-2.7.1/lib/puppet/network/rest_authconfig.rb
102
@@ -18,6 +18,7 @@ module Puppet
103
{ :acl => "/certificate/", :method => :find, :authenticated => false },
104
{ :acl => "/certificate_request", :method => [:find, :save], :authenticated => false },
105
{ :acl => "/status", :method => [:find], :authenticated => true },
106
+ { :acl => "/resource", :method => [:find, :save, :search], :authenticated => true },