sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
325 discussions

git:master: xhttp_pi: adding note about using the provisioning interface with db_text

by Ovidiu Sas

Module: sip-router Branch: master Commit: 588a1a4280840e40beaae77345533b40ef1c710d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=588a1a4… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Jan 16 11:38:18 2013 -0500 xhttp_pi: adding note about using the provisioning interface with db_text --- modules/xhttp_pi/README | 5 +++++ modules/xhttp_pi/doc/xhttp_pi_admin.xml | 7 +++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/modules/xhttp_pi/README b/modules/xhttp_pi/README index c1bdafe..ed4a451 100644 --- a/modules/xhttp_pi/README +++ b/modules/xhttp_pi/README @@ -97,6 +97,11 @@ Chapter 1. Admin Guide * ability to reconfigure the interface layout on the fly by reloading the config from the xml framework via the rpc command interface. + Note: when provisioning tables using db_text, any change made to a + db_text table will not be reflected on the actual text file. In order + to force a write out to the disk of the cached tables, the db_text rpc + command db_text.dump must be used. + 2. Usage The layout of the provisionning interface is controlled via an external diff --git a/modules/xhttp_pi/doc/xhttp_pi_admin.xml b/modules/xhttp_pi/doc/xhttp_pi_admin.xml index c6aad7f..45b03ed 100644 --- a/modules/xhttp_pi/doc/xhttp_pi_admin.xml +++ b/modules/xhttp_pi/doc/xhttp_pi_admin.xml @@ -39,6 +39,13 @@ </para></listitem> </itemizedlist> </para> + <para> + Note: when provisioning tables using <emphasis>db_text</emphasis>, + any change made to a <emphasis>db_text</emphasis> table will not + be reflected on the actual text file. In order to force a write + out to the disk of the cached tables, the db_text rpc command + <emphasis>db_text.dump</emphasis> must be used. + </para> </section> <section>

11 years, 11 months

git:master: xhttp_pi: more documentation updates

by Ovidiu Sas

Module: sip-router Branch: master Commit: c065b24620a9475a70a19de95231a814076eefae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c065b24… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Jan 16 10:48:25 2013 -0500 xhttp_pi: more documentation updates --- modules/xhttp_pi/README | 4 +++- modules/xhttp_pi/doc/xhttp_pi_admin.xml | 3 +++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules/xhttp_pi/README b/modules/xhttp_pi/README index 0397018..c1bdafe 100644 --- a/modules/xhttp_pi/README +++ b/modules/xhttp_pi/README @@ -108,7 +108,9 @@ kamdbctl pframework create The generated framework will be saved inside Kamailio's config directory as pi_framework_sample. The list of configurable tables will be based on the STANDARD_MODULES and EXTRA_MODULES vars from kamctlrc - file. + file. The sample framework file will provide the ability to inspect + tables. In order to add/modify/remove records to/from tables, new + commands must be added by the admin. 3. Framework diff --git a/modules/xhttp_pi/doc/xhttp_pi_admin.xml b/modules/xhttp_pi/doc/xhttp_pi_admin.xml index 4fb6851..c6aad7f 100644 --- a/modules/xhttp_pi/doc/xhttp_pi_admin.xml +++ b/modules/xhttp_pi/doc/xhttp_pi_admin.xml @@ -58,6 +58,9 @@ kamdbctl pframework create <emphasis>STANDARD_MODULES</emphasis> and <emphasis>EXTRA_MODULES</emphasis> vars from <emphasis>kamctlrc</emphasis> file. + The sample framework file will provide the ability to inspect tables. + In order to add/modify/remove records to/from tables, + new commands must be added by the admin. </para> </section>

11 years, 11 months

git:master: xhttp_pi: documentation updates

by Ovidiu Sas

