Date: Fri, 18 Feb 2011 20:00:26 GMT From: "Petr Holub" <hopet@ics.muni.cz> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/154864: [PATCH] net/gatekeeper: update to 2.2.8 Message-ID: <201102182000.p1IK0QgS007903@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/154864; it has been noted by GNATS.
From: "Petr Holub" <hopet@ics.muni.cz>
To: <bug-followup@FreeBSD.org>
Cc:
Subject: Re: ports/154864: [PATCH] net/gatekeeper: update to 2.2.8
Date: Fri, 18 Feb 2011 20:31:27 +0100
port submit was unable to attach the patch - thus sending
it sepatartely :(, see below.
Petr
diff -ruN gatekeeper.orig/Makefile gatekeeper/Makefile
--- gatekeeper.orig/Makefile 2011-02-18 14:57:54.000000000 +0100
+++ gatekeeper/Makefile 2011-02-18 16:07:33.000000000 +0100
@@ -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 -ruN gatekeeper.orig/distinfo gatekeeper/distinfo
--- gatekeeper.orig/distinfo 2006-12-21 22:43:20.000000000 +0100
+++ gatekeeper/distinfo 2011-02-18 14:58:24.000000000 +0100
@@ -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 -ruN gatekeeper.orig/files/patch-Routing-cxx gatekeeper/files/patch-Routing-cxx
--- gatekeeper.orig/files/patch-Routing-cxx 2008-03-01 08:26:20.000000000 +0100
+++ gatekeeper/files/patch-Routing-cxx 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruN gatekeeper.orig/files/patch-Toolkit.cxx gatekeeper/files/patch-Toolkit.cxx
--- gatekeeper.orig/files/patch-Toolkit.cxx 2005-06-30 20:11:28.000000000 +0200
+++ gatekeeper/files/patch-Toolkit.cxx 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruN gatekeeper.orig/files/patch-addpasswd-cxx gatekeeper/files/patch-addpasswd-cxx
--- gatekeeper.orig/files/patch-addpasswd-cxx 2008-03-01 08:26:20.000000000 +0100
+++ gatekeeper/files/patch-addpasswd-cxx 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruN gatekeeper.orig/files/patch-capctrl-cxx gatekeeper/files/patch-capctrl-cxx
--- gatekeeper.orig/files/patch-capctrl-cxx 2008-03-01 08:26:20.000000000 +0100
+++ gatekeeper/files/patch-capctrl-cxx 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruN gatekeeper.orig/files/patch-clirw-cxx gatekeeper/files/patch-clirw-cxx
--- gatekeeper.orig/files/patch-clirw-cxx 2008-03-01 08:26:20.000000000 +0100
+++ gatekeeper/files/patch-clirw-cxx 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruN gatekeeper.orig/files/patch-pwlib_compat-h gatekeeper/files/patch-pwlib_compat-h
--- gatekeeper.orig/files/patch-pwlib_compat-h 1970-01-01 01:00:00.000000000 +0100
+++ gatekeeper/files/patch-pwlib_compat-h 2011-02-18 15:08:48.000000000 +0100
@@ -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 -ruN gatekeeper.orig/pkg-plist gatekeeper/pkg-plist
--- gatekeeper.orig/pkg-plist 2006-04-21 15:12:38.000000000 +0200
+++ gatekeeper/pkg-plist 2011-02-18 16:07:12.000000000 +0100
@@ -20,6 +20,14 @@
%%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 @@
%%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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102182000.p1IK0QgS007903>