diff --git a/community/rtpengine/APKBUILD b/community/rtpengine/APKBUILD index 848b7b8bc35..09234472300 100644 --- a/community/rtpengine/APKBUILD +++ b/community/rtpengine/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena pkgname=rtpengine -pkgver=9.3.1.2 -pkgrel=7 +pkgver=10.5.4.3 +pkgrel=0 pkgdesc="Proxy for RTP traffic and other UDP based media traffic" url="https://github.com/sipwise/rtpengine" arch="all" @@ -32,11 +32,8 @@ pkgusers="rtpengine" pkggroups="rtpengine" source="$pkgname-$pkgver.tar.gz::https://github.com/sipwise/rtpengine/archive/mr$pkgver.tar.gz $pkgname.initd - $pkgname-iptables.1.8.8.patch::https://github.com/sipwise/rtpengine/commit/2a6d5cd2cbb58c1cab271a65a76decfdbc11dcd7.patch - disable-O3.patch fix-default-config.patch - fix-glib-build.patch " builddir="$srcdir"/$pkgname-mr$pkgver @@ -57,7 +54,7 @@ package() { install -Dm644 LICENSE "$pkgdir"/usr/share/doc/$pkgname/LICENSE install -Dm755 daemon/rtpengine "$pkgdir"/usr/bin/rtpengine - install -Dm644 etc/$pkgname.sample.conf "$pkgdir"/etc/rtpengine/rtpengine.conf + install -Dm644 etc/$pkgname.conf "$pkgdir"/etc/rtpengine/rtpengine.conf install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname ln -s rtpengine "$pkgdir"/etc/init.d/$pkgname-recording @@ -75,7 +72,7 @@ recording() { install -Dm755 "$builddir"/recording-daemon/rtpengine-recording \ "$subpkgdir"/usr/bin/rtpengine-recording - install -Dm644 "$builddir"/etc/rtpengine-recording.sample.conf \ + install -Dm644 "$builddir"/etc/rtpengine-recording.conf \ "$subpkgdir"/etc/$pkgname/rtpengine-recording.conf local dir @@ -85,10 +82,7 @@ recording() { } sha512sums=" -7a6a1662a927c59365952fb2aec6e9f7751590005efecf526b4e20120c41ce2f2afc530b7f688765027966fa47092c372d5196e81e4492bcd0892272fb2c665c rtpengine-9.3.1.2.tar.gz +5df6d231a87a3ad5ca2390dcb0f33968cacf9c212b26de6f8e8d2e94729865a75904352ecbfe62008c480a70aef9a07df3e659e8c147608c11aadb4b64a4fe46 rtpengine-10.5.4.3.tar.gz a696277b8ef477420db13e4628818b728f318a8ba52f727ce8b7969f5f0182f9389f3b931eb4542ce1fe1a6fbc4dcdc3d6959090de76b1981f434b3fafebc224 rtpengine.initd -62495159dd3d19e2ba954001becb32f336ec84bd3e37d242b61465caf503c4ad1276ffde7468a7c19df3583901df0c76b59c41169426e48bd264a9d415f90dcb rtpengine-iptables.1.8.8.patch -9e59d1e1507abc139c016d218e496919bc7053d143b3220753fe7a7b350bbf74facc2f43cbaf8f0b47984608a1fead7171270b0c06d2c866e5b21cf2a94da81d disable-O3.patch -a86f896955cb06252c81abaffd362f999a0a4f38dbafb34739015f787bbd966adba1e4e3232edf562a38415a4f69c4b21d62745cb7ef8e730d0259f098765685 fix-default-config.patch -5eed099d8748d7dad9076d371225fab97aba31cf0fa08424a18953b43ba6d2d574b8726232d33f8ead8a3f82e4487035745640bde6dc3c85d86555c7188d4ab9 fix-glib-build.patch +73a93ccc287982092691e97eb743600332d842ba7d87336dcee20604bb638b9b349333072249a616f01b47dded38452263769252eca7172f954591e6306fd9d6 fix-default-config.patch " diff --git a/community/rtpengine/disable-O3.patch b/community/rtpengine/disable-O3.patch deleted file mode 100644 index 9efbab9f600..00000000000 --- a/community/rtpengine/disable-O3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/lib.Makefile b/lib/lib.Makefile -index 0353516..b036f09 100644 ---- a/lib/lib.Makefile -+++ b/lib/lib.Makefile -@@ -47,8 +47,6 @@ endif - - ifeq ($(DBG),yes) - CFLAGS+= -D__DEBUG=1 --else --CFLAGS+= -O3 - endif - - diff --git a/community/rtpengine/fix-default-config.patch b/community/rtpengine/fix-default-config.patch index c07fb6ef220..9f3dd4efaac 100644 --- a/community/rtpengine/fix-default-config.patch +++ b/community/rtpengine/fix-default-config.patch @@ -1,7 +1,7 @@ -diff --git a/etc/rtpengine.sample.conf b/etc/rtpengine.sample.conf +diff --git a/etc/rtpengine.conf b/etc/rtpengine.conf index 1ec8898..1f2cd27 100644 ---- a/etc/rtpengine.sample.conf -+++ b/etc/rtpengine.sample.conf +--- a/etc/rtpengine.conf ++++ b/etc/rtpengine.conf @@ -6,7 +6,7 @@ table = 0 # table = -1 diff --git a/community/rtpengine/fix-glib-build.patch b/community/rtpengine/fix-glib-build.patch deleted file mode 100644 index 117ec5bf1b7..00000000000 --- a/community/rtpengine/fix-glib-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d90de55e83be25906fc7565a3e766ae8c4700fdc Mon Sep 17 00:00:00 2001 -From: Richard Fuchs -Date: Mon, 9 Aug 2021 14:53:16 -0400 -Subject: [PATCH] TT#14008 rename g_tree_remove_all to avoid namespace conflict - -closes #1327 - -Change-Id: I30e745a7d2a2b0fa8cef90ecb76881071c437695 ---- - daemon/ice.c | 8 ++++---- - include/aux.h | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/daemon/ice.c b/daemon/ice.c -index 0437cdccb..68e24cd1c 100644 ---- a/daemon/ice.c -+++ b/daemon/ice.c -@@ -908,10 +908,10 @@ static void __recalc_pair_prios(struct ice_agent *ag) { - - ilogs(ice, LOG_DEBUG, "Recalculating all ICE pair priorities"); - -- g_tree_remove_all(&nominated, ag->nominated_pairs); -- g_tree_remove_all(&succ, ag->succeeded_pairs); -- g_tree_remove_all(&valid, ag->valid_pairs); -- g_tree_remove_all(&all, ag->all_pairs); -+ g_tree_find_remove_all(&nominated, ag->nominated_pairs); -+ g_tree_find_remove_all(&succ, ag->succeeded_pairs); -+ g_tree_find_remove_all(&valid, ag->valid_pairs); -+ g_tree_find_remove_all(&all, ag->all_pairs); - - for (l = ag->candidate_pairs.head; l; l = l->next) { - pair = l->data; -diff --git a/include/aux.h b/include/aux.h -index e0cee6af7..4ee701eb4 100644 ---- a/include/aux.h -+++ b/include/aux.h -@@ -182,7 +182,7 @@ INLINE void g_tree_find_all(GQueue *out, GTree *t, GEqualFunc f, void *data) { - INLINE void g_tree_get_values(GQueue *out, GTree *t) { - g_tree_find_all(out, t, NULL, NULL); - } --INLINE void g_tree_remove_all(GQueue *out, GTree *t) { -+INLINE void g_tree_find_remove_all(GQueue *out, GTree *t) { - GList *l; - g_queue_init(out); - g_tree_find_all(out, t, NULL, NULL);