diff options
| author | jwise <jwise@pkgsrc.org> | 2003-09-16 18:15:26 +0000 |
|---|---|---|
| committer | jwise <jwise@pkgsrc.org> | 2003-09-16 18:15:26 +0000 |
| commit | 3f8ae3a319b2414c5d7cf212d4af5a96072f62d0 (patch) | |
| tree | cf55f3ab6db1733793efdedec2f505dc4a9f950f /security/openssh+gssapi | |
| parent | b03c7fbafcc904cfbb60c24e8df71aac08cbd77a (diff) | |
| download | pkgsrc-3f8ae3a319b2414c5d7cf212d4af5a96072f62d0.tar.gz | |
Apply security patch for OpenSSH-3.6.1p2 recently released by openssh team.
PKGREVISION bump, and BROKEN= removed.
While there, fix Solaris short pkg name.
Diffstat (limited to 'security/openssh+gssapi')
| -rw-r--r-- | security/openssh+gssapi/Makefile | 7 | ||||
| -rw-r--r-- | security/openssh+gssapi/distinfo | 3 | ||||
| -rw-r--r-- | security/openssh+gssapi/patches/patch-ai | 28 |
3 files changed, 33 insertions, 5 deletions
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile index e2ad315aa7a..fbe7d7e1590 100644 --- a/security/openssh+gssapi/Makefile +++ b/security/openssh+gssapi/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.7 2003/09/16 14:05:47 jwise Exp $ +# $NetBSD: Makefile,v 1.8 2003/09/16 18:15:26 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 # patches do. -BROKEN= OpenSSH 3.6.1p2 contains a buffer overflow, and updated version of patch is not yet available. - DISTNAME= openssh-3.6.1p2 PKGNAME= openssh+gssapi-3.6.1.2.20030430 -SVR4_PKGNAME= ossh +PKGREVISION= 1 +SVR4_PKGNAME= osshgss CATEGORIES= security MASTER_SITES= ftp://ftp7.usa.openbsd.org/pub/os/OpenBSD/OpenSSH/portable/ \ ftp://ftp.stealth.net/pub/mirrors/ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ diff --git a/security/openssh+gssapi/distinfo b/security/openssh+gssapi/distinfo index 897244dfa7b..0b17a65dce8 100644 --- a/security/openssh+gssapi/distinfo +++ b/security/openssh+gssapi/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/07/24 21:01:23 jwise Exp $ +$NetBSD: distinfo,v 1.2 2003/09/16 18:15:27 jwise Exp $ SHA1 (openssh-3.6.1p2.tar.gz) = dafe5b6ee2c8ced12c2ee8961530b4e51c2f0bcf Size (openssh-3.6.1p2.tar.gz) = 879629 bytes @@ -7,3 +7,4 @@ Size (openssh-3.6.1p2-gssapi-20030430.diff) = 121077 bytes SHA1 (patch-aa) = 20abe6938aba07ab7b6c7eab5d24a303f0cd2298 SHA1 (patch-ab) = 1069fe256b7925fcf404781ef14e5c492f52c21e SHA1 (patch-ah) = 9913c868bde5d318915b1dee2c05dcf454a0f506 +SHA1 (patch-ai) = 863ddd5f85a8b436912605314cc2f7b8bfde5ec4 diff --git a/security/openssh+gssapi/patches/patch-ai b/security/openssh+gssapi/patches/patch-ai new file mode 100644 index 00000000000..b1a87e07ffb --- /dev/null +++ b/security/openssh+gssapi/patches/patch-ai @@ -0,0 +1,28 @@ +--- 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 @@ + void * + buffer_append_space(Buffer *buffer, u_int len) + { ++ u_int newlen; + void *p; + + if (len > 0x100000) +@@ -98,11 +99,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); ++ buffer->buf = xrealloc(buffer->buf, newlen); ++ buffer->alloc = newlen; + goto restart; + /* NOTREACHED */ + } |