aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstef <l0ls0fo2i@ctrlc.hu>2014-08-06 00:03:58 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-08-06 09:39:01 +0000
commitf76185cfcaa939d21d4c9915aec5d2882fff2e20 (patch)
tree948e6ee2e5b2396506d2976879cf2b6e753bb075
parent6657a503a5104ab1f920546affb5a414cddeca75 (diff)
downloadaports-f76185cfcaa939d21d4c9915aec5d2882fff2e20.tar.bz2
aports-f76185cfcaa939d21d4c9915aec5d2882fff2e20.tar.xz
main/pcsc-lite: fix segfault because too small musl stack
-rw-r--r--main/pcsc-lite/APKBUILD6
-rw-r--r--main/pcsc-lite/musl-stacksize.patch17
2 files changed, 22 insertions, 1 deletions
diff --git a/main/pcsc-lite/APKBUILD b/main/pcsc-lite/APKBUILD
index aec600ed91..70335d8be9 100644
--- a/main/pcsc-lite/APKBUILD
+++ b/main/pcsc-lite/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=pcsc-lite
pkgver=1.8.11
-pkgrel=0
+pkgrel=1
pkgdesc="Middleware to access a smart card using SCard API (PC/SC)"
url="http://pcsclite.alioth.debian.org/pcsclite.html"
arch="all"
@@ -14,6 +14,7 @@ install="pcsc-lite.pre-install"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="https://alioth.debian.org/frs/download.php/file/3991/pcsc-lite-1.8.11.tar.bz2
pcscd.initd
+ musl-stacksize.patch
pcsc-lite-1.8.11-nopolkit.patch"
_builddir="$srcdir"/pcsc-lite-$pkgver
@@ -65,10 +66,13 @@ libs() {
md5sums="73502ca4ba6526727f9f49c63d805408 pcsc-lite-1.8.11.tar.bz2
6268a2247c0f3aa2998da1432e5a43d0 pcscd.initd
+e33fa0c01cf9abe8f15ff91b7e7675c7 musl-stacksize.patch
04d6b0bd35bc7b95319d483222675335 pcsc-lite-1.8.11-nopolkit.patch"
sha256sums="945041c94c53959ae5a767616a4ec5099fe67f549bfd344e8bd0cfe7a3c71ac6 pcsc-lite-1.8.11.tar.bz2
4668c7b42d51c1b5dd05671d538fdb443603ee900542afeb0a817e9fcf42ef94 pcscd.initd
+7b2c1c9d50b62b2ab7dc50d18948e1c9fa213cc3bd6f234db87c9bec307e5946 musl-stacksize.patch
f35db5c74576bb656130f0a0402cd67917a65fb63fb37b7fcddca5800e76ad9a pcsc-lite-1.8.11-nopolkit.patch"
sha512sums="22f65f27f5b5cab04f6067f820c2564c3b42fcb3a54764416aa8676c9e19ccae1f0414f4e90d7ef1b91e27535bdfa31d73f5af4a9d994957d4ab369b0aadc5bd pcsc-lite-1.8.11.tar.bz2
5b929ab607b3c897cb7d34e01af94f1481c3dc6c1c46f54ed04a35079c6f8fb082346263ba0efdd99e83f17bd6fd2726444d6ebca0f5f947d935b018448d86a5 pcscd.initd
+90337a526a9768664d861c7b30e2580d4e4af2e114dd5516c69a239e34562263a661a38d61fb83841cca606bfb1375f7da38a66c64733d7856d24800d6f1edde musl-stacksize.patch
54e91069a6a0a87c02d986cf9b51096f7aac2f559cfd0603c32439a9ff0604b33d1d799790312fa876d3331ce88be2a0457c5f64219c5b5276263a6f2675e97f pcsc-lite-1.8.11-nopolkit.patch"
diff --git a/main/pcsc-lite/musl-stacksize.patch b/main/pcsc-lite/musl-stacksize.patch
new file mode 100644
index 0000000000..e38c25ac1c
--- /dev/null
+++ b/main/pcsc-lite/musl-stacksize.patch
@@ -0,0 +1,17 @@
+diff -urw src/pcsc-lite-1.8.11/src/utils.c src.cur/src/utils.c
+--- src/pcsc-lite-1.8.11/src/utils.c 2014-02-14 16:15:44.000000000 +0000
++++ src.cur/src/utils.c 2014-08-05 23:46:09.240000000 +0000
+@@ -161,6 +161,13 @@
+ if (ret)
+ return ret;
+
++ ret = pthread_attr_setstacksize(&attr, 0x400000);
++ if (ret)
++ {
++ (void)pthread_attr_destroy(&attr);
++ return ret;
++ }
++
+ ret = pthread_attr_setdetachstate(&attr,
+ attributes & THREAD_ATTR_DETACHED ? PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE);
+ if (ret)