Date: Sat, 8 Aug 2015 20:44:12 +0000 (UTC) From: Michael Moll <mmoll@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393745 - in head/sysutils/puppet: . files Message-ID: <201508082044.t78KiCid042747@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmoll Date: Sat Aug 8 20:44:11 2015 New Revision: 393745 URL: https://svnweb.freebsd.org/changeset/ports/393745 Log: sysutils/puppet: update to 3.8.2 unbreak on Ruby 2.2 [1] Approved by: swills (maintainer) Obtained from: safe_yaml upstream (commit e281053e) [1] Added: head/sysutils/puppet/files/patch-lib_puppet_vendor_safe__yaml_lib_safe__yaml.rb (contents, props changed) Modified: head/sysutils/puppet/Makefile head/sysutils/puppet/distinfo Modified: head/sysutils/puppet/Makefile ============================================================================== --- head/sysutils/puppet/Makefile Sat Aug 8 20:29:52 2015 (r393744) +++ head/sysutils/puppet/Makefile Sat Aug 8 20:44:11 2015 (r393745) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 3.8.1 -PORTREVISION= 1 +PORTVERSION= 3.8.2 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ @@ -52,11 +51,6 @@ BROKEN= PACKAGE_ROOT option patch is inc .include <bsd.port.pre.mk> -# puppet 4.x should support ruby 2.2.x -.if ${RUBY_VER} >= 2.2 -BROKEN= Does not work with Ruby 2.2 -.endif - .if ${PORT_OPTIONS:MPACKAGE_ORIGIN} EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_origin RUN_DEPENDS+= rubygem-bzip2-ruby>=0:${PORTSDIR}/archivers/rubygem-bzip2-ruby Modified: head/sysutils/puppet/distinfo ============================================================================== --- head/sysutils/puppet/distinfo Sat Aug 8 20:29:52 2015 (r393744) +++ head/sysutils/puppet/distinfo Sat Aug 8 20:44:11 2015 (r393745) @@ -1,2 +1,2 @@ -SHA256 (puppet-3.8.1.tar.gz) = 033d99125276c7062fa5928e3de38c5e487b406530b3c50e84027b3abfd945a8 -SIZE (puppet-3.8.1.tar.gz) = 2633982 +SHA256 (puppet-3.8.2.tar.gz) = 5a89c623f22fc96a2919801ff874b10f8f1a66e95c09976c73b257b8bbc39986 +SIZE (puppet-3.8.2.tar.gz) = 2637591 Added: head/sysutils/puppet/files/patch-lib_puppet_vendor_safe__yaml_lib_safe__yaml.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/puppet/files/patch-lib_puppet_vendor_safe__yaml_lib_safe__yaml.rb Sat Aug 8 20:44:11 2015 (r393745) @@ -0,0 +1,11 @@ +--- lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb.orig 2015-08-06 16:17:42 UTC ++++ lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb +@@ -3,7 +3,7 @@ require "yaml" + # This needs to be defined up front in case any internal classes need to base + # their behavior off of this. + module SafeYAML +- YAML_ENGINE = defined?(YAML::ENGINE) ? YAML::ENGINE.yamler : "syck" ++ YAML_ENGINE = defined?(YAML::ENGINE) ? YAML::ENGINE.yamler : (defined?(Psych) && YAML == Psych ? "psych" : "syck") + end + + require "set"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508082044.t78KiCid042747>