Module: sip-router Branch: master Commit: 0f59c52cb1d21d07654f815af3636330dc02e164 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f59c52… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Jan 16 10:37:30 2013 -0500 xhttp_pi: documentation updates - reported by Philippe Sultan <philippe.sultan(a)gmail.com> --- modules/xhttp_pi/README | 143 +++++++++++++++++-------------- modules/xhttp_pi/doc/xhttp_pi.xml | 4 +- modules/xhttp_pi/doc/xhttp_pi_admin.xml | 31 +++++-- modules/xhttp_pi/xhttp_pi_fnc.c | 2 +- 4 files changed, 102 insertions(+), 78 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0f5…

11 years, 11 months

cfg files for IMS modules

by Farkas István

Dear IMS module developers, First of all many thanks and respect for your work on providing the IMS extensions to Kamailio. If it's possible, could you please add some updated P-CSCF, I-CSCF, S-CSCF sample configuration files to the git repo? Currently I'm trying to test using files from the old smile-ims-extensions repo and the updated ones I got from Carsten, and they contain the following calls in the i-cscf config: I_trans_in_processing - It is used in register route I_perform_location_information - It is used initial request route The I-cscf instance does not start because it cannot find these commands. I couldn't find these functions in the source code. Maybe there's a replacement function for them or can they be safely omitted? Thanks in advance, Istvan

11 years, 11 months

git:master: Starting to prepare README/INSTALL files for release

by Olle E. Johansson

