sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
531 discussions

git:4.1:8bfe0a4b: travis-ci: build only supported branches. Send email notifications on failure only
by Victor Seva 05 Jan '15

05 Jan '15

Module: kamailio Branch: 4.1 Commit: 8bfe0a4b2ea98dac2574c24b78c9ccd4d17f61a6 URL: https://github.com/kamailio/kamailio/commit/8bfe0a4b2ea98dac2574c24b78c9ccd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-05T19:11:03+01:00 travis-ci: build only supported branches. Send email notifications on failure only (cherry picked from commit dc9928ec99901ec713d1a79b02a8554ed5f6618e) --- Modified: .travis.yml --- Diff: https://github.com/kamailio/kamailio/commit/8bfe0a4b2ea98dac2574c24b78c9ccd… Patch: https://github.com/kamailio/kamailio/commit/8bfe0a4b2ea98dac2574c24b78c9ccd… --- diff --git a/.travis.yml b/.travis.yml index d5b76b0..b7b4352 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,16 @@ before_install: - sudo apt-get install -y gdebi-core - sudo pkg/kamailio/deb/build_deps.sh precise $TRAVIS_BUILD_DIR script: ./pkg/kamailio/deb/build_travis.sh +branches: + only: + - master + - 4.2 + - 4.1 notifications: irc: channels: - "chat.freenode.net#Kamailio" - on_success: change + on_success: never on_failure: always email: - sr-dev(a)lists.sip-router.org

1 0

git:4.1:31cdb7ba: pkg/kamailio: Initial Travis CI configuration
by Victor Seva 05 Jan '15

05 Jan '15

Module: kamailio Branch: 4.1 Commit: 31cdb7bae9d26987426f6aa72e5a2f261ba40d6f URL: https://github.com/kamailio/kamailio/commit/31cdb7bae9d26987426f6aa72e5a2f2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-05T19:02:53+01:00 pkg/kamailio: Initial Travis CI configuration (cherry picked from commit 3cdfb23b6e9d13fea3ee0994b450279c3cc6a488) --- Added: .travis.yml Added: pkg/kamailio/deb/build_deps.sh Added: pkg/kamailio/deb/build_travis.sh --- Diff: https://github.com/kamailio/kamailio/commit/31cdb7bae9d26987426f6aa72e5a2f2… Patch: https://github.com/kamailio/kamailio/commit/31cdb7bae9d26987426f6aa72e5a2f2… --- diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..d5b76b0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,17 @@ +language: c +compiler: + - gcc + - clang +before_install: + - sudo apt-get update -qq + - sudo apt-get install -y gdebi-core + - sudo pkg/kamailio/deb/build_deps.sh precise $TRAVIS_BUILD_DIR +script: ./pkg/kamailio/deb/build_travis.sh +notifications: + irc: + channels: + - "chat.freenode.net#Kamailio" + on_success: change + on_failure: always + email: + - sr-dev(a)lists.sip-router.org diff --git a/pkg/kamailio/deb/build_deps.sh b/pkg/kamailio/deb/build_deps.sh new file mode 100755 index 0000000..10387b2 --- /dev/null +++ b/pkg/kamailio/deb/build_deps.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# +# build_deps script for travis CI +# installs the build_deps packages needed to build Kamailio +# environment based on Ubuntu 12.04 LTS (precise) +# +DIST=${1:-precise} +BASE_DIR=${2:-$(pwd)} +CONTROL_FILE="${BASE_DIR}/pkg/kamailio/deb/${DIST}/control" +if ! [ -f "${CONTROL_FILE}" ]; then + echo "Error: No ${CONTROL_FILE} found" + exit 1 +fi + +BUILD_DEPS=$(/usr/bin/gdebi --quiet --non-interactive \ + --option=APT::Install-Recommends=false \ + --apt-line ${CONTROL_FILE}) +if [ -z "${BUILD_DEPS}" ]; then + echo "Error: no build deps packages resolved" + exit 2 +fi + +apt-get install -y $BUILD_DEPS diff --git a/pkg/kamailio/deb/build_travis.sh b/pkg/kamailio/deb/build_travis.sh new file mode 100755 index 0000000..a18b2e7 --- /dev/null +++ b/pkg/kamailio/deb/build_travis.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# +# build script for travis CI +# environment based on Ubuntu 12.04 LTS (precise) +# +export JAVA_HOME="/usr/lib/jvm/java-gcj" +EXCLUDED_MODULES="" +EXTRA_EXCLUDED_MODULES="bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec kazoo cnxcc" +PACKAGE_GROUPS="mysql postgres berkeley unixodbc radius presence ldap xml perl utils lua memcached \ + snmpstats carrierroute xmpp cpl redis python geoip\ + sqlite json mono ims sctp java \ + purple tls outbound websocket autheph" +echo "make cfg" +make FLAVOUR=kamailio cfg \ + skip_modules="${EXCLUDED_MODULES} ${EXTRA_EXCLUDED_MODULES}" \ + group_include="kstandard" +echo "make all" +make all +echo "make groups" +for grp in ${PACKAGE_GROUPS}; do + make every-module group_include="k${grp}" +done

