CVS commit: pkgsrc/devel/scmcvs

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Dec 18 08:51:48 UTC 2017

Modified Files:
        pkgsrc/devel/scmcvs: distinfo
        pkgsrc/devel/scmcvs/patches: patch-al

Log Message:
Reverted wrong commit


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/scmcvs/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/scmcvs/patches/patch-al

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/scmcvs/distinfo
diff -u pkgsrc/devel/scmcvs/distinfo:1.20 pkgsrc/devel/scmcvs/distinfo:1.21
--- pkgsrc/devel/scmcvs/distinfo:1.20   Mon Dec 18 08:48:26 2017
+++ pkgsrc/devel/scmcvs/distinfo        Mon Dec 18 08:51:48 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2017/12/18 08:48:26 adam Exp $
+$NetBSD: distinfo,v 1.21 2017/12/18 08:51:48 adam Exp $
 
 SHA1 (cvs-1.12.13.tar.bz2) = 93a8dacc6ff0e723a130835713235863f1f5ada9
 RMD160 (cvs-1.12.13.tar.bz2) = ba3048e3e2d99ae78f6a759889b615acf65dd487
@@ -12,7 +12,7 @@ SHA1 (patch-ag) = 53d072ba6bdbe0f9888296
 SHA1 (patch-ah) = b03e6675ab1f6f62fc885d990b5a6bf64c309e9f
 SHA1 (patch-ai) = d265a2967566cf2679ad6fff1dffd5c6d6cbd120
 SHA1 (patch-ak) = 3582de771a424cd7c906574bf4a76fc57f977e6b
-SHA1 (patch-al) = d23cc725aa31a5f2e9db9f3aa84513a114285f03
+SHA1 (patch-al) = 5c4909942ccfa7d7000c2856705ca9a28dbf005d
 SHA1 (patch-am) = cb0cc7cdfaf1d2455c519eda5cf239ea623c4f7b
 SHA1 (patch-an) = 2eac4f7d0be8aa73de2ef3b021c134d0d9e40125
 SHA1 (patch-ao) = ccc7a159a6eb1ebc07c9187e3bcd0db61b8b4086

Index: pkgsrc/devel/scmcvs/patches/patch-al
diff -u pkgsrc/devel/scmcvs/patches/patch-al:1.7 pkgsrc/devel/scmcvs/patches/patch-al:1.8
--- pkgsrc/devel/scmcvs/patches/patch-al:1.7    Mon Dec 18 08:48:27 2017
+++ pkgsrc/devel/scmcvs/patches/patch-al        Mon Dec 18 08:51:48 2017
@@ -1,43 +1,8 @@
-$NetBSD: patch-al,v 1.7 2017/12/18 08:48:27 adam Exp $
+$NetBSD: patch-al,v 1.8 2017/12/18 08:51:48 adam Exp $
 
 --- src/client.c.orig  2005-10-02 15:17:20.000000000 +0000
 +++ src/client.c
-@@ -1147,7 +1147,6 @@ read_counted_file (char *filename, char 
-     size_t nread;
-     size_t nwrite;
- 
--    FILE *fp;
- 
-     read_line (&size_string);
-     if (size_string[0] == 'z')
-@@ -1168,9 +1167,6 @@ protocol error: compressed files not sup
-        is binary or not.  I haven't carefully looked into whether
-        CVS/Template files should use local text file conventions or
-        not.  */
--    fp = CVS_FOPEN (filename, "wb");
--    if (!fp)
--      error (1, errno, "cannot write %s", fullname);
-     nread = size;
-     nwrite = 0;
-     pread = buf;
-@@ -1189,16 +1185,11 @@ protocol error: compressed files not sup
- 
-       if (nwrite > 0)
-       {
--          n = fwrite (pwrite, sizeof *pwrite, nwrite, fp);
--          if (ferror (fp))
--              error (1, errno, "cannot write %s", fullname);
-           nwrite -= n;
-           pwrite += n;
-       }
-     }
-     free (buf);
--    if (fclose (fp) < 0)
--      error (1, errno, "cannot close %s", fullname);
- }
- 
- 
-@@ -4179,6 +4170,16 @@ start_server (void)
+@@ -4179,6 +4179,16 @@ start_server (void)
            error (1, 0,
                   "This server does not support the global -n option.");
      }