sr-dev May 2011

sr-dev@lists.kamailio.org

28 participants
167 discussions

git:3.1: pkg: deb lib dir name is set by variable LIBDIR
by Daniel-Constantin Mierla 08 May '11

08 May '11

Module: sip-router Branch: 3.1 Commit: 41e576663d1826fd94106d8aa1b8aff0fc7104ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41e5766… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 6 06:42:51 2011 +0200 pkg: deb lib dir name is set by variable LIBDIR - fixes the check for duplicate libs to variants of deb distros - reported in FS#130 and FS#128 (cherry picked from commit 807b73d8a242ae12f93564b024baaa38dce89c8e) --- pkg/kamailio/deb/lenny/rules | 15 +++++++++------ pkg/kamailio/deb/lucid/rules | 15 +++++++++------ pkg/kamailio/deb/squeeze/rules | 15 +++++++++------ 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/pkg/kamailio/deb/lenny/rules b/pkg/kamailio/deb/lenny/rules index d9ec443..38066c0 100755 --- a/pkg/kamailio/deb/lenny/rules +++ b/pkg/kamailio/deb/lenny/rules @@ -44,10 +44,13 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ snmpstats carrierroute xmpp cpl lua python +# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) +LIBDIR ?= lib + # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/$(LIBDIR)/kamailio \ + $(CURDIR)/debian/kamailio-db-modules/usr/$(LIBDIR)/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) @@ -80,10 +83,10 @@ define PACKAGE_GRP_INSTALL_template doc-dir=share/doc/kamailio-$(grp)-modules # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) @@ -98,10 +101,10 @@ define PACKAGE_MODULE_INSTALL_template doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-module # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) diff --git a/pkg/kamailio/deb/lucid/rules b/pkg/kamailio/deb/lucid/rules index fbaccf6..30feea7 100755 --- a/pkg/kamailio/deb/lucid/rules +++ b/pkg/kamailio/deb/lucid/rules @@ -44,10 +44,13 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ snmpstats carrierroute xmpp cpl lua python geoip +# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) +LIBDIR ?= lib + # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/$(LIBDIR)/kamailio \ + $(CURDIR)/debian/kamailio-db-modules/usr/$(LIBDIR)/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) @@ -80,10 +83,10 @@ define PACKAGE_GRP_INSTALL_template doc-dir=share/doc/kamailio-$(grp)-modules # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) @@ -98,10 +101,10 @@ define PACKAGE_MODULE_INSTALL_template doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-module # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index a64793a..0f2e2a5 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -44,10 +44,13 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils geoip memcached tls \ snmpstats carrierroute xmpp cpl lua python +# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) +LIBDIR ?= lib + # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/$(LIBDIR)/kamailio \ + $(CURDIR)/debian/kamailio-db-modules/usr/$(LIBDIR)/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) @@ -80,10 +83,10 @@ define PACKAGE_GRP_INSTALL_template doc-dir=share/doc/kamailio-$(grp)-modules # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) @@ -98,10 +101,10 @@ define PACKAGE_MODULE_INSTALL_template doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-module # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done )

1 0

git:3.1: pkg: lib dir name is set by variable LIBDIR
by Daniel-Constantin Mierla 08 May '11

08 May '11

Module: sip-router Branch: 3.1 Commit: 078667f55841b64fb0e33b20c5ae066f849a6195 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=078667f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 6 05:42:21 2011 +0200 pkg: lib dir name is set by variable LIBDIR - fixes the check for duplicate libs - reported in FS#130 and FS#128 (cherry picked from commit 29b996a5d89a74c7fe866919a6e3067071f84d75) --- pkg/kamailio/deb/debian/rules | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index fbaccf6..30feea7 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -44,10 +44,13 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ snmpstats carrierroute xmpp cpl lua python geoip +# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) +LIBDIR ?= lib + # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/$(LIBDIR)/kamailio \ + $(CURDIR)/debian/kamailio-db-modules/usr/$(LIBDIR)/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) @@ -80,10 +83,10 @@ define PACKAGE_GRP_INSTALL_template doc-dir=share/doc/kamailio-$(grp)-modules # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) @@ -98,10 +101,10 @@ define PACKAGE_MODULE_INSTALL_template doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-module # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done )

1 0

[tracker] Comment added: kamailio debian build error
by sip-router 06 May '11

