diff --git a/debian/patches/fix_export.patch b/debian/patches/fix_export.patch index 11bf4b2de..413831ce4 100644 --- a/debian/patches/fix_export.patch +++ b/debian/patches/fix_export.patch @@ -3,7 +3,7 @@ Author: Tzafrir Cohen --- a/Makefile +++ b/Makefile -@@ -200,6 +200,8 @@ +@@ -139,6 +139,8 @@ main_makefile=1 include Makefile.defs diff --git a/debian/patches/no_INSTALL_file.patch b/debian/patches/no_INSTALL_file.patch index bde677b5d..dd20ac29a 100644 --- a/debian/patches/no_INSTALL_file.patch +++ b/debian/patches/no_INSTALL_file.patch @@ -3,7 +3,7 @@ Author: Victor Seva --- a/Makefile +++ b/Makefile -@@ -896,8 +896,6 @@ +@@ -839,8 +839,6 @@ install-doc: $(doc_prefix)/$(doc_dir) install-every-module-doc diff --git a/debian/patches/no_lib64_on_64_bits.patch b/debian/patches/no_lib64_on_64_bits.patch index 1c82ee563..2c6133e27 100644 --- a/debian/patches/no_lib64_on_64_bits.patch +++ b/debian/patches/no_lib64_on_64_bits.patch @@ -3,7 +3,7 @@ Author: Victor Seva --- a/Makefile.defs +++ b/Makefile.defs -@@ -428,15 +428,7 @@ +@@ -360,15 +360,7 @@ endif $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) diff --git a/debian/patches/sipwise/add_pcem_module.patch b/debian/patches/sipwise/add_pcem_module.patch index 9b08762f6..2cbb878e7 100644 --- a/debian/patches/sipwise/add_pcem_module.patch +++ b/debian/patches/sipwise/add_pcem_module.patch @@ -1,6 +1,6 @@ --- a/Makefile.groups +++ b/Makefile.groups -@@ -25,7 +25,7 @@ +@@ -27,7 +27,7 @@ db_cluster dialog dispatcher domain drouting group \ htable imc matrix mohqueue msilo mtree p_usrloc pdt permissions \ pipelimit prefix_route registrar sipcapture siptrace speeddial \ diff --git a/debian/patches/sipwise/do-not-install-default-config.patch b/debian/patches/sipwise/do-not-install-default-config.patch index 63b317608..7dd74749f 100644 --- a/debian/patches/sipwise/do-not-install-default-config.patch +++ b/debian/patches/sipwise/do-not-install-default-config.patch @@ -9,7 +9,7 @@ Subject: do not install default config --- a/Makefile +++ b/Makefile -@@ -708,7 +708,7 @@ +@@ -647,7 +647,7 @@ .PHONY: install install: mk_params="compile_for_install=yes" @@ -20,7 +20,7 @@ Subject: do not install default config .PHONY: dbinstall --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile -@@ -8,7 +8,7 @@ +@@ -14,7 +14,7 @@ install-if-newer: install diff --git a/debian/patches/sipwise/lcr_rate_module.patch b/debian/patches/sipwise/lcr_rate_module.patch index 8dfa9eab4..fbf1d373a 100644 --- a/debian/patches/sipwise/lcr_rate_module.patch +++ b/debian/patches/sipwise/lcr_rate_module.patch @@ -1,6 +1,6 @@ --- a/Makefile.groups +++ b/Makefile.groups -@@ -104,6 +104,9 @@ +@@ -106,6 +106,9 @@ # - modules depending on openssl library mod_list_autheph=auth_ephemeral @@ -10,17 +10,17 @@ # - modules related to SIMPLE presence extensions mod_list_presence=presence presence_conference presence_dialoginfo \ presence_mwi presence_profile presence_reginfo \ -@@ -179,7 +182,8 @@ - $(mod_list_outbound) $(mod_list_osp) \ - $(mod_list_java) $(mod_list_dnssec) \ - $(mod_list_sctp) $(mod_list_autheph) \ -- $(mod_list_gzcompress)) -+ $(mod_list_gzcompress)) \ +@@ -209,7 +212,8 @@ + $(mod_list_ev) $(mod_list_kazoo) \ + $(mod_list_mongodb) $(mod_list_cnxcc) \ + $(mod_list_jansson) $(mod_list_geoip2) \ +- $(mod_list_erlang)) ++ $(mod_list_erlang)) \ + $(mod_list_lcrrate) -@@ -233,6 +237,8 @@ +@@ -263,6 +267,8 @@ module_group_ignore= $(sort $(filter-out $(module_group_default), $(mod_list_all))) diff --git a/debian/patches/sipwise/parallel_build.patch b/debian/patches/sipwise/parallel_build.patch index 512354775..5ec87f07c 100644 --- a/debian/patches/sipwise/parallel_build.patch +++ b/debian/patches/sipwise/parallel_build.patch @@ -1,6 +1,6 @@ --- a/Makefile.rules +++ b/Makefile.rules -@@ -77,6 +77,18 @@ +@@ -60,6 +60,18 @@ cmd_MKDEP= endif # CC_MKDEP_OPTS @@ -19,7 +19,7 @@ # what will be displayed if quiet==silent silent_cmd_CC=CC ($(CC)) [$(strip $(crt_type) $(NAME))] $@ silent_cmd_LD=LD ($(LD)) [$(strip $(crt_type) $(NAME))] $@ -@@ -107,7 +119,7 @@ +@@ -90,7 +102,7 @@ quote:= " escall= $(subst $$,\$$,$(subst $(quote),\$(quote),$1)) exec_cmd= $(if $($(quiet)_cmd_$(1)),\ diff --git a/debian/patches/sipwise/tcap.patch b/debian/patches/sipwise/tcap.patch index 096a3a3b7..c6efa4516 100644 --- a/debian/patches/sipwise/tcap.patch +++ b/debian/patches/sipwise/tcap.patch @@ -254,9 +254,9 @@ +} --- a/Makefile.groups +++ b/Makefile.groups -@@ -160,6 +160,9 @@ - # - modules depending on gzip library - mod_list_gzcompress=gzcompress +@@ -186,6 +186,9 @@ + # - modules depending on erlang library + mod_list_erlang=erlang +# - modules depending on libtcap library +mod_list_tcap=tcap @@ -264,7 +264,7 @@ # - all modules mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_db) $(mod_list_dbuid) \ -@@ -240,6 +243,9 @@ +@@ -270,6 +273,9 @@ # pkg lcrrate module module_group_klcrrate=$(mod_list_lcrrate) diff --git a/debian/patches/upstream/debug/0001-modules-debugger-trace-msg-out.patch b/debian/patches/upstream/debug/0001-modules-debugger-trace-msg-out.patch index 6cd564294..522a76634 100644 --- a/debian/patches/upstream/debug/0001-modules-debugger-trace-msg-out.patch +++ b/debian/patches/upstream/debug/0001-modules-debugger-trace-msg-out.patch @@ -20,7 +20,7 @@ Subject: [PATCH] modules/debugger: trace msg out /** * */ -@@ -487,6 +489,20 @@ +@@ -520,6 +522,20 @@ return 0; } @@ -52,23 +52,23 @@ Subject: [PATCH] modules/debugger: trace msg out --- a/modules/debugger/debugger_mod.c +++ b/modules/debugger/debugger_mod.c -@@ -60,6 +60,7 @@ - extern char *_dbg_cfgtrace_prefix; +@@ -61,6 +61,7 @@ + extern char *_dbg_cfgtrace_lname; extern int _dbg_step_usleep; extern int _dbg_step_loops; +extern int _dbg_outtrace; extern int _dbg_reset_msgid; static char * _dbg_cfgtrace_facility_str = 0; -@@ -86,6 +87,7 @@ +@@ -88,6 +89,7 @@ {"log_assign", INT_PARAM, &_dbg_log_assign}, {"step_usleep", INT_PARAM, &_dbg_step_usleep}, {"step_loops", INT_PARAM, &_dbg_step_loops}, + {"trace_out_msg", INT_PARAM, &_dbg_outtrace}, {"mod_hash_size", INT_PARAM, &default_dbg_cfg.mod_hash_size}, {"mod_level_mode", INT_PARAM, &default_dbg_cfg.mod_level_mode}, - {"mod_level", STR_PARAM|USE_FUNC_PARAM, (void*)dbg_mod_level_param}, -@@ -178,6 +180,7 @@ + {"mod_level", PARAM_STRING|USE_FUNC_PARAM, (void*)dbg_mod_level_param}, +@@ -180,6 +182,7 @@ if (rank==PROC_INIT) { dbg_enable_mod_levels(); dbg_enable_log_assign();