#15 BZ#1977579 Fix build
Merged 2 years ago by jsmith. Opened 2 years ago by mspacek.
rpms/ mspacek/asterisk rawhide  into  rawhide

@@ -102,12 +102,12 @@ 

  ===================================================================

  --- asterisk-16.1.0.orig/contrib/scripts/ast_coredumper

  +++ asterisk-16.1.0/contrib/scripts/ast_coredumper

- @@ -251,7 +251,7 @@ EOF

-  # For *BSD, the preferred gdb may be in /usr/local/bin so we

-  # need to search for one that supports python.

-  for g in $(which -a gdb) ; do

- -	result=$($g --batch --ex "python print('hello')" 2>/dev/null || : )

- +	result=$($g --batch --ex "python2 print('hello')" 2>/dev/null || : )

-  	if [[ "$result" =~ ^hello$ ]] ; then

-  		GDB=$g

-  		break

+ @@ -371,7 +371,7 @@

+  		EOF

+  	fi

+  

+ -	result=$($GDB --batch --ex "python print('hello')" 2>/dev/null || : )

+ +	result=$($GDB --batch --ex "python2 print('hello')" 2>/dev/null || : )

+  	if [[ ! "$result" =~ ^hello$ ]] ; then

+  		die -2 <<-EOF

+  		$GDB does not support python.

@@ -0,0 +1,14 @@ 

+ --- asterisk-18.12.1.orig/codecs/codec_ilbc.c	2022-06-15 15:43:53.010639561 +0200

+ +++ asterisk-18.12.1/codecs/codec_ilbc.c	2022-06-15 15:43:40.388576072 +0200

+ @@ -45,6 +45,11 @@

+  typedef uint16_t ilbc_bytes;

+  typedef int16_t  ilbc_block;

+  #define BUF_TYPE i16

+ +/* In the ilbc library were removed RFC 3951 compatibility macros */

+ +#define initDecode WebRtcIlbcfix_InitDecode

+ +#define initEncode WebRtcIlbcfix_InitEncode

+ +#define iLBC_decode WebRtcIlbcfix_DecodeImpl

+ +#define iLBC_encode WebRtcIlbcfix_EncodeImpl

+  #else

+  #include "ilbc/iLBC_encode.h"

+  #include "ilbc/iLBC_decode.h"

@@ -0,0 +1,10 @@ 

+ --- a/channels/console_board.c	2022-04-07 16:00:48.018413156 +0200

+ +++ b/channels/console_board.c	2022-04-07 16:00:38.836359567 +0200

+ @@ -41,6 +41,7 @@

+  	<support_level>extended</support_level>

+   ***/

+  

+ +#define ASTMM_LIBC ASTMM_IGNORE

+  #include "asterisk.h"	/* ast_strdupa */

+  #include "asterisk/utils.h"	/* ast_strdupa */

+  #include "console_video.h"	/* ast_strdupa */

file modified
+54 -4
@@ -1,8 +1,8 @@ 

  #%%global _rc 1

  #%%global _beta 3

  

- %global           pjsip_version   2.10

- %global           jansson_version 2.12

+ %global           pjsip_version   2.12

+ %global           jansson_version 2.14

  

  %global           optflags        %{optflags} -Werror-implicit-function-declaration -DLUA_COMPAT_MODULE -fPIC

  %ifarch s390 %{arm} aarch64 %{mips}
@@ -50,8 +50,8 @@ 

  

  Summary:          The Open Source PBX

  Name:             asterisk

- Version:          18.4.0

- Release:          %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}.5

+ Version:          18.12.1

+ Release:          %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}

  License:          GPLv2

  URL:              http://www.asterisk.org/

  
@@ -90,6 +90,11 @@ 

  Patch1:           asterisk-16.1.0-explicit-python3.patch

  %endif

  

+ Patch2:           asterisk-18.4.0-astmm_ignore_for_console_board.patch

+ 

+ # Removed macros from ilbc library for RFC 3951 compatibility.

+ Patch3:           asterisk-18.12.1-ilbc_macros.patch

+ 

  # Asterisk now builds against a bundled copy of pjproject, as they apply some patches

  # directly to pjproject before the build against it

  Provides:         bundled(pjproject) = %{pjsip_version}
@@ -650,6 +655,10 @@ 

  %patch1 -p1

  %endif

  

+ %patch2 -p1

+ 

+ %patch3 -p1

+ 

  cp %{S:3} menuselect.makedeps

  cp %{S:4} menuselect.makeopts

  
@@ -1004,6 +1013,7 @@ 

  %{_libdir}/asterisk/modules/app_dictate.so

  %{_libdir}/asterisk/modules/app_directed_pickup.so

  %{_libdir}/asterisk/modules/app_disa.so

