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