CVS commit: pkgsrc/comms/hylafax

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu May 14 19:17:45 UTC 2020

Modified Files:
        pkgsrc/comms/hylafax: Makefile distinfo
        pkgsrc/comms/hylafax/patches: patch-ae
Added Files:
        pkgsrc/comms/hylafax/patches: patch-libhylafax_FaxRecvInfo.c++

Log Message:
Fix compare of pointer and NUL constant. Allow newer libtiff. Bump
revision.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/comms/hylafax/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/comms/hylafax/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/comms/hylafax/patches/patch-ae
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/comms/hylafax/patches/patch-libhylafax_FaxRecvInfo.c++

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/comms/hylafax/Makefile
diff -u pkgsrc/comms/hylafax/Makefile:1.73 pkgsrc/comms/hylafax/Makefile:1.74
--- pkgsrc/comms/hylafax/Makefile:1.73  Sun Jan 26 17:30:50 2020
+++ pkgsrc/comms/hylafax/Makefile       Thu May 14 19:17:45 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2020/01/26 17:30:50 rillig Exp $
+# $NetBSD: Makefile,v 1.74 2020/05/14 19:17:45 joerg Exp $
 
 DISTNAME=      hylafax-6.0.6
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    comms
 MASTER_SITES=  ftp://ftp.hylafax.org/source/
 

Index: pkgsrc/comms/hylafax/distinfo
diff -u pkgsrc/comms/hylafax/distinfo:1.28 pkgsrc/comms/hylafax/distinfo:1.29
--- pkgsrc/comms/hylafax/distinfo:1.28  Tue Nov  3 01:34:54 2015
+++ pkgsrc/comms/hylafax/distinfo       Thu May 14 19:17:45 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2015/11/03 01:34:54 agc Exp $
+$NetBSD: distinfo,v 1.29 2020/05/14 19:17:45 joerg Exp $
 
 SHA1 (hylafax-6.0.6.tar.gz) = 8d8cc9a5f242ef83d7bc6f5cd200fec1351b280e
 RMD160 (hylafax-6.0.6.tar.gz) = 1f6e3022fe9886f2cde9fb406277d5496ee24f1c
@@ -8,7 +8,7 @@ SHA1 (patch-aa) = 54f34633757a4925084d9e
 SHA1 (patch-ab) = 5ee930814178223fa66dd308f365ff400559fd1d
 SHA1 (patch-ac) = b2051ac2e43d0635797043605d96f128e535c976
 SHA1 (patch-ad) = a7e361980c94a025be0b326c1cf694cce3cbff72
-SHA1 (patch-ae) = 75024769daca0657e8c0ba4a655ee7993c453120
+SHA1 (patch-ae) = 0c54469c43434590f00372b71af31eb526c79be6
 SHA1 (patch-af) = f1dd817fcd086bfdd354351dc0b92027250edcba
 SHA1 (patch-ag) = 52024e0184e2607c6cfb2c6c19c9f31b3c37ec95
 SHA1 (patch-ah) = 8558a0f9d970ce1cddbeb76fc87a1c450bd0941d
@@ -18,4 +18,5 @@ SHA1 (patch-am) = b004485310a2257630561a
 SHA1 (patch-an) = de131bcdeb22a2f7daadbaf86d0aa00b841512af
 SHA1 (patch-ao) = d46c0c4d3e3e6309a807fa5c335888a3c28886d8
 SHA1 (patch-ap) = 419036385f1d0582ab6e5dd0710f5bbf41744e0f
+SHA1 (patch-libhylafax_FaxRecvInfo.c++) = 03f77a21b11b4e409e2f860b5056600023621214
 SHA1 (patch-rules.in) = 4c9604ce9fc5848764adfdbd2e39cc7576674ebc

Index: pkgsrc/comms/hylafax/patches/patch-ae
diff -u pkgsrc/comms/hylafax/patches/patch-ae:1.19 pkgsrc/comms/hylafax/patches/patch-ae:1.20
--- pkgsrc/comms/hylafax/patches/patch-ae:1.19  Mon Aug 10 05:03:36 2015
+++ pkgsrc/comms/hylafax/patches/patch-ae       Thu May 14 19:17:45 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.19 2015/08/10 05:03:36 dholland Exp $
+$NetBSD: patch-ae,v 1.20 2020/05/14 19:17:45 joerg Exp $
 
 * Customize paths.
 * Configure for pkgsrc.
@@ -146,6 +146,15 @@ symbols aren't resolved at link time.
  {
      printf( "header_ver=%d lib_ver=%s", TIFFLIB_VERSION, TIFFGetVersion() );
      exit(0);
+@@ -2563,7 +2563,7 @@ EOF
+                               tiff_offset_t="uint32"
+                               tiff_bytecount_t="uint32"
+                               ;;
+-              4.[0])          tiff_runlen_t="uint32"
++              4.[01])         tiff_runlen_t="uint32"
+                               tiff_offset_t="uint64"
+                               tiff_bytecount_t="uint64"
+                               echo '#define TIFFHeader        TIFFHeaderClassic'
 @@ -3281,7 +3281,7 @@ CheckForSyslog()
  {
      (echo '#include <syslog.h>';

Added files:

Index: pkgsrc/comms/hylafax/patches/patch-libhylafax_FaxRecvInfo.c++
diff -u /dev/null pkgsrc/comms/hylafax/patches/patch-libhylafax_FaxRecvInfo.c++:1.1
--- /dev/null   Thu May 14 19:17:45 2020
+++ pkgsrc/comms/hylafax/patches/patch-libhylafax_FaxRecvInfo.c++       Thu May 14 19:17:45 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-libhylafax_FaxRecvInfo.c++,v 1.1 2020/05/14 19:17:45 joerg Exp $
+
+--- libhylafax/FaxRecvInfo.c++.orig    2020-05-12 14:59:48.960689473 +0000
++++ 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,'"'));