Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 8 Oct 2018 08:53:59 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
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
Message-ID:  <201810080853.w988rxbu099164@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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 <ohartmann walstatt org>
  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,'"'));

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