From 3f5f73b5e70312548b8f4ad36d1ecb609920378c Mon Sep 17 00:00:00 2001 From: Michael Iedema Date: Wed, 13 Jul 2016 04:47:29 -0700 Subject: [PATCH] Revert "update asterisk to 13.7.2, fix build for ubuntu 16.04" This reverts commit ee14dabe076789f3e72a1d167f43fde964b9ff95. --- build.sh | 15 ++++- debian/changelog | 4 +- debian/menuselect.makeopts | 100 +++------------------------------ fix_pjproject_dependency.patch | 10 ++++ 4 files changed, 35 insertions(+), 94 deletions(-) create mode 100644 fix_pjproject_dependency.patch diff --git a/build.sh b/build.sh index 42dc5ba..b0900b8 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=13.7.2 +VERSION=11.7.0 sayAndDo () { echo $@ @@ -12,6 +12,17 @@ sayAndDo () { fi } +installIfMissing () { + dpkg -s $@ > /dev/null + if [ $? -ne 0 ]; then + echo " - oops, missing $@, installing" + sudo apt-get install $@ + else + echo " - $@ ok" + fi + echo +} + if [ ! -f asterisk-$VERSION.tar.gz ] then sayAndDo wget http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$VERSION.tar.gz @@ -26,4 +37,6 @@ sayAndDo tar zxf asterisk-$VERSION.tar.gz sayAndDo mkdir asterisk-$VERSION/debian sayAndDo cp -R debian/* asterisk-$VERSION/debian/ sayAndDo cd asterisk-$VERSION +sayAndDo patch -p0 < ../fix_pjproject_dependency.patch sayAndDo dpkg-buildpackage -us -uc + diff --git a/debian/changelog b/debian/changelog index d200ae5..c97710b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -range-asterisk (13.7.2) unstable; urgency=low +range-asterisk (11.7.0.4) unstable; urgency=low * Test - -- Michael Iedema Thu, 26 May 2016 00:11:00 -0700 + -- Michael Iedema Thu, 30 May 2013 00:11:00 -0700 diff --git a/debian/menuselect.makeopts b/debian/menuselect.makeopts index 06b512a..38b2f0a 100644 --- a/debian/menuselect.makeopts +++ b/debian/menuselect.makeopts @@ -1,15 +1,15 @@ -MENUSELECT_ADDONS=chan_mobile chan_ooh323 format_mp3 res_config_mysql app_mysql cdr_mysql -MENUSELECT_APPS=app_flash app_skel app_dahdiras app_fax app_ivrdemo app_jack app_meetme app_osplookup app_saycounted app_setcallerid +MENUSELECT_ADDONS=chan_mobile chan_ooh323 format_mp3 res_config_mysql app_mysql app_saycountpl cdr_mysql +MENUSELECT_APPS=app_flash app_skel app_dahdiras app_fax app_ivrdemo app_jack app_meetme app_osplookup app_saycounted app_dahdibarge app_readfile app_setcallerid MENUSELECT_BRIDGES= MENUSELECT_CDR=cdr_pgsql cdr_radius cdr_tds cdr_sqlite MENUSELECT_CEL=cel_pgsql cel_radius cel_tds -MENUSELECT_CHANNELS=chan_dahdi chan_motif chan_pjsip chan_alsa chan_console chan_mgcp chan_misdn chan_nbs chan_oss chan_phone chan_skinny chan_unistim chan_vpb +MENUSELECT_CHANNELS=chan_dahdi chan_motif chan_alsa chan_console chan_mgcp chan_misdn chan_nbs chan_oss chan_phone chan_skinny chan_unistim chan_vpb chan_gtalk chan_h323 chan_jingle MENUSELECT_CODECS=codec_dahdi codec_speex MENUSELECT_FORMATS=format_ogg_vorbis -MENUSELECT_FUNCS=func_curl func_pjsip_aor func_pjsip_contact func_pjsip_endpoint func_speex +MENUSELECT_FUNCS=func_curl func_speex MENUSELECT_PBX=pbx_lua -MENUSELECT_RES=res_pjsip_log_forwarder res_pjsip_keepalive res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_curl res_curl res_format_attr_celt res_format_attr_h263 res_format_attr_h264 res_format_attr_silk res_http_post res_pjproject res_pjsip res_pjsip_acl res_pjsip_authenticator_digest res_pjsip_caller_id res_pjsip_config_wizard res_pjsip_dialog_info_body_generator res_pjsip_diversion res_pjsip_dlg_options res_pjsip_dtmf_info res_pjsip_endpoint_identifier_anonymous res_pjsip_endpoint_identifier_ip res_pjsip_endpoint_identifier_user res_pjsip_exten_state res_pjsip_header_funcs res_pjsip_logger res_pjsip_messaging res_pjsip_multihomed res_pjsip_mwi res_pjsip_mwi_body_generator res_pjsip_nat res_pjsip_notify res_pjsip_one_touch_record_info res_pjsip_outbound_authenticator_digest res_pjsip_outbound_publish res_pjsip_outbound_registration res_pjsip_path res_pjsip_pidf_body_generator res_pjsip_pidf_digium_body_supplement res_pjsip_pidf_eyebeam_body_supplement res_pjsip_publish_asterisk res_pjsip_pubsub res_pjsip_refer res_pjsip_registrar res_pjsip_registrar_expire res_pjsip_rfc3326 res_pjsip_sdp_rtp res_pjsip_send_to_voicemail res_pjsip_session res_pjsip_sips_contact res_pjsip_t38 res_pjsip_transport_management res_pjsip_transport_websocket res_pjsip_xpidf_body_generator res_stasis_test res_timing_dahdi res_xmpp res_config_ldap res_config_pgsql res_config_sqlite res_corosync res_fax_spandsp res_hep_pjsip res_pjsip_history res_pjsip_phoneprov_provider res_pktccops res_snmp res_timing_kqueue -MENUSELECT_TESTS=test_abstract_jb test_acl test_amihooks test_aoc test_app test_ari test_ari_model test_ast_format_str_reduce test_astobj2 test_astobj2_thrash test_bucket test_callerid test_cdr test_cel test_channel_feature_hooks test_config test_core_codec test_core_format test_db test_devicestate test_dlinklists test_endpoints test_event test_expr test_format_cache test_format_cap test_func_file test_gosub test_hashtab_thrash test_heap test_jitterbuf test_json test_linkedlists test_locale test_logger test_message test_named_lock test_netsock2 test_optional_api test_pbx test_poll test_res_stasis test_sched test_scoped_lock test_security_events test_skel test_sorcery test_sorcery_astdb test_sorcery_memory_cache_thrash test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints test_stringfields test_strings test_substitution test_taskprocessor test_threadpool test_time test_uri test_utils test_uuid test_vector test_voicemail_api test_websocket_client test_xml_escape +MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_curl res_config_sqlite res_curl res_format_attr_celt res_format_attr_h263 res_format_attr_h264 res_format_attr_silk res_http_post res_timing_dahdi res_xmpp res_config_ldap res_config_pgsql res_corosync res_fax_spandsp res_pktccops res_snmp res_timing_kqueue res_jabber +MENUSELECT_TESTS=test_abstract_jb test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_astobj2_thrash test_config test_db test_devicestate test_dlinklists test_event test_expr test_format_api test_func_file test_gosub test_hashtab_thrash test_heap test_jitterbuf test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils test_voicemail_api test_xml_escape MENUSELECT_CFLAGS=LOADABLE_MODULES MENUSELECT_OPTS_app_voicemail=FILE_STORAGE MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb @@ -18,7 +18,7 @@ MENUSELECT_EMBED= MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-OPSOUND-GSM MENUSELECT_EXTRA_SOUNDS= -MENUSELECT_BUILD_DEPS=bridge_holding app_cdr app_confbridge res_monitor res_speech res_agi res_stasis res_adsi res_smdi res_odbc res_crypto res_http_websocket app_chanspy func_cut func_groupcount func_uri res_ael_share res_ari res_ari_model res_stasis_recording res_stasis_playback res_stasis_answer res_stasis_snoop res_stasis_device_state res_stasis_mailbox func_periodic_hook res_mwi_external res_statsd res_hep DONT_OPTIMIZE G711_NEW_ALGORITHM +MENUSELECT_BUILD_DEPS=chan_local app_voicemail app_confbridge res_monitor res_agi res_adsi res_smdi res_odbc res_crypto res_http_websocket res_ael_share G711_NEW_ALGORITHM MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_flash MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_dahdiras MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack @@ -31,7 +31,6 @@ MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_radius MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_tds MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_dahdi MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_motif -MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_pjsip MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_alsa MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_console MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn @@ -40,9 +39,6 @@ MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_dahdi MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex MENUSELECT_DEPSFAILED=MENUSELECT_FORMATS=format_ogg_vorbis MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_curl -MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_pjsip_aor -MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_pjsip_contact -MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_pjsip_endpoint MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_speex MENUSELECT_DEPSFAILED=MENUSELECT_PBX=pbx_lua MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_caldav @@ -52,59 +48,12 @@ MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_icalendar MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_curl MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_curl MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_http_post -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjproject -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_acl -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_authenticator_digest -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_caller_id -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_config_wizard -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_dialog_info_body_generator -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_diversion -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_dlg_options -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_dtmf_info -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_endpoint_identifier_anonymous -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_endpoint_identifier_ip -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_endpoint_identifier_user -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_exten_state -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_header_funcs -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_logger -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_messaging -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_multihomed -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_mwi -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_mwi_body_generator -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_nat -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_notify -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_one_touch_record_info -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_outbound_authenticator_digest -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_outbound_publish -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_outbound_registration -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_path -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_pidf_body_generator -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_pidf_digium_body_supplement -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_pidf_eyebeam_body_supplement -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_publish_asterisk -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_pubsub -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_refer -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_registrar -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_registrar_expire -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_rfc3326 -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_sdp_rtp -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_send_to_voicemail -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_session -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_sips_contact -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_t38 -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_transport_management -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_transport_websocket -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_xpidf_body_generator -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_stasis_test MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_dahdi MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_xmpp MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_ldap MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql +MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_corosync MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_fax_spandsp -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_hep_pjsip -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_history -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_phoneprov_provider MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_kqueue MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_abstract_jb @@ -112,65 +61,34 @@ MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_acl MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_amihooks MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aoc MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_app -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ari -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ari_model MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ast_format_str_reduce MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2_thrash -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_bucket -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_callerid -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_cdr -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_cel -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_channel_feature_hooks MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_config -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_core_codec -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_core_format MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_db MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_devicestate MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dlinklists -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_endpoints MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_event MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_expr -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_cache -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_cap +MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_api MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_func_file MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_gosub MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_hashtab_thrash MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_heap MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_jitterbuf -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_json MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_linkedlists MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_locale MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_logger -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_message -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_named_lock MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_netsock2 -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_optional_api MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_pbx MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_poll -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_res_stasis MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sched -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_scoped_lock MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_security_events MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_skel -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sorcery -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sorcery_astdb -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sorcery_memory_cache_thrash -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sorcery_realtime -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stasis -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stasis_channels -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stasis_endpoints MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stringfields MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_strings MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_substitution -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_taskprocessor -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_threadpool MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_time -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_uri MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_uuid -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_vector MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_voicemail_api -MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_websocket_client MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_xml_escape -MENUSELECT_DEPSFAILED=MENUSELECT_CFLAGS=BUILD_NATIVE diff --git a/fix_pjproject_dependency.patch b/fix_pjproject_dependency.patch new file mode 100644 index 0000000..895a044 --- /dev/null +++ b/fix_pjproject_dependency.patch @@ -0,0 +1,10 @@ +--- res/res_rtp_asterisk.c.orig 2014-12-08 15:53:43.032358579 +0100 ++++ res/res_rtp_asterisk.c 2014-12-08 15:54:15.524358525 +0100 +@@ -47,6 +47,7 @@ + #include + #endif + ++#undef USE_PJPROJECT + #ifdef USE_PJPROJECT + /* Asterisk discourages the use of bzero in favor of memset, in fact if you try to use bzero it will tell you to use memset. As a result bzero has to be undefined + * here since it is used internally by pjlib. The only other option would be to modify pjlib... which won't happen. */