Ralf S. Engelschall 24 лет назад
Родитель
Сommit
6cae3fdb81
2 измененных файлов с 41 добавлено и 2 удалено
  1. 39 0
      gnupg/gnupg-1.0.6.patch
  2. 2 2
      gnupg/gnupg.spec

+ 39 - 0
gnupg/gnupg-1.0.6.patch

@@ -9,3 +9,42 @@
  #endif
  void tty_print_string( byte *p, size_t n );
  void tty_print_utf8_string( byte *p, size_t n );
+--- zlib/infblock.c	Mon Jun  8 19:06:16 1998
++++ zlib/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

+ 2 - 2
gnupg/gnupg.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [REL]
 Group:        Cryptography
 License:      GPL
 Version:      1.0.6
-Release:      20020206
+Release:      20020312
 
 #   list of sources
 Source0:      ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gnupg-%{version}.tar.gz
@@ -46,7 +46,7 @@ BuildPreReq:  OpenPKG, openpkg >= 20020206, make
 PreReq:       OpenPKG, openpkg >= 20020206
 AutoReq:      no
 AutoReqProv:  no
-Provides:     openpgp
+Provides:     OPENPGP
 
 %description
      GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and