Compiling sqlbox against cvs-> Patch fails (Any suggestions?)

Hello All,
	I'm trying to get sqlbox compiled against the current cvs sources +  
the patch is failing (as well as the build)
Can someone please supply a working patch in order to get sqlbox built?

thanks,

here is the complete output + steps I took (Including patch reject  
files. Any suggestions would be appreciated)


1. Dowload Kannel from cvs for gateway & sqlbox

cd /usr/local/src

cvs -d:pserver:[email protected]:/home/cvs co gateway;
cvs -d:pserver:[email protected]:/home/cvs co sqlbox;


/usr/local/src root# ls
gateway   sqlbox

cd sqlbox


make patch

mb-108:/usr/local/src/sqlbox root# make patch
patch -p0 -d ../gateway < sqlbox.patch
patching file Makefile.in
patching file configure
Hunk #1 succeeded at 10871 (offset -9 lines).
Hunk #2 succeeded at 10948 (offset -9 lines).
Hunk #3 succeeded at 12962 (offset 82 lines).
patching file configure.in
Hunk #1 succeeded at 930 (offset -6 lines).
Hunk #2 succeeded at 997 (offset -6 lines).
patching file gw/smsbox.c
Hunk #1 FAILED at 3319.
Hunk #2 succeeded at 3351 with fuzz 2 (offset -14 lines).
1 out of 2 hunks FAILED -- saving rejects to file gw/smsbox.c.rej
patching file gwlib/cfg.def
Hunk #1 FAILED at 243.
Hunk #2 succeeded at 578 (offset 21 lines).
1 out of 2 hunks FAILED -- saving rejects to file gwlib/cfg.def.rej
make: *** [patch] Error 1


contents of gw/smsbox.c.rej :
mb-108:/usr/local/src/gateway root# cat gw/smsbox.c.rej
***************
*** 3319,3325 ****
       Octstr *http_proxy_password = NULL;
       Octstr *http_proxy_exceptions_regex = NULL;
       int ssl = 0;
-     int lf, m;

       bb_port = BB_DEFAULT_SMSBOX_PORT;
       bb_ssl = 0;
--- 3319,3325 ----
       Octstr *http_proxy_password = NULL;
       Octstr *http_proxy_exceptions_regex = NULL;
       int ssl = 0;
+     int lf, m, bearerbox_is_sqlbox = 0;

       bb_port = BB_DEFAULT_SMSBOX_PORT;
       bb_ssl = 0;

contents of gwlib/cfg.def.rej :
mb-108:/usr/local/src/gateway root# cat gwlib/cfg.def.rej
***************
*** 243,248 ****
   SINGLE_GROUP(smsbox,
       OCTSTR(smsbox-id)
       OCTSTR(bearerbox-host)
       OCTSTR(sendsms-port)
       OCTSTR(sendsms-port-ssl)
       OCTSTR(sendsms-interface)
--- 243,249 ----
   SINGLE_GROUP(smsbox,
       OCTSTR(smsbox-id)
       OCTSTR(bearerbox-host)
+     OCTSTR(bearerbox-is-sqlbox)
       OCTSTR(sendsms-port)
       OCTSTR(sendsms-port-ssl)
       OCTSTR(sendsms-interface)
mb-108:/usr/local/src/gateway root#