06 May '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#130 - kamailio debian build error User who did this - Marcus Hunger (fnordian) ---------- also, 64bit libs must be deleted when duplicate. add rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib64/kamailio/`basename "$$r"` ; \ to the PACKAGE_GRP_INSTALL_template ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=130#comment211 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

free tickets linuxtag
by Henning Westerholt 06 May '11

06 May '11

Hello, we've few free 4 day tickets for the LinuxTag next week in Berlin to share. If you like to receive one, just send me a short reply. More informations about our booth: http://www.kamailio.org/w/2011/04/kamailio-booth-at-linuxtag-2011/ Best regards, Henning

1 0

git:mariusbucur/dmq: changed build_node_str so that parameters are added to the sip uri
by Marius Ovidiu Bucur 06 May '11

06 May '11

Module: sip-router Branch: mariusbucur/dmq Commit: 34ae039f6949affb42a005ef8f39313c30eca75b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34ae039… Author: Marius Bucur <marius(a)marius-bucur.ro> Committer: Marius Bucur <marius(a)marius-bucur.ro> Date: Fri May 6 09:55:31 2011 +0300 changed build_node_str so that parameters are added to the sip uri --- modules_k/dmq/dmq.c | 5 ++++ modules_k/dmq/dmq_funcs.c | 1 + modules_k/dmq/dmqnode.c | 47 +++++++++++++++++++++++++++++++++++++ modules_k/dmq/dmqnode.h | 3 ++ modules_k/dmq/notification_peer.c | 9 ------- 5 files changed, 56 insertions(+), 9 deletions(-) diff --git a/modules_k/dmq/dmq.c b/modules_k/dmq/dmq.c index 9dbf52c..c8fbff9 100644 --- a/modules_k/dmq/dmq.c +++ b/modules_k/dmq/dmq.c @@ -251,6 +251,11 @@ static int child_init(int rank) { */ static void destroy(void) { /* TODO unregister dmq node, free resources */ + if(dmq_notification_address.s) { + LM_DBG("unregistering node %.*s\n", STR_FMT(&self_node->orig_uri)); + self_node->status = DMQ_NODE_DISABLED; + request_nodelist(notification_node, 1); + } } static int handle_dmq_fixup(void** param, int param_no) { diff --git a/modules_k/dmq/dmq_funcs.c b/modules_k/dmq/dmq_funcs.c index b0164db..8a97c99 100644 --- a/modules_k/dmq/dmq_funcs.c +++ b/modules_k/dmq/dmq_funcs.c @@ -80,6 +80,7 @@ int bcast_dmq_message(dmq_peer_t* peer, str* body, dmq_node_t* except, dmq_resp_ * - any inactive nodes */ if((except && cmp_dmq_node(node, except)) || node->local || node->status != DMQ_NODE_ACTIVE) { + LM_DBG("skipping node %.*s\n", STR_FMT(&node->orig_uri)); node = node->next; continue; } diff --git a/modules_k/dmq/dmqnode.c b/modules_k/dmq/dmqnode.c index 6465e01..25334bc 100644 --- a/modules_k/dmq/dmqnode.c +++ b/modules_k/dmq/dmqnode.c @@ -12,6 +12,23 @@ str dmq_node_active_str = str_init("active"); str dmq_node_disabled_str = str_init("disabled"); str dmq_node_timeout_str = str_init("timeout"); +str* get_status_str(int status) { + switch(status) { + case DMQ_NODE_ACTIVE: { + return &dmq_node_active_str; + } + case DMQ_NODE_DISABLED: { + return &dmq_node_disabled_str; + } + case DMQ_NODE_TIMEOUT: { + return &dmq_node_timeout_str; + } + default: { + return 0; + } + } +} + dmq_node_list_t* init_dmq_node_list() { dmq_node_list_t* node_list = shm_malloc(sizeof(dmq_node_list_t)); memset(node_list, 0, sizeof(dmq_node_list_t)); @@ -63,6 +80,11 @@ error: return -1; } +inline int set_default_dmq_node_params(dmq_node_t* node) { + node->status = DMQ_NODE_ACTIVE; + return 0; +} + inline dmq_node_t* build_dmq_node(str* uri, int shm) { dmq_node_t* ret; param_hooks_t hooks; @@ -79,6 +101,7 @@ inline dmq_node_t* build_dmq_node(str* uri, int shm) { memset(ret, 0, sizeof(*ret)); pkg_str_dup(&ret->orig_uri, uri); } + set_default_dmq_node_params(ret); if(parse_uri(ret->orig_uri.s, ret->orig_uri.len, &ret->uri) < 0) { LM_ERR("error parsing uri\n"); goto error; @@ -198,4 +221,28 @@ inline dmq_node_t* add_dmq_node(dmq_node_list_t* list, str* uri) { return newnode; error: return NULL; +} + +int build_node_str(dmq_node_t* node, char* buf, int buflen) { + /* sip:host:port;status=[status] */ + int len = 0; + if(buflen < node->orig_uri.len + 32) { + LM_ERR("no more space left for node string\n"); + return -1; + } + memcpy(buf + len, "sip:", 4); + len += 4; + memcpy(buf + len, node->uri.host.s, node->uri.host.len); + len += node->uri.host.len; + memcpy(buf + len, ":", 1); + len += 1; + memcpy(buf + len, node->uri.port.s, node->uri.port.len); + len += node->uri.port.len; + memcpy(buf + len, ";", 1); + len += 1; + memcpy(buf + len, "status=", 7); + len += 7; + memcpy(buf + len, get_status_str(node->status)->s, get_status_str(node->status)->len); + len += get_status_str(node->status)->len; + return len; } \ No newline at end of file diff --git a/modules_k/dmq/dmqnode.h b/modules_k/dmq/dmqnode.h index c16d534..3bd69b0 100644 --- a/modules_k/dmq/dmqnode.h +++ b/modules_k/dmq/dmqnode.h @@ -47,6 +47,9 @@ void shm_free_node(dmq_node_t* node); void pkg_free_node(dmq_node_t* node); int set_dmq_node_params(dmq_node_t* node, param_t* params); +str* get_status_str(int status); +int build_node_str(dmq_node_t* node, char* buf, int buflen); + extern dmq_node_t* self_node; extern dmq_node_t* notification_node; diff --git a/modules_k/dmq/notification_peer.c b/modules_k/dmq/notification_peer.c index c8c261c..f06693a 100644 --- a/modules_k/dmq/notification_peer.c +++ b/modules_k/dmq/notification_peer.c @@ -153,15 +153,6 @@ error: return -1; } -int build_node_str(dmq_node_t* node, char* buf, int buflen) { - if(buflen < node->orig_uri.len) { - LM_ERR("no more space left for node string\n"); - return -1; - } - memcpy(buf, node->orig_uri.s, node->orig_uri.len); - return node->orig_uri.len; -} - /** * builds the body of a notification message from the list of servers * the result will look something like:

1 0

git:master: pkg: deb lib dir name is set by variable LIBDIR
by Daniel-Constantin Mierla 06 May '11

06 May '11

Module: sip-router Branch: master Commit: 807b73d8a242ae12f93564b024baaa38dce89c8e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=807b73d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 6 06:42:51 2011 +0200 pkg: deb lib dir name is set by variable LIBDIR - fixes the check for duplicate libs to variants of deb distros - reported in FS#130 and FS#128 --- pkg/kamailio/deb/lenny/rules | 15 +++++++++------ pkg/kamailio/deb/lucid/rules | 15 +++++++++------ pkg/kamailio/deb/squeeze/rules | 15 +++++++++------ 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/pkg/kamailio/deb/lenny/rules b/pkg/kamailio/deb/lenny/rules index d9ec443..38066c0 100755 --- a/pkg/kamailio/deb/lenny/rules +++ b/pkg/kamailio/deb/lenny/rules @@ -44,10 +44,13 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ snmpstats carrierroute xmpp cpl lua python +# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) +LIBDIR ?= lib + # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/$(LIBDIR)/kamailio \ + $(CURDIR)/debian/kamailio-db-modules/usr/$(LIBDIR)/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) @@ -80,10 +83,10 @@ define PACKAGE_GRP_INSTALL_template doc-dir=share/doc/kamailio-$(grp)-modules # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) @@ -98,10 +101,10 @@ define PACKAGE_MODULE_INSTALL_template doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-module # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) diff --git a/pkg/kamailio/deb/lucid/rules b/pkg/kamailio/deb/lucid/rules index fbaccf6..30feea7 100755 --- a/pkg/kamailio/deb/lucid/rules +++ b/pkg/kamailio/deb/lucid/rules @@ -44,10 +44,13 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ snmpstats carrierroute xmpp cpl lua python geoip +# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) +LIBDIR ?= lib + # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/$(LIBDIR)/kamailio \ + $(CURDIR)/debian/kamailio-db-modules/usr/$(LIBDIR)/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) @@ -80,10 +83,10 @@ define PACKAGE_GRP_INSTALL_template doc-dir=share/doc/kamailio-$(grp)-modules # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) @@ -98,10 +101,10 @@ define PACKAGE_MODULE_INSTALL_template doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-module # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index a64793a..0f2e2a5 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -44,10 +44,13 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils geoip memcached tls \ snmpstats carrierroute xmpp cpl lua python +# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) +LIBDIR ?= lib + # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/$(LIBDIR)/kamailio \ + $(CURDIR)/debian/kamailio-db-modules/usr/$(LIBDIR)/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) @@ -80,10 +83,10 @@ define PACKAGE_GRP_INSTALL_template doc-dir=share/doc/kamailio-$(grp)-modules # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) @@ -98,10 +101,10 @@ define PACKAGE_MODULE_INSTALL_template doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-module # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done )

1 0

git:master: pkg: lib dir name is set by variable LIBDIR
by Daniel-Constantin Mierla 06 May '11

06 May '11

Module: sip-router Branch: master Commit: 29b996a5d89a74c7fe866919a6e3067071f84d75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29b996a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 6 05:42:21 2011 +0200 pkg: lib dir name is set by variable LIBDIR - fixes the check for duplicate libs - reported in FS#130 and FS#128 --- pkg/kamailio/deb/debian/rules | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index fbaccf6..30feea7 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -44,10 +44,13 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ snmpstats carrierroute xmpp cpl lua python geoip +# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) +LIBDIR ?= lib + # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/$(LIBDIR)/kamailio \ + $(CURDIR)/debian/kamailio-db-modules/usr/$(LIBDIR)/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) @@ -80,10 +83,10 @@ define PACKAGE_GRP_INSTALL_template doc-dir=share/doc/kamailio-$(grp)-modules # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(grp) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done ) @@ -98,10 +101,10 @@ define PACKAGE_MODULE_INSTALL_template doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-module # eliminate duplicate libs -for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio" &&\ + test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\ for r in $$d/lib*; do \ echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ - rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/lib/kamailio/`basename "$$r"` ; \ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ done ; \ done )

1 0

[tracker] Comment added: Debian / Ubuntu Packages for Kamailio 3.1.3 Broken
by sip-router 05 May '11

05 May '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#128 - Debian / Ubuntu Packages for Kamailio 3.1.3 Broken User who did this - Ali Onur Uyar (aouyar) ---------- The bug also applies to 32-bit systems; in fact I had reported the error on after upgrading from 3.1.2 to 3.1.3 debs on a 32-bit system. What seemed quite strange to me was that libraries were being installed in /usr/lib64 directory eventhough the system in question is a 32-bits system. Why are 64-bit libs being installed in the first place if the target system is 32-bits? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=128#comment210 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

crash at startup when listening address does not exist
by Juha Heinanen 05 May '11

05 May '11

i noticed that sr master version crashes at startup if a listening address does not exist: May 3 10:19:43 sip /usr/sbin/sip-proxy[27907]: ERROR: <core> [udp_server.c:400]: ERROR: udp_init: bind(8, 0xb7210490, 16) on 192.98.102.10: Cannot assign requested address May 3 10:19:43 sip kernel: [189745.416438] sip-proxy[27907]: segfault at 786e6570 ip b767ce38 sp bf85f67c error 4 in libc-2.11.2.so[b760a000+140000] May 3 10:19:43 sip sip-proxy: ERROR: <core> [daemonize.c:307]: Main process exited before writing to pipe -- juha

2 2

[tracker] Comment added: Debian / Ubuntu Packages for Kamailio 3.1.3 Broken
by sip-router 05 May '11

05 May '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#128 - Debian / Ubuntu Packages for Kamailio 3.1.3 Broken User who did this - Florian Friedrich (FloFri) ---------- It seems to be a problem with the 64bit-builds. The debian/rules-script only checks for duplicate libraries in the usr/lib directory. But the libraries for the 64bit-builds are in the usr/lib64 directory. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=128#comment209 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2011