HylaFAX 4.0.2

This commit is contained in:
d 1998-09-04 00:35:54 +00:00
parent 5e7e9034d8
commit bcbfb2e050
36 changed files with 381 additions and 631 deletions

View File

@ -1,61 +1,73 @@
# OpenBSD makefile for: hylafax
# Version required: v4.0pl1
# Date created: 8 Feb 1998
# Version required: v4.0pl2
# Date created: 2 Sep 1998
# Whom: d
#
# $OpenBSD: Makefile,v 1.4 1998/06/14 08:10:23 marc Exp $
# $OpenBSD: Makefile,v 1.5 1998/09/04 00:35:54 d Exp $
#
DISTNAME= hylafax-v4.0pl1
PKGNAME= hylafax-4.0.1
DISTNAME= hylafax-v4.0pl2
PKGNAME= hylafax-4.0.2
CATEGORIES= comms
MASTER_SITES= ftp://ftp.sgi.com/sgi/fax/source/
EXTRACT_SUFX= -tar.gz
MAINTAINER= d@openbsd.org
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 \
${PREFIX}/lib/afm/Courier:${PORTSDIR}/print/afm
BUILD_DEPENDS+= ${PREFIX}/lib/afm/Courier:${PORTSDIR}/print/afm
# no dependency on ghostscript because we don't know which
# version the user prefers
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2
LIB_DEPENDS= tiff\\.3\\.4:${PORTSDIR}/graphics/tiff34 \
jpeg\\.62\\.:${PORTSDIR}/graphics/jpeg
RUN_DEPENDS= ghostscript-5.10:${PORTSDIR}/print/ghostscript5
LIB_DEPENDS= tiff\\.3\\.4:${PORTSDIR}/graphics/tiff34
USE_GMAKE= yes
.if !defined(A4)
PAGESIZE= North American Letter
.else
PAGESIZE= ISO A4
.endif
FAXUID=uucp
FAXGID=dialer
# libtiff34 crashes on this machine when dynamically linked?? (mac68k)
# so change -ltiff34 to ${PREFIX}/lib/libtiff34.a to avoid this
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --with-INSTALL="" \
--with-MAKE=gmake --with-CC=/usr/bin/cc \
--with-LIBTIFF="-L${PREFIX}/lib -ltiff34 -ljpeg" \
--with-ZLIB=no --with-LIBZ='-lz' \
--with-
--with-MAKE=${MAKE} \
--with-CC=${CC} \
--with-CXX=${CXX} \
--with-DIR_HTML=/usr/share/doc/html/hylafax \
--with-PAGESIZE="${PAGESIZE}" \
--with-LIBTIFF="-L${PREFIX}/lib -ltiff" \
--with-ZLIB=no --with-LIBZ='-lz' --with-ZLIBINC=/usr/include \
--with-REGEX=no --with-LIBREGEX= --with-REGEXINC=/usr/include \
--with-FAXUID=${FAXUID} --with-FAXGID=${FAXGID} \
MAN1= hylafax.1 faxalter.1 faxcover.1 faxmail.1 faxrm.1 faxstat.1 sendfax.1 \
sendpage.1 sgi2fax.1 textfmt.1
MAN5= pagesizes.5f typerules.5f \
hylafax.5f cid.5f config.5f destctrls.5f dialrules.5f hosts.5f \
info.5f log.5f pagermap.5f recvq.5f sendq.5f shutdown.5f status.5f \
tsi.5f xferlog.5f
MAN8= cqtest.8c choptest.8c dialtest.8c faxabort.8c faxaddmodem.8c \
faxanswer.8c faxconfig.8c faxmodem.8c faxstate.8c faxcron.8c \
faxgetty.8c faxinfo.8c faxq.8c faxqclean.8c faxquit.8c faxrcvd.8c \
faxsend.8c faxsetup.8c faxwatch.8c hfaxd.8c mkcover.8c notify.8c \
pagesend.8c pollrcvd.8c ps2fax.8c recvstats.8c tagtest.8c tiff2fax.8c \
tiffcheck.8c tsitest.8c wedged.8c xferstats.8c
MAN1= choptest.1m cqtest.1m dialtest.1m faxabort.1m faxaddmodem.1m \
faxalter.1 faxanswer.1m faxconfig.1m faxcover.1 faxcron.1m \
faxgetty.1m faxinfo.1m faxmail.1 faxmodem.1m faxq.1m \
faxqclean.1m faxquit.1m faxrcvd.1m faxrm.1 faxsend.1m \
faxsetup.1m faxstat.1 faxstate.1m faxwatch.1m hfaxd.1m \
hylafax.1 mkcover.1m notify.1m pagesend.1m pollrcvd.1m \
ps2fax.1m recvstats.1m sendfax.1 sendpage.1 sgi2fax.1 \
tagtest.1m textfmt.1 tiff2fax.1m tiffcheck.1m tsitest.1m \
wedged.1m xferstats.1m
MAN4= cid.4f config.4f destctrls.4f dialrules.4f hosts.4f hylafax.4f \
info.4f log.4f pagermap.4f pagesizes.4f recvq.4f sendq.4f \
shutdown.4f status.4f tsi.4f typerules.4f xferlog.4f
SUID_EXES= ${PREFIX}/sbin/faxgetty ${PREFIX}/sbin/faxq \
${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
pre-fetch:
.if !defined(A4)
@${ECHO_MSG} "Type \"make A4=yes\" if you want A4 as default page size."
.else
@${ECHO_MSG} "Using \"ISO A4\" for default page size."
.endif
post-install:
/usr/sbin/chown uucp ${SUID_EXES}
/usr/sbin/chown ${FAXUID}.${FAXGID} ${SUID_EXES}
chmod a=rx,u+s ${SUID_EXES}
@if [ ! -f ${PREFIX}/etc/rc.d/hylafax.sh.sample ]; then \
cp ${FILESDIR}/hylafax.sh.sample ${PREFIX}/etc/rc.d; \
fi
${INSTALL_DATA} ${FILESDIR}/hylafax.sh.sample ${PREFIX}/lib/fax
${CAT} ${PKGDIR}/MESSAGE
.include <bsd.port.mk>

View File

@ -1,9 +1,12 @@
#! /bin/sh
# hylafax startup example.
# be sure to initialize the followings:
# OpenBSD HylaFAX startup example
#
# Make sure that you have configured HylaFAX before running faxq!:
# server: /usr/local/sbin/faxsetup
# modems: /usr/local/sbin/faxaddmodem
# incoming calls: /etc/ttys
if [ -x /usr/local/sbin/faxq ]; then
/usr/local/sbin/faxq && echo -n ' hylafax'
fi

View File

@ -1 +1 @@
MD5 (hylafax-v4.0pl1-tar.gz) = 47af6fb4b94985c8829c47003bc4e4ab
MD5 (hylafax-v4.0pl2-tar.gz) = 59966e41f769770134b2c80c84245874

View File

@ -1,5 +1,5 @@
--- config/skel.orig Wed Nov 27 00:20:26 1996
+++ config/skel Sun Feb 8 03:37:56 1998
--- config/skel.orig Wed Sep 2 13:02:56 1998
+++ config/skel Wed Sep 2 13:03:15 1998
@@ -41,8 +41,8 @@
SessionTracing: 11 # log server-related operations
RecvFileMode: 0600 # recvd facsimile are not public

View File

@ -1,16 +1,11 @@
--- config/zyxel-2864.orig Wed Nov 27 00:20:29 1996
+++ config/zyxel-2864 Sun Feb 8 03:37:56 1998
@@ -63,12 +63,11 @@
# &B1 DTE-DCE rate is fixed at DTE setting
# &N0 Auto-negotiate highest possible DCE-DCE link rate
# &S0 DSR always on
-# *F0 Deny remote configuration
# S18=4 Receive at 38400
# S38.3=1 DCD on/off sequence follows UNIX standard; also
# fix receiving baud rate at S18 value
#
-ModemResetCmds: AT&B1&N0&S0*F0S18=4S38.3=1
+ModemResetCmds: AT&B1&N0&S0S18=4S38.3=1
#
ModemDialCmd: ATDT%s # no '@' 'cuz then busy not recognized
NoCarrierRetrys: 3 # retry 3 times on no carrier
--- etc/faxsetup.sh.in.orig Wed Sep 2 13:01:12 1998
+++ etc/faxsetup.sh.in Wed Sep 2 13:01:30 1998
@@ -489,7 +489,7 @@
# Functions required by faxaddmodem.
#
case $TARGET in
- *-sunos*|*-linux*|*-ultrix*|*-hpux*|*-freebsd*|*-netbsd*)
+ *-sunos*|*-linux*|*-ultrix*|*-hpux*|*-freebsd*|*-netbsd*|*-openbsd*)
dumpTTYFuncs()
{
cat<<'EOF'

View File

@ -1,11 +1,11 @@
--- util/SendFaxClient.c++.orig Wed Nov 27 00:20:41 1996
+++ util/SendFaxClient.c++ Sun Feb 8 03:38:00 1998
@@ -716,7 +716,7 @@
return tr;
--- faxd/Getty.c++.orig Wed Sep 2 13:06:02 1998
+++ faxd/Getty.c++ Wed Sep 2 13:06:18 1998
@@ -218,7 +218,7 @@
// NB: this is executed in the parent
fxStr device = fxStr::format("%s/" | line, _PATH_DEV);
Sys::chown(device, UUCPLock::getUUCPUid(), UUCPLock::getUUCPGid());
- Sys::chmod(device, 0600); // reset protection
+ Sys::chmod(device, 0660); // reset protection
}
-#include "tiffio.h"
+#include "tiffio34.h"
/*
* Count the number of ``pages'' in a TIFF file.
extern void vlogError(const char* fmt, va_list ap);

View File

@ -1,67 +1,11 @@
--- util/TypeRules.c++.orig Wed Nov 27 00:20:45 1996
+++ util/TypeRules.c++ Sun Feb 8 03:38:01 1998
@@ -48,7 +48,7 @@
}
--- faxd/ModemServer.c++.orig Wed Sep 2 13:06:37 1998
+++ faxd/ModemServer.c++ Wed Sep 2 13:07:08 1998
@@ -895,7 +895,7 @@
"7 bits, odd parity", // ODD
};
static const char* typeNames[] =
- { "ascii", "string", "address", "byte", "short", "long" };
+ { "ascii", "asciiesc", "string", "address", "byte", "short", "long" };
static const char* opNames[] =
{ "<any>", "=", "!=", "<", "<=", ">", ">=", "&", "^", "!" };
static const char* resultNames[] = { "tiff", "postscript", "error" };
@@ -65,7 +65,7 @@
);
if (type == STRING)
printf(" \"%s\"", value.s);
- else if (type != ASCII) {
+ else if (type != ASCII && type != ASCIIESC) {
if (op == ANY)
printf(" <any value>");
else
@@ -83,6 +83,7 @@
const u_char* cp = (const u_char*) data;
switch (type) {
case ASCII:
+ {
u_int i;
for (i = 0; i < size; i++)
if (!isprint(cp[i]) && !isspace(cp[i])) {
@@ -92,6 +93,19 @@
}
ok = TRUE;
goto done;
+ }
+ case ASCIIESC:
+ {
+ u_int i;
+ for (i = 0; i < size; i++)
+ if (!isprint(cp[i]) && !isspace(cp[i]) && cp[i] != '\033') {
+ if (verbose)
+ printf("failed (unprintable char %#x)\n", cp[i]);
+ return (FALSE);
+ }
+ ok = TRUE;
+ goto done;
+ }
case STRING:
ok = (strncmp((const char*)(cp+off), value.s,
fxmin((u_int) strlen(value.s), (u_int)(size-off))) == 0);
@@ -307,6 +321,8 @@
rule.type = TypeRule::STRING;
else if (strncasecmp(tp, "ascii", cp-tp) == 0)
rule.type = TypeRule::ASCII;
+ else if (strncasecmp(tp, "asciiesc", cp-tp) == 0)
+ rule.type = TypeRule::ASCIIESC;
else if (strncasecmp(tp, "addr", cp-tp) == 0)
rule.type = TypeRule::ADDR;
else {
@@ -317,7 +333,8 @@
cp++;
rule.op = TypeRule::EQ; // default is '='
const char* vp = cp;
- if (rule.type != TypeRule::STRING && rule.type != TypeRule::ASCII) {
+ if (rule.type != TypeRule::STRING && rule.type != TypeRule::ASCII
+ && rule.type != TypeRule::ASCIIESC) {
// numeric value
switch (*vp) {
case '=': rule.op = TypeRule::EQ; cp++; break;
-#if defined(CCTS_OFLOW) && defined(CRTS_IFLOW) && !defined(__NetBSD__)
+#if defined(CCTS_OFLOW) && defined(CRTS_IFLOW) && !defined(__NetBSD__) && !defined(__OpenBSD__)
#undef CRTSCTS /* BSDi */
#define CRTSCTS (CCTS_OFLOW|CRTS_IFLOW)
#endif

