aboutsummaryrefslogtreecommitdiffstats
path: root/main/hylafax
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2018-10-09 06:32:37 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2018-10-09 06:33:34 +0000
commit3be855a9170213861cb95bc2b884957869ff66d5 (patch)
treecf7e00a338f3b41152c022c81fc91cb869e527a4 /main/hylafax
parentd4ebd7cc66c32690a483cb6e2b1d825429a4920c (diff)
downloadaports-3be855a9170213861cb95bc2b884957869ff66d5.tar.bz2
aports-3be855a9170213861cb95bc2b884957869ff66d5.tar.xz
main/hylafax: fix build with gcc8
Diffstat (limited to 'main/hylafax')
-rw-r--r--main/hylafax/APKBUILD6
-rw-r--r--main/hylafax/gcc8.patch13
2 files changed, 17 insertions, 2 deletions
diff --git a/main/hylafax/APKBUILD b/main/hylafax/APKBUILD
index 4dc9b1c80c..15ec5efbce 100644
--- a/main/hylafax/APKBUILD
+++ b/main/hylafax/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=hylafax
pkgver=6.0.6
-pkgrel=5
+pkgrel=6
pkgdesc="Sends and receives faxes"
url="http://www.hylafax.org/"
arch="all"
@@ -17,6 +17,7 @@ source="ftp://ftp.hylafax.org/source/$pkgname-$pkgver.tar.gz
$pkgname.confd
hylafax-charset.patch
CVE-2018-17141.patch
+ gcc8.patch
"
builddir="$srcdir"/$pkgname-$pkgver
@@ -100,4 +101,5 @@ sha512sums="be7e0533a24391c87deac6af35e01c81a79c99977c7f7a931e336d7c737b388d2a7c
3862cefcd26092000e4489c097537e5e0e2ae1f7c2a7a16b1e933b3bb78d136b6d8a65fb712ae245dd8ca881900408d0d9788bd2e0b859a9569fc6f4ede8cc7c hylafax.initd
3c07726cc9d7351dceb80a46354c6626e54b033b0f434c1db01db2a3b3ab5e9084d551dd23cae3ab40806f27aa5fa0a5b70c43a6b7802356871c0b343baa2376 hylafax.confd
f97c805a62dfcb57f85f614b6eb28bd6b58e0582ce4f9aa5166337a46d453ea038a098223d879d120f51454008a5e8ed2fa60ba6e8be12af7b7d5a4927c51471 hylafax-charset.patch
-062628b296c32692c7853c1c2395e27e1d9d7ff2136d486c4ba69b7ff3aedaef60ac50ac0a2a2581373a163109ba84c1b73f96cdd154d224b96b21d50e74f25c CVE-2018-17141.patch"
+062628b296c32692c7853c1c2395e27e1d9d7ff2136d486c4ba69b7ff3aedaef60ac50ac0a2a2581373a163109ba84c1b73f96cdd154d224b96b21d50e74f25c CVE-2018-17141.patch
+49b20d4570c8170e1fdb9b354799fced3afec67c43423625286260c4c563ee1ab3b501c5491ab195ac228bc44e726b732bb5ba65f705b95fa0630c4809856222 gcc8.patch"
diff --git a/main/hylafax/gcc8.patch b/main/hylafax/gcc8.patch
new file mode 100644
index 0000000000..5f49d9f8e5
--- /dev/null
+++ b/main/hylafax/gcc8.patch
@@ -0,0 +1,13 @@
+From http://bugs.hylafax.org/show_bug.cgi?id=971
+
+--- a/libhylafax/FaxRecvInfo.c++
++++ b/libhylafax/FaxRecvInfo.c++
+@@ -112,7 +112,7 @@
+ if (cp == NULL || cp[1] != ',' || cp[2] != '"')
+ return (false);
+ u_int i = 0;
+- while (cp+2 != '\0') {
++ while (*(cp+2) != '\0') {
+ callid[i] = cp+3; // +1 for "/+1 for ,/+1 for "
+ if (*cp == '\"') break;
+ callid[i].resize(callid[i].next(0,'"'));