Module: sip-router Branch: master Commit: 32e73f99a3bab4bc673504d316831f0a8ff1f48c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32e73f9… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Jan 15 09:46:22 2013 +0100 Starting to prepare README/INSTALL files for release --- AUTHORS | 7 +++++++ INSTALL | 13 ++++++++----- README | 24 ++++++++++++++---------- README-MODULES | 33 +++++++++------------------------ 4 files changed, 38 insertions(+), 39 deletions(-) diff --git a/AUTHORS b/AUTHORS index f79ba18..b766254 100644 --- a/AUTHORS +++ b/AUTHORS @@ -131,6 +131,13 @@ W: http://www.ohlmeier.org P: BAD6CA40 B5E7 4FB0 800F 0A2C E3E9 4073 C7C3 F275 BAD6 CA40 D: +N: Olle E. JOhansson +C: oej +E: oej(a)edvina.net +W: http://edvina.net +P: +D: + N: Peter Griffiths C: E: diff --git a/INSTALL b/INSTALL index 8519add..68bed71 100644 --- a/INSTALL +++ b/INSTALL @@ -62,6 +62,10 @@ very few, Kamailio enabling next compile time flags: - internal statistics - application server extensions in tm module +In version 4.0.0 the modules were merged into one set and the merger +between the two products was completed. Kamailio is now the main +flavour. + Switching between flavours is a matter of 'make' command parameters. Several installation tutorials for Kamailio are available on the web wiki: @@ -130,6 +134,7 @@ Requirements: - libpcre libs and devel headers - if you want to compile the lcr and dialplan modules - libsctp devel headers - if you want to compile the SCTP transport in the core +- linunistring - for the Websockets module OS Notes: @@ -253,10 +258,8 @@ B) Build Commands Compile modules except some explicitly excepted (see below) make modules - all modules in the modules/ directory (common modules) - make modules_s - all modules in the modules_s/ directory (ser modules) make modules_k - all modules in the modules_k/ directory (kamailio modules) - make modules-all or make every-module - all the modules (modules, modules_s - and module_k) + make modules-all or make every-module - all the modules (modules and module_k) * Compile all: make all @@ -680,10 +683,10 @@ D) SIP Server with Persistent Data Storage 3.2) create MySQL tables for Kamailio flavour - if you have a previously installed Kamailio on your system, use - /usr/sbin/kamdbctl reinstall + /usr/local/sbin/kamdbctl reinstall to convert your Kamailio database into new structures - otherwise, if this is your very first installation, use - /usr/sbin/kamdbctl create + /usr/local/sbin/kamdbctl create to create Kamailio database structures (you will be prompted for password of MySql "root" user) diff --git a/README b/README index 1b0ab00..6d342ca 100644 --- a/README +++ b/README @@ -15,26 +15,29 @@ VI. More Information SIP Router (sip-router) is an industrial-strength, free VoIP server based on the Session Initiation Protocol (SIP RFC3261). -It is engineered to power IP telephony and presence infrastructures up to large -scale. The server keeps track of users, sets up VoIP sessions, relays instant +It is engineered to power Realtime Communications such as IP telephony and presence +infrastructures up to large scale. + +The server keeps track of users, sets up multimedia sessions, relays instant messages and creates space for new plug-in applications. Its proven interoperability guarantees seamless integration with components from other vendors, eliminating the -risk of a single-vendor trap. It has successfully participated in various +risk of a single-vendor trap. SIP Router has successfully participated in various interoperability tests in which it worked with the products of other leading SIP vendors. -The SIP Router enables a flexible plug-in model for new applications: Third parties +The SIP Router software enables a flexible plug-in model for new applications: Third parties can easily link their plug-ins with the server code and provide thereby advanced and -customized services. +customized services. With a modern RPC interface, 3rd party application can integrate +and interact with services provided by SIP Router. -Its performance and robustness allows it to serve millions of users and accommodate needs -of very large operators. With a $3000 dual-CPU, the SIP Express Router is able to power +SIP Router's performance and robustness allows it to serve millions of users and accommodate needs +of very large operators. With a low-cost dual-CPU, the SIP Router server is able to power IP telephony services in an area as large as the Bay Area during peak hours. The SIP Router is extremely configurable to allow the creation of various routing and admission policies as well as setting up new and customized services. Its configurability allows it to serve many roles: network security barrier, presence server, application server, -or PSTN gateway guard (Session Border Controller) for example. +IMS server or PSTN gateway guard (Session Border Controller) for example. II. Feature List @@ -64,7 +67,8 @@ IV. About sip-router.org The SIP Router project was started during the fall of 2008 by developers from the OpenSER project, recently renamed to Kamailio.org and SIP Express Router (SER) from iptel.org. SIP Router is the result of a merge of the code base and years -of experience from both developer teams. +of experience from both developer teams. In release 4.0, during the spring of 2013, the +merger of the products was completed and a unified product was released. See http://www.sip-router.org/ for the story of SER, OpenSER/Kamailio and sip-router.org. @@ -89,7 +93,7 @@ Most up-to-date information is always available at our website, Particularly, it includes: - administrator's guide -- configuration cookbook +- configuration cookbooks (core, pseudovariables and transformations) - module documentation - installation guidelines (INSTALL) - download links diff --git a/README-MODULES b/README-MODULES index 8861ec6..e04c872 100644 --- a/README-MODULES +++ b/README-MODULES @@ -3,23 +3,14 @@ SIP-ROUTER modules ================== -This is the first release of the combined project. In order to be able to support -an upgrade path for both Kamailio/OpenSER and SER current users, we have been forced to -provide some modules in two versions, which means that we have three set of modules: +This is the first release of the merged product - Kamailio and SER. +In the previous release some modules where provided in two versions, in Kamailio +and SER flavours. These are now merged. In some cases, the functionality has +changed. You can still do the same operation, but how you do it may be different. +Modules are divided in two directories - modules: the SIP router modules - modules_k: Kamailio modules - - modules_s: SER modules - -All modules are compatible with the core, so regardless if you are a new user or -an existing, you are free to make a choice between the three sets as well as -mix and match between them. - -Note that if you are currently using one product, you want to select the module -that exists in the K/S directories first to get a smooth upgrade path. - -As sip-router development progress, we will move as many modules as possible -into the core and only keep k/s modules for backwards compatibility when required. What is a module? ================= @@ -27,22 +18,16 @@ A module consists of a lot of functions that enhance the core. Some of the modul depends on other modules. It's all properly documented in the README that belongs to each module (available as web pages on the sip-router.org web site). -A module providers up to three different APIs: +A module providers up to five different APIs: - Enhancements to the core SIP-router routing script (functions) -- Commands for the management interface (MI) +- Commands for the management interface (MI and RPC) - Development interface for other modules +- Pseudo-variables +- Selects and config framework variables A single module may provide a selection of this, maybe only one of them. -Why do we have two modules with the same name? -============================================== -Some modules exists both in modules_k and modules_s - like xlog. If you are -upgrading from Kamailio, we recommend using the one in modules_k for backwards -compatibility, if you are using SER then select the one in modules_s. -In the future the development team will try to integrate modules that are -split like this into one integrated module. - Core modules ------------ auth_identity SIP Identity support (RFC 4474)