1 0

git:vseva/travis:42407b48: DISCARD: test travis-ci on temporal 4.1 branch
by Victor Seva 05 Jan '15

05 Jan '15

Module: kamailio Branch: vseva/travis Commit: 42407b48e165b44c2a08753cf355008054d21bcf URL: https://github.com/kamailio/kamailio/commit/42407b48e165b44c2a08753cf355008… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-05T19:25:46+01:00 DISCARD: test travis-ci on temporal 4.1 branch --- Modified: .travis.yml --- Diff: https://github.com/kamailio/kamailio/commit/42407b48e165b44c2a08753cf355008… Patch: https://github.com/kamailio/kamailio/commit/42407b48e165b44c2a08753cf355008… --- diff --git a/.travis.yml b/.travis.yml index f25d00a..175d68e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ branches: only: - master - 4.2 - - 4.1 + - vseva/travis notifications: email: recipients:

1 0

git:vseva/travis:482b9e2b: DISCARD: change email for email notification
by Victor Seva 05 Jan '15

05 Jan '15

Module: kamailio Branch: vseva/travis Commit: 482b9e2b7646b3a81133efab87984daf3ffe0477 URL: https://github.com/kamailio/kamailio/commit/482b9e2b7646b3a81133efab87984da… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-05T19:17:57+01:00 DISCARD: change email for email notification --- Modified: .travis.yml --- Diff: https://github.com/kamailio/kamailio/commit/482b9e2b7646b3a81133efab87984da… Patch: https://github.com/kamailio/kamailio/commit/482b9e2b7646b3a81133efab87984da… --- diff --git a/.travis.yml b/.travis.yml index ecd40fd..f25d00a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,13 +13,8 @@ branches: - 4.2 - 4.1 notifications: - irc: - channels: - - "chat.freenode.net#Kamailio" - on_success: never - on_failure: always email: recipients: - - sr-dev(a)lists.sip-router.org + - linuxmaniac(a)torreviejawireless.org on_success: never on_failure: always

1 0

git:vseva/travis:0aadaaf3: travis-ci: set proper email notification options
by Victor Seva 05 Jan '15

05 Jan '15

Module: kamailio Branch: vseva/travis Commit: 0aadaaf321c69edc68735607c2ed8445773e5e5c URL: https://github.com/kamailio/kamailio/commit/0aadaaf321c69edc68735607c2ed844… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-05T19:11:18+01:00 travis-ci: set proper email notification options (cherry picked from commit 04999c90b074bf1571036ab88bb0a384a58f97a2) --- Modified: .travis.yml --- Diff: https://github.com/kamailio/kamailio/commit/0aadaaf321c69edc68735607c2ed844… Patch: https://github.com/kamailio/kamailio/commit/0aadaaf321c69edc68735607c2ed844… --- diff --git a/.travis.yml b/.travis.yml index b7b4352..ecd40fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,7 @@ notifications: on_success: never on_failure: always email: - - sr-dev(a)lists.sip-router.org + recipients: + - sr-dev(a)lists.sip-router.org + on_success: never + on_failure: always

1 0

git:vseva/travis:8bfe0a4b: travis-ci: build only supported branches. Send email notifications on failure only
by Victor Seva 05 Jan '15

05 Jan '15

Module: kamailio Branch: vseva/travis Commit: 8bfe0a4b2ea98dac2574c24b78c9ccd4d17f61a6 URL: https://github.com/kamailio/kamailio/commit/8bfe0a4b2ea98dac2574c24b78c9ccd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-05T19:11:03+01:00 travis-ci: build only supported branches. Send email notifications on failure only (cherry picked from commit dc9928ec99901ec713d1a79b02a8554ed5f6618e) --- Modified: .travis.yml --- Diff: https://github.com/kamailio/kamailio/commit/8bfe0a4b2ea98dac2574c24b78c9ccd… Patch: https://github.com/kamailio/kamailio/commit/8bfe0a4b2ea98dac2574c24b78c9ccd… --- diff --git a/.travis.yml b/.travis.yml index d5b76b0..b7b4352 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,16 @@ before_install: - sudo apt-get install -y gdebi-core - sudo pkg/kamailio/deb/build_deps.sh precise $TRAVIS_BUILD_DIR script: ./pkg/kamailio/deb/build_travis.sh +branches: + only: + - master + - 4.2 + - 4.1 notifications: irc: channels: - "chat.freenode.net#Kamailio" - on_success: change + on_success: never on_failure: always email: - sr-dev(a)lists.sip-router.org

