aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2019-06-07 09:14:33 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2019-06-07 09:14:33 +0000
commit1f7ae7dee3850f94894a1cb5b2e8d181cc5fad6d (patch)
tree44861a3a96c7bd0699413fa808de0f8afaab695d
parent2e2f3beda7bdf46f5e4b7c78245c9d8149dc283a (diff)
downloadaports-1f7ae7dee3850f94894a1cb5b2e8d181cc5fad6d.tar.gz
aports-1f7ae7dee3850f94894a1cb5b2e8d181cc5fad6d.tar.bz2
aports-1f7ae7dee3850f94894a1cb5b2e8d181cc5fad6d.tar.xz
main/hylafaxplus: backported common-functions-busybox-awk patch from edge
-rw-r--r--main/hylafaxplus/APKBUILD4
-rw-r--r--main/hylafaxplus/common-functions-busybox-awk.patch90
2 files changed, 44 insertions, 50 deletions
diff --git a/main/hylafaxplus/APKBUILD b/main/hylafaxplus/APKBUILD
index 30e114f339..68c638c01a 100644
--- a/main/hylafaxplus/APKBUILD
+++ b/main/hylafaxplus/APKBUILD
@@ -3,7 +3,7 @@
pkgname=hylafaxplus
_pkgname=hylafax
pkgver=7.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="Making the Premier Open-Source Fax Management System Even Better"
url="http://hylafax.sourceforge.net"
arch="all"
@@ -94,6 +94,6 @@ package(){
sha512sums="c63fdbff79c2ced29e03907c2e401c95a739e343414840a25b9582e3f4db880eaf4622295035e4728a9d1f224f97985007944397f28c9b29595aeec157bc2031 hylafax-7.0.0.tar.gz
54025c3ee3683476fa947f1e29cda7cc61027e2cbb0be1d400c7f715b4087a5c7693e0e3f8fdb1a8ecf56f48c03e4f0d82d12a2d6ae93707b13d08569510c917 hylafaxplus.initd
a2117eddc8f0ff70a23a90f2001dcb88c5bddee46ffa021d6d1701cc5cfc3bcb0362ead2b1b1ce2b288992728053c5947466d08916649f45e7dfb1876576e50f hylafaxplus.confd
-b57bdc8c2af622eaff72a880b23f0ff81101908d5781a13f4fcc19a876f73bc83afec94c389e903d783e6673d2923cfc193c6289baeded689bf4520244b733cc common-functions-busybox-awk.patch
+41ae2055a7781d83fc275aafe18ced0fe75ba79d3ad7d5096eabaeae3a514b564723185dd33820268577174f6c53bfcfddb30922ba50754b15c5c3b0abbec837 common-functions-busybox-awk.patch
4a1243daff9904e6395c3e28aa4a78a74de99f5aa9dbf5055a3781acfcd9b1b3db42b1569409b27e3ef9b0e55272dc99122436a79a08c9a1c140c2547c5a2c15 no-locale.patch
f5f1e33897a91b8297311c033d50e7ea2f9088568264a5b9224285066a504da8cc4296f973dd0a70e09abca538cef26964c6181f4f67f76400783d0697f05e61 utf8-dictionary.patch"
diff --git a/main/hylafaxplus/common-functions-busybox-awk.patch b/main/hylafaxplus/common-functions-busybox-awk.patch
index 6788928e19..b217b20b7f 100644
--- a/main/hylafaxplus/common-functions-busybox-awk.patch
+++ b/main/hylafaxplus/common-functions-busybox-awk.patch
@@ -1,48 +1,42 @@
-diff --git a/main/hylafaxplus/common-functions-busybox-awk.patch b/main/hylafaxplus/common-functions-busybox-awk.patch
-new file mode 100644
-index 0000000000..b217b20b7f
---- /dev/null
-+++ b/main/hylafaxplus/common-functions-busybox-awk.patch
-@@ -0,0 +1,42 @@
-+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
-+ }
-+@@ -146,12 +146,12 @@
-+ } p("faxstatus", status);
-+ next;
-+ }
-+- /^[!]*post/ { p("files_"++nfiles, $4); p("filetype_"nfiles, "PostScript"); next; }
-+- /^[!]*tiff/ { p("files_"++nfiles, $4); p("filetype_"nfiles, "TIFF"); next; }
-+- /^[!]*pdf/ { p("files_"++nfiles, $4); p("filetype_"nfiles, "PDF"); next; }
-+- /^[!]*pcl/ { p("files_"++nfiles, $4); p("filetype_"nfiles, "PCL"); next; }
-+- /^page:/ { p("pins_"++npins, $4); next; }
-+- /^data:/ { p("files_"++nfiles, $4); next; }
-++ /^[!]*post/ { ++nfiles; p("files_"nfiles, $4); p("filetype_"nfiles, "PostScript"); next; }
-++ /^[!]*tiff/ { ++nfiles; p("files_"nfiles, $4); p("filetype_"nfiles, "TIFF"); next; }
-++ /^[!]*pdf/ { ++nfiles; p("files_"nfiles, $4); p("filetype_"nfiles, "PDF"); next; }
-++ /^[!]*pcl/ { ++nfiles; p("files_"nfiles, $4); p("filetype_"nfiles, "PCL"); next; }
-++ /^page:/ { ++npins; p("pins_"npins, $4); next; }
-++ /^data:/ { ++nfiles; p("files_"nfiles, $4); next; }
-+ /^poll/ { p("poll", " -p"); next; }
-+ # Only parse remaining valid lines and allows for colons to appear in the value part
-+ /^[a-z]+:/ { str = $0; sub($1":", "", str); p($1, str); next; }
-+
+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
+ }
+@@ -146,12 +146,12 @@
+ } p("faxstatus", status);
+ next;
+ }
+- /^[!]*post/ { p("files_"++nfiles, $4); p("filetype_"nfiles, "PostScript"); next; }
+- /^[!]*tiff/ { p("files_"++nfiles, $4); p("filetype_"nfiles, "TIFF"); next; }
+- /^[!]*pdf/ { p("files_"++nfiles, $4); p("filetype_"nfiles, "PDF"); next; }
+- /^[!]*pcl/ { p("files_"++nfiles, $4); p("filetype_"nfiles, "PCL"); next; }
+- /^page:/ { p("pins_"++npins, $4); next; }
+- /^data:/ { p("files_"++nfiles, $4); next; }
++ /^[!]*post/ { ++nfiles; p("files_"nfiles, $4); p("filetype_"nfiles, "PostScript"); next; }
++ /^[!]*tiff/ { ++nfiles; p("files_"nfiles, $4); p("filetype_"nfiles, "TIFF"); next; }
++ /^[!]*pdf/ { ++nfiles; p("files_"nfiles, $4); p("filetype_"nfiles, "PDF"); next; }
++ /^[!]*pcl/ { ++nfiles; p("files_"nfiles, $4); p("filetype_"nfiles, "PCL"); next; }
++ /^page:/ { ++npins; p("pins_"npins, $4); next; }
++ /^data:/ { ++nfiles; p("files_"nfiles, $4); next; }
+ /^poll/ { p("poll", " -p"); next; }
+ # Only parse remaining valid lines and allows for colons to appear in the value part
+ /^[a-z]+:/ { str = $0; sub($1":", "", str); p($1, str); next; }
+