diff options
| -rw-r--r-- | .SRCINFO | 21 | ||||
| -rw-r--r-- | 0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch | 12 | ||||
| -rw-r--r-- | PKGBUILD | 23 | ||||
| -rwxr-xr-x | localnxxtoregex.sh | 108 |
4 files changed, 103 insertions, 61 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Jan 14 00:00:24 UTC 2022 +# Mon Apr 18 03:34:56 UTC 2022 pkgbase = hylafaxplus pkgdesc = Enterprise Fax Server - pkgver = 7.0.4 + pkgver = 7.0.5 pkgrel = 1 url = http://hylafax.sourceforge.net/ install = hylafax.install @@ -26,9 +26,10 @@ pkgbase = hylafaxplus optdepends = yajhfc: hylafax client in Java optdepends = mainpine-rfuser: reset utility for MainPine modems optdepends = tgif: Cover Page Customization - provides = hylafax=7.0.4 + provides = hylafax=7.0.5 conflicts = hylafax - source = https://downloads.sourceforge.net/hylafax/hylafax-7.0.4.tar.gz + options = !buildflags + source = https://downloads.sourceforge.net/hylafax/hylafax-7.0.5.tar.gz source = sendfaxvsi-1.0.0.tgz::https://github.com/severach/sendfaxvsi/archive/18fabc74490362cd26690331d546d727c727db25.tar.gz source = fmfix.pl source = localnxxtoregex.sh @@ -40,29 +41,29 @@ pkgbase = hylafaxplus source = 0005-hylafaxplus-faxsetup.patch source = 0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch source = 1000-hylafaxplus-modem-support.patch - md5sums = af3e1c241965891fedaa5ce2e7b266e7 + md5sums = ac8450d7aa8e5d6dd726e4d601702d69 md5sums = 3af38f1eaa4f9fb92cac2f0cf9544321 md5sums = 916f2c100eb2b41ef6b35f96bdb9444a - md5sums = c1d54ea1f50abfb3834488b428754714 + md5sums = ae0a86260ab7ed94187a5d8e560a82ac md5sums = 0edd9dbf9b745437a5a4c174d6418e96 md5sums = a2d08cfd91be2aa608dd3bc9ef6c69bc md5sums = c8c3aab59725c20eddc7d31d21c7b31e md5sums = fd0395521f6c2b8681e5fbcfd943043d md5sums = a14922b05223f703c41dff8035477706 md5sums = 0de848f554e2a93c09352eadb2b2e260 - md5sums = f6692d5cb0033abe7865c47ec581ea87 + md5sums = 151567ca960d860c88ff0e5154cb5b78 md5sums = dd1e2859dd1cc13db863ba74bc539ca0 - sha256sums = 2512e93d23bd04c12304c67fefb1646735c4bcb5d75b866adf91a89ed1098bf8 + sha256sums = 0e55067ec6b852a4179b72ea0887c0a05055467e723e9e6687167a9043119bae sha256sums = 0aed186ab30fdb7cf36895a0ff50b03bd4a68db63cf4f19763995dabd9caffb0 sha256sums = 466ab17cdaa1eb1f1f0b5bdc444a90df5835a1896b1363584264920bbc3929f2 - sha256sums = 80d2e28ee7a7d8f93501e32c96e9895e242409da1326761d36dbf28e5a0e3677 + sha256sums = 8b2dbf38d13d0c25e6164e691187b4f45ae971c009e80911cd96aac0f61cf871 sha256sums = dd4728f8204d0bba2a026768f0e0216778ed26583c3f799f6266554e21b48fe2 sha256sums = 5f19fa1f3b12fd480f4c28a9a2bdf041359d5510e1040b735d5f312071dcbd04 sha256sums = b4b93c149164ed7c96f4f04373c32198c1e19c89ca9e2ab6e92e17c0a48bd1af sha256sums = 989d6f71a8cfe99a3ca983981f8d8e9368776e2fc7667a809755d8d7292d52ad sha256sums = 528f267805203b792741423f46114fee7b48664f1aab35a0edff7d519555ccc2 sha256sums = e2b43c19705ce112dd3a08ecd0cae4c5558910366291524566cdd5890b2c6095 - sha256sums = 96d106278ac68b95f0d1916f76066904c2108a2bb0c97651c22d025d989f4acb + sha256sums = 4efef67287b2b5ebaa2485ac5be5a62d2a86b2830b416f7a6905cfe17d6e76bb sha256sums = 98e79e16e9cda5bb853501daaac7734cd5a367eb7543990f6a3c16fef49d0968 pkgname = hylafaxplus diff --git a/0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch b/0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch index 0bca9bc3dc33..4d6882215bfe 100644 --- a/0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch +++ b/0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch @@ -1,6 +1,6 @@ ---- 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 +--- hfaxd/Jobs.c++.Arch 2020-07-31 18:37:47.000000000 -0400 ++++ hfaxd/Jobs.c++ 2022-01-25 15:31:31.103951194 -0500 +@@ -2252,11 +2252,17 @@ HylaFAXServer::Jprintf(FILE* fd, const c break; case 'l': fprintf(fd, fspec, job.pagelength); @@ -8,11 +8,11 @@ case 'm': - fprintf(fd, fspec, (const char*) job.modem); + { -+ const char *p=job.modemused; ++ const char *q,*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); ++ q=strstr(p,"tty"); /* I'd rather search backwards */ ++ fprintf(fd, fspec, q?(q+3):p); + } break; case 'n': @@ -180,7 +180,7 @@ _opt_pagesize="Letter" # A4, Letter, Legal set -u pkgname='hylafaxplus' _pkgnick='hylafax' -pkgver='7.0.4' +pkgver='7.0.5' pkgrel='1' _sendfaxvsicommit='18fabc74490362cd26690331d546d727c727db25' pkgdesc='Enterprise Fax Server' @@ -211,6 +211,7 @@ optdepends=( provides=("hylafax=${pkgver}") conflicts=('hylafax') # backup=(var/spool/hylafax/bin/{faxrcvd,notify}) +options=('!buildflags') # get rid of Class 1 errors No response to PPS MPS, RSPREC DCN, No receiver protocol, Failure to train remote modem install="${_pkgnick}.install" # 'var/spool/hylafax/etc/hosts.hfaxd') # This is better handled with a .default file. _verwatch=("${url}" 'news/\([0-9\.]\+\)\.php' 'l') @@ -228,29 +229,29 @@ source=( '0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch' '1000-hylafaxplus-modem-support.patch' ) -md5sums=('af3e1c241965891fedaa5ce2e7b266e7' +md5sums=('ac8450d7aa8e5d6dd726e4d601702d69' '3af38f1eaa4f9fb92cac2f0cf9544321' '916f2c100eb2b41ef6b35f96bdb9444a' - 'c1d54ea1f50abfb3834488b428754714' + 'ae0a86260ab7ed94187a5d8e560a82ac' '0edd9dbf9b745437a5a4c174d6418e96' 'a2d08cfd91be2aa608dd3bc9ef6c69bc' 'c8c3aab59725c20eddc7d31d21c7b31e' 'fd0395521f6c2b8681e5fbcfd943043d' 'a14922b05223f703c41dff8035477706' '0de848f554e2a93c09352eadb2b2e260' - 'f6692d5cb0033abe7865c47ec581ea87' + '151567ca960d860c88ff0e5154cb5b78' 'dd1e2859dd1cc13db863ba74bc539ca0') -sha256sums=('2512e93d23bd04c12304c67fefb1646735c4bcb5d75b866adf91a89ed1098bf8' +sha256sums=('0e55067ec6b852a4179b72ea0887c0a05055467e723e9e6687167a9043119bae' '0aed186ab30fdb7cf36895a0ff50b03bd4a68db63cf4f19763995dabd9caffb0' '466ab17cdaa1eb1f1f0b5bdc444a90df5835a1896b1363584264920bbc3929f2' - '80d2e28ee7a7d8f93501e32c96e9895e242409da1326761d36dbf28e5a0e3677' + '8b2dbf38d13d0c25e6164e691187b4f45ae971c009e80911cd96aac0f61cf871' 'dd4728f8204d0bba2a026768f0e0216778ed26583c3f799f6266554e21b48fe2' '5f19fa1f3b12fd480f4c28a9a2bdf041359d5510e1040b735d5f312071dcbd04' 'b4b93c149164ed7c96f4f04373c32198c1e19c89ca9e2ab6e92e17c0a48bd1af' '989d6f71a8cfe99a3ca983981f8d8e9368776e2fc7667a809755d8d7292d52ad' '528f267805203b792741423f46114fee7b48664f1aab35a0edff7d519555ccc2' 'e2b43c19705ce112dd3a08ecd0cae4c5558910366291524566cdd5890b2c6095' - '96d106278ac68b95f0d1916f76066904c2108a2bb0c97651c22d025d989f4acb' + '4efef67287b2b5ebaa2485ac5be5a62d2a86b2830b416f7a6905cfe17d6e76bb' '98e79e16e9cda5bb853501daaac7734cd5a367eb7543990f6a3c16fef49d0968') # The HylaFAX binaries work very well. The scripts need major fixes! @@ -412,7 +413,7 @@ build() { CHGRP="${srcdir}/chgrp" \ ./configure \ --nointeractive \ - --with-OPTIMIZER="${CFLAGS}" \ + --with-OPTIMIZER="${CFLAGS:-}" \ --target="${CARCH}-arch-linux" \ --with-DIR_BIN='/usr/bin' \ --with-DIR_LIB='/usr/lib' \ @@ -633,7 +634,7 @@ if [ -s "\${QFILE}" ]; then [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 + #5175551214-*) echo 'Modem: "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). @@ -725,12 +726,12 @@ EOF # https://aur.archlinux.org/ [Unit] -Description=HylaFAX+ faxgetty on %i +Description=HylaFAX+ faxgetty on %I Documentation=man:faxgetty(8) After=faxq.service hfaxd.service [Service] -ExecStart=/usr/bin/faxgetty %i +ExecStart=/usr/bin/faxgetty %I Nice=-10 Type=simple Restart=always diff --git a/localnxxtoregex.sh b/localnxxtoregex.sh index 8c9a85babd6c..9b90c12ab5b9 100755 --- a/localnxxtoregex.sh +++ b/localnxxtoregex.sh @@ -6,56 +6,96 @@ set -u set -e +g_area='517' + if [ -z "${1:-}" ]; then - echo "Usage: $(basename "$0") nnx.txt > nnxmytown.txt" + echo "Usage: $(basename "$0") npamytown-date.txt > npamytown.txt" echo "Create nnx.txt from local nnx listing at" echo "http://localcallingguide.com/" echo "Search, Area Code/Prefix, ..., ..., Local prefixes" exit 1 fi -message='! local NNX list generated by localnxxtoregex.sh from Arch Linux HylaFax+ package' - -_fn_display() { +_fn_proc() { if [ ! -z "${nx}" ]; then - if [ ! -z "${message}" ]; then - echo "${message}" - message='' - fi + #if [ ! -z "${message}" ]; then + # echo "${message}" + # message='' + #fi local tx if [ "${#x}" -gt 1 ]; then x="[${x}]" - tx="(${nx}${x})" + tx="${nx}${x}" + nxt+=("") else - tx="(${nx}${x})\t" # keep tabs lined up + tx="${nx}${x}" + nxt+=($'\t') # keep tabs lined up fi - local _tx="(${nx}${x})" - echo -e '^${Country}${Area}'"${tx}\t= \1\t\t! USA NNX/NXX local ${npas[2]} calls" + #local _tx="(${nx}${x})" + nxn+=("${tx}") + nxl+=("${npas[2]}") + nxa+=("${npas[0]}") nx='' x='' fi } -readarray -t npalist < <(grep '^[0-9]' "$1" | LC_ALL=C sort) -#declare -p npalist - -nx='' -x='' -# 555 & 556 will be coalesced into 55[56] -#NPA;NXX;Rate Centre;Region;Plan Type;Call Type;Monthly Limit;Note;Effective -#517;555;Operator;MI;;;;; -#517;556;Operator;MI;;;;; -#517;560;Operator;MI;;;;; -#517;570;Operator;MI;;;;; -for npaline in "${npalist[@]}"; do - IFS=';' read -r -a npas <<<"${npaline}" - nnx="${npas[1]}" - if [ "${nnx#${nx}}" = "${nnx}" ]; then - _fn_display - nx="${nnx: 0:2}" - x="${nnx: 2:1}" - else - x+="${nnx: 2:1}" - fi +_fn_print() { + # output dialrules regex, no longer useful now that 10 digit dialing is required + local dt="$(date +'%F %T')" + printf '\n' + printf '! local dialrules NNX list\n' + printf '! generated %s by localnxxtoregex.sh %s from Arch Linux HylaFax+ package\n' "${dt}" "$1" + printf '! As of October 24, 2021 no more 7 digit dialing\n' + local k a + for k in "${!nxn[@]}"; do + a="${nxa[k]}" + if [ "${a}" = "${g_area}" ]; then + a='${Area}' + fi + printf '! ^${Country}%s(%s)%s\t= \\1\t\t! USA NNX/NXX local %s calls\n' "${a}" "${nxn[k]}" "${nxt[k]}" "${nxl[k]}" + done + # output jobcontrol-local case shell match statement + printf '\n # local jobcontrol-local NNX list generated %s by localnxxtoregex.sh %s from Arch Linux HylaFax+ package\n' "${dt}" "$1" + printf ' ' + local bar='' + for k in "${!nxn[@]}"; do + printf '%s%s%s*' "${bar}" "${nxa[k]}" "${nxn[k]}" + bar='|' + done + printf ')\n' +} + +while [ "$#" -gt 0 ]; do + readarray -t npalist < <(grep '^[0-9]' "$1" | LC_ALL=C sort) + #declare -p npalist + + nxl=() # list of city names + nxn=() # list of nnx 55[567] + nxa=() # list of area codes 517 + nxt=() # list of tab or not tab + nx='' + x='' + # 555 & 556 will be coalesced into 55[56] + #NPA;NXX;Rate Centre;Region;Plan Type;Call Type;Monthly Limit;Note;Effective + #517;555;Operator;MI;;;;; + #517;556;Operator;MI;;;;; + #517;560;Operator;MI;;;;; + #517;570;Operator;MI;;;;; + for npaline in "${npalist[@]}"; do + IFS=';' read -r -a npas <<<"${npaline}" + nnx="${npas[1]}" + if [ "${nnx#${nx}}" != "${nnx}" ]; then + x+="${nnx: 2:1}" + else + _fn_proc + nx="${nnx: 0:2}" + x="${nnx: 2:1}" + fi + done + _fn_proc + unset npalist nx x npaline npas nnx + #set > x + _fn_print "$1" + shift done -_fn_display |