summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Severance2019-04-12 15:55:45 -0400
committerChris Severance2019-04-12 15:55:45 -0400
commit82522b915e603645251815ad4c88aaa330b4f81a (patch)
tree25c029e1454fa426d3092539a99a7cb85169e280
parent1b4b36306f515f996cfcc4e8741322c2d3c1ff0a (diff)
downloadaur-hylafaxplus.tar.gz
autu: Update to 7.0.0-1
-rw-r--r--.SRCINFO21
-rw-r--r--0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch21
-rw-r--r--1000-hylafaxplus-modem-support.patch83
-rw-r--r--PKGBUILD184
-rw-r--r--hylafax.install2
5 files changed, 281 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a003dbf331d..7c2c0667f3f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Nov 27 22:28:47 UTC 2018
+# Fri Apr 12 19:55:45 UTC 2019
pkgbase = hylafaxplus
pkgdesc = Enterprise Fax Server
- pkgver = 5.6.1
- pkgrel = 2
+ pkgver = 7.0.0
+ pkgrel = 1
url = http://hylafax.sourceforge.net/
install = hylafax.install
arch = i686
@@ -16,16 +16,19 @@ pkgbase = hylafaxplus
depends = sharutils
depends = jbigkit
depends = lcms2
- depends = smtp-server
depends = gsfonts-type1
+ optdepends = smtp-server: email support
optdepends = avantfax: manage HylaFAX+ through web browser
optdepends = t38modem: sip/voip fax modem pool interface
optdepends = fax4cups: CUPS fax printer
optdepends = faxfrontend: CUPS fax printer
optdepends = 2Fax: ascii to fax generator including pictures and fonts
- provides = hylafax=5.6.1
+ optdepends = yajhfc: hylafax client in Java
+ optdepends = mainpine-rfuser: reset utility for MainPine modems
+ optdepends = tgif: Cover Page Customization
+ provides = hylafax=7.0.0
conflicts = hylafax
- source = https://downloads.sourceforge.net/hylafax/hylafax-5.6.1.tar.gz
+ source = https://downloads.sourceforge.net/hylafax/hylafax-7.0.0.tar.gz
source = sendfaxvsi-1.0.0.tgz::https://github.com/severach/sendfaxvsi/archive/18fabc74490362cd26690331d546d727c727db25.tar.gz
source = fmfix.pl
source = localnxxtoregex.sh
@@ -35,7 +38,9 @@ pkgbase = hylafaxplus
source = 0004-hylafaxplus-systemd.patch
source = 0004a-hylafaxplus-systemd.patch
source = 0005-hylafaxplus-faxsetup.patch
- sha256sums = 419b8376f36a0a7bc685f083cd5230d4cc28581c4a8c035d2ae611e2a6651280
+ source = 0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch
+ source = 1000-hylafaxplus-modem-support.patch
+ sha256sums = 9e69bef1afc2e9c943c6ee176b435305a5f6f8c743c9e9fb35a348c52a6ad8e7
sha256sums = 0aed186ab30fdb7cf36895a0ff50b03bd4a68db63cf4f19763995dabd9caffb0
sha256sums = 466ab17cdaa1eb1f1f0b5bdc444a90df5835a1896b1363584264920bbc3929f2
sha256sums = 80d2e28ee7a7d8f93501e32c96e9895e242409da1326761d36dbf28e5a0e3677
@@ -45,6 +50,8 @@ pkgbase = hylafaxplus
sha256sums = 989d6f71a8cfe99a3ca983981f8d8e9368776e2fc7667a809755d8d7292d52ad
sha256sums = 528f267805203b792741423f46114fee7b48664f1aab35a0edff7d519555ccc2
sha256sums = e2b43c19705ce112dd3a08ecd0cae4c5558910366291524566cdd5890b2c6095
+ sha256sums = 96d106278ac68b95f0d1916f76066904c2108a2bb0c97651c22d025d989f4acb
+ sha256sums = d1671cf26e10858c5e1debc4c1bbb4d0091b982ce7d01c867dc9781b4b3e84b4
pkgname = hylafaxplus
diff --git a/0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch b/0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch
new file mode 100644
index 00000000000..0bca9bc3dc3
--- /dev/null
+++ b/0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch
@@ -0,0 +1,21 @@
+--- hfaxd/Jobs.c++.Arch 2018-06-27 18:15:01.000000000 -0400
++++ hfaxd/Jobs.c++ 2019-03-29 20:57:09.408205318 -0400
+@@ -2240,11 +2240,17 @@ HylaFAXServer::Jprintf(FILE* fd, const c
+ break;
+ case 'l':
+ fprintf(fd, fspec, job.pagelength);
+ break;
+ case 'm':
+- fprintf(fd, fspec, (const char*) job.modem);
++ {
++ const char *p=job.modemused;
++ if (*p == '\0') p=job.modem;
++ if (0==strcmp(p,"any")) p="";
++ if ( p[0]=='t' && p[1]=='t' && p[2]=='y') p+=3;
++ fprintf(fd, fspec, (const char*) p);
++ }
+ break;
+ case 'n':
+ fprintf(fd, fspec, " DQA"[job.notify]);
+ break;
+ case 'o':
diff --git a/1000-hylafaxplus-modem-support.patch b/1000-hylafaxplus-modem-support.patch
new file mode 100644
index 00000000000..15029ef4c4b
--- /dev/null
+++ b/1000-hylafaxplus-modem-support.patch
@@ -0,0 +1,83 @@
+diff -pNaru5 config.Arch/conexant-1.0 config/conexant-1.0
+--- config.Arch/conexant-1.0 2015-07-26 20:46:06.000000000 -0400
++++ config/conexant-1.0 2019-04-12 14:06:33.818743062 -0400
+@@ -7,13 +7,17 @@
+ # support "Class 1.0" which means that they have "adaptive receive"
+ # (AT+FAR=1), but not V.34.
+ #
+ # Comtrol RocketModem II/III/IV
+ # MultiTech MT5600ZDX
++# MultiTech MT5656ZDX
++# MultiTech MT5600BA
+ # Zoltrix FMVSP56i3
+ #
+ # CONFIG:CLASS1.0:56000:.*:.*: Manufacturer=Rockwell/Conexant Model=AC/K56
++# CONFIG:CLASS1.0:MT5600BA-V92:.*:.*: Manufacturer=MultiTech Model=MT5600BA-V92
++# CONFIG:CLASS1.0:MT5600BA:.*:.*: Manufacturer=MultiTech Model=MT5600BA-V90
+ # CONFIG:CLASS1.0:MT5600ZDX:.*:.*: Manufacturer=MultiTech Model=MT5600ZDX
+ # CONFIG:CLASS1.0:MT5656ZDX*:.*:.*: Manufacturer=MultiTech Model=MT5656ZDX
+ # CONFIG:CLASS1.0:.*:.*LEONARDO.*:.*: Manufacturer=Digicom Model=Leonardo
+ #
+ # BEGIN-SERVER
+diff -pNaru5 config.Arch/lucent config/lucent
+--- config.Arch/lucent 2015-07-26 20:46:06.000000000 -0400
++++ config/lucent 2019-04-12 14:05:09.188228149 -0400
+@@ -46,10 +46,12 @@
+ # CONFIG:CLASS1:Zoom V.90 Serial*:.*:.*: Manufacturer=Zoom Model=2949L
+ # CONFIG:CLASS1:EFM560 VER*:.*:.*: Manufacturer=AboCom Model=EFM560
+ # CONFIG:CLASS1:Mainpine Venus V.92*:.*:.*: Manufacturer=Mainpine Model=RockForce
+ # CONFIG:CLASS1:Mainpine CFAX34*:.*:.*: Manufacturer=Mainpine Model='IQ Express'
+ # CONFIG:CLASS1:.*:Mainpine CFAX34*:.*: Manufacturer=Mainpine Model='IQ Express'
++# CONFIG:CLASS1:LT 33.6 MT3334ZDX*:.*:.*: Manufacturer=Lucent Model='MT3334ZDX'
++# CONFIG:CLASS1:Agere OCM V.92 MT9234ZBA*:.*:.*: Manufacturer=MultiTech Model=MT9234ZBA
+ # CONFIG:CLASS1:Agere OCM V.92*:.*:.*: Manufacturer=Agere Model=OCM
+ # CONFIG:CLASS1:AGERE OCM V.92*:.*:.*: Manufacturer=Agere Model=OCM
+ #
+ # BEGIN-SERVER
+ # END-SERVER
+diff -pNaru5 config.Arch/lucent-mt-10 config/lucent-mt-10
+--- config.Arch/lucent-mt-10 2015-07-26 20:46:06.000000000 -0400
++++ config/lucent-mt-10 2019-04-12 14:05:09.188228149 -0400
+@@ -10,10 +10,11 @@
+ # CONFIG:CLASS1.0:LT V.90 1.0 MT5634ZBA*:.*:.*: Manufacturer=MultiTech Model=MT5634ZBA
+ # CONFIG:CLASS1.0:LT V.92 1.0 MT5634ZBA*:.*:.*: Manufacturer=MultiTech Model=MT5634ZBA
+ # CONFIG:CLASS1.0:LT V.90 1.0 ISI5634PCI*:.*:.*: Manufacturer=MultiTech Model=ISI5634PCI
+ # CONFIG:CLASS1.0:LT V.92 1.0 ISI5634PCI*:.*:.*: Manufacturer=MultiTech Model=ISI5634PCI
+ # CONFIG:CLASS1.0:LT V.92 1.0 MT5634SMI*:.*:.*: Manufacturer=MultiTech Model=MT5634SMI
++# CONFIG:CLASS1.0:Agere OCM V.92 MT9234ZBA*:.*:.*: Manufacturer=MultiTech Model=MT9234ZBA
+ # CONFIG:CLASS1.0:Agere OCM V.92*:.*:.*: Manufacturer=Agere Model=OCM
+ # CONFIG:CLASS1.0:AGERE OCM V.92*:.*:.*: Manufacturer=Agere Model=OCM
+ #
+ # BEGIN-SERVER
+ # END-SERVER
+diff -pNaru5 config.Arch/lucent-mt-2 config/lucent-mt-2
+--- config.Arch/lucent-mt-2 2015-07-26 20:46:06.000000000 -0400
++++ config/lucent-mt-2 2019-04-12 14:05:09.188228149 -0400
+@@ -9,10 +9,11 @@
+ #
+
+ #
+ # CONFIG: CLASS2:"Multi-Tech Systems"-"MT5634ZPX-PCI"-*
+ # CONFIG: CLASS2:"Multi-Tech Systems"-"MT5634ZBA"-*
++# CONFIG: CLASS2:"Multi-Tech Systems"-*"MT3334ZDX"*
+ # CONFIG: CLASS2:*-"ISI5634PCI"-*
+ # CONFIG: CLASS2:*-"MT5634SMI-V92"-*
+ #
+ # BEGIN-SERVER
+ # END-SERVER
+diff -pNaru5 config.Arch/rc288dpi-1 config/rc288dpi-1
+--- config.Arch/rc288dpi-1 2015-07-26 20:46:06.000000000 -0400
++++ config/rc288dpi-1 2019-04-12 14:06:52.938859444 -0400
+@@ -38,10 +38,12 @@
+ # switches to XON/XOFF (testing host was too fast to see).
+ #
+ # CONFIG:CLASS1:28800:.*:.*: Manufacturer=ROCKWELL Model=RC288DPi
+ # CONFIG:CLASS1:33600:.*:.*: Manufacturer=Rockwell Model=33600
+ # CONFIG:CLASS1:56000:.*:.*: Manufacturer=Rockwell/Conexant Model=AC/K56
++# CONFIG:CLASS1:MT5600BA-V92:.*:.*: Manufacturer=MultiTech Model=MT5600BA-V92
++# CONFIG:CLASS1:MT5600BA:.*:.*: Manufacturer=MultiTech Model=MT5600BA
+ # CONFIG:CLASS1:MT5600ZDX:.*:.*: Manufacturer=MultiTech Model=MT5600ZDX
+ # CONFIG:CLASS1:MT5656ZDX*:.*:.*: Manufacturer=MultiTech Model=MT5656ZDX
+ #
+ # BEGIN-SERVER
+ # END-SERVER
diff --git a/PKGBUILD b/PKGBUILD
index 6c6a459feb3..ba97d0d76d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,6 +23,10 @@
# TODO: Improve systemd code now that it's out of sed and in patch
# TODO: Remove hfaxd.service and faxq.service symlinks
+# TODO: log/c* modem and phone statistics script
+# TODO: doneq/q* extended connection info awk script
+# TODO: automatic requeue script
+
# Setting these skel defaults will make adding modems easier.
_opt_AreaCode="517"
@@ -81,15 +85,18 @@ _opt_pagesize="Letter" # A4, Letter, Legal
# Enable one of the modems with some of the following commands.
-# sudo systemctl enable faxgetty@ttyUSB0.service
-# sudo systemctl start faxgetty@ttyUSB0.service
-# sudo systemctl enable faxgetty@ttyACM0.service
-# sudo systemctl start faxgetty@ttyACM0.service
+# sudo systemctl enable --now faxgetty@ttyUSB0.service
+# sudo systemctl enable --now faxgetty@ttyACM0.service
# You only need to enable the first faxgetty service manually. faxsetup will
# detect that faxgetty is in use and automatically enable and start all
# configured modems. When all modems are added run faxsetup again to restart
# the servers and enable all modems.
+# Note that all modems are enabled including those that were manually
+# disabled 'systemctl disable --now'. To permanently disable a modem
+# you must 'rm /var/spool/hylafax/etc/config.tty...'
+# To prevent faxsetup from enabling a modem and keep the config:
+# mv /var/spool/hylafax/etc/config.ttyACM1 /var/spool/hylafax/etc/config.disabled.ttyACM1
# sudo faxsetup
@@ -173,28 +180,33 @@ _opt_pagesize="Letter" # A4, Letter, Legal
set -u
pkgname='hylafaxplus'
_pkgnick='hylafax'
-pkgver='5.6.1'
-pkgrel='2'
+pkgver='7.0.0'
+pkgrel='1'
_sendfaxvsicommit='18fabc74490362cd26690331d546d727c727db25'
pkgdesc='Enterprise Fax Server'
arch=('i686' 'x86_64')
url='http://hylafax.sourceforge.net/'
license=('custom')
-depends=('dash' 'libtiff' 'pam' 'ghostscript' 'sharutils' 'jbigkit' 'lcms2' 'smtp-server' 'gsfonts-type1') # 'cron'
+depends=('dash' 'libtiff' 'pam' 'ghostscript' 'sharutils' 'jbigkit' 'lcms2' 'gsfonts-type1') # 'cron'
# BASE64 is the default so HylaFAX+ doesn't need uuencode but I put it in anyways to placate configure and the bin finder in faxsetup!
-optdepends=('avantfax: manage HylaFAX+ through web browser'
- #'HERMESfax: manage HylaFAX+ through web browser' # Way too old
- 't38modem: sip/voip fax modem pool interface'
- 'fax4cups: CUPS fax printer' # http://vigna.di.unimi.it/fax4CUPS/
- 'faxfrontend: CUPS fax printer' # https://www.vitki.net/book/page/integrating-hylafax-cups
- '2Fax: ascii to fax generator including pictures and fonts' # http://www.atbas.org/2fax/ascii.php
- #'cypheus: (Windows) manage HylaFAX+' # Pretty old
+optdepends=(
+ 'smtp-server: email support' # this must be configured if installed or Hylafax will spam the process table with orphaned sendmail processes
+ 'avantfax: manage HylaFAX+ through web browser'
+ #'HERMESfax: manage HylaFAX+ through web browser' # Way too old
+ 't38modem: sip/voip fax modem pool interface'
+ 'fax4cups: CUPS fax printer' # http://vigna.di.unimi.it/fax4CUPS/
+ 'faxfrontend: CUPS fax printer' # https://www.vitki.net/book/page/integrating-hylafax-cups
+ '2Fax: ascii to fax generator including pictures and fonts' # http://www.atbas.org/2fax/ascii.php
+ #'cypheus: (Windows) manage HylaFAX+' # Pretty old
# Too ad like and will show in red as not found packages... We'll leave them here for avid readers.
- #'Winprint-HylaFAX-Reloaded: (Windows) print to fax' # http://nerdvittles.com/?p=738 Incredible Fax: Free Faxing Returns to Incredible PBX 1.8
- #'WinPrint-Hylafax-for-Windows: (Windows) print to fax'
- #'Hylafax-support: iFax Solutions can help configure your fax system'
+ #'Winprint-HylaFAX-Reloaded: (Windows) print to fax' # http://nerdvittles.com/?p=738 Incredible Fax: Free Faxing Returns to Incredible PBX 1.8
+ #'WinPrint-Hylafax-for-Windows: (Windows) print to fax'
+ #'Hylafax-support: iFax Solutions can help configure your fax system'
# 'sambafax'
# 'gfax: fax from Gnome (X)'
+ 'yajhfc: hylafax client in Java'
+ 'mainpine-rfuser: reset utility for MainPine modems'
+ 'tgif: Cover Page Customization'
)
provides=("hylafax=${pkgver}")
conflicts=('hylafax')
@@ -213,8 +225,10 @@ source=(
'0004-hylafaxplus-systemd.patch'
'0004a-hylafaxplus-systemd.patch'
'0005-hylafaxplus-faxsetup.patch'
+ '0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch'
+ '1000-hylafaxplus-modem-support.patch'
)
-sha256sums=('419b8376f36a0a7bc685f083cd5230d4cc28581c4a8c035d2ae611e2a6651280'
+sha256sums=('9e69bef1afc2e9c943c6ee176b435305a5f6f8c743c9e9fb35a348c52a6ad8e7'
'0aed186ab30fdb7cf36895a0ff50b03bd4a68db63cf4f19763995dabd9caffb0'
'466ab17cdaa1eb1f1f0b5bdc444a90df5835a1896b1363584264920bbc3929f2'
'80d2e28ee7a7d8f93501e32c96e9895e242409da1326761d36dbf28e5a0e3677'
@@ -223,7 +237,10 @@ sha256sums=('419b8376f36a0a7bc685f083cd5230d4cc28581c4a8c035d2ae611e2a6651280'
'b4b93c149164ed7c96f4f04373c32198c1e19c89ca9e2ab6e92e17c0a48bd1af'
'989d6f71a8cfe99a3ca983981f8d8e9368776e2fc7667a809755d8d7292d52ad'
'528f267805203b792741423f46114fee7b48664f1aab35a0edff7d519555ccc2'
- 'e2b43c19705ce112dd3a08ecd0cae4c5558910366291524566cdd5890b2c6095')
+ 'e2b43c19705ce112dd3a08ecd0cae4c5558910366291524566cdd5890b2c6095'
+ '96d106278ac68b95f0d1916f76066904c2108a2bb0c97651c22d025d989f4acb'
+ 'd1671cf26e10858c5e1debc4c1bbb4d0091b982ce7d01c867dc9781b4b3e84b4')
+
# The HylaFAX binaries work very well. The scripts need major fixes!
# HylaFAX+ is pretty much completely broken for any Linux install,
# and some parts are broken for other Unix too. The original HylaFAX
@@ -244,7 +261,7 @@ sha256sums=('419b8376f36a0a7bc685f083cd5230d4cc28581c4a8c035d2ae611e2a6651280'
_pkginit() {
if [ "${SOURCEONLY:-0}" -ne 0 ]; then # see makepkg -S if this var changes
- if [ "${_opt_FAXNumber}" != '+1.517.555.0113' ] || [ "${_opt_LocalIdentifier}" != 'ArchLinuxFAX' ]; then
+ if [ "${_opt_FAXNumber}" != '+1.517.555.0101' ] || [ "${_opt_LocalIdentifier}" != 'ArchLinuxFAX' ]; then
echo 'Our fax info must be removed from the PKGBUILD' 1>&2
echo 'to produce a source package.' 1>&2
exit 1
@@ -289,7 +306,7 @@ prepare() {
test ! -s 'etc/faxsetup.sh.in.Arch' || echo "${}"
#cp -p 'etc/faxsetup.sh.in'{,.Arch}
- # diff -pNau5 'faxsetup.sh.in'{.orig,} > '0005-hylafaxplus-faxsetup.patch'
+ # diff -pNau5 'faxsetup.sh.in'{.Arch,} > '0005-hylafaxplus-faxsetup.patch'
patch -Nbup0 -i "${srcdir}/0005-hylafaxplus-faxsetup.patch"
sed -Ee "# Remove ' for mcedit syntax highlighter" \
-e "s:([dD]on)'t:"'\1t:g' \
@@ -298,6 +315,16 @@ prepare() {
-i 'etc/faxsetup.sh.in'
test ! -s 'etc/faxsetup.sh.in.Arch' || echo "${}"
+ #cp -p 'hfaxd/Jobs.c++'{,.Arch}
+ # diff -pNau5 'hfaxd/Jobs.c++'{.Arch,} > '0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch'
+ patch -Nbup0 -i "${srcdir}/0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch"
+ test ! -s 'hfaxd/Jobs.c++.Arch' || echo "${}"
+
+ #cp -pr 'config'{,.Arch}
+ # diff -pNaru5 'config'{.Arch,} > '1000-hylafaxplus-modem-support.patch'
+ patch -Nup0 -i "${srcdir}/1000-hylafaxplus-modem-support.patch"
+ test ! -d 'config.Arch' || echo "${}"
+
# Var $TTY clashes with the Arch Linux environment and likely all other Linux
# too. $TTY contains the terminal device from `tty`. With this already set
# to a known valid terminal, faxaddmodem never asks for a modem device and
@@ -348,6 +375,12 @@ prepare() {
# diff -pNau5 cover.templ{.default,} > '0003-graphic.logo.instructions.patch'
patch -d 'util' -Nup0 -i "${srcdir}/0003-graphic.logo.instructions.patch"
+ # Add Include to all of the config files. The initial include is blank so it won't change anything.
+ local _cfg
+ for _cfg in $(grep -le '^ModemType:' config/*); do
+ printf '#\nInclude:\t\t"etc/config-modems"\n' >> "${_cfg}"
+ done
+
set +u
echo 'Checking for fonts missing from fmfix.pl'
@@ -495,6 +528,111 @@ EOF
echo "${_host}" >> "${_outfile}"
done
+ # The usage of config include files needs to be standardized
+ touch "${pkgdir}/var/spool/hylafax/etc/config-modems.default"
+
+ # Lengthen retries to minimize failed jobs on high volume fax servers
+ install -Dm644 <(cat << EOF
+# The delay in seconds to wait before retrying a job whose
+# dialing attempt failed with a BUSY status result.
+# 12 dials over two hours: (2*60*60)/12
+JobReqBusy: 600
+
+# The delay in seconds to wait before retrying a job whose
+# dialing attempt failed with a NO ANSWER status result.
+# 2 dials over 2 hours: (2*60*60)/2
+JobReqNoAnswer: 3600
+
+# The delay in seconds to wait before retrying a job whose
+# dialing attempt failed with a NO CARRIER status result.
+# 2 dials over 2 hours: (2*60*60)/2
+JobReqNoCarrier: 3600
+
+# Delay in seconds for a Fax protocol error.
+JobReqProto: 180
+
+# rings to wait before answering phone
+# 0 for send only modems
+RingsBeforeAnswer: 0
+EOF
+ ) "${pkgdir}/var/spool/hylafax/etc/config-modems.sample"
+
+ # faxaddmodem destroys some things we'd like to add to etc/config
+ install -Dm644 <(cat << EOF
+# faxaddmodem destroys some lines we add to etc/config
+# so we add them here and use Include which isn't destroyed.
+# To use this, etc/config must contain the line
+# Include:<------><------>etc/config-local
+# Hylafax does not automatically detect changes to included files
+# touch etc/config to signal a change
+
+#FAXNumber: +1.000.000.0000
+#PageMargins: l=0.40in,r=0.40in,t=0.1in,b=0.1in
+#JobControlCmd: etc/jobcontrol-local
+#ModemGroup: "any:0:.*"
+##ModemGroup: "any:0:(ttyACM.*|ttyUSB[0123456])"
+#ModemGroup: "Rockwell:0:ttyUSB[067]"
+#ModemGroup: "Lucent:0:ttyACM.*"
+#ModemGroup: "Courier:0:ttyUSB3"
+EOF
+ ) "${pkgdir}/var/spool/hylafax/etc/config-local.default"
+
+ # It's difficult to set up job control from the scant information in man pages and the Internet
+ install -Dm644 <(cat << EOF
+#!/usr/bin/bash
+
+set -u
+set -e
+
+# man jobcontrol
+
+if [ -x "\${0##*/}" ]; then
+ self="\$(readlink -m "\$0")"
+ cd ..
+ self="\${self##\${PWD}/}"
+ if ! grep -q "^JobControlCmd:\s\+\${self}" 'etc/config-local'; then
+ echo "JobControlCmd not installed"
+ echo "Try:"
+ echo " printf 'JobControlCmd:\t\t%s\n' '\${self}' >> 'config-local'"
+ fi
+ echo "DEMO!" 1>&2
+ if [ "\$#" -ne 1 ]; then
+ echo "Usage \$0 JID"
+ exit 1
+ fi
+fi
+
+source etc/setup.cache
+source bin/common-functions
+
+QFILE="sendq/q\$1"
+if [ -s "\${QFILE}" ]; then
+ HYLAFAX_TMPDIR=''
+ TMPDIR=''
+ SetupPrivateTmp
+ parseQfile '' "\${QFILE}"
+ case "\$number-\$owner-\$tottries" in
+ #5551212-lee-3) echo "Class1ECMSupport: no";;
+ #*-sam-*) echo "LocalIdentifier: +1.800.555.1224";;
+ 911-*|???555*) echo 'RejectNotice: "Calls to 911 and directory assistance are not permitted"';;
+ [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]*) echo "RejectNotice: \"Invalid number (\${#number} digits)\"";;
+ [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-*) echo "RejectNotice: \"Invalid number (\${#number} digits)\"";;
+ ???111*|000*|111*|???000*) echo 'RejectNotice: "Invalid number"';;
+ #5175551214-*) echo 'ModemGroup: "Rockwell"';; # not compatible with Lucent
+ #2705551214-*) # bad lines at this location won't let the fax complete
+ # # man sendq
+ # echo 'DesiredBR: 0' # 0 for 2400 bps, 1 for 4800 bps, 2 for 7200 bps, 3 for 9600 bps, 4 for 12000 bps, 5 for 14400 bps, 6 for 16800 bps, 7 for 19200 bps, 8 for 21600 bps, 9 for 24000 bps, 10 for 26400 bps, 11 for 28800 bps, 12 for 31200 bps, and 13 for 33600 bps (default).
+ # echo 'DesiredEC: 0' # 0 to disable, 1 for 64-byte ECM, 2 for 256-byte ECM (default).
+ # echo 'DesiredDF: 0' # 0 for 1-D MH, 1 for 2-D MR, 3 for 2-D MR with uncompressed data, and 4 for 2-D MMR (default).
+ # ;;
+ esac
+else
+ echo "This only works with files in the sendq. Don't try JID in the doneq." 1>&2
+fi
+exit 0
+EOF
+ ) "${pkgdir}/var/spool/hylafax/etc/jobcontrol-local.default"
+
# Add dial rules for USA 7 and 10 digit numbers. The posted examples have them in the wrong order.
# diff -pNau5 dialrules{.default,} > '0001-dialrules.7-10.digits.USA.patch'
patch -d "${pkgdir}/var/spool/hylafax/etc" -Nup0 -i "${srcdir}/0001-dialrules.7-10.digits.USA.patch"
@@ -552,6 +690,7 @@ Documentation=man:faxq(8)
[Service]
Type=forking
ExecStart=/usr/bin/faxq
+Nice=-10
ExecReload=/bin/kill -HUP \$MAINPID
[Install]
@@ -577,6 +716,7 @@ After=faxq.service hfaxd.service
[Service]
ExecStart=/usr/bin/faxgetty %i
+Nice=-10
Type=simple
Restart=always
RestartSec=0
@@ -617,7 +757,7 @@ Documentation=man:faxqclean(8) man:faxcron(8)
[Service]
Type=oneshot
-ExecStart=/usr/bin/faxqclean
+ExecStart=/usr/bin/faxqclean -a -j 1209600
ExecStart=/usr/bin/faxcron -rcv 30
Nice=19
IOSchedulingClass=best-effort
diff --git a/hylafax.install b/hylafax.install
index df6b61a3940..de9937652a7 100644
--- a/hylafax.install
+++ b/hylafax.install
@@ -10,7 +10,7 @@ _print_install() {
echo ' The device to configure is usually ttyS0, ttyUSB0, or ttyACM0'
echo ' The number of pages to accept to more than 25'
echo ' The country code and area code'
- echo ' The Fax Class to 2.0'
+ echo ' The Fax Class to 1 or 1.0' # I can find no modem reliable at Class 2*
echo ' Most other defaults are OK'
echo -e '\n'
}