From owner-svn-ports-head@freebsd.org Wed May 18 12:07:43 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC6C3B3F6DF; Wed, 18 May 2016 12:07:43 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 95A291E70; Wed, 18 May 2016 12:07:43 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4IC7gMD062174; Wed, 18 May 2016 12:07:42 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4IC7gO3062171; Wed, 18 May 2016 12:07:42 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201605181207.u4IC7gO3062171@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 18 May 2016 12:07:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415436 - in head/sysutils/puppet37: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2016 12:07:44 -0000 Author: bapt Date: Wed May 18 12:07:42 2016 New Revision: 415436 URL: https://svnweb.freebsd.org/changeset/ports/415436 Log: Fix with ruby 2.2 Sponsored by: Gandi.net Added: head/sysutils/puppet37/files/patch-lib_puppet_vendor_safe__yaml_lib_safe__yaml.rb (contents, props changed) head/sysutils/puppet37/files/patch-spec_unit_reports_store__spec.rb (contents, props changed) Modified: head/sysutils/puppet37/Makefile Modified: head/sysutils/puppet37/Makefile ============================================================================== --- head/sysutils/puppet37/Makefile Wed May 18 11:59:57 2016 (r415435) +++ head/sysutils/puppet37/Makefile Wed May 18 12:07:42 2016 (r415436) @@ -3,7 +3,7 @@ PORTNAME= puppet PORTVERSION= 3.7.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 37 @@ -34,13 +34,6 @@ SUB_LIST= RUBY=${RUBY} OPTIONS_DEFINE= DOCS EXAMPLES -.include - -# puppet 4.x should support ruby 2.2.x -.if ${RUBY_VER} >= 2.2 -BROKEN= Does not work with Ruby 2.2 -.endif - post-patch: @${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \ ${WRKSRC}/install.rb \ @@ -74,4 +67,4 @@ do-install: cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/ext/rack/example-passenger-vhost.conf ${STAGEDIR}${EXAMPLESDIR} -.include +.include Added: head/sysutils/puppet37/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/puppet37/files/patch-lib_puppet_vendor_safe__yaml_lib_safe__yaml.rb Wed May 18 12:07:42 2016 (r415436) @@ -0,0 +1,11 @@ +--- lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb.orig 2015-03-25 16:32:47 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" Added: head/sysutils/puppet37/files/patch-spec_unit_reports_store__spec.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/puppet37/files/patch-spec_unit_reports_store__spec.rb Wed May 18 12:07:42 2016 (r415436) @@ -0,0 +1,11 @@ +--- spec/unit/reports/store_spec.rb.orig 2015-03-25 16:32:48 UTC ++++ spec/unit/reports/store_spec.rb +@@ -24,7 +24,7 @@ describe processor do + end + + it "should write the report to the file in YAML" do +- Time.stubs(:now).returns(Time.parse("2011-01-06 12:00:00 UTC")) ++ Time.stubs(:now).returns(Time.utc(2011,01,06,12,00,00)) + @report.process + + File.read(File.join(Puppet[:reportdir], @report.host, "201101061200.yaml")).should == @report.to_yaml