diff options
Diffstat (limited to 'dev-vcs/cvsps/files')
-rw-r--r-- | dev-vcs/cvsps/files/cvsps-2.1-build.patch | 4 | ||||
-rw-r--r-- | dev-vcs/cvsps/files/cvsps-2.1-solaris.patch | 131 | ||||
-rw-r--r-- | dev-vcs/cvsps/files/cvsps-2.2_beta1-solaris.patch | 8 | ||||
-rw-r--r-- | dev-vcs/cvsps/files/cvsps-3.13-make.patch | 2 |
4 files changed, 2 insertions, 143 deletions
diff --git a/dev-vcs/cvsps/files/cvsps-2.1-build.patch b/dev-vcs/cvsps/files/cvsps-2.1-build.patch index bcb394d5dd0b..e59f305b99b1 100644 --- a/dev-vcs/cvsps/files/cvsps-2.1-build.patch +++ b/dev-vcs/cvsps/files/cvsps-2.1-build.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2008-03-24 07:16:47.000000000 -0400 -+++ Makefile 2008-03-24 07:17:18.000000000 -0400 +--- a/Makefile.orig 2008-03-24 07:16:47.000000000 -0400 ++++ b/Makefile 2008-03-24 07:17:18.000000000 -0400 @@ -3,6 +3,7 @@ CC?=gcc CFLAGS?=-g -O2 -Wall diff --git a/dev-vcs/cvsps/files/cvsps-2.1-solaris.patch b/dev-vcs/cvsps/files/cvsps-2.1-solaris.patch deleted file mode 100644 index 3e063fd9248b..000000000000 --- a/dev-vcs/cvsps/files/cvsps-2.1-solaris.patch +++ /dev/null @@ -1,131 +0,0 @@ -Modified version of -http://cvs.openpkg.org/fileview?f=openpkg-src/cvsps/cvsps.patch&v=1.13 - -Index: cache.c ---- cache.c.orig 2008-04-02 03:18:44 +0200 -+++ cache.c 2008-04-02 09:10:25 +0200 -@@ -361,7 +361,7 @@ - - strcpy(buff, p_buff); - -- while ((s = strsep(&p, ";"))) -+ while ((s = my_strsep(&p, ";"))) - { - char * c = strchr(s, ':'); - -Index: cvs_direct.c ---- cvs_direct.c.orig 2008-04-02 03:18:44 +0200 -+++ cvs_direct.c 2008-04-02 09:10:25 +0200 -@@ -92,12 +92,12 @@ - - strcpy_a(root, p_root, PATH_MAX); - -- tok = strsep(&p, ":"); -+ tok = my_strsep(&p, ":"); - - /* if root string looks like :pserver:... then the first token will be empty */ - if (strlen(tok) == 0) - { -- char * method = strsep(&p, ":"); -+ char * method = my_strsep(&p, ":"); - if (strcmp(method, "pserver") == 0) - { - ctx = open_ctx_pserver(ctx, p); -@@ -185,14 +185,14 @@ - - strcpy_a(root, p_root, PATH_MAX); - -- tok = strsep(&p, ":"); -+ tok = my_strsep(&p, ":"); - if (strlen(tok) == 0 || !p) - { - debug(DEBUG_APPERROR, "parse error on third token"); - goto out_free_err; - } - -- tok2 = strsep(&tok, "@"); -+ tok2 = my_strsep(&tok, "@"); - if (!strlen(tok2) || (!tok || !strlen(tok))) - { - debug(DEBUG_APPERROR, "parse error on user@server in pserver"); -@@ -272,7 +272,7 @@ - strcpy_a(root, p_root, PATH_MAX); - - /* if there's a ':', it's remote */ -- tok = strsep(&p, ":"); -+ tok = my_strsep(&p, ":"); - - if (p) - { -@@ -281,7 +281,7 @@ - if (!cvs_rsh) - cvs_rsh = "rsh"; - -- tok2 = strsep(&tok, "@"); -+ tok2 = my_strsep(&tok, "@"); - - if (tok) - snprintf(execcmd, PATH_MAX, "%s -l %s %s %s server", cvs_rsh, tok2, tok, cvs_server); -@@ -776,7 +776,7 @@ - static int parse_patch_arg(char * arg, char ** str) - { - char *tok, *tok2 = ""; -- tok = strsep(str, " "); -+ tok = my_strsep(str, " "); - if (!tok) - return 0; - -@@ -796,7 +796,7 @@ - /* see if command wants two args and they're separated by ' ' */ - if (tok[2] == 0 && strchr("BdDFgiorVxYz", tok[1])) - { -- tok2 = strsep(str, " "); -+ tok2 = my_strsep(str, " "); - if (!tok2) - { - debug(DEBUG_APPERROR, "diff_opts parse_error: argument %s requires two arguments", tok); -Index: util.c ---- util.c.orig 2008-04-02 03:18:44 +0200 -+++ util.c 2008-04-02 09:10:25 +0200 -@@ -316,3 +316,31 @@ - exit(1); - } - } -+ -+char *my_strsep(char **stringp, const char *delim) -+{ -+ char *s; -+ const char *spanp; -+ int c, sc; -+ char *tok; -+ -+ if ((s = *stringp) == NULL) -+ return NULL; -+ for (tok = s;;) { -+ c = *s++; -+ spanp = delim; -+ do { -+ if ((sc = *spanp++) == c) { -+ if (c == 0) -+ s = NULL; -+ else -+ s[-1] = 0; -+ *stringp = s; -+ return tok; -+ } -+ } while (sc != 0); -+ } -+ /* NOTREACHED */ -+ return NULL; -+} -+ -Index: util.h ---- util.h.orig 2008-04-02 03:18:44 +0200 -+++ util.h 2008-04-02 09:15:35 +0200 -@@ -24,5 +24,6 @@ - void timing_stop(const char *); - int my_system(const char *); - int escape_filename(char *, int, const char *); -+char *my_strsep(char **, const char *); - - #endif /* UTIL_H */ diff --git a/dev-vcs/cvsps/files/cvsps-2.2_beta1-solaris.patch b/dev-vcs/cvsps/files/cvsps-2.2_beta1-solaris.patch index 444ac1382a7b..eb8d9e2a94d2 100644 --- a/dev-vcs/cvsps/files/cvsps-2.2_beta1-solaris.patch +++ b/dev-vcs/cvsps/files/cvsps-2.2_beta1-solaris.patch @@ -1,8 +1,6 @@ Modified version of. http://cvs.openpkg.org/fileview?f=openpkg-src/cvsps/cvsps.patch&v=1.13 -diff --git a/cache.c b/cache.c -index 4c51cf7..2c3918d 100644 --- a/cache.c +++ b/cache.c @@ -361,7 +361,7 @@ static void parse_cache_revision(PatchSetMember * psm, const char * p_buff) @@ -14,8 +12,6 @@ index 4c51cf7..2c3918d 100644 { char * c = strchr(s, ':'); -diff --git a/cvs_direct.c b/cvs_direct.c -index e281848..5aa8f0f 100644 --- a/cvs_direct.c +++ b/cvs_direct.c @@ -92,12 +92,12 @@ CvsServerCtx * open_cvs_server(char * p_root, int compress) @@ -86,8 +82,6 @@ index e281848..5aa8f0f 100644 if (!tok2) { debug(DEBUG_APPERROR, "diff_opts parse_error: argument %s requires two arguments", tok); -diff --git a/util.c b/util.c -index 7884c84..f3ab3a3 100644 --- a/util.c +++ b/util.c @@ -316,3 +316,31 @@ void strcpy_a(char * dst, const char * src, int n) @@ -122,8 +116,6 @@ index 7884c84..f3ab3a3 100644 + return NULL; +} + -diff --git a/util.h b/util.h -index ff2d3a0..336fd63 100644 --- a/util.h +++ b/util.h @@ -24,5 +24,6 @@ void timing_stop(const char *); diff --git a/dev-vcs/cvsps/files/cvsps-3.13-make.patch b/dev-vcs/cvsps/files/cvsps-3.13-make.patch index 7c96d60300a1..6263b3b8b749 100644 --- a/dev-vcs/cvsps/files/cvsps-3.13-make.patch +++ b/dev-vcs/cvsps/files/cvsps-3.13-make.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile b/Makefile -index 6266c9d..4f60d2f 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ INSTALL = install |