1 0

git:vseva/travis:31cdb7ba: pkg/kamailio: Initial Travis CI configuration
by Victor Seva 05 Jan '15

05 Jan '15

Module: kamailio Branch: vseva/travis Commit: 31cdb7bae9d26987426f6aa72e5a2f261ba40d6f URL: https://github.com/kamailio/kamailio/commit/31cdb7bae9d26987426f6aa72e5a2f2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-05T19:02:53+01:00 pkg/kamailio: Initial Travis CI configuration (cherry picked from commit 3cdfb23b6e9d13fea3ee0994b450279c3cc6a488) --- Added: .travis.yml Added: pkg/kamailio/deb/build_deps.sh Added: pkg/kamailio/deb/build_travis.sh --- Diff: https://github.com/kamailio/kamailio/commit/31cdb7bae9d26987426f6aa72e5a2f2… Patch: https://github.com/kamailio/kamailio/commit/31cdb7bae9d26987426f6aa72e5a2f2… --- diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..d5b76b0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,17 @@ +language: c +compiler: + - gcc + - clang +before_install: + - sudo apt-get update -qq + - sudo apt-get install -y gdebi-core + - sudo pkg/kamailio/deb/build_deps.sh precise $TRAVIS_BUILD_DIR +script: ./pkg/kamailio/deb/build_travis.sh +notifications: + irc: + channels: + - "chat.freenode.net#Kamailio" + on_success: change + on_failure: always + email: + - sr-dev(a)lists.sip-router.org diff --git a/pkg/kamailio/deb/build_deps.sh b/pkg/kamailio/deb/build_deps.sh new file mode 100755 index 0000000..10387b2 --- /dev/null +++ b/pkg/kamailio/deb/build_deps.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# +# build_deps script for travis CI +# installs the build_deps packages needed to build Kamailio +# environment based on Ubuntu 12.04 LTS (precise) +# +DIST=${1:-precise} +BASE_DIR=${2:-$(pwd)} +CONTROL_FILE="${BASE_DIR}/pkg/kamailio/deb/${DIST}/control" +if ! [ -f "${CONTROL_FILE}" ]; then + echo "Error: No ${CONTROL_FILE} found" + exit 1 +fi + +BUILD_DEPS=$(/usr/bin/gdebi --quiet --non-interactive \ + --option=APT::Install-Recommends=false \ + --apt-line ${CONTROL_FILE}) +if [ -z "${BUILD_DEPS}" ]; then + echo "Error: no build deps packages resolved" + exit 2 +fi + +apt-get install -y $BUILD_DEPS diff --git a/pkg/kamailio/deb/build_travis.sh b/pkg/kamailio/deb/build_travis.sh new file mode 100755 index 0000000..a18b2e7 --- /dev/null +++ b/pkg/kamailio/deb/build_travis.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# +# build script for travis CI +# environment based on Ubuntu 12.04 LTS (precise) +# +export JAVA_HOME="/usr/lib/jvm/java-gcj" +EXCLUDED_MODULES="" +EXTRA_EXCLUDED_MODULES="bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec kazoo cnxcc" +PACKAGE_GROUPS="mysql postgres berkeley unixodbc radius presence ldap xml perl utils lua memcached \ + snmpstats carrierroute xmpp cpl redis python geoip\ + sqlite json mono ims sctp java \ + purple tls outbound websocket autheph" +echo "make cfg" +make FLAVOUR=kamailio cfg \ + skip_modules="${EXCLUDED_MODULES} ${EXTRA_EXCLUDED_MODULES}" \ + group_include="kstandard" +echo "make all" +make all +echo "make groups" +for grp in ${PACKAGE_GROUPS}; do + make every-module group_include="k${grp}" +done

1 0

git:lazedo/4.2:21115f39: deb : remove librabbitmq-dev from kamailio main dependencies
by Luis Azedo 05 Jan '15

05 Jan '15

Module: kamailio Branch: lazedo/4.2 Commit: 21115f391d1fa9c2ddf639fa96eea9e3956c09b7 URL: https://github.com/kamailio/kamailio/commit/21115f391d1fa9c2ddf639fa96eea9e… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-01-05T18:11:24Z deb : remove librabbitmq-dev from kamailio main dependencies --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/trusty/control --- Diff: https://github.com/kamailio/kamailio/commit/21115f391d1fa9c2ddf639fa96eea9e… Patch: https://github.com/kamailio/kamailio/commit/21115f391d1fa9c2ddf639fa96eea9e… --- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 2aeac33..0e47389 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -30,7 +30,6 @@ Build-Depends: bison, libperl-dev, libpq-dev, libpurple-dev, - librabbitmq-dev, libreadline-dev, libsasl2-dev, libsctp-dev, diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index b992303..a948ac1 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -30,7 +30,6 @@ Build-Depends: bison, libperl-dev, libpq-dev, libpurple-dev, - librabbitmq-dev, libreadline-dev, libsasl2-dev, libsctp-dev, diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index b992303..a948ac1 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -30,7 +30,6 @@ Build-Depends: bison, libperl-dev, libpq-dev, libpurple-dev, - librabbitmq-dev, libreadline-dev, libsasl2-dev, libsctp-dev,

1 0

git:master:04999c90: travis-ci: set proper email notification options
by Victor Seva 05 Jan '15

05 Jan '15

Module: kamailio Branch: master Commit: 04999c90b074bf1571036ab88bb0a384a58f97a2 URL: https://github.com/kamailio/kamailio/commit/04999c90b074bf1571036ab88bb0a38… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-05T19:07:08+01:00 travis-ci: set proper email notification options --- Modified: .travis.yml --- Diff: https://github.com/kamailio/kamailio/commit/04999c90b074bf1571036ab88bb0a38… Patch: https://github.com/kamailio/kamailio/commit/04999c90b074bf1571036ab88bb0a38… --- diff --git a/.travis.yml b/.travis.yml index b7b4352..ecd40fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,7 @@ notifications: on_success: never on_failure: always email: - - sr-dev(a)lists.sip-router.org + recipients: + - sr-dev(a)lists.sip-router.org + on_success: never + on_failure: always

1 0

git:master:5e701d6a: core: cfg parser - resolve conflict between proto:host and event route name
by Daniel-Constantin Mierla 05 Jan '15

05 Jan '15

Module: kamailio Branch: master Commit: 5e701d6a0826611dc980db2f434bee49e0fdcf88 URL: https://github.com/kamailio/kamailio/commit/5e701d6a0826611dc980db2f434bee4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-05T18:50:40+01:00 core: cfg parser - resolve conflict between proto:host and event route name - there was a conflict on same kind of id:id format - event route name is expected now only after an event_route --- Modified: cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/5e701d6a0826611dc980db2f434bee4… Patch: https://github.com/kamailio/kamailio/commit/5e701d6a0826611dc980db2f434bee4… --- diff --git a/cfg.lex b/cfg.lex index 472dfd0..3eb79dc 100644 --- a/cfg.lex +++ b/cfg.lex @@ -117,6 +117,7 @@ #define IFDEF_EOL_S 14 #define IFDEF_SKIP_S 15 #define DEFINE_DATA_S 16 + #define EVRT_NAME_S 17 #define STR_BUF_ALLOC_UNIT 128 struct str_buf{ @@ -181,7 +182,7 @@ /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P -%x PVARID INCLF IMPTF +%x PVARID INCLF IMPTF EVRTNAME %x LINECOMMENT DEFINE_ID DEFINE_EOL DEFINE_DATA IFDEF_ID IFDEF_EOL IFDEF_SKIP /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ @@ -619,7 +620,19 @@ IMPORTFILE "import_file" <INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; yylval.strval=yytext; return ROUTE_SEND; } <INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; - yylval.strval=yytext; return ROUTE_EVENT; } + yylval.strval=yytext; + state=EVRT_NAME_S; BEGIN(EVRTNAME); + return ROUTE_EVENT; } +<EVRTNAME>{LBRACK} { count(); return LBRACK; } +<EVRTNAME>{EAT_ABLE}|{CR} { count(); }; +<EVRTNAME>{EVENT_RT_NAME} { count(); + addstr(&s_buf, yytext, yyleng); + yylval.strval=s_buf.s; + memset(&s_buf, 0, sizeof(s_buf)); + return EVENT_RT_NAME; } +<EVRTNAME>{RBRACK} { count(); + state=INITIAL_S; BEGIN(INITIAL); + return RBRACK; } <INITIAL>{EXEC} { count(); yylval.strval=yytext; return EXEC; } <INITIAL>{SET_HOST} { count(); yylval.strval=yytext; return SET_HOST; } <INITIAL>{SET_HOSTPORT} { count(); yylval.strval=yytext; return SET_HOSTPORT; } @@ -1150,11 +1163,6 @@ IMPORTFILE "import_file" <INITIAL>{DOT} { count(); return DOT; } <INITIAL>\\{CR} {count(); } /* eat the escaped CR */ <INITIAL>{CR} { count();/* return CR;*/ } -<INITIAL>{EVENT_RT_NAME} { count(); - addstr(&s_buf, yytext, yyleng); - yylval.strval=s_buf.s; - memset(&s_buf, 0, sizeof(s_buf)); - return EVENT_RT_NAME; } <INITIAL,SELECT>{QUOTES} { count(); old_initial = YY_START;

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015