diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-25 07:32:14 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-25 12:09:22 +0000 |
| commit | 845a7f8a74a27a72ea38cd374c2d4ce30a5349f2 (patch) | |
| tree | 0b373737287ae23fcd0f1280da457f57a556d639 /main/freeswitch | |
| parent | ffb26010ba794a7d4a9d050cbf07c4590ce60788 (diff) | |
| download | aports-845a7f8a74a27a72ea38cd374c2d4ce30a5349f2.tar.bz2 aports-845a7f8a74a27a72ea38cd374c2d4ce30a5349f2.tar.xz | |
main/freeswitch: upgrade to 1.4.19
Diffstat (limited to 'main/freeswitch')
| -rw-r--r-- | main/freeswitch/0001-fix-joining-to-threads.patch | 40 | ||||
| -rw-r--r-- | main/freeswitch/APKBUILD | 14 |
2 files changed, 5 insertions, 49 deletions
diff --git a/main/freeswitch/0001-fix-joining-to-threads.patch b/main/freeswitch/0001-fix-joining-to-threads.patch deleted file mode 100644 index f223e30786..0000000000 --- a/main/freeswitch/0001-fix-joining-to-threads.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 914a9e09b56696311b9fce8acfa9380c74eb8e23 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Thu, 21 May 2015 12:53:38 +0300 -Subject: [PATCH] fix joining to threads - -do not detach threads that we later join to. joining to detached -thread invokes unspecified behaviour (usually crash). ---- - src/switch_log.c | 2 -- - src/switch_scheduler.c | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/src/switch_log.c b/src/switch_log.c -index 00ae7c0..c512b2d 100644 ---- a/src/switch_log.c -+++ b/src/switch_log.c -@@ -512,8 +512,6 @@ SWITCH_DECLARE(switch_status_t) switch_log_init(switch_memory_pool_t *pool, swit - LOG_POOL = pool; - - switch_threadattr_create(&thd_attr, LOG_POOL); -- switch_threadattr_detach_set(thd_attr, 1); -- - - switch_queue_create(&LOG_QUEUE, SWITCH_CORE_QUEUE_LEN, LOG_POOL); - #ifdef SWITCH_LOG_RECYCLE -diff --git a/src/switch_scheduler.c b/src/switch_scheduler.c -index e734bad..16fc59d 100644 ---- a/src/switch_scheduler.c -+++ b/src/switch_scheduler.c -@@ -335,7 +335,6 @@ SWITCH_DECLARE(void) switch_scheduler_task_thread_start(void) - switch_mutex_init(&globals.task_mutex, SWITCH_MUTEX_NESTED, globals.memory_pool); - switch_queue_create(&globals.event_queue, 250000, globals.memory_pool); - -- switch_threadattr_detach_set(thd_attr, 1); - switch_thread_create(&task_thread_p, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool); - } - --- -2.4.1 - diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD index efe17b5a53..ad123ece02 100644 --- a/main/freeswitch/APKBUILD +++ b/main/freeswitch/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Contributor: Cameron Banta <cbanta@gmail.com> pkgname=freeswitch -pkgver=1.4.18 -pkgrel=6 +pkgver=1.4.19 +pkgrel=0 pkgdesc="A communications platform written in C from the ground up" url="http://www.freeswitch.org" arch="all" @@ -62,7 +62,6 @@ _libsources=" source="http://files.freeswitch.org/$pkgname-$pkgver.tar.xz $_libsources - 0001-fix-joining-to-threads.patch getlib.patch modules.conf freeswitch.confd @@ -210,13 +209,12 @@ conf() { mkdir -p "$pkgdir"/etc/freeswitch/scripts } -md5sums="a6044a3fcefc8f76cc2bfcab3abc9d58 freeswitch-1.4.18.tar.xz +md5sums="6c0d11a132b7aba6229d28ba9dfeaea5 freeswitch-1.4.19.tar.xz 4653b3b9c568bb9c782178abfaac128d freeswitch-json-c-0.9.tar.gz 645db96ffc296cbb6d37f231cc1cc6b2 freeswitch-flite-2.0.0-release.tar.bz2 8e9866ad6b570c6c95c8cba48060473f freeswitch-lame-3.98.4.tar.gz e409b006b5dad6d8668c3e429bf20159 freeswitch-libshout-2.2.2.tar.gz 452fd875cb5e4d16f77c757371836fff freeswitch-mpg123-1.13.2.tar.gz -84f6e3509fa4762a6fbdfe68ae0c6ea5 0001-fix-joining-to-threads.patch 1e7f335ee00f589825ecc9affa779346 getlib.patch 0eb382f73ed393f28b8a797ebbfa608b modules.conf c608cca8ad773acebf201f581438c7e7 freeswitch.confd @@ -224,13 +222,12 @@ d823b7fd353c9a95467e736e4a226b74 freeswitch.initd 90b133b14a42c86d53d5e54dcbfbaf58 libshout-disable-examples.patch 4cd4923463c89bed053e6295b5a4ec40 freeswitch-mod_shout-textrels.patch 6a6c4aba80e99c236ef712b17f3cdd01 system-lame.patch" -sha256sums="54b3560d3c9b228a329677099beba40345af7592d19922212ee1a6c599ecbe4b freeswitch-1.4.18.tar.xz +sha256sums="cc5f9f23d181889cf714b6747e12d322e6ed4adb35b7ae6b6a6dd99b6d8b6fe0 freeswitch-1.4.19.tar.xz 816fb2d4baab09e2f51a7c1be75bc9e03ed09d4cf3c2cd03c183f433bb9b565f freeswitch-json-c-0.9.tar.gz 678c3860fd539402b5d1699b921239072af6acb4e72dc4720494112807cae411 freeswitch-flite-2.0.0-release.tar.bz2 ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8 freeswitch-lame-3.98.4.tar.gz 38701125cb0e0349f4394dd3254d6037eeb8af0747c0942ff433ffbcd48d2367 freeswitch-libshout-2.2.2.tar.gz b3a855acc96e0061a0c2b1162e8aff80b6b1a03849e3756786db2fcacfc9a9bd freeswitch-mpg123-1.13.2.tar.gz -749ddd2d3c7f68c0e84b4ea59fb46e0b1426668ad5b7ddc9a0ecc1264b466213 0001-fix-joining-to-threads.patch ab437c92149b6fc88bc2fc8a228d6a5f8af574e2c90469a6dc4c753d13972c34 getlib.patch f83f9680d243eb254bf045571f971a6c5cf716367444cd48ed26d4c3367f4c41 modules.conf 846a29a361ef6eecd77876963b5c0133699c40fa8b34c68df42d5f8a1a1915b1 freeswitch.confd @@ -238,13 +235,12 @@ f83f9680d243eb254bf045571f971a6c5cf716367444cd48ed26d4c3367f4c41 modules.conf db0d3c252b5664ecb071bcf6868eff77c85dd7943a63fcfcac7e19db6a0ff61f libshout-disable-examples.patch be1009327de615f04956ba0b0f44183f31c263e380af8027f94b976a84bcb09a freeswitch-mod_shout-textrels.patch 11b107ca8632bb9c8fcb2aedfcfb421af24929aace4f56c34d4e701eb410e190 system-lame.patch" -sha512sums="9de4d86c9adfde9f30e84ab6900ec115c2441126904c7f4f705767bced25ec166fb386cd2fde7f9a1eeadfea61aede0f02f9e0fcb508c92974c75b887633b5a4 freeswitch-1.4.18.tar.xz +sha512sums="144bd408e94bd04d325dc4a933927bde792d1bc89804b0cd471526197aa3186d52867c4e266f637026b9d27326eafcb288f9ed1ccaa8907157935f5a1e765372 freeswitch-1.4.19.tar.xz 38b8729275bbfebaee783e703d19481f3d32b50cfdeb338644b8db2742573ea025702c789b5ce8d5067dcde23c5a16b46231eaadf0b9c5dbff392d410912c772 freeswitch-json-c-0.9.tar.gz e2b353721d0316fbd7948f90f9c9561d080eebd50e8dd0449a9c803ffbdb060a469385fadd63f535ade8d627cba37928d8e72ac61d5bcf98f73ca5ebb66549f8 freeswitch-flite-2.0.0-release.tar.bz2 cf6cff914c06c2d65470c577eed2bfa226e9017cdfd26aa3e95c3b3b76c40568151ca223327859d6dacb982c80c06b672ba4e9f32ce1e452363c95126edb301b freeswitch-lame-3.98.4.tar.gz d517d1d6a79dfd4819c42603faafc051c69270831f4894c01f6bd38e877eb008f8458534857641fd8d653fd437fb41ee1c558ff2a76339c3a8a579f4d5a26baf freeswitch-libshout-2.2.2.tar.gz 1940b6bf1c7167a7718ac0972e9c8cf9a49cf8c7a4a062052d00ead282cf4ae63214bfc317f2ccb424f6f3f26c602e91300d45635ba2d4f8da992c94b3ed0885 freeswitch-mpg123-1.13.2.tar.gz -3582c2a603a9ca81f02334c37fa052cd99dbdffc8cc29016503aacff412d5429110991552be82c1739e398d094ad966090f5902ab8db4251b4d0f92f03bc43ca 0001-fix-joining-to-threads.patch 4ceb48f64d2bc26a02cc0846276506241bfd30c156422b0a1d608fd172c099feb5c121a763652e9a45046dcdd0ba0eb71eab240e0c6ce2ad63ff781719e135a4 getlib.patch 6330e47cd3dcfdb4f5c99e91c9c725c7c8aa4f1691d83817d7600e510b5a586f3312bab84df3766448bbdab78cd1feebecf64b8280626b3f751f6e787f145e23 modules.conf a585f6411185a26206137a1ad97a06fd6c73e80c5439e9be45eabfa70e7a83120169ba882971fcd328436c8e0242cbd664170b80754ea2846021689baf1f1595 freeswitch.confd |