diff options
| author | Steve Wills <swills@FreeBSD.org> | 2012-11-23 22:32:30 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2012-11-23 22:32:30 +0000 |
| commit | 5692af00ad5a2f35b23681c5f1835f26c0939ea4 (patch) | |
| tree | 2f7ddc5f3eaaaa14ab6de9827888993550ec7d83 /sysutils/puppet27 | |
| parent | cee79b9e0b229a6217fbacdf91c805939cb48b77 (diff) | |
- Update to 2.7.20
- Remove reversed and unnecessary patch for issue already fixed upstream
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=307689
Diffstat (limited to 'sysutils/puppet27')
| -rw-r--r-- | sysutils/puppet27/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/puppet27/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/puppet27/files/patch-exec.rb | 17 |
3 files changed, 3 insertions, 21 deletions
diff --git a/sysutils/puppet27/Makefile b/sysutils/puppet27/Makefile index 05519517c90d..238e7dd63631 100644 --- a/sysutils/puppet27/Makefile +++ b/sysutils/puppet27/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 2.7.19 -PORTREVISION= 1 +PORTVERSION= 2.7.20 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ diff --git a/sysutils/puppet27/distinfo b/sysutils/puppet27/distinfo index f0b40cd63478..1e64c18553e7 100644 --- a/sysutils/puppet27/distinfo +++ b/sysutils/puppet27/distinfo @@ -1,2 +1,2 @@ -SHA256 (puppet-2.7.19.tar.gz) = 13b103513253ae5af466c8fcf25f36cbc41290f824fa7580041f0700d23a3c3a -SIZE (puppet-2.7.19.tar.gz) = 1936300 +SHA256 (puppet-2.7.20.tar.gz) = 77d39513261bd38322b04aef5002c134de73e40343684cdff5459ab33703fafb +SIZE (puppet-2.7.20.tar.gz) = 1982220 diff --git a/sysutils/puppet27/files/patch-exec.rb b/sysutils/puppet27/files/patch-exec.rb deleted file mode 100644 index ff9d28983d96..000000000000 --- a/sysutils/puppet27/files/patch-exec.rb +++ /dev/null @@ -1,17 +0,0 @@ ---- lib/puppet/provider/exec.rb.orig 2012-08-21 17:41:17.000000000 -0400 -+++ lib/puppet/provider/exec.rb 2012-08-30 12:31:32.000000000 -0400 -@@ -66,11 +66,9 @@ - end - - def extractexe(command) -- if command.is_a? Array -- command.first -- elsif match = /^"([^"]+)"|^'([^']+)'/.match(command) -- # extract whichever of the two sides matched the content. -- match[1] or match[2] -+ # easy case: command was quoted -+ if command =~ /^"([^"]+)"/ -+ $1 - else - command.split(/ /)[0] - end |