From hsn@sendmail.cz  Thu Apr  5 09:52:46 2007
Return-Path: <hsn@sendmail.cz>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 86A0816A405
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Apr 2007 09:52:46 +0000 (UTC)
	(envelope-from hsn@sendmail.cz)
Received: from smtp-out3.iol.cz (smtp-out3.iol.cz [194.228.2.91])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D3F513C46E
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Apr 2007 09:52:46 +0000 (UTC)
	(envelope-from hsn@sendmail.cz)
Received: from smtp-out3.iol.cz (smtp-out-3.iplanet.iol.cz [192.168.30.28])
	by smtp-out3.iol.cz (Postfix) with ESMTP id F27B5644FC
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Apr 2007 11:52:40 +0200 (CEST)
Received: from sanatana.dharma (234.114.broadband5.iol.cz [88.100.114.234])
	by smtp-out3.iol.cz (Postfix) with ESMTP id 6359D57EE0
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Apr 2007 11:52:33 +0200 (CEST)
Received: from hsn-sf@localhost
	by sanatana.dharma (Exim 4.66_0 FreeBSD) id 1HZOdn-000Ltq-Rt
	; Thu, 05 Apr 2007 11:52:27 +0200
Message-Id: <E1HZOdn-000Ltq-Rt@sanatana.dharma>
Date: Thu, 05 Apr 2007 11:52:27 +0200
From: Radim Kolar SF.NET <hsn@sendmail.cz>
Sender: "Radim Kolar SF.NET" <hsn-sf@sanatana.iol.cz>
To: FreeBSD-gnats-submit@freebsd.org
Cc: lulf@kerneled.org, hsn-sf@localhost.iol.cz
Subject: [PATCH] devel/bazaar: fix compile after neon 0.26 import
X-Send-Pr-Version: 3.113
X-GNATS-Notify: lulf@kerneled.org

>Number:         111264
>Category:       ports
>Synopsis:       [PATCH] devel/bazaar: fix compile after neon 0.26 import
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lwhsu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 05 10:00:10 GMT 2007
>Closed-Date:    Fri Apr 13 16:09:49 GMT 2007
>Last-Modified:  Fri Apr 13 16:10:03 GMT 2007
>Originator:     Radim Kolar SF.NET
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD sanatana.dharma 6.2-RELEASE FreeBSD 6.2-RELEASE #1: Sun Jan 14 11:36:17 CET 2007
>Description:
unbreak port after neon 0.26 import

Added file(s):
- files/patch-pfs-sftp.c
- files/patch-unit-sftp.c

