- updated for 1.11.18

Changed files:
    cvs-acl.patch -> 1.4

diff --git a/cvs-acl.patch b/cvs-acl.patch
index 5fad864114abc709e28bb4744e54d4dc741c6838..c82707791eb97c6604cdecfb606714e6207eac1d 100644 (file)
--- a/cvs-acl.patch
+++ b/cvs-acl.patch
@@ -1,43 +1,6 @@
-diff -urN cvs-1.11.17.orig/aclconfig.default cvs-1.11.17/aclconfig.default
---- cvs-1.11.17.orig/aclconfig.default 1970-01-01 01:00:00.000000000 +0100
-+++ cvs-1.11.17/aclconfig.default      2004-06-17 14:33:44.000000000 +0200
-@@ -0,0 +1,33 @@
-+# Set `UseCVSACL' to yes to use CVS ACL feature.
-+UseCVSACL=yes
-+
-+# Default CVS ACL Permission are to use.
-+#CVSACLDefaultPermissions=a
-+
-+# Default file location for CVS ACL file (access) is CVSROOT/access.
-+# If you want to use a different location, define it below.
-+#CVSACLFileLocation=/path/to/cvs/access
-+
-+# Set `UseSystemGroups' to yes to use system group definitions (/etc/group).
-+UseSystemGroups=yes
-+
-+# Set `UseCVSGroups' to yes to use another group file.
-+#UseCVSGroups=yes
-+
-+# Default file location for CVS groups file is CVSROOT/group.
-+# If you want to use a different location, define it below.
-+#CVSGroupsFileLocation=/path/to/cvs/group
-+
-+# Set UseSeparateACLFileForEachDir to yes in order to use a
-+# separate 'access' file for each directory.
-+# This increased the performance if you have really big repository.
-+#UseSeparateACLFileForEachDir=no
-+
-+# If StopAtFirstPermissionDenied is set to yes
-+# operation will stop at first permission denied message.
-+# Default is no.
-+#StopAtFirstPermissionDenied=no
-+
-+# Set CVSServerRunAsUser to a system user, in order CVS server
-+# to run as.
-+#CVSServerRunAsUser=runascvsuser
-diff -urN cvs-1.11.17.orig/INSTALL.cvsacl cvs-1.11.17/INSTALL.cvsacl
---- cvs-1.11.17.orig/INSTALL.cvsacl    1970-01-01 01:00:00.000000000 +0100
-+++ cvs-1.11.17/INSTALL.cvsacl 2004-06-25 07:39:24.000000000 +0200
+diff -urN cvs-1.11.18.orig/INSTALL.cvsacl cvs-1.11.18/INSTALL.cvsacl
+--- cvs-1.11.18.orig/INSTALL.cvsacl    1970-01-01 01:00:00.000000000 +0100
++++ cvs-1.11.18/INSTALL.cvsacl 2004-11-14 14:00:39.000000000 +0100
 @@ -0,0 +1,23 @@
 +
 +Installation
@@ -62,9 +25,9 @@ diff -urN cvs-1.11.17.orig/INSTALL.cvsacl cvs-1.11.17/INSTALL.cvsacl
 +  "cvs -d /path/to/repository racl yourname:p -r ALL -d ALL"
 +  this command gives p (acl admin) rights to user (yourname),
 +  on all repository and tags/branches. 
-diff -urN cvs-1.11.17.orig/README.cvsacl cvs-1.11.17/README.cvsacl
---- cvs-1.11.17.orig/README.cvsacl     1970-01-01 01:00:00.000000000 +0100
-+++ cvs-1.11.17/README.cvsacl  2004-06-25 07:39:30.000000000 +0200
+diff -urN cvs-1.11.18.orig/README.cvsacl cvs-1.11.18/README.cvsacl
+--- cvs-1.11.18.orig/README.cvsacl     1970-01-01 01:00:00.000000000 +0100
++++ cvs-1.11.18/README.cvsacl  2004-11-14 14:00:39.000000000 +0100
 @@ -0,0 +1,282 @@
 +
 +CVS Access Control List Extension Patch
@@ -348,9 +311,93 @@ diff -urN cvs-1.11.17.orig/README.cvsacl cvs-1.11.17/README.cvsacl
 +f src/main.c HEAD | userX:wcd group1:r | defaults:r
 +
 +
