sr-dev November 2022

sr-dev@lists.kamailio.org

11 participants
214 discussions

git:master:7ff3088a: modules: readme files regenerated - geoip2 ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 7ff3088ad38edcf28f7bb9ab58cb46a164c17b54 URL: https://github.com/kamailio/kamailio/commit/7ff3088ad38edcf28f7bb9ab58cb46a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-11-30T09:46:17+01:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/7ff3088ad38edcf28f7bb9ab58cb46a… Patch: https://github.com/kamailio/kamailio/commit/7ff3088ad38edcf28f7bb9ab58cb46a… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 3f09eb637a..a8ebc98adf 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -30,6 +30,7 @@ Henning Westerholt 3. Parameters 3.1. path (string) + 3.2. resid (str) 4. Functions @@ -44,8 +45,9 @@ Henning Westerholt List of Examples 1.1. Set path parameter - 1.2. geoip2_match usage - 1.3. geoip2.reload usage + 1.2. Set resid parameter + 1.3. geoip2_match usage + 1.4. geoip2.reload usage Chapter 1. Admin Guide @@ -60,6 +62,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. path (string) + 3.2. resid (str) 4. Functions @@ -115,6 +118,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. path (string) + 3.2. resid (str) 3.1. path (string) @@ -127,6 +131,23 @@ Chapter 1. Admin Guide modparam("geoip2", "path", "/usr/local/share/GeoIP/GeoLite2-City.mmdb") ... +3.2. resid (str) + + Preregister result container id during initialization, enabling the use + of the module in KEMI scripts. In native Kamailio.cfg file, + registration is done when parsing config and finding variables. + + Default value is “” (empty). + + Example 1.2. Set resid parameter +... +modparam("geoip2", "resid", "src") +... +if(geoip2_match("$si", "src")) { + ... +} +... + 4. Functions 4.1. geoip2_match(ipaddr, pvc) @@ -138,7 +159,7 @@ modparam("geoip2", "path", "/usr/local/share/GeoIP/GeoLite2-City.mmdb") At least one function needs to be present that access the pvc container, otherwise this function will not work. - Example 1.2. geoip2_match usage + Example 1.3. geoip2_match usage ... if(geoip2_match("$si", "src")) xlog("SIP message from: $gip2(src=>cc)\n"); @@ -153,7 +174,7 @@ if(geoip2_match("$si", "src")) Reload the internal GeoIP database. This is necessary after the database file has been changed on the disk. - Example 1.3. geoip2.reload usage + Example 1.4. geoip2.reload usage ... kamcmd geoip2.reload ...

1 year, 4 months

git:master:21817906: geoip2: new parameter to register result id to get pv work in kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 21817906853140322c701f8cbb8201049d2b58f0 URL: https://github.com/kamailio/kamailio/commit/21817906853140322c701f8cbb82010… Author: Vadim Gaysin <gaysin(a)zvonok.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-30T09:31:45+01:00 geoip2: new parameter to register result id to get pv work in kemi --- Modified: src/modules/geoip2/doc/geoip2_admin.xml Modified: src/modules/geoip2/geoip2_mod.c Modified: src/modules/geoip2/geoip2_pv.c Modified: src/modules/geoip2/geoip2_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/21817906853140322c701f8cbb82010… Patch: https://github.com/kamailio/kamailio/commit/21817906853140322c701f8cbb82010… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index a82b1a9a293..76e59055fa2 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -81,7 +81,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="geoip2.p.path"> <title><varname>path</varname> (string)</title> <para> Path to the GeoIP2 database file. @@ -100,7 +100,31 @@ modparam("geoip2", "path", "/usr/local/share/GeoIP/GeoLite2-City.mmdb") </programlisting> </example> </section> - + <section id="geoip2.p.resid"> + <title><varname>resid</varname> (str)</title> + <para> + Preregister result container id during initialization, enabling the use + of the module in KEMI scripts. In native &kamailio;.cfg file, registration + is done when parsing config and finding variables. + </para> + <para> + <emphasis> + Default value is <quote></quote> (empty). + </emphasis> + </para> + <example> + <title>Set <varname>resid</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("geoip2", "resid", "src") +... +if(geoip2_match("$si", "src")) { + ... +} +... +</programlisting> + </example> + </section> </section> <section> diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 96285592425..b5b5e7db6c4 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -44,6 +44,7 @@ static int geoip2_rpc_init(void); static int w_geoip2_match(struct sip_msg* msg, char* str1, char* str2); static int geoip2_match(sip_msg_t *msg, str *tomatch, str *pvclass); +static int geoip2_resid_param(modparam_t type, void* val); static pv_export_t mod_pvs[] = { { {"gip2", sizeof("gip2")-1}, PVT_OTHER, pv_get_geoip2, 0, @@ -51,7 +52,6 @@ static pv_export_t mod_pvs[] = { { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; - static cmd_export_t cmds[]={ {"geoip2_match", (cmd_function)w_geoip2_match, 2, fixup_spve_spve, 0, ANY_ROUTE}, @@ -59,7 +59,8 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - {"path", PARAM_STRING, &geoip2_path}, + {"path", PARAM_STRING, &geoip2_path}, + {"resid", PARAM_STR|PARAM_USE_FUNC, &geoip2_resid_param}, {0, 0, 0} }; @@ -76,7 +77,6 @@ struct module_exports exports = { mod_destroy /* module destroy function */ }; - /** * init module function */ @@ -113,6 +113,19 @@ static void mod_destroy(void) geoip2_destroy_pv(); } +static int geoip2_resid_param(modparam_t type, void* val) +{ + str rname; + + rname = *((str*)val); + if(sr_geoip2_add_resid(&rname) < 0) { + LM_ERR("failed to register result container with id: %.*s\n", + rname.len, rname.s); + return -1; + } + return 0; +} + static int geoip2_match(sip_msg_t *msg, str *tomatch, str *pvclass) { geoip2_pv_reset(pvclass); @@ -192,4 +205,4 @@ static sr_kemi_t sr_kemi_geoip2_exports[] = { int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_geoip2_exports); return 0; -} \ No newline at end of file +} diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index ff427f259f6..71b814e9ad3 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -124,6 +124,13 @@ sr_geoip2_item_t *sr_geoip2_add_item(str *name) return it; } +int sr_geoip2_add_resid(str *rname) +{ + if(sr_geoip2_add_item(rname)==NULL) { + return -1; + } + return 0; +} int pv_parse_geoip2_name(pv_spec_p sp, str *in) { diff --git a/src/modules/geoip2/geoip2_pv.h b/src/modules/geoip2/geoip2_pv.h index d616461673a..fbd25c00440 100644 --- a/src/modules/geoip2/geoip2_pv.h +++ b/src/modules/geoip2/geoip2_pv.h @@ -35,6 +35,7 @@ void geoip2_destroy_pv(void); int geoip2_reload_pv(char *path); void geoip2_pv_reset(str *pvclass); int geoip2_update_pv(str *tomatch, str *pvclass); +int sr_geoip2_add_resid(str *rname); #endif

