Changes 6.0.6:
These releases are maintenance releases, and do not contain any new features or functionality, but only contain bugfixes: * Re-order library files in fchmod() configure check * faxalter: Wire up the nissing page range -Z options * man: JobReqError/JobRetryError were missing in hylafax-config.4 * typerules: adding missing comma to typeNames array * Do not warn about one of the Fontpath directories not existing * Reworked how faxsetup looks for Fontmap * Use a private Fontmap.HylaFAX file of .pfb files * Combine all Fontmap files in memory, including new Fontmap.HylaFAX * Bug 934: We need to avoid a 0-index in playList * hfaxd: Eliminte extraneous debug logging * hfaxd: Make source port for active connections be ctrl port - 1 * hfaxd: Release old accept fd * Support libtiff 4.0 * faxsend: JobRetryOther/JobRequeueOther weren't actually being used * Make sure not to cut faxq FIFO messages in two when reaching end of buffer * hfaxd: Port is network byte order, correct logging of it
This commit is contained in:
adam
parent
bb40478bab
commit
65dc98044e
19 changed files with 396 additions and 325 deletions
|
|
@ -1,7 +1,7 @@
|
|||
===========================================================================
|
||||
$NetBSD: MESSAGE,v 1.3 2003/05/06 17:40:40 jmmv Exp $
|
||||
$NetBSD: MESSAGE,v 1.4 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
Hylafax was installed. You'll need manual configurations to actually
|
||||
Hylafax has been installed. You'll need manual configurations to actually
|
||||
activate it.
|
||||
|
||||
Setting up: (for impatients)
|
||||
|
|
|
|||
|
|
@ -1,60 +1,48 @@
|
|||
# $NetBSD: Makefile,v 1.69 2013/08/30 16:57:35 joerg Exp $
|
||||
# $NetBSD: Makefile,v 1.70 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
VERS= 4.2.5
|
||||
DISTNAME= hylafax-${VERS}
|
||||
PKGREVISION= 10
|
||||
DISTNAME= hylafax-6.0.6
|
||||
CATEGORIES= comms
|
||||
MASTER_SITES_BETA= ftp://ftp.hylafax.org/source/BETA/
|
||||
MASTER_SITES_RELEASE= ftp://ftp.hylafax.org/source/
|
||||
MASTER_SITES= ${MASTER_SITES_RELEASE}
|
||||
MASTER_SITES= ftp://ftp.hylafax.org/source/
|
||||
|
||||
MAINTAINER= hallmann@ahatec.de
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= http://www.hylafax.org/
|
||||
COMMENT= Telecommunication and fax server system
|
||||
|
||||
DEPENDS+= mawk>=1.2.2:../../lang/mawk
|
||||
LICENSE= sgi-free-software-b-v2.0
|
||||
|
||||
CONFLICTS= hylafax-devel-[0-9]* mgetty-[0-9]*
|
||||
DEPENDS+= mawk>=1.2.2:../../lang/mawk
|
||||
|
||||
BUILD_DEFS+= FAXUSER FAXGROUP VARBASE
|
||||
|
||||
USE_LANGUAGES= c c++
|
||||
USE_TOOLS+= gs:run
|
||||
USE_TOOLS+= gs:run pkg-config
|
||||
HAS_CONFIGURE= yes
|
||||
CONFIGURE_ARGS+= --with-MAKE=${MAKE_PROGRAM:Q}
|
||||
CONFIGURE_ARGS+= --with-INSTALL="" --nointeractive
|
||||
CONFIGURE_ARGS+= --with-ZLIBINC=-I${BUILDLINK_PREFIX.zlib}/include
|
||||
CONFIGURE_ARGS+= --with-LIBZ="-L${BUILDLINK_PREFIX.zlib}/lib -lz"
|
||||
CONFIGURE_ARGS+= --with-SYSVINIT=no
|
||||
CONFIGURE_ENV+= PREFIX=${PREFIX:Q} OPTIMIZER=${CFLAGS:Q}
|
||||
CONFIGURE_ENV+= FAXUID=${FAXUSER:Q} FAXGID=${FAXGROUP:Q}
|
||||
CONFIGURE_ENV+= VARBASE=${VARBASE:Q}
|
||||
CONFIGURE_ENV+= FAXUID=${FAXUSER:Q}
|
||||
CONFIGURE_ENV+= FAXGID=${FAXGROUP:Q}
|
||||
CONFIGURE_ENV+= OPTIMIZER=${CFLAGS:Q}
|
||||
CONFIGURE_ENV+= VARBASE=${VARBASE}
|
||||
CHECK_PORTABILITY_SKIP= rpm/jobcontrol.sh
|
||||
MANCOMPRESSED= yes
|
||||
|
||||
FAXUSER?= uucp
|
||||
FAXGROUP?= dialer
|
||||
RCD_SCRIPTS= hylafax
|
||||
|
||||
MAKE_JOBS_SAFE= NO
|
||||
EGDIR= share/examples/hylafax
|
||||
|
||||
INSTALLATION_DIRS= libdata/hylafax
|
||||
INSTALLATION_DIRS= libdata/hylafax ${EGDIR} ${EGDIR}/templates
|
||||
|
||||
SPECIAL_PERMS+= bin/faxalter ${SETUID_ROOT_PERMS} \
|
||||
bin/faxrm ${SETUID_ROOT_PERMS} \
|
||||
libexec/faxgetty ${SETUID_ROOT_PERMS} \
|
||||
sbin/faxq ${SETUID_ROOT_PERMS}
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.hylafax
|
||||
PKG_SUPPORTED_OPTIONS= pam
|
||||
#pam doesn't work right now, so disabled by default
|
||||
#PKG_SUGGESTED_OPTIONS= pam
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mpam)
|
||||
.include "../../mk/pam.buildlink3.mk"
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-pam
|
||||
.endif
|
||||
.include "options.mk"
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
|
|
@ -69,5 +57,4 @@ BUILDLINK_API_DEPENDS.libtiff+= tiff>=4.0.0
|
|||
.include "../../graphics/jbigkit/buildlink3.mk"
|
||||
.include "../../mk/jpeg.buildlink3.mk"
|
||||
.include "../../graphics/tiff/buildlink3.mk"
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.13 2014/03/11 14:05:00 jperkin Exp $
|
||||
@comment $NetBSD: PLIST,v 1.14 2014/03/14 15:59:29 adam Exp $
|
||||
bin/faxalter
|
||||
bin/faxcover
|
||||
bin/faxmail
|
||||
|
|
@ -16,10 +16,14 @@ libexec/faxgetty
|
|||
libexec/faxsend
|
||||
libexec/hfaxd
|
||||
libexec/hylafax/archive
|
||||
libexec/hylafax/b64-encode.awk
|
||||
libexec/hylafax/common-functions
|
||||
libexec/hylafax/dictionary
|
||||
libexec/hylafax/faxrcvd
|
||||
libexec/hylafax/mkcover
|
||||
libexec/hylafax/notify
|
||||
libexec/hylafax/notify-4.1
|
||||
libexec/hylafax/notify-4.2
|
||||
libexec/hylafax/notify.awk
|
||||
libexec/hylafax/pcl2fax
|
||||
libexec/hylafax/pdf2fax.gs
|
||||
|
|
@ -27,6 +31,7 @@ libexec/hylafax/pollrcvd
|
|||
libexec/hylafax/ps2fax.dps
|
||||
libexec/hylafax/ps2fax.gs
|
||||
libexec/hylafax/ps2fax.imp
|
||||
libexec/hylafax/qp-encode.awk
|
||||
libexec/hylafax/tiff2fax
|
||||
libexec/hylafax/tiff2pdf
|
||||
libexec/hylafax/wedged
|
||||
|
|
@ -34,6 +39,7 @@ libexec/lockname
|
|||
libexec/ondelay
|
||||
libexec/pagesend
|
||||
libexec/textfmt
|
||||
libexec/typetest
|
||||
man/man1/edit-faxcover.1
|
||||
man/man1/faxalter.1
|
||||
man/man1/faxcover.1
|
||||
|
|
@ -45,8 +51,6 @@ man/man1/sendfax.1
|
|||
man/man1/sendpage.1
|
||||
man/man1/sgi2fax.1
|
||||
man/man1/textfmt.1
|
||||
man/man5/callid.5
|
||||
man/man5/destctrls.5
|
||||
man/man5/dialrules.5
|
||||
man/man5/doneq.5
|
||||
man/man5/hosts.hfaxd.5
|
||||
|
|
@ -86,6 +90,7 @@ man/man8/faxsetup.8
|
|||
man/man8/faxstate.8
|
||||
man/man8/faxwatch.8
|
||||
man/man8/hfaxd.8
|
||||
man/man8/jobcontrol.8
|
||||
man/man8/mkcover.8
|
||||
man/man8/notify.8
|
||||
man/man8/pagesend.8
|
||||
|
|
@ -132,8 +137,228 @@ sbin/tsitest
|
|||
sbin/typetest
|
||||
sbin/xferfaxstats
|
||||
share/doc/hylafax/COPYRIGHT
|
||||
share/hylafax/config_template/agere-mp-2
|
||||
share/hylafax/config_template/agere-mp-21
|
||||
share/examples/hylafax/dialrules
|
||||
share/examples/hylafax/dialrules.europe
|
||||
share/examples/hylafax/dialrules.sf-ba
|
||||
share/examples/hylafax/hosts.hfaxd
|
||||
share/examples/hylafax/lutRS18.pcf
|
||||
share/examples/hylafax/templates/README
|
||||
share/examples/hylafax/templates/de/faxrcvd-error.txt
|
||||
share/examples/hylafax/templates/de/faxrcvd-failure.txt
|
||||
share/examples/hylafax/templates/de/faxrcvd-notify-error.txt
|
||||
share/examples/hylafax/templates/de/faxrcvd-notify-success.txt
|
||||
share/examples/hylafax/templates/de/faxrcvd-success.txt
|
||||
share/examples/hylafax/templates/de/notify-blocked.txt
|
||||
share/examples/hylafax/templates/de/notify-done-page.txt
|
||||
share/examples/hylafax/templates/de/notify-done.txt
|
||||
share/examples/hylafax/templates/de/notify-failed-page.txt
|
||||
share/examples/hylafax/templates/de/notify-failed.txt
|
||||
share/examples/hylafax/templates/de/notify-faxmaster.txt
|
||||
share/examples/hylafax/templates/de/notify-format_failed.txt
|
||||
share/examples/hylafax/templates/de/notify-killed.txt
|
||||
share/examples/hylafax/templates/de/notify-no_formatter.txt
|
||||
share/examples/hylafax/templates/de/notify-poll_failed.txt
|
||||
share/examples/hylafax/templates/de/notify-poll_no_document.txt
|
||||
share/examples/hylafax/templates/de/notify-poll_rejected.txt
|
||||
share/examples/hylafax/templates/de/notify-rejected.txt
|
||||
share/examples/hylafax/templates/de/notify-removed.txt
|
||||
share/examples/hylafax/templates/de/notify-requeued.txt
|
||||
share/examples/hylafax/templates/de/notify-timedout.txt
|
||||
share/examples/hylafax/templates/en/faxrcvd-error.txt
|
||||
share/examples/hylafax/templates/en/faxrcvd-failure.txt
|
||||
share/examples/hylafax/templates/en/faxrcvd-notify-error.txt
|
||||
share/examples/hylafax/templates/en/faxrcvd-notify-success.txt
|
||||
share/examples/hylafax/templates/en/faxrcvd-success.txt
|
||||
share/examples/hylafax/templates/en/notify-blocked.txt
|
||||
share/examples/hylafax/templates/en/notify-done-page.txt
|
||||
share/examples/hylafax/templates/en/notify-done.txt
|
||||
share/examples/hylafax/templates/en/notify-failed-page.txt
|
||||
share/examples/hylafax/templates/en/notify-failed.txt
|
||||
share/examples/hylafax/templates/en/notify-faxmaster.txt
|
||||
share/examples/hylafax/templates/en/notify-format_failed.txt
|
||||
share/examples/hylafax/templates/en/notify-killed.txt
|
||||
share/examples/hylafax/templates/en/notify-no_formatter.txt
|
||||
share/examples/hylafax/templates/en/notify-poll_failed.txt
|
||||
share/examples/hylafax/templates/en/notify-poll_no_document.txt
|
||||
share/examples/hylafax/templates/en/notify-poll_rejected.txt
|
||||
share/examples/hylafax/templates/en/notify-rejected.txt
|
||||
share/examples/hylafax/templates/en/notify-removed.txt
|
||||
share/examples/hylafax/templates/en/notify-requeued.txt
|
||||
share/examples/hylafax/templates/en/notify-timedout.txt
|
||||
share/examples/hylafax/templates/es/faxrcvd-error.txt
|
||||
share/examples/hylafax/templates/es/faxrcvd-failure.txt
|
||||
share/examples/hylafax/templates/es/faxrcvd-notify-error.txt
|
||||
share/examples/hylafax/templates/es/faxrcvd-notify-success.txt
|
||||
share/examples/hylafax/templates/es/faxrcvd-success.txt
|
||||
share/examples/hylafax/templates/es/notify-blocked.txt
|
||||
share/examples/hylafax/templates/es/notify-done-page.txt
|
||||
share/examples/hylafax/templates/es/notify-done.txt
|
||||
share/examples/hylafax/templates/es/notify-failed-page.txt
|
||||
share/examples/hylafax/templates/es/notify-failed.txt
|
||||
share/examples/hylafax/templates/es/notify-faxmaster.txt
|
||||
share/examples/hylafax/templates/es/notify-format_failed.txt
|
||||
share/examples/hylafax/templates/es/notify-killed.txt
|
||||
share/examples/hylafax/templates/es/notify-no_formatter.txt
|
||||
share/examples/hylafax/templates/es/notify-poll_failed.txt
|
||||
share/examples/hylafax/templates/es/notify-poll_no_document.txt
|
||||
share/examples/hylafax/templates/es/notify-poll_rejected.txt
|
||||
share/examples/hylafax/templates/es/notify-rejected.txt
|
||||
share/examples/hylafax/templates/es/notify-removed.txt
|
||||
share/examples/hylafax/templates/es/notify-requeued.txt
|
||||
share/examples/hylafax/templates/es/notify-timedout.txt
|
||||
share/examples/hylafax/templates/fr/faxrcvd-error.txt
|
||||
share/examples/hylafax/templates/fr/faxrcvd-failure.txt
|
||||
share/examples/hylafax/templates/fr/faxrcvd-notify-error.txt
|
||||
share/examples/hylafax/templates/fr/faxrcvd-notify-success.txt
|
||||
share/examples/hylafax/templates/fr/faxrcvd-success.txt
|
||||
share/examples/hylafax/templates/fr/notify-blocked.txt
|
||||
share/examples/hylafax/templates/fr/notify-done-page.txt
|
||||
share/examples/hylafax/templates/fr/notify-done.txt
|
||||
share/examples/hylafax/templates/fr/notify-failed-page.txt
|
||||
share/examples/hylafax/templates/fr/notify-failed.txt
|
||||
share/examples/hylafax/templates/fr/notify-faxmaster.txt
|
||||
share/examples/hylafax/templates/fr/notify-format_failed.txt
|
||||
share/examples/hylafax/templates/fr/notify-killed.txt
|
||||
share/examples/hylafax/templates/fr/notify-no_formatter.txt
|
||||
share/examples/hylafax/templates/fr/notify-poll_failed.txt
|
||||
share/examples/hylafax/templates/fr/notify-poll_no_document.txt
|
||||
share/examples/hylafax/templates/fr/notify-poll_rejected.txt
|
||||
share/examples/hylafax/templates/fr/notify-rejected.txt
|
||||
share/examples/hylafax/templates/fr/notify-removed.txt
|
||||
share/examples/hylafax/templates/fr/notify-requeued.txt
|
||||
share/examples/hylafax/templates/fr/notify-timedout.txt
|
||||
share/examples/hylafax/templates/html-sample1/css.inc
|
||||
share/examples/hylafax/templates/html-sample1/divider.inc
|
||||
share/examples/hylafax/templates/html-sample1/fax-attach.inc
|
||||
share/examples/hylafax/templates/html-sample1/fax-data.inc
|
||||
share/examples/hylafax/templates/html-sample1/fax-dispatched.inc
|
||||
share/examples/hylafax/templates/html-sample1/faxrcvd-error.txt
|
||||
share/examples/hylafax/templates/html-sample1/faxrcvd-failure.txt
|
||||
share/examples/hylafax/templates/html-sample1/faxrcvd-notify-error.txt
|
||||
share/examples/hylafax/templates/html-sample1/faxrcvd-notify-success.txt
|
||||
share/examples/hylafax/templates/html-sample1/faxrcvd-success.txt
|
||||
share/examples/hylafax/templates/html-sample1/footer.inc
|
||||
share/examples/hylafax/templates/html-sample1/header.inc
|
||||
share/examples/hylafax/templates/html-sample1/hook.sh
|
||||
share/examples/hylafax/templates/html-sample1/job-data.inc
|
||||
share/examples/hylafax/templates/html-sample1/notify-blocked.txt
|
||||
share/examples/hylafax/templates/html-sample1/notify-done.txt
|
||||
share/examples/hylafax/templates/html-sample1/notify-failed.txt
|
||||
share/examples/hylafax/templates/html-sample1/notify-faxmaster.txt
|
||||
share/examples/hylafax/templates/html-sample1/notify-format_failed.txt
|
||||
share/examples/hylafax/templates/html-sample1/notify-killed.txt
|
||||
share/examples/hylafax/templates/html-sample1/notify-no_formatter.txt
|
||||
share/examples/hylafax/templates/html-sample1/notify-rejected.txt
|
||||
share/examples/hylafax/templates/html-sample1/notify-removed.txt
|
||||
share/examples/hylafax/templates/html-sample1/notify-requeued.txt
|
||||
share/examples/hylafax/templates/html-sample1/notify-timedout.txt
|
||||
share/examples/hylafax/templates/html-sample1/session_log.inc
|
||||
share/examples/hylafax/templates/it/faxrcvd-error.txt
|
||||
share/examples/hylafax/templates/it/faxrcvd-failure.txt
|
||||
share/examples/hylafax/templates/it/faxrcvd-notify-error.txt
|
||||
share/examples/hylafax/templates/it/faxrcvd-notify-success.txt
|
||||
share/examples/hylafax/templates/it/faxrcvd-success.txt
|
||||
share/examples/hylafax/templates/it/notify-blocked.txt
|
||||
share/examples/hylafax/templates/it/notify-done-page.txt
|
||||
share/examples/hylafax/templates/it/notify-done.txt
|
||||
share/examples/hylafax/templates/it/notify-failed-page.txt
|
||||
share/examples/hylafax/templates/it/notify-failed.txt
|
||||
share/examples/hylafax/templates/it/notify-faxmaster.txt
|
||||
share/examples/hylafax/templates/it/notify-format_failed.txt
|
||||
share/examples/hylafax/templates/it/notify-killed.txt
|
||||
share/examples/hylafax/templates/it/notify-no_formatter.txt
|
||||
share/examples/hylafax/templates/it/notify-poll_failed.txt
|
||||
share/examples/hylafax/templates/it/notify-poll_no_document.txt
|
||||
share/examples/hylafax/templates/it/notify-poll_rejected.txt
|
||||
share/examples/hylafax/templates/it/notify-rejected.txt
|
||||
share/examples/hylafax/templates/it/notify-removed.txt
|
||||
share/examples/hylafax/templates/it/notify-requeued.txt
|
||||
share/examples/hylafax/templates/it/notify-timedout.txt
|
||||
share/examples/hylafax/templates/pl/faxrcvd-error.txt
|
||||
share/examples/hylafax/templates/pl/faxrcvd-failure.txt
|
||||
share/examples/hylafax/templates/pl/faxrcvd-notify-error.txt
|
||||
share/examples/hylafax/templates/pl/faxrcvd-notify-success.txt
|
||||
share/examples/hylafax/templates/pl/faxrcvd-success.txt
|
||||
share/examples/hylafax/templates/pl/notify-blocked.txt
|
||||
share/examples/hylafax/templates/pl/notify-done-page.txt
|
||||
share/examples/hylafax/templates/pl/notify-done.txt
|
||||
share/examples/hylafax/templates/pl/notify-failed-page.txt
|
||||
share/examples/hylafax/templates/pl/notify-failed.txt
|
||||
share/examples/hylafax/templates/pl/notify-faxmaster.txt
|
||||
share/examples/hylafax/templates/pl/notify-format_failed.txt
|
||||
share/examples/hylafax/templates/pl/notify-killed.txt
|
||||
share/examples/hylafax/templates/pl/notify-no_formatter.txt
|
||||
share/examples/hylafax/templates/pl/notify-poll_failed.txt
|
||||
share/examples/hylafax/templates/pl/notify-poll_no_document.txt
|
||||
share/examples/hylafax/templates/pl/notify-poll_rejected.txt
|
||||
share/examples/hylafax/templates/pl/notify-rejected.txt
|
||||
share/examples/hylafax/templates/pl/notify-removed.txt
|
||||
share/examples/hylafax/templates/pl/notify-requeued.txt
|
||||
share/examples/hylafax/templates/pl/notify-timedout.txt
|
||||
share/examples/hylafax/templates/pt/faxrcvd-error.txt
|
||||
share/examples/hylafax/templates/pt/faxrcvd-failure.txt
|
||||
share/examples/hylafax/templates/pt/faxrcvd-notify-error.txt
|
||||
share/examples/hylafax/templates/pt/faxrcvd-notify-success.txt
|
||||
share/examples/hylafax/templates/pt/faxrcvd-success.txt
|
||||
share/examples/hylafax/templates/pt/notify-blocked.txt
|
||||
share/examples/hylafax/templates/pt/notify-done-page.txt
|
||||
share/examples/hylafax/templates/pt/notify-done.txt
|
||||
share/examples/hylafax/templates/pt/notify-failed-page.txt
|
||||
share/examples/hylafax/templates/pt/notify-failed.txt
|
||||
share/examples/hylafax/templates/pt/notify-faxmaster.txt
|
||||
share/examples/hylafax/templates/pt/notify-format_failed.txt
|
||||
share/examples/hylafax/templates/pt/notify-killed.txt
|
||||
share/examples/hylafax/templates/pt/notify-no_formatter.txt
|
||||
share/examples/hylafax/templates/pt/notify-poll_failed.txt
|
||||
share/examples/hylafax/templates/pt/notify-poll_no_document.txt
|
||||
share/examples/hylafax/templates/pt/notify-poll_rejected.txt
|
||||
share/examples/hylafax/templates/pt/notify-rejected.txt
|
||||
share/examples/hylafax/templates/pt/notify-removed.txt
|
||||
share/examples/hylafax/templates/pt/notify-requeued.txt
|
||||
share/examples/hylafax/templates/pt/notify-timedout.txt
|
||||
share/examples/hylafax/templates/pt_BR/faxrcvd-error.txt
|
||||
share/examples/hylafax/templates/pt_BR/faxrcvd-failure.txt
|
||||
share/examples/hylafax/templates/pt_BR/faxrcvd-notify-error.txt
|
||||
share/examples/hylafax/templates/pt_BR/faxrcvd-notify-success.txt
|
||||
share/examples/hylafax/templates/pt_BR/faxrcvd-success.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-blocked.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-done-page.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-done.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-failed-page.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-failed.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-faxmaster.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-format_failed.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-killed.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-no_formatter.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-poll_failed.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-poll_no_document.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-poll_rejected.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-rejected.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-removed.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-requeued.txt
|
||||
share/examples/hylafax/templates/pt_BR/notify-timedout.txt
|
||||
share/examples/hylafax/templates/ro/faxrcvd-error.txt
|
||||
share/examples/hylafax/templates/ro/faxrcvd-failure.txt
|
||||
share/examples/hylafax/templates/ro/faxrcvd-notify-error.txt
|
||||
share/examples/hylafax/templates/ro/faxrcvd-notify-success.txt
|
||||
share/examples/hylafax/templates/ro/faxrcvd-success.txt
|
||||
share/examples/hylafax/templates/ro/notify-blocked.txt
|
||||
share/examples/hylafax/templates/ro/notify-done-page.txt
|
||||
share/examples/hylafax/templates/ro/notify-done.txt
|
||||
share/examples/hylafax/templates/ro/notify-failed-page.txt
|
||||
share/examples/hylafax/templates/ro/notify-failed.txt
|
||||
share/examples/hylafax/templates/ro/notify-faxmaster.txt
|
||||
share/examples/hylafax/templates/ro/notify-format_failed.txt
|
||||
share/examples/hylafax/templates/ro/notify-killed.txt
|
||||
share/examples/hylafax/templates/ro/notify-no_formatter.txt
|
||||
share/examples/hylafax/templates/ro/notify-poll_failed.txt
|
||||
share/examples/hylafax/templates/ro/notify-poll_no_document.txt
|
||||
share/examples/hylafax/templates/ro/notify-poll_rejected.txt
|
||||
share/examples/hylafax/templates/ro/notify-rejected.txt
|
||||
share/examples/hylafax/templates/ro/notify-removed.txt
|
||||
share/examples/hylafax/templates/ro/notify-requeued.txt
|
||||
share/examples/hylafax/templates/ro/notify-timedout.txt
|
||||
share/examples/hylafax/xferfaxlog
|
||||
share/hylafax/config_template/att-dataport
|
||||
share/hylafax/config_template/att-dataport-2
|
||||
share/hylafax/config_template/att-dataport-2.0
|
||||
|
|
@ -159,13 +384,20 @@ share/hylafax/config_template/exar
|
|||
share/hylafax/config_template/gvc-288
|
||||
share/hylafax/config_template/gvc-288-2
|
||||
share/hylafax/config_template/hayes
|
||||
share/hylafax/config_template/iaxmodem
|
||||
share/hylafax/config_template/intel-400e
|
||||
share/hylafax/config_template/ip568x
|
||||
share/hylafax/config_template/linux-isdn-2
|
||||
share/hylafax/config_template/lucent
|
||||
share/hylafax/config_template/lucent-isa
|
||||
share/hylafax/config_template/lucent-mt-10
|
||||
share/hylafax/config_template/lucent-mt-2
|
||||
share/hylafax/config_template/lucent-mt-20
|
||||
share/hylafax/config_template/lucent-mt-21
|
||||
share/hylafax/config_template/mainpine-10
|
||||
share/hylafax/config_template/mainpine-2
|
||||
share/hylafax/config_template/mainpine-20
|
||||
share/hylafax/config_template/mainpine-21
|
||||
share/hylafax/config_template/moto-288
|
||||
share/hylafax/config_template/mt-1432
|
||||
share/hylafax/config_template/nuvo-voyager
|
||||
|
|
@ -199,10 +431,4 @@ share/hylafax/config_template/zyxel-1496e-1
|
|||
share/hylafax/config_template/zyxel-1496e-2.0
|
||||
share/hylafax/config_template/zyxel-2864
|
||||
share/hylafax/etc_template/cover.templ
|
||||
share/hylafax/etc_template/dialrules
|
||||
share/hylafax/etc_template/dialrules.europe
|
||||
share/hylafax/etc_template/dialrules.sf-ba
|
||||
share/hylafax/etc_template/dpsprinter.ps
|
||||
share/hylafax/etc_template/hosts.hfaxd
|
||||
share/hylafax/etc_template/lutRS18.pcf
|
||||
share/hylafax/etc_template/xferfaxlog
|
||||
|
|
|
|||
|
|
@ -1,22 +1,20 @@
|
|||
$NetBSD: distinfo,v 1.25 2013/08/30 16:57:35 joerg Exp $
|
||||
$NetBSD: distinfo,v 1.26 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
SHA1 (hylafax-4.2.5.tar.gz) = b3bfd492dcb85e8aa1ddff9e6dcec3c31e00fccc
|
||||
RMD160 (hylafax-4.2.5.tar.gz) = aef5e7a8ff32bafa43b5efc431b9fd8c334ddb3a
|
||||
Size (hylafax-4.2.5.tar.gz) = 1450958 bytes
|
||||
SHA1 (patch-aa) = 94de7c7fb55c9c95c6a774fb732e2d47ec818152
|
||||
SHA1 (hylafax-6.0.6.tar.gz) = 8d8cc9a5f242ef83d7bc6f5cd200fec1351b280e
|
||||
RMD160 (hylafax-6.0.6.tar.gz) = 1f6e3022fe9886f2cde9fb406277d5496ee24f1c
|
||||
Size (hylafax-6.0.6.tar.gz) = 1297412 bytes
|
||||
SHA1 (patch-aa) = 54f34633757a4925084d9e7e4c1e743bca48e4ba
|
||||
SHA1 (patch-ab) = 5ee930814178223fa66dd308f365ff400559fd1d
|
||||
SHA1 (patch-ac) = 6f89cc0c9e7a0e789c23b0dfc604376e457091b7
|
||||
SHA1 (patch-ac) = b2051ac2e43d0635797043605d96f128e535c976
|
||||
SHA1 (patch-ad) = a7e361980c94a025be0b326c1cf694cce3cbff72
|
||||
SHA1 (patch-ae) = 75b243c618a197bacd97e4292b123e97ffe178cd
|
||||
SHA1 (patch-af) = cb76c429c01e05ceeee7664a09344dc9d27f972d
|
||||
SHA1 (patch-ag) = e1a38918cadf1d1cca7765ee2c050e99dfed0b7f
|
||||
SHA1 (patch-ah) = 084a99cfe21d7090fca33d9e068036e19707f441
|
||||
SHA1 (patch-ai) = d45bb9e224b18999489314aa1c1c74fc62a77328
|
||||
SHA1 (patch-al) = edac7c7af07556f7321ba7ede1eeca55e618b8cc
|
||||
SHA1 (patch-ae) = 031813b7a130cb7ee99596be88aa933e6ec8786e
|
||||
SHA1 (patch-af) = f1dd817fcd086bfdd354351dc0b92027250edcba
|
||||
SHA1 (patch-ag) = 52024e0184e2607c6cfb2c6c19c9f31b3c37ec95
|
||||
SHA1 (patch-ah) = 8558a0f9d970ce1cddbeb76fc87a1c450bd0941d
|
||||
SHA1 (patch-ai) = 85ae0baa95f012593b908b3394280e49ba3b7f24
|
||||
SHA1 (patch-al) = a0f006412918c047176945d911042264aa050fc0
|
||||
SHA1 (patch-am) = b004485310a2257630561a42b3f08896604ce986
|
||||
SHA1 (patch-an) = 535f9454e473d7bb26a256aec3158cffdb3d0399
|
||||
SHA1 (patch-ao) = 73da088c0dbc13a0dcb8d6abaa36804f34638c51
|
||||
SHA1 (patch-ap) = f9d6a2796535e7200419d6e24203b9995e5cfb39
|
||||
SHA1 (patch-hfaxd_FileSystem_c__) = d39e8abb1163f5f02b2cb1fa5814c4588a8fa73e
|
||||
SHA1 (patch-hfaxd_FileTransfer_c__) = 683b4a0bdd1927d0a0636e8df75d5b8bae27e0ff
|
||||
SHA1 (patch-rules.in) = 7d2752d19a3367ce0feaca1b8704159f9691f9c2
|
||||
SHA1 (patch-an) = de131bcdeb22a2f7daadbaf86d0aa00b841512af
|
||||
SHA1 (patch-ao) = d46c0c4d3e3e6309a807fa5c335888a3c28886d8
|
||||
SHA1 (patch-ap) = 419036385f1d0582ab6e5dd0710f5bbf41744e0f
|
||||
SHA1 (patch-rules.in) = 4c9604ce9fc5848764adfdbd2e39cc7576674ebc
|
||||
|
|
|
|||
14
comms/hylafax/options.mk
Normal file
14
comms/hylafax/options.mk
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
# $NetBSD: options.mk,v 1.1 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.hylafax
|
||||
PKG_SUPPORTED_OPTIONS= pam
|
||||
#pam doesn't work right now, so disabled by default
|
||||
#PKG_SUGGESTED_OPTIONS= pam
|
||||
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mpam)
|
||||
.include "../../mk/pam.buildlink3.mk"
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-pam
|
||||
.endif
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-aa,v 1.8 2003/09/23 21:39:47 abs Exp $
|
||||
$NetBSD: patch-aa,v 1.9 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
--- Makefile.in.orig Mon Apr 14 03:44:42 2003
|
||||
+++ Makefile.in
|
||||
@@ -237,22 +237,13 @@ makeClientDirs::
|
||||
@@ -227,22 +227,13 @@ makeClientDirs::
|
||||
makeServerDirs::
|
||||
-${INSTALL} -u ${SYSUSER} -g ${SYSGROUP} -m ${DIRMODE} \
|
||||
-idb hylafax.sw.server -dir ${SBIN};
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ac,v 1.7 2005/01/27 16:22:37 adam Exp $
|
||||
$NetBSD: patch-ac,v 1.8 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
--- config/Makefile.in.orig 2004-05-22 02:12:35.000000000 +0000
|
||||
+++ config/Makefile.in
|
||||
@@ -120,6 +120,7 @@ targets: ${TARGETS}
|
||||
@@ -124,6 +124,7 @@ targets: ${TARGETS}
|
||||
PUTSERVER=${INSTALL} -idb ${PRODUCT}.sw.server
|
||||
|
||||
install: default ${CONFIGFILES}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
$NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
||||
$NetBSD: patch-ae,v 1.18 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
- Configure for pkgsrc.
|
||||
- Recognize libtiff 4.x.
|
||||
- ...
|
||||
* Customize paths.
|
||||
* Configure for pkgsrc.
|
||||
|
||||
--- configure.orig 2005-12-16 22:40:30.000000000 +0000
|
||||
--- configure.orig 2012-06-06 00:58:38.000000000 +0000
|
||||
+++ configure
|
||||
@@ -37,23 +37,23 @@
|
||||
#
|
||||
|
|
@ -16,7 +15,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
-DIR_LIB=/usr/local/lib
|
||||
-DIR_LIBEXEC=$DIR_SBIN
|
||||
-DIR_SPOOL=/var/spool/hylafax
|
||||
-DIR_HTML=/var/httpd/htdocs/hylafax
|
||||
-DIR_LOCALE=/usr/local/share/locale
|
||||
-DIR_CGI=/var/httpd/cgi-bin
|
||||
+DIR_BIN=${PREFIX}/bin
|
||||
+DIR_SBIN=${PREFIX}/sbin
|
||||
|
|
@ -24,13 +23,13 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
+DIR_LIB=${PREFIX}/lib
|
||||
+DIR_LIBEXEC=${PREFIX}/libexec
|
||||
+DIR_SPOOL=${VARBASE}/spool/hylafax
|
||||
+DIR_HTML=${PREFIX}/http/htdocs/hylafax
|
||||
+DIR_LOCALE=${PREFIX}/share/locale
|
||||
+DIR_CGI=${PREFIX}/http/cgi-bin
|
||||
PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe
|
||||
-PATH_IMPRIP=/usr/lib/print/psrip
|
||||
+PATH_IMPRIP=${PREFIX}/lib/print/psrip
|
||||
HTMLPATH=/hylafax
|
||||
CGIPATH=/cgi-bin
|
||||
LOCALE_DOMAIN=hylafax
|
||||
DEFVRES=98
|
||||
PAGESIZE="North American Letter"
|
||||
FAXUID=uucp
|
||||
|
|
@ -40,38 +39,29 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
SYSGID=
|
||||
DSO=auto
|
||||
GETTY=auto
|
||||
@@ -72,9 +72,8 @@ DPS=no
|
||||
GS=no
|
||||
@@ -70,11 +70,10 @@ GS=no
|
||||
IMP=no
|
||||
UTMP=auto
|
||||
NLS=auto
|
||||
-OPTIMIZER="-O"
|
||||
-LIBTIFF="-L/usr/local/lib -ltiff"
|
||||
-TIFFINC=/usr/local/include
|
||||
+LIBTIFF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltiff -ljpeg -lz -lm"
|
||||
+TIFFINC=${PREFIX}/include
|
||||
LIBCRYPT=
|
||||
LIBPAM=
|
||||
-LIBTIFF="-ltiff"
|
||||
-TIFFINC=
|
||||
+LIBTIFF=`pkg-config --libs libtiff-4`
|
||||
+TIFFINC=`pkg-config --cflags libtiff-4`
|
||||
TIFFBIN=
|
||||
LIBZ=
|
||||
ZLIBINC=
|
||||
@@ -82,8 +81,8 @@ REGEX=yes
|
||||
LIBREGEX='-L${DEPTH}/regex -lregex'
|
||||
REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
|
||||
DBLIB=no
|
||||
-LIBDB="-L/usr/local/lib -ldb"
|
||||
-DBLIBINC=/usr/local/include
|
||||
+LIBDB="-L${PREFIX}/lib -ldb"
|
||||
+DBLIBINC=${PREFIX}/include
|
||||
FAXD=
|
||||
LIBFAXSERVER='libfaxserver.${DSO}'
|
||||
LIBUTIL='${UTIL}/libfaxutil.${DSO}'
|
||||
@@ -224,6 +223,7 @@ PKG_EMAIL
|
||||
LIBUTIL=
|
||||
LIBZ=-lz
|
||||
@@ -229,6 +228,7 @@ PKG_ARCH
|
||||
PKG_EMAIL
|
||||
PKG_VENDOR
|
||||
PORT
|
||||
PORTFUNCS
|
||||
+PREFIX
|
||||
PROTOTYPES
|
||||
PSPACKAGE PS
|
||||
PWDCMD
|
||||
@@ -290,7 +290,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd
|
||||
@@ -300,7 +300,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd
|
||||
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
|
||||
|
|
@ -80,7 +70,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
PATH=$PATH:$OPATH
|
||||
|
||||
POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions
|
||||
@@ -809,7 +809,7 @@ checkGCCVersion()
|
||||
@@ -831,7 +831,7 @@ checkGCCVersion()
|
||||
# NB: use ANSI C prototype to weed out non-ANSI compilers.
|
||||
#
|
||||
cat>dummy.c<<EOF
|
||||
|
|
@ -89,7 +79,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
EOF
|
||||
|
||||
checkCompiler()
|
||||
@@ -958,7 +958,7 @@ fi
|
||||
@@ -982,7 +982,7 @@ fi
|
||||
# Make dependency information.
|
||||
#
|
||||
cat>dummy.c<<EOF
|
||||
|
|
@ -98,32 +88,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
EOF
|
||||
capture cat dummy.c
|
||||
if capture "$CCOMPILER -c -M $MKDEPCOPTS dummy.c | grep '^dummy.o[ ]*:[ ]*dummy.c'"; then
|
||||
@@ -1418,12 +1418,22 @@ runMake()
|
||||
CheckForCXXRuntime()
|
||||
{
|
||||
cat>t.c++<<EOF
|
||||
+#include <iostream>
|
||||
+int main(){ std::cout << "Hello World!" << std::endl; return 0;}
|
||||
+EOF
|
||||
+ runMake t "t:; \${C++F} \${C++FILE} t.c++${MAKECXXOVERRIDE}" || return $?
|
||||
+ Note "Looks like the system has a CXX runtime"
|
||||
+}
|
||||
+CheckForDeprecatedCXXRuntime()
|
||||
+{
|
||||
+cat>t.c++<<EOF
|
||||
#include "iostream.h"
|
||||
int main(){ cout << "Hello World!" << endl; return 0;}
|
||||
EOF
|
||||
- runMake t "t:; \${C++F} \${C++FILE} t.c++${MAKECXXOVERRIDE}"
|
||||
+ runMake t "t:; \${C++F} \${C++FILE} t.c++${MAKECXXOVERRIDE}" || return $?
|
||||
+ Note "Looks like the system has a CXX runtime with deprecated headers"
|
||||
}
|
||||
-CheckForCXXRuntime || {
|
||||
+CheckForCXXRuntime || CheckForDeprecatedCXXRuntime || {
|
||||
cat 1>&2 <<EOF
|
||||
|
||||
Missing C++ runtime support for $CXX ($CXXCOMPILER).
|
||||
@@ -1591,7 +1601,7 @@ pamconv(int num_msg, const struct pam_me
|
||||
@@ -1629,7 +1629,7 @@ pamconv(int num_msg, const struct pam_me
|
||||
{
|
||||
return(0);
|
||||
}
|
||||
|
|
@ -132,16 +97,16 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
{
|
||||
struct pam_conv conv = { pamconv };
|
||||
}
|
||||
@@ -2062,7 +2072,7 @@ EmitConfigurationDefinitions()
|
||||
@@ -2176,7 +2176,7 @@ EmitConfigurationDefinitions()
|
||||
#
|
||||
CheckForFunc()
|
||||
{
|
||||
- echo "extern int $1(); main(){$1();exit(0);}" >t.c
|
||||
+ echo "extern int $1(); int main(){$1();exit(0);}" >t.c
|
||||
- echo "extern int $1(); main(){$1($2);exit(0);}" >t.c
|
||||
+ echo "extern int $1(); int main(){$1($2);exit(0);}" >t.c
|
||||
capture cat t.c
|
||||
runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"
|
||||
}
|
||||
@@ -2315,7 +2325,7 @@ CheckForStructExitStatus()
|
||||
@@ -2448,7 +2448,7 @@ CheckForStructExitStatus()
|
||||
echo "$i"
|
||||
done
|
||||
cat<<EOF
|
||||
|
|
@ -150,7 +115,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
{
|
||||
struct $decl x;
|
||||
x.ut_exit.e_exit = 0;
|
||||
@@ -2332,7 +2342,7 @@ CheckForTimeZoneHandling()
|
||||
@@ -2465,7 +2465,7 @@ CheckForTimeZoneHandling()
|
||||
{
|
||||
(echo '#include <time.h>'
|
||||
cat<<EOF
|
||||
|
|
@ -159,7 +124,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
{
|
||||
struct tm x;
|
||||
char* cp;
|
||||
@@ -2351,7 +2361,7 @@ CheckForTXCD()
|
||||
@@ -2484,7 +2484,7 @@ CheckForTXCD()
|
||||
{
|
||||
cat>t.c<<EOF
|
||||
#include <sys/ioctl.h>
|
||||
|
|
@ -168,7 +133,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
{
|
||||
ioctl(0, TXADDCD, "rts");
|
||||
ioctl(0, TXDELCD, "rts");
|
||||
@@ -2400,7 +2410,7 @@ CheckLibtiff()
|
||||
@@ -2538,7 +2538,7 @@ CheckLibtiff()
|
||||
cat>t.c<<EOF
|
||||
#include <stdio.h>
|
||||
#include "tiffio.h"
|
||||
|
|
@ -177,16 +142,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
{
|
||||
printf( "header_ver=%d lib_ver=%s", TIFFLIB_VERSION, TIFFGetVersion() );
|
||||
exit(0);
|
||||
@@ -2418,7 +2428,7 @@ EOF
|
||||
if [ ${header_ver} -ge 19960307 ]; then
|
||||
case ${lib_ver} in
|
||||
3.4) tiff_runlen_t="uint16" ;;
|
||||
- 3.[567]) tiff_runlen_t="uint32" ;;
|
||||
+ 3.[56789]|4*) tiff_runlen_t="uint32" ;;
|
||||
esac
|
||||
fi
|
||||
else
|
||||
@@ -3102,7 +3112,7 @@ CheckForSyslog()
|
||||
@@ -3281,7 +3281,7 @@ CheckForSyslog()
|
||||
{
|
||||
(echo '#include <syslog.h>';
|
||||
echo '#include "port.h"';
|
||||
|
|
@ -195,7 +151,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
capture cat t.c
|
||||
runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"
|
||||
}
|
||||
@@ -3111,7 +3121,7 @@ CheckForVSyslog()
|
||||
@@ -3290,7 +3290,7 @@ CheckForVSyslog()
|
||||
(echo '#include <syslog.h>';
|
||||
echo '#include <stdarg.h>';
|
||||
echo '#include "port.h"';
|
||||
|
|
@ -204,7 +160,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
capture cat t.c
|
||||
runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"
|
||||
}
|
||||
@@ -3139,19 +3149,13 @@ Note "Checking ZLIB support."
|
||||
@@ -3314,19 +3314,13 @@ Note "Checking ZLIB support."
|
||||
#
|
||||
cat>t.c<<EOF
|
||||
#include "zlib.h"
|
||||
|
|
@ -225,7 +181,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
}
|
||||
EOF
|
||||
capture cat t.c
|
||||
@@ -3213,7 +3217,7 @@ Note "Checking TIFF support."
|
||||
@@ -3385,7 +3379,7 @@ Note "Checking TIFF support."
|
||||
# Location of TIFF binaries
|
||||
#
|
||||
if [ -z "$TIFFBIN" ]; then
|
||||
|
|
@ -234,16 +190,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
for i in $DIRS; do
|
||||
test -x $i/tiff2ps && { TIFFBIN=$i; break; }
|
||||
done
|
||||
@@ -3245,7 +3249,7 @@ if [ -f $SRCDIR/MLA/VERSION -a $DBLIB =
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "db.h"
|
||||
-main()
|
||||
+int main()
|
||||
{
|
||||
DBT key, data;
|
||||
const char d[] = "some random string";
|
||||
@@ -3722,6 +3726,7 @@ if [ -z "$FAXGID" ]; then
|
||||
@@ -3806,6 +3800,7 @@ if [ -z "$FAXGID" ]; then
|
||||
*-bsdi*) FAXGID=uucp;;
|
||||
*freebsd2.1*) FAXGID=uucp; break;; # Not sure when this changed..
|
||||
*bsd*) FAXGID=dialer;;
|
||||
|
|
@ -251,7 +198,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
*-hpux*) FAXGID=sys;;
|
||||
*-irix*) FAXGID=nuucp;;
|
||||
*-isc*) FAXGID=uucp;;
|
||||
@@ -3750,6 +3755,7 @@ if [ -z "$SYSGID" ]; then
|
||||
@@ -3834,6 +3829,7 @@ if [ -z "$SYSGID" ]; then
|
||||
*-aix*) SYSGID=sys;;
|
||||
*netbsd*) SYSGID=wheel;;
|
||||
*bsd*) SYSGID=bin;;
|
||||
|
|
@ -259,7 +206,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
*-hpux*) SYSGID=bin;;
|
||||
*-irix*) SYSGID=sys;;
|
||||
*-isc*) SYSGID=sys;;
|
||||
@@ -3794,6 +3800,7 @@ fi
|
||||
@@ -3878,6 +3874,7 @@ fi
|
||||
if [ "$GETTY" = auto ]; then
|
||||
case $TARGET in
|
||||
*bsd*) GETTY=BSD;;
|
||||
|
|
@ -267,7 +214,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
*-sunos*) GETTY=BSD;;
|
||||
*-ultrix*) GETTY=BSD;;
|
||||
*darwin*) GETTY=BSD;;
|
||||
@@ -3836,7 +3843,7 @@ fi
|
||||
@@ -3920,7 +3917,7 @@ fi
|
||||
if [ -z "$PATH_VGETTY" ]; then
|
||||
PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH`
|
||||
if [ -z "$PATH_VGETTY" ]; then
|
||||
|
|
@ -276,7 +223,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
Note "WARNING, no vgetty program found to handle a voice call, using $PATH_VGETTY."
|
||||
else
|
||||
Note "Looks like $PATH_VGETTY is the program to exec for a voice call."
|
||||
@@ -3849,7 +3856,7 @@ fi
|
||||
@@ -3933,7 +3930,7 @@ fi
|
||||
if [ -z "$PATH_EGETTY" ]; then
|
||||
PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH`
|
||||
if [ -z "$PATH_EGETTY" ]; then
|
||||
|
|
@ -285,7 +232,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
Note "WARNING, no egetty program found, using $PATH_EGETTY."
|
||||
else
|
||||
Note "Looks like $PATH_EGETTY is the program to exec for an extern call."
|
||||
@@ -3871,6 +3878,7 @@ if [ "$LOCKS" = auto ]; then
|
||||
@@ -3956,6 +3953,7 @@ if [ "$LOCKS" = auto ]; then
|
||||
*-sysv5*) LOCKS="+ascii";;
|
||||
*-solaris*) LOCKS="+ascii";;
|
||||
*-freebsd*) LOCKS=ascii;;
|
||||
|
|
@ -293,7 +240,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
*-netbsd*) LOCKS=ascii;;
|
||||
*bsd*) LOCKS=binary;;
|
||||
*) LOCKS=ascii;;
|
||||
@@ -3920,6 +3928,7 @@ PickRIP()
|
||||
@@ -4005,6 +4003,7 @@ PickRIP()
|
||||
{
|
||||
if [ -z "$PATH_GSRIP" ]; then
|
||||
GSLOCS="
|
||||
|
|
@ -301,7 +248,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
/usr/local/bin/gs
|
||||
/usr/contrib/bin/gs
|
||||
/usr/gnu/bin/gs
|
||||
@@ -3967,7 +3976,7 @@ fax software to operate correctly. See
|
||||
@@ -4052,7 +4051,7 @@ fax software to operate correctly. See
|
||||
on building Ghostscript with the necessary TIFF driver.
|
||||
|
||||
EOF
|
||||
|
|
@ -310,7 +257,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
PATH_GSRIP=$PATH_PSRIP
|
||||
fi
|
||||
}
|
||||
@@ -4034,9 +4043,9 @@ if [ -z "$PATH_AFM" ]; then
|
||||
@@ -4119,9 +4118,9 @@ if [ -z "$PATH_AFM" ]; then
|
||||
else
|
||||
DIR_AFMS="
|
||||
/usr/lib/afm
|
||||
|
|
@ -323,7 +270,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
/usr/share/ghostscript/fonts
|
||||
/usr/gnu/lib/ghostscript/fonts
|
||||
/opt/gnu/lib/ghostscript/fonts
|
||||
@@ -4056,7 +4065,7 @@ if [ -z "$PATH_AFM" ]; then
|
||||
@@ -4141,7 +4140,7 @@ if [ -z "$PATH_AFM" ]; then
|
||||
fi
|
||||
if [ -z "$PATH_AFM" ]; then
|
||||
# put it where ghostscript normally puts things
|
||||
|
|
@ -332,7 +279,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
Note "WARNING, could not locate a directory with font metric information,"
|
||||
Note "guessing that font metric information goes in $PATH_AFM."
|
||||
else
|
||||
@@ -4075,7 +4084,7 @@ fi
|
||||
@@ -4160,7 +4159,7 @@ fi
|
||||
#
|
||||
if [ -z "$DIR_MAN" ]; then
|
||||
MANPATH="
|
||||
|
|
@ -341,7 +288,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
|
|||
/usr/local/man
|
||||
/usr/contrib/man
|
||||
/usr/catman/local
|
||||
@@ -4084,43 +4093,11 @@ if [ -z "$DIR_MAN" ]; then
|
||||
@@ -4169,43 +4168,11 @@ if [ -z "$DIR_MAN" ]; then
|
||||
for i in $MANPATH; do
|
||||
test -d $i && { DIR_MAN=$i; break; }
|
||||
done
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-af,v 1.8 2010/01/29 16:44:13 joerg Exp $
|
||||
$NetBSD: patch-af,v 1.9 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
--- defs.in.orig 2005-09-27 18:38:24.000000000 +0000
|
||||
--- defs.in.orig 2012-06-06 00:58:38.000000000 +0000
|
||||
+++ defs.in
|
||||
@@ -44,13 +44,14 @@ SHELL = @SCRIPT_SH@
|
||||
@@ -48,12 +48,13 @@ ABI_PATCH = @ABI_PATCH@
|
||||
# to insufficient; you are better off rerunning the
|
||||
# configure script so that all uses are set correctly.
|
||||
#
|
||||
|
|
@ -12,7 +12,6 @@ $NetBSD: patch-af,v 1.8 2010/01/29 16:44:13 joerg Exp $
|
|||
-LIBDATA = @LIBDATA@
|
||||
-LIBDIR = @LIBDIR@
|
||||
-LIBEXEC = @LIBEXEC@
|
||||
-HTMLDIR = @HTMLDIR@
|
||||
+PREFIX = ${DESTDIR}@PREFIX@
|
||||
+SPOOL = ${DESTDIR}@SPOOL@
|
||||
+SBIN = ${DESTDIR}@SBIN@
|
||||
|
|
@ -20,20 +19,10 @@ $NetBSD: patch-af,v 1.8 2010/01/29 16:44:13 joerg Exp $
|
|||
+LIBDATA = ${DESTDIR}@LIBDATA@
|
||||
+LIBDIR = ${DESTDIR}@LIBDIR@
|
||||
+LIBEXEC = ${DESTDIR}@LIBEXEC@
|
||||
+HTMLDIR = ${DESTDIR}@HTMLDIR@
|
||||
FONTMAP = @FONTMAP@
|
||||
FONTPATH = @FONTPATH@
|
||||
SENDMAIL = @SENDMAIL@
|
||||
@@ -261,7 +262,7 @@ LDFLAGS = ${LDOPTS} ${LDLIBS}
|
||||
LDOPTS = ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
|
||||
LDLIBS = ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
|
||||
|
||||
-GLDOPTS = -L/usr/local/lib
|
||||
+GLDOPTS = -L${PREFIX}/lib
|
||||
GLDLIBS = ${SHDLIBC}
|
||||
|
||||
#
|
||||
@@ -322,7 +323,7 @@ INCLDIR = /usr/include
|
||||
@@ -328,7 +329,7 @@ INCLDIR = /usr/include
|
||||
# MANSYS subdirectory for server & server-related apps
|
||||
# MANFILES subdirectory for file format info
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,25 +1,38 @@
|
|||
$NetBSD: patch-ag,v 1.5 2003/09/23 21:39:48 abs Exp $
|
||||
$NetBSD: patch-ag,v 1.6 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
--- etc/Makefile.in.orig Tue Feb 6 04:54:06 2001
|
||||
--- etc/Makefile.in.orig 2012-06-06 00:58:38.000000000 +0000
|
||||
+++ etc/Makefile.in
|
||||
@@ -85,14 +85,16 @@ install: default
|
||||
@@ -86,25 +86,25 @@ install: default
|
||||
-src ${SRCDIR}/faxsetup.$$i -O faxsetup.$$i; \
|
||||
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.hfaxd
|
||||
+ -${MKDIR} -m 755 ${PREFIX}/share/hylafax
|
||||
+ -${MKDIR} -m 755 ${PREFIX}/share/hylafax/etc_template
|
||||
+ ${PUTSAMPLE} -F ${PREFIX}/share/hylafax/etc_template -m 644 -o xferfaxlog
|
||||
+ ${PUTSAMPLE} -F ${PREFIX}/share/hylafax/etc_template -m 600 -o hosts.hfaxd
|
||||
+ ${PUTSAMPLE} -F ${PREFIX}/share/examples/hylafax -m 644 -o xferfaxlog
|
||||
+ ${PUTSAMPLE} -F ${PREFIX}/share/examples/hylafax -m 600 -o hosts.hfaxd
|
||||
for i in ${DIALRULES}; do \
|
||||
- ${PUTSERVER} -F ${SPOOL}/etc -m 444 -src ${SRCDIR}/$$i \
|
||||
+ ${PUTSERVER} -F ${PREFIX}/share/hylafax/etc_template -m 444 -src ${SRCDIR}/$$i \
|
||||
+ ${PUTSERVER} -F ${PREFIX}/share/examples/hylafax -m 444 -src ${SRCDIR}/$$i \
|
||||
-idb "config(update)" -O $$i; \
|
||||
done
|
||||
${PUTSERVER} -F ${LIBEXEC} -m 755 -O lockname ondelay
|
||||
- ${PUTSAMPLE} -F ${SPOOL}/etc -m 644 -idb nostrip \
|
||||
+ ${PUTSAMPLE} -F ${PREFIX}/share/hylafax/etc_template -m 644 -idb nostrip \
|
||||
+ ${PUTSAMPLE} -F ${PREFIX}/share/examples/hylafax -m 644 -idb nostrip \
|
||||
-src ${SRCDIR}/lutRS18.pcf -O lutRS18.pcf
|
||||
|
||||
#
|
||||
${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \
|
||||
- -idb hylafax.sw.server -dir -F ${SPOOL}/etc templates
|
||||
- ${PUTSAMPLE} -F ${SPOOL}/etc/templates -m 644 \
|
||||
+ -idb hylafax.sw.server -dir -F ${PREFIX}/share/examples/hylafax templates
|
||||
+ ${PUTSAMPLE} -F ${PREFIX}/share/examples/hylafax/templates -m 644 \
|
||||
-src ${SRCDIR}/templates/README -O README
|
||||
@for d in ${TEMPLATES}; do \
|
||||
${ECHO} "Installing templates/$$d"; \
|
||||
${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \
|
||||
- -idb hylafax.sw.server -dir -F ${SPOOL}/etc/templates $$d; \
|
||||
+ -idb hylafax.sw.server -dir -F ${PREFIX}/share/examples/hylafax/templates $$d; \
|
||||
for f in ${SRCDIR}/templates/$$d/*; do \
|
||||
- ${PUTSAMPLE} -F ${SPOOL}/etc/templates/$$d -m 644 -src $$f `basename $$f`; \
|
||||
+ ${PUTSAMPLE} -F ${PREFIX}/share/examples/hylafax/templates/$$d -m 644 -src $$f `basename $$f`; \
|
||||
done; \
|
||||
done;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
$NetBSD: patch-ah,v 1.6 2005/01/27 16:22:37 adam Exp $
|
||||
$NetBSD: patch-ah,v 1.7 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
--- etc/faxaddmodem.sh.in.orig 2004-12-22 13:44:05.000000000 +0000
|
||||
--- etc/faxaddmodem.sh.in.orig 2012-06-06 00:58:38.000000000 +0000
|
||||
+++ etc/faxaddmodem.sh.in
|
||||
@@ -46,6 +46,7 @@
|
||||
SPOOL=@SPOOL@
|
||||
@@ -51,6 +51,7 @@ die()
|
||||
}
|
||||
|
||||
SPEED=
|
||||
+TTY=
|
||||
DOFUSER=no
|
||||
while [ x"$1" != x"" ] ; do
|
||||
case $1 in
|
||||
-s) SPEED=$2; shift;;
|
||||
@@ -115,7 +116,7 @@ CAT="$CAT -u" # something to do unbuff
|
||||
@@ -124,7 +125,7 @@ CAT="$CAT -u" # something to do unbuff
|
||||
FAX=@FAXUID@ # identity of the fax user
|
||||
GROUP=/etc/group # where to go for group entries
|
||||
PROTOGID=@FAXGID@ # group who's gid we use for FAX user
|
||||
|
|
@ -19,7 +19,7 @@ $NetBSD: patch-ah,v 1.6 2005/01/27 16:22:37 adam Exp $
|
|||
MODEMCONFIG=$SPOOL/config # location of prototype modem config files
|
||||
RMCMD="$RM -f" # forced removal
|
||||
|
||||
@@ -809,7 +810,7 @@ SendToModem()
|
||||
@@ -833,7 +834,7 @@ SendToModem()
|
||||
COMMAND=$*
|
||||
sleep 1 # wait for previous kill
|
||||
case $TARGET in
|
||||
|
|
@ -28,7 +28,7 @@ $NetBSD: patch-ah,v 1.6 2005/01/27 16:22:37 adam Exp $
|
|||
*) onDev $STTY 0; sleep 1 ;; # reset the modem (hopefully)
|
||||
esac
|
||||
# start listening for output
|
||||
@@ -1152,7 +1153,7 @@ EOF
|
||||
@@ -1178,7 +1179,7 @@ EOF
|
||||
done;
|
||||
MODEMCLASSES=`echo $MODEMCLASSES | $SED -e 's/3/2.0/g' -e 's/4/1.0/g' -e 's/5/2.1/g' -e 's/ $//g'`
|
||||
SUPPORT=`echo $SUPPORT | $SED -e 's/3/2.0/g' -e 's/4/1.0/g' -e 's/5/2.1/g'`.
|
||||
|
|
@ -37,7 +37,7 @@ $NetBSD: patch-ah,v 1.6 2005/01/27 16:22:37 adam Exp $
|
|||
case "$MODEMCLASSES" in
|
||||
"") giveup;;
|
||||
"1") ModemType=Class1; configureClass1Modem;;
|
||||
@@ -1163,7 +1164,7 @@ EOF
|
||||
@@ -1189,7 +1190,7 @@ EOF
|
||||
*)
|
||||
DEFAULTCLASS=`echo $MODEMCLASSES | $SED 's/\([^ ]*\).*/\1/g'`
|
||||
x=""
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-ai,v 1.9 2005/01/27 16:22:37 adam Exp $
|
||||
$NetBSD: patch-ai,v 1.10 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
--- etc/faxsetup.sh.in.orig 2004-12-28 04:45:04.000000000 +0000
|
||||
--- etc/faxsetup.sh.in.orig 2012-06-06 00:58:38.000000000 +0000
|
||||
+++ etc/faxsetup.sh.in
|
||||
@@ -41,7 +41,9 @@
|
||||
# This script interactively prepares and verifies
|
||||
|
|
@ -18,10 +18,10 @@ $NetBSD: patch-ai,v 1.9 2005/01/27 16:22:37 adam Exp $
|
|||
LN=@LN@ # ln command for use below
|
||||
LN_S=@LN_S@ # ln option for creating a symbolic link
|
||||
+MKDIR=@MKDIR@ # directory creation program for use below
|
||||
MIMENCODE=@MIMENCODE@ # mimencode command to dump in setup.cache
|
||||
MKFIFO=@MKFIFO@ # FIFO creation program for use below
|
||||
MV=@MV@ # move file for use below
|
||||
@@ -149,6 +152,7 @@ LIBEXEC DIR_LIBEXEC
|
||||
PCL6CMD=@PCL6CMD@ # pcl6 (GhostPCL) program
|
||||
@@ -154,6 +157,7 @@ LIBEXEC DIR_LIBEXEC
|
||||
LN
|
||||
MANDIR DIR_MAN
|
||||
MIMENCODE
|
||||
|
|
@ -29,7 +29,7 @@ $NetBSD: patch-ai,v 1.9 2005/01/27 16:22:37 adam Exp $
|
|||
MKFIFO
|
||||
MV
|
||||
PATH
|
||||
@@ -816,6 +820,61 @@ if [ "$euid" != "root" ]; then
|
||||
@@ -870,6 +874,61 @@ if [ "$euid" != "root" ]; then
|
||||
boom
|
||||
fi
|
||||
|
||||
|
|
@ -91,7 +91,7 @@ $NetBSD: patch-ai,v 1.9 2005/01/27 16:22:37 adam Exp $
|
|||
onClient && Note "Checking system for proper client configuration."
|
||||
onServer && Note "Checking system for proper server configuration."
|
||||
|
||||
@@ -2214,12 +2273,7 @@ if onServer; then
|
||||
@@ -2426,12 +2485,7 @@ if onServer; then
|
||||
|
||||
findproc()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-al,v 1.6 2005/01/27 16:22:37 adam Exp $
|
||||
$NetBSD: patch-al,v 1.7 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
--- faxd/Getty.c++.orig 2005-01-01 21:27:15.000000000 +0000
|
||||
+++ faxd/Getty.c++
|
||||
@@ -234,7 +234,7 @@ Getty::hangup()
|
||||
@@ -230,7 +230,7 @@ Getty::hangup()
|
||||
// NB: this is executed in the parent
|
||||
fxStr device = fxStr::format("%s" | line, _PATH_DEV);
|
||||
Sys::chown(device, UUCPLock::getUUCPUid(), UUCPLock::getUUCPGid());
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-an,v 1.7 2005/01/27 16:22:37 adam Exp $
|
||||
$NetBSD: patch-an,v 1.8 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
--- faxd/faxGettyApp.c++.orig 2005-01-01 21:27:16.000000000 +0000
|
||||
+++ faxd/faxGettyApp.c++
|
||||
@@ -789,7 +789,7 @@ faxGettyApp::notifyDocumentRecvd(const F
|
||||
@@ -815,7 +815,7 @@ faxGettyApp::notifyDocumentRecvd(const F
|
||||
FaxServer::notifyDocumentRecvd(ri);
|
||||
|
||||
FaxAcctInfo ai;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ao,v 1.7 2005/01/27 16:22:37 adam Exp $
|
||||
$NetBSD: patch-ao,v 1.8 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
--- hfaxd/User.c++.orig 2005-01-10 04:52:09.000000000 +0000
|
||||
--- hfaxd/User.c++.orig 2012-06-06 00:58:38.000000000 +0000
|
||||
+++ hfaxd/User.c++
|
||||
@@ -244,7 +244,7 @@ HylaFAXServer::userName(u_int id)
|
||||
@@ -260,7 +260,7 @@ HylaFAXServer::userName(u_int id)
|
||||
if (id == uid) // user currently logged in
|
||||
return (const char*) the_user;
|
||||
if (id == FAXUID_ANON) // anonymous user
|
||||
|
|
@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.7 2005/01/27 16:22:37 adam Exp $
|
|||
if (idcache == NULL) // load cache from file
|
||||
fillIDCache();
|
||||
const fxStr* hit = idcache->find(id); // check cache
|
||||
@@ -263,7 +263,7 @@ HylaFAXServer::userID(const char* name,
|
||||
@@ -279,7 +279,7 @@ HylaFAXServer::userID(const char* name,
|
||||
{
|
||||
if (name == the_user)
|
||||
id = uid;
|
||||
|
|
@ -20,12 +20,12 @@ $NetBSD: patch-ao,v 1.7 2005/01/27 16:22:37 adam Exp $
|
|||
id = FAXUID_ANON;
|
||||
else {
|
||||
if (idcache == NULL)
|
||||
@@ -350,7 +350,7 @@ HylaFAXServer::findUser(FILE* db, const
|
||||
@@ -366,7 +366,7 @@ HylaFAXServer::findUser(FILE* db, const
|
||||
if (faxuid < FAXUID_MAX)
|
||||
SetBit(FAXUID_RESV); // reserved uid
|
||||
SetBit(faxuid); // reserved uid
|
||||
else
|
||||
- logError("Internal error, \"fax\" UID (%u) too large.", faxuid);
|
||||
+ logError("Internal error, \"" FAX_USER "\" UID (%u) too large.", faxuid);
|
||||
SetBit(0); // 0 uid is reserved
|
||||
SetBit(FAXUID_ANON); // anonymous uid is reserved
|
||||
while (nextRecord(db, line, sizeof (line))) {
|
||||
if (line[0] == '!')
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ap,v 1.8 2005/01/27 16:22:37 adam Exp $
|
||||
$NetBSD: patch-ap,v 1.9 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
--- util/Makefile.in.orig 2004-08-16 12:58:22.000000000 +0000
|
||||
--- util/Makefile.in.orig 2012-06-06 00:58:38.000000000 +0000
|
||||
+++ util/Makefile.in
|
||||
@@ -156,7 +156,7 @@ checkat: checkat.o ${LIBS}
|
||||
@@ -117,7 +117,7 @@ checkat: checkat.o ${LIBS}
|
||||
PUTCLIENT = ${INSTALL} -idb ${PRODUCT}.sw.client
|
||||
PUTSERVER = ${INSTALL} -idb ${PRODUCT}.sw.server
|
||||
PUTSERV = ${PUTSERVER} -m 755
|
||||
|
|
@ -11,7 +11,7 @@ $NetBSD: patch-ap,v 1.8 2005/01/27 16:22:37 adam Exp $
|
|||
PUTSBIN = ${PUTSERVER} -F ${SBIN}
|
||||
|
||||
installClient: default
|
||||
@@ -173,6 +173,7 @@ install: installClient
|
||||
@@ -133,6 +133,7 @@ install: installClient
|
||||
${PUTSBIN} -m 755 -src xferfaxstats.sh -O xferfaxstats
|
||||
${PUTSBIN} -m 755 -src recvstats.sh -O recvstats
|
||||
${PUTSBIN} -m 755 -idb "config(update)" -src faxcron.sh -O faxcron
|
||||
|
|
@ -19,7 +19,7 @@ $NetBSD: patch-ap,v 1.8 2005/01/27 16:22:37 adam Exp $
|
|||
${PUTSUPD} -m 755 -src ps2fax.gs.sh -O ps2fax.gs
|
||||
${PUTSUPD} -m 755 -src ps2fax.dps.sh -O ps2fax.dps
|
||||
${PUTSUPD} -m 755 -src ps2fax.imp.sh -O ps2fax.imp
|
||||
@@ -187,9 +188,11 @@ install: installClient
|
||||
@@ -153,9 +154,11 @@ install: installClient
|
||||
${PUTSUPD} -m 755 -src pollrcvd.sh -O pollrcvd
|
||||
${PUTSUPD} -m 755 -src mkcover.sh -O mkcover
|
||||
${PUTSUPD} -m 755 -src wedged.sh -O wedged
|
||||
|
|
@ -32,4 +32,4 @@ $NetBSD: patch-ap,v 1.8 2005/01/27 16:22:37 adam Exp $
|
|||
+ ${PUTSERVER} -F ${PREFIX}/share/hylafax/etc_template -idb "config(suggest)" \
|
||||
-m 444 -src ${SRCDIR}/cover.templ -O cover.templ
|
||||
|
||||
@MAKEDSOINCLUDE@ @MAKELQUOTE@${SRCDIR}/Makefile.@DSO@dso@MAKERQUOTE@
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
$NetBSD: patch-hfaxd_FileSystem_c__,v 1.1 2012/04/08 03:25:03 dholland Exp $
|
||||
|
||||
Support libtiff 4.x.
|
||||
|
||||
--- hfaxd/FileSystem.c++~ 2003-02-08 22:49:52.000000000 +0000
|
||||
+++ hfaxd/FileSystem.c++
|
||||
@@ -728,7 +728,7 @@ HylaFAXServer::nlstUnixFile(FILE* fd, co
|
||||
}
|
||||
|
||||
static bool
|
||||
-isTIFF(const TIFFHeader& h)
|
||||
+isTIFF(const TIFFHeaderClassic& h)
|
||||
{
|
||||
if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN)
|
||||
return (false);
|
||||
@@ -741,7 +741,7 @@ isTIFF(const TIFFHeader& h)
|
||||
// byte swap version stamp if opposite byte order
|
||||
if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN))
|
||||
TIFFSwabShort(&version);
|
||||
- return (version == TIFF_VERSION);
|
||||
+ return (version == TIFF_VERSION_CLASSIC);
|
||||
}
|
||||
|
||||
bool
|
||||
@@ -754,7 +754,7 @@ HylaFAXServer::docType(const char* docna
|
||||
if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) {
|
||||
union {
|
||||
char buf[512];
|
||||
- TIFFHeader h;
|
||||
+ TIFFHeaderClassic h;
|
||||
} b;
|
||||
ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
|
||||
if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!')
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
$NetBSD: patch-hfaxd_FileTransfer_c__,v 1.1 2012/04/08 03:25:03 dholland Exp $
|
||||
|
||||
Support libtiff 4.x. Hopefully.
|
||||
|
||||
--- hfaxd/FileTransfer.c++.orig 2005-08-05 19:08:15.000000000 +0000
|
||||
+++ hfaxd/FileTransfer.c++
|
||||
@@ -50,6 +50,14 @@
|
||||
#define HAVE_PSLEVEL2 false
|
||||
#define HAVE_PCL5 false
|
||||
|
||||
+/* XXX */
|
||||
+struct TIFFDirEntry {
|
||||
+ uint16_t tdir_tag;
|
||||
+ uint16_t tdir_type;
|
||||
+ uint16_t tdir_count;
|
||||
+ uint16_t tdir_offset;
|
||||
+};
|
||||
+
|
||||
static struct {
|
||||
const char* name; // protocol token name
|
||||
bool supported; // true if format is supported
|
||||
@@ -210,7 +218,7 @@ HylaFAXServer::retrievePageCmd(const cha
|
||||
uint32* sb;
|
||||
TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
|
||||
file_size = sizeof (DirTemplate) +
|
||||
- sizeof (TIFFHeader) + sizeof (uint16);
|
||||
+ sizeof (TIFFHeaderClassic) + sizeof (uint16);
|
||||
for (tstrip_t s = 0, ns = TIFFNumberOfStrips(tif); s < ns; s++)
|
||||
file_size += sb[s];
|
||||
reply(code, "%s for %s (%lu bytes).",
|
||||
@@ -242,10 +250,10 @@ HylaFAXServer::openTIFF(const char* name
|
||||
if (fd >= 0) {
|
||||
union {
|
||||
char buf[512];
|
||||
- TIFFHeader h;
|
||||
+ TIFFHeaderClassic h;
|
||||
} b;
|
||||
ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
|
||||
- if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION &&
|
||||
+ if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION_CLASSIC &&
|
||||
(b.h.tiff_magic == TIFF_BIGENDIAN ||
|
||||
b.h.tiff_magic == TIFF_LITTLEENDIAN)) {
|
||||
(void) lseek(fd, 0L, SEEK_SET); // rewind
|
||||
@@ -324,7 +332,7 @@ HylaFAXServer::sendTIFFHeader(TIFF* tif,
|
||||
{
|
||||
static DirTemplate templ = {
|
||||
#define TIFFdiroff(v) \
|
||||
- (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \
|
||||
+ (uint32) (sizeof (TIFFHeaderClassic) + sizeof (uint16) + \
|
||||
(intptr_t) &(((DirTemplate*) 0)->v))
|
||||
{ TIFFTAG_SUBFILETYPE, TIFF_LONG, 1 },
|
||||
{ TIFFTAG_IMAGEWIDTH, TIFF_LONG, 1 },
|
||||
@@ -358,14 +366,14 @@ HylaFAXServer::sendTIFFHeader(TIFF* tif,
|
||||
* of things about the contents of the TIFF file.
|
||||
*/
|
||||
struct {
|
||||
- TIFFHeader h;
|
||||
+ TIFFHeaderClassic h;
|
||||
uint16 dircount;
|
||||
u_char dirstuff[sizeof (templ)];
|
||||
} buf;
|
||||
union { int32 i; char c[4]; } u; u.i = 1;
|
||||
buf.h.tiff_magic = (u.c[0] == 0 ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN);
|
||||
- buf.h.tiff_version = TIFF_VERSION;
|
||||
- buf.h.tiff_diroff = sizeof (TIFFHeader);
|
||||
+ buf.h.tiff_version = TIFF_VERSION_CLASSIC;
|
||||
+ buf.h.tiff_diroff = sizeof (TIFFHeaderClassic);
|
||||
buf.dircount = (uint16) NTAGS;
|
||||
getLong(tif, templ.SubFileType);
|
||||
getLong(tif, templ.ImageWidth);
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-rules.in,v 1.1 2013/08/30 16:57:35 joerg Exp $
|
||||
$NetBSD: patch-rules.in,v 1.2 2014/03/14 15:59:29 adam Exp $
|
||||
|
||||
--- rules.in.orig 2013-08-30 14:42:52.000000000 +0000
|
||||
+++ rules.in
|
||||
@@ -195,3 +195,5 @@ RAWDEPFILTER= sed -e 's:^:${VPATH}/:'
|
||||
@@ -198,3 +198,5 @@ RAWDEPFILTER= sed -e 's:^:${VPATH}/:'
|
||||
# Include the make dependency file if it exists.
|
||||
#
|
||||
@MAKEDEPINCLUDE@ @MAKELQUOTE@${MKDEPFILE}@MAKERQUOTE@
|
||||
|
|
|
|||
Loading…
Reference in a new issue