-diff -urN cvs-1.11.17.orig/src/acl.c cvs-1.11.17/src/acl.c
---- cvs-1.11.17.orig/src/acl.c 1970-01-01 01:00:00.000000000 +0100
-+++ cvs-1.11.17/src/acl.c      2004-06-24 10:52:51.000000000 +0200
+diff -urN cvs-1.11.18.orig/aclconfig.default cvs-1.11.18/aclconfig.default
+--- cvs-1.11.18.orig/aclconfig.default 1970-01-01 01:00:00.000000000 +0100
++++ cvs-1.11.18/aclconfig.default      2004-11-14 14:00:39.000000000 +0100
+@@ -0,0 +1,33 @@
++# Set `UseCVSACL' to yes to use CVS ACL feature.
++UseCVSACL=yes
++
++# Default CVS ACL Permission are to use.
++#CVSACLDefaultPermissions=a
++
++# Default file location for CVS ACL file (access) is CVSROOT/access.
++# If you want to use a different location, define it below.
++#CVSACLFileLocation=/path/to/cvs/access
++
++# Set `UseSystemGroups' to yes to use system group definitions (/etc/group).
++UseSystemGroups=yes
++
++# Set `UseCVSGroups' to yes to use another group file.
++#UseCVSGroups=yes
++
++# Default file location for CVS groups file is CVSROOT/group.
++# If you want to use a different location, define it below.
++#CVSGroupsFileLocation=/path/to/cvs/group
++
++# Set UseSeparateACLFileForEachDir to yes in order to use a
++# separate 'access' file for each directory.
++# This increased the performance if you have really big repository.
++#UseSeparateACLFileForEachDir=no
++
++# If StopAtFirstPermissionDenied is set to yes
++# operation will stop at first permission denied message.
++# Default is no.
++#StopAtFirstPermissionDenied=no
++
++# Set CVSServerRunAsUser to a system user, in order CVS server
++# to run as.
++#CVSServerRunAsUser=runascvsuser
+diff -urN cvs-1.11.18.orig/src/Makefile.am cvs-1.11.18/src/Makefile.am
+--- cvs-1.11.18.orig/src/Makefile.am   2004-11-14 13:58:12.000000000 +0100
++++ cvs-1.11.18/src/Makefile.am        2004-11-14 14:00:39.000000000 +0100
+@@ -29,6 +29,7 @@
+ 
+ # The cvs executable
+ cvs_SOURCES = \
++      acl.c \
+       add.c \
+       admin.c \
+       annotate.c \
+diff -urN cvs-1.11.18.orig/src/Makefile.in cvs-1.11.18/src/Makefile.in
+--- cvs-1.11.18.orig/src/Makefile.in   2004-11-11 19:17:20.000000000 +0100
++++ cvs-1.11.18/src/Makefile.in        2004-11-14 14:52:25.000000000 +0100
+@@ -67,11 +67,11 @@
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+-am_cvs_OBJECTS = add.$(OBJEXT) admin.$(OBJEXT) annotate.$(OBJEXT) \
+-      buffer.$(OBJEXT) checkin.$(OBJEXT) checkout.$(OBJEXT) \
+-      classify.$(OBJEXT) client.$(OBJEXT) commit.$(OBJEXT) \
+-      create_adm.$(OBJEXT) cvsrc.$(OBJEXT) diff.$(OBJEXT) \
+-      edit.$(OBJEXT) entries.$(OBJEXT) error.$(OBJEXT) \
++am_cvs_OBJECTS = acl.$(OBJEXT) add.$(OBJEXT) admin.$(OBJEXT) \
++      annotate.$(OBJEXT) buffer.$(OBJEXT) checkin.$(OBJEXT) \
++      checkout.$(OBJEXT) classify.$(OBJEXT) client.$(OBJEXT) \
++      commit.$(OBJEXT) create_adm.$(OBJEXT) cvsrc.$(OBJEXT) \
++      diff.$(OBJEXT) edit.$(OBJEXT) entries.$(OBJEXT) error.$(OBJEXT) \
+       expand_path.$(OBJEXT) fileattr.$(OBJEXT) filesubr.$(OBJEXT) \
+       find_names.$(OBJEXT) hardlink.$(OBJEXT) hash.$(OBJEXT) \
+       history.$(OBJEXT) ignore.$(OBJEXT) import.$(OBJEXT) \
+@@ -204,6 +204,7 @@
+ 
+ # The cvs executable
+ cvs_SOURCES = \
++      acl.c \
+       add.c \
+       admin.c \
+       annotate.c \
+@@ -382,6 +383,7 @@
+ distclean-compile:
+       -rm -f *.tab.c
+ 
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/add.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/admin.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/annotate.Po@am__quote@
+diff -urN cvs-1.11.18.orig/src/acl.c cvs-1.11.18/src/acl.c
+--- cvs-1.11.18.orig/src/acl.c 1970-01-01 01:00:00.000000000 +0100
++++ cvs-1.11.18/src/acl.c      2004-11-14 14:00:39.000000000 +0100
 @@ -0,0 +1,2028 @@
 +/*
 + * 
@@ -2380,9 +2427,9 @@ diff -urN cvs-1.11.17.orig/src/acl.c cvs-1.11.17/src/acl.c
 +              }
 +              
 +}
-diff -urN cvs-1.11.17.orig/src/add.c cvs-1.11.17/src/add.c
---- cvs-1.11.17.orig/src/add.c 2004-05-10 16:35:54.000000000 +0200
-+++ cvs-1.11.17/src/add.c      2004-08-04 10:40:18.602728608 +0200
+diff -urN cvs-1.11.18.orig/src/add.c cvs-1.11.18/src/add.c
+--- cvs-1.11.18.orig/src/add.c 2004-10-19 22:13:23.000000000 +0200
++++ cvs-1.11.18/src/add.c      2004-11-14 14:00:39.000000000 +0100
 @@ -400,6 +400,24 @@
                    }
                    else
@@ -2408,7 +2455,7 @@ diff -urN cvs-1.11.17.orig/src/add.c cvs-1.11.17/src/add.c
                        /* There is a user file, so build the entry for it */
                        if (build_entry (repository, finfo.file, vers->options,
                                         message, entries, vers->tag) != 0)