1 year, 4 months

git:master:3cecd97f: app_python3s: new module offering python3 kemi script execution

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3cecd97f71c2dc397516dcf6f04aa906a4be8527 URL: https://github.com/kamailio/kamailio/commit/3cecd97f71c2dc397516dcf6f04aa90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-30T09:25:07+01:00 app_python3s: new module offering python3 kemi script execution - alternative to app_python3, without dynamic SIP message object instantiation, only KSR lib static export - old exported python modules (e.g., Router) no longer available --- Added: src/modules/app_python3s/Makefile Added: src/modules/app_python3s/README Added: src/modules/app_python3s/app_python3s_mod.c Added: src/modules/app_python3s/app_python3s_mod.h Added: src/modules/app_python3s/apy3s_exception.c Added: src/modules/app_python3s/apy3s_exception.h Added: src/modules/app_python3s/apy3s_kemi.c Added: src/modules/app_python3s/apy3s_kemi.h Added: src/modules/app_python3s/apy3s_kemi_export.c Added: src/modules/app_python3s/apy3s_kemi_export.h Added: src/modules/app_python3s/doc/Makefile Added: src/modules/app_python3s/doc/app_python3s.xml Added: src/modules/app_python3s/doc/app_python3s_admin.xml Added: src/modules/app_python3s/utils/app_python_ctl --- Diff: https://github.com/kamailio/kamailio/commit/3cecd97f71c2dc397516dcf6f04aa90… Patch: https://github.com/kamailio/kamailio/commit/3cecd97f71c2dc397516dcf6f04aa90…

1 year, 4 months

Build failed in Jenkins: kamailio56-nightly-binaries » amd64,jammy #31

by kamailio＠sipwise.com

