Version bump wrt bug 391705, also fix doc build wrt bug 306131

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

4 files changed, 486 insertions, 18 deletions

diff --git a/app-mobilephone/kannel/ChangeLog b/app-mobilephone/kannel/ChangeLog
index dee178fc7e55..80c676c6e4ad 100644
--- a/app-mobilephone/kannel/ChangeLog
+++ b/app-mobilephone/kannel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/kannel
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.26 2012/12/02 08:24:43 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.27 2013/08/25 19:54:39 creffett Exp $
+
+*kannel-1.5.0 (25 Aug 2013)
+
+  25 Aug 2013; Chris Reffett <creffett@gentoo.org>
+  +files/kannel-1.5.0-custom-wap-ports.patch, +kannel-1.5.0.ebuild:
+  Version bump wrt bug 391705, also fix doc build wrt bug 306131
 
   02 Dec 2012; Ulrich Müller <ulm@gentoo.org> kannel-1.4.3-r1.ebuild:
   Update LICENSE, this is identical with the Apache-1.1 license, bug 444848.
@@ -116,4 +122,3 @@
   16 May 2005; Alin Nastac <mrness@gentoo.org> +files/kannel-confd,
   +files/kannel-initd, +metadata.xml, +kannel-1.4.0.ebuild:
   Initial import from bug #30749.
-
diff --git a/app-mobilephone/kannel/Manifest b/app-mobilephone/kannel/Manifest
index d2eb6b60face..341447a2f320 100644
--- a/app-mobilephone/kannel/Manifest
+++ b/app-mobilephone/kannel/Manifest
@@ -6,29 +6,24 @@ AUX kannel-1.4.1-nolex.patch 672 SHA256 237a6ea2f2e39657ba49c0ee34d660e060bea941
 AUX kannel-1.4.3-autotools.patch 952 SHA256 3e04fdf52e6dbc10da2edee7776fc35254aafea3467d168aabf30f9ca65b0443 SHA512 ff449047fa16d6274682e0c1ccb5741187d397345bdc28bdcdf9aea4c4329d572e63066a75433191a1128302cf529d186a1d493bbc0d9e7de4ff271b59413f4b WHIRLPOOL d94fe887c54c917a5c8e36c08f0ff2900176139ad87489e7b3d0724591ada06cfa5f527a801ac7c718016fc1b146b6038107412b8797f03af1c2801cfb099bba
 AUX kannel-1.4.3-custom-wap-ports.patch 13135 SHA256 f2873ee0950ccc9f512cde0262a64aca3aaab02ce7a12b94df7365630afb229b SHA512 5b4830e2c148926cf85e071933e356bc6d82c0e469a6a0887eef65fb95151e7bb864258087783283239cc1dc28fb92637269ea8984a87f1aab3846d00bc4c188 WHIRLPOOL c4cd58e11ed9c88e7cc1c76f11066384023235fa44b55f88faf6a31c67c7cf3cb066b460278fff6e97bd854cee2cb9ea0ada6974a57ed87464d4f43196ae8959
 AUX kannel-1.4.3-external-libuuid.patch 19830 SHA256 5aac0108ed74ff3b50170c25c098521e00ca0d8bb361e9e77418f2c5c1f52d85 SHA512 e810d87f5aba6651a87aa3b959780115ed643253b120c2d4da13a7a7fe0cb9ca264e4303aa402ff1401200b9649a663dd203355c3384b28c4152b72b2a2916a2 WHIRLPOOL 376a1303aeff276172224201acda6deea175f706247eeeb58534b7b870d01ff5d5b7d59194f6dbaddf4a9ee69654fe8aa827a39c10e89be54b6fcc3993933559
