aboutsummaryrefslogtreecommitdiffstats
path: root/main/alpine
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-12-18 09:40:30 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-12-18 09:40:30 +0000
commitec56c6104f84980b4387dd935c47ca94cdd468c8 (patch)
tree48826f7d9ea2e8d206c82ecc48bdeedaa2520719 /main/alpine
parentbd92489c71902e3b41c595e7aa5a765454d298b0 (diff)
downloadaports-ec56c6104f84980b4387dd935c47ca94cdd468c8.tar.bz2
aports-ec56c6104f84980b4387dd935c47ca94cdd468c8.tar.xz
main/alpine: fix musl build
Diffstat (limited to 'main/alpine')
-rw-r--r--main/alpine/APKBUILD11
-rw-r--r--main/alpine/uclibc-musl.patch (renamed from main/alpine/uclibc.patch)4
2 files changed, 8 insertions, 7 deletions
diff --git a/main/alpine/APKBUILD b/main/alpine/APKBUILD
index 004fda68fd..0213ae5258 100644
--- a/main/alpine/APKBUILD
+++ b/main/alpine/APKBUILD
@@ -3,7 +3,7 @@ pkgname=alpine
pkgver=2.00_p84
_ver=${pkgver%_p*}
_pver=${pkgver##*_p}
-pkgrel=4
+pkgrel=5
pkgdesc="Text-based email client, friendly for novices but powerful"
url="http://www.washington.edu/alpine/"
arch="all"
@@ -17,12 +17,13 @@ source="ftp://ftp.cac.washington.edu/alpine/alpine.tar.bz2
CVE-2008-5514.patch
libcrypt-underlinking.patch
libcrypto-underlinking.patch
- uclibc.patch
+ uclibc-musl.patch
"
_builddir="$srcdir"/$pkgname-$_ver
prepare() {
cd "$_builddir"
+ update_config_sub || return 1
for i in $source; do
case $i in
*.patch)
@@ -60,16 +61,16 @@ md5sums="84e44cbf71ed674800a5d57eed9c1c52 alpine.tar.bz2
1b52a54a656979116c09fb1d948a4325 CVE-2008-5514.patch
c0afe83884124c8945db376e91863a83 libcrypt-underlinking.patch
1db0d3aad97a0e11c6910234a802264c libcrypto-underlinking.patch
-b31ed2bf31f80b10f19b4771645f3e75 uclibc.patch"
+f5c328cdc3ac57c66a64bf8ed0f98fc4 uclibc-musl.patch"
sha256sums="c85db8405af90375ba2440c85b7952d80996154e9916b83acca558dc82e0a2a6 alpine.tar.bz2
3e9441b74b54c829f9ac5cc15a82d311cad003632506247a961aa6b344b6603a all_p84.patch
07fd3dd2ffdfe9e2c952603b9aae099d1250bc89373de3e1a5009ec5d251346b CVE-2008-5514.patch
fcffe3ae3a44b03880ac2305c269237f3f50bfe68c70b95d73c099500fd0fcdd libcrypt-underlinking.patch
5af4fd05b91e0c34182b27f2faafc2c5df4ebffcad1042cc5c3cf2fce783ec07 libcrypto-underlinking.patch
-acf9ddd3b7850b166895373e8c332a35fcece5c1c98af75e24ee1e2033a86c89 uclibc.patch"
+72b9decde3a10af694a26fe843f316495e71cc41d047f8ca3dd1d78a6a53bfda uclibc-musl.patch"
sha512sums="17c6e65fbe767d4f9ffb3d3c2bb3deeab9d3620cd046cbb0009290aa484c9254effa992957631f0603bd82b82aeca2923d391aee6d20a7684d5830fbca8ce4d2 alpine.tar.bz2
c4cb716c9c39af6319ff0fc9839d049a7e30628d93b110f62a49b0bbeea87ede05b6d0945799d45b2a4793ef6efd330a3a3a58555bb44aef5b656964d0d8d5ae all_p84.patch
c5ed29171b13eb8edc1a8bde0a9923afcb4809bf17da96bc4c72ce501e016494523b0c184754027f9e5fcfec0f0405354e0ebafd6b8e30b9b4986b85e16e881a CVE-2008-5514.patch
426a51fc157c81ed2d3b70e478c38c1c8a2625ddaafce052a2d43d0979715fdd27d6d62095a80971287bb5e8a9c67d57b9fd224b37fc42ab716a28fceba928eb libcrypt-underlinking.patch
f00d2d32b92582c7c8d23393cff10e7a3e3c9e510c4cee3479b059c7641a69ca19948db8c57c422e768fdd6bda2f4e4f50d718579f77d5818a74e523026ef479 libcrypto-underlinking.patch
-f4e4b7e95629c0cc1b07d728bb41a34c76f7a04f1b53c9a4909b62811bb0f0f1717ca78d846f3a17de9376e98daac8245f3f6e42d9f2472da7b569274a3c26b2 uclibc.patch"
+e299995ff60dcaa3c11e07dd9e77c1580e03246a74cc0d75e4da0b46b7cc5742b74efa86cb4149afbca637b9f68deeebe94dddd8e49c692cc10bba4bd5f016b2 uclibc-musl.patch"
diff --git a/main/alpine/uclibc.patch b/main/alpine/uclibc-musl.patch
index f4c84fff54..ba5122f5bb 100644
--- a/main/alpine/uclibc.patch
+++ b/main/alpine/uclibc-musl.patch
@@ -5,7 +5,7 @@
dnl preload c-client default locations/options
case $host in
- *-linux-gnu)
-+ *-linux-gnu|*-linux-uclibc)
++ *-linux-gnu|*-linux-uclibc|*-linux-musl*)
if test -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/redhat_version ; then
alpine_SSLTYPE="nopwd"
if test -d /etc/pki/tls ; then
@@ -14,7 +14,7 @@
dnl adopts configure
case "$host" in
- *-linux-gnu*|*-k*bsd*-gnu*)
-+ *-linux-gnu*|*-k*bsd*-gnu*|*-linux-uclibc)
++ *-linux-gnu*|*-k*bsd*-gnu*|*-linux-uclibc|*-linux-musl*)
alpine_path_delim="/"
alpine_mode_readonly="(0600)"
if test -f /etc/fedora-release ; then