cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r481438 comms/hylafax: Fix build with Clang 6 (and GCC7)

Browse Source 
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)
This commit is contained in:
Kubilay Kocak 2018-10-08 08:53:59 +00:00
parent af3ec38b8c
commit c47a0cb2f9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q4/; revision=481526
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
comms/hylafax/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= hylafax
PORTVERSION= 6.0.6
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= comms
MASTER_SITES= ftp://ftp.hylafax.org/source/

16
comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++ Normal file
View File

@ -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,'"'));