+ %{_libdir}/asterisk/modules/app_dtmfstore.so

  %{_libdir}/asterisk/modules/app_dumpchan.so

  %{_libdir}/asterisk/modules/app_echo.so

  %{_libdir}/asterisk/modules/app_exec.so
@@ -1013,6 +1023,7 @@ 

  %{_libdir}/asterisk/modules/app_getcpeid.so

  %{_libdir}/asterisk/modules/app_image.so

  %{_libdir}/asterisk/modules/app_macro.so

+ %{_libdir}/asterisk/modules/app_mf.so

  %{_libdir}/asterisk/modules/app_milliwatt.so

  %{_libdir}/asterisk/modules/app_mixmonitor.so

  %{_libdir}/asterisk/modules/app_morsecode.so
@@ -1028,11 +1039,13 @@ 

  #%%{_libdir}/asterisk/modules/app_readfile.so

  %{_libdir}/asterisk/modules/app_read.so

  %{_libdir}/asterisk/modules/app_record.so

+ %{_libdir}/asterisk/modules/app_reload.so

  %{_libdir}/asterisk/modules/app_saycounted.so

  #%%{_libdir}/asterisk/modules/app_saycountpl.so

  %{_libdir}/asterisk/modules/app_sayunixtime.so

  %{_libdir}/asterisk/modules/app_senddtmf.so

  %{_libdir}/asterisk/modules/app_sendtext.so

+ %{_libdir}/asterisk/modules/app_sf.so

  #%%{_libdir}/asterisk/modules/app_setcallerid.so

  %{_libdir}/asterisk/modules/app_sms.so

  %{_libdir}/asterisk/modules/app_softhangup.so
@@ -1048,6 +1061,7 @@ 

  %{_libdir}/asterisk/modules/app_url.so

  %{_libdir}/asterisk/modules/app_userevent.so

  %{_libdir}/asterisk/modules/app_verbose.so

+ %{_libdir}/asterisk/modules/app_waitforcond.so

  %{_libdir}/asterisk/modules/app_waitforring.so

  %{_libdir}/asterisk/modules/app_waitforsilence.so

  %{_libdir}/asterisk/modules/app_waituntil.so
@@ -1114,7 +1128,9 @@ 

  %{_libdir}/asterisk/modules/func_dialplan.so

  %{_libdir}/asterisk/modules/func_enum.so

  %{_libdir}/asterisk/modules/func_env.so

+ %{_libdir}/asterisk/modules/func_evalexten.so

  %{_libdir}/asterisk/modules/func_extstate.so

+ %{_libdir}/asterisk/modules/func_frame_drop.so

  %{_libdir}/asterisk/modules/func_frame_trace.so

  %{_libdir}/asterisk/modules/func_global.so

  %{_libdir}/asterisk/modules/func_groupcount.so
@@ -1122,6 +1138,7 @@ 

  %{_libdir}/asterisk/modules/func_holdintercept.so

  %{_libdir}/asterisk/modules/func_iconv.so

  %{_libdir}/asterisk/modules/func_jitterbuffer.so

+ %{_libdir}/asterisk/modules/func_json.so

  %{_libdir}/asterisk/modules/func_lock.so

  %{_libdir}/asterisk/modules/func_logic.so

  %{_libdir}/asterisk/modules/func_math.so
@@ -1132,6 +1149,8 @@ 

  %{_libdir}/asterisk/modules/func_presencestate.so

  %{_libdir}/asterisk/modules/func_rand.so

  %{_libdir}/asterisk/modules/func_realtime.so

+ %{_libdir}/asterisk/modules/func_sayfiles.so

+ %{_libdir}/asterisk/modules/func_scramble.so

  %{_libdir}/asterisk/modules/func_sha1.so

  %{_libdir}/asterisk/modules/func_shell.so

  %{_libdir}/asterisk/modules/func_sorcery.so
@@ -1151,6 +1170,7 @@ 

  %{_libdir}/asterisk/modules/pbx_realtime.so

  %{_libdir}/asterisk/modules/pbx_spool.so

  %{_libdir}/asterisk/modules/res_adsi.so

+ %{_libdir}/asterisk/modules/res_aeap.so

  %{_libdir}/asterisk/modules/res_agi.so

  %{_libdir}/asterisk/modules/res_ari.so

  %{_libdir}/asterisk/modules/res_ari_applications.so
@@ -1213,6 +1233,7 @@ 

  %{_libdir}/asterisk/modules/res_sorcery_memory_cache.so

  %{_libdir}/asterisk/modules/res_sorcery_realtime.so

  %{_libdir}/asterisk/modules/res_speech.so

