Date: Thu, 05 Apr 2007 11:52:27 +0200 From: "Radim Kolar SF.NET" <hsn@sendmail.cz> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lulf@kerneled.org, hsn-sf@localhost.iol.cz Subject: ports/111264: [PATCH] devel/bazaar: fix compile after neon 0.26 import Message-ID: <E1HZOdn-000Ltq-Rt@sanatana.dharma> Resent-Message-ID: <200704051000.l35A0BO7000165@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 111264
>Category: ports
>Synopsis: [PATCH] devel/bazaar: fix compile after neon 0.26 import
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 05 10:00:10 GMT 2007
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1HZOdn-000Ltq-Rt>