From f7fa35d3ea0ce58b23460cd5ce39f39a683c2003 Mon Sep 17 00:00:00 2001 From: bagyenda <> Date: Mon, 7 Jul 2008 14:36:29 +0000 Subject: [PATCH] moved to cvs --- mbuni/ChangeLog | 2 ++ mbuni/doc/userguide.shtml | 4 ++-- mbuni/extras/pgsql-queue/Makefile | 2 +- mbuni/mmlib/mms_util.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog index 0f8953d..6aed452 100644 --- a/mbuni/ChangeLog +++ b/mbuni/ChangeLog @@ -1,3 +1,5 @@ +2008-07-07 P. A. Bagyenda + * Move to compile against Kannel-CVS 2008-07-07 P. A. Bagyenda * Message-ID fix -- added '@' 2008-07-04 P. A. Bagyenda diff --git a/mbuni/doc/userguide.shtml b/mbuni/doc/userguide.shtml index a4a6475..2e646b2 100644 --- a/mbuni/doc/userguide.shtml +++ b/mbuni/doc/userguide.shtml @@ -386,8 +386,8 @@ href="http://www.mbuni.org/downloads.shtml">download area of the website

Installing Kannel

In order to compile the software, you -will first need to download and install Kannel CVS (2006-11-23) from mbuni.org:

+will first need to download and install Kannel CVS (2008-07-07) from kannel.org:

diff --git a/mbuni/extras/pgsql-queue/Makefile b/mbuni/extras/pgsql-queue/Makefile index 8632c75..bf8d9a4 100644 --- a/mbuni/extras/pgsql-queue/Makefile +++ b/mbuni/extras/pgsql-queue/Makefile @@ -86,7 +86,7 @@ BUILD_PGSQLQ_FALSE = # BUILD_PGSQLQ_TRUE = CC = gcc CCDEPMODE = depmode=gcc3 -CFLAGS = -I/usr/local/pgsql/include -g -O2 -DDARWIN=1 -O4 -Wall -I/usr/include/openssl -I/usr/local/include/kannel -g -DDARWIN=1 -L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -I/Developer/SDKs/MacOSX10.4u.sdk/usr/include -I/sw/include/libxml2 -I/sw/include -I/usr/include/openssl +CFLAGS = -I/usr/local/pgsql/include -g -O2 -DDARWIN=1 -O4 -Wall -I/usr/include/openssl -I/usr/local/include/kannel -g -O2 -DDARWIN=1 -L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -I/Developer/SDKs/MacOSX10.4u.sdk/usr/include -I/sw/include/libxml2 -I/sw/include -I/usr/include/openssl CPP = gcc -E CPPFLAGS = CXX = g++ diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c index a530501..9481595 100644 --- a/mbuni/mmlib/mms_util.c +++ b/mbuni/mmlib/mms_util.c @@ -87,7 +87,7 @@ int mms_load_core_settings(mCfgGrp *cgrp) mms_cfg_get_int(cgrp, octstr_imm("http-proxy-port"), &http_proxy_port); if (http_proxy_port > 0) - http_use_proxy(http_proxy_host, http_proxy_port, + http_use_proxy(http_proxy_host, http_proxy_port, 0, exceptions, username, password, except_regex); octstr_destroy(http_proxy_host); octstr_destroy(username);