+ %{_libdir}/asterisk/modules/res_speech_aeap.so

  %{_libdir}/asterisk/modules/res_srtp.so

  %{_libdir}/asterisk/modules/res_stasis.so

  %{_libdir}/asterisk/modules/res_stasis_answer.so
@@ -1225,6 +1246,7 @@ 

  %{_libdir}/asterisk/modules/res_stun_monitor.so

  %{_libdir}/asterisk/modules/res_timing_pthread.so

  %{_libdir}/asterisk/modules/res_timing_timerfd.so

+ %{_libdir}/asterisk/modules/res_tonedetect.so

  

  %{_sbindir}/astcanary

  %{_sbindir}/astdb2sqlite3
@@ -1252,6 +1274,7 @@ 

  %attr(0750,asterisk,asterisk) %dir %{_sysconfdir}/asterisk

  %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/acl.conf

  %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adsi.conf

+ %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/aeap.conf

  %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/agents.conf

  %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/alarmreceiver.conf

  %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/amd.conf
@@ -1663,6 +1686,33 @@ 

  %endif

  

  %changelog

+ * Wed Jun 15 2022 Michal Josef Špaček <mspacek@redhat.com> - 18.12.1-1

+ - Update to upstream 18.12.1 release.

+ 

+ * Wed Jun 15 2022 Michal Josef Špaček <mspacek@redhat.com> - 18.11.2-1

+ - Update to upstream 18.11.2 release.

+ 

+ * Wed Jun 15 2022 Michal Josef Špaček <mspacek@redhat.com> - 18.10.1-1

+ - Update to upstream 18.10.1 release.

+ 

+ * Wed Jun 15 2022 Michal Josef Špaček <mspacek@redhat.com> - 18.9.0-1

+ - Update to upstream 18.9.0 release.

+ 

+ * Wed Jun 15 2022 Michal Josef Špaček <mspacek@redhat.com> - 18.8.0-1

+ - Update to upstream 18.8.0 release.

+ 

+ * Wed Jun 15 2022 Michal Josef Špaček <mspacek@redhat.com> - 18.7.1-1

+ - Update to upstream 18.7.1 release.

+ 

+ * Wed Jun 15 2022 Michal Josef Špaček <mspacek@redhat.com> - 18.6.0-1

+ - Update to upstream 18.6.0 release.

+ 

+ * Wed Jun 15 2022 Michal Josef Špaček <mspacek@redhat.com> - 18.5.1-1

+ - Update to upstream 18.5.1 release.

+ 

+ * Wed Jun 15 2022 Michal Josef Špaček <mspacek@redhat.com> - 18.4.0-1.6

