From 2cfe3ece99a46d5db320b93d76bbf5b9e8e9efee Mon Sep 17 00:00:00 2001 From: rob dux Date: Sun, 26 Jun 2016 18:39:35 -0500 Subject: main/kamailio: fix kamdbctl.base stringify parameter expansions --- main/kamailio/0003-kamdbctl-backslash.patch | 55 ---------------------------- main/kamailio/0003-kamdbctl.base.patch | 56 +++++++++++++++++++++++++++++ main/kamailio/APKBUILD | 19 ++++------ 3 files changed, 62 insertions(+), 68 deletions(-) delete mode 100644 main/kamailio/0003-kamdbctl-backslash.patch create mode 100644 main/kamailio/0003-kamdbctl.base.patch diff --git a/main/kamailio/0003-kamdbctl-backslash.patch b/main/kamailio/0003-kamdbctl-backslash.patch deleted file mode 100644 index e87b6206cf..0000000000 --- a/main/kamailio/0003-kamdbctl-backslash.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base -index 3daf457..b60413c 100644 ---- a/utils/kamctl/kamdbctl.base -+++ b/utils/kamctl/kamdbctl.base -@@ -33,18 +33,18 @@ 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 -- 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 -+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 -- carrierroute carrier_name domain_name carrierfailureroute userblacklist -- globalblacklist htable purplemap uacreg pl_pipes mtree mtrees -+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} --PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap -+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 -+DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs \ - uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs} - - # SQL definitions -@@ -68,17 +68,17 @@ GREP=${GREP:-grep} - SED=${SED:-sed} - - # define what modules should be installed --STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group -- permissions registrar usrloc msilo alias_db uri_db speeddial -+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} - - PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls} - --EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute -- userblacklist htable purple uac pipelimit mtree sca mohqueue -+EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \ -+ userblacklist htable purple uac pipelimit mtree sca mohqueue \ - rtpproxy} - --DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags -+DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags \ - uid_uri_db} - - ############################################################ diff --git a/main/kamailio/0003-kamdbctl.base.patch b/main/kamailio/0003-kamdbctl.base.patch new file mode 100644 index 0000000000..34cf29f0ed --- /dev/null +++ b/main/kamailio/0003-kamdbctl.base.patch @@ -0,0 +1,56 @@ +--- a/utils/kamctl/kamdbctl.base ++++ b/utils/kamctl/kamdbctl.base +@@ -33,19 +33,19 @@ + + # 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} +-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} ++ sca_subscriptions mohqcalls mohqueues rtpproxy'} ++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 +@@ -68,18 +68,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 + userblacklist htable purple uac pipelimit mtree sca mohqueue +- rtpproxy} ++ rtpproxy'} + +-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'} + + ############################################################ + diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD index 791476f4ce..b3e4314150 100644 --- a/main/kamailio/APKBUILD +++ b/main/kamailio/APKBUILD @@ -13,7 +13,7 @@ _gittag=HEAD pkgver=4.4.2 -pkgrel=1 +pkgrel=2 [ -z "${_gitcommit}" ] && _suffix="_src" || _suffix="-${_gitcommit}" pkgdesc="Open Source SIP Server" @@ -234,7 +234,7 @@ done source="http://www.kamailio.org/pub/kamailio/$pkgver/src/${pkgname}-${pkgver}${_suffix}.tar.gz 0001-musl-fixes.patch - 0003-kamdbctl-backslash.patch + 0003-kamdbctl.base.patch 0004-remove-spurious-execinfo.patch kamailio.cfg kamailio.initd @@ -258,14 +258,7 @@ snapshot() { _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - for i in $source; do - case $i in - *.patch) - msg "Applying $i" - patch -p1 -i "$srcdir"/$i || return 1 - ;; - esac - done + default_prepare sed -i \ -e "s:-O9 -funroll-loops:$CFLAGS:g" \ @@ -510,19 +503,19 @@ http_async_client() { md5sums="24b7306ef975975299961a26e95f2f9f kamailio-4.4.2_src.tar.gz 18863791d386659eae6ef0c82a2517ae 0001-musl-fixes.patch -8c83bc9102a77711e30dcac6e9bba534 0003-kamdbctl-backslash.patch +800dbf35a951582a08eceed68532d7a6 0003-kamdbctl.base.patch e613ef3611f9a5091ce05084daf9c9a5 0004-remove-spurious-execinfo.patch 299706d97e30a4f0d9b4c873df422866 kamailio.cfg 39dc9355fa7d8fec425d3b17c2fb26e0 kamailio.initd" sha256sums="d7c17456d5a9cacf50fa63829f79af8fc52fd5531a71dd619c8aa63b45298793 kamailio-4.4.2_src.tar.gz 254ea5d4699417aec49e1aae45398a802067a8967060f2a469e278779d876d22 0001-musl-fixes.patch -9aa3b9afea6f0d2d8d306c2f7d093cb846189285e560ce3c62fa2ec2f3d461fe 0003-kamdbctl-backslash.patch +c01250a7fe339b53b51cc62d0f6c0bc0a9c9c4596a9692771d26b40216f822d2 0003-kamdbctl.base.patch fb9c13dd3cd5cd07cf7599cf6688c46739334a18ade64f8bf44f84fb179e8409 0004-remove-spurious-execinfo.patch 8b742ff710ef67ff59ec07a260690ebcdda24fb6f0b7b64dc50433a1bacf99f2 kamailio.cfg ba928fa914feea2b95b8c659832e3fbea25eb6ac1ce56e4c23ff58c09f1ec3b8 kamailio.initd" sha512sums="56e84909c45e42db1981e61b2d67ca086d281a0bd6ed7abd097e2a380cbc471ec0faea3019b0a835281e22ab762f4d51ea9e0524f0bd851b210538b0946068a9 kamailio-4.4.2_src.tar.gz 32c8e723ee858b24a3bd1313537e9348bdd895e709041d52199b7d2c4054565f3f8d203458b5a7bd5f4b09a782a972cf87f931de5bb8199e6f9786a3c9bfb3ba 0001-musl-fixes.patch -b71457ee4badf2c1848f4ea86afddfd2be2383791e559f5758fd8502d87e434f0149485eb1c33722d111999508b81b0acb56c9dcb462b6522a5f4cbfae05dfde 0003-kamdbctl-backslash.patch +139fab275e7d01da85bf3422a16966165c72584122513d34b5fb3d9341c430eeb69ec5b86b82ff4acce709f5ab3f651de5954ae38ff9a256a19b22d88cfea830 0003-kamdbctl.base.patch d962f7bb7fe5c0747dff050d4c2d74f16eedba903a3347b3f86b42e5d7778f5f8b973a6134fd6714c0a62189bc475396e8225db3468390f6e1a84fc1d44f0d87 0004-remove-spurious-execinfo.patch c1abf69b48847dc8c7ab0d11ef9adb531aa4635f9d44db6933981edc5a47df374664fb24867b19aa64abbcc9777bf1cd0360d9aea54e27b081065928c61e0f0b kamailio.cfg cd6e3b677d803cd78561ad14d9b2589fd35ad0096f48047fdcb4ddc7d9103871357efba3b350946844cb53dbb081210746421fc420c22ac845b90251168a628e kamailio.initd" -- cgit v1.2.3