+AUX kannel-1.5.0-custom-wap-ports.patch 13161 SHA256 024874118ccb7ff2d0a4a42229b3639910bec6bbc02b6d251097303599392aa3 SHA512 cd71a435feadb43533ed06cf0a1f9e556131f5339951cc1971c9ebf922a5e028b390af978441d7d3fde68022f9c67fe3af69be737d9952614486613f7ba29d23 WHIRLPOOL 42761c282c1ea2016b81b3cc2939c21655a0ab24f5a79401a0fa6c404741bc8cc414d874c1cae2dbf1e00ce30adc41a4413cee029debfa1b16d56ba60bef5f60
 AUX kannel-bearerbox.initd 936 SHA256 4ef0a7a2f62ad9253f4bcd2dfc54cefe2f31a4ed14b046b45e1a7bb08cdb204b SHA512 ede0ad9aee34919ff0ba5a85d7fdba28d52752b0107de4cc47e62ebfb33d28bac649ab4949309a4e3359307d78275b40ede02b90dca4ef52ed14d2299c8d6dfd WHIRLPOOL c280dc32c03d8139a14e057a622c659021dcbc00fc24afe63f19aa0d568ad1494ece845a4f5e4f3ba2fc4819de09ff1644e34941db3ae98ab2bb6cde03d74794
 AUX kannel-confd 366 SHA256 78afde2b41edad9338894b2eab5968c2c93a2a657745d0bb8d2d1ba401d7cee0 SHA512 042840638cc5166cf6a76d76c7b6c96aa3c77648a50f4e316195d564fde47a9ad3d6b66d5283175f8f2053171ae785772609b49f8db88579a0bfcda757ecbe0a WHIRLPOOL 1a8611821fe02798a9b58bf86be586a79d7999abc88683dbc29498c2571d1c1259f0f09a17363e32d18e5948d2529d0d6fab80c34cd6bdd7a31fd75be70fe9bb
 AUX kannel-initd 1529 SHA256 a1b0587fddd348c31ad2e02822e32b1389339b531259ddd84050447e2b9f9e6a SHA512 56248ae17a1d6ff6f9f0d295079c4ba0079afac4375944c6373082f0a50d00cd9858a5ef5cfe0334a8ad2cfa21984d3ab3cfba6b4f35b4cbd6e12c772321b3e1 WHIRLPOOL 6657f5a8289af7cdd9ca3c8805df694a314cd7711674d7424a5a91f2915d4dc9ecc6358391c325d078a670850f8d0381e519bae68887d3b96dea209ddecf92cb
 AUX kannel-smsbox.initd 918 SHA256 01381241fd0140fb70723dad1f3ac2e2bedeb65806a0341d7fb8cd677bea0167 SHA512 826b277191dd1645fc7fc74ae246a941b4558be3b46953a346e58b01a0205180c0afb6a45e330620b8b9f572c5aed10b67d2c1d4904b5ef4bea54b6fb57d0392 WHIRLPOOL ab14edc1b58d4a9c1dacf3413589ef898f1b931839e66b317a772789246537dbb85e87c64bc4273f25c63cb014a19d6e8bfb070a067ed64b7076977670e43b77
 AUX kannel-wapbox.initd 918 SHA256 f7eb826f46cd216eaf2e03e4e8470556ab835baa8fe8704bb4e9d61b5f3b49b6 SHA512 81ace04e2251c448f4bc8acba4f482d16316bb9cdc0fa750a274af41a23f9ca5da88124d15339021028159c3e8832fe348c6d175615d0f20f57e4d61a8772a2c WHIRLPOOL 17174306c6589393920810605b3fb6d62a824eb48fb8178cdf94ea71d715b02492450f8cadd7fd18efa7edb383f68a954d515ad023eeb67ef2b394848a701c82
 DIST gateway-1.4.3.tar.gz 2654925 SHA256 9e247f4168290973d799d580472494a89a2cf22db035550f6423868b5bf78a07 SHA512 2e727cd3f57ba5af815f1c029dd9125db17b4f980bb555c20cde693e03226f52e1d2969a3d262e0dda1198cbddd3cc1d2f708aaa623f656d91aef686f4925dae WHIRLPOOL 2830599a7184b52b653d77fec03614e3e09e518e4bf0cb7fe87c5a7640341f01a7dfb0904c406fc0628b60a7b63be291c39ec8b0cfd16d56def171761f81d7bb
+DIST gateway-1.5.0.tar.gz 3469476 SHA256 9613fbf46ffaca322f3983a9b8a7579b135c54b8dd24cf715777da5ff50c5e53 SHA512 5bd35ff40e0f5882367f717e67104a0dc8703b5d6d95654e1268ded15cf6fac6366968b10adbe2eec22b3ac17fe3ae33b4142cd38f51fd3d75a56c8fe7653652 WHIRLPOOL d813da05f572e69c1619483c68a06f0587f8e191b1d71973fd9b63c22b8749169ae02963b48cfeae980aff1628f0b2c72a0ce9a82f4f7eecb5dc93cec0f2d2d7
 EBUILD kannel-1.4.3-r1.ebuild 3108 SHA256 08be32f3afb93d1f7feab972deb143f9ecba97821bd1780be982a6fa83bf9f7c SHA512 68d759ef36f71197d03484cc147776c8918b187ab0b82681d4c69513791211c4ffa10f6fd3f93d5be82171a3fa34f67d9d13f543406b992cdb59ca265640e939 WHIRLPOOL f0c834def63ea4a4a31722a6fb6b330ba2ad2a14a5d337f7e53c46cb7d85868e0e4d9ffb8ac054739f29c8432340bdbc0fbd9e3b205c0b74ab5c4193c37f0202
