sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
312 discussions

git:master:03248001: modules: readme files regenerated - websocket ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 0324800109442bf5786dae6d8238a3bf4e0e51f4 URL: https://github.com/kamailio/kamailio/commit/0324800109442bf5786dae6d8238a3b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-21T09:46:15+02:00 modules: readme files regenerated - websocket ... [skip ci] --- Modified: src/modules/websocket/README Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/0324800109442bf5786dae6d8238a3b… Patch: https://github.com/kamailio/kamailio/commit/0324800109442bf5786dae6d8238a3b… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 7ac759b205..cbe8fd98eb 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -162,6 +162,8 @@ Chapter 1. Admin Guide Example 1.1. event_route[xhttp:request] ... +tcp_accept_no_cl=yes +... loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "msrp.so" # Only required if using MSRP over WebSockets diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README index a38599775f..781ac41392 100644 --- a/src/modules/xhttp/README +++ b/src/modules/xhttp/README @@ -220,6 +220,11 @@ event_route[xhttp:request] { The event route is executed when a new HTTP request is received. ... +tcp_accept_no_cl=yes +... +loadmodule "sl.so" +loadmodule "xhttp.so +... event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", "<html><body>OK - [$si:$sp]</body></html>");

3 years, 5 months

git:master:a05b4d7c: websocket: docs - added tcp_accept_no_cl=yes to example

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a05b4d7c2e413032b1a63f3d017243446a0bc6ec URL: https://github.com/kamailio/kamailio/commit/a05b4d7c2e413032b1a63f3d0172434… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-21T09:43:55+02:00 websocket: docs - added tcp_accept_no_cl=yes to example --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a05b4d7c2e413032b1a63f3d0172434… Patch: https://github.com/kamailio/kamailio/commit/a05b4d7c2e413032b1a63f3d0172434… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 7cc6e09069..b4b5e2c8ce 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -43,6 +43,8 @@ <title>event_route[xhttp:request]</title> <programlisting><![CDATA[ ... +tcp_accept_no_cl=yes +... loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "msrp.so" # Only required if using MSRP over WebSockets

3 years, 5 months

git:master:195de260: xhttp: extended example for event_route[xhttp:request]

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 195de260f102f1a016ad7bd1021571c1dd8a983f URL: https://github.com/kamailio/kamailio/commit/195de260f102f1a016ad7bd1021571c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-21T09:42:28+02:00 xhttp: extended example for event_route[xhttp:request] --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/195de260f102f1a016ad7bd1021571c… Patch: https://github.com/kamailio/kamailio/commit/195de260f102f1a016ad7bd1021571c… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index c2a18f9d44..507283b90f 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -222,6 +222,11 @@ event_route[xhttp:request] { </para> <programlisting format="linespecific"> ... +tcp_accept_no_cl=yes +... +loadmodule "sl.so" +loadmodule "xhttp.so +... event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", "<html><body>OK - [$si:$sp]</body></html>");

3 years, 5 months

