sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
389 discussions

git:master:d0bfefd0: src/Makefile: fix make deb rules
by Victor Seva 02 Jun '17

02 Jun '17

Module: kamailio Branch: master Commit: d0bfefd0f03962b61162eeb65fe01e8dff91674f URL: https://github.com/kamailio/kamailio/commit/d0bfefd0f03962b61162eeb65fe01e8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-06-02T11:42:58+02:00 src/Makefile: fix make deb rules * dpkg-buildpackage needs to be executed from the root of the project * don't sign any file --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d0bfefd0f03962b61162eeb65fe01e8… Patch: https://github.com/kamailio/kamailio/commit/d0bfefd0f03962b61162eeb65fe01e8… --- diff --git a/src/Makefile b/src/Makefile index bbf5f8db8a..2bbbdc3c89 100644 --- a/src/Makefile +++ b/src/Makefile @@ -609,25 +609,27 @@ bin: .PHONY: deb deb: - -@if [ -d debian ]; then \ - dpkg-buildpackage -rfakeroot -tc; \ + (cd ..; \ + if [ -d debian ]; then \ + dpkg-buildpackage -rfakeroot -tc --no-sign; \ rm debian; \ else \ - ln -s ../pkg/$(MAIN_NAME)/deb/debian debian; \ - dpkg-buildpackage -rfakeroot -tc; \ + ln -s pkg/$(MAIN_NAME)/deb/debian debian; \ + dpkg-buildpackage -rfakeroot -tc --no-sign; \ rm debian; \ - fi + fi) .PHONY: deb-stable deb-stable: - -@if [ -d debian ]; then \ - dpkg-buildpackage -rfakeroot -tc; \ + (cd ..; \ + if [ -d debian ]; then \ + dpkg-buildpackage -rfakeroot -tc --no-sign; \ rm debian; \ else \ - ln -s ../pkg/$(MAIN_NAME)/deb/jessie debian; \ - dpkg-buildpackage -rfakeroot -tc; \ + ln -s pkg/$(MAIN_NAME)/deb/jessie debian; \ + dpkg-buildpackage -rfakeroot -tc --no-sign; \ rm debian; \ - fi + fi) .PHONY: sunpkg sunpkg:

1 0

