Set LICENSE to Kannel.

Version bump.
Disable sqlite2 support.
Use libuuid installed by e2fsprogs-libs (#252857).
Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

7 files changed, 1340 insertions, 11 deletions

diff --git a/app-mobilephone/kannel/ChangeLog b/app-mobilephone/kannel/ChangeLog
index 9afcc0e1b313..894b568728ab 100644
--- a/app-mobilephone/kannel/ChangeLog
+++ b/app-mobilephone/kannel/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-mobilephone/kannel
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.17 2008/06/24 00:31:46 mrness Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.18 2009/03/01 16:04:24 mrness Exp $
+
+*kannel-1.4.3 (01 Mar 2009)
+
+  01 Mar 2009; Alin Năstac <mrness@gentoo.org>
+  +files/kannel-1.4.3-custom-wap-ports.patch,
+  +files/kannel-1.4.3-external-libuuid.patch,
+  +files/kannel-1.4.3-nolex.patch, kannel-1.4.1.ebuild,
+  +kannel-1.4.3.ebuild:
+  Set LICENSE to Kannel. Version bump. Disable sqlite2 support. Use libuuid
+  installed by e2fsprogs-libs (#252857).
 
   24 Jun 2008; Alin Năstac <mrness@gentoo.org>
   +files/kannel-1.4.1-nolex.patch, kannel-1.4.1.ebuild:
diff --git a/app-mobilephone/kannel/Manifest b/app-mobilephone/kannel/Manifest
index 84bced811729..26ea05a5f3a8 100644
--- a/app-mobilephone/kannel/Manifest
+++ b/app-mobilephone/kannel/Manifest
@@ -3,16 +3,21 @@ Hash: SHA1
 
 AUX kannel-1.4.1-custom-wap-ports.patch 13266 RMD160 6d390b206dfbcc3e8749447ac6e419d9b67bcd0c SHA1 04bc815e29831450dfb1709f50480140b696ec01 SHA256 e0959fd25dd41fc2aa01b488fc70b0d29d1ab66aed1151de60fcc9e84e50512f
 AUX kannel-1.4.1-nolex.patch 672 RMD160 2f7a63ed9a1e456aa99c914f401ebbf3c15cfb95 SHA1 b85d28d36cdf21120bac3afb61c5687a8f09126a SHA256 237a6ea2f2e39657ba49c0ee34d660e060bea94117e861f9f970b283c6cccb08
+AUX kannel-1.4.3-custom-wap-ports.patch 13135 RMD160 3ed3e21dd787b0d1dd667054061275713208c3c2 SHA1 95e2495138efe877b7e0e6c36a85b947a988cd1f SHA256 f2873ee0950ccc9f512cde0262a64aca3aaab02ce7a12b94df7365630afb229b
+AUX kannel-1.4.3-external-libuuid.patch 19830 RMD160 77a15da084c97264b5513715c54b0c880198ddfa SHA1 2b188f0eedc11fb4ee97505c0f82a48039e0a804 SHA256 5aac0108ed74ff3b50170c25c098521e00ca0d8bb361e9e77418f2c5c1f52d85
+AUX kannel-1.4.3-nolex.patch 693 RMD160 08c4b5606359bb8b13695da5323dda302fd44108 SHA1 7bbb4c0b27c17283457c7e259c57667f45ee7125 SHA256 8e7368f20453ba43d985cf93b9067472f3f375f3551dfdce6cb2cd8826c08ab3
 AUX kannel-confd 366 RMD160 7036907a3695a279dc3c9622cf081273834ba666 SHA1 89335740ca0fc412bf3ca994aed27dc00f8f9371 SHA256 78afde2b41edad9338894b2eab5968c2c93a2a657745d0bb8d2d1ba401d7cee0
 AUX kannel-initd 1529 RMD160 285dbe2b181f356ef8ad5365bf32bd1bad2e4a62 SHA1 573851c2219a676dd42f8a6a7ac21e4dcd49dd85 SHA256 a1b0587fddd348c31ad2e02822e32b1389339b531259ddd84050447e2b9f9e6a
 DIST gateway-1.4.1.tar.gz 2596267 RMD160 45523a5aa23711a607e1ccf46eb4584897784fbe SHA1 4699aa3e6689a420bce24bba2356eb63e0767895 SHA256 0a70a1507883cba9bd44a0de39a04d3480f9781359a79f6f662020862270e44b
-EBUILD kannel-1.4.1.ebuild 2423 RMD160 8f21e3f359c16a031ba7d9134905536ff17f5baa SHA1 e7a201ed1cda4bb84c5763fe5414af88b4903982 SHA256 096d5532790d370aef76c03b61855f6ab22e7ca66831a1d6665eb3948c82bfe4
-MISC ChangeLog 2886 RMD160 c58db3f8d0046a477bd490dd0ae02d7603a12fef SHA1 ec8c906f17a666137dffc7692b53d7ba9aa45264 SHA256 f7f6efb319925455da2ad19652289fc56d99768ee45f756121779ceeefdb6a3b
+DIST gateway-1.4.3.tar.gz 2654925 RMD160 92642cb7b3a5233993f3743f76dd54d90dcd3202 SHA1 9fe54f29bfa94964b181a3b1d96fc00e002ec34f SHA256 9e247f4168290973d799d580472494a89a2cf22db035550f6423868b5bf78a07
+EBUILD kannel-1.4.1.ebuild 2427 RMD160 f9668e3a112980e57d663e1afa9946e8f3c8f7e7 SHA1 3c87a693404926f11d47820f394d2ce8c694fb98 SHA256 be2bf1b0078f59ab795dd432467a5fa49d13d1a686e8d37520c7bb3c59ff216a
+EBUILD kannel-1.4.3.ebuild 2449 RMD160 c80096165cfb2670bf7db4ff1561f47ddbb83298 SHA1 f9f96f92f51b1f3b75bb9822c74682c0c955741d SHA256 de5f24ff982f833b8f50d46acbdcda26f33b3561b1b7c46158081d8dc3e598b3
+MISC ChangeLog 3253 RMD160 fb51fb192fcf9aef240bf630767a9c92cef0bc18 SHA1 0c625e7e50945ac91bf1e10512b0e1d2835dcdbe SHA256 83a8e0ceea78abbb697b50ded0f3f36cbfea952fdc9b9b24d2c0ad6a3e8c36a1
 MISC metadata.xml 389 RMD160 fc509383c09f88b4215f7cee07d3512647d0fddc SHA1 3fdf094c4c9ee7f53ebb752c3fa3f74b2e2c2efc SHA256 16236241363c791f472a403615d4cf12b0126967113605edce57329771795d61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkhgQLgACgkQ+fWpoTWIA9Hv+ACgj53U1p1T1DHQDkpEN6bjLhhV
-W30Ani0o6Nc/QY/BjnnNpgfHp0aJUuw+
-=05l6
+iEYEARECAAYFAkmqsh4ACgkQts85UDFmaOVEjwCfQZEp/6fKR3bWKnx5xhu0X6ZE
+l68Aniwo5rf6Q8D19a/+8T7aJuHvRQuz
+=MZXc
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/kannel/files/kannel-1.4.3-custom-wap-ports.patch b/app-mobilephone/kannel/files/kannel-1.4.3-custom-wap-ports.patch
new file mode 100644
index 000000000000..e1992b08319a
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-1.4.3-custom-wap-ports.patch
@@ -0,0 +1,346 @@
+diff -Nru gateway-1.4.3.orig/gw/bb_udp.c gateway-1.4.3/gw/bb_udp.c
+--- gateway-1.4.3.orig/gw/bb_udp.c	2009-01-12 16:46:56.000000000 +0000
++++ gateway-1.4.3/gw/bb_udp.c	2009-03-01 14:20:38.000000000 +0000
+@@ -78,7 +78,7 @@
+ #include "gwlib/gwlib.h"
+ #include "msg.h"
+ #include "bearerbox.h"
+-
++#include "custports.h"
+ /* passed from bearerbox core */
+ 
+ extern volatile sig_atomic_t bb_status;
+@@ -352,13 +352,13 @@
+     while (gwlist_len(ifs) > 0) {
+         iface = gwlist_extract_first(ifs);
+ 	info(0, "Adding interface %s", octstr_get_cstr(iface));
+-        add_service(9200, octstr_get_cstr(iface));   /* wsp 	*/
+-        add_service(9201, octstr_get_cstr(iface));   /* wsp/wtp	*/
++        add_service(port_wsp, octstr_get_cstr(iface));   /* wsp 	*/
++        add_service(port_wtp, octstr_get_cstr(iface));   /* wsp/wtp	*/
+     
+ #ifdef HAVE_WTLS_OPENSSL
+         if (allow_wtls) {
+-             add_service(9202, octstr_get_cstr(iface));   /* wsp/wtls	*/
+-             add_service(9203, octstr_get_cstr(iface));   /* wsp/wtp/wtls */
++             add_service(port_wsps, octstr_get_cstr(iface));   /* wsp/wtls	*/
++             add_service(port_wtps, octstr_get_cstr(iface));   /* wsp/wtp/wtls */
+         }
+ #else
+         if (allow_wtls)
+diff -Nru gateway-1.4.3.orig/gw/bearerbox.c gateway-1.4.3/gw/bearerbox.c
+--- gateway-1.4.3.orig/gw/bearerbox.c	2009-01-12 16:46:56.000000000 +0000
++++ gateway-1.4.3/gw/bearerbox.c	2009-03-01 14:23:05.000000000 +0000
+@@ -78,6 +78,7 @@
+ #include "shared.h"
+ #include "dlr.h"
+ #include "load.h"
++#include "custports.h"
+ 
+ /* global variables; included to other modules as needed */
+ 
+@@ -365,6 +366,7 @@
+     int ssl_enabled = 0;
+ #endif /* HAVE_LIBSSL */
+ 
++    ReadCustomPorts(cfg);
+     /* defaults: use localtime and markers for access-log */
+     lf = m = 1;
+ 	
+diff -Nru gateway-1.4.3.orig/gw/custports.c gateway-1.4.3/gw/custports.c
+--- gateway-1.4.3.orig/gw/custports.c	1970-01-01 00:00:00.000000000 +0000
++++ gateway-1.4.3/gw/custports.c	2009-03-01 14:20:38.000000000 +0000
+@@ -0,0 +1,88 @@
++/* ==================================================================== 
++ * The Kannel Software License, Version 1.0 
++ * 
++ * Copyright (c) 2001-2004 Kannel Group  
++ * Copyright (c) 1998-2001 WapIT Ltd.   
++ * All rights reserved. 
++ * 
++ * Redistribution and use in source and binary forms, with or without 
++ * modification, are permitted provided that the following conditions 
++ * are met: 
++ * 
++ * 1. Redistributions of source code must retain the above copyright 
++ *    notice, this list of conditions and the following disclaimer. 
++ * 
++ * 2. Redistributions in binary form must reproduce the above copyright 
++ *    notice, this list of conditions and the following disclaimer in 
++ *    the documentation and/or other materials provided with the 
++ *    distribution. 
++ * 
++ * 3. The end-user documentation included with the redistribution, 
++ *    if any, must include the following acknowledgment: 
++ *       "This product includes software developed by the 
++ *        Kannel Group (http://www.kannel.org/)." 
++ *    Alternately, this acknowledgment may appear in the software itself, 
++ *    if and wherever such third-party acknowledgments normally appear. 
++ * 
++ * 4. The names "Kannel" and "Kannel Group" must not be used to 
++ *    endorse or promote products derived from this software without 
++ *    prior written permission. For written permission, please  
++ *    contact org@kannel.org. 
++ * 
++ * 5. Products derived from this software may not be called "Kannel", 
++ *    nor may "Kannel" appear in their name, without prior written 
++ *    permission of the Kannel Group. 
++ * 
++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 
++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
++ * DISCLAIMED.  IN NO EVENT SHALL THE KANNEL GROUP OR ITS CONTRIBUTORS 
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,  
++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  
++ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR  
++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  
++ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
++ * ==================================================================== 
++ * 
++ * This software consists of voluntary contributions made by many 
++ * individuals on behalf of the Kannel Group.  For more information on  
++ * the Kannel Group, please see <http://www.kannel.org/>. 
++ * 
++ * Portions of this software are based upon software originally written at  
++ * WapIT Ltd., Helsinki, Finland for the Kannel project.  
++ */ 
++
++/*
++ * gw/custports.c
++ *
++ * Implementation of reading custom UDP ports used by wapbox
++ *
++ * Lubor Kolar <kolar@porcus.cz>, 14.03.2006
++ */
++ 
++#include <custports.h>
++
++long port_wsp = 9200; // connectionless default
++long port_wtp = 9201; // connection-oriented default
++long port_wsps = 9202; // connectionless secure default
++long port_wtps = 9203; // connection-oriented secure
++
++
++void ReadCustomPorts(Cfg *config)
++{
++    CfgGroup *grp;
++    grp = cfg_get_single_group(config, octstr_imm("wapbox"));
++    if(grp == NULL)
++        return;
++	         
++    if(cfg_get_integer(&port_wsp, grp, octstr_imm("wsp-port")) != -1)
++        info(0, "Using custom WSP port %ld", port_wsp);
++    if(cfg_get_integer(&port_wtp, grp, octstr_imm("wtp-port")) != -1)
++        info(0, "Using custom WSP/WTP port %ld", port_wtp);
++    if(cfg_get_integer(&port_wsps, grp, octstr_imm("wsps-port")) != -1)
++        info(0, "Using custom WSP/WTLS port %ld", port_wsps);
++    if(cfg_get_integer(&port_wtps, grp, octstr_imm("wtps-port")) != -1)
++        info(0, "Using custom WSP/WTP/WTLS port %ld", port_wtps);
++}
+diff -Nru gateway-1.4.3.orig/gw/custports.h gateway-1.4.3/gw/custports.h
+--- gateway-1.4.3.orig/gw/custports.h	1970-01-01 00:00:00.000000000 +0000
++++ gateway-1.4.3/gw/custports.h	2009-03-01 14:20:38.000000000 +0000
+@@ -0,0 +1,77 @@
++/* ==================================================================== 
++ * The Kannel Software License, Version 1.0 
++ * 
++ * Copyright (c) 2001-2004 Kannel Group  
++ * Copyright (c) 1998-2001 WapIT Ltd.   
++ * All rights reserved. 
++ * 
++ * Redistribution and use in source and binary forms, with or without 
++ * modification, are permitted provided that the following conditions 
++ * are met: 
++ * 
++ * 1. Redistributions of source code must retain the above copyright 
++ *    notice, this list of conditions and the following disclaimer. 
++ * 
++ * 2. Redistributions in binary form must reproduce the above copyright 
++ *    notice, this list of conditions and the following disclaimer in 
++ *    the documentation and/or other materials provided with the 
++ *    distribution. 
++ * 
++ * 3. The end-user documentation included with the redistribution, 
++ *    if any, must include the following acknowledgment: 
++ *       "This product includes software developed by the 
++ *        Kannel Group (http://www.kannel.org/)." 
++ *    Alternately, this acknowledgment may appear in the software itself, 
++ *    if and wherever such third-party acknowledgments normally appear. 
++ * 
++ * 4. The names "Kannel" and "Kannel Group" must not be used to 
++ *    endorse or promote products derived from this software without 
++ *    prior written permission. For written permission, please  
++ *    contact org@kannel.org. 
++ * 
++ * 5. Products derived from this software may not be called "Kannel", 
++ *    nor may "Kannel" appear in their name, without prior written 
++ *    permission of the Kannel Group. 
++ * 
++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 
++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
++ * DISCLAIMED.  IN NO EVENT SHALL THE KANNEL GROUP OR ITS CONTRIBUTORS 
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,  
++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  
++ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR  
++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  
++ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
++ * ==================================================================== 
++ * 
++ * This software consists of voluntary contributions made by many 
++ * individuals on behalf of the Kannel Group.  For more information on  
++ * the Kannel Group, please see <http://www.kannel.org/>. 
++ * 
++ * Portions of this software are based upon software originally written at  
++ * WapIT Ltd., Helsinki, Finland for the Kannel project.  
++ */ 
++
++/*
++ * gw/custports.h
++ *
++ * Implementation of wapbox custom UDP ports)
++ *
++ * Lubor Kolar <kolar@porcus.cz>, 14.03.2006
++ */
++
++#ifndef	CUSTPORTS_H
++#define	CUSTPORTS_H
++
++#include "gwlib/gwlib.h"
++
++extern long port_wsp; // connectionless 
++extern long port_wtp; // connection-oriented
++extern long port_wsps; // connectionless secure
++extern long port_wtps; // connection-oriented secure
++
++void ReadCustomPorts(Cfg *config);
++#endif /* CUSTPORTS_H */
++
+diff -Nru gateway-1.4.3.orig/gw/wapbox.c gateway-1.4.3/gw/wapbox.c
+--- gateway-1.4.3.orig/gw/wapbox.c	2009-01-12 16:46:57.000000000 +0000
++++ gateway-1.4.3/gw/wapbox.c	2009-03-01 14:20:38.000000000 +0000
+@@ -84,17 +84,11 @@
+ #include "gwlib/pki.h"
+ #endif
+ #include "radius/radius_acct.h"
++#include "custports.h"
+ 
+ static void config_reload(int reload);
+ static long logfilelevel=-1;
+ 
+-enum {
+-    CONNECTIONLESS_PORT = 9200,
+-    CONNECTION_ORIENTED_PORT = 9201,
+-    WTLS_CONNECTIONLESS_PORT = 9202,
+-    WTLS_CONNECTION_ORIENTED_PORT = 9203
+-};
+-
+ enum { DEFAULT_TIMER_FREQ = 1};
+ 
+ static Octstr *bearerbox_host;
+@@ -131,6 +125,8 @@
+ 
+     cfg_dump(cfg);
+     
++    ReadCustomPorts(cfg);
++    
+     /*
+      * Extract info from the core group.
+      */
+@@ -776,9 +772,9 @@
+ 	     * XXXX here should be suspend/resume, add RSN
+ 	     */
+ 	} else if (msg_type(msg) == wdp_datagram) {
+-        switch (msg->wdp_datagram.destination_port) {
+-        case CONNECTIONLESS_PORT:
+-        case CONNECTION_ORIENTED_PORT:
++	if(msg->wdp_datagram.destination_port == port_wsp 
++	   || msg->wdp_datagram.destination_port == port_wtp)
++	{
+ 	    	dgram = wap_event_create(T_DUnitdata_Ind);
+ 	    	dgram->u.T_DUnitdata_Ind.addr_tuple = wap_addr_tuple_create(
+ 				msg->wdp_datagram.source_address,
+@@ -789,19 +785,22 @@
+ 	    	msg->wdp_datagram.user_data = NULL;
+ 
+           	wap_dispatch_datagram(dgram); 
+-			break;
+-        case WTLS_CONNECTIONLESS_PORT:
+-        case WTLS_CONNECTION_ORIENTED_PORT:
++	}
++	else
++	if(msg->wdp_datagram.destination_port == port_wsps 
++	   || msg->wdp_datagram.destination_port == port_wtps)
++	{
+ #if (HAVE_WTLS_OPENSSL)
+             dgram = wtls_unpack_wdp_datagram(msg);
+             if (dgram != NULL)
+                 wtls_dispatch_event(dgram);
+ #endif
+-			break;
+-        default:
++	}
++        else
++	{
+                 panic(0,"Bad packet received! This shouldn't happen!");
+                 break;
+-        } 
++        } 	
+ 	} else {
+ 	    warning(0, "Received other message than wdp/admin, ignoring!");
+ 	}
+diff -Nru gateway-1.4.3.orig/gw/wap_push_ppg.c gateway-1.4.3/gw/wap_push_ppg.c
+--- gateway-1.4.3.orig/gw/wap_push_ppg.c	2009-01-12 16:46:56.000000000 +0000
++++ gateway-1.4.3/gw/wap_push_ppg.c	2009-03-01 14:20:38.000000000 +0000
+@@ -88,6 +88,7 @@
+ #include "wap_push_pap_compiler.h"
+ #include "wap_push_pap_mime.h"
+ #include "wap_push_ppg_pushuser.h"
++#include "custports.h"
+ 
+ enum {
+     TIME_EXPIRED = 0,
+@@ -1779,10 +1780,10 @@
+ 
+     if (!cless_accepted) {
+         cliport = CONNECTED_CLIPORT;
+-        servport = CONNECTED_SERVPORT;
++        servport = port_wtp;
+     } else {
+         cliport = CONNECTIONLESS_PUSH_CLIPORT;
+-        servport = CONNECTIONLESS_SERVPORT;
++        servport = port_wsp;
+     }
+     
+     address_type = (**e).u.Push_Message.address_type;
+diff -Nru gateway-1.4.3.orig/gw/wap_push_ppg.h gateway-1.4.3/gw/wap_push_ppg.h
+--- gateway-1.4.3.orig/gw/wap_push_ppg.h	2009-01-12 16:46:57.000000000 +0000
++++ gateway-1.4.3/gw/wap_push_ppg.h	2009-03-01 14:20:38.000000000 +0000
+@@ -167,9 +167,7 @@
+  */
+ enum {
+     CONNECTIONLESS_PUSH_CLIPORT = 2948,
+-    CONNECTIONLESS_SERVPORT = 9200,
+     CONNECTED_CLIPORT = 9209,
+-    CONNECTED_SERVPORT = 9201
+ };
+ 
+ struct PPGSessionMachine {
+diff -Nru gateway-1.4.3.orig/gwlib/cfg.def gateway-1.4.3/gwlib/cfg.def
+--- gateway-1.4.3.orig/gwlib/cfg.def	2009-01-12 16:46:55.000000000 +0000
++++ gateway-1.4.3/gwlib/cfg.def	2009-03-01 14:20:38.000000000 +0000
+@@ -159,6 +159,10 @@
+     OCTSTR(concatenation)
+     OCTSTR(max-messages)
+     OCTSTR(wml-strict)
++    OCTSTR(wsp-port)
++    OCTSTR(wtp-port)
++    OCTSTR(wsps-port)
++    OCTSTR(wtps-port)
+ )
+ 
+ 
diff --git a/app-mobilephone/kannel/files/kannel-1.4.3-external-libuuid.patch b/app-mobilephone/kannel/files/kannel-1.4.3-external-libuuid.patch
new file mode 100644
index 000000000000..a29f2c3a8333
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-1.4.3-external-libuuid.patch
@@ -0,0 +1,849 @@
+diff -Nru gateway-1.4.3.orig/configure.in gateway-1.4.3/configure.in
+--- gateway-1.4.3.orig/configure.in	2009-03-01 14:42:03.000000000 +0000
++++ gateway-1.4.3/configure.in	2009-03-01 15:06:37.000000000 +0000
+@@ -173,6 +173,9 @@
+ AC_ARG_WITH(libs,
+ [  --with-libs=FLAGS       use FLAGS for extra libraries],
+ LIBS="$LIBS $withval")
++CFLAGS="$CFLAGS -I/usr/include/uuid"
++LIBS="$LIBS -luuid"
++
+ 
+ dnl Check whether compiler supports inline
+ AC_C_INLINE
+@@ -1226,7 +1229,7 @@
+ dnl Final Output
+ 
+ AC_CONFIG_SECTION([Generating output files]) 
+-AC_OUTPUT(gwlib/gw_uuid_types.h Makefile)
++AC_OUTPUT(Makefile)
+ 
+ 
+ dnl LICENSE notice
+diff -Nru gateway-1.4.3.orig/gwlib/gwlib.c gateway-1.4.3/gwlib/gwlib.c
+--- gateway-1.4.3.orig/gwlib/gwlib.c	2009-01-12 16:46:54.000000000 +0000
++++ gateway-1.4.3/gwlib/gwlib.c	2009-03-01 15:01:36.000000000 +0000
+@@ -79,7 +79,6 @@
+ {
+     gw_assert(!init);
+     gw_init_mem();
+-    uuid_init();
+     octstr_init();
+     gwlib_protected_init();
+     gwthread_init();
+@@ -100,7 +99,6 @@
+     gwthread_shutdown();
+     octstr_shutdown();
+     gwlib_protected_shutdown();
+-    uuid_shutdown();
+     cfg_shutdown();
+     gw_check_leaks();
+     log_shutdown();
+diff -Nru gateway-1.4.3.orig/gwlib/gwlib.h gateway-1.4.3/gwlib/gwlib.h
+--- gateway-1.4.3.orig/gwlib/gwlib.h	2009-01-12 16:46:55.000000000 +0000
++++ gateway-1.4.3/gwlib/gwlib.h	2009-03-01 15:01:56.000000000 +0000
+@@ -100,10 +100,12 @@
+ #include "semaphore.h"
+ #include "xmlrpc.h"
+ #include "md5.h"
+-#include "gw_uuid.h"
++#include <uuid.h>
+ #include "gw-rwlock.h"
+ #include "gw-prioqueue.h"
+ 
++#define UUID_STR_LEN 36
++
+ void gwlib_assert_init(void);
+ void gwlib_init(void);
+ void gwlib_shutdown(void);
+diff -Nru gateway-1.4.3.orig/gwlib/gw_uuid.c gateway-1.4.3/gwlib/gw_uuid.c
+--- gateway-1.4.3.orig/gwlib/gw_uuid.c	2004-01-05 16:37:10.000000000 +0000
++++ gateway-1.4.3/gwlib/gw_uuid.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,632 +0,0 @@
+-/*
+- * clear.c -- Clear a UUID
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-
+-/*
+- * Force inclusion of SVID stuff since we need it if we're compiling in
+- * gcc-wall wall mode
+- */
+-#ifndef _SVID_SOURCE
+-#define _SVID_SOURCE
+-#endif
+-
+-#include "gw-config.h"
+-
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
+-#ifdef HAVE_STDLIB_H
+-#include <stdlib.h>
+-#endif
+-#include <string.h>
+-#include <ctype.h>
+-#include <fcntl.h>
+-#include <errno.h>
+-#include <sys/types.h>
+-#include <sys/time.h>
+-#include <sys/stat.h>
+-#include <sys/file.h>
+-#ifdef HAVE_SYS_IOCTL_H
+-#include <sys/ioctl.h>
+-#endif
+-#ifdef HAVE_SYS_SOCKET_H
+-#include <sys/socket.h>
+-#endif
+-#ifdef HAVE_SYS_SOCKIO_H
+-#include <sys/sockio.h>
+-#endif
+-#ifdef HAVE_NET_IF_H
+-#include <net/if.h>
+-#endif
+-#ifdef HAVE_NETINET_IN_H
+-#include <netinet/in.h>
+-#endif
+-#include <stdio.h>
+-
+-#include "gwlib/gw_uuid_types.h"
+-#include "gwlib/gw_uuid.h"
+-
+-/*
+- * Offset between 15-Oct-1582 and 1-Jan-70
+- */
+-#define TIME_OFFSET_HIGH 0x01B21DD2
+-#define TIME_OFFSET_LOW  0x13814000
+-
+-struct uuid {
+-        __u32   time_low;
+-        __u16   time_mid;
+-        __u16   time_hi_and_version;
+-        __u16   clock_seq;
+-        __u8    node[6];
+-};
+-
+-
+-/*
+- * prototypes
+- */
+-static void uuid_pack(const struct uuid *uu, uuid_t ptr);
+-static void uuid_unpack(const uuid_t in, struct uuid *uu);
+-static int get_random_fd(void);
+-
+-
+-#ifdef HAVE_SRANDOM
+-#define srand(x) 	srandom(x)
+-#define rand() 		random()
+-#endif
+-
+-
+-
+-void uuid_init(void)
+-{
+-    /* 
+-     * open random device if any.
+-     * We should do it here because otherwise it's
+-     * possible that we open device twice.
+-     */
+-    get_random_fd();
+-}
+-
+-
+-void uuid_shutdown(void)
+-{
+-    int fd = get_random_fd();
+-
+-    if (fd > 0)
+-        close(fd);
+-}
+-
+-void uuid_clear(uuid_t uu)
+-{
+-	memset(uu, 0, 16);
+-}
+-
+-/*
+- * compare.c --- compare whether or not two UUID's are the same
+- *
+- * Returns an integer less than, equal to, or greater than zero if
+- * uu1 respectively, to be less than, to match, or be greater than
+- * uu2.
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-#define UUCMP(u1,u2) if (u1 != u2) return((u1 < u2) ? -1 : 1);
+-
+-int uuid_compare(const uuid_t uu1, const uuid_t uu2)
+-{
+-	struct uuid	uuid1, uuid2;
+-
+-	uuid_unpack(uu1, &uuid1);
+-	uuid_unpack(uu2, &uuid2);
+-
+-	UUCMP(uuid1.time_low, uuid2.time_low);
+-	UUCMP(uuid1.time_mid, uuid2.time_mid);
+-	UUCMP(uuid1.time_hi_and_version, uuid2.time_hi_and_version);
+-	UUCMP(uuid1.clock_seq, uuid2.clock_seq);
+-	return memcmp(uuid1.node, uuid2.node, 6);
+-}
+-
+-/*
+- * copy.c --- copy UUIDs
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-void uuid_copy(uuid_t dst, const uuid_t src)
+-{
+-	unsigned char		*cp1;
+-	const unsigned char	*cp2;
+-	int			i;
+-
+-	for (i=0, cp1 = dst, cp2 = src; i < 16; i++)
+-		*cp1++ = *cp2++;
+-}
+-
+-
+-/*
+- * gen_uuid.c --- generate a DCE-compatible uuid
+- *
+- * Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-static int get_random_fd(void)
+-{
+-	struct timeval	tv;
+-	static int	fd = -2;
+-	int		i;
+-
+-	if (fd == -2) {
+-		gettimeofday(&tv, 0);
+-		fd = open("/dev/urandom", O_RDONLY);
+-		if (fd == -1)
+-			fd = open("/dev/random", O_RDONLY | O_NONBLOCK);
+-		srand((getpid() << 16) ^ getuid() ^ tv.tv_sec ^ tv.tv_usec);
+-	}
+-	/* Crank the random number generator a few times */
+-	gettimeofday(&tv, 0);
+-	for (i = (tv.tv_sec ^ tv.tv_usec) & 0x1F; i > 0; i--)
+-		rand();
+-
+-	return fd;
+-}
+-
+-
+-/*
+- * Generate a series of random bytes.  Use /dev/urandom if possible,
+- * and if not, use srandom/random.
+- */
+-static void get_random_bytes(void *buf, int nbytes)
+-{
+-	int i, n = nbytes, fd = get_random_fd();
+-	int lose_counter = 0;
+-	unsigned char *cp = (unsigned char *) buf;
+-
+-	if (fd >= 0) {
+-		while (n > 0) {
+-			i = read(fd, cp, n);
+-			if (i <= 0) {
+-				if (lose_counter++ > 16)
+-					break;
+-				continue;
+-			}
+-			n -= i;
+-			cp += i;
+-			lose_counter = 0;
+-		}
+-	}
+-	
+-	/*
+-	 * We do this all the time, but this is the only source of
+-	 * randomness if /dev/random/urandom is out to lunch.
+-	 */
+-	for (cp = buf, i = 0; i < nbytes; i++)
+-		*cp++ ^= (rand() >> 7) & 0xFF;
+-	return;
+-}
+-
+-/*
+- * Get the ethernet hardware address, if we can find it...
+- */
+-static int get_node_id(unsigned char *node_id)
+-{
+-#ifdef HAVE_NET_IF_H
+-	int 		sd;
+-	struct ifreq 	ifr, *ifrp;
+-	struct ifconf 	ifc;
+-	char buf[1024];
+-	int		n, i;
+-	unsigned char 	*a;
+-	
+-/*
+- * BSD 4.4 defines the size of an ifreq to be
+- * max(sizeof(ifreq), sizeof(ifreq.ifr_name)+ifreq.ifr_addr.sa_len
+- * However, under earlier systems, sa_len isn't present, so the size is 
+- * just sizeof(struct ifreq)
+- */
+-#ifdef HAVE_SA_LEN
+-#ifndef max
+-#define max(a,b) ((a) > (b) ? (a) : (b))
+-#endif
+-#define ifreq_size(i) max(sizeof(struct ifreq),\
+-     sizeof((i).ifr_name)+(i).ifr_addr.sa_len)
+-#else
+-#define ifreq_size(i) sizeof(struct ifreq)
+-#endif /* HAVE_SA_LEN*/
+-
+-	sd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+-	if (sd < 0) {
+-		return -1;
+-	}
+-	memset(buf, 0, sizeof(buf));
+-	ifc.ifc_len = sizeof(buf);
+-	ifc.ifc_buf = buf;
+-	if (ioctl (sd, SIOCGIFCONF, (char *)&ifc) < 0) {
+-		close(sd);
+-		return -1;
+-	}
+-	n = ifc.ifc_len;
+-	for (i = 0; i < n; i+= ifreq_size(*ifr) ) {
+-		ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
+-		strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);
+-#ifdef SIOCGIFHWADDR
+-		if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
+-			continue;
+-		a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
+-#else
+-#ifdef SIOCGENADDR
+-		if (ioctl(sd, SIOCGENADDR, &ifr) < 0)
+-			continue;
+-		a = (unsigned char *) ifr.ifr_enaddr;
+-#else
+-		/*
+-		 * XXX we don't have a way of getting the hardware
+-		 * address
+-		 */
+-		close(sd);
+-		return 0;
+-#endif /* SIOCGENADDR */
+-#endif /* SIOCGIFHWADDR */
+-		if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5])
+-			continue;
+-		if (node_id) {
+-			memcpy(node_id, a, 6);
+-			close(sd);
+-			return 1;
+-		}
+-	}
+-	close(sd);
+-#endif
+-	return 0;
+-}
+-
+-/* Assume that the gettimeofday() has microsecond granularity */
+-#define MAX_ADJUSTMENT 10
+-
+-static int get_clock(__u32 *clock_high, __u32 *clock_low, __u16 *ret_clock_seq)
+-{
+-	static int			adjustment = 0;
+-	static struct timeval		last = {0, 0};
+-	static __u16			clock_seq;
+-	struct timeval 			tv;
+-	unsigned long long		clock_reg;
+-	
+-try_again:
+-	gettimeofday(&tv, 0);
+-	if ((last.tv_sec == 0) && (last.tv_usec == 0)) {
+-		get_random_bytes(&clock_seq, sizeof(clock_seq));
+-		clock_seq &= 0x1FFF;
+-		last = tv;
+-		last.tv_sec--;
+-	}
+-	if ((tv.tv_sec < last.tv_sec) ||
+-	    ((tv.tv_sec == last.tv_sec) &&
+-	     (tv.tv_usec < last.tv_usec))) {
+-		clock_seq = (clock_seq+1) & 0x1FFF;
+-		adjustment = 0;
+-		last = tv;
+-	} else if ((tv.tv_sec == last.tv_sec) &&
+-	    (tv.tv_usec == last.tv_usec)) {
+-		if (adjustment >= MAX_ADJUSTMENT)
+-			goto try_again;
+-		adjustment++;
+-	} else {
+-		adjustment = 0;
+-		last = tv;
+-	}
+-		
+-	clock_reg = tv.tv_usec*10 + adjustment;
+-	clock_reg += ((unsigned long long) tv.tv_sec)*10000000;
+-	clock_reg += (((unsigned long long) 0x01B21DD2) << 32) + 0x13814000;
+-
+-	*clock_high = clock_reg >> 32;
+-	*clock_low = clock_reg;
+-	*ret_clock_seq = clock_seq;
+-	return 0;
+-}
+-
+-void uuid_generate_time(uuid_t out)
+-{
+-	static unsigned char node_id[6];
+-	static int has_init = 0;
+-	struct uuid uu;
+-	__u32	clock_mid;
+-
+-	if (!has_init) {
+-		if (get_node_id(node_id) <= 0) {
+-			get_random_bytes(node_id, 6);
+-			/*
+-			 * Set multicast bit, to prevent conflicts
+-			 * with IEEE 802 addresses obtained from
+-			 * network cards
+-			 */
+-			node_id[0] |= 0x80;
+-		}
+-		has_init = 1;
+-	}
+-	get_clock(&clock_mid, &uu.time_low, &uu.clock_seq);
+-	uu.clock_seq |= 0x8000;
+-	uu.time_mid = (__u16) clock_mid;
+-	uu.time_hi_and_version = (clock_mid >> 16) | 0x1000;
+-	memcpy(uu.node, node_id, 6);
+-	uuid_pack(&uu, out);
+-}
+-
+-void uuid_generate_random(uuid_t out)
+-{
+-	uuid_t	buf;
+-	struct uuid uu;
+-
+-	get_random_bytes(buf, sizeof(buf));
+-	uuid_unpack(buf, &uu);
+-
+-	uu.clock_seq = (uu.clock_seq & 0x3FFF) | 0x8000;
+-	uu.time_hi_and_version = (uu.time_hi_and_version & 0x0FFF) | 0x4000;
+-	uuid_pack(&uu, out);
+-}
+-
+-/*
+- * This is the generic front-end to uuid_generate_random and
+- * uuid_generate_time.  It uses uuid_generate_random only if
+- * /dev/urandom is available, since otherwise we won't have
+- * high-quality randomness.
+- */
+-void uuid_generate(uuid_t out)
+-{
+-	if (get_random_fd() >= 0) {
+-		uuid_generate_random(out);
+-	}
+-	else
+-		uuid_generate_time(out);
+-}
+-
+-/*
+- * isnull.c --- Check whether or not the UUID is null
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-/* Returns 1 if the uuid is the NULL uuid */
+-int uuid_is_null(const uuid_t uu)
+-{
+-	const unsigned char 	*cp;
+-	int			i;
+-
+-	for (i=0, cp = uu; i < 16; i++)
+-		if (*cp++)
+-			return 0;
+-	return 1;
+-}
+-
+-/*
+- * Internal routine for packing UUID's
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-void uuid_pack(const struct uuid *uu, uuid_t ptr)
+-{
+-	__u32	tmp;
+-	unsigned char	*out = ptr;
+-
+-	tmp = uu->time_low;
+-	out[3] = (unsigned char) tmp;
+-	tmp >>= 8;
+-	out[2] = (unsigned char) tmp;
+-	tmp >>= 8;
+-	out[1] = (unsigned char) tmp;
+-	tmp >>= 8;
+-	out[0] = (unsigned char) tmp;
+-	
+-	tmp = uu->time_mid;
+-	out[5] = (unsigned char) tmp;
+-	tmp >>= 8;
+-	out[4] = (unsigned char) tmp;
+-
+-	tmp = uu->time_hi_and_version;
+-	out[7] = (unsigned char) tmp;
+-	tmp >>= 8;
+-	out[6] = (unsigned char) tmp;
+-
+-	tmp = uu->clock_seq;
+-	out[9] = (unsigned char) tmp;
+-	tmp >>= 8;
+-	out[8] = (unsigned char) tmp;
+-
+-	memcpy(out+10, uu->node, 6);
+-}
+-
+-/*
+- * parse.c --- UUID parsing
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-int uuid_parse(const char *in, uuid_t uu)
+-{
+-	struct uuid	uuid;
+-	int 		i;
+-	const char	*cp;
+-	char		buf[3];
+-
+-	if (strlen(in) != 36)
+-		return -1;
+-	for (i=0, cp = in; i <= 36; i++,cp++) {
+-		if ((i == 8) || (i == 13) || (i == 18) ||
+-		    (i == 23)) {
+-			if (*cp == '-')
+-				continue;
+-			else
+-				return -1;
+-		}
+-		if (i== 36)
+-			if (*cp == 0)
+-				continue;
+-		if (!isxdigit(*cp))
+-			return -1;
+-	}
+-	uuid.time_low = strtoul(in, NULL, 16);
+-	uuid.time_mid = strtoul(in+9, NULL, 16);
+-	uuid.time_hi_and_version = strtoul(in+14, NULL, 16);
+-	uuid.clock_seq = strtoul(in+19, NULL, 16);
+-	cp = in+24;
+-	buf[2] = 0;
+-	for (i=0; i < 6; i++) {
+-		buf[0] = *cp++;
+-		buf[1] = *cp++;
+-		uuid.node[i] = strtoul(buf, NULL, 16);
+-	}
+-	
+-	uuid_pack(&uuid, uu);
+-	return 0;
+-}
+-	
+-
+-/*
+- * Internal routine for unpacking UUID
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-void uuid_unpack(const uuid_t in, struct uuid *uu)
+-{
+-	const __u8	*ptr = in;
+-	__u32		tmp;
+-
+-	tmp = *ptr++;
+-	tmp = (tmp << 8) | *ptr++;
+-	tmp = (tmp << 8) | *ptr++;
+-	tmp = (tmp << 8) | *ptr++;
+-	uu->time_low = tmp;
+-
+-	tmp = *ptr++;
+-	tmp = (tmp << 8) | *ptr++;
+-	uu->time_mid = tmp;
+-	
+-	tmp = *ptr++;
+-	tmp = (tmp << 8) | *ptr++;
+-	uu->time_hi_and_version = tmp;
+-
+-	tmp = *ptr++;
+-	tmp = (tmp << 8) | *ptr++;
+-	uu->clock_seq = tmp;
+-
+-	memcpy(uu->node, ptr, 6);
+-}
+-
+-/*
+- * unparse.c -- convert a UUID to string
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-void uuid_unparse(const uuid_t uu, char *out)
+-{
+-	struct uuid uuid;
+-
+-	uuid_unpack(uu, &uuid);
+-	sprintf(out,
+-		"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+-		uuid.time_low, uuid.time_mid, uuid.time_hi_and_version,
+-		uuid.clock_seq >> 8, uuid.clock_seq & 0xFF,
+-		uuid.node[0], uuid.node[1], uuid.node[2],
+-		uuid.node[3], uuid.node[4], uuid.node[5]);
+-}
+-
+-/*
+- * uuid_time.c --- Interpret the time field from a uuid.  This program
+- * 	violates the UUID abstraction barrier by reaching into the guts
+- *	of a UUID and interpreting it.
+- * 
+- * Copyright (C) 1998, 1999 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-time_t uuid_time(const uuid_t uu, struct timeval *ret_tv)
+-{
+-	struct uuid		uuid;
+-	__u32			high;
+-	struct timeval		tv;
+-	unsigned long long	clock_reg;
+-
+-	uuid_unpack(uu, &uuid);
+-	
+-	high = uuid.time_mid | ((uuid.time_hi_and_version & 0xFFF) << 16);
+-	clock_reg = uuid.time_low | ((unsigned long long) high << 32);
+-
+-	clock_reg -= (((unsigned long long) 0x01B21DD2) << 32) + 0x13814000;
+-	tv.tv_sec = clock_reg / 10000000;
+-	tv.tv_usec = (clock_reg % 10000000) / 10;
+-
+-	if (ret_tv)
+-		*ret_tv = tv;
+-
+-	return tv.tv_sec;
+-}
+-
+-int uuid_type(const uuid_t uu)
+-{
+-	struct uuid		uuid;
+-
+-	uuid_unpack(uu, &uuid);	
+-	return ((uuid.time_hi_and_version >> 12) & 0xF);
+-}
+-
+-int uuid_variant(const uuid_t uu)
+-{
+-	struct uuid		uuid;
+-	int			var;
+-
+-	uuid_unpack(uu, &uuid);	
+-	var = uuid.clock_seq;
+-
+-	if ((var & 0x8000) == 0)
+-		return UUID_VARIANT_NCS;
+-	if ((var & 0x4000) == 0)
+-		return UUID_VARIANT_DCE;
+-	if ((var & 0x2000) == 0)
+-		return UUID_VARIANT_MICROSOFT;
+-	return UUID_VARIANT_OTHER;
+-}
+-
+diff -Nru gateway-1.4.3.orig/gwlib/gw_uuid.h gateway-1.4.3/gwlib/gw_uuid.h
+--- gateway-1.4.3.orig/gwlib/gw_uuid.h	2005-06-14 09:31:34.000000000 +0000
++++ gateway-1.4.3/gwlib/gw_uuid.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,84 +0,0 @@
+-/*
+- * Public include file for the UUID library
+- * 
+- * Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-
+-#ifndef _UUID_UUID_H
+-#define _UUID_UUID_H
+-
+-#include <sys/types.h>
+-#include <sys/time.h>
+-#include <time.h>
+-
+-#define UUID_STR_LEN 36
+-
+-#ifdef	DARWIN
+-
+-#ifndef _POSIX_C_SOURCE
+-#ifndef _UUID_T
+-#define _UUID_T
+-typedef __darwin_uuid_t		uuid_t;
+-#endif /* _UUID_T */
+-#endif /* _POSIX_C_SOURCE */
+-
+-#else
+-
+-typedef unsigned char uuid_t[16];
+-
+-#endif
+-
+-/* UUID Variant definitions */
+-#define UUID_VARIANT_NCS 	0
+-#define UUID_VARIANT_DCE 	1
+-#define UUID_VARIANT_MICROSOFT	2
+-#define UUID_VARIANT_OTHER	3
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-/* initialize uuid library */
+-void uuid_init(void);
+-
+-/* shutdown uuid library */
+-void uuid_shutdown(void);
+-
+-/* clear.c */
+-void uuid_clear(uuid_t uu);
+-
+-/* compare.c */
+-int uuid_compare(const uuid_t uu1, const uuid_t uu2);
+-
+-/* copy.c */
+-void uuid_copy(uuid_t dst, const uuid_t src);
+-
+-/* gen_uuid.c */
+-void uuid_generate(uuid_t out);
+-void uuid_generate_random(uuid_t out);
+-void uuid_generate_time(uuid_t out);
+-
+-/* isnull.c */
+-int uuid_is_null(const uuid_t uu);
+-
+-/* parse.c */
+-int uuid_parse(const char *in, uuid_t uu);
+-
+-/* unparse.c */
+-void uuid_unparse(const uuid_t uu, char *out);
+-
+-/* uuid_time.c */
+-time_t uuid_time(const uuid_t uu, struct timeval *ret_tv);
+-int uuid_type(const uuid_t uu);
+-int uuid_variant(const uuid_t uu);
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* _UUID_UUID_H */
+diff -Nru gateway-1.4.3.orig/gwlib/gw_uuid_types.h.in gateway-1.4.3/gwlib/gw_uuid_types.h.in
+--- gateway-1.4.3.orig/gwlib/gw_uuid_types.h.in	2003-12-08 11:25:44.000000000 +0000
++++ gateway-1.4.3/gwlib/gw_uuid_types.h.in	1970-01-01 00:00:00.000000000 +0000
+@@ -1,51 +0,0 @@
+-/* 
+- * If linux/types.h is already been included, assume it has defined
+- * everything we need.  (cross fingers)  Other header files may have 
+- * also defined the types that we need.
+- */
+-#if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
+-	!defined(_UUID_TYPES) && !defined(_EXT2_TYPES_H))
+-#define _UUID_TYPES_H
+-
+-typedef unsigned char __u8;
+-typedef signed char __s8;
+-
+-#if (@SIZEOF_INT@ == 8)
+-typedef int		__s64;
+-typedef unsigned int	__u64;
+-#elif (@SIZEOF_LONG@ == 8)
+-typedef long		__s64;
+-typedef unsigned long	__u64;
+-#elif (@SIZEOF_LONG_LONG@ == 8)
+-#if defined(__GNUC__)
+-typedef __signed__ long long 	__s64;
+-#else
+-typedef signed long long 	__s64;
+-#endif
+-typedef unsigned long long	__u64;
+-#endif
+-
+-#if (@SIZEOF_INT@ == 2)
+-typedef	int		__s16;
+-typedef	unsigned int	__u16;
+-#elif (@SIZEOF_SHORT@ == 2)
+-typedef	short		__s16;
+-typedef	unsigned short	__u16;
+-#else
+-  ?==error: undefined 16 bit type
+-#endif
+-
+-#if (@SIZEOF_INT@ == 4)
+-typedef	int		__s32;
+-typedef	unsigned int	__u32;
+-#elif (@SIZEOF_LONG@ == 4)
+-typedef	long		__s32;
+-typedef	unsigned long	__u32;
+-#elif (@SIZEOF_SHORT@ == 4)
+-typedef	short		__s32;
+-typedef	unsigned short	__u32;
+-#else
+- ?== error: undefined 32 bit type
+-#endif
+-
+-#endif /* _*_TYPES_H */
+diff -Nru gateway-1.4.3.orig/Makefile.in gateway-1.4.3/Makefile.in
+--- gateway-1.4.3.orig/Makefile.in	2009-03-01 14:42:03.000000000 +0000
++++ gateway-1.4.3/Makefile.in	2009-03-01 15:03:45.000000000 +0000
+@@ -322,7 +322,7 @@
+ 	rm -f $(benchoutputs)
+ 
+ distclean: clean
+-	rm -f Makefile gw-config.h config.cache config.log config.status config.nice .depend gwlib/gw_uuid_types.h
++	rm -f Makefile gw-config.h config.cache config.log config.status config.nice .depend
+ 
+ nag:
+ 	utils/find-long-lines
diff --git a/app-mobilephone/kannel/files/kannel-1.4.3-nolex.patch b/app-mobilephone/kannel/files/kannel-1.4.3-nolex.patch
new file mode 100644
index 000000000000..6562ba46e4de
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-1.4.3-nolex.patch
@@ -0,0 +1,22 @@
+diff -Nru gateway-1.4.3.orig/configure.in gateway-1.4.3/configure.in
+--- gateway-1.4.3.orig/configure.in	2009-01-12 16:47:01.000000000 +0000
++++ gateway-1.4.3/configure.in	2009-03-01 14:18:51.000000000 +0000
+@@ -112,7 +112,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AC_PROG_YACC
+-AC_PROG_LEX
+ AC_CHECK_TOOL(AR, ar)
+ AC_PATH_PROG(CONVERT, convert)
+ AC_PATH_PROG(PERL, perl)
+diff -Nru gateway-1.4.3.orig/Makefile.in gateway-1.4.3/Makefile.in
+--- gateway-1.4.3.orig/Makefile.in	2008-06-24 15:05:24.000000000 +0000
++++ gateway-1.4.3/Makefile.in	2009-03-01 14:18:14.000000000 +0000
+@@ -61,7 +61,6 @@
+ SHELL = @SHELL@
+ VERSION = @VERSION@
+ SUFFIX = @SUFFIX@
+-LEX = @LEX@
+ PERL = @PERL@
+ YACC = @YACC@
+ 
diff --git a/app-mobilephone/kannel/kannel-1.4.1.ebuild b/app-mobilephone/kannel/kannel-1.4.1.ebuild
index 06207bb4fd0f..eadf7df1ba9e 100644
--- a/app-mobilephone/kannel/kannel-1.4.1.ebuild
+++ b/app-mobilephone/kannel/kannel-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/kannel-1.4.1.ebuild,v 1.9 2008/06/24 00:32:49 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/kannel-1.4.1.ebuild,v 1.10 2009/03/01 16:04:24 mrness Exp $
 
 WANT_AUTOMAKE=none
 
