[Pkg-voip-commits] r9927 - in /kamailio/trunk/debian: ./ patches/ patches/upstream/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Sun Aug 5 13:46:00 UTC 2012
Author: maniac-guest
Date: Sun Aug 5 13:45:59 2012
New Revision: 9927
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9927
Log:
new upstream release
Added:
kamailio/trunk/debian/patches/upstream/0001-rr-k-add-missing-in-Route-header-for-strict-routing.patch
- copied unchanged from r9926, kamailio/trunk/debian/patches/upstream/rr-k-add-missing-in-Route-header-for-strict-routing.patch
kamailio/trunk/debian/patches/upstream/0002-pkg-kamailio-fedora-17-Fixed-typo-in-appliance-files.patch
kamailio/trunk/debian/patches/upstream/0003-pkg-kamailio-fedora-16-Updated-version-in-.spec-file.patch
kamailio/trunk/debian/patches/upstream/0004-modules_k-rls-Fixed-segmentation-fault-in-RLS.patch
kamailio/trunk/debian/patches/upstream/0005-modules_k-dispatcher-Dispatcher-reload-MI-command-no.patch
Removed:
kamailio/trunk/debian/patches/upstream/0001-dialog-k-proper-unlock-of-profile-for-mi-list-comman.patch
kamailio/trunk/debian/patches/upstream/0002-modules_k-presence_xml-Xcap-auth-reason-when-user-de.patch
kamailio/trunk/debian/patches/upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch
kamailio/trunk/debian/patches/upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch
kamailio/trunk/debian/patches/upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch
kamailio/trunk/debian/patches/upstream/0007-modules_k-presence-Added-missing-use_table-call.patch
kamailio/trunk/debian/patches/upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch
kamailio/trunk/debian/patches/upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch
kamailio/trunk/debian/patches/upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch
kamailio/trunk/debian/patches/upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch
kamailio/trunk/debian/patches/upstream/0013-modules-matrix-Fixed-MI-command-not-exported.patch
kamailio/trunk/debian/patches/upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch
kamailio/trunk/debian/patches/upstream/0016-dispatcher-k-allow-set-id-0-for-OPTIONS-callback.patch
kamailio/trunk/debian/patches/upstream/0017-p_usrloc-added-missing-usrloc-API-members.patch
kamailio/trunk/debian/patches/upstream/0018-kamailio.cfg-removed-sample-db_mode-parameter-for-do.patch
kamailio/trunk/debian/patches/upstream/0019-kamdbctl-mtree-tables-were-not-in-the-list-for-db-cr.patch
kamailio/trunk/debian/patches/upstream/0020-tls-set-function-to-return-the-id.patch
kamailio/trunk/debian/patches/upstream/0021-usrloc-k-on-ul-update-re-clone-uri-and-callid-if-ins.patch
kamailio/trunk/debian/patches/upstream/0022-register-k-pack-contact-info-based-on-header-for-sea.patch
kamailio/trunk/debian/patches/upstream/rr-k-add-missing-in-Route-header-for-strict-routing.patch
Modified:
kamailio/trunk/debian/changelog
kamailio/trunk/debian/patches/series
kamailio/trunk/debian/rules
Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9927&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Sun Aug 5 13:45:59 2012
@@ -1,16 +1,16 @@
-kamailio (3.3.0-2) UNRELEASED; urgency=low
-
- [ Tzafrir Cohen ]
- * NOT RELEASED YET
-
- [ Victor Seva ]
+kamailio (3.3.1-1) UNRELEASED; urgency=low
+
+ * new upstream release.
+ * debian/rules:
+ + kambdb_recover binary is not in source.
+ * debian/patches/upstream:
+ + removed upstream fixes for the previous release.
+ + added upstream fixes.
* debian/backports/squeeze:
+ remove call to dpkg-buildflags
+ do not apply hardening_flags.patch
- * debian/patches:
- + upstream fixes.
-
- -- Victor Seva <linuxmaniac at torreviejawireless.org> Tue, 17 Jul 2012 16:51:09 +0200
+
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Sun, 05 Aug 2012 10:55:39 +0200
kamailio (3.3.0-1) unstable; urgency=low
Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9927&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Sun Aug 5 13:45:59 2012
@@ -1,26 +1,8 @@
-upstream/0001-dialog-k-proper-unlock-of-profile-for-mi-list-comman.patch
-upstream/0002-modules_k-presence_xml-Xcap-auth-reason-when-user-de.patch
-upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch
-upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch
-upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch
-upstream/0007-modules_k-presence-Added-missing-use_table-call.patch
-upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch
-upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch
-upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch
-upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch
-upstream/0013-modules-matrix-Fixed-MI-command-not-exported.patch
-upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch
-upstream/0016-dispatcher-k-allow-set-id-0-for-OPTIONS-callback.patch
-upstream/0017-p_usrloc-added-missing-usrloc-API-members.patch
-upstream/0018-kamailio.cfg-removed-sample-db_mode-parameter-for-do.patch
-upstream/0019-kamdbctl-mtree-tables-were-not-in-the-list-for-db-cr.patch
-upstream/0020-tls-set-function-to-return-the-id.patch
-upstream/0021-usrloc-k-on-ul-update-re-clone-uri-and-callid-if-ins.patch
-upstream/0022-register-k-pack-contact-info-based-on-header-for-sea.patch
-upstream/rr-k-add-missing-in-Route-header-for-strict-routing.patch
-multiarch_support.patch
+upstream/0001-rr-k-add-missing-in-Route-header-for-strict-routing.patch
+upstream/0004-modules_k-rls-Fixed-segmentation-fault-in-RLS.patch
+upstream/0005-modules_k-dispatcher-Dispatcher-reload-MI-command-no.patch
+no_lib64_on_64_bits.patch
no_INSTALL_file.patch
-hardening_flags.patch
plumb_md5.patch
plumb_md5_fixes.patch
fix_export.patch
Added: kamailio/trunk/debian/patches/upstream/0002-pkg-kamailio-fedora-17-Fixed-typo-in-appliance-files.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0002-pkg-kamailio-fedora-17-Fixed-typo-in-appliance-files.patch?rev=9927&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0002-pkg-kamailio-fedora-17-Fixed-typo-in-appliance-files.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0002-pkg-kamailio-fedora-17-Fixed-typo-in-appliance-files.patch Sun Aug 5 13:45:59 2012
@@ -1,0 +1,41 @@
+From d7de94a452185fca7ae4ea1cb5bb9bd775b73d5e Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Fri, 3 Aug 2012 11:32:28 +0100
+Subject: [PATCH] pkg/kamailio/fedora/17: Fixed typo in appliance files
+ (cherry picked from commit
+ 79a614ced2283264e3746cfcfd32fe4245f6496b)
+
+---
+ pkg/kamailio/fedora/17/kamailio-build.appl | 2 +-
+ pkg/kamailio/fedora/17/kamailio.appl | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pkg/kamailio/fedora/17/kamailio-build.appl b/pkg/kamailio/fedora/17/kamailio-build.appl
+index 1619699..216dceb 100644
+--- a/pkg/kamailio/fedora/17/kamailio-build.appl
++++ b/pkg/kamailio/fedora/17/kamailio-build.appl
+@@ -11,7 +11,7 @@ hardware:
+ size: 6
+ packages:
+ - @core
+- - @base
++ - @Base
+ - bison # kamailio
+ - db4-devel # kamailio-bdb
+ - expat-devel # kamailio-xmpp
+diff --git a/pkg/kamailio/fedora/17/kamailio.appl b/pkg/kamailio/fedora/17/kamailio.appl
+index 76dd466..800931c 100644
+--- a/pkg/kamailio/fedora/17/kamailio.appl
++++ b/pkg/kamailio/fedora/17/kamailio.appl
+@@ -11,7 +11,7 @@ hardware:
+ size: 2
+ packages:
+ - @core
+- - @base
++ - @Base
+ - db4 # kamailio-bdb
+ - expat # kamailio-xmpp
+ - GeoIP # kamailio-GeoIP
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0003-pkg-kamailio-fedora-16-Updated-version-in-.spec-file.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0003-pkg-kamailio-fedora-16-Updated-version-in-.spec-file.patch?rev=9927&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0003-pkg-kamailio-fedora-16-Updated-version-in-.spec-file.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0003-pkg-kamailio-fedora-16-Updated-version-in-.spec-file.patch Sun Aug 5 13:45:59 2012
@@ -1,0 +1,32 @@
+From 1bd1c77b7c35cbdf88a09020954f4b780e08697d Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Fri, 3 Aug 2012 11:34:31 +0100
+Subject: [PATCH] pkg/kamailio/fedora/16: Updated version in .spec file
+
+---
+ pkg/kamailio/fedora/16/kamailio.spec | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec
+index 46b0228..3b3704c 100644
+--- a/pkg/kamailio/fedora/16/kamailio.spec
++++ b/pkg/kamailio/fedora/16/kamailio.spec
+@@ -1,5 +1,5 @@
+ %define name kamailio
+-%define ver 3.3.0
++%define ver 3.3.1
+ %define rel 0%{dist}
+
+
+@@ -940,6 +940,8 @@ fi
+
+
+ %changelog
++* Fri Aug 3 2012 Peter Dunkley <peter at dunkley.me.uk>
++ - Updated ver to 3.3.1
+ * Sat Jun 30 2012 Peter Dunkley <peter at dunkley.me.uk>
+ - Removed %_sharedir and replaced with standard macro %_datadir
+ * Mon Jun 17 2012 Peter Dunkley <peter at dunkley.me.uk>
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0004-modules_k-rls-Fixed-segmentation-fault-in-RLS.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0004-modules_k-rls-Fixed-segmentation-fault-in-RLS.patch?rev=9927&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0004-modules_k-rls-Fixed-segmentation-fault-in-RLS.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0004-modules_k-rls-Fixed-segmentation-fault-in-RLS.patch Sun Aug 5 13:45:59 2012
@@ -1,0 +1,26 @@
+From a87a6a94e26176511cf2cc7e5260d5c1f0861add Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Fri, 3 Aug 2012 14:39:49 +0100
+Subject: [PATCH] modules_k/rls: Fixed segmentation fault in RLS
+
+- Fix by Paul Pankhurst @ Crocodile RCS
+(cherry picked from commit 49f25c402871a619404b61e29ff496c71daad8be)
+---
+ modules_k/rls/notify.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c
+index 82324a9..b923add 100644
+--- a/modules_k/rls/notify.c
++++ b/modules_k/rls/notify.c
+@@ -101,6 +101,7 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri,
+ int len_est;
+ res_param_t param;
+ int resource_added = 0; /* Flag to indicate that we have added at least one resource */
++ multipart_body = NULL;
+
+ LM_DBG("start\n");
+ /* query in alfabetical order */
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0005-modules_k-dispatcher-Dispatcher-reload-MI-command-no.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0005-modules_k-dispatcher-Dispatcher-reload-MI-command-no.patch?rev=9927&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0005-modules_k-dispatcher-Dispatcher-reload-MI-command-no.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0005-modules_k-dispatcher-Dispatcher-reload-MI-command-no.patch Sun Aug 5 13:45:59 2012
@@ -1,0 +1,71 @@
+From 7795ef185365eab558ed2c98e8d995f47fa823bb Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Fri, 3 Aug 2012 14:38:49 +0100
+Subject: [PATCH] modules_k/dispatcher: Dispatcher reload MI command not
+ returning errors correctly
+
+- Fix by Hugh Waite @ Crocodile RCS
+(cherry picked from commit 5c83492470e8d1a706933915fcfbf6cfe2e0fd55)
+---
+ modules_k/dispatcher/dispatch.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c
+index 7429e97..cc8b7bf 100644
+--- a/modules_k/dispatcher/dispatch.c
++++ b/modules_k/dispatcher/dispatch.c
+@@ -678,6 +678,11 @@ int init_ds_db(void)
+ }
+
+ ret = ds_load_db();
++ if (ret == -2)
++ {
++ LM_WARN("failure while loading one or more dispatcher entries\n");
++ ret = 0;
++ }
+
+ ds_disconnect_db();
+
+@@ -691,6 +696,7 @@ int ds_load_db(void)
+ int flags;
+ int priority;
+ int nrcols;
++ int dest_errs = 0;
+ str uri;
+ str attrs = {0, 0};
+ db1_res_t * res;
+@@ -764,17 +770,20 @@ int ds_load_db(void)
+ }
+ if(add_dest2list(id, uri, flags, priority, &attrs,
+ *next_idx, &setn) != 0)
++ {
++ dest_errs++;
+ LM_WARN("unable to add destination %.*s to set %d -- skipping\n",
+ uri.len, uri.s, id);
++ }
+ }
+- ds_dbf.free_result(ds_db_handle, res);
+-
+ if(reindex_dests(*next_idx, setn)!=0)
+ {
+ LM_ERR("error on reindex\n");
+ goto err2;
+ }
+
++ ds_dbf.free_result(ds_db_handle, res);
++
+ /* update data - should it be sync'ed? */
+ _ds_list_nr = setn;
+ *crt_idx = *next_idx;
+@@ -782,6 +791,8 @@ int ds_load_db(void)
+
+ ds_print_sets();
+
++ if (dest_errs > 0)
++ return -2;
+ return 0;
+
+ err2:
+--
+1.7.9.5
+
Modified: kamailio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/rules?rev=9927&op=diff
==============================================================================
--- kamailio/trunk/debian/rules (original)
+++ kamailio/trunk/debian/rules Sun Aug 5 13:45:59 2012
@@ -101,9 +101,6 @@
build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
- if [ ! -r debian/kambdb_recover ]; then \
- mv utils/db_berkeley/kambdb_recover debian/;\
- fi
$(MAKE) all
# make groups
$(call PACKAGE_GRP_BUILD_template)
@@ -114,9 +111,6 @@
clean:
dh_testdir
dh_testroot
- if [ -r debian/kambdb_recover ]; then \
- mv debian/kambdb_recover utils/db_berkeley/;\
- fi
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
$(MAKE) maintainer-clean
More information about the Pkg-voip-commits
mailing list