From owner-svn-ports-all@freebsd.org Thu Jan 26 17:54:49 2017 Return-Path: Delivered-To: svn-ports-all@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 E37C1CC27F0; Thu, 26 Jan 2017 17:54:49 +0000 (UTC) (envelope-from swills@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 B01C6B5D; Thu, 26 Jan 2017 17:54:49 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0QHsm8x024512; Thu, 26 Jan 2017 17:54:48 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0QHsmaY024510; Thu, 26 Jan 2017 17:54:48 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201701261754.v0QHsmaY024510@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Thu, 26 Jan 2017 17:54:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432525 - in head/databases/puppetdb: . 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2017 17:54:50 -0000 Author: swills Date: Thu Jan 26 17:54:48 2017 New Revision: 432525 URL: https://svnweb.freebsd.org/changeset/ports/432525 Log: databases/puppetdb: broken RUBY_VERSION regex PR: 208814 Submitted by: Fabiano Sidler Approved by: Zach Leslie (maintainer) Added: head/databases/puppetdb/files/patch-ext_master_lib_puppet_util_puppetdb_char__encoding.rb (contents, props changed) Modified: head/databases/puppetdb/Makefile Modified: head/databases/puppetdb/Makefile ============================================================================== --- head/databases/puppetdb/Makefile Thu Jan 26 17:45:43 2017 (r432524) +++ head/databases/puppetdb/Makefile Thu Jan 26 17:54:48 2017 (r432525) @@ -2,7 +2,7 @@ PORTNAME= puppetdb PORTVERSION= 2.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases java MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ Added: head/databases/puppetdb/files/patch-ext_master_lib_puppet_util_puppetdb_char__encoding.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb/files/patch-ext_master_lib_puppet_util_puppetdb_char__encoding.rb Thu Jan 26 17:54:48 2017 (r432525) @@ -0,0 +1,11 @@ +--- ext/master/lib/puppet/util/puppetdb/char_encoding.rb.orig 2015-10-13 22:23:24 UTC ++++ ext/master/lib/puppet/util/puppetdb/char_encoding.rb +@@ -33,7 +33,7 @@ module CharEncoding + + + def self.utf8_string(str) +- if RUBY_VERSION =~ /1.8/ ++ if RUBY_VERSION =~ /^1\.8/ + # Ruby 1.8 doesn't have String#encode and related methods, and there + # appears to be a bug in iconv that will interpret some byte sequences + # as 6-byte characters. Thus, we are forced to resort to some unfortunate