~alpine/devel

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
1

[alpine-devel] [PATCH] main/kamailio: package bump to 4.0.2

Nathan Angelacos <nangel@alpinelinux.org>
Details
Message ID
<1371840106-22572-1-git-send-email-nangel@alpinelinux.org>
Sender timestamp
1371840106
DKIM signature
missing
Download raw message
10 years ago
Patch: +58 -44 
	modified:   APKBUILD
	deleted:    kamailio-3.2-backslash.patch
	new file:   kamailio-4.0-backslash.patch
---
 main/kamailio/APKBUILD                     | 14 ++++++---
 main/kamailio/kamailio-3.2-backslash.patch | 39 ------------------------
 main/kamailio/kamailio-4.0-backslash.patch | 49 ++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 44 deletions(-)
 delete mode 100644 main/kamailio/kamailio-3.2-backslash.patch
 create mode 100644 main/kamailio/kamailio-4.0-backslash.patch

diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 3b64089..86d8f3c 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=kamailio
pkgver=4.0.1
pkgrel=3
pkgver=4.0.2
pkgrel=0
pkgdesc="Open Source SIP Server"
url="http://www.kamailio.org/"
pkgusers="kamailio"
@@ -192,6 +192,7 @@ done

source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz
	fix-sql-module-loading-order.patch
    kamailio-4.0-backslash.patch
	kamailio.cfg
	kamailio.initd
	"
@@ -401,15 +402,18 @@ websocket() {
        "$_mod_list_websocket"
}

md5sums="ab57fcb1eb1195fa45f5c0935810e42a  kamailio-4.0.1_src.tar.gz
md5sums="012f1a0f288434549ad54ea2c5c3fa7a  kamailio-4.0.2_src.tar.gz
53cca39c47399eb2df20a1044d1e29eb  fix-sql-module-loading-order.patch
7ca9394c4987c83a27f492c5b6b055f0  kamailio-4.0-backslash.patch
a3c959ec568c43a905710e7d25cd8c25  kamailio.cfg
9c190575e28772a784c4172216d85333  kamailio.initd"
sha256sums="dd8652f47a572c0b0e1e45bdd0f6f838a14e50f2dbbeed77726ec0c7076e1769  kamailio-4.0.1_src.tar.gz
sha256sums="4b7651c5f5a796c1f207ecf5de0e503d7e727ad3acffa1b665627d7ee1480858  kamailio-4.0.2_src.tar.gz
d2b5518e31e9bfaf4b3f4b38f9c69f5c201255eae1a46e860afd471d123d274b  fix-sql-module-loading-order.patch
2cb24070809718deac1a32fd4de73eaea47c685d9608fd06ae6531bd34fe4604  kamailio-4.0-backslash.patch
8024266849033a917147827c3579a382f10f3796989bebc6de3d7c80c965fb72  kamailio.cfg
82612cc107e51de6968568a266de25b98e57257926defab7261fd81cbd624e00  kamailio.initd"
sha512sums="cb46c335ad6afba78ef72fbb4e323dcb4a9c7867aceaaac9f000f6d6199026f6d797735107ef554c79cd79188fa291398e389bcb9bc8acdef75da50874da36e1  kamailio-4.0.1_src.tar.gz
sha512sums="b45f6c01d16ce589ce531dc8f05563eeaf818e896c6c45303306922611651771cb6c617a2ce0dee04753e6989506bfac439e5611db6d3ba123fce452b55bdfb8  kamailio-4.0.2_src.tar.gz
8aeb1d6eb0d83c20b0ad31e74ca68cfa868a215a12b7029167c8913aeb84afa06e1bbc8b43dd3f84ce864a9ca6f04177d73401f99d37d9087c06a8d8431d18fd  fix-sql-module-loading-order.patch
f83ca7e4feaa02ba4c97fe8b3ff72857b334b6ba27f90b1cc4a2819c77bf40a1d6b77cc8d9b9afa045da5a1a4706b737b73f93c39c0cdb57c14088ca691afbf9  kamailio-4.0-backslash.patch
0b666bfa10fd0af97b62749f8691cb3f76d9b40d1abe0a33e810e367bd733d2e8189c89f7f23010ec591116aada6e1a8a403b17449fe775038917617f281ad4d  kamailio.cfg
babec2a230daea3c579dc581f9a945c70bd1736cdacaaa7a183d902c8d9fbd4f7958cce03424fb65cdf7a1f6aa077ad8aec7e53525e270f88f856caa374505e7  kamailio.initd"
diff --git a/main/kamailio/kamailio-3.2-backslash.patch b/main/kamailio/kamailio-3.2-backslash.patch
deleted file mode 100644
index 8f7a73a..0000000
--- a/main/kamailio/kamailio-3.2-backslash.patch
@@ -1,39 +0,0 @@
--- a/utils/kamctl/kamdbctl.base
+++ b/utils/kamctl/kamdbctl.base
@@ -32,14 +32,14 @@
 
 # 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 re_grp trusted address missed_calls usr_preferences
+STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs grp \
+		uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber \
+		location 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
+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}
-PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap 
+PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \
 		pua rls_presentity rls_watchers}
 
 # SQL definitions
@@ -62,11 +62,11 @@
 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 avpops auth_db pdt dialog dispatcher
+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}
-EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
+EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \
     userblacklist htable purple uac pipelimit mtree}
 
 ############################################################
diff --git a/main/kamailio/kamailio-4.0-backslash.patch b/main/kamailio/kamailio-4.0-backslash.patch
new file mode 100644
index 0000000..c64478d
--- /dev/null
+++ b/main/kamailio/kamailio-4.0-backslash.patch
@@ -0,0 +1,49 @@
--- 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}
 
 ############################################################
-- 
1.8.2.3



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20130626081712.4b1d34a7@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1371840106-22572-1-git-send-email-nangel@alpinelinux.org> (view parent)
Sender timestamp
1372227432
DKIM signature
missing
Download raw message
10 years ago 
On Fri, 21 Jun 2013 18:41:46 +0000
Nathan Angelacos <nangel@alpinelinux.org> wrote:

> 	modified:   APKBUILD
> 	deleted:    kamailio-3.2-backslash.patch
> 	new file:   kamailio-4.0-backslash.patch
> ---
>  main/kamailio/APKBUILD                     | 14 ++++++---
>  main/kamailio/kamailio-3.2-backslash.patch | 39 ------------------------
>  main/kamailio/kamailio-4.0-backslash.patch | 49 ++++++++++++++++++++++++++++++
>  3 files changed, 58 insertions(+), 44 deletions(-)
>  delete mode 100644 main/kamailio/kamailio-3.2-backslash.patch
>  create mode 100644 main/kamailio/kamailio-4.0-backslash.patch

Sorry for late answer. Looks like Jeff applied a variant of this.

-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)