Date: Sat, 5 Jan 2008 23:32:30 -0500 (EST) From: Steve Ames <steve@energistic.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/119375: Fix compile in net/gatekeeper after pwlib update Message-ID: <200801060432.m064WU33098773@energistic.com> Resent-Message-ID: <200801060500.m06501ZW072106@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 119375 >Category: ports >Synopsis: Fix compile in net/gatekeeper after pwlib update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jan 06 05:00:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Steve Ames >Release: FreeBSD 7.0-PRERELEASE i386 >Organization: >Environment: System: FreeBSD energistic.com 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #99: Fri Dec 28 15:25:37 EST 2007 steve@energistic.com:/usr/obj/usr/src/sys/VV i386 >Description: Changes to header library layout and API in devel/pwlib require a few patches to gatekeeper to make it compile and run properly. These fixes were (mainly) pulled directly from the GnuGK 2.2.6 codebase and so can be removed when the maintainer updates to that version. >How-To-Repeat: >Fix: Apply the following patch. Also available at: http://steve.energistic.com/h323-ports/gatekeeper-2.2.4.1-2.2.4.2.patch diff -ruN gatekeeper.old/Makefile gatekeeper/Makefile --- gatekeeper.old/Makefile 2008-01-05 22:24:33.000000000 -0500 +++ gatekeeper/Makefile 2008-01-05 23:21:32.000000000 -0500 @@ -8,7 +8,7 @@ PORTNAME= gatekeeper #PORTVERSION= 2.2.4 DISTVERSION= 2.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= openh323gk diff -ruN gatekeeper.old/files/patch-Routing-cxx gatekeeper/files/patch-Routing-cxx --- gatekeeper.old/files/patch-Routing-cxx 1969-12-31 19:00:00.000000000 -0500 +++ gatekeeper/files/patch-Routing-cxx 2008-01-05 22:40:06.000000000 -0500 @@ -0,0 +1,12 @@ +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.old/files/patch-addpasswd-cxx gatekeeper/files/patch-addpasswd-cxx --- gatekeeper.old/files/patch-addpasswd-cxx 1969-12-31 19:00:00.000000000 -0500 +++ gatekeeper/files/patch-addpasswd-cxx 2008-01-05 22:40:58.000000000 -0500 @@ -0,0 +1,11 @@ +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.old/files/patch-capctrl-cxx gatekeeper/files/patch-capctrl-cxx --- gatekeeper.old/files/patch-capctrl-cxx 1969-12-31 19:00:00.000000000 -0500 +++ gatekeeper/files/patch-capctrl-cxx 2008-01-05 22:58:50.000000000 -0500 @@ -0,0 +1,22 @@ +--- 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.old/files/patch-clirw-cxx gatekeeper/files/patch-clirw-cxx --- gatekeeper.old/files/patch-clirw-cxx 1969-12-31 19:00:00.000000000 -0500 +++ gatekeeper/files/patch-clirw-cxx 2008-01-05 22:58:31.000000000 -0500 @@ -0,0 +1,21 @@ +--- 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.old/files/patch-main-cxx gatekeeper/files/patch-main-cxx --- gatekeeper.old/files/patch-main-cxx 1969-12-31 19:00:00.000000000 -0500 +++ gatekeeper/files/patch-main-cxx 2008-01-05 22:41:46.000000000 -0500 @@ -0,0 +1,14 @@ +diff -ruN main.cxx.old main.cxx +--- main.cxx.old 2004-04-17 07:43:43.000000000 -0400 ++++ main.cxx 2008-01-05 21:37:07.000000000 -0500 +@@ -18,6 +18,10 @@ + + + #include <ptlib.h> ++/* the following were expected to be included within ptlib.h ++ but in case they weren't include them explicitly here. */ ++#include <ptlib/pprocess.h> ++ + #include "gk.h" + + PCREATE_PROCESS(Gatekeeper) >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801060432.m064WU33098773>