sr-dev October 2010

sr-dev@lists.kamailio.org

33 participants
336 discussions

git:sr_3.0: permissions(k): fixed misleading out of shm

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: e5dfdb012649cc766ca62fa27c6b3c4850fb9566 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5dfdb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Oct 9 10:56:38 2010 +0200 permissions(k): fixed misleading out of shm - out of shm memory was printed even when db load failed - some identations to reveal the inner blocks (cherry picked from commit 80928443fcd9548bd2e4599e76f1c96498aed4a7) --- modules_k/permissions/address.c | 161 ++++++++++++++++++++------------------- 1 files changed, 81 insertions(+), 80 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 126c8d8..93e5f5c 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -90,20 +90,20 @@ int reload_address_table(void) /* Choose new hash table and free its old contents */ if (*addr_hash_table == addr_hash_table_1) { - empty_addr_hash_table(addr_hash_table_2); - new_hash_table = addr_hash_table_2; + empty_addr_hash_table(addr_hash_table_2); + new_hash_table = addr_hash_table_2; } else { - empty_addr_hash_table(addr_hash_table_1); - new_hash_table = addr_hash_table_1; + empty_addr_hash_table(addr_hash_table_1); + new_hash_table = addr_hash_table_1; } /* Choose new subnet table */ if (*subnet_table == subnet_table_1) { - empty_subnet_table(subnet_table_2); - new_subnet_table = subnet_table_2; + empty_subnet_table(subnet_table_2); + new_subnet_table = subnet_table_2; } else { - empty_subnet_table(subnet_table_1); - new_subnet_table = subnet_table_1; + empty_subnet_table(subnet_table_1); + new_subnet_table = subnet_table_1; } row = RES_ROWS(res); @@ -111,52 +111,52 @@ int reload_address_table(void) LM_DBG("Number of rows in address table: %d\n", RES_ROW_N(res)); for (i = 0; i < RES_ROW_N(res); i++) { - val = ROW_VALUES(row + i); - if ((ROW_N(row + i) == 4) && - (VAL_TYPE(val) == DB1_INT) && !VAL_NULL(val) && - (VAL_INT(val) > 0) && - (VAL_TYPE(val + 1) == DB1_STRING) && !VAL_NULL(val + 1) && - inet_aton((char *)VAL_STRING(val + 1), &ip_addr) != 0 && - (VAL_TYPE(val + 2) == DB1_INT) && !VAL_NULL(val + 2) && - ((unsigned int)VAL_INT(val + 2) > 0) && - ((unsigned int)VAL_INT(val + 2) <= 32) && - (VAL_TYPE(val + 3) == DB1_INT) && !VAL_NULL(val + 3)) { - if ((unsigned int)VAL_INT(val + 2) == 32) { - if (addr_hash_table_insert(new_hash_table, + val = ROW_VALUES(row + i); + if ((ROW_N(row + i) == 4) && + (VAL_TYPE(val) == DB1_INT) && !VAL_NULL(val) && + (VAL_INT(val) > 0) && + (VAL_TYPE(val + 1) == DB1_STRING) && !VAL_NULL(val + 1) && + inet_aton((char *)VAL_STRING(val + 1), &ip_addr) != 0 && + (VAL_TYPE(val + 2) == DB1_INT) && !VAL_NULL(val + 2) && + ((unsigned int)VAL_INT(val + 2) > 0) && + ((unsigned int)VAL_INT(val + 2) <= 32) && + (VAL_TYPE(val + 3) == DB1_INT) && !VAL_NULL(val + 3)) { + if ((unsigned int)VAL_INT(val + 2) == 32) { + if (addr_hash_table_insert(new_hash_table, (unsigned int)VAL_INT(val), (unsigned int)ip_addr.s_addr, (unsigned int)VAL_INT(val + 3)) - == -1) { - LM_ERR("hash table problem\n"); - perm_dbf.free_result(db_handle, res); - return -1; - } - LM_DBG("Tuple <%u, %s, %u> inserted into address hash " - "table\n", (unsigned int)VAL_INT(val), - (char *)VAL_STRING(val + 1), - (unsigned int)VAL_INT(val + 2)); - } else { - if (subnet_table_insert(new_subnet_table, - (unsigned int)VAL_INT(val), - (unsigned int)ip_addr.s_addr, - (unsigned int)VAL_INT(val + 2), - (unsigned int)VAL_INT(val + 3)) - == -1) { - LM_ERR("subnet table problem\n"); - perm_dbf.free_result(db_handle, res); - return -1; + == -1) { + LM_ERR("hash table problem\n"); + perm_dbf.free_result(db_handle, res); + return -1; + } + LM_DBG("Tuple <%u, %s, %u> inserted into address hash " + "table\n", (unsigned int)VAL_INT(val), + (char *)VAL_STRING(val + 1), + (unsigned int)VAL_INT(val + 2)); + } else { + if (subnet_table_insert(new_subnet_table, + (unsigned int)VAL_INT(val), + (unsigned int)ip_addr.s_addr, + (unsigned int)VAL_INT(val + 2), + (unsigned int)VAL_INT(val + 3)) + == -1) { + LM_ERR("subnet table problem\n"); + perm_dbf.free_result(db_handle, res); + return -1; + } + LM_DBG("Tuple <%u, %s, %u, %u> inserted into subnet " + "table\n", (unsigned int)VAL_INT(val), + (char *)VAL_STRING(val + 1), + (unsigned int)VAL_INT(val + 2), + (unsigned int)VAL_INT(val + 3)); + } + } else { + LM_ERR("database problem\n"); + perm_dbf.free_result(db_handle, res); + return -1; } - LM_DBG("Tuple <%u, %s, %u, %u> inserted into subnet " - "table\n", (unsigned int)VAL_INT(val), - (char *)VAL_STRING(val + 1), - (unsigned int)VAL_INT(val + 2), - (unsigned int)VAL_INT(val + 3)); - } - } else { - LM_ERR("database problem\n"); - perm_dbf.free_result(db_handle, res); - return -1; - } } perm_dbf.free_result(db_handle, res); @@ -176,19 +176,19 @@ int reload_address_table(void) int init_addresses(void) { if (!db_url.s) { - LM_INFO("db_url parameter of permissions module not set, " - "disabling allow_address\n"); - return 0; + LM_INFO("db_url parameter of permissions module not set, " + "disabling allow_address\n"); + return 0; } else { - if (db_bind_mod(&db_url, &perm_dbf) < 0) { - LM_ERR("load a database support module\n"); - return -1; - } + if (db_bind_mod(&db_url, &perm_dbf) < 0) { + LM_ERR("load a database support module\n"); + return -1; + } - if (!DB_CAPABILITY(perm_dbf, DB_CAP_QUERY)) { - LM_ERR("database module does not implement 'query' function\n"); - return -1; - } + if (!DB_CAPABILITY(perm_dbf, DB_CAP_QUERY)) { + LM_ERR("database module does not implement 'query' function\n"); + return -1; + } } addr_hash_table_1 = addr_hash_table_2 = 0; @@ -212,9 +212,11 @@ int init_addresses(void) addr_hash_table_2 = new_addr_hash_table(); if (!addr_hash_table_2) goto error; - addr_hash_table = (struct addr_list ***)shm_malloc - (sizeof(struct addr_list **)); - if (!addr_hash_table) goto error; + addr_hash_table = (struct addr_list ***)shm_malloc(sizeof(struct addr_list **)); + if (!addr_hash_table) { + LM_ERR("no more shared memory\n"); + goto error; + } *addr_hash_table = addr_hash_table_1; @@ -230,8 +232,8 @@ int init_addresses(void) *subnet_table = subnet_table_1; if (reload_address_table() == -1) { - LM_CRIT("reload of address table failed\n"); - goto error; + LM_CRIT("reload of address table failed\n"); + goto error; } perm_dbf.close(db_handle); @@ -240,30 +242,29 @@ int init_addresses(void) return 0; error: - LM_ERR("no more shm memory\n"); if (addr_hash_table_1) { - free_addr_hash_table(addr_hash_table_1); - addr_hash_table_1 = 0; + free_addr_hash_table(addr_hash_table_1); + addr_hash_table_1 = 0; } if (addr_hash_table_2) { - free_addr_hash_table(addr_hash_table_2); - addr_hash_table_2 = 0; + free_addr_hash_table(addr_hash_table_2); + addr_hash_table_2 = 0; } if (addr_hash_table) { - shm_free(addr_hash_table); - addr_hash_table = 0; + shm_free(addr_hash_table); + addr_hash_table = 0; } if (subnet_table_1) { - free_subnet_table(subnet_table_1); - subnet_table_1 = 0; + free_subnet_table(subnet_table_1); + subnet_table_1 = 0; } if (subnet_table_2) { - free_subnet_table(subnet_table_2); - subnet_table_2 = 0; + free_subnet_table(subnet_table_2); + subnet_table_2 = 0; } - if (subnet_table) { - shm_free(subnet_table); - subnet_table = 0; + if (subnet_table) { + shm_free(subnet_table); + subnet_table = 0; } perm_dbf.close(db_handle); db_handle = 0;

14 years, 1 month

git:sr_3.0: * debian-lenny symlink added for debian builds

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: d4a8ef3d6ef64f9cce0d6847b50d091b1eedde33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4a8ef3… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Sep 4 17:49:18 2010 +0200 * debian-lenny symlink added for debian builds (cherry picked from commit 191502e739dcd888177fd4653b50c76ea89603c6) --- pkg/kamailio/debian-lenny | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/debian-lenny b/pkg/kamailio/debian-lenny new file mode 120000 index 0000000..b2f7fd3 --- /dev/null +++ b/pkg/kamailio/debian-lenny @@ -0,0 +1 @@ +debian \ No newline at end of file

14 years, 1 month

git:sr_3.0: Modules_k:pv No warning message for branch(count) if no branches

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: c1802e9ff5861cd52e5a692a6a2aa236a20ccfa7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1802e9… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 25 14:08:35 2010 +0300 Modules_k:pv No warning message for branch(count) if no branches Patch by Carsten Gross (carsten.gross at 1und1 dot de) (cherry picked from commit 54f04ae93503f1d24763b6b6cb0ceec3045b26d9) --- modules_k/pv/pv_branch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_branch.c b/modules_k/pv/pv_branch.c index 163fc73..5c8b56d 100644 --- a/modules_k/pv/pv_branch.c +++ b/modules_k/pv/pv_branch.c @@ -47,7 +47,8 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket); - if(uri.s == 0) + /* branch(count) doesn't need a valid branch, everything else does */ + if(uri.s == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ )) { LM_ERR("error accessing branch [%d]\n", idx); return pv_get_null(msg, param, res);

14 years, 1 month

git repository open for development

by Daniel-Constantin Mierla

Hello, just in case someone was waiting for a more formal announcement regarding the close of frozen state for GIT repository, then it is now open for new development. Thanks again to all that helped to make stable branch v3.1.x happen. Daniel -- Daniel-Constantin Mierla http://www.asipto.com

14 years, 1 month

git:3.1: More git hate

by Jon Bonilla

Module: sip-router Branch: 3.1 Commit: 64793df48f817d2a05c3a4647d5645109997ab32 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=64793df… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Sun Oct 10 01:41:58 2010 +0200 More git hate --- pkg/kamailio/debian-squeeze/control | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/pkg/kamailio/debian-squeeze/control b/pkg/kamailio/debian-squeeze/control index 00aaf9a..ab4ad1e 100644 --- a/pkg/kamailio/debian-squeeze/control +++ b/pkg/kamailio/debian-squeeze/control @@ -2,11 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> -<<<<<<< HEAD Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libgeoip-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev -======= -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libmemcache-dev, libreadline-dev ->>>>>>> b532368... pkg debian Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/

14 years, 1 month

acc not logging 200 events

by Alex Balashov

Greetings, Were there any changes to 'acc' between Kamailio v3.0.x and v3.1.0 that would have caused it to stop logging some events to Postgres? I set the db_flag (in my case 1) on initial INVITE, but it is not logged when the 200 OK comes from the far end. The BYE, however, is logged. I have traced through the config with the new debugger (awesome!) module to verify that the flag is in fact being set, and it is. Thanks, -- Alex Balashov - Principal Evariste Systems LLC 1170 Peachtree Street 12th Floor, Suite 1200 Atlanta, GA 30309 Tel: +1-678-954-0670 Fax: +1-404-961-1892 Web: http://www.evaristesys.com/

14 years, 1 month

git:master: Still hating git

by Jon Bonilla

Module: sip-router Branch: master Commit: 2e5310e5f7c3e1f4307b052c582800b508f95784 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e5310e… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Sun Oct 10 01:41:12 2010 +0200 Still hating git --- pkg/kamailio/debian-squeeze/control | 4 ---- pkg/kamailio/debian/control | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/pkg/kamailio/debian-squeeze/control b/pkg/kamailio/debian-squeeze/control index 00aaf9a..ab4ad1e 100644 --- a/pkg/kamailio/debian-squeeze/control +++ b/pkg/kamailio/debian-squeeze/control @@ -2,11 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> -<<<<<<< HEAD Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libgeoip-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev -======= -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libmemcache-dev, libreadline-dev ->>>>>>> b532368... pkg debian Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/debian/control b/pkg/kamailio/debian/control index c7b6fa2..73a1e26 100644 --- a/pkg/kamailio/debian/control +++ b/pkg/kamailio/debian/control @@ -2,11 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> -<<<<<<< HEAD Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev -======= -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev ->>>>>>> b532368... pkg debian Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/

14 years, 1 month

git:3.1: I hate git

by Jon Bonilla

Module: sip-router Branch: 3.1 Commit: 47405259234989b0c7ce53091ba4cdad280586c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4740525… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Sun Oct 10 01:40:22 2010 +0200 I hate git --- pkg/kamailio/debian/control | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/pkg/kamailio/debian/control b/pkg/kamailio/debian/control index c7b6fa2..73a1e26 100644 --- a/pkg/kamailio/debian/control +++ b/pkg/kamailio/debian/control @@ -2,11 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> -<<<<<<< HEAD Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev -======= -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev ->>>>>>> b532368... pkg debian Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/

14 years, 1 month

git:3.1: pkg debian

by Jon Bonilla

Module: sip-router Branch: 3.1 Commit: e4c14ed4ba933dd8c675a157adf21cd7e84b565c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4c14ed… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Sun Oct 10 01:38:09 2010 +0200 pkg debian * Use libreadline-dev generic instead of libreadline5-dev as dependency (cherry picked from commit b532368d655fb7b08c44120c85eb09ff545bab44) Conflicts: pkg/kamailio/debian-squeeze/control pkg/kamailio/debian/control --- pkg/kamailio/debian-squeeze/control | 4 ++++ pkg/kamailio/debian/control | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/debian-squeeze/control b/pkg/kamailio/debian-squeeze/control index ab4ad1e..00aaf9a 100644 --- a/pkg/kamailio/debian-squeeze/control +++ b/pkg/kamailio/debian-squeeze/control @@ -2,7 +2,11 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> +<<<<<<< HEAD Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libgeoip-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev +======= +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libmemcache-dev, libreadline-dev +>>>>>>> b532368... pkg debian Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/debian/control b/pkg/kamailio/debian/control index 73a1e26..c7b6fa2 100644 --- a/pkg/kamailio/debian/control +++ b/pkg/kamailio/debian/control @@ -2,7 +2,11 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> +<<<<<<< HEAD Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev +======= +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev +>>>>>>> b532368... pkg debian Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/

14 years, 1 month

git:master: pkg debian

by Jon Bonilla

Module: sip-router Branch: master Commit: cbec5862d01c5983da0ecf730ff92c05a371e927 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbec586… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Sun Oct 10 01:37:15 2010 +0200 pkg debian * Use libreadline-dev generic instead of libreadline5-dev as dependency (cherry picked from commit b532368d655fb7b08c44120c85eb09ff545bab44) Conflicts: pkg/kamailio/debian-squeeze/control pkg/kamailio/debian/control --- pkg/kamailio/debian-squeeze/control | 4 ++++ pkg/kamailio/debian/control | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/debian-squeeze/control b/pkg/kamailio/debian-squeeze/control index ab4ad1e..00aaf9a 100644 --- a/pkg/kamailio/debian-squeeze/control +++ b/pkg/kamailio/debian-squeeze/control @@ -2,7 +2,11 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> +<<<<<<< HEAD Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libgeoip-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev +======= +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libmemcache-dev, libreadline-dev +>>>>>>> b532368... pkg debian Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/debian/control b/pkg/kamailio/debian/control index 73a1e26..c7b6fa2 100644 --- a/pkg/kamailio/debian/control +++ b/pkg/kamailio/debian/control @@ -2,7 +2,11 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> +<<<<<<< HEAD Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev +======= +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev +>>>>>>> b532368... pkg debian Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/

14 years, 1 month

← Newer
1
...
15
16
17
18
19
20
21
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2010