sr-dev November 2018

sr-dev@lists.kamailio.org

22 participants
298 discussions

git:master:6675a960: evapi: convert return code for kemi functions to match the ones from cfg equivalents

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6675a960490c9c72e69aab7a676a3012da2999b2 URL: https://github.com/kamailio/kamailio/commit/6675a960490c9c72e69aab7a676a301… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-07T08:34:13+01:00 evapi: convert return code for kemi functions to match the ones from cfg equivalents --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6675a960490c9c72e69aab7a676a301… Patch: https://github.com/kamailio/kamailio/commit/6675a960490c9c72e69aab7a676a301… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index c8d32ac9cb..7d3a4ecf36 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -586,7 +586,13 @@ static int w_evapi_set_tag(sip_msg_t* msg, char* ptag, char* p2) */ static int ki_evapi_relay(sip_msg_t *msg, str *sdata) { - return evapi_relay(sdata); + int ret; + + ret = evapi_relay(sdata); + + if(ret<0) return ret; + + return (ret+1); } /** @@ -598,7 +604,6 @@ static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) unsigned int tlabel; tm_cell_t *t = 0; - if(tmb.t_suspend==NULL) { LM_ERR("evapi async relay is disabled - tm module not loaded\n"); return -1; @@ -644,7 +649,13 @@ static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) */ static int ki_evapi_relay_unicast(sip_msg_t *msg, str *sdata, str *stag) { - return evapi_relay_unicast(sdata, stag); + int ret; + + ret = evapi_relay_unicast(sdata, stag); + + if(ret<0) return ret; + + return (ret+1); } /** @@ -652,7 +663,13 @@ static int ki_evapi_relay_unicast(sip_msg_t *msg, str *sdata, str *stag) */ static int ki_evapi_relay_multicast(sip_msg_t *msg, str *sdata, str *stag) { - return evapi_relay_multicast(sdata, stag); + int ret; + + ret = evapi_relay_multicast(sdata, stag); + + if(ret<0) return ret; + + return (ret+1); } /**

6 years

