net/kamailio-5.x/patches/050-fix-kamailio-utils.patch

   1 --- a/utils/kamctl/kamctl
   2 +++ b/utils/kamctl/kamctl
   3 @@ -1,4 +1,4 @@
   4 -#!/bin/bash
   5 +#!/bin/sh
   6  #
   7  # control tool for maintaining Kamailio
   8  #
   9 --- a/utils/kamctl/kamctlrc
  10 +++ b/utils/kamctl/kamctlrc
  11 @@ -151,3 +151,6 @@
  12  ## Extra start options - default is: not set
  13  # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"
  14  # STARTOPTIONS=
  15 +
  16 +# Disable colour printing in terminal
  17 +NOHLPRINT=1
  18 --- a/utils/kamctl/kamdbctl
  19 +++ b/utils/kamctl/kamdbctl
  20 @@ -1,4 +1,4 @@
  21 -#!/bin/bash
  22 +#!/bin/sh
  23  #
  24  # control tool for maintaining Kamailio databases
  25  #
  26 --- kamailio5-5.0.2/utils/kamctl/kamdbctl.base  2017-06-26 13:57:13.000000000 +0200
  27 +++ kamailio5-x/utils/kamctl/kamdbctl.base      2017-08-13 20:17:54.033561438 +0200
  28 @@ -33,19 +33,19 @@ INSTALL_DBUID_TABLES=${INSTALL_DBUID_TAB
  29
  30  # Used by dbtext and db_berkeley to define tables to be created, used by
  31  # postgres to do the grants
  32 -STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs
  33 -               grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber
  34 -               location location_attrs re_grp trusted address missed_calls
  35 -               usr_preferences aliases silo dialog dialog_vars dispatcher dialplan
  36 +STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs \
  37 +               grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber \
  38 +               location location_attrs re_grp trusted address missed_calls \
  39 +               usr_preferences aliases silo dialog dialog_vars dispatcher dialplan \
  40                 acc_cdrs topos_d topos_t}
  41 -EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy
  42 -               carrierroute carrier_name domain_name carrierfailureroute userblacklist
  43 -               globalblacklist htable purplemap uacreg pl_pipes mtree mtrees
  44 -               sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine
  45 +EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy \
  46 +               carrierroute carrier_name domain_name carrierfailureroute userblacklist \
  47 +               globalblacklist htable purplemap uacreg pl_pipes mtree mtrees \
  48 +               sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine \
  49                 dr_gateways dr_rules dr_gw_lists dr_groups}
  50 -PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
  51 +PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \
  52                 pua rls_presentity rls_watchers}
  53 -DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs
  54 +DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs \
  55                 uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
  56
  57  # SQL definitions
  58 @@ -69,17 +69,17 @@ GREP=${GREP:-grep}
  59  SED=${SED:-sed}
  60
  61  # define what modules should be installed
  62 -STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group
  63 -               permissions registrar usrloc msilo alias_db uri_db speeddial
  64 +STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group \
  65 +               permissions registrar usrloc msilo alias_db uri_db speeddial \
  66                 avpops auth_db pdt dialog dispatcher dialplan topos}
  67
  68  PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls}
  69
  70 -EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
  71 -               drouting userblacklist htable purple uac pipelimit mtree sca mohqueue
  72 +EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \
  73 +               drouting userblacklist htable purple uac pipelimit mtree sca mohqueue \
  74                 rtpproxy rtpengine}
  75
  76 -DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags
  77 +DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags \
  78                 uid_uri_db}
  79
  80  ############################################################