ソースを参照

The zlib patch is irrelevant, because it was merged with the cvs sources in this version.

Michael Schloh von Bennewitz 24 年 前
コミット
ff4d377922
2 ファイル変更0 行追加44 行削除
  1. 0 4
      cvs/cvs.spec
  2. 0 40
      cvs/zlib.patch

+ 0 - 4
cvs/cvs.spec

@@ -53,7 +53,6 @@ Source1:      ftp://riemann.iam.uni-bonn.de/pub/users/roessler/cvslock/cvslock-%
 Source2:      http://www.red-bean.com/cvs2cl/cvs2cl.pl
 Source3:      cvs.patches.rse
 Source4:      rc.cvs
-Patch0:       zlib.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -89,9 +88,6 @@ AutoReqProv:  no
 %prep
     %setup0 -q -c
     %setup1 -q -T -D -a 1
-    ( cd cvs-%{V_cvs}/zlib
-      %patch0 -p1
-    )
 %if "%{with_rse_patches}" == "yes"
     ( cd cvs-%{V_cvs} 
       cat %{SOURCE cvs.patches.rse} |\

+ 0 - 40
cvs/zlib.patch

@@ -1,40 +0,0 @@
-diff -u3 zlib-1.1.3/infblock.c zlib-1.1.4/infblock.c
---- zlib-1.1.3/infblock.c	Mon Jun  8 19:06:16 1998
-+++ zlib-1.1.4/infblock.c	Mon Mar 11 14:16:01 2002
-@@ -249,10 +249,12 @@
-                              &s->sub.trees.tb, s->hufts, z);
-       if (t != Z_OK)
-       {
--        ZFREE(z, s->sub.trees.blens);
-         r = t;
-         if (r == Z_DATA_ERROR)
-+        {
-+          ZFREE(z, s->sub.trees.blens);
-           s->mode = BAD;
-+        }
-         LEAVE
-       }
-       s->sub.trees.index = 0;
-@@ -313,11 +315,13 @@
-         t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
-                                   s->sub.trees.blens, &bl, &bd, &tl, &td,
-                                   s->hufts, z);
--        ZFREE(z, s->sub.trees.blens);
-         if (t != Z_OK)
-         {
-           if (t == (uInt)Z_DATA_ERROR)
-+          {
-+            ZFREE(z, s->sub.trees.blens);
-             s->mode = BAD;
-+          }
-           r = t;
-           LEAVE
-         }
-@@ -329,6 +333,7 @@
-         }
-         s->sub.decode.codes = c;
-       }
-+      ZFREE(z, s->sub.trees.blens);
-       s->mode = CODES;
-     case CODES:
-       UPDATE