summaryrefslogtreecommitdiff
path: root/devel/cvs
diff options
context:
space:
mode:
Diffstat (limited to 'devel/cvs')
-rw-r--r--devel/cvs/Makefile9
-rw-r--r--devel/cvs/PLIST5
-rw-r--r--devel/cvs/distinfo55
-rw-r--r--devel/cvs/patches/patch-aa39
-rw-r--r--devel/cvs/patches/patch-ab20
-rw-r--r--devel/cvs/patches/patch-ac55
-rw-r--r--devel/cvs/patches/patch-ad35
-rw-r--r--devel/cvs/patches/patch-ae18
-rw-r--r--devel/cvs/patches/patch-af6
-rw-r--r--devel/cvs/patches/patch-ah12
-rw-r--r--devel/cvs/patches/patch-ai6
-rw-r--r--devel/cvs/patches/patch-aj19
-rw-r--r--devel/cvs/patches/patch-ak6
-rw-r--r--devel/cvs/patches/patch-al6
-rw-r--r--devel/cvs/patches/patch-am14
-rw-r--r--devel/cvs/patches/patch-an6
-rw-r--r--devel/cvs/patches/patch-ao12
-rw-r--r--devel/cvs/patches/patch-ap19
-rw-r--r--devel/cvs/patches/patch-aq8
-rw-r--r--devel/cvs/patches/patch-ar30
-rw-r--r--devel/cvs/patches/patch-as10
-rw-r--r--devel/cvs/patches/patch-at8
-rw-r--r--devel/cvs/patches/patch-au8
-rw-r--r--devel/cvs/patches/patch-av64
-rw-r--r--devel/cvs/patches/patch-ax13
-rw-r--r--devel/cvs/patches/patch-ay8
-rw-r--r--devel/cvs/patches/patch-az6
27 files changed, 168 insertions, 329 deletions
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index eb2fc8d9928..69f1d1caed8 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2002/10/10 09:42:58 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2002/11/24 21:31:20 hubertf Exp $
#
-DISTNAME= cvs-1.11
-PKGREVISION= 2
+DISTNAME= cvs-1.11.2
CATEGORIES= devel
MASTER_SITES= http://ftp.cvshome.org/${DISTNAME}/ \
${MASTER_SITE_GNU:=non-gnu/cvs/}
@@ -19,8 +18,8 @@ BUILD_DEFS+= USE_INET6
USE_BUILDLINK2= yes
.if ${OPSYS} == "NetBSD"
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCHFILES= cvs-1.11-v6-20020111.diff.gz
+PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
+PATCHFILES= cvs-1.11.2-v6-20020709.diff.gz
PATCH_DIST_STRIP= -p1
.if defined(USE_INET6) && ${USE_INET6} == "YES"
diff --git a/devel/cvs/PLIST b/devel/cvs/PLIST
index 18bd8e78768..4b6bf52361f 100644
--- a/devel/cvs/PLIST
+++ b/devel/cvs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:08 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/11/24 21:31:21 hubertf Exp $
bin/cvs
bin/cvsbug
bin/rcs2log
@@ -30,11 +30,12 @@ share/cvs/contrib/commit_prep
share/cvs/contrib/cvs2vendor
share/cvs/contrib/cvs_acls
share/cvs/contrib/cvscheck
-share/cvs/contrib/cvscheck.man
+share/cvs/contrib/debug_check_log
share/cvs/contrib/intro.doc
share/cvs/contrib/log
share/cvs/contrib/log_accum
share/cvs/contrib/mfpipe
+share/cvs/contrib/pvcs2rcs
share/cvs/contrib/rcs-to-cvs
share/cvs/contrib/rcs2log
share/cvs/contrib/rcslock
diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo
index 208b4bbbb31..bcd0acebb26 100644
--- a/devel/cvs/distinfo
+++ b/devel/cvs/distinfo
@@ -1,31 +1,28 @@
-$NetBSD: distinfo,v 1.5 2002/01/11 12:47:23 skrll Exp $
+$NetBSD: distinfo,v 1.6 2002/11/24 21:31:21 hubertf Exp $
-SHA1 (cvs-1.11.tar.gz) = 809932302b085491bdb868e558b5474f61f68f8a
-Size (cvs-1.11.tar.gz) = 2343288 bytes
-SHA1 (cvs-1.11-v6-20020111.diff.gz) = f36242b157fe8e9ad92c423dad8275b91cd8e499
-Size (cvs-1.11-v6-20020111.diff.gz) = 21734 bytes
-SHA1 (patch-aa) = 6952c772768280c4dc96037df77040f62007d06b
-SHA1 (patch-ab) = c011a08b223a68c0a9546462a064c99ef28691d4
-SHA1 (patch-ac) = f5b8e99ce02e1bb235a55cd2e7da2623b37014f1
-SHA1 (patch-ad) = 7fb003cff44208a0207ceca497b7288ad35d7273
-SHA1 (patch-ae) = fff731374c8dc049dbce41d861026af910877a3f
-SHA1 (patch-af) = 74eacddd452edbae91e8fbb41b554eb33b69788b
+SHA1 (cvs-1.11.2.tar.gz) = da2019c5e8d6708030c9d0c917acd524831fcb21
+Size (cvs-1.11.2.tar.gz) = 2695128 bytes
+SHA1 (cvs-1.11.2-v6-20020709.diff.gz) = 7b03fe31141f507e9b2c1118b6a746c457a4de0c
+Size (cvs-1.11.2-v6-20020709.diff.gz) = 23862 bytes
+SHA1 (patch-aa) = c4321f158cf5768b8696f9babf25f81a7c7a4134
+SHA1 (patch-ab) = d803ed98eb512873d662efc161b357b78adf7dfa
+SHA1 (patch-ac) = 432bc81bc7fb89644b2b7a9fff991a1dee32ee38
+SHA1 (patch-ae) = 509ba28b402049573cff6d9dba471332e39834fa
+SHA1 (patch-af) = 0463ada714be222594597906a84b177e803c5940
SHA1 (patch-ag) = e301b54d193cef394ffbe482ceb1bbd0d5d73343
-SHA1 (patch-ah) = 0b00aad19f35ef81edcc980ec8ab6fb3707974da
-SHA1 (patch-ai) = 403eeda35a60d0f277fa6521dc7899c85f3ba25f
-SHA1 (patch-aj) = 9a0220b8261ca08b43b7ea09a5a1102f9f8b9a28
-SHA1 (patch-ak) = 11aee488226ecda4973bdf7ff6c3b22fcb7f3f5c
-SHA1 (patch-al) = f5ab4db1bec429b7fc3447a220e3611fd3041572
-SHA1 (patch-am) = f44f08fe620de49521ac34d9c002718da7a92e54
-SHA1 (patch-an) = a958e25814c514e276bf618a21be86d43f395345
-SHA1 (patch-ao) = d0888f49b884ba915d7c2f09a86b02ae0cdd8c9a
-SHA1 (patch-ap) = 1715267e59a78b0e510df79d206e9354864baab6
-SHA1 (patch-aq) = fd66be1c5395baf3a3ef5c81ac7a38f481e8eafa
-SHA1 (patch-ar) = 6e7c24d1827fed5d970e263e552d12f64a62b90d
-SHA1 (patch-as) = 166179f19af183b76f6a3336db494609c8d6dcc8
-SHA1 (patch-at) = 5a05259e267c002b91d6653602e9b5b49d55f8ce
-SHA1 (patch-au) = 0b63715fa19fda6dacac259bd4510479eaba5a67
-SHA1 (patch-av) = 34656e9372f51c9bdb9ca7e065b4391d9aede3ac
-SHA1 (patch-ax) = 972a7086e904be528c627934444a5ab6d587f720
-SHA1 (patch-ay) = c27da149c0144c0cbe2efadb4c770d08d4ab6c14
-SHA1 (patch-az) = 5e844a7abaa7fe4024c25c641d5b57edf0f35218
+SHA1 (patch-ah) = bb2e096452371e6006427a175271efa30b75110b
+SHA1 (patch-ai) = a269d62c85379f5b91dff3bf129d0608f0ceb94c
+SHA1 (patch-ak) = ddf7dfb70c23be3eeeda2bd7fff6b8dd7514c053
+SHA1 (patch-al) = ee92e34d058b33dda84d6c600580eaf555fe684f
+SHA1 (patch-am) = 8523249e8bef265449ddbb491dcc1d5d36fa8255
+SHA1 (patch-an) = 2061110f6f5f44397182b917bd44abe3e63d47a4
+SHA1 (patch-ao) = 0f8472015729f95451c5da6034057ed81695395a
+SHA1 (patch-ap) = ca2b22cde32b13904d7c6d047a30109fb9b53ec4
+SHA1 (patch-aq) = a6bf7e0c4d923e77c660d3ea8f6bdf70f663675d
+SHA1 (patch-ar) = cb57f806bb25f50dd1eca54b7749a38746065ecb
+SHA1 (patch-as) = 1553c1c32eef8872a6d8b0b4866be447335119f2
+SHA1 (patch-at) = 0243e9179442efebfd81cb8900daa7032f9ee9ea
+SHA1 (patch-au) = 50795e0c4d4d7100aabcde20e54fce913291e0c1
+SHA1 (patch-av) = 385f5155e60f9fac255242e56902ef8a450f587f
+SHA1 (patch-ay) = fc032523f28431dae99d03e677eb43b7d2cd5901
+SHA1 (patch-az) = 9ae7d47ad2295c4598b88d425fee52f9afeb6081
diff --git a/devel/cvs/patches/patch-aa b/devel/cvs/patches/patch-aa
index f0e240b5e0d..5880c798f7c 100644
--- a/devel/cvs/patches/patch-aa
+++ b/devel/cvs/patches/patch-aa
@@ -1,35 +1,22 @@
-$NetBSD: patch-aa,v 1.4 2000/10/18 03:31:15 hubertf Exp $
+$NetBSD: patch-aa,v 1.5 2002/11/24 21:31:22 hubertf Exp $
---- Makefile.in.orig Fri Sep 8 20:28:02 2000
+--- Makefile.in.orig Wed Apr 17 21:47:32 2002
+++ Makefile.in
-@@ -94,7 +94,7 @@
+@@ -96,7 +96,7 @@
- ### Subdirectories to run make in for the primary targets.
# Unix source subdirs, where we'll want to run lint and etags:
+ # This is a legacy variable from b4 Automake
-USOURCE_SUBDIRS = lib zlib diff src
+USOURCE_SUBDIRS = lib diff src
# All other subdirs:
- SUBDIRS = ${USOURCE_SUBDIRS} man doc contrib tools \
+ SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
windows-NT os2 emx vms
-@@ -187,21 +187,18 @@
- .PHONY: check
- check:
- cd lib ; $(MAKE) $(FLAGS_TO_PASS)
-- cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
- cd diff ; $(MAKE) $(FLAGS_TO_PASS)
- cd src ; $(MAKE) $(FLAGS_TO_PASS) check
-
- .PHONY: remotecheck
- remotecheck:
- cd lib ; $(MAKE) $(FLAGS_TO_PASS)
-- cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
- cd diff ; $(MAKE) $(FLAGS_TO_PASS)
- cd src ; $(MAKE) $(FLAGS_TO_PASS) remotecheck
-
- .PHONY: installcheck
- installcheck:
- cd lib ; $(MAKE) $(FLAGS_TO_PASS)
-- cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
- cd diff ; $(MAKE) $(FLAGS_TO_PASS)
- cd src ; $(MAKE) $(FLAGS_TO_PASS) installcheck
+@@ -124,7 +124,7 @@
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h $(top_builddir)/src/options.h
+-CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile
++CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
diff --git a/devel/cvs/patches/patch-ab b/devel/cvs/patches/patch-ab
index 70140c52ce2..6d2f2876dda 100644
--- a/devel/cvs/patches/patch-ab
+++ b/devel/cvs/patches/patch-ab
@@ -1,22 +1,22 @@
-$NetBSD: patch-ab,v 1.5 2001/02/22 17:04:36 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2002/11/24 21:31:22 hubertf Exp $
---- doc/cvs.texinfo.orig Wed Aug 30 03:16:32 2000
-+++ doc/cvs.texinfo Thu Feb 22 17:19:43 2001
+--- doc/cvs.texinfo.orig Wed Apr 17 20:24:27 2002
++++ doc/cvs.texinfo
@@ -40,6 +40,10 @@
@setfilename cvs.info
- @include CVSvn.texi
- @settitle CVS---Concurrent Versions System
+ @include version.texi
+ @settitle CVS---Concurrent Versions System v@value{VERSION}
+@dircategory Programming & development tools
+@direntry
-+* CVS: (cvs) CVS Reference Manual.
++* CVS: (cvs) CVS Reference Manual.
+@end direntry
@setchapternewpage odd
@c -- TODO list:
-@@ -12637,6 +12641,11 @@
- all transactions. Any subset of the default is
- legal. (For example, to only log transactions that modify the
- @file{*,v} files, use @samp{LogHistory=TMAR}.)
+@@ -13478,6 +13482,11 @@
+
+ @xref{verifymsg}, for more information on how verifymsg
+ may be used.
+
+@cindex tag, in CVSROOT/config
+@item tag=@var{value}
diff --git a/devel/cvs/patches/patch-ac b/devel/cvs/patches/patch-ac
index 2dc0eae3f85..9b4fe6f75d1 100644
--- a/devel/cvs/patches/patch-ac
+++ b/devel/cvs/patches/patch-ac
@@ -1,39 +1,22 @@
-$NetBSD: patch-ac,v 1.4 2000/10/18 03:31:16 hubertf Exp $
+$NetBSD: patch-ac,v 1.5 2002/11/24 21:31:22 hubertf Exp $
---- src/Makefile.in.orig Fri Sep 8 20:28:03 2000
+--- src/Makefile.in.orig Wed Apr 17 21:47:47 2002
+++ src/Makefile.in
-@@ -86,10 +86,8 @@
- @cd ..; $(MAKE) lint SUBDIRS=src
+@@ -180,7 +180,7 @@
+ cvs_LDADD = \
+ ../diff/libdiff.a \
+ ../lib/libcvs.a \
+- ../zlib/libz.a
++ -lz
+
+
+ # extra clean targets
+@@ -222,7 +222,7 @@
+ update.$(OBJEXT) version.$(OBJEXT) vers_ts.$(OBJEXT) \
+ watch.$(OBJEXT) wrapper.$(OBJEXT) zlib.$(OBJEXT)
+ cvs_OBJECTS = $(am_cvs_OBJECTS)
+-cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
++cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
+ cvs_LDFLAGS =
+ SCRIPTS = $(bin_SCRIPTS)
- install: installdirs
-- @for prog in $(PROGS); do \
-- echo Installing $$prog in $(bindir); \
-- $(INSTALL) $$prog $(bindir)/$$prog ; \
-- done
-+ $(INSTALL_PROGRAM) cvs $(bindir)/
-+ $(BSD_INSTALL_SCRIPT) cvsbug $(bindir)/
-
- installdirs:
- $(SHELL) $(top_srcdir)/mkinstalldirs $(bindir)
-@@ -140,10 +138,10 @@
-
- # Linking rules.
-
--$(PROGS): ../lib/libcvs.a ../zlib/libz.a ../diff/libdiff.a
-+$(PROGS): ../lib/libcvs.a ../diff/libdiff.a
-
- cvs: $(OBJECTS)
-- $(CC) $(OBJECTS) ../lib/libcvs.a ../zlib/libz.a ../diff/libdiff.a $(LIBS) $(LDFLAGS) -o $@
-+ $(CC) $(OBJECTS) ../lib/libcvs.a -lz ../diff/libdiff.a $(LIBS) $(LDFLAGS) -o $@
-
- xlint: $(SOURCES)
- files= ; \
-@@ -177,7 +175,7 @@
- $(CC) $(CPPFLAGS) $(INCLUDES) -I$(top_srcdir)/diff $(DEFS) $(CFLAGS) -c $(srcdir)/rcscmds.c
-
- zlib.o: zlib.c $(top_srcdir)/zlib/zlib.h
-- $(CC) $(CPPFLAGS) $(INCLUDES) -I$(top_srcdir)/zlib $(DEFS) $(CFLAGS) -c $(srcdir)/zlib.c
-+ $(CC) $(CPPFLAGS) $(INCLUDES) $(DEFS) $(CFLAGS) -c $(srcdir)/zlib.c
-
- subdir = src
- Makefile: ../config.status Makefile.in
diff --git a/devel/cvs/patches/patch-ad b/devel/cvs/patches/patch-ad
deleted file mode 100644
index 528fd7d43f0..00000000000
--- a/devel/cvs/patches/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2000/10/18 03:31:16 hubertf Exp $
-
---- contrib/Makefile.in.orig Fri Sep 8 20:28:02 2000
-+++ contrib/Makefile.in
-@@ -37,7 +37,7 @@
- # Use cp if you don't have install.
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT}
-
- DISTFILES = \
- ChangeLog README .cvsignore intro.doc \
-@@ -80,10 +80,10 @@
-
- install: all installdirs
- for f in $(CONTRIB_FILES) ; do\
-- $(INSTALL_DATA) $(srcdir)/$$f $(libdir)/cvs/contrib/$$f; \
-+ $(INSTALL_DATA) $(srcdir)/$$f $(prefix)/share/cvs/contrib/$$f; \
- done
- for f in $(CONTRIB_PROGS) ; do\
-- $(INSTALL_PROGRAM) $$f $(libdir)/cvs/contrib/$$f; \
-+ $(INSTALL_PROGRAM) $$f $(prefix)/share/cvs/contrib/$$f; \
- done
- for f in $(PROGS) ; do\
- $(INSTALL_PROGRAM) $$f $(bindir)/$$f; \
-@@ -91,7 +91,7 @@
- .PHONY: install
-
- installdirs:
-- $(top_srcdir)/mkinstalldirs $(libdir)/cvs/contrib
-+ $(top_srcdir)/mkinstalldirs $(prefix)/share/cvs/contrib
- .PHONY: installdirs
-
- tags:
diff --git a/devel/cvs/patches/patch-ae b/devel/cvs/patches/patch-ae
index 153b76bb33c..620f0ca05e5 100644
--- a/devel/cvs/patches/patch-ae
+++ b/devel/cvs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2000/10/21 19:29:06 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2002/11/24 21:31:23 hubertf Exp $
---- src/rcs.c.orig Mon Aug 21 23:16:38 2000
+--- src/rcs.c.orig Tue Mar 19 20:15:45 2002
+++ src/rcs.c
-@@ -3348,7 +3348,7 @@
+@@ -3466,7 +3466,7 @@
size_t len;
};
#define KEYWORD_INIT(s) (s), sizeof (s) - 1
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/21 19:29:06 wiz Exp $
{
{ KEYWORD_INIT ("Author") },
{ KEYWORD_INIT ("Date") },
-@@ -3361,6 +3361,7 @@
+@@ -3479,6 +3479,7 @@
{ KEYWORD_INIT ("Revision") },
{ KEYWORD_INIT ("Source") },
{ KEYWORD_INIT ("State") },
@@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/21 19:29:06 wiz Exp $
{ NULL, 0 }
};
enum keyword
-@@ -3375,7 +3376,8 @@
+@@ -3493,7 +3494,8 @@
KEYWORD_RCSFILE,
KEYWORD_REVISION,
KEYWORD_SOURCE,
@@ -29,7 +29,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/21 19:29:06 wiz Exp $
};
/* Convert an RCS date string into a readable string. This is like
-@@ -3512,6 +3514,11 @@
+@@ -3630,6 +3632,11 @@
return;
}
@@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/21 19:29:06 wiz Exp $
/* If we are using -kkvl, dig out the locker information if any. */
locker = NULL;
if (expand == KFLAG_KVL)
-@@ -3603,6 +3610,7 @@
+@@ -3721,6 +3728,7 @@
case KEYWORD_HEADER:
case KEYWORD_ID:
@@ -49,12 +49,12 @@ $NetBSD: patch-ae,v 1.3 2000/10/21 19:29:06 wiz Exp $
{
char *path;
int free_path;
-@@ -4234,7 +4242,7 @@
+@@ -4352,7 +4360,7 @@
if (info != NULL)
{
/* If the size of `devtype' changes, fix the sscanf call also */
- char devtype[16];
+ char devtype[16+1];
- if (sscanf (info->data, "%16s %lu",
+ if (sscanf (info->data, "%15s %lu",
devtype, &devnum_long) < 2)
diff --git a/devel/cvs/patches/patch-af b/devel/cvs/patches/patch-af
index 9a681c8cbc2..37c7580389c 100644
--- a/devel/cvs/patches/patch-af
+++ b/devel/cvs/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2001/04/13 05:33:17 itojun Exp $
+$NetBSD: patch-af,v 1.6 2002/11/24 21:31:23 hubertf Exp $
---- src/update.c.orig Wed Jul 26 21:29:01 2000
+--- src/update.c.orig Sun Jul 8 22:51:46 2001
+++ src/update.c
-@@ -1374,11 +1374,18 @@
+@@ -1403,11 +1403,18 @@
xchmod (finfo->file, 1);
else
{
diff --git a/devel/cvs/patches/patch-ah b/devel/cvs/patches/patch-ah
index 57ac7bb100d..95eca0cb1bd 100644
--- a/devel/cvs/patches/patch-ah
+++ b/devel/cvs/patches/patch-ah
@@ -1,11 +1,11 @@
-$NetBSD: patch-ah,v 1.3 2000/10/21 19:29:06 wiz Exp $
+$NetBSD: patch-ah,v 1.4 2002/11/24 21:31:23 hubertf Exp $
---- src/mkmodules.c.orig Fri Sep 8 17:28:36 2000
+--- src/mkmodules.c.orig Fri Sep 7 16:22:39 2001
+++ src/mkmodules.c
-@@ -297,6 +297,9 @@
- "# Set `LogHistory' to `all' or `TOFEWGCMAR' to log all transactions to the\n",
- "# history file, or a subset as needed (ie `TMAR' logs all write operations)\n",
- "#LogHistory=TOFEWGCMAR\n",
+@@ -307,6 +307,9 @@
+ "# repositories. Set it to `never' (the previous CVS behavior) to prevent\n",
+ "# verifymsg scripts from changing the log message.\n",
+ "#RereadLogAfterVerify=always\n",
+ "\n",
+ "# Set this to the name of a local tag to use in addition to Id\n",
+ "#tag=OurTag\n",
diff --git a/devel/cvs/patches/patch-ai b/devel/cvs/patches/patch-ai
index 48b24124c9b..94f4bc39a4a 100644
--- a/devel/cvs/patches/patch-ai
+++ b/devel/cvs/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2000/10/21 19:29:06 wiz Exp $
+$NetBSD: patch-ai,v 1.4 2002/11/24 21:31:23 hubertf Exp $
---- src/parseinfo.c.orig Mon Mar 13 20:15:31 2000
+--- src/parseinfo.c.orig Fri Aug 24 19:47:02 2001
+++ src/parseinfo.c
-@@ -335,6 +335,14 @@
+@@ -340,6 +340,14 @@
goto error_return;
}
}
diff --git a/devel/cvs/patches/patch-aj b/devel/cvs/patches/patch-aj
deleted file mode 100644
index c3e240d9b32..00000000000
--- a/devel/cvs/patches/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2001/04/30 17:33:47 wiz Exp $
-
---- man/cvs.1.orig Wed May 3 20:47:47 2000
-+++ man/cvs.1
-@@ -1708,8 +1708,13 @@
- .B update
- keeps you informed of its progress by printing a line for each file,
- prefaced with one of the characters
--.` "U A R M C ?"
-+.` "P U A R M C ?"
- to indicate the status of the file:
-+.TP 1i
-+\fBP\fP \fIfile\fP
-+The file has been \fIpatched\fP to be in sync with the version in the
-+repository. Only a diff has been applied, in contrast to \fBU\fP,
-+where the whole file is fetched.
- .TP 1i
- \fBU\fP \fIfile\fP
- The file was brought \fIup to date\fP with respect to the repository.
diff --git a/devel/cvs/patches/patch-ak b/devel/cvs/patches/patch-ak
index dbf4698e7cf..e92d1ef8060 100644
--- a/devel/cvs/patches/patch-ak
+++ b/devel/cvs/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.3 2000/10/18 03:31:16 hubertf Exp $
+$NetBSD: patch-ak,v 1.4 2002/11/24 21:31:24 hubertf Exp $
---- src/checkout.c.orig Wed Jun 28 06:15:47 2000
+--- src/checkout.c.orig Thu Jul 19 18:35:32 2001
+++ src/checkout.c
-@@ -179,7 +179,7 @@
+@@ -191,7 +191,7 @@
case 'p':
pipeout = 1;
run_module_prog = 0; /* don't run module prog when piping */
diff --git a/devel/cvs/patches/patch-al b/devel/cvs/patches/patch-al
index 88f88df8126..87007abe2e4 100644
--- a/devel/cvs/patches/patch-al
+++ b/devel/cvs/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.4 2000/10/18 03:31:16 hubertf Exp $
+$NetBSD: patch-al,v 1.5 2002/11/24 21:31:24 hubertf Exp $
---- src/client.c.orig Thu Jul 6 18:20:41 2000
+--- src/client.c.orig Thu Aug 9 22:27:26 2001
+++ src/client.c
-@@ -4455,6 +4455,16 @@
+@@ -4546,6 +4546,16 @@
error (1, 0,
"This server does not support the global -n option.");
}
diff --git a/devel/cvs/patches/patch-am b/devel/cvs/patches/patch-am
index 2c527592873..9f322004390 100644
--- a/devel/cvs/patches/patch-am
+++ b/devel/cvs/patches/patch-am
@@ -1,16 +1,16 @@
-$NetBSD: patch-am,v 1.5 2000/10/21 19:29:06 wiz Exp $
+$NetBSD: patch-am,v 1.6 2002/11/24 21:31:24 hubertf Exp $
---- src/cvs.h.orig Sat Jul 8 21:57:21 2000
+--- src/cvs.h.orig Fri Aug 24 19:47:02 2001
+++ src/cvs.h
-@@ -363,6 +363,7 @@
+@@ -366,6 +366,7 @@
extern int use_editor;
extern int cvswrite;
extern mode_t cvsumask;
+extern char *RCS_citag;
- /* Access method specified in CVSroot. */
- typedef enum {
-@@ -394,6 +395,7 @@
+
+
+@@ -384,6 +385,7 @@
extern int trace; /* Show all commands */
extern int noexec; /* Don't modify disk anywhere */
@@ -18,7 +18,7 @@ $NetBSD: patch-am,v 1.5 2000/10/21 19:29:06 wiz Exp $
extern int logoff; /* Don't write history entry */
extern int top_level_admin;
-@@ -654,6 +656,7 @@
+@@ -660,6 +662,7 @@
#define RUN_STDOUT_APPEND 0x0004 /* append to stdout, don't truncate */
#define RUN_STDERR_APPEND 0x0008 /* append to stderr, don't truncate */
#define RUN_SIGIGNORE 0x0010 /* ignore interrupts for command */
diff --git a/devel/cvs/patches/patch-an b/devel/cvs/patches/patch-an
index 05575ad1cc0..0dbe74b2fb2 100644
--- a/devel/cvs/patches/patch-an
+++ b/devel/cvs/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.2 2000/10/18 03:31:16 hubertf Exp $
+$NetBSD: patch-an,v 1.3 2002/11/24 21:31:24 hubertf Exp $
---- src/history.c.orig Wed May 3 00:13:25 2000
+--- src/history.c.orig Thu May 3 21:35:16 2001
+++ src/history.c
-@@ -730,7 +730,7 @@
+@@ -731,7 +731,7 @@
if (trace)
fprintf (stderr, "%s-> fopen(%s,a)\n",
CLIENT_SERVER_STR, fname);
diff --git a/devel/cvs/patches/patch-ao b/devel/cvs/patches/patch-ao
index 6ab471c81bc..da2af580017 100644
--- a/devel/cvs/patches/patch-ao
+++ b/devel/cvs/patches/patch-ao
@@ -1,17 +1,17 @@
-$NetBSD: patch-ao,v 1.2 2000/10/18 03:31:16 hubertf Exp $
+$NetBSD: patch-ao,v 1.3 2002/11/24 21:31:24 hubertf Exp $
---- src/lock.c.orig Thu Jul 27 18:49:27 2000
+--- src/lock.c.orig Wed Sep 26 20:54:09 2001
+++ src/lock.c
-@@ -395,7 +395,7 @@
- FILE *fp;
- char *tmp;
+@@ -403,7 +403,7 @@
+ (void) fprintf (stderr, "%s-> Reader_Lock(%s)\n", CLIENT_SERVER_STR,
+ xrepository);
- if (noexec)
+ if (nolock)
return (0);
/* we only do one directory at a time for read locks! */
-@@ -467,7 +467,7 @@
+@@ -475,7 +475,7 @@
{
char *wait_repos;
diff --git a/devel/cvs/patches/patch-ap b/devel/cvs/patches/patch-ap
index c9434200919..e3578e1aaab 100644
--- a/devel/cvs/patches/patch-ap
+++ b/devel/cvs/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.3 2000/10/21 19:29:06 wiz Exp $
+$NetBSD: patch-ap,v 1.4 2002/11/24 21:31:24 hubertf Exp $
---- src/main.c.orig Thu Sep 7 01:35:04 2000
+--- src/main.c.orig Tue Mar 19 20:15:45 2002
+++ src/main.c
@@ -41,6 +41,7 @@
int quiet = 0;
@@ -18,7 +18,7 @@ $NetBSD: patch-ap,v 1.3 2000/10/21 19:29:06 wiz Exp $
char *CurDir;
-@@ -239,6 +241,7 @@
+@@ -249,6 +251,7 @@
" -w Make checked-out files read-write (default).\n",
" -l Turn history logging off.\n",
" -n Do not execute anything that will change the disk.\n",
@@ -26,7 +26,7 @@ $NetBSD: patch-ap,v 1.3 2000/10/21 19:29:06 wiz Exp $
" -t Show trace of program execution -- try with -n.\n",
" -v CVS version and copyright.\n",
" -T tmpdir Use 'tmpdir' for temporary files.\n",
-@@ -432,7 +435,7 @@
+@@ -407,7 +410,7 @@
int help = 0; /* Has the user asked for help? This
lets us support the `cvs -H cmd'
convention to give help for cmd. */
@@ -35,7 +35,7 @@ $NetBSD: patch-ap,v 1.3 2000/10/21 19:29:06 wiz Exp $
static struct option long_options[] =
{
{"help", 0, NULL, 'H'},
-@@ -562,6 +565,8 @@
+@@ -537,6 +540,8 @@
break;
case 'n':
noexec = 1;
@@ -44,12 +44,3 @@ $NetBSD: patch-ap,v 1.3 2000/10/21 19:29:06 wiz Exp $
case 'l': /* Fall through */
logoff = 1;
break;
-@@ -936,7 +941,7 @@
- /*
- * Check to see if the repository exists.
- */
-- if (!client_active)
-+ if (!client_active && !nolock)
- {
- char *path;
- int save_errno;
diff --git a/devel/cvs/patches/patch-aq b/devel/cvs/patches/patch-aq
index dac0f4bad84..a77d6e1ffa2 100644
--- a/devel/cvs/patches/patch-aq
+++ b/devel/cvs/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.2 2000/10/18 03:31:16 hubertf Exp $
+$NetBSD: patch-aq,v 1.3 2002/11/24 21:31:25 hubertf Exp $
---- src/recurse.c.orig Thu Jun 22 00:28:37 2000
+--- src/recurse.c.orig Wed Jun 27 06:20:51 2001
+++ src/recurse.c
-@@ -508,7 +508,7 @@
+@@ -511,7 +511,7 @@
if (frame->flags == R_SKIP_ALL)
return (0);
@@ -11,7 +11,7 @@ $NetBSD: patch-aq,v 1.2 2000/10/18 03:31:16 hubertf Exp $
/* The fact that locks are not active here is what makes us fail to have
the
-@@ -550,7 +550,7 @@
+@@ -553,7 +553,7 @@
*/
if (server_active
/* If there are writelocks around, we cannot pause here. */
diff --git a/devel/cvs/patches/patch-ar b/devel/cvs/patches/patch-ar
index 9267ecb3153..09533fb3958 100644
--- a/devel/cvs/patches/patch-ar
+++ b/devel/cvs/patches/patch-ar
@@ -1,24 +1,24 @@
-$NetBSD: patch-ar,v 1.4 2000/10/18 03:31:16 hubertf Exp $
+$NetBSD: patch-ar,v 1.5 2002/11/24 21:31:25 hubertf Exp $
---- src/server.c.orig Fri Jul 28 22:18:40 2000
+--- src/server.c.orig Tue Mar 19 20:15:45 2002
+++ src/server.c
-@@ -796,6 +796,7 @@
+@@ -782,6 +782,7 @@
nothing. But for rsh, we need to do it now. */
- parse_config (CVSroot_directory);
+ parse_config (current_parsed_root->directory);
+ if (!nolock) {
- path = malloc (strlen (CVSroot_directory)
+ path = malloc (strlen (current_parsed_root->directory)
+ sizeof (CVSROOTADM)
- + 10);
-@@ -813,6 +814,7 @@
+ + 2);
+@@ -799,6 +800,7 @@
pending_error = save_errno;
}
free (path);
+ }
#ifdef HAVE_PUTENV
- env = malloc (strlen (CVSROOT_ENV) + strlen (CVSroot_directory) + 1 + 1);
-@@ -2194,6 +2196,8 @@
+ env = malloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2);
+@@ -2181,6 +2183,8 @@
{
case 'n':
noexec = 1;
@@ -27,7 +27,7 @@ $NetBSD: patch-ar,v 1.4 2000/10/18 03:31:16 hubertf Exp $
break;
case 'q':
quiet = 1;
-@@ -5172,6 +5176,7 @@
+@@ -5283,6 +5287,7 @@
const char *username;
{
struct passwd *pw;
@@ -35,19 +35,19 @@ $NetBSD: patch-ar,v 1.4 2000/10/18 03:31:16 hubertf Exp $
pw = getpwnam (username);
if (pw == NULL)
-@@ -5231,7 +5236,15 @@
+@@ -5342,7 +5347,15 @@
}
}
-
+
- if (setuid (pw->pw_uid) < 0)
+#ifdef SETXID_SUPPORT
+ /* Honor the setuid bit iff set. */
+ if (getuid() != geteuid())
-+ rc = setuid (geteuid ());
-+ else
++ rc = setuid (geteuid ());
++ else
+#else
+ rc = setuid (pw->pw_uid);
-+#endif
++#endif
+ if (rc < 0)
{
/* Note that this means that if run as a non-root user,
diff --git a/devel/cvs/patches/patch-as b/devel/cvs/patches/patch-as
index c2280a977b5..9558ccccca7 100644
--- a/devel/cvs/patches/patch-as
+++ b/devel/cvs/patches/patch-as
@@ -1,13 +1,13 @@
-$NetBSD: patch-as,v 1.2 2000/10/18 03:31:16 hubertf Exp $
+$NetBSD: patch-as,v 1.3 2002/11/24 21:31:25 hubertf Exp $
---- src/tag.c.orig Wed Jun 14 21:32:51 2000
+--- src/tag.c.orig Wed Jun 6 21:43:04 2001
+++ src/tag.c
-@@ -868,7 +868,7 @@
+@@ -1295,7 +1295,7 @@
/* The tags is valid but not mentioned in val-tags. Add it. */
datum value;
-- if (noexec)
-+ if (nolock)
+- if (noexec || nowrite)
++ if (noexec || nowrite || nolock)
{
if (db != NULL)
dbm_close (db);
diff --git a/devel/cvs/patches/patch-at b/devel/cvs/patches/patch-at
index 04677b84897..d0460be353d 100644
--- a/devel/cvs/patches/patch-at
+++ b/devel/cvs/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.4 2000/10/18 03:31:17 hubertf Exp $
+$NetBSD: patch-at,v 1.5 2002/11/24 21:31:25 hubertf Exp $
---- src/logmsg.c.orig Wed Mar 1 17:33:39 2000
+--- src/logmsg.c.orig Fri Sep 14 19:12:10 2001
+++ src/logmsg.c
-@@ -283,7 +283,7 @@
+@@ -298,7 +298,7 @@
run_setup (editinfo_editor ? editinfo_editor : Editor);
run_arg (fname);
if ((retcode = run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
@@ -11,7 +11,7 @@ $NetBSD: patch-at,v 1.4 2000/10/18 03:31:17 hubertf Exp $
error (editinfo_editor ? 1 : 0, retcode == -1 ? errno : 0,
editinfo_editor ? "Logfile verification failed" :
"warning: editor session failed");
-@@ -590,6 +590,15 @@
+@@ -686,6 +686,15 @@
xrealloc (str_list,
strlen (str_list) + strlen (p->key) + 5);
(void) strcat (str_list, p->key);
diff --git a/devel/cvs/patches/patch-au b/devel/cvs/patches/patch-au
index 5789185aab5..40bc57188c0 100644
--- a/devel/cvs/patches/patch-au
+++ b/devel/cvs/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.3 2000/10/18 03:31:17 hubertf Exp $
+$NetBSD: patch-au,v 1.4 2002/11/24 21:31:25 hubertf Exp $
---- src/commit.c.orig Wed Jul 26 21:29:01 2000
+--- src/commit.c.orig Fri Aug 24 19:47:02 2001
+++ src/commit.c
-@@ -996,7 +996,9 @@
+@@ -982,7 +982,9 @@
xmalloc (sizeof (struct logfile_info)));
li->type = status;
li->tag = xstrdup (vers->tag);
@@ -13,7 +13,7 @@ $NetBSD: patch-au,v 1.3 2000/10/18 03:31:17 hubertf Exp $
li->rev_new = NULL;
p->data = (char *) li;
(void) addnode (ulist, p);
-@@ -1497,7 +1499,7 @@
+@@ -1489,7 +1491,7 @@
run_print (stdout);
cvs_output ("'\n", 0);
cvs_flushout ();
diff --git a/devel/cvs/patches/patch-av b/devel/cvs/patches/patch-av
index 742c3865f47..34938afe826 100644
--- a/devel/cvs/patches/patch-av
+++ b/devel/cvs/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.5 2001/03/04 01:08:02 assar Exp $
+$NetBSD: patch-av,v 1.6 2002/11/24 21:31:25 hubertf Exp $
---- configure.in.orig Sun Mar 4 00:31:29 2001
-+++ configure.in Sun Mar 4 00:47:31 2001
-@@ -110,16 +110,19 @@
+--- configure.in.orig Tue Mar 26 17:16:02 2002
++++ configure.in
+@@ -223,16 +223,19 @@
dnl libkrb in the system libraries, so --with-krb4=value needs to
dnl override the system -lkrb.
dnl
@@ -24,7 +24,7 @@ $NetBSD: patch-av,v 1.5 2001/03/04 01:08:02 assar Exp $
krb_h=
AC_MSG_CHECKING([for krb.h])
if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then
-@@ -159,7 +162,7 @@
+@@ -272,7 +275,7 @@
[LDFLAGS=$hold_ldflags
# Using open here instead of printf so we don't
# get confused by the cached value for printf from above.
@@ -33,7 +33,7 @@ $NetBSD: patch-av,v 1.5 2001/03/04 01:08:02 assar Exp $
LDFLAGS=$hold_ldflags
else
AC_CHECK_LIB(krb,printf,[krb_lib=yes krb_libdir=])
-@@ -167,7 +170,7 @@
+@@ -280,7 +283,7 @@
if test -n "$krb_lib"; then
AC_DEFINE(HAVE_KERBEROS)
test -n "${krb_libdir}" && LIBS="${LIBS} -L${krb_libdir}"
@@ -42,55 +42,3 @@ $NetBSD: patch-av,v 1.5 2001/03/04 01:08:02 assar Exp $
# Put -L${krb_libdir} in LDFLAGS temporarily so that it appears before
# -ldes in the command line. Don't do it permanently so that we honor
# the user's setting for LDFLAGS
-@@ -181,22 +184,26 @@
- fi
- fi
- AC_CHECK_FUNCS(krb_get_err_text)
-+fi # KRB4 empty
-
- dnl
- dnl Use --with-gssapi=DIR to enable GSSAPI support.
- dnl
--GSSAPI=/usr/cygnus/kerbnet
-+GSSAPI=
- define(WITH_GSSAPI,[
- AC_ARG_WITH([gssapi],
- [ --with-gssapi=value GSSAPI directory],
-- [GSSAPI=$withval],
-+ [if test X"$withval" != X"no"; then GSSAPI=$withval; fi],
- )dnl
-+if test X"$GSSAPI" != X""; then
- echo "default place for GSSAPI is $GSSAPI"
-+fi
- AC_SUBST(GSSAPI)])dnl
- WITH_GSSAPI
-
-+if test X"$GSSAPI" != X""; then
- hold_cppflags=$CPPFLAGS
--CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
-+CPPFLAGS="$CPPFLAGS -I$GSSAPI/include -I$GSSAPI/include/krb5 "
- AC_CHECK_HEADERS(krb5.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
- CPPFLAGS=$hold_cppflags
-
-@@ -204,10 +211,10 @@
- (test "$ac_cv_header_gssapi_h" = "yes" ||
- test "$ac_cv_header_gssapi_gssapi_h" = "yes"); then
- AC_DEFINE(HAVE_GSSAPI)
-- includeopt="${includeopt} -I$GSSAPI/include"
-+ includeopt="${includeopt} -I$GSSAPI/include -I$GSSAPI/include/krb5"
- # FIXME: This is ugly, but these things don't seem to be standardized.
-- if test "$ac_cv_header_gssapi_h" = "yes"; then
-- LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken"
-+ if test "$ac_cv_header_gssapi_gssapi_generic_h" = "no"; then
-+ LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -lcom_err -ldes -lroken"
- else
- LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
- fi
-@@ -223,6 +230,7 @@
- # there, an_to_ln.o refers to things defined only in -lgen.
- AC_CHECK_LIB(gen, compile)
- fi
-+fi # GSSAPI empty
-
- dnl
- dnl Use --with-encryption to turn on encryption support
diff --git a/devel/cvs/patches/patch-ax b/devel/cvs/patches/patch-ax
deleted file mode 100644
index bdc99ab050d..00000000000
--- a/devel/cvs/patches/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ax,v 1.3 2000/10/18 03:31:17 hubertf Exp $
-
---- diff/Makefile.in.orig Thu May 6 18:32:55 1999
-+++ diff/Makefile.in
-@@ -31,7 +31,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-
--PR_PROGRAM = /bin/pr
-+PR_PROGRAM = /usr/bin/pr
-
- #### End of system configuration section. ####
-
diff --git a/devel/cvs/patches/patch-ay b/devel/cvs/patches/patch-ay
index 50e75d730c6..a6300695fce 100644
--- a/devel/cvs/patches/patch-ay
+++ b/devel/cvs/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.2 2000/02/23 06:48:56 mycroft Exp $
+$NetBSD: patch-ay,v 1.3 2002/11/24 21:31:26 hubertf Exp $
---- src/run.c.orig Thu Dec 18 10:18:50 1997
-+++ src/run.c Wed Feb 23 01:19:27 2000
-@@ -188,6 +188,13 @@
+--- src/run.c.orig Wed Jan 24 04:35:10 2001
++++ src/run.c
+@@ -189,6 +189,13 @@
#endif
if (pid == 0)
{
diff --git a/devel/cvs/patches/patch-az b/devel/cvs/patches/patch-az
index 264ffaa6b4c..9530d53fff6 100644
--- a/devel/cvs/patches/patch-az
+++ b/devel/cvs/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.2 2000/10/18 03:31:17 hubertf Exp $
+$NetBSD: patch-az,v 1.3 2002/11/24 21:31:26 hubertf Exp $
---- src/modules.c.orig Wed Jul 26 21:29:01 2000
+--- src/modules.c.orig Thu Jun 21 23:23:09 2001
+++ src/modules.c
-@@ -740,7 +740,8 @@
+@@ -745,7 +745,8 @@
cvs_output ("'\n", 0);
cvs_flushout ();
}