diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2008-02-24 03:11:57 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2008-02-24 03:11:57 +0000 |
commit | fa4a943c17e47bf910596a414fd7287983350b9b (patch) | |
tree | dc76cec18a505befc330e612e0a56bf1caa5ca49 /devel/baz/files | |
parent | - Fix manpage pointing to correct PREFIX for binary and conf (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_7_0_0'.release/7.0.0
Notes
Notes:
svn path=/head/; revision=207820
svn path=/tags/RELEASE_7_0_0/; revision=207821; tag=release/7.0.0
Diffstat (limited to 'devel/baz/files')
-rw-r--r-- | devel/baz/files/patch-pfs-sftp.c | 11 | ||||
-rw-r--r-- | devel/baz/files/patch-pfs-signatures.c | 11 | ||||
-rw-r--r-- | devel/baz/files/patch-pfs.c | 89 | ||||
-rw-r--r-- | devel/baz/files/patch-unit-sftp.c | 20 |
4 files changed, 0 insertions, 131 deletions
diff --git a/devel/baz/files/patch-pfs-sftp.c b/devel/baz/files/patch-pfs-sftp.c deleted file mode 100644 index be725a45a68f..000000000000 --- a/devel/baz/files/patch-pfs-sftp.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 --git a/devel/baz/files/patch-pfs-signatures.c b/devel/baz/files/patch-pfs-signatures.c deleted file mode 100644 index 7952b9ff2d90..000000000000 --- a/devel/baz/files/patch-pfs-signatures.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/baz/libarch/pfs-signatures.c.old Wed Nov 2 21:46:56 2005 -+++ src/baz/libarch/pfs-signatures.c Wed Nov 2 21:47:09 2005 -@@ -29,7 +29,7 @@ - #include "libarch/namespace.h" - #include "libarch/archives.h" - #include "libarch/cached-archive.h" --#include <gpgme.h> -+#include <gpgme/gpgme.h> - #include "libarch/pfs-signatures.h" - - diff --git a/devel/baz/files/patch-pfs.c b/devel/baz/files/patch-pfs.c deleted file mode 100644 index 22399f9c314d..000000000000 --- a/devel/baz/files/patch-pfs.c +++ /dev/null @@ -1,89 +0,0 @@ ---- 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)); - } - -+/* RFC2396 spake: -+ * "Data must be escaped if it does not have a representation -+ * using an unreserved character". -+ */ -+ -+/* Lookup table: character classes from 2396. (This is overkill) */ -+ -+#define SP 0 /* space = <US-ASCII coded character 20 hexadecimal> */ -+#define CO 0 /* control = <US-ASCII coded characters 00-1F and 7F hexadecimal> */ -+#define DE 0 /* delims = "<" | ">" | "#" | "%" | <"> */ -+#define UW 0 /* unwise = "{" | "}" | "|" | "\" | "^" | "[" | "]" | "`" */ -+#define MA 1 /* mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")" */ -+#define AN 2 /* alphanum = alpha | digit */ -+#define RE 2 /* reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | "," */ -+ -+static const char uri_chars[128] = { -+/* +2 +4 +6 +8 +10 +12 +14 */ -+/* 0 */ CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, -+/* 16 */ CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, -+/* 32 */ SP, MA, DE, DE, RE, DE, RE, MA, MA, MA, MA, RE, RE, MA, MA, RE, -+/* 48 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, RE, RE, DE, RE, DE, RE, -+/* 64 */ RE, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, -+/* 80 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, UW, UW, UW, UW, MA, -+/* 96 */ UW, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, -+/* 112 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, UW, UW, UW, MA, CO -+}; -+ -+#define ESCAPE(ch) (((const signed char)(ch) < 0 || \ -+ uri_chars[(unsigned int)(ch)] == 0)) -+ -+char *oldneon_ne_path_escape(const char *abs_path) -+{ -+ const char *pnt; -+ char *ret, *retpos; -+ int count = 0; -+ for (pnt = abs_path; *pnt != '\0'; pnt++) { -+ if (ESCAPE(*pnt)) { -+ count++; -+ } -+ } -+ if (count == 0) { -+ return ne_strdup(abs_path); -+ } -+ /* An escaped character is "%xx", i.e., two MORE -+ * characters than the original string */ -+ retpos = ret = ne_malloc(strlen(abs_path) + 2*count + 1); -+ for (pnt = abs_path; *pnt != '\0'; pnt++) { -+ if (ESCAPE(*pnt)) { -+ /* Escape it - %<hex><hex> */ -+ sprintf(retpos, "%%%02x", (unsigned char) *pnt); -+ retpos += 3; -+ } else { -+ /* It's cool */ -+ *retpos++ = *pnt; -+ } -+ } -+ *retpos = '\0'; -+ return ret; -+} -+ - /** - * \brief escape a location - * -@@ -528,7 +588,7 @@ - t_uchar * - escape_location (t_uchar const *location) - { -- return ne_path_escape(location); -+ return oldneon_ne_path_escape(location); - } - - /** diff --git a/devel/baz/files/patch-unit-sftp.c b/devel/baz/files/patch-unit-sftp.c deleted file mode 100644 index f0a049289de8..000000000000 --- a/devel/baz/files/patch-unit-sftp.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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); - |