HylaFAX 4.0beta1 suggested patches.

To: Hylafax Mailing List <flexfax@sgi.com>
Subject: flexfax: HylaFAX 4.0beta1 suggested patches.
From: Nico Kadel-Garcia <raoul@cirl.meei.harvard.edu>
Date: Thu, 8 Jul 1999 19:10:13 -0400 (EDT)

-----BEGIN PGP SIGNED MESSAGE-----


The source looks pretty good. I would suggest the following attached patches
for production: most of them are variants of patches I've posted before
but need alteration or tweaks for this distribution.

hosts.fax-patch.sh - 	An optional patch to change the use of
			$SPOOLDIR/etc/hosts to be
			$SPOOLDIR/etc/hosts.fax. I like it a lot, but
			it's not mandatory to use.

zlib.patch - 		Gets the zlib makefile to correctly use the
			same compiler as HylaFAX, and gets "clean" to
			work correctly.

fxSIGVEC.patch -	fxSIGVEC patch for gcc-2.8.1 under SunOS:
			configure with gcc-2.8.1 reports some strange
			C++ error under SunOS and other OS's, which
			cause fxSIGVEC not to be set. This sets it to
			the same as fxSIGACTION if that check fails.

fixhtml.patch -		Adds a "fixhtml.sh" script to fix the HTML
			pages after installation for local CGIPATH and
			HTMLPATH values.  (Formerly
			http://www.hylafax.org/patches/fixhtml-patch.sh)

fixhtml.patch -		Adds a "fixhtml.sh" script to fix the HTML
			pages after installation for local CGIPATH and
			HTMLPATH values.  (Formerly
			http://www.hylafax.org/patches/fixhtml-patch.sh)

manpage-patch.sh -	Deletes man subdirectory entries in HTML pages
			to let manpage CGI work on multiple OS's. (Formerly
			http://www.hylafax.org/patches/fixhtml-manpage-patch.sh

Let me know what you think!


			Nico Kadel-Garcia
			Senior Engineer, CIRL 
			Mass. Eye and Ear Infirmary
			raoul@cirl.meei.harvard.edu

-----BEGIN PGP SIGNATURE-----
Version: 2.6.2

iQCVAwUBN4Uu/z/+ItycgIJRAQGlPgQAmlFnpSibX8/25cd4dn7yU3rDYdknh43t
Z0kdj9GKbVmK2bRFxIWY3XGQ06B0/R9oU+ProLf93CYkKw1zuUBwp4vP0QHyTqF2
wfMnwuIzcomO5LBKYtv/PlhCOqckSLdaFBRY9dSodyvBQZ0/G7fv8I96Snv2ieEK
uSlzKbUsGII=
=Ud8V
-----END PGP SIGNATURE-----

#!/bin/sh
#
# This is a shell script that changes the HylaFAX etc/hosts file to be
# etc/hosts.fax
#

test -f man/hosts.4f && mv man/hosts.4f man/hosts.fax.4f

patch -p1 -E < $0

exit 0

# Here is the actual patch

diff -cr hylafax-4.1beta1.orig/config.h.in hylafax-4.1beta1/config.h.in
*** hylafax-4.1beta1.orig/config.h.in
--- hylafax-4.1beta1/config.h.in
***************
*** 136,146 ****
  
  /*
   * Client access to services on the server machine is controlled
!  * by information in the ``hosts'' file.  This is actually a
   * minsomer; the file has much more information than host names
   * (but it used to only have host-related information).
   */
! #define	FAX_PERMFILE	FAX_ETCDIR "/hosts"
  
  /*
   * Server processes write various status information to files
--- 136,146 ----
  
  /*
   * Client access to services on the server machine is controlled
!  * by information in the ``hosts.fax'' file.  This is actually a
   * minsomer; the file has much more information than host names
   * (but it used to only have host-related information).
   */
! #define	FAX_PERMFILE	FAX_ETCDIR "/hosts.fax"
  
  /*
   * Server processes write various status information to files
diff -cr hylafax-4.1beta1.orig/distrules hylafax-4.1beta1/distrules
*** hylafax-4.1beta1.orig/distrules
--- hylafax-4.1beta1/distrules
***************
*** 612,618 ****
  	man/faxstate.1m				\
  	man/faxwatch.1m				\
  	man/hfaxd.1m				\
! 	man/hosts.4f				\
  	man/hylafax.1				\
  	man/hylafax.4f				\
  	man/info.4f				\
--- 612,618 ----
  	man/faxstate.1m				\
  	man/faxwatch.1m				\
  	man/hfaxd.1m				\
! 	man/hosts.fax.4f			\
  	man/hylafax.1				\
  	man/hylafax.4f				\
  	man/info.4f				\
diff -cr hylafax-4.1beta1.orig/etc/Makefile.in hylafax-4.1beta1/etc/Makefile.in
*** hylafax-4.1beta1.orig/etc/Makefile.in
--- hylafax-4.1beta1/etc/Makefile.in
***************
*** 45,51 ****
  DIALRULES=dialrules \
  	dialrules.sf-ba \
  	dialrules.europe
! TARGETS	= config.fax hosts xferfaxlog lockname ondelay
  
  default all::
  	@${MAKE} targets
--- 45,51 ----
  DIALRULES=dialrules \
  	dialrules.sf-ba \
  	dialrules.europe
! TARGETS	= config.fax hosts.fax xferfaxlog lockname ondelay
  
  default all::
  	@${MAKE} targets
***************
*** 54,62 ****
  
  @MAKEINCLUDE@ @MAKELQUOTE@${COMMONRULES}@MAKERQUOTE@
  
! hosts:
! 	${ECHO} "localhost" >hosts
! 	${ECHO} "127.0.0.1" >>hosts
  xferfaxlog:
  	${ECHO} >xferfaxlog
  config.fax:
--- 54,62 ----
  
  @MAKEINCLUDE@ @MAKELQUOTE@${COMMONRULES}@MAKERQUOTE@
  
! hosts.fax:
! 	${ECHO} "localhost" >hosts.fax
! 	${ECHO} "127.0.0.1" >>hosts.fax
  xferfaxlog:
  	${ECHO} >xferfaxlog
  config.fax:
***************
*** 79,85 ****
  	done
  	${PUTSERVER} -F ${SBIN} -m 755 -src probemodem.sh -O probemodem
  	${PUTSAMPLE} -F ${SPOOL}/etc -m 644 -o xferfaxlog
! 	${PUTSAMPLE} -F ${SPOOL}/etc -m 600 -o hosts
  	for i in ${DIALRULES}; do \
  	    ${PUTSERVER} -F ${SPOOL}/etc -m 444 -src ${SRCDIR}/$$i \
  		-idb "config(update)" -O $$i; \
--- 79,85 ----
  	done
  	${PUTSERVER} -F ${SBIN} -m 755 -src probemodem.sh -O probemodem
  	${PUTSAMPLE} -F ${SPOOL}/etc -m 644 -o xferfaxlog
! 	${PUTSAMPLE} -F ${SPOOL}/etc -m 600 -o hosts.fax
  	for i in ${DIALRULES}; do \
  	    ${PUTSERVER} -F ${SPOOL}/etc -m 444 -src ${SRCDIR}/$$i \
  		-idb "config(update)" -O $$i; \
diff -cr hylafax-4.1beta1.orig/etc/faxsetup.sh.in hylafax-4.1beta1/etc/faxsetup.sh.in
*** hylafax-4.1beta1.orig/etc/faxsetup.sh.in
--- hylafax-4.1beta1/etc/faxsetup.sh.in
***************
*** 1559,1565 ****
      # Verify existence, permission and ownership of sensitive files.
      # XXX there are other files too 
      #
!     HOSTS=$DIR_SPOOL/etc/hosts
      test -f $HOSTS || {
  	cat<<EOF
  
--- 1559,1565 ----
      # Verify existence, permission and ownership of sensitive files.
      # XXX there are other files too 
      #
!     HOSTS=$DIR_SPOOL/etc/hosts.fax
      test -f $HOSTS || {
  	cat<<EOF
  
***************
*** 1569,1575 ****
  This file specifies which clients are permitted to use the HylaFAX
  server.  The file will be initialized so that local clients are
  provided service.  Consult the HTML documentation and the manual
! page hosts(4F) for more information on setting up this file.
  
  EOF
  	$RM $HOSTS
--- 1569,1575 ----
  This file specifies which clients are permitted to use the HylaFAX
  server.  The file will be initialized so that local clients are
  provided service.  Consult the HTML documentation and the manual
! page hosts.fax(4F) for more information on setting up this file.
  
  EOF
  	$RM $HOSTS
diff -cr hylafax-4.1beta1.orig/hfaxd/hfaxd.conf hylafax-4.1beta1/hfaxd/hfaxd.conf
*** hylafax-4.1beta1.orig/hfaxd/hfaxd.conf
--- hylafax-4.1beta1/hfaxd/hfaxd.conf
***************
*** 15,21 ****
  #MaxAdminAttempts:	5		# max # admin attempts before disconnect
  #MaxConsecutiveBadCmds:	10		# max # invalid cmds before disconnect
  #FaxContact:		FaxMaster	# who gets questions/complaints
! #UserAccessFile:	"/etc/hosts"	# user+host access control file
  #ShutdownFile:		"/etc/shutdown"	# server shutdown control filename
  #XferLogFile:		"/etc/clientlog"	# for logging client file transfers
  #FaxQFIFOName:		"/FIFO"		# FIFO name for talking to faxq process
--- 15,21 ----
  #MaxAdminAttempts:	5		# max # admin attempts before disconnect
  #MaxConsecutiveBadCmds:	10		# max # invalid cmds before disconnect
  #FaxContact:		FaxMaster	# who gets questions/complaints
! #UserAccessFile:	"/etc/hosts.fax"	# user+host access control file
  #ShutdownFile:		"/etc/shutdown"	# server shutdown control filename
  #XferLogFile:		"/etc/clientlog"	# for logging client file transfers
  #FaxQFIFOName:		"/FIFO"		# FIFO name for talking to faxq process
diff -cr hylafax-4.1beta1.orig/html/overview.html hylafax-4.1beta1/html/overview.html
*** hylafax-4.1beta1.orig/html/overview.html
--- hylafax-4.1beta1/html/overview.html
***************
*** 82,88 ****
  designed to be lightweight and easy to port; imaging can be offloaded
  to the server or done on the client.  (Imaging is however, typically
  done on the server because it simplifies administration.) 
! An <A HREF="@CGIPATH@/manpage?4+hosts">access control</A>
  mechanism is included to control which users on which machines may
  access a server.
  Clients and servers communicate using well-defined publicly
--- 82,88 ----
  designed to be lightweight and easy to port; imaging can be offloaded
  to the server or done on the client.  (Imaging is however, typically
  done on the server because it simplifies administration.) 
! An <A HREF="@CGIPATH@/manpage?4+hosts.fax">access control</A>
  mechanism is included to control which users on which machines may
  access a server.
  Clients and servers communicate using well-defined publicly
diff -cr hylafax-4.1beta1.orig/html/setup-client.html hylafax-4.1beta1/html/setup-client.html
*** hylafax-4.1beta1.orig/html/setup-client.html
--- hylafax-4.1beta1/html/setup-client.html
***************
*** 83,94 ****
  
  Once a client machine is setup for use the server machine may need to
  be configured to permit client access.  Specifically, the file
! <B>etc/hosts</B> in the spooling area on the server machine must be setup to
  permit client access to HylaFAX services.
  This documentation has a section on
  ``<A HREF=setup.html#HFaxd>Setting up client access</A>''
  and the
! <A HREF="@CGIPATH@/manpage?4+hosts">hosts(4F)</A>
  manual page has reference information how this is done.
  
  <P><A NAME="Coverpage"><HR WIDTH=65% ALIGN=right><H2>Customizing Cover Pages</H2></A>
--- 83,94 ----
  
  Once a client machine is setup for use the server machine may need to
  be configured to permit client access.  Specifically, the file
! <B>etc/hosts.fax</B> in the spooling area on the server machine must be setup to
  permit client access to HylaFAX services.
  This documentation has a section on
  ``<A HREF=setup.html#HFaxd>Setting up client access</A>''
  and the
! <A HREF="@CGIPATH@/manpage?4+hosts.fax">hosts.fax(4F)</A>
  manual page has reference information how this is done.
  
  <P><A NAME="Coverpage"><HR WIDTH=65% ALIGN=right><H2>Customizing Cover Pages</H2></A>
diff -cr hylafax-4.1beta1.orig/html/setup.html hylafax-4.1beta1/html/setup.html
*** hylafax-4.1beta1.orig/html/setup.html
--- hylafax-4.1beta1/html/setup.html
***************
*** 1399,1412 ****
  is booted, it is necessary
  to specify which client machines and users can have access to a HylaFAX
  server machine.
! This is specified by the contents of the <B>etc/hosts</B> file in
  the HylaFAX spooling area on the server machine.
  The contents of this file is specified in the
! <A HREF="@CGIPATH@/manpage?4+hosts">hosts(4F)</A>
  manual page.
! The default <B>etc/hosts</B> file that comes with HylaFAX permits anyone
  to have access through the <I>localhost</I> network interface; i.e. the
! hosts file contains:
  
  <UL><TT>
  <PRE>localhost
--- 1399,1412 ----
  is booted, it is necessary
  to specify which client machines and users can have access to a HylaFAX
  server machine.
! This is specified by the contents of the <B>etc/hosts.fax</B> file in
  the HylaFAX spooling area on the server machine.
  The contents of this file is specified in the
! <A HREF="@CGIPATH@/manpage?4+hosts.fax">hosts.fax(4F)</A>
  manual page.
! The default <B>etc/hosts.fax</B> file that comes with HylaFAX permits anyone
  to have access through the <I>localhost</I> network interface; i.e. the
! hosts.fax file contains:
  
  <UL><TT>
  <PRE>localhost
***************
*** 1424,1430 ****
  <TABLE BORDER=0>
  <TR>
  <TD><IMG SRC=icons/warning_icon.gif HSPACE=8></TD>
! <TD><EM>The <B>etc/hosts</B> file must be owned by the fax user and
  be mode 0600 or hfaxd will not permit client access.</EM></TD>
  </TR>
  </TABLE>
--- 1424,1430 ----
  <TABLE BORDER=0>
  <TR>
  <TD><IMG SRC=icons/warning_icon.gif HSPACE=8></TD>
! <TD><EM>The <B>etc/hosts.fax</B> file must be owned by the fax user and
  be mode 0600 or hfaxd will not permit client access.</EM></TD>
  </TR>
  </TABLE>
diff -cr hylafax-4.1beta1.orig/html/troubleshooting.html hylafax-4.1beta1/html/troubleshooting.html
*** hylafax-4.1beta1.orig/html/troubleshooting.html
--- hylafax-4.1beta1/html/troubleshooting.html
***************
*** 278,284 ****
  the hfaxd server process then access control problems are
  either due to incorrect installation of the server software or
  misconfigured permissions on the server machine.
! Client access is defined by the contents of the <B>etc/hosts</B> file
  located in the HylaFAX spooling area on the server machine.
  This file must exist and <EM>must not be publicly readable</EM>
  or access will be denied to all clients.
--- 278,284 ----
  the hfaxd server process then access control problems are
  either due to incorrect installation of the server software or
  misconfigured permissions on the server machine.
! Client access is defined by the contents of the <B>etc/hosts.fax</B> file
  located in the HylaFAX spooling area on the server machine.
  This file must exist and <EM>must not be publicly readable</EM>
  or access will be denied to all clients.
***************
*** 287,293 ****
  <TABLE BORDER=0>
  <TR>
  <TD><IMG SRC="icons/warning_icon.gif" HSPACE=8></TD>
! <TD><EM>Beware of the protection on the <B>etc/hosts</B> file when
  upgrading from HylaFAX 3.0.  Previous versions of HylaFAX
  did not care if the file was publicly readable
  so it probably is.</EM></TD>
--- 287,293 ----
  <TABLE BORDER=0>
  <TR>
  <TD><IMG SRC="icons/warning_icon.gif" HSPACE=8></TD>
! <TD><EM>Beware of the protection on the <B>etc/hosts.fax</B> file when
  upgrading from HylaFAX 3.0.  Previous versions of HylaFAX
  did not care if the file was publicly readable
  so it probably is.</EM></TD>
***************
*** 311,317 ****
  Beware that hfaxd stores this ID as the group ID of files that are
  created on a HylaFAX server on behalf of a client.
  The fax user ID assigned to a client is defined by the information
! in the <B>etc/hosts</B> file; consult the manual page for more details.
  You can also find the user ID for a particular user by
  logging in with telnet and issuing a <TT>STAT</TT> request:
  
--- 311,317 ----
  Beware that hfaxd stores this ID as the group ID of files that are
  created on a HylaFAX server on behalf of a client.
  The fax user ID assigned to a client is defined by the information
! in the <B>etc/hosts.fax</B> file; consult the manual page for more details.
  You can also find the user ID for a particular user by
  logging in with telnet and issuing a <TT>STAT</TT> request:
  
***************
*** 355,361 ****
  The existing password facilities use the same 
  <A HREF="@CGIPATH@/manpage?3+crypt">crypt(3)</A>
  function the system login facilities use and encrypted passwords
! are stored in the <B>etc/hosts</B> file in a format that is compatible
  with most systems' password files.
  This means that client passwords can be copied from a password file
  if desired (though this is obviously discouraged).
--- 355,361 ----
  The existing password facilities use the same 
  <A HREF="@CGIPATH@/manpage?3+crypt">crypt(3)</A>
  function the system login facilities use and encrypted passwords
! are stored in the <B>etc/hosts.fax</B> file in a format that is compatible
  with most systems' password files.
  This means that client passwords can be copied from a password file
  if desired (though this is obviously discouraged).
***************
*** 377,385 ****
  <P>
  If a client is prompted for a password when contacting the server
  then it means the client is setup with a password in the
! <B>etc/hosts</B> file.
  Read the 
! <A HREF="@CGIPATH@/manpage?4+hosts">hosts(4F)</A>
  manual page carefully to understand the format for this file.
  
  <P>
--- 377,385 ----
  <P>
  If a client is prompted for a password when contacting the server
  then it means the client is setup with a password in the
! <B>etc/hosts.fax</B> file.
  Read the 
! <A HREF="@CGIPATH@/manpage?4+hosts.fax">hosts.fax(4F)</A>
  manual page carefully to understand the format for this file.
  
  <P>
diff -cr hylafax-4.1beta1.orig/html/upgrade4.0.html hylafax-4.1beta1/html/upgrade4.0.html
*** hylafax-4.1beta1.orig/html/upgrade4.0.html
--- hylafax-4.1beta1/html/upgrade4.0.html
***************
*** 43,49 ****
      <A HREF="@CGIPATH@/manpage?1+faxmodem">faxmodem(1M)</A>
      and
      <A HREF="@CGIPATH@/manpage?1+faxq">faxq(1M)</A>.
! <LI>The <B>etc/hosts</B> file on the server may contain passwords
      in v4.0 and hfaxd will not trust any information there
      unless the file is mode 0600.
      Since previous versions did not care what mode the file was
--- 43,49 ----
      <A HREF="@CGIPATH@/manpage?1+faxmodem">faxmodem(1M)</A>
      and
      <A HREF="@CGIPATH@/manpage?1+faxq">faxq(1M)</A>.
! <LI>The <B>etc/hosts.fax</B> file on the server may contain passwords
      in v4.0 and hfaxd will not trust any information there
      unless the file is mode 0600.
      Since previous versions did not care what mode the file was
diff -cr hylafax-4.1beta1.orig/html/v4.0beta022.html hylafax-4.1beta1/html/v4.0beta022.html
*** hylafax-4.1beta1.orig/html/v4.0beta022.html
--- hylafax-4.1beta1/html/v4.0beta022.html
***************
*** 51,58 ****
      jobs to be left in a ``suspended'' state if <B>faxq</B> was prematurely
      terminated
  <LI>a bug in <B>faxsetup</B>'s handling of certain prompts was corrected
! <LI><B>faxsetup</B> now does some consistency checking of the <B>etc/hosts</B>
!     file in the spooling area
  <LI><B>faxsetup</B> handles SCO systems better
  <LI>some code was added to deal with language changes introduced in
      the latest ANSI C++ draft specification (and implemented in the
--- 51,58 ----
      jobs to be left in a ``suspended'' state if <B>faxq</B> was prematurely
      terminated
  <LI>a bug in <B>faxsetup</B>'s handling of certain prompts was corrected
! <LI><B>faxsetup</B> now does some consistency checking of the
!     <B>etc/hosts.fax</B> file in the spooling area
  <LI><B>faxsetup</B> handles SCO systems better
  <LI>some code was added to deal with language changes introduced in
      the latest ANSI C++ draft specification (and implemented in the
diff -cr hylafax-4.1beta1.orig/man/Makefile.in hylafax-4.1beta1/man/Makefile.in
*** hylafax-4.1beta1.orig/man/Makefile.in
--- hylafax-4.1beta1/man/Makefile.in
***************
*** 98,104 ****
  	sman.files/config.4f	\
  	sman.files/destctrls.4f	\
  	sman.files/dialrules.4f	\
! 	sman.files/hosts.4f	\
  	sman.files/info.4f	\
  	sman.files/log.4f	\
  	sman.files/pagermap.4f	\
--- 98,104 ----
  	sman.files/config.4f	\
  	sman.files/destctrls.4f	\
  	sman.files/dialrules.4f	\
! 	sman.files/hosts.fax.4f	\
  	sman.files/info.4f	\
  	sman.files/log.4f	\
  	sman.files/pagermap.4f	\
***************
*** 183,189 ****
  sman.files/config.4f::	${SRCDIR}/config.4f;	${MANCVT}
  sman.files/destctrls.4f:: ${SRCDIR}/destctrls.4f; ${MANCVT}
  sman.files/dialrules.4f:: ${SRCDIR}/dialrules.4f; ${MANCVT}
! sman.files/hosts.4f::	${SRCDIR}/hosts.4f;	${MANCVT}
  sman.files/info.4f::	${SRCDIR}/info.4f;	${MANCVT}
  sman.files/log.4f::	${SRCDIR}/log.4f;	${MANCVT}
  sman.files/pagermap.4f::${SRCDIR}/pagermap.4f;	${MANCVT}
--- 183,189 ----
  sman.files/config.4f::	${SRCDIR}/config.4f;	${MANCVT}
  sman.files/destctrls.4f:: ${SRCDIR}/destctrls.4f; ${MANCVT}
  sman.files/dialrules.4f:: ${SRCDIR}/dialrules.4f; ${MANCVT}
! sman.files/hosts.fax.4f::	${SRCDIR}/hosts.fax.4f;	${MANCVT}
  sman.files/info.4f::	${SRCDIR}/info.4f;	${MANCVT}
  sman.files/log.4f::	${SRCDIR}/log.4f;	${MANCVT}
  sman.files/pagermap.4f::${SRCDIR}/pagermap.4f;	${MANCVT}
diff -cr hylafax-4.1beta1.orig/man/hfaxd.1m hylafax-4.1beta1/man/hfaxd.1m
*** hylafax-4.1beta1.orig/man/hfaxd.1m
--- hylafax-4.1beta1/man/hfaxd.1m
***************
*** 323,329 ****
  .SH "CLIENT ACCESS CONTROL"
  .I hfaxd
  controls client access according to the information in the file
! .BR etc/hosts .
  This file defines the set of users and machines that may receive
  service and, optionally, defines password challenges to use in
  authenticating clients.
--- 323,329 ----
  .SH "CLIENT ACCESS CONTROL"
  .I hfaxd
  controls client access according to the information in the file
! .BR etc/hosts.fax .
  This file defines the set of users and machines that may receive
  service and, optionally, defines password challenges to use in
  authenticating clients.
***************
*** 332,338 ****
  Access may also be restricted based on the host machine that a
  request for service originates from.
  Consult
! .IR hosts (4F)
  for information on the format and content of this file.
  The \s-1SITE ADDUSER\s+1
  protocol request is provided for adding new users to a server
--- 332,338 ----
  Access may also be restricted based on the host machine that a
  request for service originates from.
  Consult
! .IR hosts.fax (4F)
  for information on the format and content of this file.
  The \s-1SITE ADDUSER\s+1
  protocol request is provided for adding new users to a server
***************
*** 415,421 ****
  RetryTimeMap	string	\s-1\fIsee below\fP\s+1	mapping from service level to job retry time (\s-1SNPP\s+1)
  ServerTracing	integer	\s-11\s+1	server tracing control vector
  ShutdownFile	string	\s-1/etc/shutdown\s+1	name of shutdown control file
! UserAccessFile	string	\s-1/etc/hosts\s+1	name of access control file
  XferLogFile	string	\s-1/etc/clientlog\s+1	name of file for logging client data transfers
  .fi
  .PP
--- 415,421 ----
  RetryTimeMap	string	\s-1\fIsee below\fP\s+1	mapping from service level to job retry time (\s-1SNPP\s+1)
  ServerTracing	integer	\s-11\s+1	server tracing control vector
  ShutdownFile	string	\s-1/etc/shutdown\s+1	name of shutdown control file
! UserAccessFile	string	\s-1/etc/hosts.fax\s+1	name of access control file
  XferLogFile	string	\s-1/etc/clientlog\s+1	name of file for logging client data transfers
  .fi
  .PP
***************
*** 762,768 ****
  .B UserAccessFile
  The absolute pathname of the user access control file;
  see
! .IR hosts (4F)
  for information on the format and content of this file.
  (Note that absolute pathnames are relative to the root
  of the spooling area).
--- 762,768 ----
  .B UserAccessFile
  The absolute pathname of the user access control file;
  see
! .IR hosts.fax (4F)
  for information on the format and content of this file.
  (Note that absolute pathnames are relative to the root
  of the spooling area).
***************
*** 869,875 ****
  ${SPOOL}/client	for \s-1FIFO\s+1 files used in communicating with \fIfaxq\fP
  ${SPOOL}/status	for server status information
  ${SPOOL}/config.\fIdevice\fP	for returning server status
! ${SPOOL}/etc/hosts	host access control list
  ${SPOOL}/etc/shutdown	server shutdown control
  ${SPOOL}/etc/pagermap	\s-1SNPP\s+1 pager ID mapping file
  .fi
--- 869,875 ----
  ${SPOOL}/client	for \s-1FIFO\s+1 files used in communicating with \fIfaxq\fP
  ${SPOOL}/status	for server status information
  ${SPOOL}/config.\fIdevice\fP	for returning server status
! ${SPOOL}/etc/hosts.fax	host access control list
  ${SPOOL}/etc/shutdown	server shutdown control
  ${SPOOL}/etc/pagermap	\s-1SNPP\s+1 pager ID mapping file
  .fi
***************
*** 884,889 ****
  .IR faxq (1M),
  .IR syslog (3)
  .IR hylafax (4F),
! .IR hosts (4F),
  .IR status (4F),
  .IR shutdown (4F),
--- 884,889 ----
  .IR faxq (1M),
  .IR syslog (3)
  .IR hylafax (4F),
! .IR hosts.fax (4F),
  .IR status (4F),
  .IR shutdown (4F),
diff -cr hylafax-4.1beta1.orig/man/hylafax.4f hylafax-4.1beta1/man/hylafax.4f
*** hylafax-4.1beta1.orig/man/hylafax.4f
--- hylafax-4.1beta1/man/hylafax.4f
***************
*** 257,263 ****
  The remote job submission facility includes host and user
  access control.
  The file
! .B etc/hosts
  must be present and list those hosts and users that are
  permitted to queue jobs for transmission or do other operations
  that alter the status of a job.
--- 257,263 ----
  The remote job submission facility includes host and user
  access control.
  The file
! .B etc/hosts.fax
  must be present and list those hosts and users that are
  permitted to queue jobs for transmission or do other operations
  that alter the status of a job.
***************
*** 265,271 ****
  definition (usually 127.0.0.1) if local submission
  is to be permitted.
  For more information consult
! .IR hosts (4F).
  .PP
  There are a number of controls on outbound calls that can be
  specified using the
--- 265,271 ----
  definition (usually 127.0.0.1) if local submission
  is to be permitted.
  For more information consult
! .IR hosts.fax (4F).
  .PP
  There are a number of controls on outbound calls that can be
  specified using the
***************
*** 667,673 ****
  etc/setup.cache	server setup file created by \fIfaxsetup\fP
  etc/cid	caller id access control list
  etc/config.<devid>	configuration data for <devid>
! etc/hosts	hosts that may submit jobs for transmission
  etc/tsi	fax machine receive access control list
  etc/xferfaxlog	log of facsimile sent and received
  info/*	data base of remote fax machine capabilities
--- 667,673 ----
  etc/setup.cache	server setup file created by \fIfaxsetup\fP
  etc/cid	caller id access control list
  etc/config.<devid>	configuration data for <devid>
! etc/hosts.fax	hosts that may submit jobs for transmission
  etc/tsi	fax machine receive access control list
  etc/xferfaxlog	log of facsimile sent and received
  info/*	data base of remote fax machine capabilities
***************
*** 699,705 ****
  .IR config (4F),
  .IR dialrules (4F),
  .IR doneq (4F),
! .IR hosts (4F),
  .IR info (4F),
  .IR log (4F),
  .IR tsi (4F),
--- 699,705 ----
  .IR config (4F),
  .IR dialrules (4F),
  .IR doneq (4F),
! .IR hosts.fax (4F),
  .IR info (4F),
  .IR log (4F),
  .IR tsi (4F),
diff -cr hylafax-4.1beta1.orig/pkg/sproto.stub.in hylafax-4.1beta1/pkg/sproto.stub.in
*** hylafax-4.1beta1/pkg/sproto.stub.in.orig	Sat Feb 20 03:18:58 1999
--- hylafax-4.1beta1/pkg/sproto.stub.in	Tue Jul  6 14:25:03 1999
***************
*** 80,86 ****
  f man @MANDIR@/man4/config.4=../man/sman.files/config.4f 0444 @SYSUID@ @SYSGID@
  f man @MANDIR@/man4/destctrls.4=../man/sman.files/destctrls.4f 0444 @SYSUID@ @SYSGID@
  f man @MANDIR@/man4/dialrules.4=../man/sman.files/dialrules.4f 0444 @SYSUID@ @SYSGID@
! f man @MANDIR@/man4/hosts.4=../man/sman.files/hosts.4f 0444 @SYSUID@ @SYSGID@
  f man @MANDIR@/man4/hylafax.4=../man/sman.files/hylafax.4f 0444 @SYSUID@ @SYSGID@
  f man @MANDIR@/man4/info.4=../man/sman.files/info.4f 0444 @SYSUID@ @SYSGID@
  f man @MANDIR@/man4/log.4=../man/sman.files/log.4f 0444 @SYSUID@ @SYSGID@
--- 80,86 ----
  f man @MANDIR@/man4/config.4=../man/sman.files/config.4f 0444 @SYSUID@ @SYSGID@
  f man @MANDIR@/man4/destctrls.4=../man/sman.files/destctrls.4f 0444 @SYSUID@ @SYSGID@
  f man @MANDIR@/man4/dialrules.4=../man/sman.files/dialrules.4f 0444 @SYSUID@ @SYSGID@
! f man @MANDIR@/man4/hosts.fax.4=../man/sman.files/hosts.fax.4f 0444 @SYSUID@ @SYSGID@
  f man @MANDIR@/man4/hylafax.4=../man/sman.files/hylafax.4f 0444 @SYSUID@ @SYSGID@
  f man @MANDIR@/man4/info.4=../man/sman.files/info.4f 0444 @SYSUID@ @SYSGID@
  f man @MANDIR@/man4/log.4=../man/sman.files/log.4f 0444 @SYSUID@ @SYSGID@
***************
*** 178,184 ****
  f none @SPOOL@/etc/dpsprinter.ps=../@SRCDIR@/util/dpsprinter.ps 0444 @SYSUID@ @SYSGID@
  f none @SPOOL@/etc/cover.templ=../@SRCDIR@/util/cover.templ 0444 @SYSUID@ @SYSGID@
  f none @SPOOL@/etc/xferfaxlog=../etc/xferfaxlog 0644 @FAXUID@ @FAXGID@
! f none @SPOOL@/etc/hosts=../etc/hosts 0600 @FAXUID@ @FAXGID@
  f none @SPOOL@/etc/dialrules=../@SRCDIR@/etc/dialrules 0444 @SYSUID@ @SYSGID@
  f none @SPOOL@/etc/dialrules.sf-ba=../@SRCDIR@/etc/dialrules.sf-ba 0444 @SYSUID@ @SYSGID@
  f none @SPOOL@/etc/dialrules.europe=../@SRCDIR@/etc/dialrules.europe 0444 @SYSUID@ @SYSGID@
--- 178,184 ----
  f none @SPOOL@/etc/dpsprinter.ps=../@SRCDIR@/util/dpsprinter.ps 0444 @SYSUID@ @SYSGID@
  f none @SPOOL@/etc/cover.templ=../@SRCDIR@/util/cover.templ 0444 @SYSUID@ @SYSGID@
  f none @SPOOL@/etc/xferfaxlog=../etc/xferfaxlog 0644 @FAXUID@ @FAXGID@
! f none @SPOOL@/etc/hosts.fax=../etc/hosts 0600 @FAXUID@ @FAXGID@
  f none @SPOOL@/etc/dialrules=../@SRCDIR@/etc/dialrules 0444 @SYSUID@ @SYSGID@
  f none @SPOOL@/etc/dialrules.sf-ba=../@SRCDIR@/etc/dialrules.sf-ba 0444 @SYSUID@ @SYSGID@
  f none @SPOOL@/etc/dialrules.europe=../@SRCDIR@/etc/dialrules.europe 0444 @SYSUID@ @SYSGID@
dif -cr hylafax-4.1beta1.orig/man/hosts.4f hylafax-4.1beta1/man/hosts.fax.4f
*** hylafax-4.1beta1.orig/man/hosts.4f
--- hylafax-4.1beta1/man/hosts.fax.4f
***************
*** 29,40 ****
  .ds Fx \fIHyla\s-1FAX\s+1\fP
  .TH HOSTS 4F "January 18, 1996"
  .SH NAME
! hosts \- \*(Fx client access control list
  .SH DESCRIPTION
  The 
  .SM ASCII
  file
! .B etc/hosts
  in the \*(Fx spooling area specifies the
  hosts and users that are permitted to access services through the
  .IR hfaxd (1M)
--- 29,40 ----
  .ds Fx \fIHyla\s-1FAX\s+1\fP
  .TH HOSTS 4F "January 18, 1996"
  .SH NAME
! hosts.fax \- \*(Fx client access control list
  .SH DESCRIPTION
  The 
  .SM ASCII
  file
! .B etc/hosts.fax
  in the \*(Fx spooling area specifies the
  hosts and users that are permitted to access services through the
  .IR hfaxd (1M)
***************
*** 130,136 ****
  If this field is empty (null) then the user is not permitted to have
  administrative privileges.
  .SH EXAMPLE
! The following is a sample hosts file.
  Note that the first entry that matches
  is taken, so more-specific entries should be placed first.
  .sp .3
--- 130,136 ----
  If this field is empty (null) then the user is not permitted to have
  administrative privileges.
  .SH EXAMPLE
! The following is a sample hosts.fax file.
  Note that the first entry that matches
  is taken, so more-specific entries should be placed first.
  .sp .3

# zlib patch to use configured C compiler
#
# The old zlib used in HylaFAX does not use the same configure setup.
# This patch sets $(CC) to match the $(CCOMPILER) found in the configure
# script.

#
# Instructions : cd into the root directory of the source tree, and run the
# command 'patch -p1 < zlib.patch

*** hylafax-4.1beta1/zlib/Makefile.in.orig	Tue Jun 29 09:57:33 1999
--- hylafax-4.1beta1/zlib/Makefile.in	Tue Jul  6 12:15:03 1999
***************
*** 13,22 ****
  #    make install prefix=$HOME
  
  DEPTH=..
  SRCDIR=${DEPTH}/${TOPSRCDIR}/zlib
  VPATH=../@SRCDIR@/zlib
  
! CC=cc
  
  CFLAGS=-O
  #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
--- 13,26 ----
  #    make install prefix=$HOME
  
  DEPTH=..
+ @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
  SRCDIR=${DEPTH}/${TOPSRCDIR}/zlib
  VPATH=../@SRCDIR@/zlib
  
! # Patched for HylaFAX use
! #CC=cc
! CC=$(CCOMPILER)
! #
  
  CFLAGS=-O
  #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7

# fxSIGVEC patch for gcc-2.8.1 under SunOS and several other OS's.
#
# Recent versions of gcc fail in the C++ test for the fxSIGVEC include
# definitiion. This patch sets it to be the same value as fxSIGACTION.
#
# Instructions : cd into the root directory of the source tree, and run the
# command 'patch -p1 < fxSIGVEC.patch'

*** hylafax-4.1beta1/configure.orig	Thu Jul  1 06:30:54 1999
--- hylafax-4.1beta1/configure	Mon Jul  5 15:02:00 1999
***************
*** 2325,2330 ****
--- 2325,2331 ----
  	CheckSigvecHandler "$i" && {
  	    echo "#define fxSIGVECHANDLER $i"
  	    Note "... use $i for sigvec handler type"
+ 	    fxSIGVECHANDLER="$i";
  	    break;
  	}
      done
***************
*** 2332,2340 ****
--- 2333,2347 ----
  	CheckSigactionHandler "$i" && {
  	    echo "#define fxSIGACTIONHANDLER $i"
  	    Note "... use $i for sigaction handler type"
+ 	    fxSIGACTIONHANDLER="$i";
  	    break;
  	}
      done
+     if [ -z "$fxSIGVECHANDLER" -a -n "$fxSIGACTIONHANDLER" ]; then
+ 	echo "#define fxSIGVECHANDLER $fxSIGACTIONHANDLER"
+ 	Note "... use $fxSIGACTIONHANDLER for sigvec handler type"
+ 	fxSIGVECHANDLER="$i";
+     fi
      if [ $ISGXX = yes ]; then
  	GCXXOPTS="$OGCXXOPTS"
  	makeDefs xdefs

# fixhtml.patch
#
# This is an added shell script that automatically corrects the CGIDIR and
# HTMLDIR in the installed html pages.
#
# Instructions : change to top source tree and run the ncommand
# 'patch -p1  < fixhtml.patch
#

diff -Ncr hylafax-4.1beta1/distrules hylafax-4.1beta1.new/distrules
*** hylafax-4.1beta1/distrules	Sun Jan 10 04:50:23 1999
--- hylafax-4.1beta1.new/distrules	Mon Jul  5 17:15:05 1999
***************
*** 58,63 ****
--- 58,64 ----
  #
  HTMLFILES=\
      html/Makefile.in				\
+     html/fixhtml.sh.in				\
      \
      html/HOWTO.html				\
      html/binary.html				\
diff -Ncr hylafax-4.1beta1/html/Makefile.in hylafax-4.1beta1.new/html/Makefile.in
*** hylafax-4.1beta1/html/Makefile.in	Thu Jan  7 06:15:43 1999
--- hylafax-4.1beta1.new/html/Makefile.in	Mon Jul  5 17:11:03 1999
***************
*** 177,182 ****
--- 177,184 ----
  	    ${INSTALL} -F ${HTMLDIR} -m 444				\
  		-idb ${PRODUCT}.html.docs -src $$i -O $$f;		\
  	done
+ 	${INSTALL} -F ${HTMLDIR} -m 755 -O fixhtml.sh
+ 	-(cd ${HTMLDIR}; ./fixhtml.sh)
  
  CATPAGES=${SRCDIR}/index.html \
  	${SRCDIR}/toc.html \
***************
*** 221,227 ****
--- 223,231 ----
  
  clean::
  	@${ECHO} "= tools"; cd tools; ${MAKE} clean
+ 	${RM} -f fixhtml.sh
  
  clobber::
  	@${ECHO} "= tools"; cd tools; ${MAKE} clobber
+ 	-${RM} -f fixhtml.sh
  	-${RM} -f Makefile ${MKDEPFILE} .*dependtime .*incdepend
diff -Ncr hylafax-4.1beta1/html/fixhtml.sh.in hylafax-4.1beta1.new/html/fixhtml.sh.in
*** hylafax-4.1beta1/html/fixhtml.sh.in	Wed Dec 31 19:00:00 1969
--- hylafax-4.1beta1.new/html/fixhtml.sh.in	Mon Jul  5 17:12:34 1999
***************
*** 0 ****
--- 1,72 ----
+ #! @SCRIPT_SH@
+ #	$Id: fixhtml.sh.in
+ #
+ # @WARNING@
+ #
+ # HylaFAX Facsimile Software
+ #
+ # Copyright (c) 1990-1996 Sam Leffler
+ # Copyright (c) 1991-1996 Silicon Graphics, Inc.
+ # HylaFAX is a trademark of Silicon Graphics
+ # 
+ # Permission to use, copy, modify, distribute, and sell this software and 
+ # its documentation for any purpose is hereby granted without fee, provided
+ # that (i) the above copyright notices and this permission notice appear in
+ # all copies of the software and related documentation, and (ii) the names of
+ # Sam Leffler and Silicon Graphics may not be used in any advertising or
+ # publicity relating to the software without the specific, prior written
+ # permission of Sam Leffler and Silicon Graphics.
+ # 
+ # THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ # EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ # WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ # 
+ # IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ # ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ # OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ # WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+ # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+ # OF THIS SOFTWARE.
+ #
+ 
+ #
+ # VERSION:	@VERSION@
+ # DATE:		@DATE@
+ # TARGET:	@TARGET@
+ #
+ 
+ #
+ # fixhtml.sh
+ #
+ # This script re-arranges the various SPOOL and HTML locations
+ # of the HylaFAX web pages.
+ 
+ HTMLPATH=${1-@HTMLPATH@}
+ CGIPATH=${2-@CGIPATH@}
+ PATTERN="@[a-zA-Z][a-zA-Z]*@"
+ 
+ HTMLORIGPATH="@"
+ HTMLORIGPATH="${HTMLORIGPATH}HTMLPATH@"
+ 
+ CGIORIGPATH="@"
+ CGIORIGPATH="${CGIORIGPATH}CGIPATH@"
+ 
+ patch()
+ {
+    chmod +w $1
+    ed - $1 << EOF
+ g;$HTMLORIGPATH;s;;$HTMLPATH;g
+ g;$CGIORIGPATH;s;;$CGIPATH;g
+ w
+ q
+ EOF
+     chmod -w $1
+ }
+ 
+ FILES=`grep -l "$PATTERN" *.html */*.html */*/*.html`
+ test "$FILES" && {
+    for i in $FILES
+    do
+        echo $i; patch $i;
+    done
+ }

#!/bin/sh
#
# Nico Garcia 7 Feb 98
#
# This is a shell script that changes the HylaFAX html pages to not use
# the numerical categories on the manpage calls, thus allowing them to
# work on all Unix systems.
#
# Instructions : copy to HylaFAX source directory and run command
# 'sh fixhtml-manpages-patch.sh'

patch()
{
   chmod +w $1
   ed - $1 << EOF
   g;manpage?1;s;;manpage;g
   g;manpage?2;s;;manpage;g
   g;manpage?3;s;;manpage;g
   g;manpage?4;s;;manpage;g
   g;manpage?5;s;;manpage;g
   g;manpage?6;s;;manpage;g
   g;manpage?7;s;;manpage;g
   g;manpage?8;s;;manpage;g
   g;(4F);s;;;g
w
q
EOF
}

FILES=`find . -type f -name '*.html' -print`
FILES=`grep -l manpage $FILES`
test "$FILES" && {
   for i in $FILES
   do
       echo $i; patch $i;
   done
}

Prev by Date: Re: Tag line suppression
Next by Date: RE: Moving hylafax outside a firewall
Prev by thread: make probs on RH 6.0 (warning: previous declaration)
Next by thread: haylafax installation
Index(es):
- Main
- Thread

Report any problems to webmaster@hylafax.org

HylaFAX is a trademark of Silicon Graphics Corporation.
Internet connectivity for hylafax.org is provided by:
VirtuALL Private Host Services