head 1.2; access; symbols pkgsrc-2013Q4:1.1.0.16 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.14 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.12 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.10 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.8 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.6 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.4 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.2; locks; strict; comment @# @; 1.2 date 2014.03.14.15.59.29; author adam; state dead; branches; next 1.1; commitid 4U3eHO9oNAEopGsx; 1.1 date 2012.04.08.03.25.03; author dholland; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2012.04.08.03.25.03; author spz; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2012.04.09.16.48.51; author spz; state Exp; branches; next ; desc @@ 1.2 log @Changes 6.0.6: These releases are maintenance releases, and do not contain any new features or functionality, but only contain bugfixes: * Re-order library files in fchmod() configure check * faxalter: Wire up the nissing page range -Z options * man: JobReqError/JobRetryError were missing in hylafax-config.4 * typerules: adding missing comma to typeNames array * Do not warn about one of the Fontpath directories not existing * Reworked how faxsetup looks for Fontmap * Use a private Fontmap.HylaFAX file of .pfb files * Combine all Fontmap files in memory, including new Fontmap.HylaFAX * Bug 934: We need to avoid a 0-index in playList * hfaxd: Eliminte extraneous debug logging * hfaxd: Make source port for active connections be ctrl port - 1 * hfaxd: Release old accept fd * Support libtiff 4.0 * faxsend: JobRetryOther/JobRequeueOther weren't actually being used * Make sure not to cut faxq FIFO messages in two when reaching end of buffer * hfaxd: Port is network byte order, correct logging of it @ text @$NetBSD: patch-hfaxd_FileSystem_c__,v 1.1 2012/04/08 03:25:03 dholland Exp $ Support libtiff 4.x. --- hfaxd/FileSystem.c++~ 2003-02-08 22:49:52.000000000 +0000 +++ hfaxd/FileSystem.c++ @@@@ -728,7 +728,7 @@@@ HylaFAXServer::nlstUnixFile(FILE* fd, co } static bool -isTIFF(const TIFFHeader& h) +isTIFF(const TIFFHeaderClassic& h) { if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN) return (false); @@@@ -741,7 +741,7 @@@@ isTIFF(const TIFFHeader& h) // byte swap version stamp if opposite byte order if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN)) TIFFSwabShort(&version); - return (version == TIFF_VERSION); + return (version == TIFF_VERSION_CLASSIC); } bool @@@@ -754,7 +754,7 @@@@ HylaFAXServer::docType(const char* docna if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) { union { char buf[512]; - TIFFHeader h; + TIFFHeaderClassic h; } b; ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b)); if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!') @ 1.1 log @Hack this to build against libtiff 4.x. With luck, it'll still work. Because it depends on changes to the API in libtiff 4.x, set the minimum BUILDLINK_API_DEPENDS accordingly. And, even though it wasn't building, bump PKGREVISION to 7; the new package depending on tiff>=4.0 needs to be distinguishable from the old package depending on tiff<4.0. XXX: This package desperately needs to be updated. It is years out of XXX: date with respect to upstream. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-hfaxd_FileSystem_c__ was added on branch pkgsrc-2012Q1 on 2012-04-09 16:48:51 +0000 @ text @d1 33 @ 1.1.2.2 log @Pullup ticket #3719 - requested by dholland comms/hylafax: build fix Revisions pulled up: - comms/hylafax/Makefile 1.65 - comms/hylafax/distinfo 1.23 - comms/hylafax/patches/patch-ae 1.16 - comms/hylafax/patches/patch-hfaxd_FileSystem_c__ 1.1 - comms/hylafax/patches/patch-hfaxd_FileTransfer_c__ 1.1 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: dholland Date: Sun Apr 8 03:25:04 UTC 2012 Modified Files: pkgsrc/comms/hylafax: Makefile distinfo pkgsrc/comms/hylafax/patches: patch-ae Added Files: pkgsrc/comms/hylafax/patches: patch-hfaxd_FileSystem_c__ patch-hfaxd_FileTransfer_c__ Log Message: Hack this to build against libtiff 4.x. With luck, it'll still work. Because it depends on changes to the API in libtiff 4.x, set the minimum BUILDLINK_API_DEPENDS accordingly. And, even though it wasn't building, bump PKGREVISION to 7; the new package depending on tiff>=4.0 needs to be distinguishable from the old package depending on tiff<4.0. XXX: This package desperately needs to be updated. It is years out of XXX: date with respect to upstream. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 pkgsrc/comms/hylafax/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/comms/hylafax/distinfo cvs rdiff -u -r1.15 -r1.16 pkgsrc/comms/hylafax/patches/patch-ae cvs rdiff -u -r0 -r1.1 \ pkgsrc/comms/hylafax/patches/patch-hfaxd_FileSystem_c__ \ pkgsrc/comms/hylafax/patches/patch-hfaxd_FileTransfer_c__ @ text @a0 33 $NetBSD$ Support libtiff 4.x. --- hfaxd/FileSystem.c++~ 2003-02-08 22:49:52.000000000 +0000 +++ hfaxd/FileSystem.c++ @@@@ -728,7 +728,7 @@@@ HylaFAXServer::nlstUnixFile(FILE* fd, co } static bool -isTIFF(const TIFFHeader& h) +isTIFF(const TIFFHeaderClassic& h) { if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN) return (false); @@@@ -741,7 +741,7 @@@@ isTIFF(const TIFFHeader& h) // byte swap version stamp if opposite byte order if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN)) TIFFSwabShort(&version); - return (version == TIFF_VERSION); + return (version == TIFF_VERSION_CLASSIC); } bool @@@@ -754,7 +754,7 @@@@ HylaFAXServer::docType(const char* docna if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) { union { char buf[512]; - TIFFHeader h; + TIFFHeaderClassic h; } b; ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b)); if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!') @