See <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> Changes: ------------------------------------------ [...truncated 20.94 KB...] *** Adding content of /etc/jenkins/pbuilderrc to pbuilder configfile *** + cat /etc/jenkins/pbuilderrc + counter=3600 + ls '/run/lock/jammy-amd64.update.*' + '[' 3600 -eq 0 ']' + touch /run/lock/jammy-amd64.building.11798 + case "$architecture" in + sudo DIST=jammy ARCH=amd64 cowbuilder --buildresult <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> --build <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> --basepath /var/cache/pbuilder/base-jammy-amd64.cow --debbuildopts -sa --hookdir /usr/share/jenkins-debian-glue/pbuilder-hookdir/ --bindmounts '/tmp/apt-jdg_w864jy ' --configfile=/tmp/tmp.Z2DBK9TPVo I: Copying COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.12116 I: forking: cp -al /var/cache/pbuilder/base-jammy-amd64.cow /var/cache/pbuilder/build/cow.12116 I: removed stale ilistfile /var/cache/pbuilder/build/cow.12116/.ilist I: forking: chroot /var/cache/pbuilder/build/cow.12116 cowdancer-ilistcreate /.ilist 'find . -xdev -path ./home -prune -o $ \( -type l -o -type f $ -a -links +1 -print0 \) | xargs -0 stat --format '%d %i '' I: Invoking pbuilder I: forking: pbuilder build --debbuildopts -sa --hookdir /usr/share/jenkins-debian-glue/pbuilder-hookdir/ --bindmounts '/tmp/apt-jdg_w864jy ' --configfile /tmp/tmp.Z2DBK9TPVo --buildplace /var/cache/pbuilder/build/cow.12116 --buildresult <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> --mirror http://archive.ubuntu.com/ubuntu/ --architecture amd64 --distribution sid --extrapackages eatmydata --no-targz --internal-chrootexec 'chroot /var/cache/pbuilder/build/cow.12116 cow-shell' <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> W: /root/.pbuilderrc does not exist I: Running in no-targz mode I: pbuilder: network access will be disabled during build I: Current time: Mon Nov 28 00:53:09 UTC 2022 I: pbuilder-time-stamp: 1669596789 I: copying local configuration W: No local /etc/mailname to copy, relying on /var/cache/pbuilder/build/cow.12116/etc/mailname to be correct W: --override-config is not set; not updating apt.conf Read the manpage for details. I: mounting /proc filesystem I: mounting /sys filesystem I: creating /{dev,run}/shm I: mounting /dev/pts filesystem I: redirecting /dev/ptmx to /dev/pts/ptmx I: Mounting /tmp/apt-jdg_w864jy I: policy-rc.d already exists I: using eatmydata during job I: Obtaining the cached apt archive contents I: Copying source file I: copying [<https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…]> I: copying [<https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…]> I: Extracting source dpkg-source: warning: extracting unsigned source package (kamailio_5.6.3~ubuntu22.04.20221128004633.31.dsc) dpkg-source: info: extracting kamailio in kamailio-5.6.3~ubuntu22.04.20221128004633.31 dpkg-source: info: unpacking kamailio_5.6.3~ubuntu22.04.20221128004633.31.tar.xz I: Not using root during the build. I: Installing the build-deps I: user script /var/cache/pbuilder/build/cow.12116/tmp/hooks/D10-man-db starting I: Preseed man-db/auto-update to false I: user script /var/cache/pbuilder/build/cow.12116/tmp/hooks/D10-man-db finished I: user script /var/cache/pbuilder/build/cow.12116/tmp/hooks/D10aptspeedup starting + dpkg-query -f ${Version}\n -W dpkg + dpkg --compare-versions 1.21.1ubuntu2.1 ge 1.15.8.6 + echo I: Force DPKG unsafe IO I: Force DPKG unsafe IO + echo force-unsafe-io I: user script /var/cache/pbuilder/build/cow.12116/tmp/hooks/D10aptspeedup finished I: user script /var/cache/pbuilder/build/cow.12116/tmp/hooks/D20releaserepo starting + set -- /tmp/apt-jdg_w864jy/ + TMPAPT=/tmp/apt-jdg_w864jy/ + [ -d /tmp/apt-jdg_w864jy/ ] + UPDATE_PKGLIST=0 + ls /tmp/apt-jdg_w864jy/*.list + [ -e /tmp/apt-jdg_w864jy//keyring.gpg ] + [ 0 = 1 ] I: user script /var/cache/pbuilder/build/cow.12116/tmp/hooks/D20releaserepo finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy Version: 0.invalid.0 Architecture: amd64 Maintainer: Debian Pbuilder Team <pbuilder-maint(a)lists.alioth.debian.org> Description: Dummy package to satisfy dependencies with aptitude - created by pbuilder This package was created automatically by pbuilder to satisfy the build-dependencies of the package being currently built. Depends: bison, debhelper (>= 9), default-libmysqlclient-dev, docbook-xml, dpkg-dev (>= 1.16.1.1), erlang-dev, flex, libcurl4-openssl-dev, libdb-dev (>= 4.6.19), libev-dev, libevent-dev, libexpat1-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjansson-dev, libjson-c-dev, libldap2-dev, liblua5.1-0-dev, libmaxminddb-dev, libmemcached-dev, libmnl-dev, libmongoc-dev, libmono-2.0-dev, libmosquitto-dev, libnats-dev, libncurses5-dev, libpcre3-dev, libperl-dev, libphonenumber-dev (>= 7), libpq-dev, librabbitmq-dev, libradcli-dev, libreadline-dev, libsasl2-dev, libsctp-dev, libsecsipid-dev, libsnmp-dev, libsqlite3-dev, libssl-dev, libsystemd-dev, libunistring-dev, libwebsockets-dev, libxml2-dev, libxmlrpc-c3-dev, openssl, pkg-config, python3, python3-dev, ruby-dev, unixodbc-dev, uuid-dev, xsltproc, zlib1g-dev dpkg-deb: building package 'pbuilder-satisfydepends-dummy' in '/tmp/satisfydepends-aptitude/pbuilder-satisfydepends-dummy.deb'. Selecting previously unselected package pbuilder-satisfydepends-dummy. (Reading database ... 10311 files and directories currently installed.) Preparing to unpack .../pbuilder-satisfydepends-dummy.deb ... Unpacking pbuilder-satisfydepends-dummy (0.invalid.0) ... dpkg: pbuilder-satisfydepends-dummy: dependency problems, but configuring anyway as you requested: pbuilder-satisfydepends-dummy depends on bison; however: Package bison is not installed. pbuilder-satisfydepends-dummy depends on debhelper (>= 9); however: Package debhelper is not installed. pbuilder-satisfydepends-dummy depends on default-libmysqlclient-dev; however: Package default-libmysqlclient-dev is not installed. pbuilder-satisfydepends-dummy depends on docbook-xml; however: Package docbook-xml is not installed. pbuilder-satisfydepends-dummy depends on erlang-dev; however: Package erlang-dev is not installed. pbuilder-satisfydepends-dummy depends on flex; however: Package flex is not installed. pbuilder-satisfydepends-dummy depends on libcurl4-openssl-dev; however: Package libcurl4-openssl-dev is not installed. pbuilder-satisfydepends-dummy depends on libdb-dev (>= 4.6.19); however: Package libdb-dev is not installed. pbuilder-satisfydepends-dummy depends on libev-dev; however: Package libev-dev is not installed. pbuilder-satisfydepends-dummy depends on libevent-dev; however: Package libevent-dev is not installed. pbuilder-satisfydepends-dummy depends on libexpat1-dev; however: Package libexpat1-dev is not installed. pbuilder-satisfydepends-dummy depends on libgeoip-dev (>= 1.4.5); however: Package libgeoip-dev is not installed. pbuilder-satisfydepends-dummy depends on libhiredis-dev (>= 0.10.0); however: Package libhiredis-dev is not installed. pbuilder-satisfydepends-dummy depends on libjansson-dev; however: Package libjansson-dev is not installed. pbuilder-satisfydepends-dummy depends on libjson-c-dev; however: Package libjson-c-dev is not installed. pbuilder-satisfydepends-dummy depends on libldap2-dev; however: Package libldap2-dev is not installed. pbuilder-satisfydepends-dummy depends on liblua5.1-0-dev; however: Package liblua5.1-0-dev is not installed. pbuilder-satisfydepends-dummy depends on libmaxminddb-dev; however: Package libmaxminddb-dev is not installed. pbuilder-satisfydepends-dummy depends on libmemcached-dev; however: Package libmemcached-dev is not installed. pbuilder-satisfydepends-dummy depends on libmnl-dev; however: Package libmnl-dev is not installed. pbuilder-satisfydepends-dummy depends on libmongoc-dev; however: Package libmongoc-dev is not installed. pbuilder-satisfydepends-dummy depends on libmono-2.0-dev; however: Package libmono-2.0-dev is not installed. pbuilder-satisfydepends-dummy depends on libmosquitto-dev; however: Package libmosquitto-dev is not installed. pbuilder-satisfydepends-dummy depends on libnats-dev; however: Package libnats-dev is not installed. pbuilder-satisfydepends-dummy depends on libncurses5-dev; however: Package libncurses5-dev is not installed. pbuilder-satisfydepends-dummy depends on libpcre3-dev; however: Package libpcre3-dev is not installed. pbuilder-satisfydepends-dummy depends on libperl-dev; however: Package libperl-dev is not installed. pbuilder-satisfydepends-dummy depends on libphonenumber-dev (>= 7); however: Package libphonenumber-dev is not installed. pbuilder-satisfydepends-dummy depends on libpq-dev; however: Package libpq-dev is not installed. pbuilder-satisfydepends-dummy depends on librabbitmq-dev; however: Package librabbitmq-dev is not installed. pbuilder-satisfydepends-dummy depends on libradcli-dev; however: Package libradcli-dev is not installed. pbuilder-satisfydepends-dummy depends on libreadline-dev; however: Package libreadline-dev is not installed. pbuilder-satisfydepends-dummy depends on libsasl2-dev; however: Package libsasl2-dev is not installed. pbuilder-satisfydepends-dummy depends on libsctp-dev; however: Package libsctp-dev is not installed. pbuilder-satisfydepends-dummy depends on libsecsipid-dev; however: Package libsecsipid-dev is not installed. pbuilder-satisfydepends-dummy depends on libsnmp-dev; however: Package libsnmp-dev is not installed. pbuilder-satisfydepends-dummy depends on libsqlite3-dev; however: Package libsqlite3-dev is not installed. pbuilder-satisfydepends-dummy depends on libssl-dev; however: Package libssl-dev is not installed. pbuilder-satisfydepends-dummy depends on libsystemd-dev; however: Package libsystemd-dev is not installed. pbuilder-satisfydepends-dummy depends on libunistring-dev; however: Package libunistring-dev is not installed. pbuilder-satisfydepends-dummy depends on libwebsockets-dev; however: Package libwebsockets-dev is not installed. pbuilder-satisfydepends-dummy depends on libxml2-dev; however: Package libxml2-dev is not installed. pbuilder-satisfydepends-dummy depends on libxmlrpc-c3-dev; however: Package libxmlrpc-c3-dev is not installed. pbuilder-satisfydepends-dummy depends on openssl; however: Package openssl is not installed. pbuilder-satisfydepends-dummy depends on pkg-config; however: Package pkg-config is not installed. pbuilder-satisfydepends-dummy depends on python3; however: Package python3 is not installed. pbuilder-satisfydepends-dummy depends on python3-dev; however: Package python3-dev is not installed. pbuilder-satisfydepends-dummy depends on ruby-dev; however: Package ruby-dev is not installed. pbuilder-satisfydepends-dummy depends on unixodbc-dev; however: Package unixodbc-dev is not installed. pbuilder-satisfydepends-dummy depends on uuid-dev; however: Package uuid-dev is not installed. pbuilder-satisfydepends-dummy depends on xsltproc; however: Package xsltproc is not installed. pbuilder-satisfydepends-dummy depends on zlib1g-dev; however: Package zlib1g-dev is not installed. Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ... Reading package lists... Building dependency tree... Reading state information... Initializing package states... Writing extended state information... Building tag database... pbuilder-satisfydepends-dummy is already installed at the requested version (0.invalid.0) pbuilder-satisfydepends-dummy is already installed at the requested version (0.invalid.0) The following NEW packages will be installed: autoconf{a} automake{a} autopoint{a} autotools-dev{a} bison{a} bsdextrautils{a} ca-certificates{a} debhelper{a} debugedit{a} default-libmysqlclient-dev{a} dh-autoreconf{a} dh-strip-nondeterminism{a} docbook-xml{a} dwz{a} erlang-base{a} erlang-dev{a} file{a} flex{a} geoip-bin{a} gettext{a} gettext-base{a} groff-base{a} icu-devtools{a} intltool-debian{a} libabsl-dev{a} libabsl20210324{a} libarchive-zip-perl{a} libboost-atomic1.74-dev{a} libboost-atomic1.74.0{a} libboost-chrono1.74-dev{a} libboost-chrono1.74.0{a} libboost-date-time1.74-dev{a} libboost-date-time1.74.0{a} libboost-serialization1.74-dev{a} libboost-serialization1.74.0{a} libboost-system1.74-dev{a} libboost-system1.74.0{a} libboost-thread-dev{a} libboost-thread1.74-dev{a} libboost-thread1.74.0{a} libboost1.74-dev{a} libbrotli1{a} libbsd0{a} libbson-1.0-0{a} libbson-dev{a} libcap-dev{a} libcurl4{a} libcurl4-openssl-dev{a} libdb-dev{a} libdb5.3-dev{a} libdebhelper-perl{a} libdw1{a} libedit2{a} libelf1{a} libev-dev{a} libev4{a} libevent-2.1-7{a} libevent-core-2.1-7{a} libevent-dev{a} libevent-extra-2.1-7{a} libevent-openssl-2.1-7{a} libevent-pthreads-2.1-7{a} libexpat1{a} libexpat1-dev{a} libfile-stripnondeterminism-perl{a} libgeocoding8{a} libgeoip-dev{a} libgeoip1{a} libglib2.0-0{a} libgmp-dev{a} libgmpxx4ldbl{a} libhashkit-dev{a} libhashkit2{a} libhiredis-dev{a} libhiredis0.14{a} libicu-dev{a} libicu70{a} libjansson-dev{a} libjansson4{a} libjs-jquery{a} libjs-sphinxdoc{a} libjs-underscore{a} libjson-c-dev{a} libjson-c5{a} libldap-2.5-0{a} libldap-dev{a} libldap2-dev{a} libltdl7{a} liblua5.1-0{a} liblua5.1-0-dev{a} libmagic-mgc{a} libmagic1{a} libmaxminddb-dev{a} libmaxminddb0{a} libmd0{a} libmemcached-dev{a} libmemcached11{a} libmemcachedutil2{a} libmnl-dev{a} libmnl0{a} libmongoc-1.0-0{a} libmongoc-dev{a} libmongocrypt-dev{a} libmongocrypt0{a} libmono-2.0-dev{a} libmonosgen-2.0-1{a} libmonosgen-2.0-dev{a} libmosquitto-dev{a} libmosquitto1{a} libmpdec3{a} libmysqlclient-dev{a} libmysqlclient21{a} libnats-dev{a} libnats3.2{a} libncurses-dev{a} libnetaddr-ip-perl{a} libnetsnmptrapd40{a} libnghttp2-14{a} libodbc2{a} libodbccr2{a} libodbcinst2{a} libpci-dev{a} libpci3{a} libpcre16-3{a} libpcre3-dev{a} libpcre32-3{a} libpcrecpp0v5{a} libperl-dev{a} libphonenumber-dev{a} libphonenumber8{a} libpipeline1{a} libpq-dev{a} libpq5{a} libprotobuf-c1{a} libprotobuf-dev{a} libprotobuf-lite23{a} libprotobuf23{a} libpsl5{a} libpython3-dev{a} libpython3-stdlib{a} libpython3.10{a} libpython3.10-dev{a} libpython3.10-minimal{a} libpython3.10-stdlib{a} librabbitmq-dev{a} librabbitmq4{a} libradcli-dev{a} libradcli4{a} libreadline-dev{a} libreadline8{a} librtmp1{a} libruby3.0{a} libsasl2-2{a} libsasl2-dev{a} libsasl2-modules-db{a} libsctp-dev{a} libsctp1{a} libsecsipid-dev{a} libsecsipid1{a} libsensors-config{a} libsensors-dev{a} libsensors5{a} libsigsegv2{a} libsnappy-dev{a} libsnappy1v5{a} libsnmp-base{a} libsnmp-dev{a} libsnmp40{a} libsqlite3-dev{a} libssh-4{a} libssl-dev{a} libsub-override-perl{a} libsystemd-dev{a} libtool{a} libuchardet0{a} libudev-dev{a} libunistring-dev{a} libuv1{a} libuv1-dev{a} libwebsockets-dev{a} libwebsockets16{a} libwrap0{a} libwrap0-dev{a} libxml2{a} libxml2-dev{a} libxslt1.1{a} libyaml-0-2{a} libzstd-dev{a} m4{a} man-db{a} media-types{a} mysql-common{a} openssl{a} pci.ids{a} pkg-config{a} po-debconf{a} python3{a} python3-dev{a} python3-distutils{a} python3-lib2to3{a} python3-minimal{a} python3.10{a} python3.10-dev{a} python3.10-minimal{a} rake{a} readline-common{a} ruby{a} ruby-dev{a} ruby-net-telnet{a} ruby-rubygems{a} ruby-webrick{a} ruby-xmlrpc{a} ruby3.0{a} ruby3.0-dev{a} rubygems-integration{a} sgml-base{a} sgml-data{a} unixodbc-common{a} unixodbc-dev{a} uuid-dev{a} xml-core{a} xsltproc{a} zlib1g-dev{a} The following packages are RECOMMENDED but will NOT be installed: curl erlang-crypto erlang-syntax-tools fonts-lato geoip-database javascript-common libarchive-cpio-perl libfl-dev libglib2.0-data libldap-common libltdl-dev libmail-sendmail-perl libsasl2-modules libsnmp-perl libsocket6-perl libtool-bin lynx publicsuffix ruby3.0-doc shared-mime-info wget xdg-user-dirs zip 0 packages upgraded, 223 newly installed, 0 to remove and 0 not upgraded. Need to get 115 MB of archives. After unpacking 583 MB will be used. The following packages have unmet dependencies: pbuilder-satisfydepends-dummy : Depends: libxmlrpc-c3-dev which is a virtual package and is not provided by any available package Unable to resolve dependencies! Giving up... The following NEW packages will be installed: autoconf{a} automake{a} autopoint{a} autotools-dev{a} bison{a} bsdextrautils{a} ca-certificates{a} debhelper{a} debugedit{a} default-libmysqlclient-dev{a} dh-autoreconf{a} dh-strip-nondeterminism{a} docbook-xml{a} dwz{a} erlang-base{a} erlang-dev{a} file{a} flex{a} geoip-bin{a} gettext{a} gettext-base{a} groff-base{a} icu-devtools{a} intltool-debian{a} libabsl-dev{a} libabsl20210324{a} libarchive-zip-perl{a} libboost-atomic1.74-dev{a} libboost-atomic1.74.0{a} libboost-chrono1.74-dev{a} libboost-chrono1.74.0{a} libboost-date-time1.74-dev{a} libboost-date-time1.74.0{a} libboost-serialization1.74-dev{a} libboost-serialization1.74.0{a} libboost-system1.74-dev{a} libboost-system1.74.0{a} libboost-thread-dev{a} libboost-thread1.74-dev{a} libboost-thread1.74.0{a} libboost1.74-dev{a} libbrotli1{a} libbsd0{a} libbson-1.0-0{a} libbson-dev{a} libcap-dev{a} libcurl4{a} libcurl4-openssl-dev{a} libdb-dev{a} libdb5.3-dev{a} libdebhelper-perl{a} libdw1{a} libedit2{a} libelf1{a} libev-dev{a} libev4{a} libevent-2.1-7{a} libevent-core-2.1-7{a} libevent-dev{a} libevent-extra-2.1-7{a} libevent-openssl-2.1-7{a} libevent-pthreads-2.1-7{a} libexpat1{a} libexpat1-dev{a} libfile-stripnondeterminism-perl{a} libgeocoding8{a} libgeoip-dev{a} libgeoip1{a} libglib2.0-0{a} libgmp-dev{a} libgmpxx4ldbl{a} libhashkit-dev{a} libhashkit2{a} libhiredis-dev{a} libhiredis0.14{a} libicu-dev{a} libicu70{a} libjansson-dev{a} libjansson4{a} libjs-jquery{a} libjs-sphinxdoc{a} libjs-underscore{a} libjson-c-dev{a} libjson-c5{a} libldap-2.5-0{a} libldap-dev{a} libldap2-dev{a} libltdl7{a} liblua5.1-0{a} liblua5.1-0-dev{a} libmagic-mgc{a} libmagic1{a} libmaxminddb-dev{a} libmaxminddb0{a} libmd0{a} libmemcached-dev{a} libmemcached11{a} libmemcachedutil2{a} libmnl-dev{a} libmnl0{a} libmongoc-1.0-0{a} libmongoc-dev{a} libmongocrypt-dev{a} libmongocrypt0{a} libmono-2.0-dev{a} libmonosgen-2.0-1{a} libmonosgen-2.0-dev{a} libmosquitto-dev{a} libmosquitto1{a} libmpdec3{a} libmysqlclient-dev{a} libmysqlclient21{a} libnats-dev{a} libnats3.2{a} libncurses-dev{a} libnetaddr-ip-perl{a} libnetsnmptrapd40{a} libnghttp2-14{a} libodbc2{a} libodbccr2{a} libodbcinst2{a} libpci-dev{a} libpci3{a} libpcre16-3{a} libpcre3-dev{a} libpcre32-3{a} libpcrecpp0v5{a} libperl-dev{a} libphonenumber-dev{a} libphonenumber8{a} libpipeline1{a} libpq-dev{a} libpq5{a} libprotobuf-c1{a} libprotobuf-dev{a} libprotobuf-lite23{a} libprotobuf23{a} libpsl5{a} libpython3-dev{a} libpython3-stdlib{a} libpython3.10{a} libpython3.10-dev{a} libpython3.10-minimal{a} libpython3.10-stdlib{a} librabbitmq-dev{a} librabbitmq4{a} libradcli-dev{a} libradcli4{a} libreadline-dev{a} libreadline8{a} librtmp1{a} libruby3.0{a} libsasl2-2{a} libsasl2-dev{a} libsasl2-modules-db{a} libsctp-dev{a} libsctp1{a} libsecsipid-dev{a} libsecsipid1{a} libsensors-config{a} libsensors-dev{a} libsensors5{a} libsigsegv2{a} libsnappy-dev{a} libsnappy1v5{a} libsnmp-base{a} libsnmp-dev{a} libsnmp40{a} libsqlite3-dev{a} libssh-4{a} libssl-dev{a} libsub-override-perl{a} libsystemd-dev{a} libtool{a} libuchardet0{a} libudev-dev{a} libunistring-dev{a} libuv1{a} libuv1-dev{a} libwebsockets-dev{a} libwebsockets16{a} libwrap0{a} libwrap0-dev{a} libxml2{a} libxml2-dev{a} libxslt1.1{a} libyaml-0-2{a} libzstd-dev{a} m4{a} man-db{a} media-types{a} mysql-common{a} openssl{a} pci.ids{a} pkg-config{a} po-debconf{a} python3{a} python3-dev{a} python3-distutils{a} python3-lib2to3{a} python3-minimal{a} python3.10{a} python3.10-dev{a} python3.10-minimal{a} rake{a} readline-common{a} ruby{a} ruby-dev{a} ruby-net-telnet{a} ruby-rubygems{a} ruby-webrick{a} ruby-xmlrpc{a} ruby3.0{a} ruby3.0-dev{a} rubygems-integration{a} sgml-base{a} sgml-data{a} unixodbc-common{a} unixodbc-dev{a} uuid-dev{a} xml-core{a} xsltproc{a} zlib1g-dev{a} The following packages are RECOMMENDED but will NOT be installed: curl erlang-crypto erlang-syntax-tools fonts-lato geoip-database javascript-common libarchive-cpio-perl libfl-dev libglib2.0-data libldap-common libltdl-dev libmail-sendmail-perl libsasl2-modules libsnmp-perl libsocket6-perl libtool-bin lynx publicsuffix ruby3.0-doc shared-mime-info wget xdg-user-dirs zip 0 packages upgraded, 223 newly installed, 0 to remove and 0 not upgraded. Need to get 115 MB of archives. After unpacking 583 MB will be used. Abort. E: pbuilder-satisfydepends failed. I: Copying back the cached apt archive contents I: unmounting /tmp/apt-jdg_w864jy filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.12116 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/jammy-amd64.building.11798 + '[' -r /run/lock/jammy-amd64.update.11798 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…'> + '[' -n /tmp/tmp.Z2DBK9TPVo ']' + rm -rf /tmp/tmp.Z2DBK9TPVo + '[' -n /tmp/apt-jdg_w864jy ']' + sudo rm -rf /tmp/apt-jdg_w864jy + '[' -n 141 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=11 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Mon Nov 28 00:53:16 UTC 2022 [running 11 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Mon Nov 28 00:53:16 UTC 2022 [running 11 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error? Recording fingerprints

