sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

git:master: modules_k/htable $shtex(htable=>key) caused a segfault when reading (null pointer deref)
by Marius Zbihlei 27 Apr '11

27 Apr '11

Module: sip-router Branch: master Commit: 84eb6933f06926b1fb5068773fc32c5f97210c66 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=84eb693… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 27 15:32:18 2011 +0300 modules_k/htable $shtex(htable=>key) caused a segfault when reading (null pointer deref) (cherry picked from commit e506dae55f1c5011fe3b7f05e94ba9f02a13dc8b) --- modules_k/htable/ht_var.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules_k/htable/ht_var.c b/modules_k/htable/ht_var.c index e97bc1d..03ca66f 100644 --- a/modules_k/htable/ht_var.c +++ b/modules_k/htable/ht_var.c @@ -176,7 +176,6 @@ int pv_get_ht_cell_expire(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str htname; - ht_cell_t *htc=NULL; ht_pv_t *hpv; unsigned int now; @@ -196,7 +195,7 @@ int pv_get_ht_cell_expire(struct sip_msg *msg, pv_param_t *param, if(ht_get_cell_expire(hpv->ht, &htname, &now)!=0) return pv_get_null(msg, param, res); /* integer */ - return pv_get_uintval(msg, param, res, htc->value.n); + return pv_get_uintval(msg, param, res, now); } int pv_set_ht_cell_expire(struct sip_msg* msg, pv_param_t *param,

1 0

git:3.1: modules_k/htable $shtex(htable=>key) caused a segfault when reading (null pointer deref)
by Marius Zbihlei 27 Apr '11

27 Apr '11

Module: sip-router Branch: 3.1 Commit: e506dae55f1c5011fe3b7f05e94ba9f02a13dc8b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e506dae… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 27 15:32:18 2011 +0300 modules_k/htable $shtex(htable=>key) caused a segfault when reading (null pointer deref) --- modules_k/htable/ht_var.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules_k/htable/ht_var.c b/modules_k/htable/ht_var.c index e97bc1d..03ca66f 100644 --- a/modules_k/htable/ht_var.c +++ b/modules_k/htable/ht_var.c @@ -176,7 +176,6 @@ int pv_get_ht_cell_expire(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str htname; - ht_cell_t *htc=NULL; ht_pv_t *hpv; unsigned int now; @@ -196,7 +195,7 @@ int pv_get_ht_cell_expire(struct sip_msg *msg, pv_param_t *param, if(ht_get_cell_expire(hpv->ht, &htname, &now)!=0) return pv_get_null(msg, param, res); /* integer */ - return pv_get_uintval(msg, param, res, htc->value.n); + return pv_get_uintval(msg, param, res, now); } int pv_set_ht_cell_expire(struct sip_msg* msg, pv_param_t *param,

1 0

git:master: utils/kamctl/presence-create. sql Increased size of contact and callid in presence tables
by Marius Zbihlei 27 Apr '11

27 Apr '11

Module: sip-router Branch: master Commit: f2ffcfc6a74098b0df250771865c322c9502a643 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2ffcfc… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 27 11:48:46 2011 +0300 utils/kamctl/presence-create.sql Increased size of contact and callid in presence tables Some CPE (e.g. FritzBox,Samsung) issue larger contacts that 64 chars, thus resulting in a truncation in the DB backend (cherry picked from commit ac679cf5093f99931da6aeea4b40c1215e295a4b) --- utils/kamctl/mysql/presence-create.sql | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 6af8d0a..b764976 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -24,10 +24,10 @@ CREATE TABLE active_watchers ( event_id VARCHAR(64), to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, - callid VARCHAR(64) NOT NULL, + callid VARCHAR(128) NOT NULL, local_cseq INT(11) NOT NULL, remote_cseq INT(11) NOT NULL, - contact VARCHAR(64) NOT NULL, + contact VARCHAR(128) NOT NULL, record_route TEXT, expires INT(11) NOT NULL, status INT(11) DEFAULT 2 NOT NULL, @@ -79,7 +79,7 @@ CREATE TABLE pua ( etag VARCHAR(64) NOT NULL, tuple_id VARCHAR(64), watcher_uri VARCHAR(128) NOT NULL, - call_id VARCHAR(64) NOT NULL, + call_id VARCHAR(128) NOT NULL, to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, cseq INT(11) NOT NULL,

2 2

git:3.1: modules_k/group : In case of incorrect param, don't crash
by Marius Zbihlei 27 Apr '11

27 Apr '11

Module: sip-router Branch: 3.1 Commit: 67420b88a997cc66d3c6ca2e8cef98c4f7cc91dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67420b8… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 17 14:32:22 2011 +0200 modules_k/group : In case of incorrect param, don't crash (cherry picked from commit 5d668ec98ccf4c315da67a1cce6dc3a5cf1b2dc5) --- modules_k/group/group.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/group/group.c b/modules_k/group/group.c index 3a2368b..faac07d 100644 --- a/modules_k/group/group.c +++ b/modules_k/group/group.c @@ -117,6 +117,10 @@ int get_username_domain(struct sip_msg *msg, group_check_p gcp, } turi = &puri; break; + default: { + LM_ERR("incorrect check id %d\n", gcp->id); + return -1; + } } if (gcp->id != 4) {

1 0

Stale nonce for Authentication
by Martin Hoffmann 27 Apr '11

27 Apr '11

Hi, we came across an issue where a client expects an unexpired nonce to be flaged by the stale=true flag in the Digest Authenticate header field. I added this to the challenge function by using flag 8. The patch is attached. I suspect that calling pre_auth again to check whether the nonce is stale isn't the correct way to do this and am open to suggestions. I also looked into using the pv_*_authenticate() functions but all the database stuff is just getting crazy. Best regards, Martin

2 4

git:3.1: Fixed definitions for presence related tables. Size of callid and contact should be larger than 64.
by Marius Zbihlei 27 Apr '11

27 Apr '11

Module: sip-router Branch: 3.1 Commit: e3f8cf21c9bb601ad08e8069bc2f31ae3b6ccd20 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3f8cf2… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 27 13:26:13 2011 +0300 Fixed definitions for presence related tables. Size of callid and contact should be larger than 64. (cherry picked from commit 5af83d0a629cf51344b2ba01b7219c3a507bd225) --- lib/srdb1/schema/pr_active_watchers.xml | 4 ++-- lib/srdb1/schema/pr_pua.xml | 2 +- utils/kamctl/oracle/presence-create.sql | 6 +++--- utils/kamctl/postgres/presence-create.sql | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/srdb1/schema/pr_active_watchers.xml b/lib/srdb1/schema/pr_active_watchers.xml index 2cfdcff..8c27d56 100644 --- a/lib/srdb1/schema/pr_active_watchers.xml +++ b/lib/srdb1/schema/pr_active_watchers.xml @@ -96,7 +96,7 @@ <column id="callid"> <name>callid</name> <type>string</type> - <size>&domain_len;</size> + <size>&uri_len;</size> <description>Call ID</description> </column> @@ -117,7 +117,7 @@ <column> <name>contact</name> <type>string</type> - <size>&domain_len;</size> + <size>&uri_len;</size> <description>Contact</description> </column> diff --git a/lib/srdb1/schema/pr_pua.xml b/lib/srdb1/schema/pr_pua.xml index 21930c4..e5a21fe 100644 --- a/lib/srdb1/schema/pr_pua.xml +++ b/lib/srdb1/schema/pr_pua.xml @@ -95,7 +95,7 @@ <column> <name>call_id</name> <type>string</type> - <size>&domain_len;</size> + <size>&uri_len;</size> <description>Call ID</description> </column> diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index 6e6daf2..b0ce5ee 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -32,10 +32,10 @@ CREATE TABLE active_watchers ( event_id VARCHAR2(64), to_tag VARCHAR2(64), from_tag VARCHAR2(64), - callid VARCHAR2(64), + callid VARCHAR2(128), local_cseq NUMBER(10), remote_cseq NUMBER(10), - contact VARCHAR2(64), + contact VARCHAR2(128), record_route CLOB, expires NUMBER(10), status NUMBER(10) DEFAULT 2 NOT NULL, @@ -111,7 +111,7 @@ CREATE TABLE pua ( etag VARCHAR2(64), tuple_id VARCHAR2(64), watcher_uri VARCHAR2(128), - call_id VARCHAR2(64), + call_id VARCHAR2(128), to_tag VARCHAR2(64), from_tag VARCHAR2(64), cseq NUMBER(10), diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 9da0eb2..37c8feb 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -24,10 +24,10 @@ CREATE TABLE active_watchers ( event_id VARCHAR(64), to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, - callid VARCHAR(64) NOT NULL, + callid VARCHAR(128) NOT NULL, local_cseq INTEGER NOT NULL, remote_cseq INTEGER NOT NULL, - contact VARCHAR(64) NOT NULL, + contact VARCHAR(128) NOT NULL, record_route TEXT, expires INTEGER NOT NULL, status INTEGER DEFAULT 2 NOT NULL, @@ -79,7 +79,7 @@ CREATE TABLE pua ( etag VARCHAR(64) NOT NULL, tuple_id VARCHAR(64), watcher_uri VARCHAR(128) NOT NULL, - call_id VARCHAR(64) NOT NULL, + call_id VARCHAR(128) NOT NULL, to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, cseq INTEGER NOT NULL,

1 0

git:master: presence_conference: changed include order to fix comilation on mac os x
by Daniel-Constantin Mierla 27 Apr '11

27 Apr '11

Module: sip-router Branch: master Commit: db717362def3c6e774799c8f9756ede8a246555c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db71736… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 27 12:44:16 2011 +0200 presence_conference: changed include order to fix comilation on mac os x --- modules_k/presence_conference/pidf.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules_k/presence_conference/pidf.c b/modules_k/presence_conference/pidf.c index c0676c8..2b2d45c 100644 --- a/modules_k/presence_conference/pidf.c +++ b/modules_k/presence_conference/pidf.c @@ -31,6 +31,13 @@ * \ingroup presence_xml */ +#include <string.h> +#include <stdlib.h> +#include <libxml/parser.h> +#include "../../dprint.h" +#include "../../sr_module.h" +#include "pidf.h" + /** * make strptime available * use 600 for 'Single UNIX Specification, Version 3' @@ -50,13 +57,6 @@ #undef _XOPEN_SOURCE #undef _XOPEN_SOURCE_EXTENDED -#include <string.h> -#include <stdlib.h> -#include <libxml/parser.h> -#include "../../dprint.h" -#include "../../sr_module.h" -#include "pidf.h" - xmlAttrPtr xmlNodeGetAttrByName(xmlNodePtr node, const char *name) { xmlAttrPtr attr = node->properties;

1 0

git:master: Fixed definitions for presence related tables. Size of callid and contact should be larger than 64.
by Marius Zbihlei 27 Apr '11

27 Apr '11

Module: sip-router Branch: master Commit: 5af83d0a629cf51344b2ba01b7219c3a507bd225 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5af83d0… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 27 13:26:13 2011 +0300 Fixed definitions for presence related tables. Size of callid and contact should be larger than 64. --- lib/srdb1/schema/pr_active_watchers.xml | 4 ++-- lib/srdb1/schema/pr_pua.xml | 2 +- utils/kamctl/oracle/presence-create.sql | 6 +++--- utils/kamctl/postgres/presence-create.sql | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/srdb1/schema/pr_active_watchers.xml b/lib/srdb1/schema/pr_active_watchers.xml index 2cfdcff..8c27d56 100644 --- a/lib/srdb1/schema/pr_active_watchers.xml +++ b/lib/srdb1/schema/pr_active_watchers.xml @@ -96,7 +96,7 @@ <column id="callid"> <name>callid</name> <type>string</type> - <size>&domain_len;</size> + <size>&uri_len;</size> <description>Call ID</description> </column> @@ -117,7 +117,7 @@ <column> <name>contact</name> <type>string</type> - <size>&domain_len;</size> + <size>&uri_len;</size> <description>Contact</description> </column> diff --git a/lib/srdb1/schema/pr_pua.xml b/lib/srdb1/schema/pr_pua.xml index 21930c4..e5a21fe 100644 --- a/lib/srdb1/schema/pr_pua.xml +++ b/lib/srdb1/schema/pr_pua.xml @@ -95,7 +95,7 @@ <column> <name>call_id</name> <type>string</type> - <size>&domain_len;</size> + <size>&uri_len;</size> <description>Call ID</description> </column> diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index 6e6daf2..b0ce5ee 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -32,10 +32,10 @@ CREATE TABLE active_watchers ( event_id VARCHAR2(64), to_tag VARCHAR2(64), from_tag VARCHAR2(64), - callid VARCHAR2(64), + callid VARCHAR2(128), local_cseq NUMBER(10), remote_cseq NUMBER(10), - contact VARCHAR2(64), + contact VARCHAR2(128), record_route CLOB, expires NUMBER(10), status NUMBER(10) DEFAULT 2 NOT NULL, @@ -111,7 +111,7 @@ CREATE TABLE pua ( etag VARCHAR2(64), tuple_id VARCHAR2(64), watcher_uri VARCHAR2(128), - call_id VARCHAR2(64), + call_id VARCHAR2(128), to_tag VARCHAR2(64), from_tag VARCHAR2(64), cseq NUMBER(10), diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 9da0eb2..37c8feb 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -24,10 +24,10 @@ CREATE TABLE active_watchers ( event_id VARCHAR(64), to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, - callid VARCHAR(64) NOT NULL, + callid VARCHAR(128) NOT NULL, local_cseq INTEGER NOT NULL, remote_cseq INTEGER NOT NULL, - contact VARCHAR(64) NOT NULL, + contact VARCHAR(128) NOT NULL, record_route TEXT, expires INTEGER NOT NULL, status INTEGER DEFAULT 2 NOT NULL, @@ -79,7 +79,7 @@ CREATE TABLE pua ( etag VARCHAR(64) NOT NULL, tuple_id VARCHAR(64), watcher_uri VARCHAR(128) NOT NULL, - call_id VARCHAR(64) NOT NULL, + call_id VARCHAR(128) NOT NULL, to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, cseq INTEGER NOT NULL,

1 0

git:3.1: lib/srdb1 Fixed crash caused by NULL pointer parameter
by Marius Zbihlei 27 Apr '11

27 Apr '11

Module: sip-router Branch: 3.1 Commit: bbf59bb235f45e70f8e2925bdf584495610656c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bbf59bb… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 27 12:56:58 2011 +0300 lib/srdb1 Fixed crash caused by NULL pointer parameter --- lib/srdb1/db_id.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index 1c9c4b5..6e8671e 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -209,12 +209,14 @@ static int parse_db_url(struct db_id* id, const str* url) return 0; err: - if (id->scheme) pkg_free(id->scheme); - if (id->username) pkg_free(id->username); - if (id->password) pkg_free(id->password); - if (id->host) pkg_free(id->host); - if (id->database) pkg_free(id->database); - memset(id, 0, sizeof(struct db_id)); + if(id){ + if (id->scheme) pkg_free(id->scheme); + if (id->username) pkg_free(id->username); + if (id->password) pkg_free(id->password); + if (id->host) pkg_free(id->host); + if (id->database) pkg_free(id->database); + memset(id, 0, sizeof(struct db_id)); + } if (prev_token) pkg_free(prev_token); return -1; }

1 0

git:master: presence modules: removed invalid lib path
by Daniel-Constantin Mierla 27 Apr '11

27 Apr '11

Module: sip-router Branch: master Commit: ba9c637db7622bc14bdcc8b461d71d03a3ea3303 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba9c637… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 27 11:34:48 2011 +0200 presence modules: removed invalid lib path - invalid /usr/include/lib was removed from lib path - cleaned commented headers --- modules_k/presence/Makefile | 6 +----- modules_k/presence_conference/Makefile | 5 +---- modules_k/presence_dialoginfo/Makefile | 5 +---- modules_k/presence_mwi/Makefile | 3 --- modules_k/presence_xml/Makefile | 6 +----- modules_k/pua/Makefile | 6 +----- modules_k/pua_bla/Makefile | 6 +----- modules_k/pua_dialoginfo/Makefile | 6 +----- modules_k/pua_mi/Makefile | 7 ------- modules_k/pua_usrloc/Makefile | 6 +----- modules_k/pua_xmpp/Makefile | 6 +----- 11 files changed, 9 insertions(+), 53 deletions(-) diff --git a/modules_k/presence/Makefile b/modules_k/presence/Makefile index 53b591d..a5b5b43 100644 --- a/modules_k/presence/Makefile +++ b/modules_k/presence/Makefile @@ -1,7 +1,3 @@ -# $Id$ -# -# Presence Agent -# # # WARNING: do not run this directly, it should be run by the master Makefile @@ -12,7 +8,7 @@ LIBS= DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/presence_conference/Makefile b/modules_k/presence_conference/Makefile index 2c44fac..dedf59d 100644 --- a/modules_k/presence_conference/Makefile +++ b/modules_k/presence_conference/Makefile @@ -1,6 +1,3 @@ -# -# Presence_Conference Makefile -# # # WARNING: do not run this directly, it should be run by the master Makefile @@ -9,7 +6,7 @@ auto_gen= NAME=presence_conference.so DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/presence_dialoginfo/Makefile b/modules_k/presence_dialoginfo/Makefile index 222e2d2..cf07373 100644 --- a/modules_k/presence_dialoginfo/Makefile +++ b/modules_k/presence_dialoginfo/Makefile @@ -1,6 +1,3 @@ -# -# Presence_MWI Makefile -# # # WARNING: do not run this directly, it should be run by the master Makefile @@ -9,7 +6,7 @@ auto_gen= NAME=presence_dialoginfo.so DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/presence_mwi/Makefile b/modules_k/presence_mwi/Makefile index 2124687..7ad266a 100644 --- a/modules_k/presence_mwi/Makefile +++ b/modules_k/presence_mwi/Makefile @@ -1,6 +1,3 @@ -# -# Presence_MWI Makefile -# # # WARNING: do not run this directly, it should be run by the master Makefile diff --git a/modules_k/presence_xml/Makefile b/modules_k/presence_xml/Makefile index 451811d..c675c4c 100644 --- a/modules_k/presence_xml/Makefile +++ b/modules_k/presence_xml/Makefile @@ -1,7 +1,3 @@ -# $Id: Makefile 1856 2007-03-15 21:06:00Z jblache $ -# -# Presence_XML -# # # WARNING: do not run this directly, it should be run by the master Makefile @@ -12,7 +8,7 @@ LIBS= DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/pua/Makefile b/modules_k/pua/Makefile index 637dde8..2b81d14 100644 --- a/modules_k/pua/Makefile +++ b/modules_k/pua/Makefile @@ -1,7 +1,3 @@ -# $Id$ -# -# PUBLISH -# # # WARNING: do not run this directly, it should be run by the master Makefile @@ -12,7 +8,7 @@ LIBS= DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/pua_bla/Makefile b/modules_k/pua_bla/Makefile index 2a794db..29dad69 100755 --- a/modules_k/pua_bla/Makefile +++ b/modules_k/pua_bla/Makefile @@ -1,7 +1,3 @@ -# $Id: Makefile 1619 2007-02-12 18:17:05Z bogdan_iancu $ -# -# PUA_BLA -# # # WARNING: do not run this directly, it should be run by the master Makefile @@ -10,7 +6,7 @@ auto_gen= NAME=pua_bla.so LIBS= DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include -LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/pua_dialoginfo/Makefile b/modules_k/pua_dialoginfo/Makefile index 8437bbd..a2fd9a5 100644 --- a/modules_k/pua_dialoginfo/Makefile +++ b/modules_k/pua_dialoginfo/Makefile @@ -1,7 +1,3 @@ -# $Id: Makefile 1856 2007-03-15 21:06:00Z jblache $ -# -# PUBLISH -# # # WARNING: do not run this directly, it should be run by the master Makefile @@ -12,7 +8,7 @@ LIBS= DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/pua_mi/Makefile b/modules_k/pua_mi/Makefile index af9483e..e6944a3 100644 --- a/modules_k/pua_mi/Makefile +++ b/modules_k/pua_mi/Makefile @@ -1,7 +1,3 @@ -# $Id$ -# -# PUBLISH -# # # WARNING: do not run this directly, it should be run by the master Makefile @@ -10,9 +6,6 @@ auto_gen= NAME=pua_mi.so LIBS= -DEFS+=-I$(LOCALBASE)/include -LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib - DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib diff --git a/modules_k/pua_usrloc/Makefile b/modules_k/pua_usrloc/Makefile index 070dcf7..681f018 100644 --- a/modules_k/pua_usrloc/Makefile +++ b/modules_k/pua_usrloc/Makefile @@ -1,7 +1,3 @@ -# $Id$ -# -# PUBLISH -# # # WARNING: do not run this directly, it should be run by the master Makefile @@ -12,7 +8,7 @@ LIBS= DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/pua_xmpp/Makefile b/modules_k/pua_xmpp/Makefile index eacfc9d..90642d7 100644 --- a/modules_k/pua_xmpp/Makefile +++ b/modules_k/pua_xmpp/Makefile @@ -1,7 +1,3 @@ -# $Id: Makefile,v 1.2 2005/10/25 16:23:28 bogdan_iancu Exp $ -# -# PUBLISH -# # # WARNING: do not run this directly, it should be run by the master Makefile @@ -11,7 +7,7 @@ NAME= pua_xmpp.so LIBS= DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include -LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE

1 0

← Newer
1
2
3
4
5
6
7
8
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2011