summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Severance2019-12-23 22:45:18 -0500
committerChris Severance2019-12-23 22:45:18 -0500
commit5d63843f3a89f012284dab9b8d00e36649575420 (patch)
treefe0ff7b783e52e63859fa1b536bbf5081a3f9579
parent82522b915e603645251815ad4c88aaa330b4f81a (diff)
downloadaur-5d63843f3a89f012284dab9b8d00e36649575420.tar.gz
autu: Update to 7.0.1-1
-rw-r--r--.SRCINFO12
-rw-r--r--1000-hylafaxplus-modem-support.patch54
-rw-r--r--PKGBUILD11
3 files changed, 66 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7c2c0667f3f..ab7ff35bbae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Apr 12 19:55:45 UTC 2019
+# Tue Dec 24 03:45:17 UTC 2019
pkgbase = hylafaxplus
pkgdesc = Enterprise Fax Server
- pkgver = 7.0.0
+ pkgver = 7.0.1
pkgrel = 1
url = http://hylafax.sourceforge.net/
install = hylafax.install
@@ -26,9 +26,9 @@ 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.0
+ provides = hylafax=7.0.1
conflicts = hylafax
- source = https://downloads.sourceforge.net/hylafax/hylafax-7.0.0.tar.gz
+ source = https://downloads.sourceforge.net/hylafax/hylafax-7.0.1.tar.gz
source = sendfaxvsi-1.0.0.tgz::https://github.com/severach/sendfaxvsi/archive/18fabc74490362cd26690331d546d727c727db25.tar.gz
source = fmfix.pl
source = localnxxtoregex.sh
@@ -40,7 +40,7 @@ pkgbase = hylafaxplus
source = 0005-hylafaxplus-faxsetup.patch
source = 0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch
source = 1000-hylafaxplus-modem-support.patch
- sha256sums = 9e69bef1afc2e9c943c6ee176b435305a5f6f8c743c9e9fb35a348c52a6ad8e7
+ sha256sums = 7f8b4cb081678ba5d11b336ba55fc203eb5a65752495555f77513ab7c1ac6f32
sha256sums = 0aed186ab30fdb7cf36895a0ff50b03bd4a68db63cf4f19763995dabd9caffb0
sha256sums = 466ab17cdaa1eb1f1f0b5bdc444a90df5835a1896b1363584264920bbc3929f2
sha256sums = 80d2e28ee7a7d8f93501e32c96e9895e242409da1326761d36dbf28e5a0e3677
@@ -51,7 +51,7 @@ pkgbase = hylafaxplus
sha256sums = 528f267805203b792741423f46114fee7b48664f1aab35a0edff7d519555ccc2
sha256sums = e2b43c19705ce112dd3a08ecd0cae4c5558910366291524566cdd5890b2c6095
sha256sums = 96d106278ac68b95f0d1916f76066904c2108a2bb0c97651c22d025d989f4acb
- sha256sums = d1671cf26e10858c5e1debc4c1bbb4d0091b982ce7d01c867dc9781b4b3e84b4
+ sha256sums = 98e79e16e9cda5bb853501daaac7734cd5a367eb7543990f6a3c16fef49d0968
pkgname = hylafaxplus
diff --git a/1000-hylafaxplus-modem-support.patch b/1000-hylafaxplus-modem-support.patch
index 15029ef4c4b..9b1f888568c 100644
--- a/1000-hylafaxplus-modem-support.patch
+++ b/1000-hylafaxplus-modem-support.patch
@@ -1,6 +1,6 @@
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
++++ config/conexant-1.0 2019-04-25 00:05:01.600945703 -0400
@@ -7,13 +7,17 @@
# support "Class 1.0" which means that they have "adaptive receive"
# (AT+FAR=1), but not V.34.
@@ -19,6 +19,15 @@ diff -pNaru5 config.Arch/conexant-1.0 config/conexant-1.0
# CONFIG:CLASS1.0:.*:.*LEONARDO.*:.*: Manufacturer=Digicom Model=Leonardo
#
# BEGIN-SERVER
+@@ -36,5 +40,8 @@ ModemHardFlowCmd: AT&K3 # setup hardwar
+ ModemSoftFlowCmd: AT&K4 # setup software flow control
+ ModemSetupDTRCmd: AT&D2 # setup so DTR drop resets modem
+ ModemSetupDCDCmd: AT&C1 # setup so DCD reflects carrier (or not)
+ #
+ Class1AdaptRecvCmd: AT+FAR=1 # reports carrier detection mismatches
++#
++# ATDT wait for dial tone W produces busy signals on MT5600BA
++#ModemDialCmd: ATDT9,%s
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
@@ -81,3 +90,46 @@ diff -pNaru5 config.Arch/rc288dpi-1 config/rc288dpi-1
#
# BEGIN-SERVER
# END-SERVER
+diff -pNaru5 config.Arch/usr-rts config/usr-rts
+--- config.Arch/usr-rts 2015-07-26 20:46:06.000000000 -0400
++++ config/usr-rts 2019-04-24 23:18:18.003137846 -0400
+@@ -79,13 +79,18 @@ ModemSetupAACmd: AT+FCLASS=0 # leave mod
+ ModemAnswerCmd: AT+FCLASS=1 # force RTS/CTS after change
+ #
+ # Disables the reporting of bad frames by the modem. This
+ # overcomes a firmware problem in the x2 and V90 Sportsters.
+ # It is not necessary for the Courier modem.
++# It errors on the Sportster 5686G V.92.
+ #
+-Class2NRCmd: AT+FNR=1,1,1,0
++#Class2NRCmd: AT+FNR=1,1,1,0
+ #
++# Sportster 5686G (Agere CV92) doesn't respond correctly to AT+FTM=?
++#Class1TMQueryCmd: "!3,24,48,72,73,74,96,97,98,121,122,145,146"
++#Class1RMQueryCmd: "!3,24,48,72,73,74,96,97,98,121,122,145,146"
++#
+ # When using AT+FRS=n we see USR modems reset themselves in the middle of sessions
+ # this is not good. So, we seem to work-around that problem by not using the
+ # command. Unfortunately, this isn't an ideal thing.
+ #
+ Class1SwitchingCmd: "<delay\0727>"
+diff -pNaru5 config.Arch/zyxel-1496e-1 config/zyxel-1496e-1
+--- config.Arch/zyxel-1496e-1 2015-07-26 20:46:06.000000000 -0400
++++ config/zyxel-1496e-1 2019-04-24 23:28:05.746941599 -0400
+@@ -60,14 +60,14 @@ ModemSetupAACmd: AT+FAA=1 # enable in cu
+ # Additional reset commands:
+ #
+ # &B1 DTE-DCE rate is fixed at DTE setting
+ # &N0 Auto-negotiate highest possible DCE-DCE link rate
+ # &S0 DSR always on
+-# *F0 Deny remote configuration
++# *F0 Deny remote configuration (removed due to error on U90E)
+ # S38.3=1 DCD on/off sequence follows UNIX standard
+ #
+-ModemResetCmds: AT&B1&N0&S0*F0S38.3=1
++ModemResetCmds: AT&B1&N0&S0S38.3=1
+ #
+ # We normally append the "@" symbol to the dial string so that
+ # the modem will wait 5 seconds before attempting to connect
+ # and return result codes that distinguish between no carrier
+ # and no answer. This makes it possible to avoid problems with
diff --git a/PKGBUILD b/PKGBUILD
index ba97d0d76d6..566133a88c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -180,7 +180,7 @@ _opt_pagesize="Letter" # A4, Letter, Legal
set -u
pkgname='hylafaxplus'
_pkgnick='hylafax'
-pkgver='7.0.0'
+pkgver='7.0.1'
pkgrel='1'
_sendfaxvsicommit='18fabc74490362cd26690331d546d727c727db25'
pkgdesc='Enterprise Fax Server'
@@ -228,7 +228,7 @@ source=(
'0006-hylafaxplus-jobfmt-assigned-modem-to-used-modem.patch'
'1000-hylafaxplus-modem-support.patch'
)
-sha256sums=('9e69bef1afc2e9c943c6ee176b435305a5f6f8c743c9e9fb35a348c52a6ad8e7'
+sha256sums=('7f8b4cb081678ba5d11b336ba55fc203eb5a65752495555f77513ab7c1ac6f32'
'0aed186ab30fdb7cf36895a0ff50b03bd4a68db63cf4f19763995dabd9caffb0'
'466ab17cdaa1eb1f1f0b5bdc444a90df5835a1896b1363584264920bbc3929f2'
'80d2e28ee7a7d8f93501e32c96e9895e242409da1326761d36dbf28e5a0e3677'
@@ -239,7 +239,7 @@ sha256sums=('9e69bef1afc2e9c943c6ee176b435305a5f6f8c743c9e9fb35a348c52a6ad8e7'
'528f267805203b792741423f46114fee7b48664f1aab35a0edff7d519555ccc2'
'e2b43c19705ce112dd3a08ecd0cae4c5558910366291524566cdd5890b2c6095'
'96d106278ac68b95f0d1916f76066904c2108a2bb0c97651c22d025d989f4acb'
- 'd1671cf26e10858c5e1debc4c1bbb4d0091b982ce7d01c867dc9781b4b3e84b4')
+ '98e79e16e9cda5bb853501daaac7734cd5a367eb7543990f6a3c16fef49d0968')
# The HylaFAX binaries work very well. The scripts need major fixes!
# HylaFAX+ is pretty much completely broken for any Linux install,
@@ -381,6 +381,9 @@ prepare() {
printf '#\nInclude:\t\t"etc/config-modems"\n' >> "${_cfg}"
done
+ # pretend, that libtiff 4.1 is similar to 4.0
+ sed -e 's/4.0)/4.[01])/' -i 'configure'
+
set +u
echo 'Checking for fonts missing from fmfix.pl'
@@ -578,7 +581,7 @@ 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
+ install -Dm755 <(cat << EOF
#!/usr/bin/bash
set -u