From 19873786c1cf981d6c94504506fb91183f78f914 Mon Sep 17 00:00:00 2001 From: bagyenda <> Date: Mon, 20 Jun 2005 10:35:08 +0000 Subject: [PATCH] Minor update to kannel patch --- mbuni/misc-patches/mbuni-kannel-patch-full | 70 +++++++++++++++------- 1 file changed, 50 insertions(+), 20 deletions(-) diff --git a/mbuni/misc-patches/mbuni-kannel-patch-full b/mbuni/misc-patches/mbuni-kannel-patch-full index 9b9fea1..faecb9b 100644 --- a/mbuni/misc-patches/mbuni-kannel-patch-full +++ b/mbuni/misc-patches/mbuni-kannel-patch-full @@ -1,6 +1,6 @@ diff -Naur gateway-1.4.0/Makefile.in gateway-1.4.0-patched/Makefile.in ---- gateway-1.4.0/Makefile.in Wed Aug 25 00:50:09 2004 -+++ gateway-1.4.0-patched/Makefile.in Sat Jan 29 16:21:19 2005 +--- gateway-1.4.0/Makefile.in 2004-08-25 00:50:09.000000000 +0300 ++++ gateway-1.4.0-patched/Makefile.in 2005-01-29 16:21:19.000000000 +0300 @@ -262,9 +262,13 @@ $(INSTALL) $(man8pages) $(DESTDIR)$(mandir)/man8 $(INSTALL) -d $(DESTDIR)$(includedir)/kannel/gwlib @@ -24,8 +24,8 @@ diff -Naur gateway-1.4.0/Makefile.in gateway-1.4.0-patched/Makefile.in "@VERSION@" > gw-config chmod 0755 gw-config diff -Naur gateway-1.4.0/gw/ota_compiler.c gateway-1.4.0-patched/gw/ota_compiler.c ---- gateway-1.4.0/gw/ota_compiler.c Thu Jan 22 17:08:24 2004 -+++ gateway-1.4.0-patched/gw/ota_compiler.c Fri Jan 28 17:07:56 2005 +--- gateway-1.4.0/gw/ota_compiler.c 2004-01-22 17:08:24.000000000 +0300 ++++ gateway-1.4.0-patched/gw/ota_compiler.c 2005-01-28 17:07:56.000000000 +0300 @@ -91,9 +91,10 @@ * chapter 8.2. */ @@ -418,8 +418,8 @@ diff -Naur gateway-1.4.0/gw/ota_compiler.c gateway-1.4.0-patched/gw/ota_compiler } else { output_char(ota_hex, otabxml); diff -Naur gateway-1.4.0/gw/ota_prov.c gateway-1.4.0-patched/gw/ota_prov.c ---- gateway-1.4.0/gw/ota_prov.c Thu Jan 22 17:08:24 2004 -+++ gateway-1.4.0-patched/gw/ota_prov.c Fri Jan 28 17:17:35 2005 +--- gateway-1.4.0/gw/ota_prov.c 2004-01-22 17:08:24.000000000 +0300 ++++ gateway-1.4.0-patched/gw/ota_prov.c 2005-06-20 13:32:51.000000000 +0300 @@ -70,12 +70,16 @@ #include "gwlib/gwlib.h" @@ -588,8 +588,8 @@ diff -Naur gateway-1.4.0/gw/ota_prov.c gateway-1.4.0-patched/gw/ota_prov.c } diff -Naur gateway-1.4.0/gw/ota_prov.h gateway-1.4.0-patched/gw/ota_prov.h ---- gateway-1.4.0/gw/ota_prov.h Thu Jan 22 17:08:24 2004 -+++ gateway-1.4.0-patched/gw/ota_prov.h Fri Jan 28 17:18:20 2005 +--- gateway-1.4.0/gw/ota_prov.h 2004-01-22 17:08:24.000000000 +0300 ++++ gateway-1.4.0-patched/gw/ota_prov.h 2005-01-28 17:18:20.000000000 +0300 @@ -77,7 +77,7 @@ * Return -2 when header error, -1 when compile error, 0 when no error */ @@ -600,8 +600,8 @@ diff -Naur gateway-1.4.0/gw/ota_prov.h gateway-1.4.0-patched/gw/ota_prov.h /* * Tokenizes a given 'ota-setting' group (without using the xml compiler) to diff -Naur gateway-1.4.0/gw/smsbox.c gateway-1.4.0-patched/gw/smsbox.c ---- gateway-1.4.0/gw/smsbox.c Fri Sep 3 15:42:33 2004 -+++ gateway-1.4.0-patched/gw/smsbox.c Tue Feb 8 11:23:25 2005 +--- gateway-1.4.0/gw/smsbox.c 2004-09-03 15:42:33.000000000 +0300 ++++ gateway-1.4.0-patched/gw/smsbox.c 2005-02-08 11:23:25.000000000 +0300 @@ -1210,6 +1210,7 @@ break; @@ -697,8 +697,8 @@ diff -Naur gateway-1.4.0/gw/smsbox.c gateway-1.4.0-patched/gw/smsbox.c msg_destroy(msg); if (r == -2) { diff -Naur gateway-1.4.0/gw/xml_shared.h gateway-1.4.0-patched/gw/xml_shared.h ---- gateway-1.4.0/gw/xml_shared.h Thu Jan 22 17:08:24 2004 -+++ gateway-1.4.0-patched/gw/xml_shared.h Fri Jan 28 17:23:22 2005 +--- gateway-1.4.0/gw/xml_shared.h 2004-01-22 17:08:24.000000000 +0300 ++++ gateway-1.4.0-patched/gw/xml_shared.h 2005-01-28 17:23:22.000000000 +0300 @@ -82,10 +82,11 @@ * XML binary type not containing a string table. This is used for SI and SL. */ @@ -716,8 +716,8 @@ diff -Naur gateway-1.4.0/gw/xml_shared.h gateway-1.4.0-patched/gw/xml_shared.h /* diff -Naur gateway-1.4.0/gwlib/cfg.def gateway-1.4.0-patched/gwlib/cfg.def ---- gateway-1.4.0/gwlib/cfg.def Mon Jun 28 18:18:35 2004 -+++ gateway-1.4.0-patched/gwlib/cfg.def Fri Apr 22 17:11:25 2005 +--- gateway-1.4.0/gwlib/cfg.def 2004-06-28 18:18:35.000000000 +0300 ++++ gateway-1.4.0-patched/gwlib/cfg.def 2005-04-22 17:11:25.000000000 +0300 @@ -544,6 +544,69 @@ OCTSTR(unified-prefix) ) @@ -789,8 +789,8 @@ diff -Naur gateway-1.4.0/gwlib/cfg.def gateway-1.4.0-patched/gwlib/cfg.def #undef SINGLE_GROUP #undef MULTI_GROUP diff -Naur gateway-1.4.0/gwlib/mime.c gateway-1.4.0-patched/gwlib/mime.c ---- gateway-1.4.0/gwlib/mime.c Wed Aug 11 19:41:29 2004 -+++ gateway-1.4.0-patched/gwlib/mime.c Thu Apr 14 08:31:05 2005 +--- gateway-1.4.0/gwlib/mime.c 2004-08-11 19:41:29.000000000 +0300 ++++ gateway-1.4.0-patched/gwlib/mime.c 2005-04-14 08:31:05.000000000 +0300 @@ -191,11 +191,11 @@ value = http_header_value(headers, octstr_imm("Content-Type")); boundary = http_get_header_parameter(value, octstr_imm("boundary")); @@ -869,8 +869,8 @@ diff -Naur gateway-1.4.0/gwlib/mime.c gateway-1.4.0-patched/gwlib/mime.c /******************************************************************** * Routines for debugging purposes. diff -Naur gateway-1.4.0/gwlib/mime.h gateway-1.4.0-patched/gwlib/mime.h ---- gateway-1.4.0/gwlib/mime.h Mon Jan 26 18:04:57 2004 -+++ gateway-1.4.0-patched/gwlib/mime.h Wed Apr 13 17:59:48 2005 +--- gateway-1.4.0/gwlib/mime.h 2004-01-26 18:04:57.000000000 +0300 ++++ gateway-1.4.0-patched/gwlib/mime.h 2005-04-13 17:59:48.000000000 +0300 @@ -141,6 +141,13 @@ Octstr *mime_entity_body(MIMEEntity *m); @@ -885,9 +885,39 @@ diff -Naur gateway-1.4.0/gwlib/mime.h gateway-1.4.0-patched/gwlib/mime.h * Dump the structure (hicharchical view) of the MIME representation * structure into our DEBUG log level facility. */ +diff -Naur gateway-1.4.0/test/test_ppg.c gateway-1.4.0-patched/test/test_ppg.c +--- gateway-1.4.0/test/test_ppg.c 2004-10-13 10:38:13.000000000 +0300 ++++ gateway-1.4.0-patched/test/test_ppg.c 2005-05-31 08:31:10.000000000 +0300 +@@ -81,7 +81,7 @@ + static int verbose = 1, + use_hardcoded = 0, + num_urls = 0, +- wait = 0, ++ xwait = 0, + use_headers = 0, + use_config = 0, + accept_binary = 0, +@@ -648,7 +648,7 @@ + if (i >= max_pushes) + goto receive_rest; + start_push(caller, i); +- if (wait) ++ if (xwait) + gwthread_sleep(wait_seconds); + ++in_queue; + } +@@ -784,7 +784,7 @@ + break; + + case 'i': +- wait = 1; ++ xwait = 1; + wait_seconds = atof(optarg); + break; + diff -Naur gateway-1.4.0/wap/wsp_headers.c gateway-1.4.0-patched/wap/wsp_headers.c ---- gateway-1.4.0/wap/wsp_headers.c Sun Aug 8 23:39:56 2004 -+++ gateway-1.4.0-patched/wap/wsp_headers.c Tue Mar 15 12:26:43 2005 +--- gateway-1.4.0/wap/wsp_headers.c 2004-08-08 23:39:56.000000000 +0300 ++++ gateway-1.4.0-patched/wap/wsp_headers.c 2005-05-30 12:30:46.000000000 +0300 @@ -122,7 +122,7 @@ } else if (val > 127) { *well_known_value = val - 128;