1 year, 4 months

git:5.6:a7ded924: pkg/kamailio/deb: refresh files [skip ci]

by Victor Seva

Module: kamailio Branch: 5.6 Commit: a7ded9247f5a3f0a6c133dea41dfd61e4b7d4682 URL: https://github.com/kamailio/kamailio/commit/a7ded9247f5a3f0a6c133dea41dfd61… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-11-30T08:46:15+01:00 pkg/kamailio/deb: refresh files [skip ci] --- Modified: pkg/kamailio/deb/jammy/rules --- Diff: https://github.com/kamailio/kamailio/commit/a7ded9247f5a3f0a6c133dea41dfd61… Patch: https://github.com/kamailio/kamailio/commit/a7ded9247f5a3f0a6c133dea41dfd61… --- diff --git a/pkg/kamailio/deb/jammy/rules b/pkg/kamailio/deb/jammy/rules index 77ff6490f6..52bc98a96b 100755 --- a/pkg/kamailio/deb/jammy/rules +++ b/pkg/kamailio/deb/jammy/rules @@ -21,12 +21,12 @@ include /usr/share/dpkg/buildflags.mk export RADCLI=1 # modules not in the "main" kamailio package -EXCLUDED_MODULES= +EXCLUDED_MODULES= java python # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, # they will be excluded from compile and install of all -EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc +EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec # module groups that are packaged in separate packages # (with the name kamailio-$(group_name)-modules) @@ -34,9 +34,9 @@ EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc # on which other depend first) PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached \ - snmpstats carrierroute xmpp cpl redis python geoip geoip2 \ - sqlite json mono ruby ims sctp java \ - tls outbound websocket autheph dnssec kazoo cnxcc \ + snmpstats carrierroute xmpp cpl redisgeoip geoip2 \ + sqlite json mono ruby ims sctp \ + tls outbound websocket autheph kazoo cnxcc \ erlang systemd phonenum mongodb rabbitmq python3 mqtt secsipid lwsc nats # module groups to be packaged onto kamailio-extra-modules