View File

@ -1,10 +1,25 @@
--- util/TypeRules.h.orig Wed Nov 27 00:20:56 1996
+++ util/TypeRules.h Sun Feb 8 03:38:01 1998
@@ -130,6 +130,7 @@
fxBool cont; // continuation
enum {
ASCII, // ascii-only string
+ ASCIIESC, // ascii-only string + escape char (iso-2022 variants)
STRING, // byte string
ADDR, // address of match
BYTE, // 8 bits
--- faxd/UUCPLock.c++.orig Wed Sep 2 13:07:27 1998
+++ faxd/UUCPLock.c++ Wed Sep 2 13:09:17 1998
@@ -37,6 +37,7 @@
}
#endif
#include <pwd.h>
+#include <grp.h>
/*
* UUCP Device Locking Support.
@@ -146,8 +147,13 @@
if (!pwd)
faxApp::fatal("Can not deduce identity of UUCP");
UUCPuid = pwd->pw_uid;
- UUCPgid = pwd->pw_gid;
endpwent(); // paranoia
+
+ const group *grp = getgrnam("dialer");
+ if (!grp)
+ faxApp::fatal("Can not deduce identity of DIALER");
+ UUCPgid = grp->gr_gid;
+ endgrent(); // paranoia
}
}
uid_t UUCPLock::getUUCPUid() { setupIDs(); return UUCPuid; }

View File

@ -1,11 +1,12 @@
--- util/faxinfo.c++.orig Wed Nov 27 00:21:03 1996
+++ util/faxinfo.c++ Sun Feb 8 03:38:01 1998
@@ -30,7 +30,7 @@
#include <errno.h>
#include <string.h>
#include <stdlib.h>
-#include "tiffio.h"
+#include "tiffio34.h"
#include "PageSize.h"
#include "Class2Params.h"
--- config.guess.orig Wed Sep 2 12:57:38 1998
+++ config.guess Wed Sep 2 12:58:13 1998
@@ -276,6 +276,9 @@
*:NetBSD:*:*)
echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ exit 0 ;;
*:GNU:*:*)
echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;

View File

@ -1,11 +1,36 @@
--- util/tiffcheck.c++.orig Wed Nov 27 00:21:04 1996
+++ util/tiffcheck.c++ Sun Feb 8 03:38:01 1998
@@ -24,7 +24,7 @@
*/
#include "Sys.h"
#include "Str.h"
-#include "tiffio.h"
+#include "tiffio34.h"
static const char* appName;
--- configure.orig Wed Sep 2 12:58:28 1998
+++ configure Wed Sep 2 13:11:44 1998
@@ -248,7 +248,7 @@
test -d /usr/ucb && PATH=$PATH:/usr/ucb # Sun and others
test -d /usr/contrib/bin && PATH=$PATH:/usr/contrib/bin # BSDi
test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc # Sun and others
-test -d /usr/local/bin && PATH=/usr/local/bin:$PATH # for GNU stuff
+test -d /usr/local/bin && PATH=$PATH:/usr/local/bin # for GNU stuff
PATH=$PATH:$OPATH
POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions
@@ -3399,6 +3399,7 @@
*-solaris*) LOCKS="+ascii";;
*-freebsd*) LOCKS=ascii;;
*-netbsd*) LOCKS=ascii;;
+ *-openbsd*) LOCKS=ascii;;
*bsd*) LOCKS=binary;;
*) LOCKS=ascii;;
esac
@@ -3575,6 +3576,7 @@
*-bsdi*|*-netbsd*) MANSCHEME=bsd-nroff-gzip-0.gz;;
*-freebsd*) MANSCHEME=bsd-source-cat;;
*-linux*) MANSCHEME=bsd-source-cat;;
+ *-openbsd*) MANSCHEME=bsd-source-cat;;
*-ultrix*) MANSCHEME=bsd-source-cat;;
*-sunos*) MANSCHEME=bsd-source-cat-strip;;
*-sysv[234]*) MANSCHEME=sysv-source-cat-strip;;
@@ -3966,7 +3968,7 @@
printConfig
checkForExecutable $PATH_SENDMAIL
checkForExecutable $PATH_GETTY
- prompt "Are these ok [yes]?"; read ok
+ ok=yes # prompt "Are these ok [yes]?"; read ok
test -z "$ok" && ok=yes
case "$ok" in
[1-9]|1[0-9]) promptForParameter $ok;;