+ - Fix build (#1977579)

+ 

  * Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 18.4.0-1.5

  - Perl 5.36 rebuild

  

file modified
+1 -1
@@ -15,7 +15,7 @@ 

  MENUSELECT_OPTS_app_voicemail=FILE_STORAGE

  MENUSELECT_PBX=

  MENUSELECT_RES=res_config_sqlite res_timing_kqueue res_stasis_test res_mwi_external res_mwi_external_ami res_stasis_mailbox res_ari_mailboxes res_digium_phone res_calendar_exchange

- MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj3 test_dlinklists test_acl test_aoc test_app test_ast_format_str_reduce test_devicestate test_event test_func_file test_gosub test_named_lock test_pbx test_stringfields test_strings test_substitution test_time test_utils test_amihooks test_locale test_logger test_security_events test_poll test_expr test_netsock2 test_db test_linkedlists test_config test_voicemail_api test_jitterbuf test_abstract_jb test_astobj2_thrash test_hashtab_thrash test_xml_escape test_callerid test_ari test_ari_model test_bucket test_cdr test_cel test_channel_feature_hooks test_core_codec test_core_format test_endpoints test_format_cache test_format_cap test_json test_message test_optional_api test_res_pjsip_scheduler test_res_stasis test_scoped_lock test_sorcery test_sorcery_astdb test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints test_taskprocessor test_threadpool test_uri test_uuid test_websocket_client test_vector test_sorcery_memory_cache_thrash test_astobj2_weaken test_dns test_dns_naptr test_dns_query_set test_dns_recurring test_dns_srv test_file test_http_media_cache test_media_cache test_bridging test_channel test_conversions test_sdp test_stream test_data_buffer test_mwi test_res_prometheus test_stasis_state test_res_rtp test_scope_trace test_res_pjsip_session_caps test_astobj2

+ MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj3 test_dlinklists test_acl test_aoc test_app test_ast_format_str_reduce test_devicestate test_event test_func_file test_gosub test_named_lock test_pbx test_stringfields test_strings test_substitution test_time test_utils test_amihooks test_locale test_logger test_security_events test_poll test_expr test_netsock2 test_db test_linkedlists test_config test_voicemail_api test_jitterbuf test_abstract_jb test_astobj2_thrash test_hashtab_thrash test_xml_escape test_callerid test_ari test_ari_model test_bucket test_cdr test_cel test_channel_feature_hooks test_core_codec test_core_format test_endpoints test_format_cache test_format_cap test_json test_message test_optional_api test_res_pjsip_scheduler test_res_stasis test_scoped_lock test_sorcery test_sorcery_astdb test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints test_taskprocessor test_threadpool test_uri test_uuid test_websocket_client test_vector test_sorcery_memory_cache_thrash test_astobj2_weaken test_dns test_dns_naptr test_dns_query_set test_dns_recurring test_dns_srv test_file test_http_media_cache test_media_cache test_bridging test_channel test_conversions test_sdp test_stream test_data_buffer test_mwi test_res_prometheus test_stasis_state test_res_rtp test_scope_trace test_res_pjsip_session_caps test_astobj2 test_aeap test_aeap_speech test_aeap_transaction test_aeap_transport

  MENUSELECT_UTILS=aelparse astcanary astdb2sqlite3 astman muted smsq stereorize streamplayer

  MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup

  MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs

file modified
+4 -4
@@ -1,4 +1,4 @@ 

- SHA512 (asterisk-18.4.0.tar.gz) = 024d0a5c75d55fe614ba6219aece62778e9522a0f8365d57192aa5aa22be94d45a3bed69ac14659738e97dd98967533c13096a855366083e6df2b7800e684602

- SHA512 (asterisk-18.4.0.tar.gz.asc) = c7022aa76e93b98ee0e156dbd7429272977b423a99c92c49587831eaf14e4b91f33391ff4204cc98e38cd7ea00dcf3859e90287bd351d4856de7568ad80d8ccf

- SHA512 (jansson-2.12.tar.bz2) = 6ed665a441c789cdf7eb22b6e69d02575746c81b00e0a81ced90d30aaf2badc93fac32e5841fd4e07751a27726a327a63fe28bb0689c6bef5b6164b435bbc30d

- SHA512 (pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e

+ SHA512 (asterisk-18.12.1.tar.gz) = d172661b4ce4a15532dfbafdd57ee0310e5c6049904213e32f2137a29701b94601cdee40e71e042efaa1a592f84429067dd19a366525785154cde6850733938d

+ SHA512 (asterisk-18.12.1.tar.gz.asc) = 85e40c4f062ee8029c26fdd5f9d75a8b59ec15d158aca2776a88b3667330bf71cd63efa39ea256a641b7802bdd446766e248de9ee33dc16a846ca99583c03b8c

+ SHA512 (pjproject-2.12.tar.bz2) = 22de7704b4d52883331fd7ffb0f48c3667ec174efc6f9cdc4bf7df7464019318d97d4ebc5a783b5a30e0cebeeb44aa6b6ecc065cdb14250e08fca12ddc149fe2

+ SHA512 (jansson-2.14.tar.bz2) = 1a659c0f41b0672757c13ebd16bd10ad7d6484366aefda078aa816266ce4f5638bc121f1ce8c4234b0b9f201ea73c227b9084125857452cbcba058a111e4a6fd

7 new commits added

  • Update to upstream 18.11.2 release
  • Update to upstream 18.10.1 release
  • Update to upstream 18.9.0 release
  • Update to upstream 18.8.0 release
  • Update to upstream 18.7.1 release.
  • Update to upstream 18.6.0 release
  • Update to upstream 18.5.1 release
2 years ago

I added step by step update to 18.11.2 release

@jsmith Could you look to this PR?

rebased onto 2789009

2 years ago

@jsmith
Added update to 18.12.1 and rebase to actual rawhide

9 new commits added

  • Update to upstream 18.12.1 release
  • Update to upstream 18.11.2 release
  • Update to upstream 18.10.1 release
  • Update to upstream 18.9.0 release
  • Update to upstream 18.8.0 release
  • Update to upstream 18.7.1 release.
  • Update to upstream 18.6.0 release
  • Update to upstream 18.5.1 release
  • BZ#1977579 Fix build
2 years ago

9 new commits added

  • Update to upstream 18.12.1 release
  • Update to upstream 18.11.2 release
  • Update to upstream 18.10.1 release
  • Update to upstream 18.9.0 release
  • Update to upstream 18.8.0 release
  • Update to upstream 18.7.1 release.
  • Update to upstream 18.6.0 release
  • Update to upstream 18.5.1 release
  • BZ#1977579 Fix build
2 years ago

Pull-Request has been merged by jsmith

2 years ago