[Pkg-voip-commits] r9662 - in /kamailio/trunk/debian: ./ patches/ patches/upstream/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Wed Apr 25 14:31:20 UTC 2012
Author: maniac-guest
Date: Wed Apr 25 14:31:19 2012
New Revision: 9662
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9662
Log:
add upstream patches
Added:
kamailio/trunk/debian/patches/upstream/0004-userblacklist-k-fix-some-doc-errors-pointed-out-from.patch
kamailio/trunk/debian/patches/upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch
kamailio/trunk/debian/patches/upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch
Modified:
kamailio/trunk/debian/changelog
kamailio/trunk/debian/patches/series
kamailio/trunk/debian/patches/upstream/0001-xcap_client-set-table-version-to-4.patch
kamailio/trunk/debian/patches/upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch
kamailio/trunk/debian/patches/upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch
Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9662&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Wed Apr 25 14:31:19 2012
@@ -24,7 +24,7 @@
* debian/copyright
+ using copyright-format/1.0/
- -- Victor Seva <linuxmaniac at torreviejawireless.org> Sat, 21 Apr 2012 10:25:44 +0200
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Wed, 25 Apr 2012 16:30:38 +0200
kamailio (1.5.1-2) unstable; urgency=low
Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9662&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Wed Apr 25 14:31:19 2012
@@ -1,6 +1,9 @@
upstream/0001-xcap_client-set-table-version-to-4.patch
upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch
upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch
+upstream/0004-userblacklist-k-fix-some-doc-errors-pointed-out-from.patch
+upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch
+upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
spelling-errors.patch
Modified: kamailio/trunk/debian/patches/upstream/0001-xcap_client-set-table-version-to-4.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0001-xcap_client-set-table-version-to-4.patch?rev=9662&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0001-xcap_client-set-table-version-to-4.patch (original)
+++ kamailio/trunk/debian/patches/upstream/0001-xcap_client-set-table-version-to-4.patch Wed Apr 25 14:31:19 2012
@@ -1,7 +1,7 @@
From 5fefe8457bd9e7b5a35aa0fc3816290ca0964576 Mon Sep 17 00:00:00 2001
From: Daniel-Constantin Mierla <miconda at gmail.com>
Date: Fri, 20 Apr 2012 09:28:44 +0200
-Subject: [PATCH 1/3] xcap_client: set table version to 4
+Subject: [PATCH] xcap_client: set table version to 4
- reported by Gnaneshwar Gatla
(cherry picked from commit ab36b2b10e2f99ab584ec916bccc2a40c4fa394f)
Modified: kamailio/trunk/debian/patches/upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch?rev=9662&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch (original)
+++ kamailio/trunk/debian/patches/upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch Wed Apr 25 14:31:19 2012
@@ -1,7 +1,7 @@
From da0eff88c7467365e9f7300960baee5aac36f27a Mon Sep 17 00:00:00 2001
From: Daniel-Constantin Mierla <miconda at gmail.com>
Date: Fri, 20 Apr 2012 09:42:39 +0200
-Subject: [PATCH 2/3] presence_xml: updates to docs to refer to embedded xcap
+Subject: [PATCH] presence_xml: updates to docs to refer to embedded xcap
server (cherry picked from commit
171f560f768b43e140c24b6cc4823a92f13b2f05)
Modified: kamailio/trunk/debian/patches/upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch?rev=9662&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch (original)
+++ kamailio/trunk/debian/patches/upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch Wed Apr 25 14:31:19 2012
@@ -1,8 +1,8 @@
From 91b6dd8d1fbf649e6fe3075f59ae92892fb6cb1f Mon Sep 17 00:00:00 2001
From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Date: Fri, 20 Apr 2012 14:15:36 +0100
-Subject: [PATCH 3/3] modules/db_postgres: Fixed copy-and-paste error in
- module documentation (cherry picked from commit
+Subject: [PATCH] modules/db_postgres: Fixed copy-and-paste error in module
+ documentation (cherry picked from commit
c5a51e4236498cfe3ca31c8aae96d3b422a9da23)
---
Added: kamailio/trunk/debian/patches/upstream/0004-userblacklist-k-fix-some-doc-errors-pointed-out-from.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0004-userblacklist-k-fix-some-doc-errors-pointed-out-from.patch?rev=9662&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0004-userblacklist-k-fix-some-doc-errors-pointed-out-from.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0004-userblacklist-k-fix-some-doc-errors-pointed-out-from.patch Wed Apr 25 14:31:19 2012
@@ -1,0 +1,78 @@
+From 349969b5a91744eebd7c269cb747d2332245df6e Mon Sep 17 00:00:00 2001
+From: Henning Westerholt <hw at kamailio.org>
+Date: Mon, 23 Apr 2012 18:21:46 +0200
+Subject: [PATCH] userblacklist(k): fix some doc errors, pointed out from
+ Daniel Vukicevic, daniel at vukicevic dot com (cherry
+ picked from commit
+ 7fc5aa2c050379063212c4bb5f06697e8a97c665)
+
+---
+ modules_k/userblacklist/README | 6 +++---
+ .../userblacklist/doc/userblacklist_admin.xml | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/modules_k/userblacklist/README b/modules_k/userblacklist/README
+index 2227526..6089c60 100644
+--- a/modules_k/userblacklist/README
++++ b/modules_k/userblacklist/README
+@@ -220,7 +220,7 @@ table)
+ ...
+ $avp(i:80) = $rU;
+ # rewrite the R-URI
+-if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)"))
++if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) {
+ sl_send_reply("403", "Forbidden");
+ exit;
+ }
+@@ -241,7 +241,7 @@ table)
+ ...
+ $avp(i:80) = $rU;
+ # rewrite the R-URI
+-if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)"))
++if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) {
+ # process request
+ exit;
+ }
+@@ -256,7 +256,7 @@ if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)"))
+
+ Example 1.5. check_blacklist usage
+ ...
+-if (!check_blacklist("global_blacklist")))
++if (!check_blacklist("globalblacklist")) {
+ sl_send_reply("403", "Forbidden");
+ exit;
+ }
+diff --git a/modules_k/userblacklist/doc/userblacklist_admin.xml b/modules_k/userblacklist/doc/userblacklist_admin.xml
+index 910b930..2900a02 100644
+--- a/modules_k/userblacklist/doc/userblacklist_admin.xml
++++ b/modules_k/userblacklist/doc/userblacklist_admin.xml
+@@ -140,7 +140,7 @@ modparam("userblacklist", "match_mode", 128)
+ ...
+ $avp(i:80) = $rU;
+ # rewrite the R-URI
+-if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)"))
++if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) {
+ sl_send_reply("403", "Forbidden");
+ exit;
+ }
+@@ -167,7 +167,7 @@ if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)"))
+ ...
+ $avp(i:80) = $rU;
+ # rewrite the R-URI
+-if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)"))
++if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) {
+ # process request
+ exit;
+ }
+@@ -189,7 +189,7 @@ if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)"))
+ <title><function>check_blacklist</function> usage</title>
+ <programlisting format="linespecific">
+ ...
+-if (!check_blacklist("global_blacklist")))
++if (!check_blacklist("globalblacklist")) {
+ sl_send_reply("403", "Forbidden");
+ exit;
+ }
+--
+1.7.5.4
+
Added: kamailio/trunk/debian/patches/upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch?rev=9662&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch Wed Apr 25 14:31:19 2012
@@ -1,0 +1,55 @@
+From 11ca33836fdd33d7c3d36c4f1acc6c6782edfb5d Mon Sep 17 00:00:00 2001
+From: Marius Zbihlei <marius.zbihlei at 1and1.ro>
+Date: Wed, 25 Apr 2012 14:54:31 +0300
+Subject: [PATCH] modules/sipcapture: Fixed crash in case contact was "*"
+
+---
+ modules/sipcapture/sipcapture.c | 25 ++++++++++++++++++-------
+ 1 files changed, 18 insertions(+), 7 deletions(-)
+
+diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c
+index 50f384e..bbebd28 100644
+--- a/modules/sipcapture/sipcapture.c
++++ b/modules/sipcapture/sipcapture.c
+@@ -187,7 +187,7 @@ static str type_column = str_init("type");
+ static str node_column = str_init("node");
+ static str msg_column = str_init("msg");
+ static str capture_node = str_init("homer01");
+-
++static str star_contact = str_init("*");
+
+ int raw_sock_desc = -1; /* raw socket used for ip packets */
+ unsigned int raw_sock_children = 1;
+@@ -1136,12 +1136,23 @@ static int sip_capture(struct sip_msg *msg, char *s1, char *s2)
+
+ cb = (contact_body_t*)msg->contact->parsed;
+
+- if(cb && cb->contacts) {
+- if(parse_uri( cb->contacts->uri.s, cb->contacts->uri.len, &contact)<0){
+- LOG(L_ERR, "ERROR: do_action: bad contact dropping"" packet\n");
+- return -1;
+- }
+- }
++ if(cb) {
++ if (cb->contacts) {
++ if(parse_uri( cb->contacts->uri.s, cb->contacts->uri.len, &contact)<0){
++ LOG(L_ERR, "ERROR: do_action: bad contact dropping"" packet\n");
++ return -1;
++ }
++ } else {
++ if(cb->star){ /* in the case Contact is "*" */
++ memset(&contact, 0, sizeof(contact));
++ contact.user.s = star_contact.s;
++ contact.user.len = star_contact.len;
++ } else {
++ LOG(L_NOTICE,"Invalid contact\n");
++ memset(&contact, 0, sizeof(contact));
++ }
++ }
++ }
+ }
+
+ /* get header x-cid: */
+--
+1.7.5.4
+
Added: kamailio/trunk/debian/patches/upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch?rev=9662&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch Wed Apr 25 14:31:19 2012
@@ -1,0 +1,30 @@
+From 176f35cc78167267524724b432abad74c7218a35 Mon Sep 17 00:00:00 2001
+From: Anca Vamanu <anca.vamanu at 1and1.ro>
+Date: Wed, 25 Apr 2012 15:06:52 +0300
+Subject: [PATCH] modules_k/presence Safety check for malformed Subscribe
+
+ Subscribe with header 'Contact: *' caused crash in presence.
+---
+ modules_k/presence/subscribe.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c
+index 9db947e..b1405de 100644
+--- a/modules_k/presence/subscribe.c
++++ b/modules_k/presence/subscribe.c
+@@ -1078,6 +1078,12 @@ int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int mexp,
+ LM_ERR("cannot parse contact header\n");
+ goto error;
+ }
++ if(b->star || b->contacts==NULL)
++ {
++ LM_ERR("Wrong contact header\n");
++ goto error;
++ }
++
+ subs->contact = b->contacts->uri;
+
+ LM_DBG("subs->contact= %.*s - len = %d\n",subs->contact.len,
+--
+1.7.5.4
+
More information about the Pkg-voip-commits
mailing list