From owner-svn-ports-head@freebsd.org Fri Aug 5 05:55:10 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 D8019BADA4A; Fri, 5 Aug 2016 05:55:10 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A54161C85; Fri, 5 Aug 2016 05:55:10 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pf0-x242.google.com with SMTP id y134so19549026pfg.3; Thu, 04 Aug 2016 22:55:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:reply-to:subject:references:to:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ijgLzcqaCkorxjYCkS5y64VtWCUBn3mKJ/EVxpnromo=; b=My/CSGWwRDP/LClbDLYn7LzD5ZXBwrXmRi+1+IVbU8gtQiziTf88MkyG0ENMRbuAGJ fTDpHVKOBZ9tRdgdcp+BmLw2mBgzv/cypm5kBvmfoZm4ymdMsSRyO7xhEPVdlwOFLSd7 jASo/3n/MqBtJZQuGfl4cIWJT0hPZHT3Q/I2RIZKu+lr6QdUzXsIWF3ahEH/40gtyp2c RQEOIOtcd7UYMBltLTojOLi4M/GSoWc9iKvRBGjgI3FSugzZpQ6RGjgS5zRMMOAZqDUg 541HSNlg/lHAjpwokzoCsuwW3Q4RZwjo02/0x2L9IetMBm0TyJYpPgxepoqkBCtYVRmJ TAFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:reply-to:subject:references:to:from :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=ijgLzcqaCkorxjYCkS5y64VtWCUBn3mKJ/EVxpnromo=; b=F8BL5JfiFoe9UAz4Rl/0+oKewkXo178o8UzTtfSmvtbjkeJhIbnnTkrTuivYHDhG9t gL/QJgEXfFt/OWsWYec4erelK5//ww4QxgkZoRpo35l8rG+a818zqX6QlxmAkmJHZ1Md z3ozqfpXqyFJsbN2WrMI2IH+WruHR6NA7wFW6FPNLZ35yu3xERq/0YJVISwyIJdxxAns lL+3sjjZ42WIUtxdMVQG59ewCelh6RjPsANOfcFOXDIjZqyDWfD2N4iRllm0x7PzivbO CfGIOsAXKHMB3i6oUZiJR2t2RmMWPM1U7XdvyyBcLjFuRj1LvKmompzXDIhWSeWmkAQT /0VQ== X-Gm-Message-State: AEkoouthGc68D2X+wKGbNVwOkag5bZRtsspv9pNs0ZzkhBzcY9QqPqIZMlXSeiF5YwEvJg== X-Received: by 10.98.144.144 with SMTP id q16mr114004612pfk.98.1470376510137; Thu, 04 Aug 2016 22:55:10 -0700 (PDT) Received: from ?IPv6:2001:44b8:31ae:7b01:f985:3c4b:2a0c:8bea? (2001-44b8-31ae-7b01-f985-3c4b-2a0c-8bea.static.ipv6.internode.on.net. [2001:44b8:31ae:7b01:f985:3c4b:2a0c:8bea]) by smtp.gmail.com with ESMTPSA id h125sm24434903pfg.54.2016.08.04.22.55.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Aug 2016 22:55:09 -0700 (PDT) Sender: Kubilay Kocak Reply-To: koobs@FreeBSD.org Subject: Re: svn commit: r419609 - in head/sysutils/tmux: . files References: <201608041319.u74DJYlN032743@repo.freebsd.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org, FreeBSD Ports Security Team From: Kubilay Kocak Message-ID: Date: Fri, 5 Aug 2016 15:54:55 +1000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:50.0) Gecko/20100101 Thunderbird/50.0a2 MIME-Version: 1.0 In-Reply-To: <201608041319.u74DJYlN032743@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-AU Content-Transfer-Encoding: 7bit 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: Fri, 05 Aug 2016 05:55:10 -0000 On 4/08/2016 11:19 PM, Mathieu Arnold wrote: > Author: mat > Date: Thu Aug 4 13:19:34 2016 > New Revision: 419609 > URL: https://svnweb.freebsd.org/changeset/ports/419609 > > Log: > Fix some Unicode characters not displaying correctly. > > PR: 211499 > Submitted by: Oleg Gushchenkov > Obtained from: https://github.com/tmux/tmux/commit/65e4c57d3a554940ed5cada6dfeff403ae8d9572 > Sponsored by: Absolight @ports-secteam, can you MFH this bugfix if possible please, I'm sure quarterly users will want and appreciate it. > Added: > head/sysutils/tmux/files/patch-utf8.c (contents, props changed) > Modified: > head/sysutils/tmux/Makefile (contents, props changed) > > Modified: head/sysutils/tmux/Makefile > ============================================================================== > --- head/sysutils/tmux/Makefile Thu Aug 4 12:53:33 2016 (r419608) > +++ head/sysutils/tmux/Makefile Thu Aug 4 13:19:34 2016 (r419609) > @@ -3,6 +3,7 @@ > > PORTNAME= tmux > PORTVERSION= 2.2 > +PORTREVISION= 1 > CATEGORIES= sysutils > MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/ > DISTFILES= ${DISTNAME}${EXTRACT_SUFX} > > Added: head/sysutils/tmux/files/patch-utf8.c > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/sysutils/tmux/files/patch-utf8.c Thu Aug 4 13:19:34 2016 (r419609) > @@ -0,0 +1,34 @@ > +commit 65e4c57d3a554940ed5cada6dfeff403ae8d9572 > +Author: Nicholas Marriott > +Date: 2016-04-29 12:47:15 +0100 > + > + Only assume width 1 when wcwidth() returns -1 on non-OpenBSD platforms. > + > +--- utf8.c.orig 2016-03-02 18:29:06 UTC > ++++ utf8.c > +@@ -115,8 +115,24 @@ utf8_width(wchar_t wc) > + int width; > + > + width = wcwidth(wc); > +- if (width < 0 || width > 0xff) > ++ if (width < 0 || width > 0xff) { > ++ log_debug("Unicode %04x, wcwidth() %d", wc, width); > ++ > ++#ifndef __OpenBSD__ > ++ /* > ++ * Many platforms (particularly and inevitably OS X) have no > ++ * width for relatively common characters (wcwidth() returns > ++ * -1); assume width 1 in this case. This will be wrong for > ++ * genuinely nonprintable characters, but they should be > ++ * rare. We may pass through stuff that ideally we would block, > ++ * but this is no worse than sending the same to the terminal > ++ * without tmux. > ++ */ > ++ if (width < 0) > ++ return (1); > ++#endif > + return (-1); > ++ } > + return (width); > + } > + >