From owner-svn-ports-all@freebsd.org Mon Oct 8 08:54:00 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1601510B8428; Mon, 8 Oct 2018 08:54:00 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BF8D18114D; Mon, 8 Oct 2018 08:53:59 +0000 (UTC) (envelope-from koobs@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B8FFF2064F; Mon, 8 Oct 2018 08:53:59 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w988rx14099166; Mon, 8 Oct 2018 08:53:59 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w988rxbu099164; Mon, 8 Oct 2018 08:53:59 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201810080853.w988rxbu099164@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 8 Oct 2018 08:53:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r481526 - in branches/2018Q4/comms/hylafax: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: in branches/2018Q4/comms/hylafax: . files X-SVN-Commit-Revision: 481526 X-SVN-Commit-Repository: ports 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.27 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: Mon, 08 Oct 2018 08:54:00 -0000 Author: koobs Date: Mon Oct 8 08:53:59 2018 New Revision: 481526 URL: https://svnweb.freebsd.org/changeset/ports/481526 Log: MFH: r481438 comms/hylafax: Fix build with Clang 6 (and GCC7) Add patch from upstream HylaFAX+, fixing a Clang 6 (and GCC7) build error: FaxRecvInfo.c++:115:17: error: comparison between pointer and integer ('const char *' and 'int') while (cp+2 != '\0') { ~~~~ ^ ~~~~ [1] http://bugs.hylafax.org/show_bug.cgi?id=971 [2] https://sourceforge.net/p/hylafax/HylaFAX+/2417/ [3] See Also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853448 PR: 225372 Reported by: O. Hartmann Obtained from: HylaFAX+ [2] Approved by: ports-secteam (miwi) Added: branches/2018Q4/comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++ - copied unchanged from r481438, head/comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++ Modified: branches/2018Q4/comms/hylafax/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/comms/hylafax/Makefile ============================================================================== --- branches/2018Q4/comms/hylafax/Makefile Mon Oct 8 08:52:51 2018 (r481525) +++ branches/2018Q4/comms/hylafax/Makefile Mon Oct 8 08:53:59 2018 (r481526) @@ -3,7 +3,7 @@ PORTNAME= hylafax PORTVERSION= 6.0.6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= comms MASTER_SITES= ftp://ftp.hylafax.org/source/ Copied: branches/2018Q4/comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++ (from r481438, head/comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++ Mon Oct 8 08:53:59 2018 (r481526, copy of r481438, head/comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++) @@ -0,0 +1,16 @@ +PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225372 +Upstream: http://bugs.hylafax.org/show_bug.cgi?id=971 +Obtained from: https://sourceforge.net/p/hylafax/HylaFAX+/2417/ +See Also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853448 + +--- libhylafax/FaxRecvInfo.c++.orig 2018-10-07 07:40:23 UTC ++++ libhylafax/FaxRecvInfo.c++ +@@ -112,7 +112,7 @@ FaxRecvInfo::decode(const char* cp) + if (cp == NULL || cp[1] != ',' || cp[2] != '"') + return (false); + u_int i = 0; +- while (cp+2 != '\0') { ++ while (*(cp+2) != '\0') { + callid[i] = cp+3; // +1 for "/+1 for ,/+1 for " + if (*cp == '\"') break; + callid[i].resize(callid[i].next(0,'"'));