Date: Mon, 27 May 2013 18:53:18 +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: r319278 - in head/net/rubygem-net-ldap: . files Message-ID: <201305271853.r4RIrITX014529@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon May 27 18:53:17 2013 New Revision: 319278 URL: http://svnweb.freebsd.org/changeset/ports/319278 Log: - Add patch to work correctly with ruby19 PR: ports/177883 Submitted by: Rainer Duffner <rainer@ultra-secure.de> Obtained from: https://github.com/ruby-ldap/ruby-net-ldap/pull/41/files (upstream) Added: head/net/rubygem-net-ldap/files/ head/net/rubygem-net-ldap/files/patch-ruby19 (contents, props changed) Modified: head/net/rubygem-net-ldap/Makefile (contents, props changed) Modified: head/net/rubygem-net-ldap/Makefile ============================================================================== --- head/net/rubygem-net-ldap/Makefile Mon May 27 17:49:44 2013 (r319277) +++ head/net/rubygem-net-ldap/Makefile Mon May 27 18:53:17 2013 (r319278) @@ -1,12 +1,9 @@ -# New ports collection makefile for: rubygem-net-ldap -# Date created: 2010-05-13 -# Whom: Jyun-Yan You <jyyou@cs.nctu.edu.tw> -# +# Whom: Jyun-Yan You <jyyou@cs.nctu.edu.tw> # $FreeBSD$ -# PORTNAME= net-ldap PORTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG Added: head/net/rubygem-net-ldap/files/patch-ruby19 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/rubygem-net-ldap/files/patch-ruby19 Mon May 27 18:53:17 2013 (r319278) @@ -0,0 +1,15 @@ +--- lib/net/ber/core_ext/string.rb ++++ lib/net/ber/core_ext/string.rb +@@ -20,7 +20,11 @@ def raw_utf8_encoded + if self.respond_to?(:encode) + # Strings should be UTF-8 encoded according to LDAP. + # However, the BER code is not necessarily valid UTF-8 +- self.encode('UTF-8').force_encoding('ASCII-8BIT') ++ begin ++ self.encode('UTF-8').force_encoding('ASCII-8BIT') ++ rescue Encoding::UndefinedConversionError ++ self ++ end + else + self + end
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305271853.r4RIrITX014529>