From 8ebb8932c43ccbe1693062058bf779591eb84360 Mon Sep 17 00:00:00 2001 From: Sergey Safarov Date: Sun, 4 Nov 2018 00:13:14 +0000 Subject: [PATCH 1/4] pkg/kamailio/obs: Removed end of life dist (cherry picked from commit 9aa98b12b3b7f3841facc20fee4873d8b3dc5fff) --- pkg/kamailio/obs/kamailio.spec | 49 +++------------------------------- 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index fb3ae45af35..56c6208a283 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2,46 +2,6 @@ %define ver 5.1.6 %define rel 0%{dist} -%if 0%{?fedora} == 25 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without perl -%bcond_without rebbitmq -%bcond_without redis -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 26 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without perl -%bcond_without rebbitmq -%bcond_without redis -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - %if 0%{?fedora} == 27 %define dist_name fedora %define dist_version %{?fedora} @@ -944,19 +904,14 @@ UUID module for Kamailio. %prep %setup -n %{name}-%{ver} -ln -s ../obs pkg/kamailio/fedora/24 -ln -s ../obs pkg/kamailio/fedora/25 -ln -s ../obs pkg/kamailio/fedora/26 ln -s ../obs pkg/kamailio/fedora/27 ln -s ../obs pkg/kamailio/fedora/28 ln -s ../obs pkg/kamailio/fedora/29 -mkdir -p pkg/kamailio/rhel ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 -mkdir -p pkg/kamailio/opensuse ln -s ../obs pkg/kamailio/opensuse/1315 ln -s ../obs pkg/kamailio/opensuse/1330 -mkdir -p pkg/kamailio/centos +ln -s ../obs pkg/kamailio/opensuse/1550 ln -s ../obs pkg/kamailio/centos/6 ln -s ../obs pkg/kamailio/centos/7 @@ -1959,6 +1914,8 @@ fi %changelog +* Sun Nov 04 2018 Sergey Safarov + - removed packaging for Fedora 25, 26 as End Of Life * Sat Sep 02 2017 Sergey Safarov - added packaging for Fedora 26 and openSUSE Leap 42.3 - removed packaging for Fedora 24 and openSUSE Leap 42.1 as End Of Life From 8f6d085cda34dc6d9edb043f8c8eb548af0090cb Mon Sep 17 00:00:00 2001 From: Sergey Safarov Date: Sun, 4 Nov 2018 00:00:44 +0000 Subject: [PATCH 2/4] pkg/kamailio/obs: Updated obs meta (cherry picked from commit 3c9547334166d43aa1e2cba8b9dab6e78dfed66a) --- pkg/kamailio/obs/meta | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index 32e9e9ffb7e..452d5d764dc 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -1,6 +1,6 @@ - - RPM Packages for Kamailio v5.0.x - RPM Packages for Kamailio v5.0.x + + RPM Packages for Kamailio v5.1.x + RPM Packages for Kamailio v5.1.x @@ -24,20 +24,19 @@ x86_64 - - - + + + x86_64 - - - + + + x86_64 - - - - i586 + + + x86_64 From 18bf0d3a34794606f06e9740d881badca50cfd5a Mon Sep 17 00:00:00 2001 From: Sergey Safarov Date: Sat, 3 Nov 2018 22:15:26 +0000 Subject: [PATCH 3/4] pkg/kamailio/ops: Added MongoDB rpm package (cherry picked from commit 702bfff175efaf25202e1644e39d143886ce7886) --- pkg/kamailio/obs/kamailio.spec | 39 +++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 56c6208a283..85f8e4359ff 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 From 094f584901ff4a4c60b6119b3fd7563472b2f88f Mon Sep 17 00:00:00 2001 From: Sergey Safarov Date: Sun, 4 Nov 2018 08:49:23 +0000 Subject: [PATCH 4/4] pkg/kamailio/obs: Fixed bdb module build on fedora dists (cherry picked from commit 2c077b0434037f1b0f6b37d6026235b206ddbbb2) --- pkg/kamailio/obs/kamailio.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 85f8e4359ff..57c31222572 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