-@@ -656,6 +674,26 @@
+@@ -674,6 +692,26 @@
            && isdir (finfo.file)
            && !wrap_name_has (finfo.file, WRAP_TOCVS))
        {
@@ -2435,9 +2482,9 @@ diff -urN cvs-1.11.17.orig/src/add.c cvs-1.11.17/src/add.c
            err += add_directory (&finfo);
        }
        else
-diff -urN cvs-1.11.17.orig/src/annotate.c cvs-1.11.17/src/annotate.c
---- cvs-1.11.17.orig/src/annotate.c    2004-03-22 16:44:27.000000000 +0100
-+++ cvs-1.11.17/src/annotate.c 2004-08-04 10:40:18.603728456 +0200
+diff -urN cvs-1.11.18.orig/src/annotate.c cvs-1.11.18/src/annotate.c
+--- cvs-1.11.18.orig/src/annotate.c    2004-03-22 16:44:27.000000000 +0100
++++ cvs-1.11.18/src/annotate.c 2004-11-14 14:00:39.000000000 +0100
 @@ -276,6 +276,25 @@
      if (version == NULL)
          return 0;
@@ -2464,9 +2511,9 @@ diff -urN cvs-1.11.17.orig/src/annotate.c cvs-1.11.17/src/annotate.c
      /* Distinguish output for various files if we are processing
         several files.  */
      cvs_outerr ("\nAnnotations for ", 0);
-diff -urN cvs-1.11.17.orig/src/commit.c cvs-1.11.17/src/commit.c
---- cvs-1.11.17.orig/src/commit.c      2004-06-09 16:34:54.000000000 +0200
-+++ cvs-1.11.17/src/commit.c   2004-08-04 10:40:18.606728000 +0200
+diff -urN cvs-1.11.18.orig/src/commit.c cvs-1.11.18/src/commit.c
+--- cvs-1.11.18.orig/src/commit.c      2004-10-29 21:55:14.000000000 +0200
++++ cvs-1.11.18/src/commit.c   2004-11-14 14:00:39.000000000 +0100
 @@ -1299,6 +1299,34 @@
        return 0;
  