@@ -10,7 +10,7 @@ DESCRIPTION="Powerful SMS and WAP gateway"
 HOMEPAGE="http://www.kannel.org/"
 SRC_URI="http://www.kannel.org/download/${PV}/gateway-${PV}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="Kannel"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE="ssl mysql sqlite sqlite3 postgres pcre doc debug pam"
diff --git a/app-mobilephone/kannel/kannel-1.4.3.ebuild b/app-mobilephone/kannel/kannel-1.4.3.ebuild
new file mode 100644
index 000000000000..0d983ab4bf58
--- /dev/null
+++ b/app-mobilephone/kannel/kannel-1.4.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/kannel-1.4.3.ebuild,v 1.1 2009/03/01 16:04:24 mrness Exp $
+
+EAPI="2"
+WANT_AUTOMAKE=none
+
+inherit eutils autotools flag-o-matic
+
+DESCRIPTION="Powerful SMS and WAP gateway"
+HOMEPAGE="http://www.kannel.org/"
+SRC_URI="http://www.kannel.org/download/${PV}/gateway-${PV}.tar.gz"
+
+LICENSE="Kannel"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl mysql sqlite postgres pcre doc debug pam"
+
+RDEPEND="sys-libs/e2fsprogs-libs
+	>=dev-libs/libxml2-2.6.26
+	>=dev-lang/perl-5.8.8
+	>=sys-libs/zlib-1.2.3
+	ssl? ( >=dev-libs/openssl-0.9.8d )
+	mysql? ( virtual/mysql )
+	sqlite? ( >=dev-db/sqlite-3.2.1 )
+	postgres? ( virtual/postgresql-server )
+	pcre? ( dev-libs/libpcre )
+	doc? ( media-gfx/transfig
+		app-text/jadetex
+		app-text/docbook-dsssl-stylesheets )
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-2.2"
+
+S="${WORKDIR}/gateway-${PV}"
+
+pkg_setup() {
+	enewgroup kannel
+	enewuser kannel -1 -1 /var/log/kannel kannel
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-custom-wap-ports.patch"
+	epatch "${FILESDIR}/${P}-nolex.patch" # flex is not used
+	epatch "${FILESDIR}/${P}-external-libuuid.patch"
+
+	#by default, use current directory for logging
+	sed -i -e 's:/tmp/::' doc/examples/kannel.conf
+
+	eautoconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing # some code breaks strict aliasing
+	econf --docdir=/usr/share/doc/${P} \
+		--enable-localtime \
+		--disable-start-stop-daemon \
+		--without-sqlite2 \
+		$(use_enable pam) \
+		$(use_enable debug debug) \
+		$(use_enable pcre) \
+		$(use_enable doc docs) \
+		$(use_enable ssl) \
+		$(use_with mysql) \
+		$(use_with sqlite sqlite3) \
+		$(use_with postgres pgsql) \
+		|| die "econf failed"
+}
+
+src_test() {
+	emake check || die "make check failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" install-docs || die "emake install-docs failed"
+	fi
+	dodoc README
+
+	diropts -g kannel -m0750
+	dodir /etc/kannel
+	insinto /etc/kannel
+	newins doc/examples/kannel.conf kannel.conf.sample
+	newins doc/examples/modems.conf modems.conf.sample
+	use mysql && newins doc/examples/dlr-mysql.conf dlr-mysql.conf.sample
+
+	diropts -g kannel -m0770
+	keepdir /var/log/kannel
+
+	newinitd "${FILESDIR}/kannel-initd" kannel
+	newconfd "${FILESDIR}/kannel-confd" kannel
+}