1 year, 4 months

git:5.6:a7de8d08: pkg/kamailio/deb: fix jammy build, take two [skip ci]

by Victor Seva

Module: kamailio Branch: 5.6 Commit: a7de8d08a46ace83b79b6c1a14646aa9cb4d57a2 URL: https://github.com/kamailio/kamailio/commit/a7de8d08a46ace83b79b6c1a14646aa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-11-30T08:45:47+01:00 pkg/kamailio/deb: fix jammy build, take two [skip ci] * rules are different in master --- Modified: pkg/kamailio/deb/debian/backports/jammy --- Diff: https://github.com/kamailio/kamailio/commit/a7de8d08a46ace83b79b6c1a14646aa… Patch: https://github.com/kamailio/kamailio/commit/a7de8d08a46ace83b79b6c1a14646aa… --- diff --git a/pkg/kamailio/deb/debian/backports/jammy b/pkg/kamailio/deb/debian/backports/jammy index 097873e0fa..ec4724ff08 100755 --- a/pkg/kamailio/deb/debian/backports/jammy +++ b/pkg/kamailio/deb/debian/backports/jammy @@ -15,15 +15,15 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules # No dnssec module: sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \ ${DIST}/control -sed -i -e '/^PACKAGE_GROUPS += dnssec/d' ${DIST}/rules -sed -i -e '/--EXCLUDED--/i EXTRA_EXCLUDED_MODULES += dnssec' ${DIST}/rules +sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules +sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules # No app_java due lack of gcj-jdk sed -i -e '/gcj-jdk/d' -e '/^Package: kamailio-java-modules/,/^$/d' \ ${DIST}/control sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules -sed -i -e '/^PACKAGE_GROUPS += java/d' ${DIST}/rules -sed -i -e '/--EXCLUDED--/i EXTRA_EXCLUDED_MODULES += java' ${DIST}/rules +sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules +sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules # no dh-systemd sed -i -e '/dh-systemd/d' ${DIST}/control @@ -32,8 +32,8 @@ sed -i -e '/dh-systemd/d' ${DIST}/control sed -i -e '/^ python,/d' -e '/python-dev/d' \ -e '/^Package: kamailio-python-modules/,/^$/d' \ ${DIST}/control -sed -i -e '/^PACKAGE_GROUPS += python$/d' ${DIST}/rules -sed -i -e '/--EXCLUDED--/i EXTRA_EXCLUDED_MODULES += python' ${DIST}/rules +sed -i -e 's/ python [ ,$]*//' ${DIST}/rules +sed -i -e '/^EXCLUDED_MODULES=/s/$/ python/' ${DIST}/rules wrap-and-sort -sat -d ${DIST}

