From steve@energistic.com  Sun Jan  6 04:55:03 2008
Return-Path: <steve@energistic.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0229116A421
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  6 Jan 2008 04:55:03 +0000 (UTC)
	(envelope-from steve@energistic.com)
Received: from energistic.com (mail.energistic.com [216.54.148.60])
	by mx1.freebsd.org (Postfix) with ESMTP id BCFFE13C46E
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  6 Jan 2008 04:55:02 +0000 (UTC)
	(envelope-from steve@energistic.com)
Received: from energistic.com (localhost [127.0.0.1])
	by energistic.com (8.14.2/8.14.2) with ESMTP id m064WUwB000858
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 5 Jan 2008 23:32:30 -0500 (EST)
	(envelope-from steve@energistic.com)
Received: (from steve@localhost)
	by energistic.com (8.14.2/8.14.2/Submit) id m064WU33098773;
	Sat, 5 Jan 2008 23:32:30 -0500 (EST)
	(envelope-from steve)
Message-Id: <200801060432.m064WU33098773@energistic.com>
Date: Sat, 5 Jan 2008 23:32:30 -0500 (EST)
From: Steve Ames <steve@energistic.com>
Reply-To: Steve Ames <steve@energistic.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Fix compile in net/gatekeeper after pwlib update 
X-Send-Pr-Version: 3.113
X-GNATS-Notify: Joerg.Pulz@frm2.tum.de

>Number:         119375
>Category:       ports
>Synopsis:       Fix compile in net/gatekeeper after pwlib update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 06 05:00:01 UTC 2008
>Closed-Date:    Sat Mar 01 07:26:33 UTC 2008
>Last-Modified:  Sat Mar  1 07:30:05 UTC 2008
>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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Jan 6 05:00:12 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119375 
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Sun Jan 6 05:27:05 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119375 
State-Changed-From-To: feedback->closed 
State-Changed-By: rafan 
State-Changed-When: Sat Mar 1 07:26:32 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119375 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/119375: commit references a PR
Date: Sat,  1 Mar 2008 07:26:25 +0000 (UTC)

 rafan       2008-03-01 07:26:20 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/gatekeeper       Makefile 
   Added files:
     net/gatekeeper/files patch-Routing-cxx patch-addpasswd-cxx 
                          patch-capctrl-cxx patch-clirw-cxx 
                          patch-main-cxx 
   Log:
   - Fix build after devel/pwlib updated to 1.12.0
   
   PR:             ports/119375
   Submitted by:   Steve Ames <steve at energistic.com> (maintainer of devel/pwlib)
   Approved by:    maintainer timeout (2 months)
   
   Revision  Changes    Path
   1.47      +1 -1      ports/net/gatekeeper/Makefile
   1.1       +12 -0     ports/net/gatekeeper/files/patch-Routing-cxx (new)
   1.1       +11 -0     ports/net/gatekeeper/files/patch-addpasswd-cxx (new)
   1.1       +22 -0     ports/net/gatekeeper/files/patch-capctrl-cxx (new)
   1.1       +21 -0     ports/net/gatekeeper/files/patch-clirw-cxx (new)
   1.1       +14 -0     ports/net/gatekeeper/files/patch-main-cxx (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
