Browse code

kamdbctl: Merged patch from alpine packaging (#1786)

- kamdbctl: Merged patch from alpine packaging (#1786)
- add proper quoting for DB table and module definitions

sergey-safarov authored on 04/01/2019 21:34:47 • Henning Westerholt committed on 04/01/2019 21:34:47
Showing 3 changed files
1 1
deleted file mode 100644
... ...
@@ -1,57 +0,0 @@
1
-+++ b/utils/kamctl/kamdbctl.base
2
-@@ -33,20 +33,20 @@
3
- 
4
- # Used by dbtext and db_berkeley to define tables to be created, used by
5
- # postgres to do the grants
6
--STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs
7
-+STANDARD_TABLES=${STANDARD_TABLES:-'version acc dbaliases domain domain_attrs
8
- 		grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber
9
- 		location location_attrs re_grp trusted address missed_calls
10
- 		usr_preferences aliases silo dialog dialog_vars dispatcher dialplan
11
--		acc_cdrs topos_d topos_t}
12
--EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy
13
-+		acc_cdrs topos_d topos_t'}
14
-+EXTRA_TABLES=${EXTRA_TABLES:-'imc_members imc_rooms cpl sip_trace domainpolicy
15
- 		carrierroute carrier_name domain_name carrierfailureroute userblacklist
16
- 		globalblacklist htable purplemap uacreg pl_pipes mtree mtrees
17
- 		sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine
18
--		dr_gateways dr_rules dr_gw_lists dr_groups}
19
--PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
20
--		pua rls_presentity rls_watchers}
21
--DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs
22
--		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
23
-+		dr_gateways dr_rules dr_gw_lists dr_groups'}
24
-+PRESENCE_TABLES=${PRESENCE_TABLES:-'presentity active_watchers watchers xcap
25
-+		pua rls_presentity rls_watchers'}
26
-+DBUID_TABLES=${UID_TABLES:-'uid_credentials uid_domain uid_domain_attrs
27
-+		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs'}
28
- 
29
- # SQL definitions
30
- # If you change this definitions here, then you must change them
31
-@@ -69,18 +69,18 @@
32
- SED=${SED:-sed}
33
- 
34
- # define what modules should be installed
35
--STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group
36
-+STANDARD_MODULES=${STANDARD_MODULES:-'standard acc lcr domain group
37
- 		permissions registrar usrloc msilo alias_db uri_db speeddial
38
--		avpops auth_db pdt dialog dispatcher dialplan topos}
39
-+		avpops auth_db pdt dialog dispatcher dialplan topos'}
40
- 
41
--PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls}
42
-+PRESENCE_MODULES=${PRESENCE_MODULES:-'presence rls'}
43
- 
44
--EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
45
-+EXTRA_MODULES=${EXTRA_MODULES:-'imc cpl siptrace domainpolicy carrierroute
46
- 		drouting userblacklist htable purple uac pipelimit mtree sca mohqueue
47
--		rtpproxy rtpengine}
48
-+		rtpproxy rtpengine'}
49
- 
50
--DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags
51
--		uid_uri_db}
52
-+DBUID_MODULES=${UID_MODULES:-'uid_auth_db uid_avp_db uid_domain uid_gflags
53
-+		uid_uri_db'}
54
- 
55
- ############################################################
56
- 
... ...
@@ -253,7 +253,6 @@ for _i in db postgres sqlite dbtext mysql \
253 253
 done
254 254
 
255 255
 source="${pkgname}-${pkgver}${_suffix}.tar.gz::https://github.com/kamailio/$pkgname/archive/$_gitcommit.tar.gz
256
-	0001-kamdbctl.base.patch
257 256
 	kamailio.initd
258 257
 	"
259 258
 
... ...
@@ -557,5 +556,4 @@ sipdump() {
557 556
 }
558 557
 
559 558
 sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6  kamailio-5.1.0.20171125-991fe9b.tar.gz
560
-6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db  0001-kamdbctl.base.patch
561 559
 321b1b160434150bcde3c0ad7f47ddf259791b68d4ce74ba4c35034026421a2bc6f5e86f26f393f5fcdb523d8cd75f944709473065553ce860b0ea06b3dc2a1b  kamailio.initd"
... ...
@@ -33,20 +33,20 @@ INSTALL_DBUID_TABLES=${INSTALL_DBUID_TABLES:-ask}
33 33
 
34 34
 # Used by dbtext and db_berkeley to define tables to be created, used by
35 35
 # postgres to do the grants
36
-STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs
36
+STANDARD_TABLES=${STANDARD_TABLES:-'version acc dbaliases domain domain_attrs
37 37
 		grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber
38 38
 		location location_attrs re_grp trusted address missed_calls
39 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
40
+		acc_cdrs topos_d topos_t'}
41
+EXTRA_TABLES=${EXTRA_TABLES:-'imc_members imc_rooms cpl sip_trace domainpolicy
42 42
 		carrierroute carrier_name domain_name carrierfailureroute userblacklist
43 43
 		globalblacklist htable purplemap uacreg pl_pipes mtree mtrees
44 44
 		sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine
45
-		dr_gateways dr_rules dr_gw_lists dr_groups secfilter}
46
-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
47
-		pua rls_presentity rls_watchers}
48
-DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs
49
-		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
45
+		dr_gateways dr_rules dr_gw_lists dr_groups secfilter'}
46
+PRESENCE_TABLES=${PRESENCE_TABLES:-'presentity active_watchers watchers xcap
47
+		pua rls_presentity rls_watchers'}
48
+DBUID_TABLES=${UID_TABLES:-'uid_credentials uid_domain uid_domain_attrs
49
+		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs'}
50 50
 
51 51
 # SQL definitions
52 52
 # If you change this definitions here, then you must change them
... ...
@@ -69,18 +69,18 @@ GREP=${GREP:-grep}
69 69
 SED=${SED:-sed}
70 70
 
71 71
 # define what modules should be installed
72
-STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group
72
+STANDARD_MODULES=${STANDARD_MODULES:-'standard acc lcr domain group
73 73
 		permissions registrar usrloc msilo alias_db uri_db speeddial
74
-		avpops auth_db pdt dialog dispatcher dialplan topos}
74
+		avpops auth_db pdt dialog dispatcher dialplan topos'}
75 75
 
76
-PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls}
76
+PRESENCE_MODULES=${PRESENCE_MODULES:-'presence rls'}
77 77
 
78
-EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
78
+EXTRA_MODULES=${EXTRA_MODULES:-'imc cpl siptrace domainpolicy carrierroute
79 79
 		drouting userblacklist htable purple uac pipelimit mtree sca mohqueue
80
-		rtpproxy rtpengine secfilter}
80
+		rtpproxy rtpengine secfilter'}
81 81
 
82
-DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags
83
-		uid_uri_db}
82
+DBUID_MODULES=${UID_MODULES:-'uid_auth_db uid_avp_db uid_domain uid_gflags
83
+		uid_uri_db'}
84 84
 
85 85
 ############################################################
86 86