@@ -2502,9 +2549,9 @@ diff -urN cvs-1.11.17.orig/src/commit.c cvs-1.11.17/src/commit.c
      if (ci->status == T_MODIFIED)
      {
        if (finfo->rcs == NULL)
-diff -urN cvs-1.11.17.orig/src/cvs.h cvs-1.11.17/src/cvs.h
---- cvs-1.11.17.orig/src/cvs.h 2004-08-04 10:31:54.000000000 +0200
-+++ cvs-1.11.17/src/cvs.h      2004-08-04 10:40:18.609727544 +0200
+diff -urN cvs-1.11.18.orig/src/cvs.h cvs-1.11.18/src/cvs.h
+--- cvs-1.11.18.orig/src/cvs.h 2004-11-14 13:58:05.000000000 +0100
++++ cvs-1.11.18/src/cvs.h      2004-11-14 14:00:39.000000000 +0100
 @@ -195,6 +195,11 @@
  #define CVSROOTADM_PASSWD     "passwd"
  #define CVSROOTADM_CONFIG     "config"
@@ -2517,7 +2564,7 @@ diff -urN cvs-1.11.17.orig/src/cvs.h cvs-1.11.17/src/cvs.h
  #define CVSNULLREPOS          "Emptydir"      /* an empty directory */
  
  /* Other CVS file names */
-@@ -572,6 +577,18 @@
+@@ -567,6 +572,18 @@
  /* LockDir setting from CVSROOT/config.  */
  extern char *lock_dir;
  
@@ -2536,7 +2583,7 @@ diff -urN cvs-1.11.17.orig/src/cvs.h cvs-1.11.17/src/cvs.h
  void Scratch_Entry PROTO((List * list, const char *fname));
  void ParseTag PROTO((char **tagp, char **datep, int *nonbranchp));
  void WriteTag PROTO ((const char *dir, const char *tag, const char *date,
-@@ -867,6 +884,10 @@
+@@ -862,6 +879,10 @@
  int editors PROTO ((int argc, char **argv));
  int watchers PROTO ((int argc, char **argv));
  extern int annotate PROTO ((int argc, char **argv));
@@ -2547,9 +2594,9 @@ diff -urN cvs-1.11.17.orig/src/cvs.h cvs-1.11.17/src/cvs.h
  extern int add PROTO ((int argc, char **argv));
  extern int admin PROTO ((int argc, char **argv));
  extern int checkout PROTO ((int argc, char **argv));
-diff -urN cvs-1.11.17.orig/src/diff.c cvs-1.11.17/src/diff.c
---- cvs-1.11.17.orig/src/diff.c        2004-03-20 03:06:45.000000000 +0100
-+++ cvs-1.11.17/src/diff.c     2004-08-04 10:40:18.611727240 +0200
+diff -urN cvs-1.11.18.orig/src/diff.c cvs-1.11.18/src/diff.c
+--- cvs-1.11.18.orig/src/diff.c        2004-03-20 03:06:45.000000000 +0100
++++ cvs-1.11.18/src/diff.c     2004-11-14 14:00:39.000000000 +0100
 @@ -474,6 +474,43 @@
      {
        /* Skip all the following checks regarding the user file; we're
@@ -2637,10 +2684,10 @@ diff -urN cvs-1.11.17.orig/src/diff.c cvs-1.11.17/src/diff.c
      if (!quiet)
        error (0, 0, "Diffing %s", update_dir);
      return (R_PROCESS);
-diff -urN cvs-1.11.17.orig/src/import.c cvs-1.11.17/src/import.c
---- cvs-1.11.17.orig/src/import.c      2004-04-02 20:55:49.000000000 +0200
-+++ cvs-1.11.17/src/import.c   2004-08-04 10:40:18.634723744 +0200
-@@ -304,6 +304,20 @@
+diff -urN cvs-1.11.18.orig/src/import.c cvs-1.11.18/src/import.c
+--- cvs-1.11.18.orig/src/import.c      2004-10-29 21:55:14.000000000 +0200
++++ cvs-1.11.18/src/import.c   2004-11-14 14:00:39.000000000 +0100
+@@ -314,6 +314,20 @@
        error (1, 0, "attempt to import the repository");
      }
  
@@ -2661,9 +2708,9 @@ diff -urN cvs-1.11.17.orig/src/import.c cvs-1.11.17/src/import.c
      /*
       * Make all newly created directories writable.  Should really use a more
       * sophisticated security mechanism here.
-diff -urN cvs-1.11.17.orig/src/log.c cvs-1.11.17/src/log.c
---- cvs-1.11.17.orig/src/log.c 2004-05-10 15:37:16.000000000 +0200
-+++ cvs-1.11.17/src/log.c      2004-08-04 10:40:18.636723440 +0200
+diff -urN cvs-1.11.18.orig/src/log.c cvs-1.11.18/src/log.c
+--- cvs-1.11.18.orig/src/log.c 2004-05-10 15:37:16.000000000 +0200
++++ cvs-1.11.18/src/log.c      2004-11-14 14:00:39.000000000 +0100
 @@ -837,6 +837,25 @@
        return 1;
      }
@@ -2690,10 +2737,10 @@ diff -urN cvs-1.11.17.orig/src/log.c cvs-1.11.17/src/log.c
      if (log_data->sup_header || !log_data->nameonly)
      {
  
-diff -urN cvs-1.11.17.orig/src/main.c cvs-1.11.17/src/main.c
---- cvs-1.11.17.orig/src/main.c        2004-08-04 10:31:54.000000000 +0200
-+++ cvs-1.11.17/src/main.c     2004-08-04 10:40:18.639722984 +0200
-@@ -106,6 +106,10 @@
+diff -urN cvs-1.11.18.orig/src/main.c cvs-1.11.18/src/main.c
+--- cvs-1.11.18.orig/src/main.c        2004-11-14 13:58:05.000000000 +0100
++++ cvs-1.11.18/src/main.c     2004-11-14 14:00:39.000000000 +0100
+@@ -97,6 +97,10 @@
  } cmds[] =
  
  {
@@ -2704,7 +2751,7 @@ diff -urN cvs-1.11.17.orig/src/main.c cvs-1.11.17/src/main.c
      { "add",      "ad",       "new",       add,       CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
      { "admin",    "adm",      "rcs",       admin,     CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
      { "annotate", "ann",      NULL,        annotate,  CVS_CMD_USES_WORK_DIR },
-@@ -982,6 +986,9 @@
+@@ -959,6 +963,9 @@
                   if we didn't, then there would be no way to check in a new
                   CVSROOT/config file to fix the broken one!  */
                parse_config (current_parsed_root->directory);
@@ -2714,119 +2761,9 @@ diff -urN cvs-1.11.17.orig/src/main.c cvs-1.11.17/src/main.c
            }
  
  #ifdef CLIENT_SUPPORT
-diff -urN cvs-1.11.17.orig/src/Makefile.am cvs-1.11.17/src/Makefile.am
---- cvs-1.11.17.orig/src/Makefile.am   2004-08-04 10:32:06.000000000 +0200
-+++ cvs-1.11.17/src/Makefile.am        2004-08-04 10:40:18.594729824 +0200
-@@ -29,6 +29,7 @@
- 
- # The cvs executable
- cvs_SOURCES = \
-+      acl.c \
-       add.c \
-       admin.c \
-       annotate.c \
-diff -urN cvs-1.11.17.orig/src/Makefile.in cvs-1.11.17/src/Makefile.in
---- cvs-1.11.17.orig/src/Makefile.in   2004-06-09 16:46:19.000000000 +0200
-+++ cvs-1.11.17/src/Makefile.in        2004-08-04 10:40:18.600728912 +0200
-@@ -153,6 +153,7 @@
- 
- # The cvs executable
- cvs_SOURCES = \
-+      acl.c \
-       add.c \
-       admin.c \
-       annotate.c \
-@@ -253,11 +254,11 @@
- bin_PROGRAMS = cvs$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
- 
--am_cvs_OBJECTS = add.$(OBJEXT) admin.$(OBJEXT) annotate.$(OBJEXT) \
--      buffer.$(OBJEXT) checkin.$(OBJEXT) checkout.$(OBJEXT) \
--      classify.$(OBJEXT) client.$(OBJEXT) commit.$(OBJEXT) \
--      create_adm.$(OBJEXT) cvsrc.$(OBJEXT) diff.$(OBJEXT) \
--      edit.$(OBJEXT) entries.$(OBJEXT) error.$(OBJEXT) \
-+am_cvs_OBJECTS = acl.$(OBJEXT) add.$(OBJEXT) admin.$(OBJEXT) \
-+      annotate.$(OBJEXT) buffer.$(OBJEXT) checkin.$(OBJEXT) \
-+      checkout.$(OBJEXT) classify.$(OBJEXT) client.$(OBJEXT) \
-+      commit.$(OBJEXT) create_adm.$(OBJEXT) cvsrc.$(OBJEXT) \
-+      diff.$(OBJEXT) edit.$(OBJEXT) entries.$(OBJEXT) error.$(OBJEXT) \
-       expand_path.$(OBJEXT) fileattr.$(OBJEXT) filesubr.$(OBJEXT) \
-       find_names.$(OBJEXT) hardlink.$(OBJEXT) hash.$(OBJEXT) \
-       history.$(OBJEXT) ignore.$(OBJEXT) import.$(OBJEXT) \
-@@ -280,34 +281,34 @@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/add.Po ./$(DEPDIR)/admin.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/annotate.Po ./$(DEPDIR)/buffer.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/checkin.Po ./$(DEPDIR)/checkout.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/classify.Po ./$(DEPDIR)/client.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/commit.Po ./$(DEPDIR)/create_adm.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/cvsrc.Po ./$(DEPDIR)/diff.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/edit.Po ./$(DEPDIR)/entries.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/error.Po ./$(DEPDIR)/expand_path.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/fileattr.Po ./$(DEPDIR)/filesubr.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/find_names.Po ./$(DEPDIR)/hardlink.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/hash.Po ./$(DEPDIR)/history.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/ignore.Po ./$(DEPDIR)/import.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/lock.Po ./$(DEPDIR)/log.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/login.Po ./$(DEPDIR)/logmsg.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/main.Po ./$(DEPDIR)/mkmodules.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/modules.Po ./$(DEPDIR)/myndbm.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/no_diff.Po ./$(DEPDIR)/parseinfo.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/patch.Po ./$(DEPDIR)/rcs.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/rcscmds.Po ./$(DEPDIR)/recurse.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/release.Po ./$(DEPDIR)/remove.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/repos.Po ./$(DEPDIR)/root.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/run.Po ./$(DEPDIR)/scramble.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/server.Po ./$(DEPDIR)/stack.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/status.Po ./$(DEPDIR)/subr.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/tag.Po ./$(DEPDIR)/update.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/vers_ts.Po ./$(DEPDIR)/version.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/watch.Po ./$(DEPDIR)/wrapper.Po \
--@AMDEP_TRUE@  ./$(DEPDIR)/zlib.Po
-+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acl.Po ./$(DEPDIR)/add.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/admin.Po ./$(DEPDIR)/annotate.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/buffer.Po ./$(DEPDIR)/checkin.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/checkout.Po ./$(DEPDIR)/classify.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/client.Po ./$(DEPDIR)/commit.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/create_adm.Po ./$(DEPDIR)/cvsrc.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/diff.Po ./$(DEPDIR)/edit.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/entries.Po ./$(DEPDIR)/error.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/expand_path.Po ./$(DEPDIR)/fileattr.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/filesubr.Po ./$(DEPDIR)/find_names.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/hardlink.Po ./$(DEPDIR)/hash.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/history.Po ./$(DEPDIR)/ignore.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/import.Po ./$(DEPDIR)/lock.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/log.Po ./$(DEPDIR)/login.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/logmsg.Po ./$(DEPDIR)/main.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/mkmodules.Po ./$(DEPDIR)/modules.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/myndbm.Po ./$(DEPDIR)/no_diff.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/parseinfo.Po ./$(DEPDIR)/patch.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/rcs.Po ./$(DEPDIR)/rcscmds.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/recurse.Po ./$(DEPDIR)/release.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/remove.Po ./$(DEPDIR)/repos.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/root.Po ./$(DEPDIR)/run.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/scramble.Po ./$(DEPDIR)/server.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/stack.Po ./$(DEPDIR)/status.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/subr.Po ./$(DEPDIR)/tag.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/update.Po ./$(DEPDIR)/vers_ts.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/version.Po ./$(DEPDIR)/watch.Po \
-+@AMDEP_TRUE@  ./$(DEPDIR)/wrapper.Po ./$(DEPDIR)/zlib.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
-@@ -381,6 +382,7 @@
- distclean-compile:
-       -rm -f *.tab.c
- 
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/add.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/admin.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/annotate.Po@am__quote@
-diff -urN cvs-1.11.17.orig/src/mkmodules.c cvs-1.11.17/src/mkmodules.c
---- cvs-1.11.17.orig/src/mkmodules.c   2004-02-03 15:39:40.000000000 +0100
-+++ cvs-1.11.17/src/mkmodules.c        2004-08-04 10:40:18.641722680 +0200
+diff -urN cvs-1.11.18.orig/src/mkmodules.c cvs-1.11.18/src/mkmodules.c
+--- cvs-1.11.18.orig/src/mkmodules.c   2004-02-03 15:39:40.000000000 +0100
++++ cvs-1.11.18/src/mkmodules.c        2004-11-14 14:00:39.000000000 +0100
 @@ -311,6 +311,44 @@
      NULL
  };
@@ -2913,9 +2850,9 @@ diff -urN cvs-1.11.17.orig/src/mkmodules.c cvs-1.11.17/src/mkmodules.c
  
      /* Make an empty val-tags file to prevent problems creating it later.  */
      strcpy (info, adm);
-diff -urN cvs-1.11.17.orig/src/parseinfo.c cvs-1.11.17/src/parseinfo.c
---- cvs-1.11.17.orig/src/parseinfo.c   2004-03-19 21:36:39.000000000 +0100
-+++ cvs-1.11.17/src/parseinfo.c        2004-08-04 10:40:18.643722376 +0200
+diff -urN cvs-1.11.18.orig/src/parseinfo.c cvs-1.11.18/src/parseinfo.c
+--- cvs-1.11.18.orig/src/parseinfo.c   2004-03-19 21:36:39.000000000 +0100
++++ cvs-1.11.18/src/parseinfo.c        2004-11-14 14:00:39.000000000 +0100
 @@ -448,3 +448,192 @@
        free (line);
      return -1;
@@ -3109,9 +3046,9 @@ diff -urN cvs-1.11.17.orig/src/parseinfo.c cvs-1.11.17/src/parseinfo.c
 +    return -1;
 +}
 +
-diff -urN cvs-1.11.17.orig/src/patch.c cvs-1.11.17/src/patch.c
---- cvs-1.11.17.orig/src/patch.c       2004-04-02 21:25:32.000000000 +0200
-+++ cvs-1.11.17/src/patch.c    2004-08-04 10:40:18.645722072 +0200
+diff -urN cvs-1.11.18.orig/src/patch.c cvs-1.11.18/src/patch.c
+--- cvs-1.11.18.orig/src/patch.c       2004-04-02 21:25:32.000000000 +0200
++++ cvs-1.11.18/src/patch.c    2004-11-14 14:00:39.000000000 +0100
 @@ -498,6 +498,43 @@
        goto out2;
      }
