pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/openssh+gssapi Update for _new_ new OpenSSH p...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/43b06bb02424
branches:  trunk
changeset: 461524:43b06bb02424
user:      jwise <jwise%pkgsrc.org@localhost>
date:      Wed Sep 17 14:27:03 2003 +0000

description:
Update for _new_ new OpenSSH patch, bump pkgrevision.

``Oops, they did it again.''

diffstat:

 security/openssh+gssapi/Makefile         |   4 +-
 security/openssh+gssapi/distinfo         |   5 ++-
 security/openssh+gssapi/patches/patch-ai |  46 +++++++++++++++++++++++++++----
 security/openssh+gssapi/patches/patch-aj |  26 ++++++++++++++++++
 4 files changed, 71 insertions(+), 10 deletions(-)

diffs (134 lines):

diff -r 3cf83d7c1997 -r 43b06bb02424 security/openssh+gssapi/Makefile
--- a/security/openssh+gssapi/Makefile  Wed Sep 17 14:13:17 2003 +0000
+++ b/security/openssh+gssapi/Makefile  Wed Sep 17 14:27:03 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/09/16 18:15:26 jwise Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/17 14:27:03 jwise Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -6,7 +6,7 @@
 
 DISTNAME=              openssh-3.6.1p2
 PKGNAME=               openssh+gssapi-3.6.1.2.20030430
-PKGREVISION=           1
+PKGREVISION=           2
 SVR4_PKGNAME=          osshgss
 CATEGORIES=            security
 MASTER_SITES=          ftp://ftp7.usa.openbsd.org/pub/os/OpenBSD/OpenSSH/portable/ \
diff -r 3cf83d7c1997 -r 43b06bb02424 security/openssh+gssapi/distinfo
--- a/security/openssh+gssapi/distinfo  Wed Sep 17 14:13:17 2003 +0000
+++ b/security/openssh+gssapi/distinfo  Wed Sep 17 14:27:03 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/09/16 18:15:27 jwise Exp $
+$NetBSD: distinfo,v 1.3 2003/09/17 14:27:03 jwise Exp $
 
 SHA1 (openssh-3.6.1p2.tar.gz) = dafe5b6ee2c8ced12c2ee8961530b4e51c2f0bcf
 Size (openssh-3.6.1p2.tar.gz) = 879629 bytes
@@ -7,4 +7,5 @@
 SHA1 (patch-aa) = 20abe6938aba07ab7b6c7eab5d24a303f0cd2298
 SHA1 (patch-ab) = 1069fe256b7925fcf404781ef14e5c492f52c21e
 SHA1 (patch-ah) = 9913c868bde5d318915b1dee2c05dcf454a0f506
-SHA1 (patch-ai) = 863ddd5f85a8b436912605314cc2f7b8bfde5ec4
+SHA1 (patch-ai) = a564c1c9df9704fa8ed20bd31a5eb36450c72f2b
+SHA1 (patch-aj) = a83eed6c0a5703a2953682b4627be38a87bfb65f
diff -r 3cf83d7c1997 -r 43b06bb02424 security/openssh+gssapi/patches/patch-ai
--- a/security/openssh+gssapi/patches/patch-ai  Wed Sep 17 14:13:17 2003 +0000
+++ b/security/openssh+gssapi/patches/patch-ai  Wed Sep 17 14:27:03 2003 +0000
@@ -1,6 +1,40 @@
---- buffer.c.orig      2003-09-16 13:45:48.000000000 -0400
-+++ buffer.c   2003-09-16 13:50:49.000000000 -0400
-@@ -69,6 +69,7 @@
+$NetBSD: patch-ai,v 1.2 2003/09/17 14:27:07 jwise Exp $
+Index: buffer.c
+===================================================================
+RCS file: /cvs/src/usr.bin/ssh/buffer.c,v
+retrieving revision 1.16
+retrieving revision 1.18
+diff -u -r1.16 -r1.18
+--- buffer.c   26 Jun 2002 08:54:18 -0000      1.16
++++ buffer.c   16 Sep 2003 21:02:39 -0000      1.18
+@@ -23,8 +23,11 @@
+ void
+ buffer_init(Buffer *buffer)
+ {
+-      buffer->alloc = 4096;
+-      buffer->buf = xmalloc(buffer->alloc);
++      const u_int len = 4096;
++
++      buffer->alloc = 0;
++      buffer->buf = xmalloc(len);
++      buffer->alloc = len;
+       buffer->offset = 0;
+       buffer->end = 0;
+ }
+@@ -34,8 +37,10 @@
+ void
+ buffer_free(Buffer *buffer)
+ {
+-      memset(buffer->buf, 0, buffer->alloc);
+-      xfree(buffer->buf);
++      if (buffer->alloc > 0) {
++              memset(buffer->buf, 0, buffer->alloc);
++              xfree(buffer->buf);
++      }
+ }
+ 
+ /*
+@@ -69,6 +74,7 @@
  void *
  buffer_append_space(Buffer *buffer, u_int len)
  {
@@ -8,19 +42,19 @@
        void *p;
  
        if (len > 0x100000)
-@@ -98,11 +99,13 @@
+@@ -98,11 +104,13 @@
                goto restart;
        }
        /* Increase the size of the buffer and retry. */
 -      buffer->alloc += len + 32768;
 -      if (buffer->alloc > 0xa00000)
-+
++      
 +      newlen = buffer->alloc + len + 32768;
 +      if (newlen > 0xa00000)
                fatal("buffer_append_space: alloc %u not supported",
 -                  buffer->alloc);
 -      buffer->buf = xrealloc(buffer->buf, buffer->alloc);
-+                      newlen);
++                  newlen);
 +      buffer->buf = xrealloc(buffer->buf, newlen);
 +      buffer->alloc = newlen;
        goto restart;
diff -r 3cf83d7c1997 -r 43b06bb02424 security/openssh+gssapi/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssh+gssapi/patches/patch-aj  Wed Sep 17 14:27:03 2003 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-aj,v 1.1 2003/09/17 14:27:07 jwise Exp $
+Index: channels.c
+===================================================================
+RCS file: /cvs/src/usr.bin/ssh/channels.c,v
+retrieving revision 1.194
+retrieving revision 1.195
+diff -u -r1.194 -r1.195
+--- channels.c 29 Aug 2003 10:04:36 -0000      1.194
++++ channels.c 16 Sep 2003 21:02:40 -0000      1.195
+@@ -228,12 +228,13 @@
+       if (found == -1) {
+               /* There are no free slots.  Take last+1 slot and expand the array.  */
+               found = channels_alloc;
+-              channels_alloc += 10;
+               if (channels_alloc > 10000)
+                       fatal("channel_new: internal error: channels_alloc %d "
+                           "too big.", channels_alloc);
++              channels = xrealloc(channels,
++                  (channels_alloc + 10) * sizeof(Channel *));
++              channels_alloc += 10;
+               debug2("channel: expanding %d", channels_alloc);
+-              channels = xrealloc(channels, channels_alloc * sizeof(Channel *));
+               for (i = found; i < channels_alloc; i++)
+                       channels[i] = NULL;
+       }
+



Home | Main Index | Thread Index | Old Index