diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-08-04 16:03:15 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-08-04 16:03:15 +0300 |
| commit | 4291c7de2d59b026cf346e174bf14945cfc617b6 (patch) | |
| tree | 0edd8b8b02ddf5ee158263f6685de12e14ac2ad3 | |
| parent | 1a3fcd1cc8baf52c13053465260f220652cf4277 (diff) | |
| download | aports-4291c7de2d59b026cf346e174bf14945cfc617b6.tar.bz2 aports-4291c7de2d59b026cf346e174bf14945cfc617b6.tar.xz | |
main/asterisk: do not use mutex initializers
... the default type should not be assumed to be recursive as
it's not specified in any spec. And in musl it defaults to non-recursive
mutex.
| -rw-r--r-- | main/asterisk/APKBUILD | 6 | ||||
| -rw-r--r-- | main/asterisk/musl-mutex-init.patch | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index f4c421cc62..390591f471 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk pkgver=12.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="Asterisk: A Module Open Source PBX System" pkgusers="asterisk" pkggroups="asterisk" @@ -40,6 +40,7 @@ source="$_download/asterisk-$_xy.0.tar.gz musl-includes.patch musl-glob-compat.patch musl-outofmem-handling.patch + musl-mutex-init.patch ASTERISK-18995.patch ASTERISK-19109.patch ASTERISK-20527.patch @@ -247,6 +248,7 @@ md5sums="96af38f9d11a1ba794cd520cef842d9c asterisk-12.4.0.tar.gz b4211313aae31efa8c3c1931ba47dbf9 musl-includes.patch 9b3e6cb75464a6ef4c40d191bdfdf7ea musl-glob-compat.patch 10b84632764a6f05ec9973c31f5e82fb musl-outofmem-handling.patch +1ca5e8326dc03c963a7ce5455d0f21ba musl-mutex-init.patch bc6713f5434e07b79d3afdd155461d72 ASTERISK-18995.patch 8499917c1476953cdc2f5c94c0581775 ASTERISK-19109.patch 676ca42ee1859d8a7bae4345ede5eb89 ASTERISK-20527.patch @@ -259,6 +261,7 @@ c2ef786e9a8082fe8ba7b4eb2f130925cb823d100ec567909ad465c279e335bf 101-caps-uclib e3b7128813d0452b152d3af5015da927b07849e7f33de9f80f1d10f65907d268 musl-includes.patch c6a5c32646b767f09ebffccc49cac6a4ff9181498499e4453300775e75284b52 musl-glob-compat.patch 235b9c339793c02d1d80ac37d308cf14dc3e86fe8ccbe757e9855b186d9c164b musl-outofmem-handling.patch +a5205ed44b57a72934baf8cde543ddb179f277494181818905110bfdcccfe7d9 musl-mutex-init.patch 7a7140156ae7fc7e833035db1e428db8d90159579cd2678c4b5cc829ded47485 ASTERISK-18995.patch 8970797d4812a751968c0db83816fe2bc05c8b01dba7f64f21c197807528d234 ASTERISK-19109.patch 1f822e618554e9962fe4599975bdcc24413e087dbd7ea4ce0305ecb7ea9bef94 ASTERISK-20527.patch @@ -271,6 +274,7 @@ sha512sums="f1a58b42422efe7bca5bf39f400309d062b1f10c2918029e9b7db84dbffe38cef171 878b8cddc5af338a07658c388d42a7f9ddf3edcf302ca8b294adcf278b6ceacd463d279cb716b0b6b059f47eb287803bc15a7f36a403c66697f466ff3cd5a6e4 musl-includes.patch edf65eba44e8f1f0e78671aba312bcff2090134cf94e89ebb4b6beef7b2d57b24381ae9511cbf9fffe6b555e695a3dbe2cedcd04f1d237df822fa742bd5092ac musl-glob-compat.patch 7cbbad2c16d89b0b4ea45257a44c25ea96ca6ecb1f5bf7707656dfa3957cae34d1dca404b3d62baca8b55cea6f9fa39819bef48a1f4dad0124da95d6c80a294e musl-outofmem-handling.patch +f72c2e04de80d3ed9ce841308101383a1655e6da7a3c888ad31fffe63d1280993e08aefcf8e638316d439c68b38ee05362c87503fca1f36343976a01af9d6eb1 musl-mutex-init.patch 42b2385d88e72473fe34c63e1be8cdf7f37688649fe5bf033b5ba17627008b771aec8f0a583e9ad483a20f9e1f7c33922cb42bf5b73adc68aa43fd46c5da1daa ASTERISK-18995.patch 875dcd976b82b554157c5539df6fae0082b072c81d4db12827d1fc41c00e8dc0118b3bf7359f30e3b49051de27a85394ff30d08e62cde811a7c197b41f1f313a ASTERISK-19109.patch 6edd8e0a1dce326aadf659c8bf8ed34083e8247b6c0f032d097c77df25feb93107375ba505e9076c084fe80676336d6c863e04c3c6808a850e24257fd7a7702d ASTERISK-20527.patch diff --git a/main/asterisk/musl-mutex-init.patch b/main/asterisk/musl-mutex-init.patch new file mode 100644 index 0000000000..891d3fd10a --- /dev/null +++ b/main/asterisk/musl-mutex-init.patch @@ -0,0 +1,12 @@ +diff -ru asterisk-12.4.0.orig/include/asterisk/lock.h asterisk-12.4.0/include/asterisk/lock.h +--- asterisk-12.4.0.orig/include/asterisk/lock.h 2013-11-02 06:05:24.000000000 -0200 ++++ asterisk-12.4.0/include/asterisk/lock.h 2014-08-04 16:00:29.811967599 -0300 +@@ -66,7 +66,7 @@ + #define AST_PTHREADT_NULL (pthread_t) -1 + #define AST_PTHREADT_STOP (pthread_t) -2 + +-#if (defined(SOLARIS) || defined(BSD)) ++#if (defined(SOLARIS) || defined(BSD) || !defined(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)) + #define AST_MUTEX_INIT_W_CONSTRUCTORS + #endif /* SOLARIS || BSD */ + |