View File

@ -1,14 +1,10 @@
--- util/typerules.orig Wed Nov 27 00:21:01 1996
+++ util/typerules Sun Feb 8 03:38:01 1998
@@ -128,6 +128,11 @@
>15 string ascii ps %F/textfmt -B -f Courier-Bold\
-p 11 -s %s >%o <%i
#
+# Japanization (should help other iso-2022 variants too)
+#
+#>15 string asciiesc ps a2ps-j -l '' -p -ns -nt <%i >%o
+#0 asciiesc x ps a2ps-j -l '' -p -ns -nt <%i >%o
+#
# This causes anything else with ascii-only data to be treated as text.
#
0 ascii x ps %F/textfmt -B -f Courier-Bold\
--- util/Types.h.orig Wed Sep 2 16:36:00 1998
+++ util/Types.h Wed Sep 2 16:36:20 1998
@@ -26,6 +26,7 @@
#ifndef _Types_
#define _Types_
+#include <std.h>
#include "string.h"
#include "assert.h"
#include "stdio.h"

View File

@ -1,11 +1,11 @@
--- faxd/Class1.c++.orig Wed Nov 27 00:21:26 1996
+++ faxd/Class1.c++ Sun Feb 8 03:37:57 1998
@@ -31,7 +31,7 @@
#include "ModemConfig.h"
#include "HDLCFrame.h"
#include "t.30.h"
-#include "tiffio.h"
+#include "tiffio34.h"
#include <stdlib.h>
#include <ctype.h>
--- util/SendFaxJob.c++.orig Wed Sep 2 16:37:59 1998
+++ util/SendFaxJob.c++ Wed Sep 2 16:38:55 1998
@@ -496,7 +496,7 @@
fxBool fileSent =
client.setFormat(FaxClient::FORM_PS)
&& client.setType(FaxClient::TYPE_I) // XXX??? TYPE_A
- && client.sendZData(fd, FaxClient::storeTemp, coverDoc, emsg);
+ && client.sendZData(fd, &FaxClient::storeTemp, coverDoc, emsg);
Sys::close(fd);
if (!fileSent) {
if (emsg == "")

View File

@ -1,11 +1,16 @@
--- faxd/FaxModem.h.orig Wed Nov 27 00:21:18 1996
+++ faxd/FaxModem.h Sun Feb 8 03:37:57 1998
@@ -30,7 +30,7 @@
*/
#include "ClassModem.h"
#include "Class2Params.h"
-#include "tiffio.h"
+#include "tiffio34.h"
#include "G3Decoder.h"
#include "FaxSendStatus.h"
--- util/SendFaxClient.c++.orig Wed Sep 2 16:39:51 1998
+++ util/SendFaxClient.c++ Wed Sep 2 16:40:50 1998
@@ -457,11 +457,11 @@
if (info.rule->getResult() == TypeRule::TIFF) {
fileSent = setFormat(FORM_TIFF)
&& setType(TYPE_I)
- && sendData(fd, FaxClient::storeTemp, info.doc, emsg);
+ && sendData(fd, &FaxClient::storeTemp, info.doc, emsg);
} else {
fileSent = setFormat(FORM_PS)
&& setType(TYPE_I) // XXX TYPE_A???
- && sendZData(fd, FaxClient::storeTemp, info.doc, emsg);
+ && sendZData(fd, &FaxClient::storeTemp, info.doc, emsg);
}
Sys::close(fd);
if (!fileSent) {

View File

@ -1,11 +1,25 @@
--- faxd/FaxRecv.c++.orig Wed Nov 27 00:21:32 1996
+++ faxd/FaxRecv.c++ Sun Feb 8 03:37:57 1998
@@ -30,7 +30,7 @@
#include <errno.h>
--- util/TextFmt.c++.orig Wed Sep 2 16:50:49 1998
+++ util/TextFmt.c++ Wed Sep 2 16:58:43 1998
@@ -47,6 +47,7 @@
#if HAS_MMAP
#include <sys/mman.h>
#endif
+#include <paths.h>
#include "Dispatcher.h"
-#include "tiffio.h"
+#include "tiffio34.h"
#include "FaxServer.h"
#include "FaxRecvInfo.h"
#include "faxApp.h" // XXX
#define LUNIT (72*20) // local coord system is .05 scale
#define ICVT(x) ((TextCoord)((x)*LUNIT)) // scale inches to local coordinates
@@ -244,12 +245,11 @@
/*
* Open the file w+ so that we can reread the temp file.
*/
- tempfile = tmpnam(NULL);
- tf = Sys::fopen(tempfile, "w+");
+ tempfile = _PATH_TMP ".hylafax.XXXXXXXXXXXX";
+ tf = Sys::mkstemp(tempfile);
if (tf == NULL)
fatal("%s: Cannot open temporary file: %s",
(const char*) tempfile, strerror(errno));
- Sys::unlink(tempfile); // so it'll be removed on exit
numcol = fxmax(1,numcol);
if (pointSize == -1)

View File

@ -1,11 +1,26 @@
--- faxd/FaxSend.c++.orig Wed Nov 27 00:21:33 1996
+++ faxd/FaxSend.c++ Sun Feb 8 03:37:57 1998
@@ -26,7 +26,7 @@
#include "Sys.h"
--- hfaxd/OldProtocol.c++.orig Wed Sep 2 17:30:28 1998
+++ hfaxd/OldProtocol.c++ Wed Sep 2 17:32:36 1998
@@ -604,9 +604,9 @@
#include "Dispatcher.h"
-#include "tiffio.h"
+#include "tiffio34.h"
#include "FaxServer.h"
#include "FaxMachineInfo.h"
#include "FaxRecvInfo.h"
#define DEFINE_Alter(param) \
void OldProtocolServer::alterJob##param(const char* tag) \
- { applyToJob(tag, "alter", OldProtocolServer::reallyAlterJob##param); }\
+ { applyToJob(tag, "alter", &OldProtocolServer::reallyAlterJob##param); }\
void OldProtocolServer::alterJobGroup##param(const char* tag) \
- { applyToJobGroup(tag, "alter", OldProtocolServer::reallyAlterJob##param); }
+ { applyToJobGroup(tag, "alter", &OldProtocolServer::reallyAlterJob##param); }
fxBool
OldProtocolServer::alterSuspend(Job& job)
@@ -752,9 +752,9 @@
#define DEFINE_Op(op) \
void OldProtocolServer::##op##Job(const char* tag) \
- { applyToJob(tag, fxQUOTE(op), OldProtocolServer::do##op); }\
+ { applyToJob(tag, fxQUOTE(op), &OldProtocolServer::do##op); }\
void OldProtocolServer::##op##JobGroup(const char* tag) \
- { applyToJobGroup(tag, fxQUOTE(op), OldProtocolServer::do##op); }
+ { applyToJobGroup(tag, fxQUOTE(op), &OldProtocolServer::do##op); }
void
OldProtocolServer::doremove(Job& job, const char*)
{

View File

@ -1,11 +0,0 @@
--- faxd/G3Decoder.h.orig Wed Nov 27 00:21:19 1996
+++ faxd/G3Decoder.h Sun Feb 8 03:37:57 1998
@@ -32,7 +32,7 @@
extern "C" {
#include <setjmp.h>
}
-#include "tiffio.h"
+#include "tiffio34.h"
class G3Decoder {
private:

View File

@ -1,11 +0,0 @@
--- faxd/G3Encoder.c++.orig Wed Nov 27 00:21:34 1996
+++ faxd/G3Encoder.c++ Sun Feb 8 03:37:57 1998
@@ -29,7 +29,7 @@
*/
#include "G3Encoder.h"
#include "StackBuffer.h"
-#include "tiffio.h"
+#include "tiffio34.h"
#include "t4.h"
G3Encoder::G3Encoder(fxStackBuffer& b) : buf(b) {}

View File

@ -1,11 +0,0 @@
--- faxd/Getty.c++.orig Wed Nov 27 00:21:34 1996
+++ faxd/Getty.c++ Sun Feb 8 03:37:57 1998
@@ -218,7 +218,7 @@
// NB: this is executed in the parent
fxStr device = fxStr::format("%s/" | line, _PATH_DEV);
Sys::chown(device, UUCPLock::getUUCPUid(), UUCPLock::getUUCPGid());
- Sys::chmod(device, 0600); // reset protection
+ Sys::chmod(device, 0660); // reset protection
}
extern void vlogError(const char* fmt, va_list ap);

View File

@ -1,11 +0,0 @@
--- faxd/ModemServer.c++.orig Wed Nov 27 00:21:36 1996
+++ faxd/ModemServer.c++ Sun Feb 8 03:37:57 1998
@@ -876,7 +876,7 @@
"7 bits, odd parity", // ODD
};
-#if defined(CCTS_OFLOW) && defined(CRTS_IFLOW) && !defined(__NetBSD__)
+#if defined(CCTS_OFLOW) && defined(CRTS_IFLOW) && !defined(__NetBSD__) && !defined(__OpenBSD__)
#undef CRTSCTS /* BSDi */
#define CRTSCTS (CCTS_OFLOW|CRTS_IFLOW)
#endif

View File

@ -1,11 +0,0 @@
--- faxd/PCFFont.c++.orig Wed Nov 27 00:21:36 1996
+++ faxd/PCFFont.c++ Sun Feb 8 03:37:58 1998
@@ -34,7 +34,7 @@
*/
#include <unistd.h>
#include "PCFFont.h"
-#include "tiffio.h"
+#include "tiffio34.h"
#define LSBFirst 0
#define MSBFirst 1

View File

@ -1,25 +0,0 @@
--- faxd/UUCPLock.c++.orig Wed Nov 27 00:21:38 1996
+++ faxd/UUCPLock.c++ Sun Feb 8 03:37:58 1998
@@ -37,6 +37,7 @@
}
#endif
#include <pwd.h>
+#include <grp.h>
/*
* UUCP Device Locking Support.
@@ -146,8 +147,13 @@
if (!pwd)
faxApp::fatal("Can not deduce identity of UUCP");
UUCPuid = pwd->pw_uid;
- UUCPgid = pwd->pw_gid;
endpwent(); // paranoia
+
+ const group *grp = getgrnam("dialer");
+ if (!grp)
+ faxApp::fatal("Can not deduce identity of DIALER");
+ UUCPgid = grp->gr_gid;
+ endgrent(); // paranoia
}
}
uid_t UUCPLock::getUUCPUid() { setupIDs(); return UUCPuid; }

View File

@ -1,11 +0,0 @@
--- faxd/choptest.c++.orig Wed Nov 27 00:21:40 1996
+++ faxd/choptest.c++ Sun Feb 8 03:37:58 1998
@@ -31,7 +31,7 @@
#include <unistd.h>
#include "G3Decoder.h"
#include "Class2Params.h"
-#include "tiffio.h"
+#include "tiffio34.h"
class MemoryDecoder : public G3Decoder {
private:

View File

@ -1,11 +0,0 @@
--- faxd/cqtest.c++.orig Wed Nov 27 00:21:40 1996
+++ faxd/cqtest.c++ Sun Feb 8 03:37:58 1998
@@ -35,7 +35,7 @@
#include "Class2Params.h"
#include "Str.h"
#include "FaxTrace.h"
-#include "tiffio.h"
+#include "tiffio34.h"
#include "version.h"

View File

@ -1,11 +0,0 @@
--- faxd/faxQueueApp.c++.orig Wed Nov 27 00:21:39 1996
+++ faxd/faxQueueApp.c++ Sun Feb 8 03:37:58 1998
@@ -30,7 +30,7 @@
#include <math.h>
#include <limits.h>
#include <sys/file.h>
-#include <tiffio.h>
+#include <tiffio34.h>
#include "Dispatcher.h"

View File

@ -1,11 +0,0 @@
--- faxd/tagtest.c++.orig Wed Nov 27 00:21:41 1996
+++ faxd/tagtest.c++ Sun Feb 8 03:37:58 1998
@@ -35,7 +35,7 @@
#include "G3Encoder.h"
#include "StackBuffer.h"
#include "FaxFont.h"
-#include "tiffio.h"
+#include "tiffio34.h"
#include "Class2Params.h"
#if HAS_LOCALE
extern "C" {

View File

@ -1,11 +0,0 @@
--- faxd/tif_fax3.h.orig Wed Nov 27 00:21:26 1996
+++ faxd/tif_fax3.h Sun Feb 8 03:37:58 1998
@@ -35,7 +35,7 @@
* in Frank Cringle's viewfax program;
* Copyright (C) 1990, 1995 Frank D. Cringle.
*/
-#include "tiff.h"
+#include "tiff34.h"
/*
* To override the default routine used to image decoded

View File

@ -1,11 +0,0 @@
--- hfaxd/FileSystem.c++.orig Wed Nov 27 00:21:47 1996
+++ hfaxd/FileSystem.c++ Sun Feb 8 03:37:59 1998
@@ -29,7 +29,7 @@
*/
#include "HylaFAXServer.h"
#include "Sys.h"
-#include "tiffio.h"
+#include "tiffio34.h"
#include <limits.h>
#include <ctype.h>

View File

@ -1,11 +0,0 @@
--- hfaxd/FileTransfer.c++.orig Wed Nov 27 00:21:47 1996
+++ hfaxd/FileTransfer.c++ Sun Feb 8 03:37:59 1998
@@ -31,7 +31,7 @@
#include "Sys.h"
#include "config.h"
#include "zlib.h"
-#include "tiffio.h"
+#include "tiffio34.h"
#include <ctype.h>
#include <limits.h>

View File

@ -1,11 +0,0 @@
--- hfaxd/HylaFAXServer.c++.orig Wed Nov 27 00:21:48 1996
+++ hfaxd/HylaFAXServer.c++ Sun Feb 8 03:37:59 1998
@@ -26,7 +26,7 @@
#include "port.h"
#include "Sys.h"
#include "config.h"
-#include "tiffio.h"
+#include "tiffio34.h"
#include "HylaFAXServer.h"
#include "Dispatcher.h"

View File

@ -1,11 +0,0 @@
--- hfaxd/RecvQueue.c++.orig Wed Nov 27 00:21:50 1996
+++ hfaxd/RecvQueue.c++ Sun Feb 8 03:38:00 1998
@@ -30,7 +30,7 @@
#include "HylaFAXServer.h"
#include "Sys.h"
#include "Socket.h"
-#include "tiffio.h"
+#include "tiffio34.h"
#include <ctype.h>
#include <sys/file.h>

View File

@ -1,12 +0,0 @@
--- config.guess.orig Wed Nov 27 00:20:18 1996
+++ config.guess Sun Feb 8 03:37:57 1998
@@ -276,6 +276,9 @@
*:NetBSD:*:*)
echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ exit 0 ;;
*:GNU:*:*)
echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;

View File

@ -1,62 +0,0 @@
--- configure.orig Wed Nov 27 00:20:17 1996
+++ configure Sun Feb 8 06:15:08 1998
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/local/bin/bash
# $Id: patch-bc,v 1.1.1.1 1998/02/08 06:00:10 niklas Exp $
#
# HylaFAX Facsimile Software
@@ -68,7 +68,7 @@
GS=no
IMP=no
UTMP=auto
-LIBTIFF="-L/usr/local/lib -ltiff"
+LIBTIFF="-L/usr/local/lib -ltiff34"
TIFFINC=/usr/local/include
TIFFBIN=/usr/local/bin
ZLIB=yes
@@ -239,7 +239,7 @@
test -d /usr/ucb && PATH=$PATH:/usr/ucb # Sun and others
test -d /usr/contrib/bin && PATH=$PATH:/usr/contrib/bin # BSDi
test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc # Sun and others
-test -d /usr/local/bin && PATH=/usr/local/bin:$PATH # for GNU stuff
+test -d /usr/local/bin && PATH=$PATH:/usr/local/bin # for GNU stuff
PATH=$PATH:$OPATH
POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions
@@ -2781,7 +2781,7 @@
# Verify library is compatible.
#
cat>t.c<<EOF
-#include "tiffio.h"
+#include "tiffio34.h"
main()
{
if (TIFFLIB_VERSION < 19960307) { /* check include file version */
@@ -3362,6 +3362,7 @@
*-solaris*) LOCKS="+ascii";;
*-freebsd*) LOCKS=ascii;;
*-netbsd*) LOCKS=ascii;;
+ *-openbsd*) LOCKS=ascii;;
*bsd*) LOCKS=binary;;
*) LOCKS=ascii;;
esac
@@ -3535,7 +3536,7 @@
if [ -z "$MANSCHEME" ]; then
case $TARGET in
*-bsdi*|*-netbsd*) MANSCHEME=bsd-nroff-gzip-0.gz;;
- *-freebsd*) MANSCHEME=bsd-source-cat;;
+ *-freebsd*|*-openbsd*) MANSCHEME=bsd-source-cat;;
*-linux*) MANSCHEME=bsd-source-cat;;
*-ultrix*) MANSCHEME=bsd-source-cat;;
*-sunos*) MANSCHEME=bsd-source-cat-strip;;
@@ -3928,7 +3929,8 @@
printConfig
checkForExecutable $PATH_SENDMAIL
checkForExecutable $PATH_GETTY
- prompt "Are these ok [yes]?"; read ok
+# prompt "Are these ok [yes]?"; read ok
+ ok=yes
test -z "$ok" && ok=yes
case "$ok" in
[1-9]|1[0-9]) promptForParameter $ok;;

View File

@ -1 +1 @@
A fax software.
send/receive faxes and share modems

View File

@ -1,19 +1,26 @@
Hylafax was installed. You'll need manual configurations to actually
activate it.
Setting up: (for impatients)
Invoke /usr/local/sbin/faxsetup, and answer what she asks.
Congratulations, HylaFAX has been installed!
It now needs some manual configuration before it is usable.
Setting up: (for the impatient)
Invoke /usr/local/sbin/faxsetup to interactively configure it.
When you are asked to specify the name of tty device, use a
tty device existing on your architecture instead of "ttyd1".
Otherwise it does not work well.
Consult /usr/local/etc/rc.d/hylafax.sh.sample for startups.
Consult /usr/local/lib/fax/hylafax.sh.sample for an example
of what to put in /etc/rc.local.
For accepting incoming FAX/data calls, modify /etc/ttys to
something like below and send SIGHUP to init process:
For accepting incoming FAX/data calls, modify /etc/ttys(5) to
contain something like this:
>cua00 "/usr/local/sbin/faxgetty" dialup on secure
cua00 "/usr/local/sbin/faxgetty" dialup on
and send a SIGHUP to init(8).
Documentation: (for the methodical)
Documentation:
On Line Manuals: man hylafax.
World Wide Web site: http://www.vix.com/flexfax/
World Wide Web site: http://www.vix.com/hylafax/

View File

@ -1,17 +1,55 @@
@cwd /usr/local
bin/faxalter
bin/faxcover
bin/faxmail
bin/faxrm
bin/faxstat
bin/sendfax
bin/sendpage
etc/rc.d/hylafax.sh.sample
lib/fax/faxcover.ps
lib/fax/faxmail.ps
lib/fax/hfaxd.conf
@exec install -d -o bin -g bin -m 755 %D/lib/fax
@exec install -d -m 755 %D/man/man1
@exec install -d -m 755 %D/man/man5
@exec install -d -m 755 %D/man/man8
lib/fax/hylafax.sh.sample
sbin/textfmt
lib/fax/pagesizes
lib/fax/typerules
sbin/faxmsg
sbin/faxconfig
sbin/faxmodem
sbin/faxstate
sbin/faxwatch
sbin/faxinfo
sbin/tiffcheck
sbin/faxabort
sbin/faxanswer
sbin/faxquit
sbin/dialtest
sbin/typetest
sbin/xferstats
sbin/recvstats
sbin/faxcron
bin/faxalter
bin/faxcover
lib/fax/faxcover.ps
sbin/faxq
sbin/faxqclean
sbin/faxgetty
sbin/faxsend
sbin/pagesend
sbin/tsitest
sbin/tagtest
sbin/cqtest
sbin/choptest
bin/faxmail
lib/fax/faxmail.ps
bin/faxrm
bin/faxstat
sbin/hfaxd
lib/fax/hfaxd.conf
bin/sendfax
bin/sendpage
sbin/faxaddmodem
sbin/faxsetup
sbin/faxsetup.bsdi
sbin/faxsetup.irix
sbin/faxsetup.linux
sbin/probemodem
sbin/lockname
sbin/ondelay
man/man1/faxalter.1
man/man1/faxcover.1
man/man1/faxmail.1
@ -22,23 +60,8 @@ man/man1/sendfax.1
man/man1/sendpage.1
man/man1/sgi2fax.1
man/man1/textfmt.1
man/man5/cid.5f
man/man5/config.5f
man/man5/destctrls.5f
man/man5/dialrules.5f
man/man5/hosts.5f
man/man5/hylafax.5f
man/man5/info.5f
man/man5/log.5f
man/man5/pagermap.5f
man/man5/pagesizes.5f
man/man5/recvq.5f
man/man5/sendq.5f
man/man5/shutdown.5f
man/man5/status.5f
man/man5/tsi.5f
man/man5/typerules.5f
man/man5/xferlog.5f
man/man8/choptest.8c
man/man8/cqtest.8c
man/man8/dialtest.8c
@ -71,61 +94,62 @@ man/man8/tiffcheck.8c
man/man8/tsitest.8c
man/man8/wedged.8c
man/man8/xferstats.8c
sbin/choptest
sbin/cqtest
sbin/dialtest
sbin/faxabort
sbin/faxaddmodem
sbin/faxanswer
sbin/faxconfig
sbin/faxcron
sbin/faxgetty
sbin/faxinfo
sbin/faxmodem
sbin/faxmsg
sbin/faxq
sbin/faxqclean
sbin/faxquit
sbin/faxsend
sbin/faxsetup
sbin/faxsetup.bsdi
sbin/faxsetup.irix
sbin/faxsetup.linux
sbin/faxstate
sbin/faxwatch
sbin/hfaxd
sbin/lockname
sbin/ondelay
sbin/pagesend
sbin/probemodem
sbin/recvstats
sbin/tagtest
sbin/textfmt
sbin/tiffcheck
sbin/tsitest
sbin/typetest
sbin/xferstats
@dirrm lib/fax
man/man5/cid.5f
man/man5/config.5f
man/man5/destctrls.5f
man/man5/dialrules.5f
man/man5/hosts.5f
man/man5/hylafax.5f
man/man5/info.5f
man/man5/log.5f
man/man5/pagermap.5f
man/man5/recvq.5f
man/man5/sendq.5f
man/man5/shutdown.5f
man/man5/status.5f
man/man5/tsi.5f
man/man5/xferlog.5f
@dirrm %D/lib/fax
@cwd /var/spool
@exec install -d -o uucp -g dialer -m 755 %D/fax
@exec install -d -o uucp -g dialer -m 755 %D/fax/bin
@exec install -d -o uucp -g dialer -m 755 %D/fax/client
@exec install -d -o uucp -g dialer -m 755 %D/fax/config
@exec install -d -o uucp -g dialer -m 755 %D/fax/dev
@exec install -d -o uucp -g dialer -m 755 %D/fax/etc
@exec install -d -o uucp -g dialer -m 755 %D/fax/info
@exec install -d -o uucp -g dialer -m 755 %D/fax/log
@exec install -d -o uucp -g dialer -m 755 %D/fax/recvq
@exec install -d -o uucp -g dialer -m 755 %D/fax/status
@exec install -d -o uucp -g dialer -m 700 %D/fax/sendq
@exec install -d -o uucp -g dialer -m 700 %D/fax/doneq
@exec install -d -o uucp -g dialer -m 700 %D/fax/docq
@exec install -d -o uucp -g dialer -m 700 %D/fax/tmp
@exec install -d -o uucp -g dialer -m 700 %D/fax/pollq
@exec install -d -o uucp -g dialer -m 700 %D/fax/archive
@exec mkfifo %D/fax/FIFO; chown uucp:dialer %D/fax/FIFO; chmod 600 %D/fax/FIFO
fax/COPYRIGHT
fax/bin/faxrcvd
fax/bin/mkcover
fax/bin/ps2fax.gs
fax/bin/ps2fax.dps
fax/bin/ps2fax.imp
fax/bin/pcl2fax
fax/bin/tiff2fax
fax/bin/notify
fax/bin/notify.awk
fax/bin/pcl2fax
fax/bin/faxrcvd
fax/bin/pollrcvd
fax/bin/ps2fax.dps
fax/bin/ps2fax.gs
fax/bin/ps2fax.imp
fax/bin/tiff2fax
fax/bin/mkcover
fax/bin/wedged
fax/config/att-dataport
fax/config/att-dataport-2
fax/config/att-dataport-2.0
fax/config/cirrus
fax/etc/dpsprinter.ps
fax/etc/cover.templ
fax/config/class1
fax/config/class2
fax/config/class2.0
fax/config/skel
fax/config/att-dataport-2
fax/config/att-dataport-2.0
fax/config/att-dataport
fax/config/cirrus
fax/config/dsi-scout+
fax/config/e-tech
fax/config/everex-2496d
@ -145,9 +169,8 @@ fax/config/rc288dpi-1
fax/config/rc32acl
fax/config/rc32acl-1
fax/config/rockwell
fax/config/skel
fax/config/telebit-qblazer
fax/config/telebit-t3000
fax/config/telebit-qblazer
fax/config/telebit-wb
fax/config/tricom2842
fax/config/uds-fastalk
@ -158,69 +181,27 @@ fax/config/zyxel-1496e
fax/config/zyxel-1496e-1
fax/config/zyxel-1496e-2.0
fax/config/zyxel-2864
fax/etc/cover.templ
fax/etc/dialrules
fax/etc/dialrules.europe
fax/etc/dialrules.sf-ba
fax/etc/dpsprinter.ps
fax/etc/hosts
fax/etc/lutRS18.pcf
fax/config/sierra
fax/etc/xferlog
@exec chown uucp:dialer %D/fax
@comment pkg_* can't deal with fifos if specified as a file
@exec mkfifo %D/fax/FIFO
@exec chown uucp:dialer %D/fax/FIFO
@exec chmod 600 %D/fax/FIFO
fax/etc/hosts
fax/etc/dialrules
fax/etc/dialrules.sf-ba
fax/etc/dialrules.europe
fax/etc/lutRS18.pcf
@dirrm %D/fax/bin
@dirrm %D/fax/client
@dirrm %D/fax/config
@dirrm %D/fax/dev
@dirrm %D/fax/etc
@dirrm %D/fax/info
@dirrm %D/fax/log
@dirrm %D/fax/recvq
@dirrm %D/fax/status
@dirrm %D/fax/sendq
@dirrm %D/fax/doneq
@dirrm %D/fax/docq
@dirrm %D/fax/tmp
@dirrm %D/fax/pollq
@dirrm %D/fax/archive
@unexec rm %D/fax/FIFO
@exec mkdir %D/fax/archive
@exec chown uucp:dialer %D/fax/archive
@exec chmod 700 %D/fax/archive
@exec mkdir %D/fax/client
@exec chown uucp:dialer %D/fax/client
@exec chmod 755 %D/fax/client
@exec mkdir %D/fax/dev
@exec chown uucp:dialer %D/fax/dev
@exec chmod 755 %D/fax/dev
@exec mkdir %D/fax/docq
@exec chown uucp:dialer %D/fax/docq
@exec chmod 700 %D/fax/docq
@exec mkdir %D/fax/doneq
@exec chown uucp:dialer %D/fax/doneq
@exec chmod 700 %D/fax/doneq
@exec mkdir %D/fax/info
@exec chown uucp:dialer %D/fax/info
@exec chmod 755 %D/fax/info
@exec mkdir %D/fax/log
@exec chown uucp:dialer %D/fax/log
@exec chmod 755 %D/fax/log
@exec mkdir %D/fax/pollq
@exec chown uucp:dialer %D/fax/pollq
@exec chmod 700 %D/fax/pollq
@exec mkdir %D/fax/recvq
@exec chown uucp:dialer %D/fax/recvq
@exec chmod 755 %D/fax/recvq
@exec mkdir %D/fax/sendq
@exec chown uucp:dialer %D/fax/sendq
@exec chmod 700 %D/fax/sendq
@exec mkdir %D/fax/status
@exec chown uucp:dialer %D/fax/status
@exec chmod 755 %D/fax/status
@exec mkdir %D/fax/tmp
@exec chown uucp:dialer %D/fax/tmp
@exec chmod 700 %D/fax/tmp
@dirrm fax/archive
@dirrm fax/bin
@dirrm fax/client
@dirrm fax/config
@dirrm fax/dev
@dirrm fax/docq
@dirrm fax/doneq
@dirrm fax/etc
@dirrm fax/info
@dirrm fax/log
@dirrm fax/pollq
@dirrm fax/recvq
@dirrm fax/sendq
@dirrm fax/status
@dirrm fax/tmp
@dirrm fax
@dirrm %D/fax

View File

@ -1,10 +0,0 @@
The port is complete rewrite of hylafax-3.0p1 port by Julian Stacey
<jhs@freebsd.org>, May 1995.
original notice was as follows:
Copyright Julian Stacey 1995:
Please preserve & comply with Sam Leffler's & SGI's legal stuff
I hereby release my work in this area for public use,
& disclaim all liability !
Leave my name intact please, I'm a freelance, publicity can
be useful.