diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2019-03-04 16:20:30 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2019-03-04 16:20:30 +0000 |
| commit | 659ef779f87acd391076d5436e5450a3ea0b040a (patch) | |
| tree | 9596a112ae13bd6529318e47d3b813b0c1a29f65 /testing/hylafaxplus | |
| parent | 1558e940450d0f04dada624379f332e62dfa5e6e (diff) | |
| download | aports-659ef779f87acd391076d5436e5450a3ea0b040a.tar.bz2 aports-659ef779f87acd391076d5436e5450a3ea0b040a.tar.xz | |
testing/hylafaxplus: upgrade to 5.6.1. Fixes #898
Diffstat (limited to 'testing/hylafaxplus')
| -rw-r--r-- | testing/hylafaxplus/APKBUILD | 14 | ||||
| -rw-r--r-- | testing/hylafaxplus/common-functions-busybox-awk.patch | 22 | ||||
| -rw-r--r-- | testing/hylafaxplus/hylafaxplus.initd | 12 |
3 files changed, 35 insertions, 13 deletions
diff --git a/testing/hylafaxplus/APKBUILD b/testing/hylafaxplus/APKBUILD index b51ab0251b..c20befc380 100644 --- a/testing/hylafaxplus/APKBUILD +++ b/testing/hylafaxplus/APKBUILD @@ -1,9 +1,9 @@ -# Contributor: Cameron Banta <cbanta@gmail.com> -# Maintainer: Cameron Banta <cbanta@gmail.com> +# Contributor: Francesco Colista <fcolista@alpinelinux.org> +# Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=hylafaxplus _pkgname=hylafax -pkgver=5.5.9 -pkgrel=3 +pkgver=5.6.1 +pkgrel=0 pkgdesc="Making the Premier Open-Source Fax Management System Even Better" url="http://hylafax.sourceforge.net" arch="all" @@ -17,7 +17,7 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://downloads.sourceforge.net/hylafax/${_pkgname}-${pkgver}.tar.gz $pkgname.initd $pkgname.confd - musl-reg-startend.patch + common-functions-busybox-awk.patch " builddir="$srcdir"/$_pkgname-$pkgver @@ -90,7 +90,7 @@ package(){ } -sha512sums="67ac84df2619db7fb88cd7ad3af4beff9918b2481fc8edf7cc7574941161dd7aa6186cfc49c6cdb2a1f073f6cbf2f2a4ed084ca70ebe288bf7cd8e752cd56b2d hylafax-5.5.9.tar.gz +sha512sums="c86c33dc9e8feec4e265156fa3bbda18cf187feeef5c812ff3d3c7857de048a688bb979fcd3494ee8fe58a004a384a2a161d05245c86d0c304311d63f62a9eb1 hylafax-5.6.1.tar.gz 3862cefcd26092000e4489c097537e5e0e2ae1f7c2a7a16b1e933b3bb78d136b6d8a65fb712ae245dd8ca881900408d0d9788bd2e0b859a9569fc6f4ede8cc7c hylafaxplus.initd a2117eddc8f0ff70a23a90f2001dcb88c5bddee46ffa021d6d1701cc5cfc3bcb0362ead2b1b1ce2b288992728053c5947466d08916649f45e7dfb1876576e50f hylafaxplus.confd -be6e9f9d86340c63919aaf158c92d541904f2567b78ad2742a041f86333549b66715f108012de9a968b78bcdada8f94aa98320cda69724bf518ff3efbdf00f32 musl-reg-startend.patch" +6131e45b3b8b8ff22ba1d740bd5571b59c1347e6d80b00aa9b6404c7f38571b598002c4457b54ccd15320448c111ee900ff89a832d6c7df3c530b517c8621927 common-functions-busybox-awk.patch" diff --git a/testing/hylafaxplus/common-functions-busybox-awk.patch b/testing/hylafaxplus/common-functions-busybox-awk.patch new file mode 100644 index 0000000000..f3a101a3cf --- /dev/null +++ b/testing/hylafaxplus/common-functions-busybox-awk.patch @@ -0,0 +1,22 @@ +diff --git a/util/common-functions.sh.in b/util/common-functions.sh.in +index 38049e3..54cfd6b 100644 +--- a/util/common-functions.sh.in ++++ b/util/common-functions.sh.in +@@ -40,7 +40,7 @@ setInfoSize() + DICTTIMETORECV DICTSIGNALRATE DICTDATAFORMAT DICTERRCORRECT \ + DICTCALLID1 DICTCALLID2 DICTCALLID3 DICTCALLID4 DICTCALLID \ + DICTCALLID6 DICTCALLID7 DICTRECEIVEDON DICTCOMMID; do +- THISLEN="`eval echo \\\""$"$ITEM\\\" | $AWK 'BEGIN {L=0} length>L {L=length} END {print L}' | $SED 's/ //g'`" ++ THISLEN=`eval 'echo ${#'$ITEM'}'` + if [ $THISLEN -gt $INFOSIZE ]; then INFOSIZE=$THISLEN; fi + done + } +@@ -57,7 +57,7 @@ setItemSize() + DICTCALLS DICTPAGES DICTATTEMPTS DICTDIRNUM DICTRECEIVER DICTQUALITY \ + DICTPAGEWIDTH DICTPAGELENGTH DICTDATAFORMAT DICTREMOTEEQUIPMENT \ + DICTREMOTESTATION DICTSIGNALRATE; do +- THISLEN="`eval echo \\\""$"$ITEM\\\" | $AWK 'BEGIN {L=0} length>L {L=length} END {print L}' | $SED 's/ //g'`" ++ THISLEN=`eval 'echo ${#'$ITEM'}'` + if [ $THISLEN -gt $ITEMSIZE ]; then ITEMSIZE=$THISLEN; fi + done + } diff --git a/testing/hylafaxplus/hylafaxplus.initd b/testing/hylafaxplus/hylafaxplus.initd index d5c5df37f4..daece603e0 100644 --- a/testing/hylafaxplus/hylafaxplus.initd +++ b/testing/hylafaxplus/hylafaxplus.initd @@ -3,7 +3,7 @@ # Author Geaaru # Distributed under the terms of the GNU General Public License v2 -opts="zap" +extra_stopped_commands="zap" depend() { use lo @@ -26,22 +26,22 @@ checkconfig() { fi if [ ! -f $SPOOL/etc/setup.cache ] ; then - eerror "No $SPOOL/etc/setup.cache file founded. Use faxsetup command" + eerror "No $SPOOL/etc/setup.cache file found. Use faxsetup command" return 1 fi if [[ x$hfaxd == x || ! -f $hfaxd ]] ; then - eerror "No hfaxd daemon founded" + eerror "No hfaxd daemon found" return 1 fi if [[ x$faxq == x || ! -f $faxq ]] ; then - eerror "No faxq program founded" + eerror "No faxq program found" return 1 fi if [[ x$faxgetty == x || ! -f $faxgetty ]] ; then - eerror "No faxgetty program founded" + eerror "No faxgetty program found" return 1 fi @@ -83,7 +83,7 @@ checkconfig() { ;; any) if [[ x$faxport == x || x$snppport == x || x$oldprotoport == x ]] ; then - eerror "No port data founded for old services" + eerror "No port data found for old services" return 1 fi hfaxd_args="$hfaxd_args -i $faxport -s $snppport -o $oldprotoport" |