[Pkg-voip-commits] [kamailio] 01/02: Add upstream patches
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Mon Jan 6 10:44:16 UTC 2014
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch vseva/4.1.0
in repository kamailio.
commit 748743a837f85d780ee7ae451795da379cd1f363
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date: Mon Jan 6 10:36:17 2014 +0100
Add upstream patches
---
debian/patches/series | 12 ++
...-dialog_ng-Fix-segfault-in-dlg_new_dialog.patch | 2 +-
...oups-include-gzcompress-sipt-and-mohqueue.patch | 2 +-
...setting-0-instead-of-r-for-sdp_get_line_s.patch | 2 +-
...fs-compiler-optimization-level-made-varia.patch | 2 +-
...ore-fixed-several-clang-compiler-warnings.patch | 2 +-
...er-index-for-domain-column-when-laoding-e.patch | 2 +-
...7-tm-safety-checks-inside-t_next_contacts.patch | 2 +-
...andle-error-case-when-deleting-contact-fa.patch | 2 +-
...d-double-locking-when-preloading-attribut.patch | 2 +-
...-check-for-double-free-in-q_malloc-as-in-.patch | 2 +-
...te-a-local-pv-structure-when-parameter-is.patch | 36 ++++
...mporary-linking-of-reply-to-transaction-a.patch | 74 +++++++++
.../0013-snmpstats-fixe-MIB-file-definitions.patch | 45 +++++
...e-update-timestamp-for-kamailio-specific-.patch | 37 +++++
...-pv-fixed-params-and-param-transformation.patch | 45 +++++
...ules-pua-added-some-missing-lock-releases.patch | 58 +++++++
...ote-about-MySQL-InnoDB-not-supporting-INS.patch | 31 ++++
.../upstream/0018-acc-regenerated-README.patch | 27 +++
...-updated-the-examples-with-tmrec-duration.patch | 76 +++++++++
...h_ephemeral-added-OpenSSL-licensing-excep.patch | 114 +++++++++++++
...utbound-added-OpenSSL-licensing-exception.patch | 80 +++++++++
...bsocket-added-OpenSSL-licensing-exception.patch | 182 +++++++++++++++++++++
23 files changed, 827 insertions(+), 10 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 2cc7737..4bcdd47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,18 @@ upstream/0007-tm-safety-checks-inside-t_next_contacts.patch
upstream/0008-registrar-handle-error-case-when-deleting-contact-fa.patch
upstream/0009-usrloc-avoid-double-locking-when-preloading-attribut.patch
upstream/0010-core-safety-check-for-double-free-in-q_malloc-as-in-.patch
+upstream/0011-avpops-create-a-local-pv-structure-when-parameter-is.patch
+upstream/0012-tm-reset-temporary-linking-of-reply-to-transaction-a.patch
+upstream/0013-snmpstats-fixe-MIB-file-definitions.patch
+upstream/0014-db_flatstore-update-timestamp-for-kamailio-specific-.patch
+upstream/0015-modules-pv-fixed-params-and-param-transformation.patch
+upstream/0016-modules-pua-added-some-missing-lock-releases.patch
+upstream/0017-acc-added-note-about-MySQL-InnoDB-not-supporting-INS.patch
+upstream/0018-acc-regenerated-README.patch
+upstream/0019-tmrec-updated-the-examples-with-tmrec-duration.patch
+upstream/0020-modules-auth_ephemeral-added-OpenSSL-licensing-excep.patch
+upstream/0021-modules-outbound-added-OpenSSL-licensing-exception.patch
+upstream/0022-modules-websocket-added-OpenSSL-licensing-exception.patch
app_java-detect-JAVA_HOME-and-use-proper-libgcj-vers.patch
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
diff --git a/debian/patches/upstream/0001-dialog_ng-Fix-segfault-in-dlg_new_dialog.patch b/debian/patches/upstream/0001-dialog_ng-Fix-segfault-in-dlg_new_dialog.patch
index 83c84b9..6b57884 100644
--- a/debian/patches/upstream/0001-dialog_ng-Fix-segfault-in-dlg_new_dialog.patch
+++ b/debian/patches/upstream/0001-dialog_ng-Fix-segfault-in-dlg_new_dialog.patch
@@ -24,5 +24,5 @@ index 262e923..93a00c7 100644
}
--
-1.8.5.1
+1.8.5.2
diff --git a/debian/patches/upstream/0002-Makefile.groups-include-gzcompress-sipt-and-mohqueue.patch b/debian/patches/upstream/0002-Makefile.groups-include-gzcompress-sipt-and-mohqueue.patch
index bfac1d5..a9f0bb1 100644
--- a/debian/patches/upstream/0002-Makefile.groups-include-gzcompress-sipt-and-mohqueue.patch
+++ b/debian/patches/upstream/0002-Makefile.groups-include-gzcompress-sipt-and-mohqueue.patch
@@ -62,5 +62,5 @@ index d1cad86..30f2f17 100644
#
static_modules:=
--
-1.8.5.1
+1.8.5.2
diff --git a/debian/patches/upstream/0003-sdpops-fix-setting-0-instead-of-r-for-sdp_get_line_s.patch b/debian/patches/upstream/0003-sdpops-fix-setting-0-instead-of-r-for-sdp_get_line_s.patch
index 79429c5..db99f47 100644
--- a/debian/patches/upstream/0003-sdpops-fix-setting-0-instead-of-r-for-sdp_get_line_s.patch
+++ b/debian/patches/upstream/0003-sdpops-fix-setting-0-instead-of-r-for-sdp_get_line_s.patch
@@ -373,5 +373,5 @@ index a506fc6..16f2278 100644
return 1;
}
--
-1.8.5.1
+1.8.5.2
diff --git a/debian/patches/upstream/0004-Makefile.defs-compiler-optimization-level-made-varia.patch b/debian/patches/upstream/0004-Makefile.defs-compiler-optimization-level-made-varia.patch
index 252f686..2e95c08 100644
--- a/debian/patches/upstream/0004-Makefile.defs-compiler-optimization-level-made-varia.patch
+++ b/debian/patches/upstream/0004-Makefile.defs-compiler-optimization-level-made-varia.patch
@@ -159,5 +159,5 @@ index 480a3f8..327eeb9 100644
ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER))))
$(call set_if_empty,CPU,powerpc64)
--
-1.8.5.1
+1.8.5.2
diff --git a/debian/patches/upstream/0005-core-fixed-several-clang-compiler-warnings.patch b/debian/patches/upstream/0005-core-fixed-several-clang-compiler-warnings.patch
index ce8421a..d4e8ed3 100644
--- a/debian/patches/upstream/0005-core-fixed-several-clang-compiler-warnings.patch
+++ b/debian/patches/upstream/0005-core-fixed-several-clang-compiler-warnings.patch
@@ -87,5 +87,5 @@ index b3463a8..7277d48 100644
if (val < 0) {
res->s[0] = '-';
--
-1.8.5.1
+1.8.5.2
diff --git a/debian/patches/upstream/0006-usrloc-proper-index-for-domain-column-when-laoding-e.patch b/debian/patches/upstream/0006-usrloc-proper-index-for-domain-column-when-laoding-e.patch
index 800c73c..76305ae 100644
--- a/debian/patches/upstream/0006-usrloc-proper-index-for-domain-column-when-laoding-e.patch
+++ b/debian/patches/upstream/0006-usrloc-proper-index-for-domain-column-when-laoding-e.patch
@@ -27,5 +27,5 @@ index 244f8e7..a736051 100644
user.len, user.s);
continue;
--
-1.8.5.1
+1.8.5.2
diff --git a/debian/patches/upstream/0007-tm-safety-checks-inside-t_next_contacts.patch b/debian/patches/upstream/0007-tm-safety-checks-inside-t_next_contacts.patch
index 3524b7a..3b642ee 100644
--- a/debian/patches/upstream/0007-tm-safety-checks-inside-t_next_contacts.patch
+++ b/debian/patches/upstream/0007-tm-safety-checks-inside-t_next_contacts.patch
@@ -82,5 +82,5 @@ index 93c7480..62200ad 100644
&ruid, &location_ua) != 1) {
LM_ERR("appending branch failed\n");
--
-1.8.5.1
+1.8.5.2
diff --git a/debian/patches/upstream/0008-registrar-handle-error-case-when-deleting-contact-fa.patch b/debian/patches/upstream/0008-registrar-handle-error-case-when-deleting-contact-fa.patch
index 68f35e8..c8c9463 100644
--- a/debian/patches/upstream/0008-registrar-handle-error-case-when-deleting-contact-fa.patch
+++ b/debian/patches/upstream/0008-registrar-handle-error-case-when-deleting-contact-fa.patch
@@ -278,5 +278,5 @@ index fc5d564..caa81df 100644
}
--
-1.8.5.1
+1.8.5.2
diff --git a/debian/patches/upstream/0009-usrloc-avoid-double-locking-when-preloading-attribut.patch b/debian/patches/upstream/0009-usrloc-avoid-double-locking-when-preloading-attribut.patch
index e60a155..6456d76 100644
--- a/debian/patches/upstream/0009-usrloc-avoid-double-locking-when-preloading-attribut.patch
+++ b/debian/patches/upstream/0009-usrloc-avoid-double-locking-when-preloading-attribut.patch
@@ -36,5 +36,5 @@ index a736051..88fc7e4 100644
if (DB_CAPABILITY(ul_dbf, DB_CAP_FETCH)) {
--
-1.8.5.1
+1.8.5.2
diff --git a/debian/patches/upstream/0010-core-safety-check-for-double-free-in-q_malloc-as-in-.patch b/debian/patches/upstream/0010-core-safety-check-for-double-free-in-q_malloc-as-in-.patch
index d257443..e6c9428 100644
--- a/debian/patches/upstream/0010-core-safety-check-for-double-free-in-q_malloc-as-in-.patch
+++ b/debian/patches/upstream/0010-core-safety-check-for-double-free-in-q_malloc-as-in-.patch
@@ -26,5 +26,5 @@ index 50acab9..8c36d03 100644
qm->used-=size;
qm->real_used-=size;
--
-1.8.5.1
+1.8.5.2
diff --git a/debian/patches/upstream/0011-avpops-create-a-local-pv-structure-when-parameter-is.patch b/debian/patches/upstream/0011-avpops-create-a-local-pv-structure-when-parameter-is.patch
new file mode 100644
index 0000000..4b83f59
--- /dev/null
+++ b/debian/patches/upstream/0011-avpops-create-a-local-pv-structure-when-parameter-is.patch
@@ -0,0 +1,36 @@
+From e96a8b80fd253777e1d001ad778c5a62473ba010 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Wed, 11 Dec 2013 23:01:41 +0100
+Subject: [PATCH] avpops: create a local pv structure when parameter is only
+ flags
+
+- flags details are stored inside it
+- fixes crash at startup reported by Kevin Scott Adams, FS#381
+
+(cherry picked from commit 3c88f1de9d647db8a14bae45af1fa3b34f74d4e6)
+---
+ modules/avpops/avpops_parse.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/modules/avpops/avpops_parse.c b/modules/avpops/avpops_parse.c
+index 3a16f18..3a6c5ec 100644
+--- a/modules/avpops/avpops_parse.c
++++ b/modules/avpops/avpops_parse.c
+@@ -129,6 +129,14 @@ int parse_avp_db(char *s, struct db_param *dbp, int allow_scheme)
+ goto error;
+ }
+ }
++ /* no pv to lookup, create one to store flags details */
++ dbp->a.u.sval = (pv_spec_t*)pkg_malloc(sizeof(pv_spec_t));
++ if(dbp->a.u.sval==NULL)
++ {
++ LM_ERR("no more pkg\n");
++ goto error;
++ }
++ memset(dbp->a.u.sval, 0, sizeof(pv_spec_t));
+ dbp->a.u.sval->pvp.pvn.u.isname.type |= (flags<<8)&0xff00;
+ dbp->a.type = AVPOPS_VAL_NONE;
+ } else {
+--
+1.8.5.2
+
diff --git a/debian/patches/upstream/0012-tm-reset-temporary-linking-of-reply-to-transaction-a.patch b/debian/patches/upstream/0012-tm-reset-temporary-linking-of-reply-to-transaction-a.patch
new file mode 100644
index 0000000..c9c1eee
--- /dev/null
+++ b/debian/patches/upstream/0012-tm-reset-temporary-linking-of-reply-to-transaction-a.patch
@@ -0,0 +1,74 @@
+From 5b869a7c1c584f2762610c5310e7281375c8103d Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Wed, 11 Dec 2013 23:58:11 +0100
+Subject: [PATCH] tm: reset temporary linking of reply to transaction after
+ branch failure route execution
+
+- reported by Robert Boisvert, FS#379
+
+(cherry picked from commit 0ebc983a422cd5ee4baa39bb3ef3bdbeeefd4571)
+---
+ modules/tm/t_reply.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c
+index 562b583..4d9901d 100644
+--- a/modules/tm/t_reply.c
++++ b/modules/tm/t_reply.c
+@@ -1093,7 +1093,7 @@ int run_branch_failure_handlers(struct cell *t, struct sip_msg *rpl,
+
+ /* failure_route for a local UAC? */
+ if (!shmem_msg) {
+- LOG(L_WARN,"Warning: run_branch_failure_handlers: no UAC support (%d, %d) \n",
++ LOG(L_WARN,"no UAC support (%d, %d) \n",
+ on_branch_failure, t->tmcb_hl.reg_types);
+ return 0;
+ }
+@@ -1101,13 +1101,13 @@ int run_branch_failure_handlers(struct cell *t, struct sip_msg *rpl,
+ /* don't start faking anything if we don't have to */
+ if (unlikely((on_branch_failure < 0) && !has_tran_tmcbs( t, TMCB_ON_BRANCH_FAILURE))) {
+ LOG(L_WARN,
+- "Warning: run_failure_handlers: no branch_failure handler (%d, %d)\n",
++ "no branch_failure handler (%d, %d)\n",
+ on_branch_failure, t->tmcb_hl.reg_types);
+ return 1;
+ }
+
+ if (!fake_req(&faked_req, shmem_msg, extra_flags, &t->uac[picked_branch])) {
+- LOG(L_ERR, "ERROR: run_branch_failure_handlers: fake_req failed\n");
++ LOG(L_ERR, "fake_req failed\n");
+ return 0;
+ }
+ /* fake also the env. conforming to the fake msg */
+@@ -1124,7 +1124,7 @@ int run_branch_failure_handlers(struct cell *t, struct sip_msg *rpl,
+ if (exec_pre_script_cb(&faked_req, BRANCH_FAILURE_CB_TYPE)>0) {
+ /* run a branch_failure_route action if some was marked */
+ if (run_top_route(event_rt.rlist[on_branch_failure], &faked_req, 0)<0)
+- LOG(L_ERR, "ERROR: run_branch_failure_handlers: Error in run_top_route\n");
++ LOG(L_ERR, "error in run_top_route\n");
+ exec_post_script_cb(&faked_req, BRANCH_FAILURE_CB_TYPE);
+ }
+ /* update message flags, if changed in branch_failure route */
+@@ -1357,9 +1357,9 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code,
+ /* also append the current reply to the transaction to
+ * make it available in failure routes - a kind of "fake"
+ * save of the final reply per branch */
+- Trans->uac[branch].reply = reply;
+ if (unlikely(has_tran_tmcbs( Trans, TMCB_ON_BRANCH_FAILURE_RO|TMCB_ON_BRANCH_FAILURE)
+- || (Trans->uac[picked_branch].on_branch_failure) )) {
++ || (Trans->uac[branch].on_branch_failure) )) {
++ Trans->uac[branch].reply = reply;
+ extra_flags=
+ ((Trans->uac[branch].request.flags & F_RB_TIMEOUT)?
+ FL_TIMEOUT:0) |
+@@ -1369,6 +1369,7 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code,
+ picked_branch = branch;
+ run_branch_failure_handlers( Trans, Trans->uac[branch].reply,
+ new_code, extra_flags);
++ Trans->uac[branch].reply = 0;
+ }
+
+
+--
+1.8.5.2
+
diff --git a/debian/patches/upstream/0013-snmpstats-fixe-MIB-file-definitions.patch b/debian/patches/upstream/0013-snmpstats-fixe-MIB-file-definitions.patch
new file mode 100644
index 0000000..ab7fc1c
--- /dev/null
+++ b/debian/patches/upstream/0013-snmpstats-fixe-MIB-file-definitions.patch
@@ -0,0 +1,45 @@
+From 98ecf7d2c5753357fd2c1d1e8e72f425e4d48f9b Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Thu, 12 Dec 2013 15:50:27 +0100
+Subject: [PATCH] snmpstats: fixe MIB file definitions
+
+- patch by takeshi, FS#363
+
+(cherry picked from commit ab75785aa707f10fdbccfb0531a0f35e820f5ebc)
+---
+ modules/snmpstats/mibs/KAMAILIO-TC | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/modules/snmpstats/mibs/KAMAILIO-TC b/modules/snmpstats/mibs/KAMAILIO-TC
+index 81d1459..171c491 100644
+--- a/modules/snmpstats/mibs/KAMAILIO-TC
++++ b/modules/snmpstats/mibs/KAMAILIO-TC
+@@ -62,7 +62,7 @@ KamailioSIPTransportProtocol ::= TEXTUAL-CONVENTION
+ tcp(2),
+ sctp(3),
+ tls(4),
+- sctp_tls(5),
++ sctptls(5),
+ ws(6),
+ wss(7)
+ }
+@@ -79,14 +79,13 @@ KamailioSIPEntityRole ::= TEXTUAL-CONVENTION
+ operation of a SIP outbound edge proxy node.
+ Kamailio adds the role 'sipcaptureServer' for
+ operation of a Homer SIPcapture node."
+- "
+ SYNTAX BITS {
+ other(0),
+ userAgent(1),
+ proxyServer(2),
+ redirectServer(3),
+- registrarServer(4)
+- edgeproxyServer(5)
++ registrarServer(4),
++ edgeproxyServer(5),
+ sipcaptureServer(6)
+ }
+
+--
+1.8.5.2
+
diff --git a/debian/patches/upstream/0014-db_flatstore-update-timestamp-for-kamailio-specific-.patch b/debian/patches/upstream/0014-db_flatstore-update-timestamp-for-kamailio-specific-.patch
new file mode 100644
index 0000000..0534e9e
--- /dev/null
+++ b/debian/patches/upstream/0014-db_flatstore-update-timestamp-for-kamailio-specific-.patch
@@ -0,0 +1,37 @@
+From d75bc3b69151a9d0391309e6bb51784f3b6b9a83 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Mon, 16 Dec 2013 09:26:03 +0100
+Subject: [PATCH] db_flatstore: update timestamp for kamailio specific rpc
+ rotate
+
+- do also in 'rotate' command, not only in 'k_rotate'
+- from a patch by Abdelkader Allam
+
+(cherry picked from commit b15aefa31e45f1ad6a45b64905f9fae24e0f790e)
+---
+ modules/db_flatstore/flat_rpc.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/modules/db_flatstore/flat_rpc.c b/modules/db_flatstore/flat_rpc.c
+index 2fe0d0f..5145d83 100644
+--- a/modules/db_flatstore/flat_rpc.c
++++ b/modules/db_flatstore/flat_rpc.c
+@@ -32,6 +32,7 @@
+
+ #include "flat_rpc.h"
+ #include "flatstore_mod.h"
++#include "km_flatstore_mod.h"
+
+ #include <time.h>
+
+@@ -43,6 +44,7 @@
+ */
+ static void rotate(rpc_t* rpc, void* c)
+ {
++ *km_flat_rotate = time(0);
+ *flat_rotate = time(0);
+ }
+
+--
+1.8.5.2
+
diff --git a/debian/patches/upstream/0015-modules-pv-fixed-params-and-param-transformation.patch b/debian/patches/upstream/0015-modules-pv-fixed-params-and-param-transformation.patch
new file mode 100644
index 0000000..64c6af7
--- /dev/null
+++ b/debian/patches/upstream/0015-modules-pv-fixed-params-and-param-transformation.patch
@@ -0,0 +1,45 @@
+From 9e8c3f90e9467153b1e63a257ccdfb09adc4ecfd Mon Sep 17 00:00:00 2001
+From: Juha Heinanen <jh at tutpro.com>
+Date: Thu, 19 Dec 2013 16:21:25 +0200
+Subject: [PATCH] modules/pv: fixed params and param transformation
+
+- params need to be taken from sip_params field of sip_uri struct
+(cherry picked from commit e54b3ec673cb32664a1e8de2e591190f22216724)
+---
+ modules/pv/pv_trans.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c
+index 738efca..7c75deb 100644
+--- a/modules/pv/pv_trans.c
++++ b/modules/pv/pv_trans.c
+@@ -1025,7 +1025,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype,
+ val->ri = _tr_parsed_uri.port_no;
+ break;
+ case TR_URI_PARAMS:
+- val->rs = (_tr_parsed_uri.params.s)?_tr_parsed_uri.params:_tr_empty;
++ val->rs = (_tr_parsed_uri.sip_params.s)?_tr_parsed_uri.sip_params:_tr_empty;
+ break;
+ case TR_URI_PARAM:
+ if(tp==NULL)
+@@ -1033,7 +1033,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype,
+ LM_ERR("param invalid parameters\n");
+ return -1;
+ }
+- if(_tr_parsed_uri.params.len<=0)
++ if(_tr_parsed_uri.sip_params.len<=0)
+ {
+ val->rs = _tr_empty;
+ val->flags = PV_VAL_STR;
+@@ -1043,7 +1043,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype,
+
+ if(_tr_uri_params == NULL)
+ {
+- sv = _tr_parsed_uri.params;
++ sv = _tr_parsed_uri.sip_params;
+ if (parse_params(&sv, CLASS_ANY, &phooks, &_tr_uri_params)<0)
+ return -1;
+ }
+--
+1.8.5.2
+
diff --git a/debian/patches/upstream/0016-modules-pua-added-some-missing-lock-releases.patch b/debian/patches/upstream/0016-modules-pua-added-some-missing-lock-releases.patch
new file mode 100644
index 0000000..e710c5d
--- /dev/null
+++ b/debian/patches/upstream/0016-modules-pua-added-some-missing-lock-releases.patch
@@ -0,0 +1,58 @@
+From a4060da5e1fe1e64c224ff32d669a699a0d5cd1d Mon Sep 17 00:00:00 2001
+From: Juha Heinanen <jh at tutpro.com>
+Date: Thu, 26 Dec 2013 17:51:04 +0200
+Subject: [PATCH] modules/pua: added some missing lock releases (cherry picked
+ from commit 4eb338611e716e7a32f252acbae52bace6047a0a)
+
+---
+ modules/pua/send_subscribe.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/modules/pua/send_subscribe.c b/modules/pua/send_subscribe.c
+index 006bae4..d568ff2 100644
+--- a/modules/pua/send_subscribe.c
++++ b/modules/pua/send_subscribe.c
+@@ -1030,8 +1030,12 @@ int send_subscribe(subs_info_t* subs)
+ insert:
+
+ if (subs->expires == 0)
++ {
+ /* Don't create a new dialog when expires == 0 */
+- goto done;
++ if (dbmode != PUA_DB_ONLY)
++ lock_release(&HashT->p_records[hash_code].lock);
++ goto done;
++ }
+
+ if(subs->flag & UPDATE_TYPE)
+ {
+@@ -1044,6 +1048,8 @@ insert:
+ {
+ LM_ERR("while building callback"
+ " param\n");
++ if (dbmode != PUA_DB_ONLY)
++ lock_release(&HashT->p_records[hash_code].lock);
+ goto error;
+ }
+ hentity->flag= flag;
+@@ -1068,6 +1074,8 @@ insert:
+ uac_r.dialog = 0;
+ }
+ shm_free(hentity);
++ if (dbmode != PUA_DB_ONLY)
++ lock_release(&HashT->p_records[hash_code].lock);
+
+ /* Although this is an error must not return -1 as the
+ calling function must continue processing. */
+@@ -1089,6 +1097,8 @@ insert:
+ if(presentity== NULL)
+ {
+ LM_ERR("no more share memory\n");
++ if (dbmode != PUA_DB_ONLY)
++ lock_release(&HashT->p_records[hash_code].lock);
+ goto error;
+ }
+ memset(presentity, 0, size);
+--
+1.8.5.2
+
diff --git a/debian/patches/upstream/0017-acc-added-note-about-MySQL-InnoDB-not-supporting-INS.patch b/debian/patches/upstream/0017-acc-added-note-about-MySQL-InnoDB-not-supporting-INS.patch
new file mode 100644
index 0000000..78d1de2
--- /dev/null
+++ b/debian/patches/upstream/0017-acc-added-note-about-MySQL-InnoDB-not-supporting-INS.patch
@@ -0,0 +1,31 @@
+From 4ac82cdf92ae6c0e2ff9c1238bfe28cfcefea99c Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Fri, 3 Jan 2014 10:04:39 +0100
+Subject: [PATCH] acc: added note about MySQL InnoDB not supporting INSERT
+ DELAYED
+
+- reported by Daniel Tryba
+
+(cherry picked from commit d26eff22c8a543c63a40cd7d91bb3c70f04aabc6)
+---
+ modules/acc/doc/acc_admin.xml | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml
+index 97858be..33ca1f8 100644
+--- a/modules/acc/doc/acc_admin.xml
++++ b/modules/acc/doc/acc_admin.xml
+@@ -1093,7 +1093,9 @@ modparam("acc", "db_extra", "ct=$hdr(Content-type); email=$avp(s:email)")
+ <para>
+ If set to 1, use INSERT DELAYED to add records to accounting tables
+ when the DB driver has support for it. If no INSERT DELAYED support
+- is offered by DB driver, then standard INSERT is used.
++ is offered by DB driver, then standard INSERT is used. Beware that
++ MySQL InnoDB engine doesn't support INSERT DELAYED, thus be sure
++ the acc tables are defined with different type (e.g., MyISAM).
+ </para>
+ <para>
+ Default value is 0 (no INSERT DELAYED).
+--
+1.8.5.2
+
diff --git a/debian/patches/upstream/0018-acc-regenerated-README.patch b/debian/patches/upstream/0018-acc-regenerated-README.patch
new file mode 100644
index 0000000..0e08411
--- /dev/null
+++ b/debian/patches/upstream/0018-acc-regenerated-README.patch
@@ -0,0 +1,27 @@
+From 2ac00f9083846b958da5396cb4f5a51527957324 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Fri, 3 Jan 2014 10:11:26 +0100
+Subject: [PATCH] acc: regenerated README
+
+---
+ modules/acc/README | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/modules/acc/README b/modules/acc/README
+index f6b1c5c..7a6361c 100644
+--- a/modules/acc/README
++++ b/modules/acc/README
+@@ -1109,7 +1109,9 @@ modparam("acc", "db_extra", "ct=$hdr(Content-type); email=$avp(s:email)")
+
+ If set to 1, use INSERT DELAYED to add records to accounting tables
+ when the DB driver has support for it. If no INSERT DELAYED support is
+- offered by DB driver, then standard INSERT is used.
++ offered by DB driver, then standard INSERT is used. Beware that MySQL
++ InnoDB engine doesn't support INSERT DELAYED, thus be sure the acc
++ tables are defined with different type (e.g., MyISAM).
+
+ Default value is 0 (no INSERT DELAYED).
+
+--
+1.8.5.2
+
diff --git a/debian/patches/upstream/0019-tmrec-updated-the-examples-with-tmrec-duration.patch b/debian/patches/upstream/0019-tmrec-updated-the-examples-with-tmrec-duration.patch
new file mode 100644
index 0000000..3e7b921
--- /dev/null
+++ b/debian/patches/upstream/0019-tmrec-updated-the-examples-with-tmrec-duration.patch
@@ -0,0 +1,76 @@
+From df0218611b8f27ccaa924b8f88560c2e81966823 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Thu, 2 Jan 2014 11:25:56 +0100
+Subject: [PATCH] tmrec: updated the examples with tmrec duration
+
+- hint to read rfc2445 for duration format
+
+(cherry picked from commit 99d1170469c60206992c083f2ba0e9dc6b580d37)
+---
+ modules/tmrec/README | 8 ++++----
+ modules/tmrec/doc/tmrec_admin.xml | 7 ++++---
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/modules/tmrec/README b/modules/tmrec/README
+index 6cffee0..84b7a56 100644
+--- a/modules/tmrec/README
++++ b/modules/tmrec/README
+@@ -138,7 +138,7 @@ modparam("tmrec", "separator", ";")
+ subsequent intervals do not overlap. For non-recurring intervals,
+ durations of any positive length are permitted. Zero-length
+ duration means "forever". Negative-length durations are not
+- allowed.
++ allowed. See RFC 2445 for the format of duration.
+ * frequency - can be one of the following values: "daily" - specify
+ repeating periods based on an interval of a day or more; "weekly" -
+ specify repeating periods based on an interval of a week or more;
+@@ -222,9 +222,9 @@ modparam("tmrec", "separator", ";")
+
+ Example 1.2. tmrec_match usage
+ ...
+- if(tmrec_match("20120101T000000|24H|weekly|||SA,SU")
++ if(tmrec_match("20120101T000000|PT24H|weekly|||SA,SU")
+ xdbg("it is weekend!\n");
+- if(tmrec_match("20120101T083000|10H|weekly|||MO,TU,WE,TH,FR")
++ if(tmrec_match("20120101T083000|PT10H|weekly|||MO,TU,WE,TH,FR")
+ xdbg("it is with working hours\n");
+ ...
+
+@@ -298,7 +298,7 @@ if(is_leap_year("2010"))
+
+ Example 1.4. time_period_match usage
+ ...
+-if(time_period_match("wd{1-5} hr{8-16}, wd{1-5} hr{17} min{0-29}"))
++if(time_period_match("wd{2-6} hr{8-16}, wd{1-5} hr{17} min{0-29}"))
+ xdbg("Monday to Friday, 8:00 to 17:30\n");
+
+ if(time_period_match("weekday { sat sun }, weekday {mo-fr} hr {17-8},wd{mo-wed}h
+diff --git a/modules/tmrec/doc/tmrec_admin.xml b/modules/tmrec/doc/tmrec_admin.xml
+index 782b1f1..7a429eb 100644
+--- a/modules/tmrec/doc/tmrec_admin.xml
++++ b/modules/tmrec/doc/tmrec_admin.xml
+@@ -127,7 +127,8 @@ modparam("tmrec", "separator", ";")
+ be small enough such that subsequent intervals do not overlap.
+ For non-recurring intervals, durations of any positive length are
+ permitted. Zero-length duration means <quote>forever</quote>.
+- Negative-length durations are not allowed.
++ Negative-length durations are not allowed. See RFC 2445 for
++ the format of duration.
+ </para>
+ </listitem>
+ <listitem>
+@@ -274,9 +275,9 @@ modparam("tmrec", "separator", ";")
+ <title><function>tmrec_match</function> usage</title>
+ <programlisting format="linespecific">
+ ...
+- if(tmrec_match("20120101T000000|24H|weekly|||SA,SU")
++ if(tmrec_match("20120101T000000|PT24H|weekly|||SA,SU")
+ xdbg("it is weekend!\n");
+- if(tmrec_match("20120101T083000|10H|weekly|||MO,TU,WE,TH,FR")
++ if(tmrec_match("20120101T083000|PT10H|weekly|||MO,TU,WE,TH,FR")
+ xdbg("it is with working hours\n");
+ ...
+ </programlisting>
+--
+1.8.5.2
+
diff --git a/debian/patches/upstream/0020-modules-auth_ephemeral-added-OpenSSL-licensing-excep.patch b/debian/patches/upstream/0020-modules-auth_ephemeral-added-OpenSSL-licensing-excep.patch
new file mode 100644
index 0000000..9a1c307
--- /dev/null
+++ b/debian/patches/upstream/0020-modules-auth_ephemeral-added-OpenSSL-licensing-excep.patch
@@ -0,0 +1,114 @@
+From fb364e0b29ce388574a61ebc4a428c559c411a2a Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Sun, 5 Jan 2014 18:15:07 +0000
+Subject: [PATCH] modules/auth_ephemeral: added OpenSSL licensing exception
+
+(cherry picked from commit 99960be1d55df2ba4ca596c42c8e78e36dad3cf1)
+---
+ modules/auth_ephemeral/autheph_mod.c | 5 +++++
+ modules/auth_ephemeral/autheph_mod.h | 5 +++++
+ modules/auth_ephemeral/authorize.c | 5 +++++
+ modules/auth_ephemeral/authorize.h | 5 +++++
+ modules/auth_ephemeral/checks.c | 5 +++++
+ modules/auth_ephemeral/checks.h | 5 +++++
+ 6 files changed, 30 insertions(+)
+
+diff --git a/modules/auth_ephemeral/autheph_mod.c b/modules/auth_ephemeral/autheph_mod.c
+index 8e72fba..fb59e56 100644
+--- a/modules/auth_ephemeral/autheph_mod.c
++++ b/modules/auth_ephemeral/autheph_mod.c
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+ #include "../../dprint.h"
+ #include "../../locking.h"
+diff --git a/modules/auth_ephemeral/autheph_mod.h b/modules/auth_ephemeral/autheph_mod.h
+index 62bc808..3ad2356 100644
+--- a/modules/auth_ephemeral/autheph_mod.h
++++ b/modules/auth_ephemeral/autheph_mod.h
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+ #ifndef AUTHEPH_MOD_H
+ #define AUTHEPH_MOD_H
+diff --git a/modules/auth_ephemeral/authorize.c b/modules/auth_ephemeral/authorize.c
+index a09a9f8..454ecac 100644
+--- a/modules/auth_ephemeral/authorize.c
++++ b/modules/auth_ephemeral/authorize.c
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+ #include <openssl/hmac.h>
+ #include <openssl/sha.h>
+diff --git a/modules/auth_ephemeral/authorize.h b/modules/auth_ephemeral/authorize.h
+index 8ce9331..0a7bb91 100644
+--- a/modules/auth_ephemeral/authorize.h
++++ b/modules/auth_ephemeral/authorize.h
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+ #ifndef AUTHORIZE_H
+ #define AUTHORIZE_H
+diff --git a/modules/auth_ephemeral/checks.c b/modules/auth_ephemeral/checks.c
+index 447e997..dacec11 100644
+--- a/modules/auth_ephemeral/checks.c
++++ b/modules/auth_ephemeral/checks.c
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+ #include "../../dprint.h"
+ #include "../../mod_fix.h"
+diff --git a/modules/auth_ephemeral/checks.h b/modules/auth_ephemeral/checks.h
+index 27cb7fe..ee23c7e 100644
+--- a/modules/auth_ephemeral/checks.h
++++ b/modules/auth_ephemeral/checks.h
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+ #ifndef CHECKS_H
+ #define CHECKS_H
+--
+1.8.5.2
+
diff --git a/debian/patches/upstream/0021-modules-outbound-added-OpenSSL-licensing-exception.patch b/debian/patches/upstream/0021-modules-outbound-added-OpenSSL-licensing-exception.patch
new file mode 100644
index 0000000..16c76f1
--- /dev/null
+++ b/debian/patches/upstream/0021-modules-outbound-added-OpenSSL-licensing-exception.patch
@@ -0,0 +1,80 @@
+From bdb3a86c4453790a91de5aa2320de5b5bb26ad5c Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Sun, 5 Jan 2014 18:15:33 +0000
+Subject: [PATCH] modules/outbound: added OpenSSL licensing exception
+
+(cherry picked from commit 6741c47ad75806355cd7564d419df56acc68987b)
+---
+ modules/outbound/api.h | 5 +++++
+ modules/outbound/config.c | 5 +++++
+ modules/outbound/config.h | 5 +++++
+ modules/outbound/ob_mod.c | 5 +++++
+ 4 files changed, 20 insertions(+)
+
+diff --git a/modules/outbound/api.h b/modules/outbound/api.h
+index fc0e8b9..facc1db 100644
+--- a/modules/outbound/api.h
++++ b/modules/outbound/api.h
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ #ifndef OB_API_H
+diff --git a/modules/outbound/config.c b/modules/outbound/config.c
+index bcb6fbb..5b291f4 100644
+--- a/modules/outbound/config.c
++++ b/modules/outbound/config.c
+@@ -17,6 +17,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ /*!
+diff --git a/modules/outbound/config.h b/modules/outbound/config.h
+index 0410ff5..cf6796e 100644
+--- a/modules/outbound/config.h
++++ b/modules/outbound/config.h
+@@ -17,6 +17,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ /*!
+diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c
+index 9902e91..038c5fa 100644
+--- a/modules/outbound/ob_mod.c
++++ b/modules/outbound/ob_mod.c
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+ #include <openssl/hmac.h>
+ #include <openssl/rand.h>
+--
+1.8.5.2
+
diff --git a/debian/patches/upstream/0022-modules-websocket-added-OpenSSL-licensing-exception.patch b/debian/patches/upstream/0022-modules-websocket-added-OpenSSL-licensing-exception.patch
new file mode 100644
index 0000000..c11d973
--- /dev/null
+++ b/debian/patches/upstream/0022-modules-websocket-added-OpenSSL-licensing-exception.patch
@@ -0,0 +1,182 @@
+From 71463b06efa2997950aaf1ef088076258fe8a03a Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Sun, 5 Jan 2014 18:16:04 +0000
+Subject: [PATCH] modules/websocket: added OpenSSL licensing exception
+
+(cherry picked from commit 661d7d3a6231713861a8a1236dd7d783113c2890)
+---
+ modules/websocket/config.c | 5 +++++
+ modules/websocket/config.h | 5 +++++
+ modules/websocket/ws_conn.c | 5 +++++
+ modules/websocket/ws_conn.h | 5 +++++
+ modules/websocket/ws_frame.c | 5 +++++
+ modules/websocket/ws_frame.h | 5 +++++
+ modules/websocket/ws_handshake.c | 5 +++++
+ modules/websocket/ws_handshake.h | 5 +++++
+ modules/websocket/ws_mod.c | 5 +++++
+ modules/websocket/ws_mod.h | 5 +++++
+ 10 files changed, 50 insertions(+)
+
+diff --git a/modules/websocket/config.c b/modules/websocket/config.c
+index e6e6a50..a0607a7 100644
+--- a/modules/websocket/config.c
++++ b/modules/websocket/config.c
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ /*!
+diff --git a/modules/websocket/config.h b/modules/websocket/config.h
+index 690649e..64ed5bd 100644
+--- a/modules/websocket/config.h
++++ b/modules/websocket/config.h
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ /*!
+diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c
+index 613f14e..9f2b672 100644
+--- a/modules/websocket/ws_conn.c
++++ b/modules/websocket/ws_conn.c
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ #include "../../locking.h"
+diff --git a/modules/websocket/ws_conn.h b/modules/websocket/ws_conn.h
+index d022d0e..0c7d639 100644
+--- a/modules/websocket/ws_conn.h
++++ b/modules/websocket/ws_conn.h
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ #ifndef _WS_CONN_H
+diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c
+index a3a4cef..3ccb4d1 100644
+--- a/modules/websocket/ws_frame.c
++++ b/modules/websocket/ws_frame.c
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ #include <limits.h>
+diff --git a/modules/websocket/ws_frame.h b/modules/websocket/ws_frame.h
+index 1210c6c..815ec65 100644
+--- a/modules/websocket/ws_frame.h
++++ b/modules/websocket/ws_frame.h
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ #ifndef _WS_FRAME_H
+diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c
+index c4e3143..05332e4 100644
+--- a/modules/websocket/ws_handshake.c
++++ b/modules/websocket/ws_handshake.c
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ #include <openssl/sha.h>
+diff --git a/modules/websocket/ws_handshake.h b/modules/websocket/ws_handshake.h
+index e7ff8e0..5c69fa2 100644
+--- a/modules/websocket/ws_handshake.h
++++ b/modules/websocket/ws_handshake.h
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ #ifndef _WS_HANDSHAKE_H
+diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c
+index ec5e07c..8932769 100644
+--- a/modules/websocket/ws_mod.c
++++ b/modules/websocket/ws_mod.c
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ #include "../../dprint.h"
+diff --git a/modules/websocket/ws_mod.h b/modules/websocket/ws_mod.h
+index 819d3ea..8db9fef 100644
+--- a/modules/websocket/ws_mod.h
++++ b/modules/websocket/ws_mod.h
+@@ -19,6 +19,11 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
++ * Exception: permission to copy, modify, propagate, and distribute a work
++ * formed by combining OpenSSL toolkit software and the code in this file,
++ * such as linking with software components and libraries released under
++ * OpenSSL project license.
++ *
+ */
+
+ #ifndef _WS_MOD_H
+--
+1.8.5.2
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/kamailio.git
More information about the Pkg-voip-commits
mailing list