aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-08-19 13:42:02 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2015-08-19 13:42:02 +0200
commitc9b7f1861a3e3983a2657fce6067c916c083df73 (patch)
treee382263e1ed0782625923b81c9208a5d2f7f3e7b
parentb94db4bce54e4ffdcb45ddc77a0f01a4124f79b7 (diff)
downloadaports-c9b7f1861a3e3983a2657fce6067c916c083df73.tar.bz2
aports-c9b7f1861a3e3983a2657fce6067c916c083df73.tar.xz
main/freeswitch: fix threading priority inheirtance
The previously posted patch has a bug that makes it not set the inherited priority properly.
-rw-r--r--main/freeswitch/APKBUILD8
-rw-r--r--main/freeswitch/fix-pthread-sched.patch4
2 files changed, 6 insertions, 6 deletions
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 9359006423..c1a793f9ad 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Cameron Banta <cbanta@gmail.com>
pkgname=freeswitch
pkgver=1.4.20
-pkgrel=0
+pkgrel=1
pkgdesc="A communications platform written in C from the ground up"
url="http://www.freeswitch.org"
arch="all"
@@ -223,7 +223,7 @@ d823b7fd353c9a95467e736e4a226b74 freeswitch.initd
90b133b14a42c86d53d5e54dcbfbaf58 libshout-disable-examples.patch
4cd4923463c89bed053e6295b5a4ec40 freeswitch-mod_shout-textrels.patch
6a6c4aba80e99c236ef712b17f3cdd01 system-lame.patch
-077b00789cf6b108283819cc105faa00 fix-pthread-sched.patch"
+9d55ced54a2c323c3e876db824ae2ba8 fix-pthread-sched.patch"
sha256sums="46bb7e7f83dd616f268085c7e36fd45b48c3f02821dbea110211f0e10da16b09 freeswitch-1.4.20.tar.xz
816fb2d4baab09e2f51a7c1be75bc9e03ed09d4cf3c2cd03c183f433bb9b565f freeswitch-json-c-0.9.tar.gz
678c3860fd539402b5d1699b921239072af6acb4e72dc4720494112807cae411 freeswitch-flite-2.0.0-release.tar.bz2
@@ -237,7 +237,7 @@ f83f9680d243eb254bf045571f971a6c5cf716367444cd48ed26d4c3367f4c41 modules.conf
db0d3c252b5664ecb071bcf6868eff77c85dd7943a63fcfcac7e19db6a0ff61f libshout-disable-examples.patch
be1009327de615f04956ba0b0f44183f31c263e380af8027f94b976a84bcb09a freeswitch-mod_shout-textrels.patch
11b107ca8632bb9c8fcb2aedfcfb421af24929aace4f56c34d4e701eb410e190 system-lame.patch
-84e0150f217bc10d0a66d532cc4726ab74928bf10e68e7cad0dc419cf998ffa9 fix-pthread-sched.patch"
+85f53fc313b9b72e7f7d2afb8720577d8ce4415b56a997d0bbab98986d04d452 fix-pthread-sched.patch"
sha512sums="f7f3209ed5c6de4b0c92edd772d12f7a62342289db142d05f7559b0053f9e4e17d65f1d7680abdbda1743a4b30764bc13941c24edb9541265d2c08f99cbe0a64 freeswitch-1.4.20.tar.xz
38b8729275bbfebaee783e703d19481f3d32b50cfdeb338644b8db2742573ea025702c789b5ce8d5067dcde23c5a16b46231eaadf0b9c5dbff392d410912c772 freeswitch-json-c-0.9.tar.gz
e2b353721d0316fbd7948f90f9c9561d080eebd50e8dd0449a9c803ffbdb060a469385fadd63f535ade8d627cba37928d8e72ac61d5bcf98f73ca5ebb66549f8 freeswitch-flite-2.0.0-release.tar.bz2
@@ -251,4 +251,4 @@ d823ce7924f281b5808ffec0cd99569cd161b0749eca77dd076ea0dc86502e4d767c2fd2ff0d0c9c
91a6d7c8456de65855930b371f568f0230c28422e667453aa48fababd185b47677c06ff0c79f94c2a02182439b012d48cb54548cbde3d12b8d0e1ffbb9b229cc libshout-disable-examples.patch
5f085254ca9f5dc196afd39fc55e083b1998e776d9de2428e5657d99077526c33c1fc13f12432598184ce63138447fed7c318c384b743681703f5682dc8e1e50 freeswitch-mod_shout-textrels.patch
398dd0f2665415ff40348dc94d26ec7008fb59ec033f9d2c64dc1aa01071021f83f47954e95efc58c4033f22bb6da159e83e3b0d36b99189d5e7535ed6ae70bd system-lame.patch
-c2b42c3504e62ce57e2781c5128fe82d9fb73f8202d561d7a2e6bfaa86ea2d53c4bdfce1b8ff34939729ee30a736e5e751e926bf4a56ebbd0c81e2d82debf90d fix-pthread-sched.patch"
+92a5c48874bf99e458939cb870165cd9983813f7742dfe60007d75f6d5f899d80f4d94f654fb8fd1039b67677702c3a972aaa64623d3c0fa5030248a8db0091e fix-pthread-sched.patch"
diff --git a/main/freeswitch/fix-pthread-sched.patch b/main/freeswitch/fix-pthread-sched.patch
index 8cb6d28715..ed12d1b526 100644
--- a/main/freeswitch/fix-pthread-sched.patch
+++ b/main/freeswitch/fix-pthread-sched.patch
@@ -1,4 +1,4 @@
-Set sched param via pthread_attr_* before thread is created.
+Set sched priority via pthread_attr_* before thread is created.
This fixes segfault when trying to modify scheduling priority if thread
exits before pthread_setschedparam() is called.
@@ -28,7 +28,7 @@ index 8859e79..a34e29f 100644
+ if (pthread_attr_getschedparam(&attr->attr, &param) == 0) {
+ param.sched_priority = attr->priority;
+ pthread_attr_setschedparam(&attr->attr, &param);
-+ pthread_attr_setinheritsched(&param, PTHREAD_EXPLICIT_SCHED);
++ pthread_attr_setinheritsched(&attr->attr, PTHREAD_EXPLICIT_SCHED);
+ }
+ }