[Pkg-voip-commits] r9648 - in /kamailio/trunk/debian: ./ patches/ patches/upstream/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Sat Apr 21 08:42:02 UTC 2012
Author: maniac-guest
Date: Sat Apr 21 08:42:01 2012
New Revision: 9648
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9648
Log:
new upstream version
Added:
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
Removed:
kamailio/trunk/debian/patches/upstream/0001-Proper-parsing-for-PVs.patch
kamailio/trunk/debian/patches/upstream/0002-xmlops-fixed-internal-module-name.patch
kamailio/trunk/debian/patches/upstream/0003-regex_mod-Fix-a-double-freeing-in-free_shared_memory.patch
kamailio/trunk/debian/patches/upstream/0004-core-added-back-the-option-to-use-name-IDs-for-tos-s.patch
kamailio/trunk/debian/patches/upstream/0005-modules_k-dialog-fix-dlg_var-return-value-in-case-of.patch
kamailio/trunk/debian/patches/upstream/0006-rtpproxy-proper-iovec-size-for-rtpproxy-commands.patch
kamailio/trunk/debian/patches/upstream/0007-snmpstats-safe-destroy-in-case-of-invalid-startup.patch
kamailio/trunk/debian/patches/upstream/0008-modules_k-siptrace-fixed-function-pipport2su.-error-.patch
kamailio/trunk/debian/patches/upstream/0009-dialog-k-match-on-callid-and-ftag-for-no-ACK-ed-dial.patch
kamailio/trunk/debian/patches/upstream/0010-ndb_redis-try-to-reconnect-if-query-to-redis-server-.patch
kamailio/trunk/debian/patches/upstream/0011-tls-check-for-support-of-ssl2.patch
kamailio/trunk/debian/patches/upstream/0012-kamailio.cfg-add-colon-before-the-port-for-voicemail.patch
kamailio/trunk/debian/patches/upstream/0013-module-modules-sipcapture-fixed-socket_info-structur.patch
kamailio/trunk/debian/patches/upstream/0014-uac-k-support-for-407-challenge-to-registrations.patch
kamailio/trunk/debian/patches/upstream/0015-modules-tm-Filled-in-the-snd-structure-for-event_rou.patch
kamailio/trunk/debian/patches/upstream/0016-dns-srv-load-balancing-distribution-fix.patch
kamailio/trunk/debian/patches/upstream/0017-call_control-avoid-internal-flags-conflicts-with-med.patch
kamailio/trunk/debian/patches/upstream/0018-modules-sipcapture-added-check-for-corrupted-and-def.patch
kamailio/trunk/debian/patches/upstream/0019-sqlops-check-for-DB_CAP_RAW_QUERY-of-DB-connection.patch
kamailio/trunk/debian/patches/upstream/0020-parser-sdp-allow-boundary-value-between-quotes.patch
kamailio/trunk/debian/patches/upstream/0021-core-include-str.h-in-parse_param.h-to-avoid-compile.patch
kamailio/trunk/debian/patches/upstream/0022-tm-fix-the-multiple-t_suspend-t_continue-scenario.patch
kamailio/trunk/debian/patches/upstream/0023-modules_k-siptrace-Fixed-0-termination-for-tmp_pippo.patch
kamailio/trunk/debian/patches/upstream/0024-debugger-safe-wrapper-around-cfg-name.patch
kamailio/trunk/debian/patches/upstream/0025-maxfwd-k-return-2-false-if-MF-header-cannot-be-proce.patch
kamailio/trunk/debian/patches/upstream/0026-pua_reginfo-fix-for-state-of-the-registration-during.patch
kamailio/trunk/debian/patches/upstream/0027-pua_reginfo-propoer-call-id-buffer-when-constructing.patch
Modified:
kamailio/trunk/debian/changelog
kamailio/trunk/debian/patches/series
Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9648&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Sat Apr 21 08:42:01 2012
@@ -1,4 +1,4 @@
-kamailio (3.2.2-1) UNRELEASED; urgency=low
+kamailio (3.2.3-1) UNRELEASED; urgency=low
* New upstream release
* debian/rules:
@@ -24,7 +24,7 @@
* debian/copyright
+ using copyright-format/1.0/
- -- Victor Seva <linuxmaniac at torreviejawireless.org> Wed, 18 Apr 2012 08:31:49 +0200
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Sat, 21 Apr 2012 10:25:44 +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=9648&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Sat Apr 21 08:42:01 2012
@@ -1,30 +1,6 @@
-upstream/0001-Proper-parsing-for-PVs.patch
-upstream/0002-xmlops-fixed-internal-module-name.patch
-upstream/0003-regex_mod-Fix-a-double-freeing-in-free_shared_memory.patch
-upstream/0004-core-added-back-the-option-to-use-name-IDs-for-tos-s.patch
-upstream/0005-modules_k-dialog-fix-dlg_var-return-value-in-case-of.patch
-upstream/0006-rtpproxy-proper-iovec-size-for-rtpproxy-commands.patch
-upstream/0007-snmpstats-safe-destroy-in-case-of-invalid-startup.patch
-upstream/0008-modules_k-siptrace-fixed-function-pipport2su.-error-.patch
-upstream/0009-dialog-k-match-on-callid-and-ftag-for-no-ACK-ed-dial.patch
-upstream/0010-ndb_redis-try-to-reconnect-if-query-to-redis-server-.patch
-upstream/0011-tls-check-for-support-of-ssl2.patch
-upstream/0012-kamailio.cfg-add-colon-before-the-port-for-voicemail.patch
-upstream/0013-module-modules-sipcapture-fixed-socket_info-structur.patch
-upstream/0014-uac-k-support-for-407-challenge-to-registrations.patch
-upstream/0015-modules-tm-Filled-in-the-snd-structure-for-event_rou.patch
-upstream/0016-dns-srv-load-balancing-distribution-fix.patch
-upstream/0017-call_control-avoid-internal-flags-conflicts-with-med.patch
-upstream/0018-modules-sipcapture-added-check-for-corrupted-and-def.patch
-upstream/0019-sqlops-check-for-DB_CAP_RAW_QUERY-of-DB-connection.patch
-upstream/0020-parser-sdp-allow-boundary-value-between-quotes.patch
-upstream/0021-core-include-str.h-in-parse_param.h-to-avoid-compile.patch
-upstream/0022-tm-fix-the-multiple-t_suspend-t_continue-scenario.patch
-upstream/0023-modules_k-siptrace-Fixed-0-termination-for-tmp_pippo.patch
-upstream/0024-debugger-safe-wrapper-around-cfg-name.patch
-upstream/0025-maxfwd-k-return-2-false-if-MF-header-cannot-be-proce.patch
-upstream/0026-pua_reginfo-fix-for-state-of-the-registration-during.patch
-upstream/0027-pua_reginfo-propoer-call-id-buffer-when-constructing.patch
+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
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
spelling-errors.patch
Added: 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=9648&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0001-xcap_client-set-table-version-to-4.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0001-xcap_client-set-table-version-to-4.patch Sat Apr 21 08:42:01 2012
@@ -1,0 +1,27 @@
+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
+
+- reported by Gnaneshwar Gatla
+(cherry picked from commit ab36b2b10e2f99ab584ec916bccc2a40c4fa394f)
+---
+ modules_k/xcap_client/xcap_client.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules_k/xcap_client/xcap_client.c b/modules_k/xcap_client/xcap_client.c
+index 0551c67..c3f4049 100644
+--- a/modules_k/xcap_client/xcap_client.c
++++ b/modules_k/xcap_client/xcap_client.c
+@@ -51,7 +51,7 @@
+
+ MODULE_VERSION
+
+-#define XCAP_TABLE_VERSION 3
++#define XCAP_TABLE_VERSION 4
+
+ static int mod_init(void);
+ static int child_init(int rank);
+--
+1.7.5.4
+
Added: 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=9648&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch Sat Apr 21 08:42:01 2012
@@ -1,0 +1,120 @@
+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
+ server (cherry picked from commit
+ 171f560f768b43e140c24b6cc4823a92f13b2f05)
+
+---
+ modules_k/presence_xml/README | 29 +++++++++++----------
+ modules_k/presence_xml/doc/presence_xml_admin.xml | 11 ++++---
+ 2 files changed, 21 insertions(+), 19 deletions(-)
+
+diff --git a/modules_k/presence_xml/README b/modules_k/presence_xml/README
+index 84b0da2..b53cc01 100644
+--- a/modules_k/presence_xml/README
++++ b/modules_k/presence_xml/README
+@@ -21,7 +21,7 @@ Anca-Maria Vamanu
+ 2.1. Kamailio Modules
+ 2.2. External Libraries or Applications
+
+- 3. Exported Parameters
++ 3. Parameters
+
+ 3.1. db_url(str)
+ 3.2. xcap_table(str)
+@@ -34,7 +34,7 @@ Anca-Maria Vamanu
+ 3.9. xcap_server (str)
+ 3.10. passive_mode(int)
+
+- 4. Exported Functions
++ 4. Functions
+
+ 4.1. pres_check_basic(presentity_uri, status)
+ 4.2. pres_check_activities(presentity_uri, activity)
+@@ -69,7 +69,7 @@ Chapter 1. Admin Guide
+ 2.1. Kamailio Modules
+ 2.2. External Libraries or Applications
+
+- 3. Exported Parameters
++ 3. Parameters
+
+ 3.1. db_url(str)
+ 3.2. xcap_table(str)
+@@ -82,7 +82,7 @@ Chapter 1. Admin Guide
+ 3.9. xcap_server (str)
+ 3.10. passive_mode(int)
+
+- 4. Exported Functions
++ 4. Functions
+
+ 4.1. pres_check_basic(presentity_uri, status)
+ 4.2. pres_check_activities(presentity_uri, activity)
+@@ -127,7 +127,7 @@ Chapter 1. Admin Guide
+ running Kamailio with this module loaded:
+ * libxml.
+
+-3. Exported Parameters
++3. Parameters
+
+ 3.1. db_url(str)
+ 3.2. xcap_table(str)
+@@ -236,14 +236,15 @@ modparam("presence_xml", "pidf_manipulation", 1)
+
+ 3.8. integrated_xcap_server (int)
+
+- This parameter is a flag for the type of XCAP server or servers used.
+- If the XCAP server is integrated with Kamailio presence_XML module and
+- access the same database tables directly, like the XCAP-lite server
+- from AG Projects, the parameter should be set to a positive value.
+- Apart from updating in xcap table, the integrated server must send an
+- MI command refershWatchers [pres_uri] [event] when a user modifies a
+- rules document, to instruct the presence_xml module to update states
+- from the database and, if needed, send NOTIFY updates.
++ This parameter is a flag for the type of XCAP servers used. If the XCAP
++ server is integrated with Kamailio presence_xml module and access the
++ same database tables directly, like the embedded XCAP server
++ implemented in xcap_server module, the parameter should be set to a
++ positive value. Apart from updating in xcap table, if the integrated
++ server is not running on the same Kamailio instance, it must send an MI
++ command refershWatchers [pres_uri] [event] when a user modifies a rules
++ document, to instruct the presence_xml module to update states from the
++ database and, if needed, send NOTIFY updates.
+
+ Otherwise, it uses xcap_client module to fetch documents from the XCAP
+ servers with HTTP requests. This mode is currently not supported.
+@@ -281,7 +282,7 @@ modparam("presence_xml", "xcap_server", "xcap_server.ag.org")
+ modparam("presence_xml", "passive_mode", 1)
+ ...
+
+-4. Exported Functions
++4. Functions
+
+ 4.1. pres_check_basic(presentity_uri, status)
+ 4.2. pres_check_activities(presentity_uri, activity)
+diff --git a/modules_k/presence_xml/doc/presence_xml_admin.xml b/modules_k/presence_xml/doc/presence_xml_admin.xml
+index b7832a9..ffab8b9 100644
+--- a/modules_k/presence_xml/doc/presence_xml_admin.xml
++++ b/modules_k/presence_xml/doc/presence_xml_admin.xml
+@@ -246,12 +246,13 @@ modparam("presence_xml", "pidf_manipulation", 1)
+ <section>
+ <title><varname>integrated_xcap_server</varname> (int)</title>
+ <para>
+- This parameter is a flag for the type of XCAP server or servers
+- used. If the XCAP server is integrated with &kamailio; presence_XML
+- module and access the same database tables directly, like the XCAP-lite
+- server from AG Projects, the parameter should be
++ This parameter is a flag for the type of XCAP servers
++ used. If the XCAP server is integrated with &kamailio; presence_xml
++ module and access the same database tables directly, like the embedded
++ XCAP server implemented in xcap_server module, the parameter should be
+ set to a positive value. Apart from updating in xcap table,
+- the integrated server must send an MI command refershWatchers
++ if the integrated server is not running on the same &kamailio; instance,
++ it must send an MI command refershWatchers
+ [pres_uri] [event] when a user modifies a rules document, to
+ instruct the presence_xml module to update states from the database
+ and, if needed, send NOTIFY updates.
+--
+1.7.5.4
+
Added: 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=9648&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch Sat Apr 21 08:42:01 2012
@@ -1,0 +1,41 @@
+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
+ c5a51e4236498cfe3ca31c8aae96d3b422a9da23)
+
+---
+ modules/db_postgres/README | 2 +-
+ modules/db_postgres/doc/db_postgres_admin.xml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/db_postgres/README b/modules/db_postgres/README
+index 3859294..76f10ce 100644
+--- a/modules/db_postgres/README
++++ b/modules/db_postgres/README
+@@ -85,7 +85,7 @@ Chapter 1. Admin Guide
+
+ Example 1.1. Set retries parameter
+ ...
+-modparam("db_mysql", "retries", 3)
++modparam("db_postgres", "retries", 3)
+ ...
+
+ 4. Functions
+diff --git a/modules/db_postgres/doc/db_postgres_admin.xml b/modules/db_postgres/doc/db_postgres_admin.xml
+index 4f36f53..3092c56 100644
+--- a/modules/db_postgres/doc/db_postgres_admin.xml
++++ b/modules/db_postgres/doc/db_postgres_admin.xml
+@@ -76,7 +76,7 @@
+ <title>Set <varname>retries</varname> parameter</title>
+ <programlisting format="linespecific">
+ ...
+-modparam("db_mysql", "retries", 3)
++modparam("db_postgres", "retries", 3)
+ ...
+ </programlisting>
+ </example>
+--
+1.7.5.4
+
More information about the Pkg-voip-commits
mailing list