-MISC ChangeLog 4525 SHA256 1b27da51033eacbc60e66d159ec58a330a24a1978b5a1212fd64059e4a5379d2 SHA512 7f8c601cb3b9b50518ccaba84c2cb6a9416aab924bad649ec199bf36379ec9d0ca8350835ebc66dffc9d15d2e649df7625c033848853709e0167e0863c2d2e7b WHIRLPOOL b1eb6f2b2982da231b8b13245c26d403c9b46b5b6393bbfc21a4d81fc2a5d5b33f55d039da46e61b51cc366f79c240959d912ce9242c17936d20825785321344
+EBUILD kannel-1.5.0.ebuild 3136 SHA256 5076d872120bb801dd697fd14ea8f2da8c62bb0a6d737e9683b67aefc4d3e02f SHA512 427ba4b01f11dbb291b372f51ee87a7ee31a9b09ffc74fd2d376ba768d73135968151083fe76df47608887c96c140ff7b2f1c489f6dddfc28c71913e67c57491 WHIRLPOOL 1dce9a23e3e27eb0c32e8177ecf176d6ad8bb377c434da1441f2f2e90530123db606c3a1867228e33c541d4c7287e636aebddd93c8db55ae800eb1177f9a9199
+MISC ChangeLog 4743 SHA256 9ae7ae027e06794efc7dfa99ab565c78505b94670959484fef327845d5afe254 SHA512 8130e35cc79246256a18097b9cc464a19c763ae830904646e15987855822b228f83187acaba5896ab36c2a9dcd271bbd77eced106204b356afe3d17a5ea10cf0 WHIRLPOOL 928aa0ab36f275f273b60b05509bf458b22eef7c0a978386e8bea7e43f845a9d13cac78568ee9fb98f2fa63656c8fe7914f9d7bd0b6a36a08daa1c664cf6d979
 MISC metadata.xml 389 SHA256 16236241363c791f472a403615d4cf12b0126967113605edce57329771795d61 SHA512 088487b92f4c22596884b0cb20e3f82c3ac8c1cca2020edf770b1895a3a8b0e6c83af8c7b16b0174008ac60e913862f8ed413fbbeadd78144cab1e19cf2d158b WHIRLPOOL fd4181d94b043df8e20204b189003e68c82e879f6cd8efab567eb549d095307915701954bf59a80ac154e157bc75ff651381eee060f4c36dbf3a5a6a1d60bca2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQuxCgAAoJEDxpGckxwJCBFPwQALz+afPMTwe+RVW4SjhuvIru
-8NHEmIm0P0XADMxF7a6LKfmwA33GnaZvKyZD3yph1iUGQjp5UgPQlaVfFjHbXKrS
-aLx7IJgqjIZzhZfLlru+YLVVa3HutJcq3JFbLa9QmlsDRa9hRmhyamG6YYOkWsrY
-9x5V7cHzQB0uQDttT/bI3JCZDPVAOsNbTUevjGiC9sFl0y9QtFT0MOdnGr/M47qL
-UldGmapmn1IeHaeRMR/YQ8d6sZBanquXFZBjL7Ud5R/guyqiB9TUc770gPCwGTA8
-u6022hWVxH6cilFDfXdzNleNVMBwfkO6JxVZn+HpOZhoJTMSqB8Nqlrnpmh68ghP
-0ldAwKqvJry/81C6GmMtb76vW8vCJBAx9MoIfR2ajY1M4BPb21WrkdVAT7zHYUp/
-XoKllw9+I1V2Vd/dP9JJQ1hB9VrZcNfwmnf5oNRw6gxAysxrwfBYCVzNdkH36SUN
-zOg4SdeBWZc8g/hIa5ojMR6Ksjk05nxRyLMV+bhrXdQQ6sQGl845+vXeQ5tRpTlW
-TDu1n4x6eWaG7S5kg4bL5RDSRSfF9TnxzZNWARMfdk/M4p7fuVDSXLWAeuNbAR1n
-S0ZtOdSKd6feVVNlg3LW4VAmbe+cda6XfSMkErriq9uj13LkDXt7E3cTvzLVFFdm
-+SZV0xcTc+qVKSCYpXJR
-=eoXF
+iKYEAREIAGYFAlIaYQxfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1RMAgCgp9/MuvnEV2oNyh2rX30ULIJu
+bAEAniru4n1pAKy5rg6VMAIJzgKYE7vW
+=/rfm
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/kannel/files/kannel-1.5.0-custom-wap-ports.patch b/app-mobilephone/kannel/files/kannel-1.5.0-custom-wap-ports.patch
new file mode 100644
index 000000000000..63981f985989
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-1.5.0-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 -ruN gateway-1.5.0/gwlib/cfg.def gateway-1.5.0-patched/gwlib/cfg.def
+--- gateway-1.5.0.orig/gwlib/cfg.def 2010-10-07 10:03:35.000000000 -0400
++++ gateway-1.5.0/gwlib/cfg.def 2013-08-25 15:07:47.544662379 -0400
+@@ -160,6 +160,10 @@
+     OCTSTR(concatenation)
+     OCTSTR(max-messages)
+     OCTSTR(wml-strict)
++    OCTSTR(wsp-port)
++    OCTSTR(wtp-port)
++    OCTSTR(wsps-port)
++    OCTSTR(wtps-port)
+     OCTSTR(http-timeout)
+ )
+
diff --git a/app-mobilephone/kannel/kannel-1.5.0.ebuild b/app-mobilephone/kannel/kannel-1.5.0.ebuild
new file mode 100644
index 000000000000..729b44c31550
--- /dev/null
+++ b/app-mobilephone/kannel/kannel-1.5.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/kannel-1.5.0.ebuild,v 1.1 2013/08/25 19:54:39 creffett Exp $
+
+EAPI=5
+WANT_AUTOMAKE=none
+
+inherit eutils autotools flag-o-matic ssl-cert user
+
+DESCRIPTION="Powerful SMS and WAP gateway"
+HOMEPAGE="http://www.kannel.org/"
+SRC_URI="http://www.kannel.org/download/${PV}/gateway-${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc mysql pam pcre postgres sqlite ssl"
+
+RESTRICT="test" # some tests fail with "address already in use"
+
+RDEPEND="sys-libs/e2fsprogs-libs
+	dev-libs/libxml2
+	dev-lang/perl
+	sys-libs/zlib
+	ssl? ( dev-libs/openssl )
+	mysql? ( virtual/mysql )
+	sqlite? ( dev-db/sqlite:3 )
+	postgres? ( dev-db/postgresql-server )
+	pcre? ( dev-libs/libpcre )
+	pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-2.2
+	doc? ( media-gfx/transfig
+		app-text/jadetex
+		app-text/docbook-dsssl-stylesheets
+		app-text/docbook-sgml-dtd:3.1 )
+"
+
+S="${WORKDIR}/gateway-${PV}"
+
+pkg_setup() {
+	enewgroup kannel
+	enewuser kannel -1 -1 /var/log/kannel kannel
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.5.0-custom-wap-ports.patch"
+	epatch "${FILESDIR}/${PN}-1.4.3-autotools.patch"
+	epatch "${FILESDIR}/${PN}-1.4.3-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/${PF} \
+		--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"
+}
+
+# phase disabled by RESTRICT
+# src_test() {
+# 	emake check || die "emake check failed"
+# }
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use doc; then
+		emake -j1 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
+
+	local f
+	for f in bearerbox smsbox wapbox; do
+		newinitd "${FILESDIR}/kannel-$f.initd" kannel-$f
+	done
+
+	diropts -g kannel -m0770
+	keepdir /var/log/kannel /var/run/kannel
+}
+
+pkg_postinst() {
+	if use ssl; then
+		elog "SSL certificate can be created by running"
+		elog "   emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_config() {
+	if use ssl; then
+		if install_cert /etc/ssl/kannel; then
+			chown kannel "${ROOT}"etc/ssl/kannel.{pem,key}
+			einfo "For using this certificate, you have to add following line to your kannel.conf:"
+			einfo '   ssl-client-certkey-file = "/etc/ssl/kannel.pem"'
+			einfo '   ssl-server-cert-file = "/etc/ssl/kannel.crt"'
+			einfo '   ssl-server-key-file = "/etc/ssl/kannel.key"'
+		fi
+	else
+		eerror "This phase exists only for creating kannel SSL certificate"
+		eerror "and ssl USE flag is disabled for this package!"
+	fi
+}