Re: [sr-dev] [kamailio/kamailio] pkg: fixed location of ChangeLog (#1143)
by Victor Seva 02 Jun '17

02 Jun '17

Closed #1143. -- 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/1143#event-1107499968

1 0

Re: [sr-dev] [kamailio/kamailio] pkg: fixed location of ChangeLog (#1143)
by Victor Seva 02 Jun '17

02 Jun '17

@miconda yes, I'm going to do that and remove the signing phase too -- 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/1143#issuecomment-305740054

1 0

Re: [sr-dev] [kamailio/kamailio] pkg: fixed location of ChangeLog (#1143)
by Daniel-Constantin Mierla 02 Jun '17

02 Jun '17

@adubovikov - thanks for testing and feedback! Signing is a matter of providing a certificate to sign the packages, not offered by `make deb`, iirc, its about a dpkg-buildpackage parameter. @linuxmaniac - will you push your patch and backport to 5.0? -- 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/1143#issuecomment-305739832

1 0

Re: [sr-dev] [kamailio/kamailio] pkg: fixed location of ChangeLog (#1143)
by Alexandr Dubovikov 02 Jun '17

02 Jun '17

@miconda feel free to close the PR ;-) -- 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/1143#issuecomment-305737871

1 0

Re: [sr-dev] [kamailio/kamailio] pkg: fixed location of ChangeLog (#1143)
by Alexandr Dubovikov 02 Jun '17

02 Jun '17

Yep. all good, only problem with sign, but this is IMHO different issue... ``` make[5]: *** No rule to make target 'maintainer-clean'. Stop. /usr/bin/make --no-print-directory -C lib maintainer-clean Making maintainer-clean in srdb1 Making maintainer-clean in srdb2 Making maintainer-clean in ims Making maintainer-clean in xcap Making maintainer-clean in trie Making maintainer-clean in print Making maintainer-clean in cds Making maintainer-clean in presence Making maintainer-clean in srutils Making maintainer-clean in shm_regex Making maintainer-clean in binrpc rm -f config.mak rm -f modules.lst make[4]: Leaving directory '/home/shurik/KAMAILIO/kamailio-5.0.1/src' make[3]: Leaving directory '/home/shurik/KAMAILIO/kamailio-5.0.1' dh_clean make[2]: Leaving directory '/home/shurik/KAMAILIO/kamailio-5.0.1' dpkg-source --after-build kamailio-5.0.1 dpkg-buildpackage: full upload; Debian-native package (full source is included) signfile kamailio_5.0.1.dsc gpg: skipped "Victor Seva <vseva(a)debian.org>": No secret key gpg: dpkg-sign.UQsQaC5d/kamailio_5.0.1.dsc: clearsign failed: No secret key dpkg-buildpackage: error: failed to sign .dsc and .changes file make[1]: Leaving directory '/home/shurik/KAMAILIO/kamailio-5.0.1/src' ``` ``` ls kamailio*.deb kamailio_5.0.1_amd64.deb kamailio-dnssec-modules_5.0.1_amd64.deb kamailio-ldap-modules_5.0.1_amd64.deb kamailio-postgres-modules_5.0.1_amd64.deb kamailio-sqlite-modules_5.0.1_amd64.deb kamailio-autheph-modules_5.0.1_amd64.deb kamailio-erlang-modules_5.0.1_amd64.deb kamailio-lua-modules_5.0.1_amd64.deb kamailio-presence-modules_5.0.1_amd64.deb kamailio-systemd-modules_5.0.1_amd64.deb kamailio-berkeley-bin_5.0.1_amd64.deb kamailio-extra-modules_5.0.1_amd64.deb kamailio-memcached-modules_5.0.1_amd64.deb kamailio-python-modules_5.0.1_amd64.deb kamailio-tls-modules_5.0.1_amd64.deb kamailio-berkeley-modules_5.0.1_amd64.deb kamailio-geoip-modules_5.0.1_amd64.deb kamailio-mono-modules_5.0.1_amd64.deb kamailio-rabbitmq-modules_5.0.1_amd64.deb kamailio-unixodbc-modules_5.0.1_amd64.deb kamailio-carrierroute-modules_5.0.1_amd64.deb kamailio-ims-modules_5.0.1_amd64.deb kamailio-mysql-modules_5.0.1_amd64.deb kamailio-radius-modules_5.0.1_amd64.deb kamailio-utils-modules_5.0.1_amd64.deb kamailio-cnxcc-modules_5.0.1_amd64.deb kamailio-java-modules_5.0.1_amd64.deb kamailio-nth_5.0.1_amd64.deb kamailio-redis-modules_5.0.1_amd64.deb kamailio-websocket-modules_5.0.1_amd64.deb kamailio-cpl-modules_5.0.1_amd64.deb kamailio-json-modules_5.0.1_amd64.deb kamailio-outbound-modules_5.0.1_amd64.deb kamailio-sctp-modules_5.0.1_amd64.deb kamailio-xml-modules_5.0.1_amd64.deb kamailio-dbg_5.0.1_amd64.deb kamailio-kazoo-modules_5.0.1_amd64.deb kamailio-perl-modules_5.0.1_amd64.deb kamailio-snmpstats-modules_5.0.1_amd64.deb kamailio-xmpp-modules_5.0.1_amd64.deb -- 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/1143#issuecomment-305737722

1 0

Re: [sr-dev] [kamailio/kamailio] pkg: fixed location of ChangeLog (#1143)
by Daniel-Constantin Mierla 02 Jun '17

02 Jun '17

@linuxmaniac - I guessed that, the `make deb` was added for convenience, I use it sometimes when doing releases to see it compiles ok, or run directly dpkg-buildpackage, which I guess I did for v5.0. @adubovikov - have you had the time to check the patch from @linuxmaniac? If all ok, then it should be pushed to git repository. -- 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/1143#issuecomment-305729868

1 0

git:master:105376be: Merge pull request #1144 from linuxmaniac/vseva/fix_tm_leak
by GitHub 02 Jun '17

02 Jun '17

Module: kamailio Branch: master Commit: 105376bea7de217d58f3558b8da0244d1f499ec5 URL: https://github.com/kamailio/kamailio/commit/105376bea7de217d58f3558b8da0244… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-02T10:34:27+02:00 Merge pull request #1144 from linuxmaniac/vseva/fix_tm_leak core: parser reset_path_vector() remove check for msg->msg_flags --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/105376bea7de217d58f3558b8da0244… Patch: https://github.com/kamailio/kamailio/commit/105376bea7de217d58f3558b8da0244… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index e8c990da9f..2a4f2bb593 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -799,13 +799,11 @@ int set_path_vector(struct sip_msg* msg, str* path) void reset_path_vector(struct sip_msg* const msg) { - /* only free path vector from pkg IFF it is still in pkg... - ie. if msg is shm we don't free... */ - if (!(msg->msg_flags&FL_SHM_CLONE)) { - if (msg->path_vec.s) - pkg_free(msg->path_vec.s); - msg->path_vec.s = 0; - msg->path_vec.len = 0; + if (msg->path_vec.s) { + pkg_free(msg->path_vec.s); } + msg->path_vec.s = 0; + msg->path_vec.len = 0; }

1 0

git:master:cca31b30: core: parser reset_path_vector() remove check for msg->msg_flags
by Victor Seva 02 Jun '17

02 Jun '17

Module: kamailio Branch: master Commit: cca31b30aeb80c808b10c5f4f36285c1c55cd72a URL: https://github.com/kamailio/kamailio/commit/cca31b30aeb80c808b10c5f4f36285c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-06-02T10:19:25+02:00 core: parser reset_path_vector() remove check for msg->msg_flags * tm now uses shared memory for fake_req() so faked_req->path_vec was leaking --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/cca31b30aeb80c808b10c5f4f36285c… Patch: https://github.com/kamailio/kamailio/commit/cca31b30aeb80c808b10c5f4f36285c… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index e8c990da9f..2a4f2bb593 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -799,13 +799,11 @@ int set_path_vector(struct sip_msg* msg, str* path) void reset_path_vector(struct sip_msg* const msg) { - /* only free path vector from pkg IFF it is still in pkg... - ie. if msg is shm we don't free... */ - if (!(msg->msg_flags&FL_SHM_CLONE)) { - if (msg->path_vec.s) - pkg_free(msg->path_vec.s); - msg->path_vec.s = 0; - msg->path_vec.len = 0; + if (msg->path_vec.s) { + pkg_free(msg->path_vec.s); } + msg->path_vec.s = 0; + msg->path_vec.len = 0; }

1 0

[kamailio/kamailio] core: parser reset_path_vector() remove check for msg->msg_flags (#1144)
by Victor Seva 02 Jun '17

02 Jun '17

* tm now uses shared memory for fake_req() so faked_req->path_vec was leaking You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1144 -- Commit Summary -- * core: parser reset_path_vector() remove check for msg->msg_flags -- File Changes -- M src/core/parser/msg_parser.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1144.patch https://github.com/kamailio/kamailio/pull/1144.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/1144

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017