[kamailio/kamailio] Cannot be packaged into RPM master and 5.2 branch (#1709)

by sergey-safarov

### Description I testing package `master` and `5.2` branch int RPM. but cannot. Build and packaging logs is [here](https://build.opensuse.org/build/home:sergey-safarov:v5.2.x-rpms/Cent… Is happens because `make install-share` goal is try create folder `/usr/share/kamailio/` instead of `/home/build/rpmbuild/BUILDROOT/kamailio-5.2.0-0.el7.centos.x86_64/usr/share/kamailio/`. ### Troubleshooting #### Reproduction please look above #### Debugging Data NA. #### Log Messages ``` [build@node0 kamailio-5.2.0]$ pwd /home/build/rpmbuild/BUILD/kamailio-5.2.0 [build@node0 kamailio-5.2.0]$ make -C src install-share make: Entering directory `/home/build/rpmbuild/BUILD/kamailio-5.2.0/src' mkdir -p /usr/share/kamailio/ mkdir: cannot create directory ‘/usr/share/kamailio/’: Permission denied make: *** [/usr/share/kamailio/] Error 1 make: Leaving directory `/home/build/rpmbuild/BUILD/kamailio-5.2.0/src' [build@node0 kamailio-5.2.0]$ ``` #### SIP Traffic NA ### Possible Solutions Not known ### Additional Information tested current master and 5.2 branch * **Operating System**: CentOS 7 ``` Linux node0.docker.rcsnet.ru 4.14.13-300.fc27.x86_64 #1 SMP Thu Jan 11 04:00:01 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1709

6 years

git:5.2:2a91ca46: Makefile.defs: use $(prefix) for setting share_target

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 2a91ca46d8f05fde52869bd9434897ad5d76625b URL: https://github.com/kamailio/kamailio/commit/2a91ca46d8f05fde52869bd9434897a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-07T08:24:07+01:00 Makefile.defs: use $(prefix) for setting share_target - GH #1709 (cherry picked from commit 2b295f83e1c40637012633b6cab2ad86415d4623) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/2a91ca46d8f05fde52869bd9434897a… Patch: https://github.com/kamailio/kamailio/commit/2a91ca46d8f05fde52869bd9434897a… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 13ff1b0188..bcf69ffb09 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -497,7 +497,7 @@ bin_target = $(prefix)/$(bin_dir) #modules_target = $(prefix)/$(modules_dir) lib_target = $(prefix)/$(lib_dir) run_target = $(run_prefix)/$(run_dir) -share_target = $(share_prefix)/$(share_dir) +share_target = $(prefix)/$(share_dir) doc_target = $(prefix)/$(doc_dir) data_target = $(prefix)/$(data_dir) @@ -2095,7 +2095,8 @@ saved_chg_vars:=\ cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \ doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \ share_prefix share_dir lib_prefix lib_dir data_prefix data_dir \ - cfg_target lib_target data_target run_prefix run_dir run_target + cfg_target lib_target data_target run_prefix run_dir run_target \ + share_target #export relevant variables to the sub-makes

6 years

5.2.x OBS: CentOS/RHEL RPMs build app_python3.so with Software Collections?

by Anthony Alba

Sorry for the fat finger and earlier incomplete message... Although RHEL 7/CentOS 7 don't come with python3 in the base OS, it would be nice to have app_python3.so packaged for more extensive exposure in the wild. Can I suggest that kamailio OBS be built against the python3 packages in Software Collections? Currently rh-python36 is on RHEL and Software Collections for CentOS. Cheers Anthony Alba

6 years

Evapi not in 5.1

by bill＠telopar.net

Just installed 5.1 and see that the evapi module is no longer included. Has this been replaced by something new? Bill

6 years

[kamailio/kamailio] RPM spec update for 5.1 branch (#1708)

by sergey-safarov

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1702 #### Description RPM spec update for 5.1 branch You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1708 -- Commit Summary -- * pkg/kamailio/ops: Added MongoDB rpm package * pkg/kamailio/obs: Updated obs meta * pkg/kamailio/obs: Removed end of life dist * pkg/kamailio/obs: Fixed bdb module build on fedora dists * [5.1] pkg/kamailio/obs: update spec to mach currently used -- File Changes -- M pkg/kamailio/obs/kamailio.spec (132) M pkg/kamailio/obs/meta (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1708.patch https://github.com/kamailio/kamailio/pull/1708.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1708

6 years

git:5.1:094f5849: pkg/kamailio/obs: Fixed bdb module build on fedora dists

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: 094f584901ff4a4c60b6119b3fd7563472b2f88f URL: https://github.com/kamailio/kamailio/commit/094f584901ff4a4c60b6119b3fd7563… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-06T11:44:36Z pkg/kamailio/obs: Fixed bdb module build on fedora dists (cherry picked from commit 2c077b0434037f1b0f6b37d6026235b206ddbbb2) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/094f584901ff4a4c60b6119b3fd7563… Patch: https://github.com/kamailio/kamailio/commit/094f584901ff4a4c60b6119b3fd7563… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 85f8e4359f..57c3122257 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -212,6 +212,12 @@ BuildRequires: bison, flex %if 0%{?suse_version} BuildRequires: systemd-mini, shadow %endif +%if 0%{?fedora} == 27 +BuildRequires: python3-devel +%endif +%if 0%{?fedora} == 28 +BuildRequires: python3-devel +%endif %description Kamailio (former OpenSER) is an Open Source SIP Server released under GPL, able @@ -253,8 +259,13 @@ Requires: kamailio = %ver Requires: libdb-4_8 BuildRequires: libdb-4_8-devel %else +%if 0%{?rhel} == 6 Requires: db4 BuildRequires: db4-devel +%else +Requires: libdb +BuildRequires: libdb-devel +%endif %endif %description bdb @@ -1121,6 +1132,9 @@ install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ %if 0%{?suse_version} %py_compile -O %{buildroot}%{_libdir}/kamailio/kamctl/dbtextdb %endif +%if 0%{?fedora} +%py_byte_compile %{__python2} %{buildroot}%{_libdir}/kamailio/kamctl/dbtextdb +%endif # Removing devel files rm -f %{buildroot}%{_libdir}/kamailio/lib*.so

6 years

git:5.1:84f00468: Merge pull request #1708 from sergey-safarov/spec_update10

by GitHub

Module: kamailio Branch: 5.1 Commit: 84f004689c4f78260592a38009665a591cc117df URL: https://github.com/kamailio/kamailio/commit/84f004689c4f78260592a38009665a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-06T16:19:09+01:00 Merge pull request #1708 from sergey-safarov/spec_update10 RPM spec update for 5.1 branch --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/84f004689c4f78260592a38009665a5… Patch: https://github.com/kamailio/kamailio/commit/84f004689c4f78260592a38009665a5…

6 years

git:5.1:18bf0d3a: pkg/kamailio/ops: Added MongoDB rpm package

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: 18bf0d3a34794606f06e9740d881badca50cfd5a URL: https://github.com/kamailio/kamailio/commit/18bf0d3a34794606f06e9740d881bad… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-06T11:44:35Z pkg/kamailio/ops: Added MongoDB rpm package (cherry picked from commit 702bfff175efaf25202e1644e39d143886ce7886) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/18bf0d3a34794606f06e9740d881bad… Patch: https://github.com/kamailio/kamailio/commit/18bf0d3a34794606f06e9740d881bad… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 56c6208a28..85f8e4359f 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -14,6 +14,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rebbitmq %bcond_without redis @@ -34,6 +35,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -54,6 +56,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -74,6 +77,7 @@ %bcond_without lua %bcond_with kazoo %bcond_without memcached +%bcond_with mongodb %bcond_without perl %bcond_with rebbitmq %bcond_with redis @@ -95,6 +99,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rebbitmq %bcond_without redis @@ -115,6 +120,7 @@ %bcond_without lua %bcond_with kazoo %bcond_without memcached +%bcond_with mongodb %bcond_without perl %bcond_with rebbitmq %bcond_without redis @@ -135,6 +141,7 @@ %bcond_with lua %bcond_with kazoo %bcond_with memcached +%bcond_with mongodb %bcond_with perl %bcond_with rebbitmq %bcond_with redis @@ -155,6 +162,7 @@ %bcond_with lua %bcond_with kazoo %bcond_with memcached +%bcond_without mongodb %bcond_without perl %bcond_without rebbitmq %bcond_without redis @@ -187,7 +195,7 @@ Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver Conflicts: kamailio-rabbitmq < %ver -Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver +Conflicts: kamailio-memcached < %ver, kamailio-mongodb < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver @@ -530,6 +538,19 @@ Memcached configuration file support for Kamailio. %endif +%if %{with mongodb} +%package mongodb +Summary: MongoDB database connectivity for Kamailio +Group: System Environment/Daemons +Requires: kamailio = %ver +Requires: mongo-c-driver +BuildRequires: mongo-c-driver-devel + +%description mongodb +MongoDB database connectivity for Kamailio. +%endif + + %package mysql Summary: MySQL database connectivity for Kamailio Group: System Environment/Daemons @@ -971,6 +992,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %endif %if %{with xmlrpc} kmi_xmlrpc \ +%endif +%if %{with mongodb} + kmongodb \ %endif kmysql koutbound \ %if %{with perl} @@ -1040,6 +1064,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %endif %if %{with xmlrpc} kmi_xmlrpc \ +%endif +%if %{with mongodb} + kmongodb \ %endif kmysql koutbound \ %if %{with perl} @@ -1638,6 +1665,16 @@ fi %endif +%if %{with mongodb} +%files mongodb +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.db_mongodb +%doc %{_docdir}/kamailio/modules/README.ndb_mongodb +%{_libdir}/kamailio/modules/db_mongodb.so +%{_libdir}/kamailio/modules/ndb_mongodb.so +%endif + + %files mysql %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.db_mysql

6 years

git:5.1:8f6d085c: pkg/kamailio/obs: Updated obs meta

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: 8f6d085cda34dc6d9edb043f8c8eb548af0090cb URL: https://github.com/kamailio/kamailio/commit/8f6d085cda34dc6d9edb043f8c8eb54… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-06T11:44:35Z pkg/kamailio/obs: Updated obs meta (cherry picked from commit 3c9547334166d43aa1e2cba8b9dab6e78dfed66a) --- Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/8f6d085cda34dc6d9edb043f8c8eb54… Patch: https://github.com/kamailio/kamailio/commit/8f6d085cda34dc6d9edb043f8c8eb54… --- diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index 32e9e9ffb7..452d5d764d 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -1,6 +1,6 @@ -<project name="home:kamailio:v5.0.x-rpms"> - <title>RPM Packages for Kamailio v5.0.x</title> - <description>RPM Packages for Kamailio v5.0.x</description> +<project name="home:kamailio:v5.1.x-rpms"> + <title>RPM Packages for Kamailio v5.1.x</title> + <description>RPM Packages for Kamailio v5.1.x</description> <person userid="kamailio" role="maintainer"/> <repository name="openSUSE_Tumbleweed"> <path project="openSUSE:Factory" repository="snapshot"/> @@ -24,20 +24,19 @@ <path project="Fedora:EPEL:6" repository="RHEL"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_27"> - <path project="Fedora:27" repository="update"/> - <path project="Fedora:27" repository="standard"/> + <repository name="Fedora_29"> + <path project="Fedora:29" repository="update"/> + <path project="Fedora:29" repository="standard"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_26"> - <path project="Fedora:26" repository="update"/> - <path project="Fedora:26" repository="standard"/> + <repository name="Fedora_28"> + <path project="Fedora:28" repository="update"/> + <path project="Fedora:28" repository="standard"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_25"> - <path project="Fedora:25" repository="update"/> - <path project="Fedora:25" repository="standard"/> - <arch>i586</arch> + <repository name="Fedora_27"> + <path project="Fedora:27" repository="update"/> + <path project="Fedora:27" repository="standard"/> <arch>x86_64</arch> </repository> <repository name="CentOS_7">

6 years

← Newer
1
...
22
23
24
25
26
27
28
29
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2018