@@ -3156,9 +3093,9 @@ diff -urN cvs-1.11.17.orig/src/patch.c cvs-1.11.17/src/patch.c
      /* Create 3 empty files.  I'm not really sure there is any advantage
       * to doing so now rather than just waiting until later.
       *
-diff -urN cvs-1.11.17.orig/src/remove.c cvs-1.11.17/src/remove.c
---- cvs-1.11.17.orig/src/remove.c      2004-03-20 03:34:32.000000000 +0100
-+++ cvs-1.11.17/src/remove.c   2004-08-04 10:40:18.648721616 +0200
+diff -urN cvs-1.11.18.orig/src/remove.c cvs-1.11.18/src/remove.c
+--- cvs-1.11.18.orig/src/remove.c      2004-03-20 03:34:32.000000000 +0100
++++ cvs-1.11.18/src/remove.c   2004-11-14 14:00:39.000000000 +0100
 @@ -250,6 +250,25 @@
      {
        char *fname;
@@ -3185,9 +3122,9 @@ diff -urN cvs-1.11.17.orig/src/remove.c cvs-1.11.17/src/remove.c
        /* Re-register it with a negative version number.  */
        fname = xmalloc (strlen (vers->vn_user) + 5);
        (void) strcpy (fname, "-");
-diff -urN cvs-1.11.17.orig/src/server.c cvs-1.11.17/src/server.c
---- cvs-1.11.17.orig/src/server.c      2004-08-04 10:31:54.000000000 +0200
-+++ cvs-1.11.17/src/server.c   2004-08-04 10:40:18.656720400 +0200
+diff -urN cvs-1.11.18.orig/src/server.c cvs-1.11.18/src/server.c
+--- cvs-1.11.18.orig/src/server.c      2004-11-14 13:58:05.000000000 +0100
++++ cvs-1.11.18/src/server.c   2004-11-14 14:00:39.000000000 +0100
 @@ -773,6 +773,10 @@
         nothing.  But for rsh, we need to do it now.  */
      parse_config (current_parsed_root->directory);
