From 311ab471d597520bcfdce8c55f1dd2b554229bf0 Mon Sep 17 00:00:00 2001 From: Marco Capetta Date: Thu, 10 Oct 2019 16:43:13 +0200 Subject: [PATCH] TT#68201 Remove already applied upstream patches and refresh old ones Remove patch: * sipwise/build-Call-make-via-MAKE.patch Change-Id: I92ec00592cfe30be5069c278eef78e75e412f2a8 --- debian/patches/series | 1 - .../sipwise/build-Call-make-via-MAKE.patch | 82 ------------------- .../patches/sipwise/pv_trans_eval_uri.patch | 4 +- .../sipwise/rtpengine-play-media.patch | 16 ++-- .../sipwise/rtpengine-tcp-forwarding.patch | 2 +- .../sipwise/rtpengine-trickle-ice-sdp.patch | 2 +- .../sipwise/rtpengine_next_branch_parm.patch | 2 +- debian/patches/sipwise/usrloc_dbro.patch | 4 +- 8 files changed, 15 insertions(+), 98 deletions(-) delete mode 100644 debian/patches/sipwise/build-Call-make-via-MAKE.patch diff --git a/debian/patches/series b/debian/patches/series index d1767b8cd..877aa47b7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,7 +21,6 @@ sipwise/fix_error_in_cfgt_module.patch sipwise/pv_trans_eval_uri.patch sipwise/avpops_avp_subst_pvar.patch sipwise/fix_dialplan_errors.patch -sipwise/build-Call-make-via-MAKE.patch ## SCA Patches sipwise/sca-line-seize.patch sipwise/sca-fallback-if-no-contact.patch diff --git a/debian/patches/sipwise/build-Call-make-via-MAKE.patch b/debian/patches/sipwise/build-Call-make-via-MAKE.patch deleted file mode 100644 index 50fa7afc4..000000000 --- a/debian/patches/sipwise/build-Call-make-via-MAKE.patch +++ /dev/null @@ -1,82 +0,0 @@ -From bcdb5b391c1a7c04f31a6714b0a444fa1abe83c4 Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Mon, 29 Jul 2019 20:15:47 +0200 -Subject: [PATCH] build: Call make via $(MAKE) - -When we need to call make from within a Makefile, we should do so by -using the MAKE variable, which has special meaning for make itself. -This makes sure, it will get marked as recursive command, and will -make it possible to use the make jobserver. - -Change-Id: I6829f3ee0a830fc8273e1dffe696382fccc6a093 ---- - doc/tutorials/rpc_list/Makefile | 4 ++-- - src/modules/db_berkeley/Makefile | 2 +- - src/modules/db_oracle/Makefile | 2 +- - src/modules/db_sqlite/Makefile | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/doc/tutorials/rpc_list/Makefile b/doc/tutorials/rpc_list/Makefile -index c9ff6905..e1050643 100644 ---- a/doc/tutorials/rpc_list/Makefile -+++ b/doc/tutorials/rpc_list/Makefile -@@ -148,7 +148,7 @@ c_defsX=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ - -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT \ - -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT - --c_defs=$(subst ^^,='\",$(subst ",\"',$(subst =",^^,$(shell make -s -C ../../../src printcdefs)))) -+c_defs=$(subst ^^,='\",$(subst ",\"',$(subst =",^^,$(shell $(MAKE) -s -C ../../../src printcdefs)))) - - c_defs+= -DMOD_NAME='\"rpcgen\"' - c_defs+= -I$(COREPATH)/modules/app_sqlang/squirrel/include -@@ -176,7 +176,7 @@ get_listed_grp=$(word 2, $(subst :, ,$(1))) - # get module interface define - get_modiface=$(word 3, $(subst :, ,$(1))) - --find_modiface=$(if $(findstring modules,$(1)),$(shell make -s -C $(dir $(1)) printmiface),-DNONE) -+find_modiface=$(if $(findstring modules,$(1)),$(shell $(MAKE) -s -C $(dir $(1)) printmiface),-DNONE) - - # get base file name from file:grp: get_bname(file:grp) - # => basename(file) without extension (e.g. get_bname(foo/bar.c:x) => bar) -diff --git a/src/modules/db_berkeley/Makefile b/src/modules/db_berkeley/Makefile -index 23013003..a33bc58e 100644 ---- a/src/modules/db_berkeley/Makefile -+++ b/src/modules/db_berkeley/Makefile -@@ -25,7 +25,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) - # extra install for kamailio - - install-berkeley-scripts: $(bin_prefix)/$(bin_dir) -- BERKELEYDBON=yes make -C ../../../utils/kamctl/ install-modules -+ BERKELEYDBON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules - - install-scripts: install-berkeley-scripts - -diff --git a/src/modules/db_oracle/Makefile b/src/modules/db_oracle/Makefile -index d30c7515..77a52af0 100644 ---- a/src/modules/db_oracle/Makefile -+++ b/src/modules/db_oracle/Makefile -@@ -17,7 +17,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) - # extra install for kamailio - - install-oracle-scripts: $(bin_prefix)/$(bin_dir) -- ORACLEON=yes make -C ../../../utils/kamctl/ install-modules -+ ORACLEON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules - - install-scripts: install-oracle-scripts - -diff --git a/src/modules/db_sqlite/Makefile b/src/modules/db_sqlite/Makefile -index c5f164cc..92e4de58 100644 ---- a/src/modules/db_sqlite/Makefile -+++ b/src/modules/db_sqlite/Makefile -@@ -20,7 +20,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) - # extra install for kamailio - - install-sqlite-scripts: $(bin_prefix)/$(bin_dir) -- SQLITEON=yes make -C ../../../utils/kamctl/ install-modules -+ SQLITEON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules - - install-scripts: install-sqlite-scripts - --- -2.22.0.709.g102302147b - diff --git a/debian/patches/sipwise/pv_trans_eval_uri.patch b/debian/patches/sipwise/pv_trans_eval_uri.patch index 788b6fb58..f19560201 100644 --- a/debian/patches/sipwise/pv_trans_eval_uri.patch +++ b/debian/patches/sipwise/pv_trans_eval_uri.patch @@ -1,8 +1,8 @@ --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c -@@ -1269,8 +1269,8 @@ int tr_eval_uri(struct sip_msg *msg, tr_ +@@ -1273,8 +1273,8 @@ int tr_eval_uri(struct sip_msg *msg, tr_ /* parse uri -- params only when requested */ - if(parse_uri(_tr_uri.s, _tr_uri.len, &_tr_parsed_uri)!=0) + if(parse_uri(_tr_uri.s, _tr_uri.len - dlen, &_tr_parsed_uri)!=0) { - LM_ERR("invalid uri [%.*s]\n", val->rs.len, - val->rs.s); diff --git a/debian/patches/sipwise/rtpengine-play-media.patch b/debian/patches/sipwise/rtpengine-play-media.patch index 1036cc8a9..dac3242b3 100644 --- a/debian/patches/sipwise/rtpengine-play-media.patch +++ b/debian/patches/sipwise/rtpengine-play-media.patch @@ -108,7 +108,7 @@ static bencode_item_t *rtpp_function_call_ok(bencode_buffer_t *bencbuf, struct sip_msg *msg, enum rtpe_operation op, const char *flags_str, str *body) { -@@ -3335,8 +3376,9 @@ +@@ -3340,8 +3381,9 @@ return 1; } @@ -120,7 +120,7 @@ { int ret, more; -@@ -3349,7 +3391,7 @@ +@@ -3354,7 +3396,7 @@ if (!selected_rtpp_set_2 || selected_rtpp_set_2 == selected_rtpp_set_1) more = 0; @@ -129,7 +129,7 @@ if (ret < 0) return ret; -@@ -3360,17 +3402,18 @@ +@@ -3365,17 +3407,18 @@ if (set_rtpengine_set_from_avp(msg, direction) == -1) return -1; @@ -152,7 +152,7 @@ { str flags; -@@ -3382,27 +3425,23 @@ +@@ -3387,27 +3430,23 @@ } } @@ -189,7 +189,7 @@ } -@@ -3548,88 +3587,45 @@ +@@ -3553,88 +3592,45 @@ return -1; } @@ -285,7 +285,7 @@ } static int -@@ -3703,160 +3699,102 @@ +@@ -3708,160 +3704,102 @@ } @@ -493,7 +493,7 @@ void **parms; pv_param_t *param; pv_value_t *res; -@@ -3910,7 +3848,7 @@ +@@ -3915,7 +3853,7 @@ parms[0] = param; parms[1] = res; @@ -502,7 +502,7 @@ } static int -@@ -3935,54 +3873,55 @@ +@@ -3940,54 +3878,55 @@ * */ static int ki_rtpengine_manage0(sip_msg_t *msg) { diff --git a/debian/patches/sipwise/rtpengine-tcp-forwarding.patch b/debian/patches/sipwise/rtpengine-tcp-forwarding.patch index 2a669db9a..adad14b80 100644 --- a/debian/patches/sipwise/rtpengine-tcp-forwarding.patch +++ b/debian/patches/sipwise/rtpengine-tcp-forwarding.patch @@ -55,7 +55,7 @@ { if (ng_flags.directional) bencode_dictionary_add_str(ng_flags.dict, "from-tag", &ng_flags.from_tag); -@@ -3802,6 +3818,44 @@ +@@ -3807,6 +3823,44 @@ return rtpengine_rtpp_set_wrap(msg, rtpengine_unblock_media_wrap, flags.s, 1); } diff --git a/debian/patches/sipwise/rtpengine-trickle-ice-sdp.patch b/debian/patches/sipwise/rtpengine-trickle-ice-sdp.patch index b14e271d0..a85193a29 100644 --- a/debian/patches/sipwise/rtpengine-trickle-ice-sdp.patch +++ b/debian/patches/sipwise/rtpengine-trickle-ice-sdp.patch @@ -91,7 +91,7 @@ goto select_node; } -@@ -3541,6 +3552,26 @@ +@@ -3546,6 +3557,26 @@ return rtpengine_rtpp_set_wrap(msg, rtpengine_manage_wrap, flags.s, 1); } diff --git a/debian/patches/sipwise/rtpengine_next_branch_parm.patch b/debian/patches/sipwise/rtpengine_next_branch_parm.patch index e74703a25..b1881ea42 100644 --- a/debian/patches/sipwise/rtpengine_next_branch_parm.patch +++ b/debian/patches/sipwise/rtpengine_next_branch_parm.patch @@ -72,7 +72,7 @@ if (ret == -1 || viabranch.len == 0) { LM_ERR("can't get Via branch/extra ID\n"); goto error; -@@ -3540,7 +3563,7 @@ rtpengine_answer1_f(struct sip_msg *msg, +@@ -3545,7 +3568,7 @@ rtpengine_answer1_f(struct sip_msg *msg, } static int diff --git a/debian/patches/sipwise/usrloc_dbro.patch b/debian/patches/sipwise/usrloc_dbro.patch index ac0c8ede9..6d0e18d82 100644 --- a/debian/patches/sipwise/usrloc_dbro.patch +++ b/debian/patches/sipwise/usrloc_dbro.patch @@ -86,7 +86,7 @@ if (nat_bflag==(unsigned int)-1) { nat_bflag = 0; } else if ( nat_bflag>=8*sizeof(nat_bflag) ) { -@@ -434,6 +485,16 @@ static int child_init(int _rank) +@@ -437,6 +488,16 @@ static int child_init(int _rank) LM_ERR("child(%d): failed to connect to database\n", _rank); return -1; } @@ -103,7 +103,7 @@ /* _rank==PROC_SIPINIT is used even when fork is disabled */ if (_rank==PROC_SIPINIT && db_mode!=DB_ONLY && db_load) { /* if cache is used, populate domains from DB */ -@@ -464,6 +525,10 @@ static void destroy(void) +@@ -467,6 +528,10 @@ static void destroy(void) ul_dbf.close(ul_dbh); }