OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Apr-2008 09:17:02
Branch: HEAD Handle: 2008040208165502
Modified files:
openpkg-src/cvsps cvsps.patch cvsps.spec
Log:
upgrading package: cvsps 2.1 -> 2.2b1
Summary:
Revision Changes Path
1.13 +22 -22 openpkg-src/cvsps/cvsps.patch
1.33 +2 -2 openpkg-src/cvsps/cvsps.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvsps/cvsps.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 cvsps.patch
--- openpkg-src/cvsps/cvsps.patch 26 May 2005 18:21:09 -0000 1.12
+++ openpkg-src/cvsps/cvsps.patch 2 Apr 2008 07:16:55 -0000 1.13
@@ -1,9 +1,9 @@
Index: Makefile
---- Makefile.orig 2005-05-26 05:39:40 +0200
-+++ Makefile 2005-05-26 20:19:29 +0200
+--- Makefile.orig 2008-04-02 03:18:44 +0200
++++ Makefile 2008-04-02 09:15:20 +0200
@@ -1,9 +1,10 @@
MAJOR=2
- MINOR=1
+ MINOR=2b1
-CC?=gcc
-CFLAGS?=-g -O2 -Wall
-CFLAGS+=-I. -DVERSION=\"$(MAJOR).$(MINOR)\"
@@ -18,7 +18,7 @@
cbtcommon/hash.o\
@@ -20,8 +21,11 @@
- all: cvsps
+ all: cvsps
+.c.o:
+ $(CC) $(CFLAGS) -c -o $@ $<
@@ -30,8 +30,8 @@
install:
[ -d $(prefix)/bin ] || mkdir -p $(prefix)/bin
Index: cache.c
---- cache.c.orig 2005-05-26 05:39:40 +0200
-+++ cache.c 2005-05-26 20:18:47 +0200
+--- 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);
@@ -42,11 +42,11 @@
char * c = strchr(s, ':');
Index: cvs_direct.c
---- cvs_direct.c.orig 2005-05-26 05:39:40 +0200
-+++ cvs_direct.c 2005-05-26 20:18:47 +0200
+--- 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(root, p_root);
+ strcpy_a(root, p_root, PATH_MAX);
- tok = strsep(&p, ":");
+ tok = my_strsep(&p, ":");
@@ -61,7 +61,7 @@
ctx = open_ctx_pserver(ctx, p);
@@ -185,14 +185,14 @@
- strcpy(root, p_root);
+ strcpy_a(root, p_root, PATH_MAX);
- tok = strsep(&p, ":");
+ tok = my_strsep(&p, ":");
@@ -77,7 +77,7 @@
{
debug(DEBUG_APPERROR, "parse error on [EMAIL PROTECTED] in pserver");
@@ -272,7 +272,7 @@
- strcpy(root, p_root);
+ strcpy_a(root, p_root, PATH_MAX);
/* if there's a ':', it's remote */
- tok = strsep(&p, ":");
@@ -94,7 +94,7 @@
if (tok)
snprintf(execcmd, PATH_MAX, "%s -l %s %s %s server", cvs_rsh, tok2,
tok, cvs_server);
-@@ -771,7 +771,7 @@
+@@ -776,7 +776,7 @@
static int parse_patch_arg(char * arg, char ** str)
{
char *tok, *tok2 = "";
@@ -103,7 +103,7 @@
if (!tok)
return 0;
-@@ -791,7 +791,7 @@
+@@ -796,7 +796,7 @@
/* see if command wants two args and they're separated by ' ' */
if (tok[2] == 0 && strchr("BdDFgiorVxYz", tok[1]))
{
@@ -113,11 +113,11 @@
{
debug(DEBUG_APPERROR, "diff_opts parse_error: argument %s requires
two arguments", tok);
Index: util.c
---- util.c.orig 2005-05-26 05:39:40 +0200
-+++ util.c 2005-05-26 20:18:47 +0200
-@@ -289,3 +289,31 @@
-
- return (*src == 0) ? 0 : -1;
+--- 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)
@@ -148,12 +148,12 @@
+}
+
Index: util.h
---- util.h.orig 2005-05-26 05:39:40 +0200
-+++ util.h 2005-05-26 20:18:47 +0200
-@@ -23,5 +23,6 @@
- void timing_stop(const char *);
+--- util.h.orig 2008-04-02 03:18:44 +0200
++++ util.h 2008-04-02 09:15:35 +0200
+@@ -24,5 +24,6 @@
int my_system(const char *);
int escape_filename(char *, int, const char *);
+ void strcpy_a(char * dst, const char * src, int n);
+char *my_strsep(char **, const char *);
#endif /* UTIL_H */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvsps/cvsps.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 cvsps.spec
--- openpkg-src/cvsps/cvsps.spec 1 Jan 2008 14:52:27 -0000 1.32
+++ openpkg-src/cvsps/cvsps.spec 2 Apr 2008 07:16:57 -0000 1.33
@@ -31,8 +31,8 @@
Class: EVAL
Group: SCM
License: GPL
-Version: 2.1
-Release: 20080101
+Version: 2.2b1
+Release: 20080402
# list of sources
Source0: http://www.cobite.com/cvsps/cvsps-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