11 years, 11 months

git:master: b/f: If no parameter is given, the "fixup_lir" method will never get called...

by admin＠sip-router.org

Module: sip-router Branch: master Commit: 241681f6a2bc9d9647251963eee5f65386717edb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=241681f… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Tue Jan 15 09:03:25 2013 +0100 b/f: If no parameter is given, the "fixup_lir" method will never get called... --- modules/ims_icscf/mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_icscf/mod.c b/modules/ims_icscf/mod.c index eacff24..6066741 100644 --- a/modules/ims_icscf/mod.c +++ b/modules/ims_icscf/mod.c @@ -107,7 +107,7 @@ static int fixup_lir(void** param, int param_no); static cmd_export_t cmds[] = { {"I_perform_user_authorization_request", (cmd_function) I_perform_user_authorization_request, 1, fixup_uar, 0, REQUEST_ROUTE}, - {"I_perform_location_information_request", (cmd_function) I_perform_location_information_request, 0, fixup_lir, 0, REQUEST_ROUTE}, + {"I_perform_location_information_request", (cmd_function) I_perform_location_information_request, 1, fixup_lir, 0, REQUEST_ROUTE}, {"I_scscf_select", (cmd_function) I_scscf_select, 1, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, {"I_scscf_drop", (cmd_function) I_scscf_drop, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, { 0, 0, 0, 0, 0, 0}

11 years, 11 months

Dokuwiki upgraded

by Daniel-Constantin Mierla

Hello, fyi, I upgraded dokuwiki to latest version, switching to the new default template (which is not bad at all, btw) as the old one is not yet fully compatible. If you find any issue, report to devel mailing list. It is about the wiki for v3.2+: - http://www.kamailio.org/wiki/ Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, April 16-17, 2013, Berlin - http://conference.kamailio.com -

11 years, 11 months

git:master: b/f: Need to link librt (on OS non-Darwin)

by admin＠sip-router.org

Module: sip-router Branch: master Commit: 7f7e0d046cbaf59170605c21070eb476a28fbc18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f7e0d0… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Tue Jan 15 08:18:52 2013 +0100 b/f: Need to link librt (on OS non-Darwin) --- modules/cdp/Makefile | 7 +++++-- modules/ims_auth/Makefile | 4 ++++ modules/ims_registrar_pcscf/Makefile | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/cdp/Makefile b/modules/cdp/Makefile index 15ef21b..d555e62 100644 --- a/modules/cdp/Makefile +++ b/modules/cdp/Makefile @@ -13,11 +13,14 @@ endif ifneq ($(XML2CFG),) DEFS += $(shell $(XML2CFG) --cflags ) LIBS += $(shell $(XML2CFG) --libs) - LIBS += -lrt else INCLUDES +=-I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include - LIBS += -L$(LOCALBASE)/lib -lxml2 -lrt + LIBS += -L$(LOCALBASE)/lib -lxml2 +endif + +ifneq ($(OS),darwin) + LIBS += -lrt endif include ../../Makefile.modules diff --git a/modules/ims_auth/Makefile b/modules/ims_auth/Makefile index a891adf..c3776e6 100644 --- a/modules/ims_auth/Makefile +++ b/modules/ims_auth/Makefile @@ -22,6 +22,10 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(OS),darwin) + LIBS += -lrt +endif + DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib diff --git a/modules/ims_registrar_pcscf/Makefile b/modules/ims_registrar_pcscf/Makefile index cae4581..8c45b9d 100644 --- a/modules/ims_registrar_pcscf/Makefile +++ b/modules/ims_registrar_pcscf/Makefile @@ -22,6 +22,10 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(OS),darwin) + LIBS += -lrt +endif + DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib

11 years, 11 months

git:master: b/f: Modify IMS-Group Modulenames to reflect module-name changes.

by admin＠sip-router.org

Module: sip-router Branch: master Commit: 04b1b6c94a69da8b4bf5134d890edfaf0c0ad153 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04b1b6c… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Jan 14 19:28:27 2013 +0100 b/f: Modify IMS-Group Modulenames to reflect module-name changes. --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4c43954..d412f75 100644 --- a/Makefile +++ b/Makefile @@ -299,8 +299,8 @@ module_group_kmono=app_mono # For IMS # kamailio modules -module_group_kims=auth_ims cdp cdp_avp dialog2 ims_qos isc icscf ipsec\ - registrar_pcscf registrar_scscf usrloc_pcscf usrloc_scscf +module_group_kims=ims_auth cdp cdp_avp dialog_ng ims_qos ims_isc ims_icscf\ + ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf ims_usrloc_scscf # if not set on the cmd. line, env or in the modules.lst (cfg_group_include) # exclude the below modules.

11 years, 11 months

git:master: b/f: Do not remove lib*, only "real" libs

by admin＠sip-router.org

Module: sip-router Branch: master Commit: b87c9b03499e58d481cf6fe02302a378051272a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b87c9b0… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Jan 14 17:46:08 2013 +0100 b/f: Do not remove lib*, only "real" libs --- pkg/kamailio/deb/debian/rules | 12 ++++++++---- pkg/kamailio/deb/lenny/rules | 12 ++++++++---- pkg/kamailio/deb/lucid/rules | 12 ++++++++---- pkg/kamailio/deb/precise/rules | 12 ++++++++---- pkg/kamailio/deb/squeeze/rules | 12 ++++++++---- pkg/kamailio/deb/wheezy/rules | 12 ++++++++---- 6 files changed, 48 insertions(+), 24 deletions(-) diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index 7c7d4f6..b2a185c 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -85,8 +85,10 @@ define PACKAGE_GRP_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ 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/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(grp) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) @@ -103,8 +105,10 @@ define PACKAGE_MODULE_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ 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/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) diff --git a/pkg/kamailio/deb/lenny/rules b/pkg/kamailio/deb/lenny/rules index c4edd6e..bb146e4 100755 --- a/pkg/kamailio/deb/lenny/rules +++ b/pkg/kamailio/deb/lenny/rules @@ -85,8 +85,10 @@ define PACKAGE_GRP_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ 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/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(grp) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) @@ -103,8 +105,10 @@ define PACKAGE_MODULE_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ 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/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) diff --git a/pkg/kamailio/deb/lucid/rules b/pkg/kamailio/deb/lucid/rules index 39a48ae..d042a5c 100755 --- a/pkg/kamailio/deb/lucid/rules +++ b/pkg/kamailio/deb/lucid/rules @@ -85,8 +85,10 @@ define PACKAGE_GRP_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ 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/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(grp) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) @@ -103,8 +105,10 @@ define PACKAGE_MODULE_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ 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/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index 9e8ac28..f809800 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/pkg/kamailio/deb/precise/rules @@ -85,8 +85,10 @@ define PACKAGE_GRP_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ 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/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(grp) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) @@ -103,8 +105,10 @@ define PACKAGE_MODULE_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ 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/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index 5b8dda0..9961948 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -85,8 +85,10 @@ define PACKAGE_GRP_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ 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/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(grp) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) @@ -103,8 +105,10 @@ define PACKAGE_MODULE_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ 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/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index 4bbf814..149d34c 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -85,8 +85,10 @@ define PACKAGE_GRP_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ 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/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(grp) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done ) @@ -103,8 +105,10 @@ define PACKAGE_MODULE_INSTALL_template -for d in $(DUP_LIBS_DIRS); do \ 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/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + if [ "$$r" != "$$d/lib*" ]; then \ + echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\ + rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \ + fi \ done ; \ done )

11 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2013