1 year, 4 months

git:5.5:fbb5e7a7: tm: backup and restore X/AVP values from initial transaction in DNS failover processing

by Henning Westerholt

Module: kamailio Branch: 5.5 Commit: fbb5e7a736ce0798a7393ada6e0f109a490d027a URL: https://github.com/kamailio/kamailio/commit/fbb5e7a736ce0798a7393ada6e0f109… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-29T10:31:23Z tm: backup and restore X/AVP values from initial transaction in DNS failover processing - restore X/AVP values from initial transaction in DNS failover processing - the X/AVP context gets lost, so we need to re-create it from the transaction - otherwise modules that depends on the X/AVPs, e.g. topology hiding will not work - tested with one load-balancer and two proxy servers - previous fix d6b1c20d3ad94 was reverted, we now properly backup and restore (cherry picked from commit 399b34c6bd4e5cbfcf4dcb699755c393229fcb99) (cherry picked from commit 2b5b3a7fb5a26dc467a60e5e70c8b3515f57bc85) --- Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/fbb5e7a736ce0798a7393ada6e0f109… Patch: https://github.com/kamailio/kamailio/commit/fbb5e7a736ce0798a7393ada6e0f109… --- diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index 26734df2ee8..3db6993b29e 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -360,6 +360,7 @@ inline static void final_response_handler( int branch_ret; int prev_branch; ticks_t now; + tm_xlinks_t backup_xd; #endif #ifdef EXTRA_DEBUG @@ -450,11 +451,15 @@ inline static void final_response_handler( branch_ret = add_uac_dns_fallback( t, t->uas.request, &t->uac[r_buf->branch], 0); prev_branch = -1; + /* restore X/AVP values from initial transaction */ + tm_xdata_swap(t, &backup_xd, 0); while((branch_ret >= 0) && (branch_ret != prev_branch)) { prev_branch = branch_ret; branch_ret = t_send_branch(t, branch_ret, t->uas.request, 0, 0); } + /* restore X/AVP values from backup data */ + tm_xdata_swap(t, &backup_xd, 1); } } #endif

