From 9a745177509914ae0ee52a8a73080bd67920d59d Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Thu, 7 Apr 2016 15:36:27 +0200 Subject: [PATCH] asterisk-13.x: cleanup patches, add HEP support Signed-off-by: Jiri Slachta --- .../035-pjproject-non-gnu-mutex-type.patch | 6 ++---- .../patches/050-musl-glob-compat.patch | 8 ++++---- .../patches/051-musl-includes.patch | 20 ++++++++----------- .../patches/052-musl-libcap.patch | 10 ++++------ .../patches/053-musl-mutex-init.patch | 5 ++--- net/asterisk-13.x/Makefile | 6 +++++- .../patches/040-fix-config-options.patch | 4 ++-- .../patches/050-musl-glob-compat.patch | 8 ++++---- .../patches/051-musl-includes.patch | 20 ++++++++----------- .../patches/052-musl-libcap.patch | 10 ++++------ .../patches/053-musl-mutex-init.patch | 5 ++--- .../patches/050-fix-kamailio-utils.patch | 20 ++++++++----------- .../patches/120-libevent-libs.patch | 10 ++++------ 13 files changed, 57 insertions(+), 75 deletions(-) diff --git a/net/asterisk-11.x/patches/035-pjproject-non-gnu-mutex-type.patch b/net/asterisk-11.x/patches/035-pjproject-non-gnu-mutex-type.patch index 7a70858..5d74891 100644 --- a/net/asterisk-11.x/patches/035-pjproject-non-gnu-mutex-type.patch +++ b/net/asterisk-11.x/patches/035-pjproject-non-gnu-mutex-type.patch @@ -1,7 +1,5 @@ -Index: asterisk-11.18.0/res/pjproject/pjlib/src/pj/os_core_unix.c -=================================================================== ---- asterisk-11.18.0.orig/res/pjproject/pjlib/src/pj/os_core_unix.c -+++ asterisk-11.18.0/res/pjproject/pjlib/src/pj/os_core_unix.c +--- a/res/pjproject/pjlib/src/pj/os_core_unix.c ++++ b/res/pjproject/pjlib/src/pj/os_core_unix.c @@ -1091,7 +1091,7 @@ static pj_status_t init_mutex(pj_mutex_t return PJ_RETURN_OS_ERROR(rc); diff --git a/net/asterisk-11.x/patches/050-musl-glob-compat.patch b/net/asterisk-11.x/patches/050-musl-glob-compat.patch index 429babb..e7cc2b3 100644 --- a/net/asterisk-11.x/patches/050-musl-glob-compat.patch +++ b/net/asterisk-11.x/patches/050-musl-glob-compat.patch @@ -1,5 +1,5 @@ ---- asterisk-11.7.0.orig/res/ael/ael.flex -+++ asterisk-11.7.0/res/ael/ael.flex +--- a/res/ael/ael.flex ++++ b/res/ael/ael.flex @@ -79,6 +79,12 @@ #if !defined(GLOB_ABORTED) #define GLOB_ABORTED GLOB_ABEND @@ -14,8 +14,8 @@ #include "asterisk/logger.h" #include "asterisk/utils.h" Only in asterisk-11.7.0: res/ael/ael.tab.o ---- asterisk-11.7.0.orig/res/ael/ael_lex.c -+++ asterisk-11.7.0/res/ael/ael_lex.c +--- a/res/ael/ael_lex.c ++++ b/res/ael/ael_lex.c @@ -838,6 +838,12 @@ #if !defined(GLOB_ABORTED) #define GLOB_ABORTED GLOB_ABEND diff --git a/net/asterisk-11.x/patches/051-musl-includes.patch b/net/asterisk-11.x/patches/051-musl-includes.patch index a45f710..6bee31c 100644 --- a/net/asterisk-11.x/patches/051-musl-includes.patch +++ b/net/asterisk-11.x/patches/051-musl-includes.patch @@ -1,6 +1,5 @@ -diff -ru asterisk-13.0.0.orig/include/asterisk/compat.h asterisk-13.0.0/include/asterisk/compat.h ---- asterisk-13.0.0.orig/include/asterisk/compat.h 2014-10-31 08:48:56.000000000 -0200 -+++ asterisk-13.0.0/include/asterisk/compat.h 2014-10-31 08:49:10.163808393 -0200 +--- a/include/asterisk/compat.h ++++ b/include/asterisk/compat.h @@ -68,7 +68,7 @@ #endif @@ -10,9 +9,8 @@ diff -ru asterisk-13.0.0.orig/include/asterisk/compat.h asterisk-13.0.0/include/ #else #include "asterisk/poll-compat.h" #endif -diff -ru asterisk-13.0.0.orig/include/asterisk/poll-compat.h asterisk-13.0.0/include/asterisk/poll-compat.h ---- asterisk-13.0.0.orig/include/asterisk/poll-compat.h 2014-10-31 08:48:56.000000000 -0200 -+++ asterisk-13.0.0/include/asterisk/poll-compat.h 2014-10-31 08:49:10.163808393 -0200 +--- a/include/asterisk/poll-compat.h ++++ b/include/asterisk/poll-compat.h @@ -83,7 +83,7 @@ #ifndef AST_POLL_COMPAT @@ -22,9 +20,8 @@ diff -ru asterisk-13.0.0.orig/include/asterisk/poll-compat.h asterisk-13.0.0/inc #define ast_poll(a, b, c) poll(a, b, c) -diff -ru asterisk-13.0.0.orig/main/ast_expr2.c asterisk-13.0.0/main/ast_expr2.c ---- asterisk-13.0.0.orig/main/ast_expr2.c 2014-10-31 08:48:56.000000000 -0200 -+++ asterisk-13.0.0/main/ast_expr2.c 2014-10-31 08:49:10.163808393 -0200 +--- a/main/ast_expr2.c ++++ b/main/ast_expr2.c @@ -93,6 +93,7 @@ #include "asterisk.h" @@ -33,9 +30,8 @@ diff -ru asterisk-13.0.0.orig/main/ast_expr2.c asterisk-13.0.0/main/ast_expr2.c #include #include -diff -ru asterisk-13.0.0.orig/main/ast_expr2.y asterisk-13.0.0/main/ast_expr2.y ---- asterisk-13.0.0.orig/main/ast_expr2.y 2014-10-31 08:48:56.000000000 -0200 -+++ asterisk-13.0.0/main/ast_expr2.y 2014-10-31 08:49:10.163808393 -0200 +--- a/main/ast_expr2.y ++++ b/main/ast_expr2.y @@ -14,6 +14,7 @@ #include "asterisk.h" diff --git a/net/asterisk-11.x/patches/052-musl-libcap.patch b/net/asterisk-11.x/patches/052-musl-libcap.patch index 6bd37cc..460a8c4 100644 --- a/net/asterisk-11.x/patches/052-musl-libcap.patch +++ b/net/asterisk-11.x/patches/052-musl-libcap.patch @@ -1,6 +1,5 @@ -diff -rupN asterisk-11.22.0/configure.ac ast11/configure.ac ---- asterisk-11.22.0/configure.ac 2016-04-04 14:23:46.141373501 +0200 -+++ ast11/configure.ac 2016-04-04 14:22:35.168787508 +0200 +--- a/configure.ac ++++ b/configure.ac @@ -181,6 +181,9 @@ case "${host_os}" in linux-gnueabi* | linux-gnuspe) OSARCH=linux-gnu @@ -25,9 +24,8 @@ diff -rupN asterisk-11.22.0/configure.ac ast11/configure.ac AST_C_DEFINE_CHECK([DAHDI], [DAHDI_RESET_COUNTERS], [dahdi/user.h], [230]) AST_C_DEFINE_CHECK([DAHDI], [DAHDI_DEFAULT_MTU_MRU], [dahdi/user.h], [220]) -diff -rupN asterisk-11.22.0/main/Makefile ast11/main/Makefile ---- asterisk-11.22.0/main/Makefile 2016-03-29 21:25:17.000000000 +0200 -+++ ast11/main/Makefile 2016-04-04 14:22:35.164787476 +0200 +--- a/main/Makefile ++++ b/main/Makefile @@ -37,7 +37,7 @@ AST_LIBS+=$(SQLITE3_LIB) AST_LIBS+=$(ASTSSL_LIBS) AST_LIBS+=$(AST_CLANG_BLOCKS_LIBS) diff --git a/net/asterisk-11.x/patches/053-musl-mutex-init.patch b/net/asterisk-11.x/patches/053-musl-mutex-init.patch index ecb104f..3e0644d 100644 --- a/net/asterisk-11.x/patches/053-musl-mutex-init.patch +++ b/net/asterisk-11.x/patches/053-musl-mutex-init.patch @@ -1,6 +1,5 @@ -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 +--- a/include/asterisk/lock.h ++++ b/include/asterisk/lock.h @@ -65,7 +65,7 @@ #define AST_PTHREADT_NULL (pthread_t) -1 #define AST_PTHREADT_STOP (pthread_t) -2 diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index 3b931cd..fc6c12f 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk13 PKG_VERSION:=13.8.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ @@ -389,6 +389,9 @@ $(eval $(call BuildAsterisk13Module,res-agi,Asterisk Gateway Interface,Support f $(eval $(call BuildAsterisk13Module,res-calendar,Calendaring API,Calendaring support (ICal and Google Calendar),,calendar.conf,res_calendar,,)) $(eval $(call BuildAsterisk13Module,res-clioriginate,Calls via CLI,Originate calls via the CLI,,,res_clioriginate,,)) $(eval $(call BuildAsterisk13Module,res-fax,FAX modules,Generic FAX resource for FAX technology resource modules,+asterisk13-res-timing-pthread,udptl.conf res_fax.conf,res_fax,,)) +$(eval $(call BuildAsterisk13Module,res-hep,HEPv3 API,,,,res_hep,,)) +$(eval $(call BuildAsterisk13Module,res-hep-pjsip,PJSIP HEPv3 Logger,,+asterisk13-res-hep +asterisk13-pjsip,,res_hep,,)) +$(eval $(call BuildAsterisk13Module,res-hep-rtcp,RTCP HEPv3 Logger,,+asterisk13-res-hep,,res_hep,,)) $(eval $(call BuildAsterisk13Module,res-http-websocket,HTTP websocket support,,,,res_http_websocket,,)) $(eval $(call BuildAsterisk13Module,res-monitor,Provide Monitor,Cryptographic Signature capability,,,res_monitor,,)) $(eval $(call BuildAsterisk13Module,res-musiconhold,MOH,Music On Hold support,,musiconhold.conf,res_musiconhold,,)) @@ -404,3 +407,4 @@ $(eval $(call BuildAsterisk13Module,res-timing-dahdi,DAHDI Timing Interface,,+as $(eval $(call BuildAsterisk13Module,res-timing-pthread,pthread Timing Interface,,,,res_timing_pthread,,)) $(eval $(call BuildAsterisk13Module,res-timing-timerfd,Timerfd Timing Interface,,,,res_timing_timerfd,,)) $(eval $(call BuildAsterisk13Module,voicemail,Voicemail,voicemail related modules,+asterisk13-res-adsi +asterisk13-res-smdi,voicemail.conf,app_voicemail,vm-*,)) + diff --git a/net/asterisk-13.x/patches/040-fix-config-options.patch b/net/asterisk-13.x/patches/040-fix-config-options.patch index 092f0a5..e3ed33a 100644 --- a/net/asterisk-13.x/patches/040-fix-config-options.patch +++ b/net/asterisk-13.x/patches/040-fix-config-options.patch @@ -1,5 +1,5 @@ ---- asterisk-13.8.0/main/config_options.c 2016-03-29 21:39:33.000000000 +0200 -+++ ast1380/main/config_options.c 2016-04-04 13:07:25.331238309 +0200 +--- a/main/config_options.c ++++ b/main/config_options.c @@ -198,8 +198,8 @@ static int link_option_to_types(struct a #ifdef AST_DEVMODE opt->doc_unavailable = 1; diff --git a/net/asterisk-13.x/patches/050-musl-glob-compat.patch b/net/asterisk-13.x/patches/050-musl-glob-compat.patch index 429babb..e7cc2b3 100644 --- a/net/asterisk-13.x/patches/050-musl-glob-compat.patch +++ b/net/asterisk-13.x/patches/050-musl-glob-compat.patch @@ -1,5 +1,5 @@ ---- asterisk-11.7.0.orig/res/ael/ael.flex -+++ asterisk-11.7.0/res/ael/ael.flex +--- a/res/ael/ael.flex ++++ b/res/ael/ael.flex @@ -79,6 +79,12 @@ #if !defined(GLOB_ABORTED) #define GLOB_ABORTED GLOB_ABEND @@ -14,8 +14,8 @@ #include "asterisk/logger.h" #include "asterisk/utils.h" Only in asterisk-11.7.0: res/ael/ael.tab.o ---- asterisk-11.7.0.orig/res/ael/ael_lex.c -+++ asterisk-11.7.0/res/ael/ael_lex.c +--- a/res/ael/ael_lex.c ++++ b/res/ael/ael_lex.c @@ -838,6 +838,12 @@ #if !defined(GLOB_ABORTED) #define GLOB_ABORTED GLOB_ABEND diff --git a/net/asterisk-13.x/patches/051-musl-includes.patch b/net/asterisk-13.x/patches/051-musl-includes.patch index a45f710..6bee31c 100644 --- a/net/asterisk-13.x/patches/051-musl-includes.patch +++ b/net/asterisk-13.x/patches/051-musl-includes.patch @@ -1,6 +1,5 @@ -diff -ru asterisk-13.0.0.orig/include/asterisk/compat.h asterisk-13.0.0/include/asterisk/compat.h ---- asterisk-13.0.0.orig/include/asterisk/compat.h 2014-10-31 08:48:56.000000000 -0200 -+++ asterisk-13.0.0/include/asterisk/compat.h 2014-10-31 08:49:10.163808393 -0200 +--- a/include/asterisk/compat.h ++++ b/include/asterisk/compat.h @@ -68,7 +68,7 @@ #endif @@ -10,9 +9,8 @@ diff -ru asterisk-13.0.0.orig/include/asterisk/compat.h asterisk-13.0.0/include/ #else #include "asterisk/poll-compat.h" #endif -diff -ru asterisk-13.0.0.orig/include/asterisk/poll-compat.h asterisk-13.0.0/include/asterisk/poll-compat.h ---- asterisk-13.0.0.orig/include/asterisk/poll-compat.h 2014-10-31 08:48:56.000000000 -0200 -+++ asterisk-13.0.0/include/asterisk/poll-compat.h 2014-10-31 08:49:10.163808393 -0200 +--- a/include/asterisk/poll-compat.h ++++ b/include/asterisk/poll-compat.h @@ -83,7 +83,7 @@ #ifndef AST_POLL_COMPAT @@ -22,9 +20,8 @@ diff -ru asterisk-13.0.0.orig/include/asterisk/poll-compat.h asterisk-13.0.0/inc #define ast_poll(a, b, c) poll(a, b, c) -diff -ru asterisk-13.0.0.orig/main/ast_expr2.c asterisk-13.0.0/main/ast_expr2.c ---- asterisk-13.0.0.orig/main/ast_expr2.c 2014-10-31 08:48:56.000000000 -0200 -+++ asterisk-13.0.0/main/ast_expr2.c 2014-10-31 08:49:10.163808393 -0200 +--- a/main/ast_expr2.c ++++ b/main/ast_expr2.c @@ -93,6 +93,7 @@ #include "asterisk.h" @@ -33,9 +30,8 @@ diff -ru asterisk-13.0.0.orig/main/ast_expr2.c asterisk-13.0.0/main/ast_expr2.c #include #include -diff -ru asterisk-13.0.0.orig/main/ast_expr2.y asterisk-13.0.0/main/ast_expr2.y ---- asterisk-13.0.0.orig/main/ast_expr2.y 2014-10-31 08:48:56.000000000 -0200 -+++ asterisk-13.0.0/main/ast_expr2.y 2014-10-31 08:49:10.163808393 -0200 +--- a/main/ast_expr2.y ++++ b/main/ast_expr2.y @@ -14,6 +14,7 @@ #include "asterisk.h" diff --git a/net/asterisk-13.x/patches/052-musl-libcap.patch b/net/asterisk-13.x/patches/052-musl-libcap.patch index 2b824de..41981ca 100644 --- a/net/asterisk-13.x/patches/052-musl-libcap.patch +++ b/net/asterisk-13.x/patches/052-musl-libcap.patch @@ -1,6 +1,5 @@ -diff -rupN asterisk-13.8.0/configure.ac ast13/configure.ac ---- asterisk-13.8.0/configure.ac 2016-04-04 14:41:26.398129246 +0200 -+++ ast13/configure.ac 2016-04-04 14:40:48.421815607 +0200 +--- a/configure.ac ++++ b/configure.ac @@ -181,6 +181,9 @@ case "${host_os}" in linux-gnueabi* | linux-gnuspe) OSARCH=linux-gnu @@ -25,9 +24,8 @@ diff -rupN asterisk-13.8.0/configure.ac ast13/configure.ac AST_C_DEFINE_CHECK([DAHDI], [DAHDI_RESET_COUNTERS], [dahdi/user.h], [230]) AST_C_DEFINE_CHECK([DAHDI], [DAHDI_DEFAULT_MTU_MRU], [dahdi/user.h], [220]) -diff -rupN asterisk-13.8.0/main/Makefile ast13/main/Makefile ---- asterisk-13.8.0/main/Makefile 2016-03-29 21:39:33.000000000 +0200 -+++ ast13/main/Makefile 2016-04-04 14:40:48.421815607 +0200 +--- a/main/Makefile ++++ b/main/Makefile @@ -45,7 +45,7 @@ AST_LIBS+=$(UUID_LIB) AST_LIBS+=$(CRYPT_LIB) AST_LIBS+=$(AST_CLANG_BLOCKS_LIBS) diff --git a/net/asterisk-13.x/patches/053-musl-mutex-init.patch b/net/asterisk-13.x/patches/053-musl-mutex-init.patch index 4b720ee..68ab484 100644 --- a/net/asterisk-13.x/patches/053-musl-mutex-init.patch +++ b/net/asterisk-13.x/patches/053-musl-mutex-init.patch @@ -1,6 +1,5 @@ -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 +--- a/include/asterisk/lock.h ++++ b/include/asterisk/lock.h @@ -68,7 +68,7 @@ #define AST_PTHREADT_NULL (pthread_t) -1 #define AST_PTHREADT_STOP (pthread_t) -2 diff --git a/net/kamailio-4.x/patches/050-fix-kamailio-utils.patch b/net/kamailio-4.x/patches/050-fix-kamailio-utils.patch index dca7efb..2ea697a 100644 --- a/net/kamailio-4.x/patches/050-fix-kamailio-utils.patch +++ b/net/kamailio-4.x/patches/050-fix-kamailio-utils.patch @@ -1,15 +1,13 @@ -diff -rupN kamailio4-4.4.0/utils/kamctl/kamctl kam4/utils/kamctl/kamctl ---- kamailio4-4.4.0/utils/kamctl/kamctl 2016-03-30 15:56:42.000000000 +0200 -+++ kam4/utils/kamctl/kamctl 2016-04-07 14:41:45.108118138 +0200 +--- a/utils/kamctl/kamctl ++++ b/utils/kamctl/kamctl @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # control tool for maintaining Kamailio # -diff -rupN kamailio4-4.4.0/utils/kamctl/kamctlrc kam4/utils/kamctl/kamctlrc ---- kamailio4-4.4.0/utils/kamctl/kamctlrc 2016-03-30 15:56:42.000000000 +0200 -+++ kam4/utils/kamctl/kamctlrc 2016-04-07 14:42:20.348404015 +0200 +--- a/utils/kamctl/kamctlrc ++++ b/utils/kamctl/kamctlrc @@ -147,3 +147,6 @@ ## Extra start options - default is: not set # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64" @@ -17,18 +15,16 @@ diff -rupN kamailio4-4.4.0/utils/kamctl/kamctlrc kam4/utils/kamctl/kamctlrc + +# Disable colour printing in terminal +NOHLPRINT=1 -diff -rupN kamailio4-4.4.0/utils/kamctl/kamdbctl kam4/utils/kamctl/kamdbctl ---- kamailio4-4.4.0/utils/kamctl/kamdbctl 2016-03-30 15:56:42.000000000 +0200 -+++ kam4/utils/kamctl/kamdbctl 2016-04-07 14:42:36.204532677 +0200 +--- a/utils/kamctl/kamdbctl ++++ b/utils/kamctl/kamdbctl @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # control tool for maintaining Kamailio databases # -diff -rupN kamailio4-4.4.0/utils/kamctl/kamdbctl.base kam4/utils/kamctl/kamdbctl.base ---- kamailio4-4.4.0/utils/kamctl/kamdbctl.base 2016-03-30 15:56:42.000000000 +0200 -+++ kam4/utils/kamctl/kamdbctl.base 2016-04-07 14:43:18.180873383 +0200 +--- a/utils/kamctl/kamdbctl.base ++++ b/utils/kamctl/kamdbctl.base @@ -33,18 +33,18 @@ INSTALL_DBUID_TABLES=${INSTALL_DBUID_TAB # Used by dbtext and db_berkeley to define tables to be created, used by diff --git a/net/kamailio-4.x/patches/120-libevent-libs.patch b/net/kamailio-4.x/patches/120-libevent-libs.patch index a7a3944..eb78a68 100644 --- a/net/kamailio-4.x/patches/120-libevent-libs.patch +++ b/net/kamailio-4.x/patches/120-libevent-libs.patch @@ -1,6 +1,5 @@ -diff -rupN kamailio4-4.4.0/modules/cnxcc/Makefile kam4/modules/cnxcc/Makefile ---- kamailio4-4.4.0/modules/cnxcc/Makefile 2016-04-07 11:26:01.186927107 +0200 -+++ kam4/modules/cnxcc/Makefile 2016-04-07 11:25:28.370655776 +0200 +--- a/modules/cnxcc/Makefile ++++ b/modules/cnxcc/Makefile @@ -45,7 +45,7 @@ else endif @@ -10,9 +9,8 @@ diff -rupN kamailio4-4.4.0/modules/cnxcc/Makefile kam4/modules/cnxcc/Makefile DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib -diff -rupN kamailio4-4.4.0/modules/janssonrpc-c/netstring.h kam4/modules/janssonrpc-c/netstring.h ---- kamailio4-4.4.0/modules/janssonrpc-c/netstring.h 2016-04-07 11:26:24.163117016 +0200 -+++ kam4/modules/janssonrpc-c/netstring.h 2016-04-07 11:25:28.070653295 +0200 +--- a/modules/janssonrpc-c/netstring.h ++++ b/modules/janssonrpc-c/netstring.h @@ -24,6 +24,7 @@ #define __NETSTRING_STREAM_H -- 2.30.2