View | Details | Raw Unified | Return to bug 119375
Collapse All | Expand All

(-)gatekeeper/Makefile (-1 / +1 lines)
Lines 8-14 Link Here
8 
PORTNAME=	gatekeeper
 8 
PORTNAME=	gatekeeper
9 
#PORTVERSION=	2.2.4
 9 
#PORTVERSION=	2.2.4
10 
DISTVERSION=	2.2.4
 10 
DISTVERSION=	2.2.4
11 
PORTREVISION=	1
 11 
PORTREVISION=	2
12 
CATEGORIES=	net
 12 
CATEGORIES=	net
13 
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 13 
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
14 
MASTER_SITE_SUBDIR=	openh323gk
 14 
MASTER_SITE_SUBDIR=	openh323gk
(-)gatekeeper/files/patch-Routing-cxx (+12 lines)
Line 0 Link Here
1 
diff -ruN gatekeeper.old/work/gnugk-2.2.4/Routing.cxx gatekeeper/work/gnugk-2.2.4/Routing.cxx
2 
--- Routing.cxx.old	2006-05-24 14:04:42.000000000 -0400
3 
+++ Routing.cxx	2008-01-05 22:25:51.000000000 -0500
4 
@@ -966,7 +966,7 @@
5 
 	for (PINDEX i = 0; i < kv.GetSize(); i++) {
6 
 		const PString &val = kv.GetDataAt(i);
7
8 
-		m_prefixes[i].m_prefix = kv.GetKeyAt(i);
9 
+		m_prefixes[i].m_prefix = string((const char*)(kv.GetKeyAt(i)));
10
11 
 		const PINDEX sepIndex = val.Find(':');
12 
 		if (sepIndex == P_MAX_INDEX) {
(-)gatekeeper/files/patch-addpasswd-cxx (+11 lines)
Line 0 Link Here
1 
diff -ruN addpasswd.cxx.old addpasswd.cxx
2 
--- addpasswd.cxx.old	2006-04-14 09:56:19.000000000 -0400
3 
+++ addpasswd.cxx	2008-01-05 21:55:43.000000000 -0500
4 
@@ -16,6 +16,7 @@
5
6 
 #include <algorithm>
7 
 #include <ptlib.h>
8 
+#include <ptlib/pprocess.h>
9 
 #include <ptclib/cypher.h>
10
11 
 class Client : public PProcess
(-)gatekeeper/files/patch-capctrl-cxx (+22 lines)
Line 0 Link Here
1 
--- capctrl.cxx	2006-01-27 07:59:49.000000000 -0500
2 
+++ capctrl.cxx	2006-12-13 10:34:22.000000000 -0500
3 
@@ -173,8 +173,8 @@
4
5 
 				cliCallVolumes.resize(cliCallVolumes.size() + 1);
6 
 				cliRule = cliCallVolumes.end() - 1;
7 
-				cliRule->first = cli;
8 
-				cliRule->second.m_sourceCLI = cli;
9 
+				cliRule->first = string((const char*)cli);
10 
+				cliRule->second.m_sourceCLI = string((const char*)cli);
11 
 				newCLIRule = true;
12
13 
 				rule = &(cliRule->second);
14 
@@ -201,7 +201,7 @@
15
16 
 			unsigned tno = 0;
17 
 			if (tokens.GetSize() >= 2)
18 
-				rule->m_prefix = tokens[tno++];
19 
+				rule->m_prefix = string((const char*)(tokens[tno++]));
20 
 			rule->m_maxVolume = tokens[tno++].AsUnsigned();
21
22 
 			if (newIpRule)
(-)gatekeeper/files/patch-clirw-cxx (+21 lines)
Line 0 Link Here
1 
--- clirw.cxx	2006-02-20 05:03:23.000000000 -0500
2 
+++ clirw.cxx	2006-12-06 11:35:37.000000000 -0500
3 
@@ -408,7 +408,7 @@
4 
 			if (rule->m_screeningType == RewriteRule::NoScreening) {
5 
 				rule->m_cli.resize(clis.GetSize());
6 
 				for (PINDEX j = 0; j < clis.GetSize(); j++)
7 
-					rule->m_cli[j] = clis[j];
8 
+					rule->m_cli[j] = (string)((const char *)(clis[j]));
9 
 			} else
10 
 				rule->m_cli.clear();
11
12 
@@ -667,6 +667,9 @@
13 
 		++rule;
14 
 	}
15
16 
+	if (rule == ipRule.second.end())
17 
+		return;
18 
+
19 
 	bool isTerminal = false;
20 
 	if (authData && authData->m_call) {
21 
 		endptr callee = authData->m_call->GetCalledParty();
(-)gatekeeper/files/patch-main-cxx (+14 lines)
Line 0 Link Here
1 
diff -ruN main.cxx.old main.cxx
2 
--- main.cxx.old	2004-04-17 07:43:43.000000000 -0400
3 
+++ main.cxx	2008-01-05 21:37:07.000000000 -0500
4 
@@ -18,6 +18,10 @@
5
6
7 
 #include <ptlib.h>
8 
+/* the following were expected to be included within ptlib.h
9 
+   but in case they weren't include them explicitly here. */
10 
+#include <ptlib/pprocess.h>
11 
+
12 
 #include "gk.h"
13
14 
 PCREATE_PROCESS(Gatekeeper)

Return to bug 119375