9 files changed, 28 insertions, 103 deletions

diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index 6d770f07e124..0f38d7cd00a6 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	gatekeeper
-#PORTVERSION=	2.2.4
-DISTVERSION=	2.2.4
-PORTREVISION=	4
+#PORTVERSION=	2.2.8
+DISTVERSION=	2.2.8
 CATEGORIES=	net
 MASTER_SITES=	SF/openh323gk/Sources/${PORTVERSION}
 DISTNAME=	gnugk-${DISTVERSION}
diff --git a/net/gatekeeper/distinfo b/net/gatekeeper/distinfo
index 411177ea0e2f..9e6de94f2d6b 100644
--- a/net/gatekeeper/distinfo
+++ b/net/gatekeeper/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnugk-2.2.4.tar.gz) = 34411ede3e0e11b61ff8d79f649dcef6
-SHA256 (gnugk-2.2.4.tar.gz) = 6f1ab26409fcab569f944a5dc1c932faa295dbb6c29d9144ca8cb8d3b306d368
-SIZE (gnugk-2.2.4.tar.gz) = 938275
+SHA256 (gnugk-2.2.8.tar.gz) = 7b1fbc33bdde8c8aa5f427011a3b5acc7804a7c47070c3873365712bdcfe23e3
+SIZE (gnugk-2.2.8.tar.gz) = 1282055
diff --git a/net/gatekeeper/files/patch-Routing-cxx b/net/gatekeeper/files/patch-Routing-cxx
deleted file mode 100644
index 900c61657b21..000000000000
--- a/net/gatekeeper/files/patch-Routing-cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN gatekeeper.old/work/gnugk-2.2.4/Routing.cxx gatekeeper/work/gnugk-2.2.4/Routing.cxx
---- Routing.cxx.old	2006-05-24 14:04:42.000000000 -0400
-+++ Routing.cxx	2008-01-05 22:25:51.000000000 -0500
-@@ -966,7 +966,7 @@
- 	for (PINDEX i = 0; i < kv.GetSize(); i++) {
- 		const PString &val = kv.GetDataAt(i);
- 
--		m_prefixes[i].m_prefix = kv.GetKeyAt(i);
-+		m_prefixes[i].m_prefix = string((const char*)(kv.GetKeyAt(i)));
- 
- 		const PINDEX sepIndex = val.Find(':');
- 		if (sepIndex == P_MAX_INDEX) {
diff --git a/net/gatekeeper/files/patch-Toolkit.cxx b/net/gatekeeper/files/patch-Toolkit.cxx
deleted file mode 100644
index bf964603e589..000000000000
--- a/net/gatekeeper/files/patch-Toolkit.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
---- Toolkit.cxx.orig	Thu Jun 30 12:09:18 2005
-+++ Toolkit.cxx	Thu Jun 30 12:10:07 2005
-@@ -783,18 +783,19 @@
- 		m_Config = new PConfig(m_ConfigFilePath, m_ConfigDefaultSection);
- 	}
- 
--	if (!m_extConfigFilePath)
-+	if (!m_extConfigFilePath) {
- 		PFile::Remove(m_extConfigFilePath);
- 	
--	// generate a unique name
--	do {
--		m_extConfigFilePath = tmpdir + PDIR_SEPARATOR + "gnugk.ini-" + PString(PString::Unsigned, rand()%10000);
--		PTRACE(5, "GK\tTrying file name "<< m_extConfigFilePath << " for external config");
--	} while (PFile::Exists(m_extConfigFilePath));
-+		// generate a unique name
-+		do {
-+			m_extConfigFilePath = tmpdir + PDIR_SEPARATOR + "gnugk.ini-" + PString(PString::Unsigned, rand()%10000);
-+			PTRACE(5, "GK\tTrying file name "<< m_extConfigFilePath << " for external config");
-+		} while (PFile::Exists(m_extConfigFilePath));
- 
--	m_Config = new GatekeeperConfig(
--		m_extConfigFilePath, m_ConfigDefaultSection, m_Config
--		);
-+		m_Config = new GatekeeperConfig(
-+			m_extConfigFilePath, m_ConfigDefaultSection, m_Config
-+			);
-+	}
- }
- 
- void Toolkit::ReloadSQLConfig()
diff --git a/net/gatekeeper/files/patch-addpasswd-cxx b/net/gatekeeper/files/patch-addpasswd-cxx
deleted file mode 100644
index 131f015321a8..000000000000
--- a/net/gatekeeper/files/patch-addpasswd-cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN addpasswd.cxx.old addpasswd.cxx
---- addpasswd.cxx.old	2006-04-14 09:56:19.000000000 -0400
-+++ addpasswd.cxx	2008-01-05 21:55:43.000000000 -0500
-@@ -16,6 +16,7 @@
- 
- #include <algorithm>
- #include <ptlib.h>
-+#include <ptlib/pprocess.h>
- #include <ptclib/cypher.h>
- 
- class Client : public PProcess
diff --git a/net/gatekeeper/files/patch-capctrl-cxx b/net/gatekeeper/files/patch-capctrl-cxx
deleted file mode 100644
index 59301779557e..000000000000
--- a/net/gatekeeper/files/patch-capctrl-cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- capctrl.cxx	2006-01-27 07:59:49.000000000 -0500
-+++ capctrl.cxx	2006-12-13 10:34:22.000000000 -0500
-@@ -173,8 +173,8 @@
- 
- 				cliCallVolumes.resize(cliCallVolumes.size() + 1);
- 				cliRule = cliCallVolumes.end() - 1;
--				cliRule->first = cli;
--				cliRule->second.m_sourceCLI = cli;
-+				cliRule->first = string((const char*)cli);
-+				cliRule->second.m_sourceCLI = string((const char*)cli);
- 				newCLIRule = true;
- 				
- 				rule = &(cliRule->second);
-@@ -201,7 +201,7 @@
- 	
- 			unsigned tno = 0;
- 			if (tokens.GetSize() >= 2)
--				rule->m_prefix = tokens[tno++];
-+				rule->m_prefix = string((const char*)(tokens[tno++]));
- 			rule->m_maxVolume = tokens[tno++].AsUnsigned();
- 			
- 			if (newIpRule)
diff --git a/net/gatekeeper/files/patch-clirw-cxx b/net/gatekeeper/files/patch-clirw-cxx
deleted file mode 100644
index 83dfb35c8f34..000000000000
--- a/net/gatekeeper/files/patch-clirw-cxx
+++ /dev/null
@@ -1,21 +0,0 @@
---- clirw.cxx	2006-02-20 05:03:23.000000000 -0500
-+++ clirw.cxx	2006-12-06 11:35:37.000000000 -0500
-@@ -408,7 +408,7 @@
- 			if (rule->m_screeningType == RewriteRule::NoScreening) {
- 				rule->m_cli.resize(clis.GetSize());
- 				for (PINDEX j = 0; j < clis.GetSize(); j++)
--					rule->m_cli[j] = clis[j];
-+					rule->m_cli[j] = (string)((const char *)(clis[j]));
- 			} else
- 				rule->m_cli.clear();
- 
-@@ -667,6 +667,9 @@
- 		++rule;
- 	}
- 
-+	if (rule == ipRule.second.end())
-+		return;
-+
- 	bool isTerminal = false;	
- 	if (authData && authData->m_call) {
- 		endptr callee = authData->m_call->GetCalledParty();
diff --git a/net/gatekeeper/files/patch-pwlib_compat-h b/net/gatekeeper/files/patch-pwlib_compat-h
new file mode 100644
index 000000000000..a177fe01860d
--- /dev/null
+++ b/net/gatekeeper/files/patch-pwlib_compat-h
@@ -0,0 +1,14 @@
+--- pwlib_compat.h.orig	2011-02-18 15:06:44.000000000 +0100
++++ pwlib_compat.h	2011-02-18 15:08:05.000000000 +0100
+@@ -103,9 +103,8 @@
+ ///////////////////////////////////////////////
+ 
+ // OpenH323 version matching
+-#ifdef H323_H460
+-	#define hasH460 1    // H460 support
+-#endif
++#undef H323_H460
++#undef hasH460
+ 
+ #if OPENH323_MAJOR == 1
+ 	#if OPENH323_MINOR >= 19
diff --git a/net/gatekeeper/pkg-plist b/net/gatekeeper/pkg-plist
index 85c1020bb9fd..06916e1a2fc7 100644
--- a/net/gatekeeper/pkg-plist
+++ b/net/gatekeeper/pkg-plist
@@ -20,6 +20,14 @@ etc/gnugk.ini.default
 %%EXAMPLESDIR%%/%%PORTNAME%%/sql.ini
 %%EXAMPLESDIR%%/%%PORTNAME%%/status.ini
 %%EXAMPLESDIR%%/%%PORTNAME%%/vqueue.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/uri.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/syslog.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/qos.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/p2pnat.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/odbc.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/nat.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/h350.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/enum.ini
 @dirrm %%EXAMPLESDIR%%/%%PORTNAME%%
 @dirrmtry %%EXAMPLESDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/keepalive.txt
@@ -27,5 +35,7 @@ etc/gnugk.ini.default
 %%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/performance.txt
 %%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/radauth.txt
 %%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/trace_levels.txt
+%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/pwlib_bugs.txt
+%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/identifiers.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%PORTNAME%%
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%