1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-22 00:35:15 +00:00

Update to version 3.6.1.

PR:		189450, Bartek Rutkowski <ports@robakdesign.com>
PR:		189886, demon
PR:		190325, Bartek Rutkowski <ports@robakdesign.com>
Approved by:	maintainer timeout (2-3 weeks)
This commit is contained in:
Dmitry Sivachenko 2014-06-02 10:12:31 +00:00
parent e0f8f4bfd5
commit 42aa7ce39a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=356209
4 changed files with 3 additions and 20 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= puppet
PORTVERSION= 3.4.3
PORTREVISION= 1
PORTVERSION= 3.6.1
CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/

View File

@ -1,2 +1,2 @@
SHA256 (puppet-3.4.3.tar.gz) = 5f991b54b6a272914f4dda5aaafb86f08855d65adad46941a72192feefe2ba0f
SIZE (puppet-3.4.3.tar.gz) = 1952505
SHA256 (puppet-3.6.1.tar.gz) = f3f8ba0243398f4a79a5f62e780a90b12dd0d770266256b446385952a1f0002f
SIZE (puppet-3.6.1.tar.gz) = 2248333

View File

@ -1,15 +0,0 @@
--- ./lib/puppet/rails/resource.rb.orig 2013-10-07 18:00:47.000000000 +0000
+++ ./lib/puppet/rails/resource.rb 2013-12-20 16:47:14.340897154 +0000
@@ -84,7 +84,11 @@
end
def [](param)
- super || parameter(param)
+ if param == 'id'
+ super
+ else
+ super || parameter(param)
+ end
end
# Make sure this resource is equivalent to the provided Parser resource.

View File

@ -43,7 +43,6 @@ man/man8/puppet.8.gz
%%RUBY_SITELIBDIR%%/puppetx/puppetlabs/syntax_checkers/json.rb
%%RUBY_SITELIBDIR%%/puppetx/puppet/syntax_checker.rb
%%RUBY_SITELIBDIR%%/puppetx/puppet/bindings_scheme_handler.rb
%%RUBY_SITELIBDIR%%/puppetx/puppet/hiera2_backend.rb
%%RUBY_SITELIBDIR%%/puppetx.rb
%%ETCDIR%%/puppet.conf-dist
%%ETCDIR%%/auth.conf-dist