Author: ankry Date: Sat Mar 3 21:42:59 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fixed build with new neon; not tested whether it works
---- Files affected:
SOURCES:
bazaar-neon.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/bazaar-neon.patch
diff -u /dev/null SOURCES/bazaar-neon.patch:1.1
--- /dev/null Sat Mar 3 22:43:00 2007
+++ SOURCES/bazaar-neon.patch Sat Mar 3 22:42:44 2007
@@ -0,0 +1,52 @@
+--- bazaar-1.4.2/[EMAIL PROTECTED]/src/baz/libarch/pfs-sftp.c~ 2007-03-03
22:03:50.000000000 +0100
++++ bazaar-1.4.2/[EMAIL PROTECTED]/src/baz/libarch/pfs-sftp.c 2007-03-03
22:03:50.000000000 +0100
+@@ -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)
+ {
+--- bazaar-1.4.2/[EMAIL PROTECTED]/src/baz/libarch/pfs.c~ 2007-03-03
22:14:19.000000000 +0100
++++ bazaar-1.4.2/[EMAIL PROTECTED]/src/baz/libarch/pfs.c 2007-03-03
22:14:19.000000000 +0100
+@@ -513,10 +513,10 @@
+ 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));
+ }
+
+--- bazaar-1.4.2/[EMAIL PROTECTED]/src/baz/libarch/tests/unit-sftp.c~
2007-03-03 22:22:25.000000000 +0100
++++ bazaar-1.4.2/[EMAIL PROTECTED]/src/baz/libarch/tests/unit-sftp.c
2007-03-03 22:22:25.000000000 +0100
+@@ -32,10 +32,9 @@
+ /*
+ typedef struct {
+ char *scheme;
+- char *host;
++ char *host, *userinfo;
+ unsigned int port;
+- char *path;
+- char *authinfo;
++ char *path, *query, *fragment;
+ } ne_uri;
+ */
+ invariant_int_cmp (ne_uri_parse ("sftp://[EMAIL
PROTECTED]@host.phwoar/root/path", &parsed_uri), 0);
+@@ -44,7 +43,7 @@
+ invariant_str_cmp (parsed_uri.host, "[EMAIL PROTECTED]");
+ arch_uri_heuristics (&parsed_uri);
+ invariant_str_cmp (parsed_uri.host, "host.phwoar");
+- invariant_str_cmp (parsed_uri.authinfo, "[EMAIL PROTECTED]");
++ invariant_str_cmp (parsed_uri.userinfo, "[EMAIL PROTECTED]");
+ invariant_int_cmp (parsed_uri.port, 0);
+ ne_uri_free(&parsed_uri);
+
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
