- updated for 1.11.2.

Changed files:
    cvs-cvspass.patch -> 1.2
    cvs-zlib.patch -> 1.3

diff --git a/cvs-cvspass.patch b/cvs-cvspass.patch
index 98fbbf04e6acf632cc3074c59face3c471d9da61..2cd7d48e038e91ed6b5f419f86b34e028aa21bfb 100644 (file)
--- a/cvs-cvspass.patch
+++ b/cvs-cvspass.patch
@@ -1,20 +1,20 @@
---- cvs-1.11.1p1/src/login.c.bero      Tue Jul 31 18:12:58 2001
-+++ cvs-1.11.1p1/src/login.c   Tue Jul 31 18:17:32 2001
+--- cvs-1.11.2/src/login.c.orig        Thu Sep  6 18:18:29 2001
++++ cvs-1.11.2/src/login.c     Sat Apr 20 00:13:24 2002
 @@ -322,8 +322,18 @@
      fp = CVS_FOPEN (passfile, "r");
      if (fp == NULL)
      {
--      error (0, errno, "failed to open %s for reading", passfile);
--      goto error_exit;
-+        /* The password file doesn't exist yet - probably because it's
+-      error (0, errno, "warning: failed to open %s for reading", passfile);
+-      goto process;
++      /* The password file doesn't exist yet - probably because it's
 +       * the first time someone uses cvs login. Create it.
 +       */
 +      fp = CVS_FOPEN (passfile, "w");
 +      fclose (fp);
 +      fp = CVS_FOPEN (passfile, "r");
 +      if (fp == NULL)
-+        {
-+            /* Creating the password file didn't work. Bail out. */
++      {
++       /* Creating the password file didn't work. Bail out. */
 +          error (0, errno, "failed to open %s for reading", passfile);
 +          goto error_exit;
 +      }

diff --git a/cvs-zlib.patch b/cvs-zlib.patch
index 424401255c908f3c562b4fd456d8534cba69e6d8..ac7e03ecacb2fb085b8d1d4246dceaef4a4bf330 100644 (file)
--- a/cvs-zlib.patch
+++ b/cvs-zlib.patch
@@ -10,10 +10,9 @@ diff -ur cvs-1.11.1/Makefile.am cvs-1.11.1.zlib/Makefile.am
  # All other subdirs:
  SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
        windows-NT os2 emx vms
-diff -ur cvs-1.11.1/configure.in cvs-1.11.1.zlib/configure.in
---- cvs-1.11.1/configure.in    Wed Apr 25 23:51:25 2001
-+++ cvs-1.11.1.zlib/configure.in       Wed May 30 21:48:59 2001
-@@ -300,6 +300,8 @@
+--- cvs-1.11.2/configure.in.orig       Thu Apr 18 17:31:39 2002
++++ cvs-1.11.2/configure.in    Sat Apr 20 00:05:04 2002
+@@ -336,6 +336,8 @@
    enable_server=yes
  fi])
  
@@ -22,19 +21,18 @@ diff -ur cvs-1.11.1/configure.in cvs-1.11.1.zlib/configure.in
  dnl The auth server needs to be able to check passwords against passwd
  dnl file entries, so we only #define AUTH_SERVER_SUPPORT if we can
  dnl find the crypt function. 
-@@ -366,8 +368,7 @@
+@@ -410,8 +412,7 @@
          tools/Makefile \
          vms/Makefile \
          windows-NT/Makefile \
 -        windows-NT/SCC/Makefile \
 -        zlib/Makefile],
 +        windows-NT/SCC/Makefile],
-         [chmod -f +x \
+         [chmod +x \
          contrib/clmerge \
          contrib/cln_hist \
-diff -ur cvs-1.11.1/src/Makefile.am cvs-1.11.1.zlib/src/Makefile.am
---- cvs-1.11.1/src/Makefile.am Tue Apr 24 20:14:53 2001
-+++ cvs-1.11.1.zlib/src/Makefile.am    Wed May 30 21:47:19 2001
+--- cvs-1.11.2/src/Makefile.am.orig    Mon Aug 20 19:52:53 2001
++++ cvs-1.11.2/src/Makefile.am Sat Apr 20 00:06:59 2002
 @@ -20,7 +20,7 @@
  # try and remove naming ocnflicts and fix Automake to allow particular includes
  # to be attached only to particular object files.  Short term fix is either or.
@@ -44,11 +42,13 @@ diff -ur cvs-1.11.1/src/Makefile.am cvs-1.11.1.zlib/src/Makefile.am
  
  bin_PROGRAMS = cvs
  bin_SCRIPTS = cvsbug
-@@ -95,7 +95,6 @@
+@@ -100,8 +100,7 @@
+ 
  cvs_LDADD = \
        ../diff/libdiff.a \
-       ../lib/libcvs.a \
--      ../zlib/libz.a \
-       version.o
- cvs_EXTRA_DIST = version.c
+-      ../lib/libcvs.a \
+-      ../zlib/libz.a
++      ../lib/libcvs.a
  
+ # extra clean targets
+ # wish this could be distclean-hdr-local but it's not part of automake