main/kamailio: fix backslash patch

ref #3104

3 files changed, 15 insertions, 61 deletions

diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 7d38d236d5..3ac71b39e8 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
 pkgname=kamailio
 pkgver=4.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 arch="all"
@@ -121,10 +121,10 @@ _mod_list_stun="stun"
 # - modules depending on libval-threads libcrypto libsres libpthread
 _mod_list_dnssec="dnssec"
 
-# - modules depending on libsctp                                   
+# - modules depending on libsctp
 _mod_list_sctp="sctp"
 
-# - modules depending on openssl library                           
+# - modules depending on openssl library
 _mod_list_authephemeral="auth_ephemeral"
 
 # - modules related to SIMPLE presence extensions
@@ -190,7 +190,7 @@ for _i in db postgres sqlite dbtext mysql \
 	cpl xml unixodbc snmpstats xmpp carrierroute \
 	ldap utils tls presence lua ims outbound debugger \
 	extras websocket authephemeral; do
-  
+
    subpackages="$subpackages $pkgname-$_i"
    eval "_modules=\"\$_modules \$_mod_list_$_i\""
 done
@@ -415,21 +415,21 @@ authephemeral() {
 }
 
 md5sums="af4d79725cef6d404a127216e7637b9b  kamailio-4.1.1_src.tar.gz
-41f4c7d9882894fddae48f509b8c8007  kamailio-4.1-backslash.patch
+d76c006fd41ceb2e2e02b222c58a953d  kamailio-4.1-backslash.patch
 6251a5c33373c5276897c8abbbecc619  0001-websocket-remove-libunistring-dependency.patch
 5eb40563ffa4f1070d21994f1f7f83dc  0002-snmpstats-makefile.patch
 2f26f821280bc65b77231ec3ba6e0472  musl-fixes.patch
 a3c959ec568c43a905710e7d25cd8c25  kamailio.cfg
 1d9e153c56569df5c2a47c792527e0da  kamailio.initd"
 sha256sums="79838961ac772523eba610f6a7f47358a00a3297f0c1912c4e74843fe59d3734  kamailio-4.1.1_src.tar.gz
-7f9b2164d347e70b0aa8e33ae4166e3c95f03ce57786ae1704b436fc360fe4de  kamailio-4.1-backslash.patch
+1be745ef5a1ceaa4d201ba2e9219b53f7ebad417e0cc820c5e41e442670a263e  kamailio-4.1-backslash.patch
 bbc06f9ae62b2e8df2c58f9a171f0408e075d5a51e2457e85ef3ca01aa972df9  0001-websocket-remove-libunistring-dependency.patch
 f29b9fb1e89d4178e1541f454e41ccc2e068a1ae9bfaa89a7ef4607489279504  0002-snmpstats-makefile.patch
 46b92e27006c08cc3511d241d2958b720a8b5de650b7d51339b265b4b0a48474  musl-fixes.patch
 8024266849033a917147827c3579a382f10f3796989bebc6de3d7c80c965fb72  kamailio.cfg
 26924dfec75a5ff0f669fabfdbf9c16bf35e93ea91ca736a9a6289be6ee21ddd  kamailio.initd"
 sha512sums="98a38d1d30682af2baa8c4d9a5c7428175068004975a37f9054b1d57afc91707a1b8fbf1f58a886af5ce5ad4a15dc82fe498b82e8611e6ac793024593261d403  kamailio-4.1.1_src.tar.gz
-6b5f5a88f3a454abef591a73d25bd5e4718ef3a86e0aeddcdfec7d638c01ff2bf706b31d10d9ef970efcf8203bd17c9360d18a37be1bba6bf0f5e30987c3d7ce  kamailio-4.1-backslash.patch
+bc5568d9937cd7bff5cb3f2289a6828b1876d86be01c5395c3bcb4b742fd006b8e73f717c2fa8746c15c9ae3a6fca8fd883e6d5d97d54f8bf7f52c907e6988c1  kamailio-4.1-backslash.patch
 a972e57d8d64c104cb3df329442c746588818ed7f148a409d6050bcbbbb021cc1eeb970b59924e0ffb7f9487faacb99cada0dbfb19b0b87f66ca6b2bcf8b8345  0001-websocket-remove-libunistring-dependency.patch
 8b9c456d9d0ce9ae1e81cce8f06cd9d291e68be77a0da07541d55e9f3c15f534b4b52b061aecce1ef37a83030222554335196ec11b9aa5eda0033f0a6241afc9  0002-snmpstats-makefile.patch
 443b4b4cfcc6d4c55833185829cc43ed11b922169d9f24d8aecfaf3c59d65cb32a2806cdd2e846261767c7ad7cbca0517d52c7e0bf10e55cbe4b5fab2b62e4e8  musl-fixes.patch
diff --git a/main/kamailio/kamailio-4.0-backslash.patch b/main/kamailio/kamailio-4.0-backslash.patch
deleted file mode 100644
index c64478d5fb..0000000000
--- a/main/kamailio/kamailio-4.0-backslash.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/utils/kamctl/kamdbctl.base
-+++ b/utils/kamctl/kamdbctl.base
-@@ -33,17 +33,17 @@ 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
-+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}
--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}
--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
-@@ -73,16 +73,16 @@ 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}
- 
- 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}
- 
--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/kamailio-4.1-backslash.patch b/main/kamailio/kamailio-4.1-backslash.patch
index ed0ae70e51..f40db408d0 100644
--- a/main/kamailio/kamailio-4.1-backslash.patch
+++ b/main/kamailio/kamailio-4.1-backslash.patch
@@ -1,5 +1,5 @@
---- a/utils/kamctl/kamdbctl.base
-+++ b/utils/kamctl/kamdbctl.base
+--- kamailio-4.1.1.orig/utils/kamctl/kamdbctl.base
++++ kamailio-4.1.1/utils/kamctl/kamdbctl.base
 @@ -33,18 +33,18 @@
  
  # Used by dbtext and db_berkeley to define tables to be created, used by
@@ -28,7 +28,7 @@
  		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
  
  # SQL definitions
-@@ -74,13 +74,13 @@
+@@ -74,16 +74,16 @@
  SED=${SED:-sed}
  
  # define what modules should be installed
@@ -44,5 +44,8 @@
 +EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \
  		userblacklist htable purple uac pipelimit mtree sca mohqueue}
  
- 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
++DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags \
+ 		uid_uri_db}
+ 
+ ############################################################