1 year, 4 months

git:5.6:2b5b3a7f: tm: backup and restore X/AVP values from initial transaction in DNS failover processing

by Henning Westerholt

Module: kamailio Branch: 5.6 Commit: 2b5b3a7fb5a26dc467a60e5e70c8b3515f57bc85 URL: https://github.com/kamailio/kamailio/commit/2b5b3a7fb5a26dc467a60e5e70c8b35… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-29T10:30:36Z tm: backup and restore X/AVP values from initial transaction in DNS failover processing - restore X/AVP values from initial transaction in DNS failover processing - the X/AVP context gets lost, so we need to re-create it from the transaction - otherwise modules that depends on the X/AVPs, e.g. topology hiding will not work - tested with one load-balancer and two proxy servers - previous fix d6b1c20d3ad94 was reverted, we now properly backup and restore (cherry picked from commit 399b34c6bd4e5cbfcf4dcb699755c393229fcb99) --- Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/2b5b3a7fb5a26dc467a60e5e70c8b35… Patch: https://github.com/kamailio/kamailio/commit/2b5b3a7fb5a26dc467a60e5e70c8b35… --- diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index a662920cab3..4c821ba871f 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -360,6 +360,7 @@ inline static void final_response_handler( int branch_ret; int prev_branch; ticks_t now; + tm_xlinks_t backup_xd; #endif #ifdef EXTRA_DEBUG @@ -450,11 +451,15 @@ inline static void final_response_handler( branch_ret = add_uac_dns_fallback( t, t->uas.request, &t->uac[r_buf->branch], 0); prev_branch = -1; + /* restore X/AVP values from initial transaction */ + tm_xdata_swap(t, &backup_xd, 0); while((branch_ret >= 0) && (branch_ret != prev_branch)) { prev_branch = branch_ret; branch_ret = t_send_branch(t, branch_ret, t->uas.request, 0, 0); } + /* restore X/AVP values from backup data */ + tm_xdata_swap(t, &backup_xd, 1); } } #endif

