FreeBSD Bugzilla – Attachment 61821 Details for
Bug 92572
[PATCH] comms/hylafax update to 4.2.5 and unbreak
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
hylafax.patch
hylafax.patch (text/plain), 22.77 KB, created by
Pawel Pekala
on 2006-01-30 22:50:03 UTC
(
hide
)
Description:
hylafax.patch
Filename:
MIME Type:
Creator:
Pawel Pekala
Created:
2006-01-30 22:50:03 UTC
Size:
22.77 KB
patch
obsolete
>diff -urN /usr/ports/comms/hylafax/Makefile hylafax/Makefile >--- /usr/ports/comms/hylafax/Makefile Mon Jan 30 22:17:39 2006 >+++ hylafax/Makefile Mon Jan 30 22:12:37 2006 >@@ -6,8 +6,7 @@ > # > > PORTNAME= hylafax >-PORTVERSION= 4.2.1 >-PORTREVISION= 3 >+PORTVERSION= 4.2.5 > CATEGORIES= comms > MASTER_SITES= ftp://ftp.hylafax.org/source/ > >@@ -22,8 +21,6 @@ > jpeg:${PORTSDIR}/graphics/jpeg > > RUN_DEPENDS= gawk:${PORTSDIR}/lang/gawk >- >-BROKEN= Configure fails > > DIST_SUBDIR= hylafax > >diff -urN /usr/ports/comms/hylafax/distinfo hylafax/distinfo >--- /usr/ports/comms/hylafax/distinfo Mon Jan 30 22:17:58 2006 >+++ hylafax/distinfo Mon Jan 30 22:29:31 2006 >@@ -1,3 +1,2 @@ >-MD5 (hylafax/hylafax-4.2.1.tar.gz) = 05430e41a279d0fff6d6e4b444440829 >-SHA256 (hylafax/hylafax-4.2.1.tar.gz) = 1f8bf5f7115e97cb7a97851e7dfdea84104ea255392d1c5da05f7f9ba67fc284 >-SIZE (hylafax/hylafax-4.2.1.tar.gz) = 1412035 >+MD5 (hylafax/hylafax-4.2.5.tar.gz) = 5989c2638f79b178cbe935882cd58f3e >+SIZE (hylafax/hylafax-4.2.5.tar.gz) = 1450958 >diff -urN /usr/ports/comms/hylafax/files/patch-configure hylafax/files/patch-configure >--- /usr/ports/comms/hylafax/files/patch-configure Mon Jan 30 21:28:03 2006 >+++ hylafax/files/patch-configure Mon Jan 30 23:32:08 2006 >@@ -1,131 +1,11 @@ >---- configure.orig Tue Dec 28 05:45:03 2004 >-+++ configure Wed Jan 12 23:15:17 2005 >-@@ -43,8 +43,8 @@ >- DIR_LIB=/usr/local/lib >- DIR_LIBEXEC=$DIR_SBIN >- DIR_SPOOL=/var/spool/hylafax >--DIR_HTML=/var/httpd/htdocs/hylafax >--DIR_CGI=/var/httpd/cgi-bin >-+DIR_HTML=/usr/local/share/doc/hylafax >-+DIR_CGI=/usr/local/share/doc/hylafax/cgi-bin >- PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe >- PATH_IMPRIP=/usr/lib/print/psrip >- HTMLPATH=/hylafax >-@@ -52,9 +52,9 @@ >- DEFVRES=98 >- PAGESIZE="North American Letter" >- FAXUID=uucp >--FAXGID= >--SYSUID=bin >--SYSGID= >-+FAXGID=dialer >-+SYSUID=root >-+SYSGID=wheel >- DSO=auto >- GETTY=auto >- HTML=no >-@@ -384,7 +384,7 @@ >- -srcdir=*|--srcdir=*) SRCDIR="$ac_optarg";; >- -target|--target) ac_prev=TARGET;; >- -target=*|--target=*) TARGET="$ac_optarg" ;; >-- -disable-pam|--disable-pam) DISABLE_PAM="yes" ;; >-+ -disable-pam|--disable-pam) DISABLE_PAM="yes" ;; >- -version|--version) >- echo "This is HylaFAX configure $Revision: 1.106 $" >- exit 0 >-@@ -1578,11 +1578,11 @@ >- if [ "$DISABLE_PAM" != "yes" ]; then >- Note "Checking for PAM (Pluggable Authentication Module) support" >- CheckForLibrary pam_authenticate -lpam && >-- CheckForLibrary misc_conv -lpam_misc -lpam && >-+ CheckForLibrary misc_conv -lpam && >- CheckForIncludeFile security/pam_appl.h && >- CheckForIncludeFile security/pam_misc.h && { >- HAVE_PAM="#define HAVE_PAM 1" >-- PAMLIBS="-lpam -lpam_misc" >-+ PAMLIBS="-lpam" >- } >- if [ "x$PAMLIBS" = "x" ]; then >- Note "... not found. Disabling PAM support" >-@@ -2661,5 +2661,4 @@ >- CheckFuncDecl strtoul \ >- 'extern unsigned long strtoul(const char*, char**, int);' stdlib.h >-- CheckFuncDecl cuserid 'extern char* cuserid(char*);' stdio.h >- # >- # unistd.h is for sco3.2v4.[0-2] and GNU libc (yech!) >-@@ -2677,8 +2676,4 @@ >- CheckStdio fdopen 'extern FILE* fdopen(int, const char*);' >- CheckStdio snprintf 'extern int snprintf(char*, size_t, const char*,...);' >-- CheckForFuncDecl vsnprintf stdio.h || { >-- echo '#include <stdarg.h>' >-- AddFuncDecl vsnprintf 'extern int vsnprintf(char*, size_t, const char*, va_list);' >-- } >- CheckForDefine fileno stdio.h || { >- CheckStdio fileno 'extern int fileno(FILE*);' >-@@ -3010,5 +3005,4 @@ >- >- FUNCS=" >-- cuserid >- flock >- ftruncate >-@@ -3024,5 +3018,4 @@ >- strtod >- strtoul >-- vsnprintf >- writev >- " >-@@ -4326,18 +4326,8 @@ >- >- HylaFAX configuration parameters (part 1 of 2) are: >- >--[ 1] Directory for applications: $DIR_BIN >--[ 2] Directory for lib data files: $DIR_LIBDATA >--[ 3] Directory for lib executables: $DIR_LIBEXEC >--[ 4] Directory for system apps: $DIR_SBIN >--[ 5] Directory for manual pages: $DIR_MAN >--[ 6] Directory for HTML documentation: $DIR_HTML >--[ 7] Directory for spooling: $DIR_SPOOL >--[ 8] Directory for uucp lock files: $DIR_LOCKS >--[ 9] Uucp lock file scheme: $LOCKS >- [10] PostScript imager package: $PS >- [11] PostScript imager program: $PATH_PSRIP >--[12] Manual page installation scheme: $MANSCHEME >- [13] Default page size: $PAGESIZE >- [14] Default vertical res (lpi): $DEFVRES >- >-@@ -4353,16 +4343,11 @@ >- [15] Location of getty program: $PATH_GETTY >- [16] Location of voice getty program: $PATH_VGETTY >- [17] Location of sendmail program: $PATH_SENDMAIL >--[18] Location of TIFF tools: $TIFFBIN >--[19] Location of SysV init scripts: $DIR_SYSVINIT >--[20] Location of SysV start scripts: $DIR_SYSVINITSTART >--[21] Location of SysV stop scripts: $DIR_SYSVINITSTOP >--[22] Name of SysV start script: $NAME_SYSVINITSTART >--[23] Name of SysV stop script: $NAME_SYSVINITSTOP >- [24] Init script starts faxq: $FAXQ_SERVER >- [25] Init script starts hfaxd $HFAXD_SERVER >- [26] Start old protocol: $HFAXD_OLD_PROTOCOL >- [27] Start paging protocol: $HFAXD_SNPP_SERVER >-+ >- EOF >- } >- >-@@ -4463,7 +4448,7 @@ >- ok=skip >- while [ "$ok" != y ] && [ "$ok" != yes ]; do >- if [ "$ok" != skip ]; then >-- for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 ; do >-+ for i in 10 11 13 14 ; do >- promptForParameter $i; >- done >- fi >-@@ -4492,7 +4477,7 @@ >- ok=skip >- while [ "$ok" != y ] && [ "$ok" != yes ]; do >- if [ "$ok" != skip ]; then >-- for i in 15 16 17 18 19 20 21 22 23 24 25 26 27 ; do >-+ for i in 15 16 17 24 25 26 27 ; do >- promptForParameter $i; >- done >+--- configure.orig Mon Jan 30 23:31:09 2006 >++++ configure Mon Jan 30 23:31:32 2006 >+@@ -2418,7 +2418,7 @@ >+ if [ ${header_ver} -ge 19960307 ]; then >+ case ${lib_ver} in >+ 3.4) tiff_runlen_t="uint16" ;; >+- 3.[567]) tiff_runlen_t="uint32" ;; >++ 3.[5678]) tiff_runlen_t="uint32" ;; >+ esac > fi >+ else >diff -urN /usr/ports/comms/hylafax/files/patch-cuserid hylafax/files/patch-cuserid >--- /usr/ports/comms/hylafax/files/patch-cuserid Mon Aug 1 18:21:23 2005 >+++ hylafax/files/patch-cuserid Thu Jan 1 01:00:00 1970 >@@ -1,99 +0,0 @@ >---- util/SNPPClient.c++ Sat Feb 8 17:49:57 2003 >-+++ util/SNPPClient.c++ Sun Jul 24 14:54:33 2005 >-@@ -247,17 +247,11 @@ >- SNPPClient::setupUserIdentity(fxStr& emsg) >- { >-- struct passwd* pwd = NULL; >-- char* name = cuserid(NULL); >-- if (!name) { >-- name = getlogin(); >-- if (name) >-- pwd = getpwnam(name); >-- } >-- if (!pwd) >-- pwd = getpwuid(getuid()); >-+ struct passwd* pwd; >-+ >-+ pwd = getpwuid(getuid()); >- if (!pwd) { >- emsg = fxStr::format( >-- "Can not locate your password entry (account name %s, uid %lu).", >-- (name ? name : "<unspecified>"), (u_long) getuid()); >-+ "Can not locate your password entry (uid %lu): %s.", >-+ (u_long) getuid(), strerror(errno)); >- return (false); >- } >---- util/TextFormat.c++ Thu Nov 20 16:23:17 2003 >-+++ util/TextFormat.c++ Sun Jul 24 14:55:47 2005 >-@@ -510,5 +510,5 @@ >- time_t t = Sys::now(); >- fprintf(output, "%%%%CreationDate: %s", ctime(&t)); >-- char* cp = cuserid(NULL); >-+ char* cp = getlogin(); >- fprintf(output, "%%%%For: %s\n", cp ? cp : ""); >- fputs("%%Origin: 0 0\n", output); >---- util/FaxClient.c++ Wed Mar 10 08:58:47 2004 >-+++ util/FaxClient.c++ Thu Jul 28 13:40:39 2005 >-@@ -180,20 +180,17 @@ >- { >- struct passwd* pwd = NULL; >-- char* name = getenv("FAXUSER"); >-+ const char* name = getenv("FAXUSER"); >- if (name) >- pwd = getpwnam(name); >- else >-- name = cuserid(NULL); >-- if (!name) { >-- name = getlogin(); >-- if (name) >-- pwd = getpwnam(name); >-- } >-- if (!pwd) >- pwd = getpwuid(getuid()); >- if (!pwd) { >-- emsg = fxStr::format( >-- "Can not locate your password entry (account name %s, uid %lu).", >-- (name ? name : "<unspecified>"), (u_long) getuid()); >-+ if (name) >-+ emsg = fxStr::format("Can not locate FAXUSER password entry " >-+ "(account name %s, uid %lu): %s", name, (u_long) getuid(), >-+ strerror(errno)); >-+ else >-+ emsg = fxStr::format("Can not locate your password entry " >-+ "(uid %lu): %s", (u_long) getuid(), strerror(errno)); >- return (false); >- } >-@@ -621,4 +622,6 @@ >- FaxClient::vcommand(const char* fmt, va_list ap) >- { >-+ char *line = NULL; >-+ >- if (getVerbose()) { >- if (strncasecmp("PASS ", fmt, 5) == 0) { >-@@ -627,7 +630,11 @@ >- traceServer("-> ADMIN XXXX"); >- } else { >-- fxStr s("-> "); >-- s.append(fmt); >-- vtraceServer(s, ap); >-+ line = (char *)malloc(100); >-+ if (line == NULL) >-+ printError("Memory allocation failed"); >-+ else { >-+ vsnprintf(line, 100, fmt, ap); >-+ traceServer("-> %s", line); >-+ } >- } >- } >-@@ -637,5 +644,10 @@ >- return (0); >- } >-- vfprintf(fdOut, fmt, ap); >-+ if (line == NULL) >-+ vfprintf(fdOut, fmt, ap); >-+ else { >-+ fputs(line, fdOut); >-+ free(line); >-+ } >- fputs("\r\n", fdOut); >- (void) fflush(fdOut); >diff -urN /usr/ports/comms/hylafax/files/patch-faxd_Class1Send.c++ hylafax/files/patch-faxd_Class1Send.c++ >--- /usr/ports/comms/hylafax/files/patch-faxd_Class1Send.c++ Sat Oct 8 10:22:41 2005 >+++ hylafax/files/patch-faxd_Class1Send.c++ Thu Jan 1 01:00:00 1970 >@@ -1,61 +0,0 @@ >---- faxd/Class1Send.c++.orig Sat Oct 8 18:06:03 2005 >-+++ faxd/Class1Send.c++ Sat Oct 8 18:06:47 2005 >-@@ -270,6 +270,8 @@ >- HDLCFrame frame(conf.class1FrameOverhead); >- >- do { >-+ hadV34Trouble = false; // to monitor failure type >-+ batchingError = false; >- signalRcvd = 0; >- if (abortRequested()) >- return (send_failed); >-@@ -320,8 +322,6 @@ >- /* >- * Transmit the facsimile message/Phase C. >- */ >-- hadV34Trouble = false; // to monitor failure type >-- batchingError = false; >- if (!sendPage(tif, params, decodePageChop(pph, params), cmd, emsg)) { >- if (hadV34Trouble) { >- protoTrace("The destination appears to have trouble with V.34-Fax."); >-@@ -913,6 +913,7 @@ >- ecmBlock[ecmBlockPos++] = ecmFrame[i]; >- ecmFramePos = 0; >- if (frameNumber == 256 || lastframe) { >-+ fxAssert(frameNumber <= 256, "Invalid frameNumber value."); >- ecmBlockPos = 0; >- bool lastblock = lastframe; >- >-@@ -1145,7 +1146,7 @@ >- } >- } >- } >-- } while (!gotppr && (++ppscnt < 3) && (crpcnt < 3)); >-+ } while (!gotppr && (++ppscnt < 3) && (crpcnt < 3) && !(useV34 && gotEOT)); >- if (gotppr) { >- if (!useV34 && !atCmd(conf.class1SwitchingCmd, AT_OK)) { >- emsg = "Failure to receive silence."; >-@@ -1485,9 +1486,11 @@ >- return (false); >- } >- } >-- if (eod && (ecmFramePos != 0)) { >-- while (ecmFramePos < (frameSize + 4)) >-- ecmFrame[ecmFramePos++] = 0x00; >-+ if (eod) { >-+ if (ecmFramePos != 0) { >-+ // frame must be filled to end with zero-data >-+ while (ecmFramePos < (frameSize + 4)) ecmFrame[ecmFramePos++] = 0x00; >-+ } >- if (!blockFrame(bitrev, true, ppmcmd, emsg)) >- return (false); >- } >-@@ -1631,7 +1634,7 @@ >- } >- >- bool rc = true; >-- ecmBlockPos = ecmFramePos = ecmBitPos = ecmOnes = ecmByte = 0; >-+ frameNumber = ecmBlockPos = ecmFramePos = ecmBitPos = ecmOnes = ecmByte = 0; >- protoTrace("SEND begin page"); >- >- tstrip_t nstrips = TIFFNumberOfStrips(tif); >diff -urN /usr/ports/comms/hylafax/files/patch-hfaxd::Makefile.in hylafax/files/patch-hfaxd::Makefile.in >--- /usr/ports/comms/hylafax/files/patch-hfaxd::Makefile.in Fri Jan 14 23:28:10 2005 >+++ hylafax/files/patch-hfaxd::Makefile.in Thu Jan 1 01:00:00 1970 >@@ -1,8 +0,0 @@ >---- hfaxd/Makefile.in.orig Thu Nov 20 16:20:39 2003 >-+++ hfaxd/Makefile.in Fri Jan 14 22:59:19 2005 >-@@ -99,4 +99,4 @@ >- ${INSTALL} -F ${LIBEXEC} -u root -m 755 \ >- -idb ${PRODUCT}.sw.server -O hfaxd >- ${INSTALL} -F ${LIBDATA} -m 644 -idb ${PRODUCT}.sw.server \ >-- -idb "config(noupdate)" -src ${SRCDIR}/hfaxd.conf -O hfaxd.conf >-+ -idb "config(noupdate)" -src ${SRCDIR}/hfaxd.conf -O hfaxd.conf-dist >diff -urN /usr/ports/comms/hylafax/files/patch-util::Makefile.in hylafax/files/patch-util::Makefile.in >--- /usr/ports/comms/hylafax/files/patch-util::Makefile.in Fri Jan 14 23:28:10 2005 >+++ hylafax/files/patch-util::Makefile.in Thu Jan 1 01:00:00 1970 >@@ -1,13 +0,0 @@ >---- util/Makefile.in.orig Mon Aug 16 14:58:22 2004 >-+++ util/Makefile.in Fri Jan 14 23:17:11 2005 >-@@ -161,8 +161,8 @@ >- >- installClient: default >- ${PUTCLIENT} -F ${LIBEXEC} -m 755 -O textfmt >-- ${PUTCLIENT} -F ${LIBDATA} -m 444 -O pagesizes >-- ${PUTCLIENT} -F ${LIBDATA} -m 444 -src ${SRCDIR}/typerules -O typerules >-+ ${PUTCLIENT} -F ${LIBDATA} -m 444 -src ${SRCDIR}/pagesizes -O pagesizes-dist >-+ ${PUTCLIENT} -F ${LIBDATA} -m 444 -src ${SRCDIR}/typerules -O typerules-dist >- >- install: installClient >- ${PUTSBIN} -m 755 -O faxmsg faxadduser faxconfig faxdeluser faxmodem \ >diff -urN /usr/ports/comms/hylafax/files/patch-util::faxrcvd.sh.in hylafax/files/patch-util::faxrcvd.sh.in >--- /usr/ports/comms/hylafax/files/patch-util::faxrcvd.sh.in Wed May 26 23:21:37 2004 >+++ hylafax/files/patch-util::faxrcvd.sh.in Thu Jan 1 01:00:00 1970 >@@ -1,10 +0,0 @@ >---- util/faxrcvd.sh.in.orig Sun May 23 15:47:38 2004 >-+++ util/faxrcvd.sh.in Sun May 23 15:48:12 2004 >-@@ -51,6 +51,7 @@ >- } >- . etc/setup.cache >- >-+export PATH=$PATH:$BIN >- INFO=$SBIN/faxinfo >- FAX2PS=$TIFFBIN/fax2ps >- MIMENCODE=mimencode >diff -urN /usr/ports/comms/hylafax/files/patch-warnings hylafax/files/patch-warnings >--- /usr/ports/comms/hylafax/files/patch-warnings Mon Aug 1 18:21:23 2005 >+++ hylafax/files/patch-warnings Thu Jan 1 01:00:00 1970 >@@ -1,311 +0,0 @@ >---- util/faxwatch.c++ Fri Jun 14 15:24:04 2002 >-+++ util/faxwatch.c++ Sun Jul 24 14:32:23 2005 >-@@ -49,5 +49,5 @@ >- writeData(void* arg, const char* buf, int cc, fxStr& emsg) >- { >-- if (Sys::write((int) arg, buf, cc) != cc) { >-+ if (Sys::write((intptr_t) arg, buf, cc) != cc) { >- emsg = fxStr::format("write error: %s", strerror(errno)); >- return (false); >---- hfaxd/FileTransfer.c++ Wed Mar 17 13:26:54 2004 >-+++ hfaxd/FileTransfer.c++ Sun Jul 24 14:34:37 2005 >-@@ -323,5 +323,5 @@ >- #define TIFFdiroff(v) \ >- (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \ >-- (unsigned) &(((DirTemplate*) 0)->v)) >-+ (uintptr_t) &(((DirTemplate*) 0)->v)) >- { TIFFTAG_SUBFILETYPE, TIFF_LONG, 1 }, >- { TIFFTAG_IMAGEWIDTH, TIFF_LONG, 1 }, >---- util/Dispatcher.c++ Sat Feb 8 17:49:55 2003 >-+++ util/Dispatcher.c++ Sun Jul 24 15:23:45 2005 >-@@ -579,10 +579,10 @@ >- */ >- if (!_cqueue->isReady()) { >-- do { >-- //note - this is an array copy, not a pointer assignment >-- rmaskret = _rmask; >-- wmaskret = _wmask; >-- emaskret = _emask; >-- howlong = calculateTimeout(howlong); >-+ do { >-+ //note - this is an array copy, not a pointer assignment >-+ rmaskret = _rmask; >-+ wmaskret = _wmask; >-+ emaskret = _emask; >-+ howlong = calculateTimeout(howlong); >- >- #if CONFIG_BADSELECTPROTO >-@@ -594,5 +594,6 @@ >- howlong = calculateTimeout(howlong); >- } while (nfound < 0 && !handleError()); >-- } >-+ } else >-+ nfound = 0; >- if (!_cqueue->isEmpty()) { >- #if defined(SA_NOCLDSTOP) // POSIX >---- util/TimeOfDay.c++ Mon Jun 4 01:32:05 2001 >-+++ util/TimeOfDay.c++ Sun Jul 24 15:27:15 2005 >-@@ -146,5 +146,5 @@ >- while (*cp && *cp != ',' && !isdigit(*cp)) >- cp++; >-- time_t start, end; >-+ unsigned start, end; >- if (sscanf(cp, "%u-%u", &start, &end) == 2) { >- // convert from military time to seconds >---- util/Class2Params.c++ Tue Dec 28 16:13:04 2004 >-+++ util/Class2Params.c++ Sun Jul 24 15:29:15 2005 >-@@ -348,7 +348,5 @@ >- // extension flags for 3 more bytes >- u_int firstbyte = 0; >-- u_int secondbyte = (1<<24); >- u_int thirdbyte = (1<<24) | (1<<16); >-- u_int fourthbyte = (1<<24) | (1<<16) | (1<<8); >- u_int dcs_xinfo = >- (vr & VR_R8 ? (DCS_200X400 | thirdbyte) : 0) >---- util/TypeRules.c++ Sat Oct 4 14:19:26 2003 >-+++ util/TypeRules.c++ Sun Jul 24 15:32:54 2005 >-@@ -81,5 +81,5 @@ >- printf(" <any value>"); >- else >-- printf(" %#x", value.v); >-+ printf(" %#llx", (long long)value.v); >- } >- printf(" -- "); >---- util/cvtfacility.c Mon Oct 12 16:47:48 1998 >-+++ util/cvtfacility.c Sun Jul 24 15:37:21 2005 >-@@ -32,58 +32,58 @@ >- } facilitynames[] = { >- #ifdef LOG_AUDIT >-- "audit", LOG_AUDIT, >-+ { "audit", LOG_AUDIT }, >- #endif >- #ifdef LOG_AUTH >-- "auth", LOG_AUTH, >-+ { "auth", LOG_AUTH }, >- #endif >- #ifdef LOG_CRON >-- "cron", LOG_CRON, >-+ { "cron", LOG_CRON }, >- #endif >- #ifdef LOG_DAEMON >-- "daemon", LOG_DAEMON, >-+ { "daemon", LOG_DAEMON }, >- #endif >- #ifdef LOG_MAIL >-- "mail", LOG_MAIL, >-+ { "mail", LOG_MAIL }, >- #endif >- #ifdef LOG_NEWS >-- "news", LOG_NEWS, >-+ { "news", LOG_NEWS }, >- #endif >- #ifdef LOG_SAT >-- "sat", LOG_AUDIT, >-+ { "sat", LOG_AUDIT }, >- #endif >- #ifdef LOG_SYSLOG >-- "syslog", LOG_SYSLOG, >-+ { "syslog", LOG_SYSLOG }, >- #endif >- #ifdef LOG_USER >-- "user", LOG_USER, >-+ { "user", LOG_USER }, >- #endif >- #ifdef LOG_UUCP >-- "uucp", LOG_UUCP, >-+ { "uucp", LOG_UUCP }, >- #endif >- #ifdef LOG_LOCAL0 >-- "local0", LOG_LOCAL0, >-+ { "local0", LOG_LOCAL0 }, >- #endif >- #ifdef LOG_LOCAL1 >-- "local1", LOG_LOCAL1, >-+ { "local1", LOG_LOCAL1 }, >- #endif >- #ifdef LOG_LOCAL2 >-- "local2", LOG_LOCAL2, >-+ { "local2", LOG_LOCAL2 }, >- #endif >- #ifdef LOG_LOCAL3 >-- "local3", LOG_LOCAL3, >-+ { "local3", LOG_LOCAL3 }, >- #endif >- #ifdef LOG_LOCAL4 >-- "local4", LOG_LOCAL4, >-+ { "local4", LOG_LOCAL4 }, >- #endif >- #ifdef LOG_LOCAL5 >-- "local5", LOG_LOCAL5, >-+ { "local5", LOG_LOCAL5 }, >- #endif >- #ifdef LOG_LOCAL6 >-- "local6", LOG_LOCAL6, >-+ { "local6", LOG_LOCAL6 }, >- #endif >- #ifdef LOG_LOCAL7 >-- "local7", LOG_LOCAL7, >-+ { "local7", LOG_LOCAL7 }, >- #endif >-- NULL, -1, >-+ { NULL, -1 }, >- }; >- >---- util/faxmsg.c Sat Feb 8 17:22:18 2003 >-+++ util/faxmsg.c Sun Jul 24 15:43:58 2005 >-@@ -59,15 +59,15 @@ >- int fifo, c; >- char* spooldir = FAX_SPOOLDIR; >-- const char* arg; >-+ const char* arg = NULL; >- char fifoname[256]; >- int cmdlen, fnlen; >- char cmd[80]; >- char* appname; >-- const char* opts; >-- const char* usage; >-- const char* cmdfmt; >-+ const char* opts = NULL; >-+ const char* usage = NULL; >-+ const char* cmdfmt = NULL; >- char* cp; >- int facility = LOG_DAEMON; >-- int modemRequired; >-+ int modemRequired = 0; >- >- (void) cvtFacility(LOG_FAX, &facility); >-@@ -123,6 +123,6 @@ >- } else { >- fnlen = snprintf(fifoname, sizeof(fifoname), "%s.%.*s", FAX_FIFO, >-- sizeof (fifoname) - sizeof (FAX_FIFO), argv[optind]); >-- if (fnlen < 0 | fnlen >= sizeof(fifoname)) { >-+ (int)(sizeof (fifoname) - sizeof (FAX_FIFO)), argv[optind]); >-+ if (fnlen < 0 || fnlen >= sizeof(fifoname)) { >- fatal("Argument name too long: %s", argv[optind]); >- } >-@@ -133,5 +133,5 @@ >- fatal("usage: %s %s", argv[0], usage); >- } >-- for (cp = fifoname; cp = strchr(cp, '/'); *cp++ = '_') >-+ for (cp = fifoname; (cp = strchr(cp, '/')); *cp++ = '_') >- ; >- if (chdir(spooldir) < 0) { >---- util/faxconfig.c Tue Apr 15 17:44:03 2003 >-+++ util/faxconfig.c Sun Jul 24 15:47:52 2005 >-@@ -89,5 +89,5 @@ >- } else { >- snprintf(fifoname, sizeof(fifoname), "%s.%.*s", FAX_FIFO, >-- sizeof (fifoname) - sizeof (FAX_FIFO), devid); >-+ (int)(sizeof(fifoname) - sizeof(FAX_FIFO)), devid); >- } >- } else { >---- util/faxstate.c Sat Feb 8 17:22:18 2003 >-+++ util/faxstate.c Sun Jul 24 15:49:29 2005 >-@@ -141,5 +141,5 @@ >- } else { >- snprintf(fifoname, sizeof(fifoname), "%s.%.*s", FAX_FIFO, >-- sizeof (fifoname) - sizeof (FAX_FIFO), devid); >-+ (int)(sizeof(fifoname) - sizeof(FAX_FIFO)), devid); >- fifo = open(fifoname, O_WRONLY|O_NDELAY); >- if (fifo < 0) { >---- util/dialtest.c++ Sat Feb 8 17:32:35 2003 >-+++ util/dialtest.c++ Sun Jul 24 15:50:17 2005 >-@@ -67,5 +67,5 @@ >- char* longDistancePrefix = "1"; >- bool verbose = false; >-- extern int optind, opterr; >-+ extern int optind; >- extern char* optarg; >- int c; >---- util/tiffcheck.c++ Wed Sep 1 19:59:16 2004 >-+++ util/tiffcheck.c++ Sun Jul 24 15:51:11 2005 >-@@ -98,5 +98,5 @@ >- * Suppress libtiff warning messages from becoming fatal. >- */ >-- TIFFErrorHandler whandler = TIFFSetWarningHandler(NULL); >-+ TIFFSetWarningHandler(NULL); >- >- if (tif) { >-@@ -201,5 +201,5 @@ >- * we generate because we are careful to include valid info. >- */ >-- float yres, yresinch; >-+ float yres, yresinch = .0F; >- if (TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres)) { >- short resunit = RESUNIT_INCH; // TIFF spec default >---- faxcover/faxcover.c++ Wed Sep 3 11:15:17 2003 >-+++ faxcover/faxcover.c++ Sun Jul 24 16:01:29 2005 >-@@ -97,6 +97,4 @@ >- faxCoverApp::initialize(int argc, char** argv) >- { >-- extern int optind; >-- extern char* optarg; >- int c; >- >---- faxd/FaxRecv.c++ Tue Nov 16 09:55:04 2004 >-+++ faxd/FaxRecv.c++ Sun Jul 24 16:04:18 2005 >-@@ -128,5 +128,5 @@ >- u_long seqnum = Sequence::getNext(FAX_RECVDIR "/" FAX_SEQF, emsg); >- >-- if (seqnum == -1) >-+ if (seqnum == (u_long)-1) >- return -1; >- >-+++ faxd/ModemServer.c++ Sun Jul 24 16:11:33 2005 >-@@ -749,4 +749,7 @@ >- changeState(LOCKWAIT, pollLockWait); >- break; >-+ default: >-+ traceServer("ModemServer::timerExpired() in an unexpected " >-+ "state %d", state); >- } >- } >---- faxd/ClassModem.c++ Sat Jan 1 16:27:14 2005 >-+++ faxd/ClassModem.c++ Sun Jul 24 16:13:14 2005 >-@@ -96,13 +96,4 @@ >- }; >- >--static fxStr >--stripAT(const fxStr& a0) >--{ >-- fxStr s(a0); >-- if (s.length() >= 2 && s.head(2) == "AT") >-- s.remove(0, 2); >-- return s; >--} >-- >- ClassModem::ClassModem(ModemServer& s, const ModemConfig& c) >- : server(s) >-@@ -1334,5 +1325,5 @@ >- /* fall thru... */ >- case AT_RING: // normal ring >-- if (conf.ringResponse != "" && (rings+1) >= conf.ringsBeforeResponse) { >-+ if (conf.ringResponse != "" && rings+1U >= conf.ringsBeforeResponse) { >- // With the MT1932ZDX we must respond ATH1>DT1 in order >- // to hear DTMF tones which are DID data, and we configure >---- faxd/Class1.c++ Fri Nov 26 23:28:13 2004 >-+++ faxd/Class1.c++ Sun Jul 24 16:17:28 2005 >-@@ -164,5 +164,4 @@ >- // We could query the modem but that would require another >- // config option, so we just trust the enable command. >-- u_short pos = 0; >- primaryV34Rate = 0; >- const char* buf = conf.class1EnableV34Cmd; >---- faxd/Class1Send.c++ Tue Dec 28 21:16:46 2004 >-+++ faxd/Class1Send.c++ Sun Jul 24 16:19:20 2005 >-@@ -742,5 +742,5 @@ >- switch (frame.getFCF()) { >- case FCF_NSF: >-- { u_int nsf = frame.getDataWord(); } >-+ frame.getDataWord(); >- break; >- case FCF_CSI: >---- faxd/Class2Send.c++ Tue Nov 23 13:11:02 2004 >-+++ faxd/Class2Send.c++ Sun Jul 24 16:23:12 2005 >-@@ -193,6 +194,5 @@ >- * so that we can read the input stream for DC1. >- */ >-- FlowControl oiFlow = getInputFlow(); >- if (flowControl == FLOW_XONXOFF) >- setXONXOFF(FLOW_NONE, getOutputFlow(), ACT_NOW); >- }
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=61821">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 92572
: 61821