git:master:c825673b: modules: readme files regenerated - secsipid ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: c825673bad8b04dcbf0dc8c150e3048a791091e8 URL: https://github.com/kamailio/kamailio/commit/c825673bad8b04dcbf0dc8c150e3048… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-21T08:16:23+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/c825673bad8b04dcbf0dc8c150e3048… Patch: https://github.com/kamailio/kamailio/commit/c825673bad8b04dcbf0dc8c150e3048… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index aaae0747e1..87a33aebfd 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -45,6 +45,8 @@ Daniel-Constantin Mierla 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 5. Installation List of Examples @@ -61,7 +63,8 @@ Daniel-Constantin Mierla 1.10. secsipid_get_url usage 1.11. secsipid_add_identity usage 1.12. secsipid_build_identity usage - 1.13. Libsecsipid Usage + 1.13. secsipid_sign usage + 1.14. Libsecsipid Usage Chapter 1. Admin Guide @@ -94,6 +97,8 @@ Chapter 1. Admin Guide 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 5. Installation 1. Overview @@ -227,6 +232,8 @@ modparam("secsipid", "libopt", "CacheExpires=0") 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) + 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 4.1. secsipid_check_identity(keyPath) Check the validity of the Identity header using the keys stored in the @@ -376,6 +383,30 @@ request_route { } ... +4.7. secsipid_sign(sheaders, spaypload, keyPath) + + Build Identity value using the key specified by "keyPath" to sign the + JWT body. The sheaders and spayload have to be string representation of + JSON headers and payload to be signed. On success, the Indentity value + is stored in variable $secsipid(val). It also sets $secsipid(ret) to + the return value of the libsecsipid functions. + + The parameters can contain pseudo-variables. + + This function can be used from ANY_ROUTE. + + Example 1.13. secsipid_sign usage +... +request_route { + ... + if(secsipid_sign("_JSON_HEADERS_", "_JSON_PAYLOAD_", + "/secsipid/$rd/key.pem")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... + 5. Installation The module needs "secsipdi_proc.so" module that depends on @@ -390,7 +421,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.13. Libsecsipid Usage + Example 1.14. Libsecsipid Usage ... export GO111MODULE=off go get https://github.com/asipto/secsipidx

3 years, 5 months

git:master:a5997c29: secsipid: docs for secsipid_sign()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a5997c29468efabb5a7745bc5b1c99c0f9eb8999 URL: https://github.com/kamailio/kamailio/commit/a5997c29468efabb5a7745bc5b1c99c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-21T08:12:15+02:00 secsipid: docs for secsipid_sign() --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a5997c29468efabb5a7745bc5b1c99c… Patch: https://github.com/kamailio/kamailio/commit/a5997c29468efabb5a7745bc5b1c99c… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 28f3dce68a..cc9c6c9fdf 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -397,6 +397,39 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="secsipid.f.secsipid_sign"> + <title> + <function moreinfo="none">secsipid_sign(sheaders, spaypload, keyPath)</function> + </title> + <para> + Build Identity value using the key specified by "keyPath" to sign the JWT body. + The sheaders and spayload have to be string representation of JSON + headers and payload to be signed. On success, the Indentity value is + stored in variable $secsipid(val). It also sets $secsipid(ret) to + the return value of the libsecsipid functions. + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_sign</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + if(secsipid_sign("_JSON_HEADERS_", "_JSON_PAYLOAD_", + "/secsipid/$rd/key.pem")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... </programlisting> </example> </section>

3 years, 5 months

