kamdbctl: Merged patch from alpine packaging (#1786)

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

pkg/kamailio/alpine/0001-kamdbctl.base.patch

@@ -1,57 +0,0 @@
---- a/utils/kamctl/kamdbctl.base
-+++ b/utils/kamctl/kamdbctl.base
-@@ -33,20 +33,20 @@
- 
- # Used by dbtext and db_berkeley to define tables to be created, used by
- # postgres to do the grants
--STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs
-+STANDARD_TABLES=${STANDARD_TABLES:-'version acc dbaliases domain domain_attrs
- 		grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber
- 		location location_attrs re_grp trusted address missed_calls
- 		usr_preferences aliases silo dialog dialog_vars dispatcher dialplan
--		acc_cdrs topos_d topos_t}
--EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy
-+		acc_cdrs topos_d topos_t'}
-+EXTRA_TABLES=${EXTRA_TABLES:-'imc_members imc_rooms cpl sip_trace domainpolicy
- 		carrierroute carrier_name domain_name carrierfailureroute userblacklist
- 		globalblacklist htable purplemap uacreg pl_pipes mtree mtrees
- 		sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine
--		dr_gateways dr_rules dr_gw_lists dr_groups}
--PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
--		pua rls_presentity rls_watchers}
--DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs
--		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
-+		dr_gateways dr_rules dr_gw_lists dr_groups'}
-+PRESENCE_TABLES=${PRESENCE_TABLES:-'presentity active_watchers watchers xcap
-+		pua rls_presentity rls_watchers'}
-+DBUID_TABLES=${UID_TABLES:-'uid_credentials uid_domain uid_domain_attrs
-+		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs'}
- 
- # SQL definitions
- # If you change this definitions here, then you must change them
-@@ -69,18 +69,18 @@
- SED=${SED:-sed}
- 
- # define what modules should be installed
--STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group
-+STANDARD_MODULES=${STANDARD_MODULES:-'standard acc lcr domain group
- 		permissions registrar usrloc msilo alias_db uri_db speeddial
--		avpops auth_db pdt dialog dispatcher dialplan topos}
-+		avpops auth_db pdt dialog dispatcher dialplan topos'}
- 
--PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls}
-+PRESENCE_MODULES=${PRESENCE_MODULES:-'presence rls'}
- 
--EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
-+EXTRA_MODULES=${EXTRA_MODULES:-'imc cpl siptrace domainpolicy carrierroute
- 		drouting userblacklist htable purple uac pipelimit mtree sca mohqueue
--		rtpproxy rtpengine}
-+		rtpproxy rtpengine'}
- 
--DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags
--		uid_uri_db}
-+DBUID_MODULES=${UID_MODULES:-'uid_auth_db uid_avp_db uid_domain uid_gflags
-+		uid_uri_db'}
- 
- ############################################################
- 

pkg/kamailio/alpine/APKBUILD

@@ -253,7 +253,6 @@ for _i in db postgres sqlite dbtext mysql \
 done
 
 source="${pkgname}-${pkgver}${_suffix}.tar.gz::https://github.com/kamailio/$pkgname/archive/$_gitcommit.tar.gz
-	0001-kamdbctl.base.patch
 	kamailio.initd
 	"
 
@@ -557,5 +556,4 @@ sipdump() {
 }
 
 sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6  kamailio-5.1.0.20171125-991fe9b.tar.gz
-6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db  0001-kamdbctl.base.patch
 321b1b160434150bcde3c0ad7f47ddf259791b68d4ce74ba4c35034026421a2bc6f5e86f26f393f5fcdb523d8cd75f944709473065553ce860b0ea06b3dc2a1b  kamailio.initd"

utils/kamctl/kamdbctl.base

@@ -33,20 +33,20 @@ INSTALL_DBUID_TABLES=${INSTALL_DBUID_TABLES:-ask}
 
 # Used by dbtext and db_berkeley to define tables to be created, used by
 # postgres to do the grants
-STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs
+STANDARD_TABLES=${STANDARD_TABLES:-'version acc dbaliases domain domain_attrs
 		grp uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber
 		location location_attrs re_grp trusted address missed_calls
 		usr_preferences aliases silo dialog dialog_vars dispatcher dialplan
-		acc_cdrs topos_d topos_t}
-EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy
+		acc_cdrs topos_d topos_t'}
+EXTRA_TABLES=${EXTRA_TABLES:-'imc_members imc_rooms cpl sip_trace domainpolicy
 		carrierroute carrier_name domain_name carrierfailureroute userblacklist
 		globalblacklist htable purplemap uacreg pl_pipes mtree mtrees
 		sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine
-		dr_gateways dr_rules dr_gw_lists dr_groups secfilter}
-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
-		pua rls_presentity rls_watchers}
-DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs
-		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
+		dr_gateways dr_rules dr_gw_lists dr_groups secfilter'}
+PRESENCE_TABLES=${PRESENCE_TABLES:-'presentity active_watchers watchers xcap
+		pua rls_presentity rls_watchers'}
+DBUID_TABLES=${UID_TABLES:-'uid_credentials uid_domain uid_domain_attrs
+		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs'}
 
 # SQL definitions
 # If you change this definitions here, then you must change them
@@ -69,18 +69,18 @@ GREP=${GREP:-grep}
 SED=${SED:-sed}
 
 # define what modules should be installed
-STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group
+STANDARD_MODULES=${STANDARD_MODULES:-'standard acc lcr domain group
 		permissions registrar usrloc msilo alias_db uri_db speeddial
-		avpops auth_db pdt dialog dispatcher dialplan topos}
+		avpops auth_db pdt dialog dispatcher dialplan topos'}
 
-PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls}
+PRESENCE_MODULES=${PRESENCE_MODULES:-'presence rls'}
 
-EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
+EXTRA_MODULES=${EXTRA_MODULES:-'imc cpl siptrace domainpolicy carrierroute
 		drouting userblacklist htable purple uac pipelimit mtree sca mohqueue
-		rtpproxy rtpengine secfilter}
+		rtpproxy rtpengine secfilter'}
 
-DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags
-		uid_uri_db}
+DBUID_MODULES=${UID_MODULES:-'uid_auth_db uid_avp_db uid_domain uid_gflags
+		uid_uri_db'}
 
 ############################################################