OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 04-Jul-2003 15:27:46
Branch: HEAD Handle: 2003070414274501
Modified files:
openpkg-src/cvsps cvsps.patch cvsps.spec
openpkg-web news.txt
Log:
provide a BSD'ish strsep(3) to get built under Solaris
Summary:
Revision Changes Path
1.11 +124 -0 openpkg-src/cvsps/cvsps.patch
1.20 +1 -1 openpkg-src/cvsps/cvsps.spec
1.5247 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvsps/cvsps.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 cvsps.patch
--- openpkg-src/cvsps/cvsps.patch 30 Jun 2003 07:45:23 -0000 1.10
+++ openpkg-src/cvsps/cvsps.patch 4 Jul 2003 13:27:46 -0000 1.11
@@ -28,3 +28,127 @@
install:
[ -d $(prefix)/bin ] || mkdir -p $(prefix)/bin
+--- util.h.orig Fri Apr 11 16:06:01 2003
++++ util.h Fri Jul 4 15:23:50 2003
+@@ -19,5 +19,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 */
+--- util.c.orig Fri Apr 11 16:06:01 2003
++++ util.c Fri Jul 4 15:23:31 2003
+@@ -241,3 +241,31 @@
+
+ return (*src == 0) ? 0 : -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;
++}
++
+--- cache.c.orig Fri Apr 11 16:06:01 2003
++++ cache.c Fri Jul 4 15:24:33 2003
+@@ -361,7 +361,7 @@
+
+ strcpy(buff, p_buff);
+
+- while ((s = strsep(&p, ";")))
++ while ((s = my_strsep(&p, ";")))
+ {
+ char * c = strchr(s, ':');
+
+--- cvs_direct.c.orig Fri Apr 11 16:06:02 2003
++++ cvs_direct.c Fri Jul 4 15:25:08 2003
+@@ -92,12 +92,12 @@
+
+ strcpy(root, p_root);
+
+- 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(root, p_root);
+
+- 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 [EMAIL PROTECTED] in pserver");
+@@ -272,7 +272,7 @@
+ strcpy(root, p_root);
+
+ /* 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);
+@@ -771,7 +771,7 @@
+ static int parse_patch_arg(char * arg, char ** str)
+ {
+ char *tok, *tok2 = "";
+- tok = strsep(str, " ");
++ tok = my_strsep(str, " ");
+ if (!tok)
+ return 0;
+
+@@ -791,7 +791,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);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvsps/cvsps.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 cvsps.spec
--- openpkg-src/cvsps/cvsps.spec 2 Jul 2003 15:05:05 -0000 1.19
+++ openpkg-src/cvsps/cvsps.spec 4 Jul 2003 13:27:46 -0000 1.20
@@ -33,7 +33,7 @@
Group: SCM
License: GPL
Version: 2.0rc1
-Release: 20030702
+Release: 20030704
# list of sources
Source0: http://www.cobite.com/cvsps/cvsps-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5246 -r1.5247 news.txt
--- openpkg-web/news.txt 4 Jul 2003 12:55:40 -0000 1.5246
+++ openpkg-web/news.txt 4 Jul 2003 13:27:45 -0000 1.5247
@@ -1,3 +1,4 @@
+04-Jul-2003: Upgraded package: P<cvsps-2.0rc1-20030704>
04-Jul-2003: Upgraded package: P<lbreakout-2.4.1-20030704>
04-Jul-2003: Upgraded package: P<xaw3d-1.5-20030704>
04-Jul-2003: Upgraded package: P<vcg-1.30.3.17-20030704>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