git:master:35f45d41: secsipid: added secsipid_sign(headers, payload, keypath)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 35f45d412c0e3b01eac34af74f2783d7bb1fdbf6 URL: https://github.com/kamailio/kamailio/commit/35f45d412c0e3b01eac34af74f2783d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-20T11:28:37+02:00 secsipid: added secsipid_sign(headers, payload, keypath) - store the result in $secsipid(val) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/35f45d412c0e3b01eac34af74f2783d… Patch: https://github.com/kamailio/kamailio/commit/35f45d412c0e3b01eac34af74f2783d… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 83a1f236dc..6a42076c0b 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -58,6 +58,7 @@ static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, char *pattest, char *porigid, char *px5u, char *pkeypath); static int w_secsipid_build_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, char *pattest, char *porigid, char *px5u, char *pkeypath); +static int w_secsipid_sign(sip_msg_t *msg, char *phdrs, char *ppayload, char *pkeypath); static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *pout); static int secsipid_libopt_param(modparam_t type, void *val); @@ -89,6 +90,8 @@ static cmd_export_t cmds[]={ fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"secsipid_build_identity", (cmd_function)w_secsipid_build_identity, 6, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"secsipid_sign", (cmd_function)w_secsipid_sign, 3, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"secsipid_get_url", (cmd_function)w_secsipid_get_url, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -379,6 +382,7 @@ static int w_secsipid_check(sip_msg_t *msg, char *pidentity, char *pkeypath) return ki_secsipid_check(msg, &sidentity, &keypath); } + /** * */ @@ -573,6 +577,75 @@ static int w_secsipid_build_identity(sip_msg_t *msg, char *porigtn, char *pdestt &attest, &origid, &x5u, &keypath, 1); } +/** + * + */ +static int ki_secsipid_sign(sip_msg_t *msg, str *sheaders, str *spayload, + str *keypath) +{ + str ibody = STR_NULL; + + if(secsipid_libopt_list_used==0) { + str_list_t *sit; + for(sit=secsipid_libopt_list; sit!=NULL; sit=sit->next) { + _secsipid_papi.SecSIPIDOptSetV(sit->s.s); + } + secsipid_libopt_list_used = 1; + } + + ibody.len = _secsipid_papi.SecSIPIDSignJSONHP(sheaders->s, spayload->s, + keypath->s, &ibody.s); + + _secsipid_data.ret = ibody.len; + + if(ibody.len<=0) { + LM_ERR("failed to get identity value (%d)\n", ibody.len); + goto error; + } + + LM_DBG("identity value: %.*s\n", ibody.len, ibody.s); + + if(_secsipid_data.value.s) { + free(_secsipid_data.value.s); + } + _secsipid_data.value = ibody; + + return 1; + +error: + if(ibody.s) { + free(ibody.s); + } + return -1; +} + +/** + * + */ +static int w_secsipid_sign(sip_msg_t *msg, char *phdrs, char *ppayload, char *pkeypath) +{ + str shdrs = STR_NULL; + str spayload = STR_NULL; + str keypath = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)phdrs, &shdrs)<0) { + LM_ERR("failed to get JSON headers parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)ppayload, &spayload)<0) { + LM_ERR("failed to get JSON payload parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)pkeypath, &keypath)<0) { + LM_ERR("failed to get keypath parameter\n"); + return -1; + } + + return ki_secsipid_sign(msg, &shdrs, &spayload, &keypath); +} + /** * */

3 years, 5 months

git:5.5:efe83bb8: pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1 [skip ci]

by Sergey Safarov

Module: kamailio Branch: 5.5 Commit: efe83bb89e9582b5c58a85626cc45d87dc124205 URL: https://github.com/kamailio/kamailio/commit/efe83bb89e9582b5c58a85626cc45d8… Author: SPChan <shihping.chan(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-20T12:21:43+03:00 pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1 [skip ci] (cherry picked from commit ecc2cc69b08e797ca954af233c229ed44475ce33) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/efe83bb89e9582b5c58a85626cc45d8… Patch: https://github.com/kamailio/kamailio/commit/efe83bb89e9582b5c58a85626cc45d8… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 28dc1c9720..3ca6df74fc 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -172,6 +172,11 @@ %define _rundir %{_localstatedir}/run %endif +# build with openssl 1.1.1 on RHEL 7 based dists +%if 0%{?rhel} == 7 +%bcond_with openssl11 +%endif + # redefine buggy openSUSE Leap _sharedstatedir macro. More info at https://bugzilla.redhat.com/show_bug.cgi?id=183370 %if 0%{?suse_version} == 1315 %define _sharedstatedir /var/lib @@ -279,8 +284,13 @@ Account transaction information in a JSON dictionary. %package auth-ephemeral Summary: Functions for authentication using ephemeral credentials Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description auth-ephemeral Functions for authentication using ephemeral credentials. @@ -365,9 +375,14 @@ Requires: openssl BuildRequires: openssl-devel %endif %if 0%{?rhel} == 7 +%if %{with openssl11} +Requires: openssl11-libs +BuildRequires: openssl11-devel +%else Requires: openssl-libs BuildRequires: openssl-devel %endif +%endif %if 0%{?fedora} Requires: openssl-libs BuildRequires: openssl-devel @@ -673,8 +688,13 @@ MySQL database connectivity for Kamailio. %package outbound Summary: Outbound (RFC 5626) support for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description outbound RFC 5626, "Managing Client-Initiated Connections in the Session Initiation @@ -952,8 +972,13 @@ SQLite database connectivity for Kamailio. %package tls Summary: TLS transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description tls TLS transport for Kamailio. @@ -1008,8 +1033,13 @@ Non-SIP utitility functions for Kamailio. %package websocket Summary: WebSocket transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: libunistring, openssl11, kamailio = %ver +BuildRequires: libunistring-devel, openssl11-devel +%else Requires: libunistring, openssl, kamailio = %ver BuildRequires: libunistring-devel, openssl-devel +%endif %description websocket WebSocket transport for Kamailio. @@ -1106,6 +1136,9 @@ make cfg prefix=/usr \ make make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ jabber ndb_cassandra osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif @@ -1201,6 +1234,9 @@ rm -rf %{buildroot} make install make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ iptrtpproxy jabber osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif

3 years, 5 months

git:5.5:01d43e2d: pkg/kamailio/obs: disabled lwsc build on CentOS 6 dist

by Sergey Safarov

Module: kamailio Branch: 5.5 Commit: 01d43e2d6f78fff7fca8d6fc00adfab7f62a5320 URL: https://github.com/kamailio/kamailio/commit/01d43e2d6f78fff7fca8d6fc00adfab… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-20T12:21:12+03:00 pkg/kamailio/obs: disabled lwsc build on CentOS 6 dist (cherry picked from commit 03c2ea28767106333ee04c5e19ee490c010dfb58) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/01d43e2d6f78fff7fca8d6fc00adfab… Patch: https://github.com/kamailio/kamailio/commit/01d43e2d6f78fff7fca8d6fc00adfab… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index cb70c1af90..28dc1c9720 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -14,6 +14,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -46,6 +47,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_with lwsc %bcond_without kazoo %bcond_without memcached %bcond_with mongodb @@ -79,6 +81,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -122,6 +125,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -148,6 +152,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_with kazoo %bcond_without memcached %bcond_with mongodb @@ -611,6 +616,7 @@ Lua extensions for Kamailio. %endif +%if %{with lwsc} %package lwsc Summary: Websocket client implementation to interact with external systems, similar to http client Group: %{PKGGROUP} @@ -619,6 +625,7 @@ BuildRequires: libwebsockets-devel %description lwsc Websocket client implementation to interact with external systems, similar to http client. +%endif %if %{with memcached} @@ -1138,7 +1145,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with lua} klua \ %endif +%if %{with lwsc} klwsc \ +%endif %if %{with memcached} kmemcached \ %endif @@ -1231,7 +1240,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with lua} klua \ %endif +%if %{with lwsc} klwsc \ +%endif %if %{with memcached} kmemcached \ %endif @@ -1894,10 +1905,12 @@ fi %endif +%if %{with lwsc} %files lwsc %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.lwsc %{_libdir}/kamailio/modules/lwsc.so +%endif %if %{with memcached} %files memcached

3 years, 5 months

git:5.5:0e8bb2fc: pkg/kamailio/obs: simlifid module definition for RHEL dist

by Sergey Safarov

Module: kamailio Branch: 5.5 Commit: 0e8bb2fc46b74b5171edeb64776d280c35739ce9 URL: https://github.com/kamailio/kamailio/commit/0e8bb2fc46b74b5171edeb64776d280… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-20T12:21:01+03:00 pkg/kamailio/obs: simlifid module definition for RHEL dist (cherry picked from commit e7a14f37c98e2bbfcf234165dc5dfd4121db5b5b) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0e8bb2fc46b74b5171edeb64776d280… Patch: https://github.com/kamailio/kamailio/commit/0e8bb2fc46b74b5171edeb64776d280… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ce12e50579..cb70c1af90 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -28,9 +28,15 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 6 +%if 0%{?rhel} == 6 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} +%endif +%if 0%{?centos_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_with cnxcc %bcond_without dnssec %bcond_without evapi @@ -54,10 +60,16 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 7 +%if 0%{?rhel} == 7 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el7.centos +%endif +%if 0%{?centos_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -81,23 +93,26 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 8 || 0%{?almalinux_ver} == 8 || 0%{?rocky_ver} == 8 -%define rhel_rebuild 8 -% if 0%{?centos_ver} +%if 0%{?rhel} == 8 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el8.centos %endif -% if 0%{?almalinux_ver} +%if 0%{?almalinux_ver} %define dist_name centos %define dist_version %{?almalinux} %define dist .el8.almalinux %endif -% if 0%{?rocky_ver} +%if 0%{?rocky_ver} %define dist_name centos %define dist_version %{?rocky} %define dist .el8.rocky %endif +%if 0%{?centos_ver} == 0 && 0%{?almalinux_ver} == 0 && 0%{?rocky_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -147,84 +162,6 @@ %bcond_without xmlrpc %endif -%if 0%{?rhel} == 6 && 0%{?centos_ver} != 6 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_with cnxcc -%bcond_without dnssec -%bcond_without evapi -%bcond_with geoip -%bcond_with http_async_client -%bcond_with ims -%bcond_with jansson -%bcond_with json -%bcond_with lua -%bcond_with kazoo -%bcond_with memcached -%bcond_with mongodb -%bcond_with perl -%bcond_with phonenum -%bcond_with python3 -%bcond_with rabbitmq -%bcond_with redis -%bcond_with ruby -%bcond_with sctp -%bcond_with websocket -%bcond_without xmlrpc -%endif - -%if 0%{?rhel} == 7 && 0%{?centos_ver} != 7 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without evapi -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?rhel} == 8 && 0%{?rhel_rebuild} != 8 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without evapi -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - # Defining missing macros on RHEL/CentOS 6 %if 0%{?rhel} == 6 %define _rundir %{_localstatedir}/run

3 years, 5 months

git:5.5:0f0e7e8f: pkg: add support for AlmaLinux and Rocky Linux

by Sergey Safarov

Module: kamailio Branch: 5.5 Commit: 0f0e7e8f139042e2dd03e01a6ac66d32727dc69a URL: https://github.com/kamailio/kamailio/commit/0f0e7e8f139042e2dd03e01a6ac66d3… Author: SPChan <shihping.chan(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-20T12:20:34+03:00 pkg: add support for AlmaLinux and Rocky Linux (cherry picked from commit b3d3cb366b67941ecebd297038522580114e3a0b) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0f0e7e8f139042e2dd03e01a6ac66d3… Patch: https://github.com/kamailio/kamailio/commit/0f0e7e8f139042e2dd03e01a6ac66d3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index e095ac9b5e..ce12e50579 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -81,10 +81,23 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 8 +%if 0%{?centos_ver} == 8 || 0%{?almalinux_ver} == 8 || 0%{?rocky_ver} == 8 +%define rhel_rebuild 8 +% if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el8.centos +%endif +% if 0%{?almalinux_ver} +%define dist_name centos +%define dist_version %{?almalinux} +%define dist .el8.almalinux +%endif +% if 0%{?rocky_ver} +%define dist_name centos +%define dist_version %{?rocky} +%define dist .el8.rocky +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -186,7 +199,7 @@ %bcond_without xmlrpc %endif -%if 0%{?rhel} == 8 && 0%{?centos_ver} != 8 +%if 0%{?rhel} == 8 && 0%{?rhel_rebuild} != 8 %define dist_name rhel %define dist_version %{?rhel} %bcond_without cnxcc

3 years, 5 months

← Newer
1
...
13
14
15
16
17
18
19
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021