[Pkg-voip-commits] [kamailio] 01/02: add upstream fixes. (Closes: #821039)
Victor Seva
vseva at moszumanska.debian.org
Fri Apr 15 08:10:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
vseva pushed a commit to branch master
in repository kamailio.
commit 84116d4d21d92a5c3d19657c07551a5039125259
Author: Victor Seva <vseva at debian.org>
Date: Fri Apr 15 09:32:55 2016 +0200
add upstream fixes. (Closes: #821039)
---
debian/patches/series | 9 ++
...pi-Fix-URL-to-library-home-page-in-README.patch | 102 +++++++++++++++++++++
...if-ifa_addr-field-is-set-while-trying-to-.patch | 29 ++++++
...n-check-for-ifa-ifa_addr-in-add_intefaces.patch | 34 +++++++
...6-Makefile.defs-re-enable-mem-join-define.patch | 28 ++++++
...dialog-fix-dlg-from_bindaddr-name-parsing.patch | 26 ++++++
.../0038-dialog-fix-dlg-from_bindaddr-getter.patch | 25 +++++
...register-server-process-with-the-local-na.patch | 78 ++++++++++++++++
...x-compile-warning-unused-but-set-variable.patch | 36 ++++++++
...x-use-UNIVERSAL-is-a-fatal-error-since-pe.patch | 71 ++++++++++++++
10 files changed, 438 insertions(+)
diff --git a/debian/patches/series b/debian/patches/series
index 1e12938..d6f0bd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,14 @@
upstream/0001-core-skip-address-family-AF_PACKET-on-l-iface_name.patch
upstream/0002-core-test-if-AF_PACKET-is-defined-at-compile-time.patch
+upstream/0033-evapi-Fix-URL-to-library-home-page-in-README.patch
+upstream/0034-core-check-if-ifa_addr-field-is-set-while-trying-to-.patch
+upstream/0035-core-common-check-for-ifa-ifa_addr-in-add_intefaces.patch
+upstream/0036-Makefile.defs-re-enable-mem-join-define.patch
+upstream/0037-dialog-fix-dlg-from_bindaddr-name-parsing.patch
+upstream/0038-dialog-fix-dlg-from_bindaddr-getter.patch
+upstream/0039-erlang-fix-register-server-process-with-the-local-na.patch
+upstream/0040-erlang-fix-compile-warning-unused-but-set-variable.patch
+upstream/0041-app_perl-Fix-use-UNIVERSAL-is-a-fatal-error-since-pe.patch
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
fix_export.patch
diff --git a/debian/patches/upstream/0033-evapi-Fix-URL-to-library-home-page-in-README.patch b/debian/patches/upstream/0033-evapi-Fix-URL-to-library-home-page-in-README.patch
new file mode 100644
index 0000000..e49a775
--- /dev/null
+++ b/debian/patches/upstream/0033-evapi-Fix-URL-to-library-home-page-in-README.patch
@@ -0,0 +1,102 @@
+From 87af066010ca0b89a4752fe593c091253b842d6c Mon Sep 17 00:00:00 2001
+From: "Olle E. Johansson" <oej at edvina.net>
+Date: Sun, 3 Apr 2016 21:45:37 +0200
+Subject: [PATCH] evapi Fix URL to library home page in README
+
+---
+ modules/evapi/README | 16 ++++++++--------
+ modules/evapi/doc/evapi_admin.xml | 2 +-
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/modules/evapi/README b/modules/evapi/README
+index a8465ce..59fe136 100644
+--- a/modules/evapi/README
++++ b/modules/evapi/README
+@@ -10,7 +10,7 @@ Daniel-Constantin Mierla
+
+ <miconda at gmail.com>
+
+- Copyright © 2014 asipto.com
++ Copyright � 2014 asipto.com
+ __________________________________________________________________
+
+ Table of Contents
+@@ -109,7 +109,7 @@ Chapter 1. Admin Guide
+
+ The following libraries or applications must be installed before
+ running Kamailio with this module loaded:
+- * libev - http://software.schmorp.de/pkg/libev
++ * libev - http://software.schmorp.de/pkg/libev.html
+
+ 3. Parameters
+
+@@ -158,7 +158,7 @@ modparam("evapi", "netstring_format", 0)
+ 4.2. evapi_async_relay(evdata)
+ 4.3. evapi_close()
+
+-4.1. evapi_relay(evdata)
++4.1. evapi_relay(evdata)
+
+ Relay the event data given as parameter to connected applications.
+
+@@ -188,7 +188,7 @@ evapi_relay("{ \"event\": \"test\",\n \"data\": { \"fU\": \"$fU\" }\n}");
+ },
+ ...
+
+-4.2. evapi_async_relay(evdata)
++4.2. evapi_async_relay(evdata)
+
+ Relay the event data given as parameter to connected applications.
+ Before evaluating the parameter, the request processing is suspended
+@@ -210,7 +210,7 @@ evapi_async_relay("{ \"event\": \"suspend\",\n \"data\":"
+ " { \"index\": \"$T(id_index)\", \"label\": \"$T(id_label)\" }\n}");
+ ...
+
+-4.3. evapi_close()
++4.3. evapi_close()
+
+ Close evapi current client connection.
+
+@@ -232,7 +232,7 @@ event_route[evapi:connection-new] {
+ 5.2. evapi:connection-closed
+ 5.3. evapi:message-received
+
+-5.1. evapi:connection-new
++5.1. evapi:connection-new
+
+ If defined, the module calls event_route[evapi:connection-new] when a
+ new client is connected.
+@@ -242,7 +242,7 @@ event_route[evapi:connection-new] {
+ }
+ ...
+
+-5.2. evapi:connection-closed
++5.2. evapi:connection-closed
+
+ If defined, the module calls event_route[evapi:connection-closed] when
+ a client connection is closed.
+@@ -252,7 +252,7 @@ event_route[evapi:connection-closed] {
+ }
+ ...
+
+-5.3. evapi:message-received
++5.3. evapi:message-received
+
+ If defined, the module calls event_route[evapi:message-received] when a
+ message is received from a client.
+diff --git a/modules/evapi/doc/evapi_admin.xml b/modules/evapi/doc/evapi_admin.xml
+index 574adef..30fa61d 100644
+--- a/modules/evapi/doc/evapi_admin.xml
++++ b/modules/evapi/doc/evapi_admin.xml
+@@ -54,7 +54,7 @@
+ <itemizedlist>
+ <listitem>
+ <para>
+- <emphasis>libev</emphasis> - <ulink url="http://software.schmorp.de/pkg/libev">http://software.schmorp.de/pkg/libev</ulink>
++ <emphasis>libev</emphasis> - <ulink url="http://software.schmorp.de/pkg/libev.html">http://software.schmorp.de/pkg/libev.html</ulink>
+ </para>
+ </listitem>
+ </itemizedlist>
+--
+2.8.0.rc3
+
diff --git a/debian/patches/upstream/0034-core-check-if-ifa_addr-field-is-set-while-trying-to-.patch b/debian/patches/upstream/0034-core-check-if-ifa_addr-field-is-set-while-trying-to-.patch
new file mode 100644
index 0000000..cd10e17
--- /dev/null
+++ b/debian/patches/upstream/0034-core-check-if-ifa_addr-field-is-set-while-trying-to-.patch
@@ -0,0 +1,29 @@
+From 6684be6b4c405ab24dd6a5a19267ceef6aa95503 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Wed, 6 Apr 2016 18:55:57 +0200
+Subject: [PATCH] core: check if ifa_addr field is set while trying to skip
+ AF_PACKET interfaces
+
+- reported by Juha Heinanen
+
+(cherry picked from commit 1545b8de396e8e5d0ef24c9102beff18b3cf36e5)
+---
+ socket_info.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/socket_info.c b/socket_info.c
+index cecfef9..95c6ee6 100644
+--- a/socket_info.c
++++ b/socket_info.c
+@@ -1207,7 +1207,7 @@ int add_interfaces(char* if_name, int family, unsigned short port,
+ {
+ #ifdef AF_PACKET
+ /* skip AF_PACKET addr family since it is of no use later on */
+- if (ifa->ifa_addr->sa_family == AF_PACKET)
++ if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_PACKET)
+ continue;
+ #endif
+ if (if_name && strcmp(if_name, ifa->ifa_name))
+--
+2.8.0.rc3
+
diff --git a/debian/patches/upstream/0035-core-common-check-for-ifa-ifa_addr-in-add_intefaces.patch b/debian/patches/upstream/0035-core-common-check-for-ifa-ifa_addr-in-add_intefaces.patch
new file mode 100644
index 0000000..2ca965f
--- /dev/null
+++ b/debian/patches/upstream/0035-core-common-check-for-ifa-ifa_addr-in-add_intefaces.patch
@@ -0,0 +1,34 @@
+From 49ec5fa5d9bb939b80ef3994b5f0c04e7525ab9f Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Wed, 6 Apr 2016 19:22:58 +0200
+Subject: [PATCH] core: common check for ifa->ifa_addr in add_intefaces
+
+- if no ip address associated with the network interface, it is not
+ useful anyhow
+
+(cherry picked from commit c395ae00d7970be0a857265e9324a50bcb00f4d0)
+---
+ socket_info.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/socket_info.c b/socket_info.c
+index 95c6ee6..aa8928a 100644
+--- a/socket_info.c
++++ b/socket_info.c
+@@ -1205,9 +1205,12 @@ int add_interfaces(char* if_name, int family, unsigned short port,
+
+ for (ifa = ifap; ifa; ifa = ifa->ifa_next)
+ {
++ /* skip if no IP addr associated with the interface */
++ if (ifa->ifa_addr==0)
++ continue;
+ #ifdef AF_PACKET
+ /* skip AF_PACKET addr family since it is of no use later on */
+- if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_PACKET)
++ if (ifa->ifa_addr->sa_family == AF_PACKET)
+ continue;
+ #endif
+ if (if_name && strcmp(if_name, ifa->ifa_name))
+--
+2.8.0.rc3
+
diff --git a/debian/patches/upstream/0036-Makefile.defs-re-enable-mem-join-define.patch b/debian/patches/upstream/0036-Makefile.defs-re-enable-mem-join-define.patch
new file mode 100644
index 0000000..5edd165
--- /dev/null
+++ b/debian/patches/upstream/0036-Makefile.defs-re-enable-mem-join-define.patch
@@ -0,0 +1,28 @@
+From b21b9cd9cb6a08b9bfc9d025b4e6a64a12e50d65 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Fri, 8 Apr 2016 15:10:55 +0200
+Subject: [PATCH] Makefile.defs: re-enable mem join define
+
+- lost when introduced the option to select the memory manager by
+ command line parameter -x
+
+(cherry picked from commit 33c6aafcd46269ce283908f49fbf70b9d73624b1)
+---
+ Makefile.defs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.defs b/Makefile.defs
+index 26205e8..245f9b4 100644
+--- a/Makefile.defs
++++ b/Makefile.defs
+@@ -664,6 +664,7 @@ C_DEFS= $(extra_defs) \
+ # debugging symbols in all cases (-g). --andrei
+
+ # memory managers and related debug mode
++C_DEFS+= -DMEM_JOIN_FREE
+ # enable f_malloc
+ C_DEFS+= -DF_MALLOC
+ # enable q_malloc
+--
+2.8.0.rc3
+
diff --git a/debian/patches/upstream/0037-dialog-fix-dlg-from_bindaddr-name-parsing.patch b/debian/patches/upstream/0037-dialog-fix-dlg-from_bindaddr-name-parsing.patch
new file mode 100644
index 0000000..a4376de
--- /dev/null
+++ b/debian/patches/upstream/0037-dialog-fix-dlg-from_bindaddr-name-parsing.patch
@@ -0,0 +1,26 @@
+From 1ec385ccd9054952b86cc976ae1debe70dc8d297 Mon Sep 17 00:00:00 2001
+From: Camille Oudot <camille.oudot at orange.com>
+Date: Mon, 11 Apr 2016 17:02:03 +0200
+Subject: [PATCH] dialog: fix $dlg(from_bindaddr) name parsing
+
+(cherry picked from commit f95789fd39fcce7b3aa3a0ab8665664afd8bc196)
+---
+ modules/dialog/dlg_var.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c
+index e8c84ed..450f8a5 100644
+--- a/modules/dialog/dlg_var.c
++++ b/modules/dialog/dlg_var.c
+@@ -877,7 +877,7 @@ int pv_parse_dlg_name(pv_spec_p sp, str *in)
+ else goto error;
+ break;
+ case 13:
+- if(strncmp(in->s, "from_bindaddr", 20)==0)
++ if(strncmp(in->s, "from_bindaddr", 13)==0)
+ sp->pvp.pvn.u.isname.name.n = 2;
+ else goto error;
+ break;
+--
+2.8.0.rc3
+
diff --git a/debian/patches/upstream/0038-dialog-fix-dlg-from_bindaddr-getter.patch b/debian/patches/upstream/0038-dialog-fix-dlg-from_bindaddr-getter.patch
new file mode 100644
index 0000000..56ae84d
--- /dev/null
+++ b/debian/patches/upstream/0038-dialog-fix-dlg-from_bindaddr-getter.patch
@@ -0,0 +1,25 @@
+From 02b17b881d63fe91221f5673dd3418831c943bd0 Mon Sep 17 00:00:00 2001
+From: Camille Oudot <camille.oudot at orange.com>
+Date: Mon, 11 Apr 2016 18:53:05 +0200
+Subject: [PATCH] dialog: fix $dlg(from_bindaddr) getter
+
+---
+ modules/dialog/dlg_var.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c
+index 450f8a5..8d76b8f 100644
+--- a/modules/dialog/dlg_var.c
++++ b/modules/dialog/dlg_var.c
+@@ -878,7 +878,7 @@ int pv_parse_dlg_name(pv_spec_p sp, str *in)
+ break;
+ case 13:
+ if(strncmp(in->s, "from_bindaddr", 13)==0)
+- sp->pvp.pvn.u.isname.name.n = 2;
++ sp->pvp.pvn.u.isname.name.n = 20;
+ else goto error;
+ break;
+ default:
+--
+2.8.0.rc3
+
diff --git a/debian/patches/upstream/0039-erlang-fix-register-server-process-with-the-local-na.patch b/debian/patches/upstream/0039-erlang-fix-register-server-process-with-the-local-na.patch
new file mode 100644
index 0000000..6afa2b9
--- /dev/null
+++ b/debian/patches/upstream/0039-erlang-fix-register-server-process-with-the-local-na.patch
@@ -0,0 +1,78 @@
+From 297d9732504290a1209ae7cf883127fadc1156aa Mon Sep 17 00:00:00 2001
+From: Seudin Kasumovic <seudin.kasumovic at gmail.com>
+Date: Wed, 13 Apr 2016 00:15:56 +0200
+Subject: [PATCH] erlang: fix register server process with the local name
+ server epmd
+
+- use correct alive name when number of C nodes greater then 1
+- fix error check on register server process
+
+(cherry picked from commit 6f268b5a9d0bd07e689c401cb7221bb0f2c5f8be)
+---
+ modules/erlang/cnode.c | 2 +-
+ modules/erlang/epmd.c | 4 ++--
+ modules/erlang/epmd.h | 2 +-
+ modules/erlang/erl_helpers.c | 4 ++--
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/modules/erlang/cnode.c b/modules/erlang/cnode.c
+index f0f6e03..1e9b5d6 100644
+--- a/modules/erlang/cnode.c
++++ b/modules/erlang/cnode.c
+@@ -226,7 +226,7 @@ int init_cnode_sockets(int cnode_id)
+ io_handler_ins(phandler);
+
+ /* start epmd handler - publish Kamailo C node */
+- if (epmd_init((epmd_handler_t*)phandler) < 0 ) {
++ if (epmd_init((epmd_handler_t*)phandler, &alivename) < 0 ) {
+ return -1;
+ }
+
+diff --git a/modules/erlang/epmd.c b/modules/erlang/epmd.c
+index 3a47e0f..43889aa 100644
+--- a/modules/erlang/epmd.c
++++ b/modules/erlang/epmd.c
+@@ -39,9 +39,9 @@
+ /**
+ * \brief Initialize EPMD handler
+ */
+-int epmd_init(epmd_handler_t *epmd)
++int epmd_init(epmd_handler_t *epmd, str *alivename)
+ {
+- epmd->sockfd = erl_init_node(&epmd->ec, &cnode_alivename, &cnode_host, &cookie);
++ epmd->sockfd = erl_init_node(&epmd->ec, alivename, &cnode_host, &cookie);
+ epmd->handle_f = handle_epmd;
+ epmd->wait_tmo_f = NULL;
+ epmd->destroy_f = NULL;
+diff --git a/modules/erlang/epmd.h b/modules/erlang/epmd.h
+index d5d4507..09b3eb5 100644
+--- a/modules/erlang/epmd.h
++++ b/modules/erlang/epmd.h
+@@ -55,7 +55,7 @@ typedef struct epmd_handler_s
+
+ } epmd_handler_t;
+
+-int epmd_init(epmd_handler_t *epmd);
++int epmd_init(epmd_handler_t *epmd, str *alivename);
+ int handle_epmd(handler_common_t *phandler);
+
+ #endif /* EPMD_H_ */
+diff --git a/modules/erlang/erl_helpers.c b/modules/erlang/erl_helpers.c
+index cc43e92..f702a8b 100644
+--- a/modules/erlang/erl_helpers.c
++++ b/modules/erlang/erl_helpers.c
+@@ -307,9 +307,9 @@ int erl_init_node(ei_cnode *ec, const str *alivename, const str *hostname, const
+ sockaddr2ip_addr(&ip, addr);
+
+ /* publish */
+- if ((epmdfd = ei_publish_tmo(ec, port, timeout_ms)) == -1) {
++ if ((epmdfd = ei_publish_tmo(ec, port, timeout_ms)) < 0) {
+
+- LM_ERR("Failed to publish port %u to epmd, check is epmd started\n", port);
++ LM_DBG("Failed publish %s:%u[%u] as %s: %s (%d)\n",ip_addr2strz(&ip),port,listen_fd,nodename, strerror(erl_errno), epmdfd);
+
+ erl_close_socket(listen_fd);
+ return -1;
+--
+2.8.0.rc3
+
diff --git a/debian/patches/upstream/0040-erlang-fix-compile-warning-unused-but-set-variable.patch b/debian/patches/upstream/0040-erlang-fix-compile-warning-unused-but-set-variable.patch
new file mode 100644
index 0000000..a5cf975
--- /dev/null
+++ b/debian/patches/upstream/0040-erlang-fix-compile-warning-unused-but-set-variable.patch
@@ -0,0 +1,36 @@
+From 3e29e0bcfb14f0e95639eb99b777da84d46becf1 Mon Sep 17 00:00:00 2001
+From: Seudin Kasumovic <seudin.kasumovic at gmail.com>
+Date: Wed, 13 Apr 2016 00:34:41 +0200
+Subject: [PATCH] erlang: fix compile warning unused but set variable
+
+- get rid of this variable
+
+(cherry picked from commit 32c3435c8122903958834002ba843b93c49495f0)
+---
+ modules/erlang/erl_helpers.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/modules/erlang/erl_helpers.c b/modules/erlang/erl_helpers.c
+index f702a8b..1ec21d1 100644
+--- a/modules/erlang/erl_helpers.c
++++ b/modules/erlang/erl_helpers.c
+@@ -235,7 +235,6 @@ int erl_init_ec(ei_cnode *ec, const str *alivename, const str *hostname, const s
+ char nodename[MAXNODELEN];
+
+ int result;
+- int port;
+
+ /* copy the nodename into something we can modify */
+ if (snprintf(nodename, MAXNODELEN, "%.*s@%.*s", STR_FMT(alivename), STR_FMT(hostname)) >= MAXNODELEN) {
+@@ -256,8 +255,6 @@ int erl_init_ec(ei_cnode *ec, const str *alivename, const str *hostname, const s
+ return -1;
+ }
+
+- port = sockaddr_port(addr);
+-
+ LM_DBG("initialized ec for cnode '%s' on %.*s[%s] creation %d.\n", nodename, STR_FMT(hostname), ip_addr2strz(&ip), creation);
+
+ freeaddrinfo(ai);
+--
+2.8.0.rc3
+
diff --git a/debian/patches/upstream/0041-app_perl-Fix-use-UNIVERSAL-is-a-fatal-error-since-pe.patch b/debian/patches/upstream/0041-app_perl-Fix-use-UNIVERSAL-is-a-fatal-error-since-pe.patch
new file mode 100644
index 0000000..97b81f5
--- /dev/null
+++ b/debian/patches/upstream/0041-app_perl-Fix-use-UNIVERSAL-is-a-fatal-error-since-pe.patch
@@ -0,0 +1,71 @@
+From 3356d6aca4c85e7c086b1d46cf06e56635fd4739 Mon Sep 17 00:00:00 2001
+From: Victor Seva <linuxmaniac at torreviejawireless.org>
+Date: Fri, 15 Apr 2016 09:09:08 +0200
+Subject: [PATCH] app_perl: Fix "use UNIVERSAL" is a fatal error since perl
+ 5.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Author: Julián Moreno Patiño <julian at debian.org>
+* Fix #516
+* from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=821039
+
+(cherry picked from commit b77ed54d33f171d170ca89252f0a31a0d23996fa)
+---
+ modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm | 3 +--
+ modules/app_perl/lib/perl/Kamailio/VDB.pm | 7 +++----
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm b/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm
+index f97a22d..3b6509a 100644
+--- a/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm
++++ b/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm
+@@ -52,7 +52,6 @@ package Kamailio::LDAPUtils::LDAPConnection;
+ use Kamailio::LDAPUtils::LDAPConf;
+ use Net::LDAP;
+ use Authen::SASL;
+-use UNIVERSAL qw( isa );
+
+ my $ldap_singleton = undef;
+
+@@ -185,7 +184,7 @@ sub search {
+
+ my $ldap = undef;
+
+- if( isa($conf ,"Kamailio::LDAPUtils::LDAPConnection") ) {
++ if( $conf->isa("Kamailio::LDAPUtils::LDAPConnection") ) {
+ $ldap = $conf;
+ } else {
+ if( ! $ldap_singleton ) {
+diff --git a/modules/app_perl/lib/perl/Kamailio/VDB.pm b/modules/app_perl/lib/perl/Kamailio/VDB.pm
+index 8c6bdb3..0fff716 100644
+--- a/modules/app_perl/lib/perl/Kamailio/VDB.pm
++++ b/modules/app_perl/lib/perl/Kamailio/VDB.pm
+@@ -45,7 +45,6 @@ use Kamailio::VDB::Result;
+ use Kamailio::VDB::Value;
+ use Kamailio::VDB::VTab;
+
+-use UNIVERSAL qw ( can );
+
+ our @ISA = qw ( Kamailio::Utils::Debug );
+
+@@ -87,12 +86,12 @@ sub use_table {
+
+ Kamailio::log(L_DBG, "perlvdb:VDB: Setting VTab: v is $v (pkg is $pkg, func/method is $3)\n");
+
+- if (can($pkg, $3)) {
++ if ($pkg->can($3)) {
+ $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( func => $pkg . "::" . $3);
+- } elsif (can($v, "init")) {
++ } elsif ($v->can("init")) {
+ $v->init();
+ $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( obj => $v );
+- } elsif (can($v, "new")) {
++ } elsif ($v->can("new")) {
+ my $obj = $v->new();
+ $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( obj => $obj );
+ } else {
+--
+2.8.0.rc3
+
--
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