Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Jan 2017 17:54:48 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r432525 - in head/databases/puppetdb: . files
Message-ID:  <201701261754.v0QHsmaY024510@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <fabianosidler@swissonline.ch>
  Approved by:	Zach Leslie <freebsd@zleslie.info> (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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701261754.v0QHsmaY024510>