@@ -3223,7 +3160,7 @@ diff -urN cvs-1.11.17.orig/src/server.c cvs-1.11.17/src/server.c
  static void
  serve_add (arg)
      char *arg;
-@@ -4820,6 +4841,11 @@
+@@ -4821,6 +4842,11 @@
    REQ_LINE("diff", serve_diff, 0),
    REQ_LINE("log", serve_log, 0),
    REQ_LINE("rlog", serve_rlog, 0),
@@ -3235,7 +3172,7 @@ diff -urN cvs-1.11.17.orig/src/server.c cvs-1.11.17/src/server.c
    REQ_LINE("add", serve_add, 0),
    REQ_LINE("remove", serve_remove, 0),
    REQ_LINE("update-patches", serve_ignore, 0),
-@@ -5293,6 +5319,10 @@
+@@ -5294,6 +5320,10 @@
  {
      struct passwd *pw;
  
@@ -3246,7 +3183,7 @@ diff -urN cvs-1.11.17.orig/src/server.c cvs-1.11.17/src/server.c
      pw = getpwnam (username);
      if (pw == NULL)
      {
-@@ -5875,6 +5905,9 @@
+@@ -5876,6 +5906,9 @@
         in a new CVSROOT/config file to fix the broken one!  */
      parse_config (repository);
  
@@ -3256,9 +3193,9 @@ diff -urN cvs-1.11.17.orig/src/server.c cvs-1.11.17/src/server.c
      /* We need the real cleartext before we hash it. */
      descrambled_password = descramble (password);
      host_user = check_password (username, descrambled_password, repository);
-diff -urN cvs-1.11.17.orig/src/status.c cvs-1.11.17/src/status.c
---- cvs-1.11.17.orig/src/status.c      2004-03-20 02:40:12.000000000 +0100
-+++ cvs-1.11.17/src/status.c   2004-08-04 10:40:18.658720096 +0200
+diff -urN cvs-1.11.18.orig/src/status.c cvs-1.11.18/src/status.c
+--- cvs-1.11.18.orig/src/status.c      2004-03-20 02:40:12.000000000 +0100
++++ cvs-1.11.18/src/status.c   2004-11-14 14:00:39.000000000 +0100
 @@ -128,7 +128,27 @@
  
      status = Classify_File (finfo, (char *) NULL, (char *) NULL, (char *) NULL,
@@ -3288,9 +3225,9 @@ diff -urN cvs-1.11.17.orig/src/status.c cvs-1.11.17/src/status.c
      switch (status)
      {
        case T_UNKNOWN:
-diff -urN cvs-1.11.17.orig/src/tag.c cvs-1.11.17/src/tag.c
---- cvs-1.11.17.orig/src/tag.c 2004-04-06 20:37:10.000000000 +0200
-+++ cvs-1.11.17/src/tag.c      2004-08-04 10:40:18.661719640 +0200
+diff -urN cvs-1.11.18.orig/src/tag.c cvs-1.11.18/src/tag.c
+--- cvs-1.11.18.orig/src/tag.c 2004-08-24 18:32:48.000000000 +0200
++++ cvs-1.11.18/src/tag.c      2004-11-14 14:00:39.000000000 +0100
 @@ -660,6 +660,25 @@
       * correctly without breaking your link!
       */
@@ -3339,9 +3276,9 @@ diff -urN cvs-1.11.17.orig/src/tag.c cvs-1.11.17/src/tag.c
      if (delete_flag)
      {
  
-diff -urN cvs-1.11.17.orig/src/update.c cvs-1.11.17/src/update.c
---- cvs-1.11.17.orig/src/update.c      2004-05-04 19:25:54.000000000 +0200
-+++ cvs-1.11.17/src/update.c   2004-08-04 10:40:18.664719184 +0200
+diff -urN cvs-1.11.18.orig/src/update.c cvs-1.11.18/src/update.c
+--- cvs-1.11.18.orig/src/update.c      2004-10-29 21:55:17.000000000 +0200
++++ cvs-1.11.18/src/update.c   2004-11-14 14:00:39.000000000 +0100
 @@ -596,6 +596,26 @@
      status = Classify_File (finfo, tag, date, options, force_tag_match,
                            aflag, &vers, pipeout);
@@ -3369,9 +3306,9 @@ diff -urN cvs-1.11.17.orig/src/update.c cvs-1.11.17/src/update.c
      /* Keep track of whether TAG is a branch tag.
         Note that if it is a branch tag in some files and a nonbranch tag
         in others, treat it as a nonbranch tag.  It is possible that case
-diff -urN cvs-1.11.17.orig/src/version.c cvs-1.11.17/src/version.c
---- cvs-1.11.17.orig/src/version.c     2004-02-03 15:37:56.000000000 +0100
-+++ cvs-1.11.17/src/version.c  2004-08-04 10:40:18.669718424 +0200
+diff -urN cvs-1.11.18.orig/src/version.c cvs-1.11.18/src/version.c
+--- cvs-1.11.18.orig/src/version.c     2004-02-03 15:37:56.000000000 +0100
++++ cvs-1.11.18/src/version.c  2004-11-14 14:00:39.000000000 +0100
 @@ -26,7 +26,8 @@
  #endif
  #endif