Port maintainer (lulf@kerneled.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- bazaar-1.4.2_4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/bazaar/Makefile /home/hsn/hacked/bazaar/Makefile
--- /usr/ports/devel/bazaar/Makefile	Fri Mar 16 11:03:09 2007
+++ /home/hsn/hacked/bazaar/Makefile	Mon Apr  2 17:52:40 2007
@@ -28,8 +28,6 @@
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 
-BROKEN=		does not build with www/neon 0.26.x
-
 MAN1=		baz.1
 
 MAJORVERSION=	1.4
diff -ruN --exclude=CVS /usr/ports/devel/bazaar/files/patch-pfs-sftp.c /home/hsn/hacked/bazaar/files/patch-pfs-sftp.c
--- /usr/ports/devel/bazaar/files/patch-pfs-sftp.c	Thu Jan  1 01:00:00 1970
+++ /home/hsn/hacked/bazaar/files/patch-pfs-sftp.c	Thu Apr  5 09:20:04 2007
@@ -0,0 +1,11 @@
+--- src/baz/libarch/pfs-sftp.c.orig	Mon Jun 20 23:59:37 2005
++++ src/baz/libarch/pfs-sftp.c	Thu Apr  5 09:16:19 2007
+@@ -1496,7 +1496,7 @@
+    */
+   arch_uri_heuristics (&parsed_uri);
+ 
+-  *user = str_save (0, parsed_uri.authinfo);
++  *user = str_save (0, parsed_uri.userinfo);
+   *hostname = str_save (0, parsed_uri.host);
+   if (parsed_uri.port)
+     {
diff -ruN --exclude=CVS /usr/ports/devel/bazaar/files/patch-pfs.c /home/hsn/hacked/bazaar/files/patch-pfs.c
--- /usr/ports/devel/bazaar/files/patch-pfs.c	Thu Oct 19 15:30:51 2006
+++ /home/hsn/hacked/bazaar/files/patch-pfs.c	Thu Apr  5 09:32:23 2007
@@ -1,7 +1,17 @@
-diff -uN -r src/baz/libarch/pfs.c src/baz/libarch/pfs.c
---- src/baz/libarch/pfs.c	2005-06-20 23:59:37.000000000 +0200
-+++ src/baz/libarch/pfs.c	2006-01-14 17:12:24.000000000 +0100
-@@ -520,6 +520,66 @@
+--- src/baz/libarch/pfs.c.orig	Mon Jun 20 23:59:37 2005
++++ src/baz/libarch/pfs.c	Thu Apr  5 09:23:25 2007
+@@ -513,13 +513,73 @@
+     char *at_pos = str_chr_index (parsed_uri->host, '@');
+     if (!at_pos)
+         return;
+-    parsed_uri->authinfo = str_replace (parsed_uri->authinfo, 
+-					str_alloc_cat (0, parsed_uri->authinfo, "@"));
+-    parsed_uri->authinfo = str_replace (parsed_uri->authinfo, 
+-					str_alloc_cat_n (0, parsed_uri->authinfo, parsed_uri->host, at_pos - parsed_uri->host));
++    parsed_uri->userinfo = str_replace (parsed_uri->userinfo, 
++					str_alloc_cat (0, parsed_uri->userinfo, "@"));
++    parsed_uri->userinfo = str_replace (parsed_uri->userinfo, 
++					str_alloc_cat_n (0, parsed_uri->userinfo, parsed_uri->host, at_pos - parsed_uri->host));
      parsed_uri->host = str_replace (parsed_uri->host, str_save (0, at_pos + 1));
  }
  
diff -ruN --exclude=CVS /usr/ports/devel/bazaar/files/patch-unit-sftp.c /home/hsn/hacked/bazaar/files/patch-unit-sftp.c
--- /usr/ports/devel/bazaar/files/patch-unit-sftp.c	Thu Jan  1 01:00:00 1970
+++ /home/hsn/hacked/bazaar/files/patch-unit-sftp.c	Thu Apr  5 10:02:29 2007
@@ -0,0 +1,20 @@
+--- src/baz/libarch/tests/unit-sftp.c.orig	Mon Jun 20 23:59:37 2005
++++ src/baz/libarch/tests/unit-sftp.c	Thu Apr  5 09:58:45 2007
+@@ -35,7 +35,7 @@
+     char *host;
+     unsigned int port;
+     char *path;
+-    char *authinfo;
++    char *userinfo;
+ } ne_uri;
+ */
+   invariant_int_cmp (ne_uri_parse ("sftp://user@email.com@host.phwoar/root/path", &parsed_uri), 0);
+@@ -44,7 +44,7 @@
+   invariant_str_cmp (parsed_uri.host, "email.com@host.phwoar");
+   arch_uri_heuristics (&parsed_uri);
+   invariant_str_cmp (parsed_uri.host, "host.phwoar");
+-  invariant_str_cmp (parsed_uri.authinfo, "user@email.com");
++  invariant_str_cmp (parsed_uri.userinfo, "user@email.com");
+   invariant_int_cmp (parsed_uri.port, 0);
+   ne_uri_free(&parsed_uri);
+ 
--- bazaar-1.4.2_4.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Apr 5 10:00:18 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111264 
Responsible-Changed-From-To: freebsd-ports-bugs->lwhsu 
Responsible-Changed-By: lwhsu 
Responsible-Changed-When: Thu Apr 12 18:27:56 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

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

From: Ulf Lilleengen <lulf@stud.ntnu.no>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/111264: [PATCH] devel/bazaar: fix compile after neon 0.26 import
Date: Thu, 12 Apr 2007 23:10:41 +0200

 On Thursday 05 April 2007 12:00, Edwin Groothuis wrote:
 > Maintainer of devel/bazaar,
 >
 > Please note that PR ports/111264 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/111264
 I approve. You might need to copy the added files into the 'files' directory 
 first though.
 
 -- 
 Ulf Lilleengen
State-Changed-From-To: feedback->open 
State-Changed-By: lwhsu 
State-Changed-When: Fri Apr 13 08:17:34 UTC 2007 
State-Changed-Why:  
Maintainer has approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111264 
State-Changed-From-To: open->closed 
State-Changed-By: lwhsu 
State-Changed-When: Fri Apr 13 16:09:43 UTC 2007 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/111264: commit references a PR
Date: Fri, 13 Apr 2007 16:08:49 +0000 (UTC)

 lwhsu       2007-04-13 16:08:44 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/bazaar         Makefile 
     devel/bazaar/files   patch-pfs.c 
   Added files:
     devel/bazaar/files   patch-pfs-sftp.c patch-unit-sftp.c 
   Log:
   - Unbreak port after neon 0.26 import [1]
   - Remove 4.x stuff
   - Change PORTREVISION?= to PORTREVISION=, this is not a master port
   - Remove gmake in BUILD_DEPENDS, we already have USE_GMAKE
   
   PR:             111264 [1]
   Submitted by:   Radim Kolar SF.NET <hsn AT sendmail.cz>
   Approved by:    Ulf Lilleengen <lulf AT stud.ntnu.no> (maintainer),
                   clsung (mentor)
   
   Revision  Changes    Path
   1.9       +2 -9      ports/devel/bazaar/Makefile
   1.1       +11 -0     ports/devel/bazaar/files/patch-pfs-sftp.c (new)
   1.2       +14 -4     ports/devel/bazaar/files/patch-pfs.c
   1.1       +20 -0     ports/devel/bazaar/files/patch-unit-sftp.c (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:
