Fix custom-wap-ports patch. The old version generates panic messages when user don't have a "wapbox" group in its configuration file (#126331 comment #6).

(Portage version: 2.0.54)

5 files changed, 75 insertions, 83 deletions

diff --git a/app-mobilephone/kannel/ChangeLog b/app-mobilephone/kannel/ChangeLog
index 2f3b0f77f34c..3fda8421a9dd 100644
--- a/app-mobilephone/kannel/ChangeLog
+++ b/app-mobilephone/kannel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-mobilephone/kannel
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.5 2006/03/25 09:29:03 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.6 2006/05/01 12:18:59 mrness Exp $
+
+*kannel-1.4.0-r2 (01 May 2006)
+
+  01 May 2006; Alin Nastac <mrness@gentoo.org>
+  files/kannel-1.4.0-custom-wap-ports.patch, -kannel-1.4.0-r1.ebuild,
+  +kannel-1.4.0-r2.ebuild:
+  Fix custom-wap-ports patch; the old version generates panic messages when
+  user don't have a "wapbox" group in its configuration file (#126331 comment #6).
 
 *kannel-1.4.0-r1 (25 Mar 2006)
 
diff --git a/app-mobilephone/kannel/Manifest b/app-mobilephone/kannel/Manifest
index 234b786be124..fc56097716ab 100644
--- a/app-mobilephone/kannel/Manifest
+++ b/app-mobilephone/kannel/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6de3b0e5cffd0eb81f3ed25b0ebbc829 ChangeLog 1047
 MD5 a7c05f05df99dd759d119b393cbe59e0 files/digest-kannel-1.4.0 66
-MD5 a7c05f05df99dd759d119b393cbe59e0 files/digest-kannel-1.4.0-r1 66
-MD5 0f567adfb816974f954e319e21b24893 files/kannel-1.4.0-custom-wap-ports.patch 13297
+MD5 a7c05f05df99dd759d119b393cbe59e0 files/digest-kannel-1.4.0-r2 66
+MD5 9a9bf197d1994c344f78068b5af722a4 files/kannel-1.4.0-custom-wap-ports.patch 13271
 MD5 600c73cb97d9ffdce59537ee94229ee7 files/kannel-1.4.0-mysql-list.patch 7291
 MD5 b77f55cded4c364d155c302e81eb07c6 files/kannel-confd 366
 MD5 0b79d37344165b8743061f68a18959ce files/kannel-initd 1529
-MD5 d4dddefe4665121700b76b846b3fbf10 kannel-1.4.0-r1.ebuild 2332
+MD5 d4dddefe4665121700b76b846b3fbf10 kannel-1.4.0-r2.ebuild 2332
 MD5 b66c40044356888f58a83e491406a6fc kannel-1.4.0.ebuild 2264
 MD5 8e6557d777542beebd0e35c01bdc156c metadata.xml 389
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEJQ1xjG8pv1lIUX4RAoXpAJ9f75G8cqSxqtZCtImrpKKx1VbPkgCglZdv
-blLTGys1fCKrVNlKjU4Ejss=
-=aCAu
------END PGP SIGNATURE-----
diff --git a/app-mobilephone/kannel/files/digest-kannel-1.4.0-r1 b/app-mobilephone/kannel/files/digest-kannel-1.4.0-r2
index 6c95c81880b6..6c95c81880b6 100644
--- a/app-mobilephone/kannel/files/digest-kannel-1.4.0-r1
+++ b/app-mobilephone/kannel/files/digest-kannel-1.4.0-r2
diff --git a/app-mobilephone/kannel/files/kannel-1.4.0-custom-wap-ports.patch b/app-mobilephone/kannel/files/kannel-1.4.0-custom-wap-ports.patch
index efc5dcf1cb7a..f53553648184 100644
--- a/app-mobilephone/kannel/files/kannel-1.4.0-custom-wap-ports.patch
+++ b/app-mobilephone/kannel/files/kannel-1.4.0-custom-wap-ports.patch
@@ -1,6 +1,6 @@
-diff -r -u -N gateway-1.4.0.orig/gw/bb_udp.c gateway-1.4.0/gw/bb_udp.c
---- gateway-1.4.0.orig/gw/bb_udp.c	2004-05-15 10:16:01.000000000 +0200
-+++ gateway-1.4.0/gw/bb_udp.c	2006-03-15 21:08:52.000000000 +0100
+diff -Nru gateway-1.4.0.orig/gw/bb_udp.c gateway-1.4.0/gw/bb_udp.c
+--- gateway-1.4.0.orig/gw/bb_udp.c	2004-05-15 11:16:01.000000000 +0300
++++ gateway-1.4.0/gw/bb_udp.c	2006-05-01 14:24:31.219193000 +0300
 @@ -78,7 +78,7 @@
  #include "gwlib/gwlib.h"
  #include "msg.h"
@@ -28,9 +28,9 @@ diff -r -u -N gateway-1.4.0.orig/gw/bb_udp.c gateway-1.4.0/gw/bb_udp.c
          }
  #else
          if (allow_wtls)
-diff -r -u -N gateway-1.4.0.orig/gw/bearerbox.c gateway-1.4.0/gw/bearerbox.c
---- gateway-1.4.0.orig/gw/bearerbox.c	2004-06-28 17:48:29.000000000 +0200
-+++ gateway-1.4.0/gw/bearerbox.c	2006-03-15 21:08:52.000000000 +0100
+diff -Nru gateway-1.4.0.orig/gw/bearerbox.c gateway-1.4.0/gw/bearerbox.c
+--- gateway-1.4.0.orig/gw/bearerbox.c	2004-06-28 18:48:29.000000000 +0300
++++ gateway-1.4.0/gw/bearerbox.c	2006-05-01 14:24:31.223193250 +0300
 @@ -77,6 +77,7 @@
  #include "bearerbox.h"
  #include "shared.h"
@@ -55,10 +55,10 @@ diff -r -u -N gateway-1.4.0.orig/gw/bearerbox.c gateway-1.4.0/gw/bearerbox.c
      /* defaults: use localtime and markers for access-log */
      lf = m = 1;
  	
-diff -r -u -N gateway-1.4.0.orig/gw/custports.c gateway-1.4.0/gw/custports.c
---- gateway-1.4.0.orig/gw/custports.c	1970-01-01 01:00:00.000000000 +0100
-+++ gateway-1.4.0/gw/custports.c	2006-03-15 21:08:52.000000000 +0100
-@@ -0,0 +1,94 @@
+diff -Nru gateway-1.4.0.orig/gw/custports.c gateway-1.4.0/gw/custports.c
+--- gateway-1.4.0.orig/gw/custports.c	1970-01-01 02:00:00.000000000 +0200
++++ gateway-1.4.0/gw/custports.c	2006-05-01 14:26:36.815042250 +0300
+@@ -0,0 +1,88 @@
 +/* ==================================================================== 
 + * The Kannel Software License, Version 1.0 
 + * 
@@ -135,27 +135,21 @@ diff -r -u -N gateway-1.4.0.orig/gw/custports.c gateway-1.4.0/gw/custports.c
 +{
 +    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);
-+    }
++        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);
-+    }
++        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);
-+    }
++        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);
-+    }    
++        info(0, "Using custom WSP/WTP/WTLS port %ld", port_wtps);
 +}
-diff -r -u -N gateway-1.4.0.orig/gw/custports.h gateway-1.4.0/gw/custports.h
---- gateway-1.4.0.orig/gw/custports.h	1970-01-01 01:00:00.000000000 +0100
-+++ gateway-1.4.0/gw/custports.h	2006-03-15 21:08:52.000000000 +0100
+diff -Nru gateway-1.4.0.orig/gw/custports.h gateway-1.4.0/gw/custports.h
+--- gateway-1.4.0.orig/gw/custports.h	1970-01-01 02:00:00.000000000 +0200
++++ gateway-1.4.0/gw/custports.h	2006-05-01 14:24:31.223193250 +0300
 @@ -0,0 +1,77 @@
 +/* ==================================================================== 
 + * The Kannel Software License, Version 1.0 
@@ -234,46 +228,9 @@ diff -r -u -N gateway-1.4.0.orig/gw/custports.h gateway-1.4.0/gw/custports.h
 +void ReadCustomPorts(Cfg *config);
 +#endif /* CUSTPORTS_H */
 +
-diff -r -u -N gateway-1.4.0.orig/gw/wap_push_ppg.c gateway-1.4.0/gw/wap_push_ppg.c
---- gateway-1.4.0.orig/gw/wap_push_ppg.c	2004-06-20 20:26:16.000000000 +0200
-+++ gateway-1.4.0/gw/wap_push_ppg.c	2006-03-15 21:08:52.000000000 +0100
-@@ -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,
-@@ -1767,10 +1768,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 -r -u -N gateway-1.4.0.orig/gw/wap_push_ppg.h gateway-1.4.0/gw/wap_push_ppg.h
---- gateway-1.4.0.orig/gw/wap_push_ppg.h	2004-01-22 15:08:24.000000000 +0100
-+++ gateway-1.4.0/gw/wap_push_ppg.h	2006-03-15 21:08:52.000000000 +0100
-@@ -167,9 +167,7 @@
-  */
- enum {
-     CONNECTIONLESS_PUSH_CLIPORT = 2948,
--    CONNECTIONLESS_SERVPORT = 9200,
-     CONNECTED_CLIPORT = 9209,
--    CONNECTED_SERVPORT = 9201
- };
- 
- struct PPGSessionMachine {
-diff -r -u -N gateway-1.4.0.orig/gw/wapbox.c gateway-1.4.0/gw/wapbox.c
---- gateway-1.4.0.orig/gw/wapbox.c	2004-08-28 20:09:19.000000000 +0200
-+++ gateway-1.4.0/gw/wapbox.c	2006-03-15 21:08:52.000000000 +0100
+diff -Nru gateway-1.4.0.orig/gw/wapbox.c gateway-1.4.0/gw/wapbox.c
+--- gateway-1.4.0.orig/gw/wapbox.c	2004-08-28 21:09:19.000000000 +0300
++++ gateway-1.4.0/gw/wapbox.c	2006-05-01 14:24:31.223193250 +0300
 @@ -84,17 +84,11 @@
  #include "gwlib/pki.h"
  #endif
@@ -344,9 +301,46 @@ diff -r -u -N gateway-1.4.0.orig/gw/wapbox.c gateway-1.4.0/gw/wapbox.c
  	} else {
  	    warning(0, "Received other message than wdp/admin, ignoring!");
  	}
-diff -r -u -N gateway-1.4.0.orig/gwlib/cfg.def gateway-1.4.0/gwlib/cfg.def
---- gateway-1.4.0.orig/gwlib/cfg.def	2004-06-28 17:18:35.000000000 +0200
-+++ gateway-1.4.0/gwlib/cfg.def	2006-03-15 21:09:14.000000000 +0100
+diff -Nru gateway-1.4.0.orig/gw/wap_push_ppg.c gateway-1.4.0/gw/wap_push_ppg.c
+--- gateway-1.4.0.orig/gw/wap_push_ppg.c	2004-06-20 21:26:16.000000000 +0300
++++ gateway-1.4.0/gw/wap_push_ppg.c	2006-05-01 14:24:31.223193250 +0300
+@@ -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,
+@@ -1767,10 +1768,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.0.orig/gw/wap_push_ppg.h gateway-1.4.0/gw/wap_push_ppg.h
+--- gateway-1.4.0.orig/gw/wap_push_ppg.h	2004-01-22 16:08:24.000000000 +0200
++++ gateway-1.4.0/gw/wap_push_ppg.h	2006-05-01 14:24:31.223193250 +0300
+@@ -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.0.orig/gwlib/cfg.def gateway-1.4.0/gwlib/cfg.def
+--- gateway-1.4.0.orig/gwlib/cfg.def	2004-06-28 18:18:35.000000000 +0300
++++ gateway-1.4.0/gwlib/cfg.def	2006-05-01 14:24:31.227193500 +0300
 @@ -148,6 +148,10 @@
      OCTSTR(http-interface-name)
      OCTSTR(concatenation)
diff --git a/app-mobilephone/kannel/kannel-1.4.0-r1.ebuild b/app-mobilephone/kannel/kannel-1.4.0-r2.ebuild
index 649c5887481a..5cd98ca59cad 100644
--- a/app-mobilephone/kannel/kannel-1.4.0-r1.ebuild
+++ b/app-mobilephone/kannel/kannel-1.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/kannel-1.4.0-r1.ebuild,v 1.1 2006/03/25 09:29:03 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/kannel-1.4.0-r2.ebuild,v 1.1 2006/05/01 12:18:59 mrness Exp $
 inherit eutils
 
 DESCRIPTION="Powerful SMS and WAP gateway"