1 year, 4 months

git:master:03356132: app_python3: Makefile - extend python3-config lookup

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 03356132aef31a35b94bd47b4146cbce3e1c4ce9 URL: https://github.com/kamailio/kamailio/commit/03356132aef31a35b94bd47b4146cbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-29T09:33:24+01:00 app_python3: Makefile - extend python3-config lookup --- Modified: src/modules/app_python3/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/03356132aef31a35b94bd47b4146cbc… Patch: https://github.com/kamailio/kamailio/commit/03356132aef31a35b94bd47b4146cbc… --- diff --git a/src/modules/app_python3/Makefile b/src/modules/app_python3/Makefile index b3c1e8760b..c357ebc09e 100644 --- a/src/modules/app_python3/Makefile +++ b/src/modules/app_python3/Makefile @@ -1,4 +1,4 @@ -# +# # WARNING: do not run this directly, it should be run by the main Makefile include ../../Makefile.defs @@ -6,21 +6,34 @@ auto_gen= NAME=app_python3.so # If you have multiple Python versions installed make sure to modify the -# the following to point to the correct instance. Module has been tested -# to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, -# but no testing has been done with that. -PYTHON3?=python3 +# the following to point to the correct instance. +PYTHON3?=$(shell which python3) +ifeq ($(PYTHON3),) +PYTHON3=python +endif + +PYTHON3CONFIG=$(shell which ${PYTHON3}-config) +ifeq ($(PYTHON3CONFIG),) +python_version_full := $(wordlist 2,4,$(subst ., ,$(shell ${PYTHON3} --version 2>&1))) +python_version_major := $(word 1,${python_version_full}) +python_version_minor := $(word 2,${python_version_full}) +PYTHON3 = python${python_version_major}.${python_version_minor} +PYTHON3CONFIG=$(shell which ${PYTHON3}-config) +ifeq ($(PYTHON3CONFIG),) +PYTHON3CONFIG=${PYTHON3}-config +endif +endif LIBS=${shell \ - tmp_py3_libs=$$(${PYTHON3}-config --ldflags --embed 2>/dev/null) || \ - tmp_py3_libs=$$(${PYTHON3}-config --ldflags); \ + tmp_py3_libs=$$(${PYTHON3CONFIG} --ldflags --embed 2>/dev/null) || \ + tmp_py3_libs=$$(${PYTHON3CONFIG} --ldflags); \ echo $$tmp_py3_libs} ifeq ($(OS), freebsd) LIBS+=-pthread endif -DEFS+=${shell ${PYTHON3}-config --includes} +DEFS+=${shell ${PYTHON3CONFIG} --includes} include ../../Makefile.modules

1 year, 4 months

git:master:8be2b013: app_python: Makefile - look also for python2.7 if python2 is not found

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8be2b013b2cd2aa71e1c7e5618d7d4b079a4b5e5 URL: https://github.com/kamailio/kamailio/commit/8be2b013b2cd2aa71e1c7e5618d7d4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-29T08:45:07+01:00 app_python: Makefile - look also for python2.7 if python2 is not found --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/8be2b013b2cd2aa71e1c7e5618d7d4b… Patch: https://github.com/kamailio/kamailio/commit/8be2b013b2cd2aa71e1c7e5618d7d4b… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index 57f9def68f..f95b635d2a 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -13,8 +13,11 @@ PYTHON=$(shell which python2) # workaround for some OS (like MacOS) that don't have a python2 link ifeq ($(PYTHON),) +PYTHON=$(shell which python2.7) +ifeq ($(PYTHON),) PYTHON=python endif +endif PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"}

1 year, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2022