[pkgsrc/trunk]: pkgsrc/net/mppe-lkm Fix a bug that made the kernel module cra...

[cube <cube%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aa631cb1ff80
branches:  trunk
changeset: 487005:aa631cb1ff80
user:      cube <cube%pkgsrc.org@localhost>
date:      Thu Jan 06 18:22:16 2005 +0000

description:
Fix a bug that made the kernel module crash when trying to send packets of
size approximatively equal to MLEN.

PKGREVISION++, everyone using that package should update.

diffstat:

 net/mppe-lkm/Makefile         |  3 ++-
 net/mppe-lkm/distinfo         |  4 ++--
 net/mppe-lkm/patches/patch-aa |  6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (51 lines):

diff -r 7e8cec977670 -r aa631cb1ff80 net/mppe-lkm/Makefile
--- a/net/mppe-lkm/Makefile     Thu Jan 06 17:41:51 2005 +0000
+++ b/net/mppe-lkm/Makefile     Thu Jan 06 18:22:16 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/01/06 05:37:21 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/01/06 18:22:16 cube Exp $
 
 DISTNAME=      kernel_ppp_mppe-0.0.4-src
 PKGNAME=       mppe-lkm-0.0.4
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=poptop/}
 EXTRACT_SUFX=  .tgz
diff -r 7e8cec977670 -r aa631cb1ff80 net/mppe-lkm/distinfo
--- a/net/mppe-lkm/distinfo     Thu Jan 06 17:41:51 2005 +0000
+++ b/net/mppe-lkm/distinfo     Thu Jan 06 18:22:16 2005 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/01/02 02:52:56 cube Exp $
+$NetBSD: distinfo,v 1.2 2005/01/06 18:22:16 cube Exp $
 
 SHA1 (kernel_ppp_mppe-0.0.4-src.tgz) = 37dc2487c760a78eb02585690bd6a1708d8dbaa2
 Size (kernel_ppp_mppe-0.0.4-src.tgz) = 54194 bytes
-SHA1 (patch-aa) = 56209bf008dbff6983d27c26b011d8a7d839973d
+SHA1 (patch-aa) = e219f76184a5684dd19e8dac828a8bb8c2b51f17
diff -r 7e8cec977670 -r aa631cb1ff80 net/mppe-lkm/patches/patch-aa
--- a/net/mppe-lkm/patches/patch-aa     Thu Jan 06 17:41:51 2005 +0000
+++ b/net/mppe-lkm/patches/patch-aa     Thu Jan 06 18:22:16 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/01/02 02:52:57 cube Exp $
+$NetBSD: patch-aa,v 1.2 2005/01/06 18:22:16 cube Exp $
 
 --- ppp_mppe_compress.c.orig   2004-05-31 07:31:51.000000000 +0200
 +++ ppp_mppe_compress.c
@@ -250,7 +250,7 @@
 +      struct mbuf *mfirst = NULL;
 +      struct mbuf *mprev;
 +      struct mbuf *m = NULL;
-+      int bleft = isize+MPPE_OVHD;
++      int bleft = isize+MPPE_OVHD+2;
 +      do {
 +      mprev = m;
 +      MGET(m,M_DONTWAIT, MT_DATA);
@@ -400,7 +400,7 @@
 +    if (mp->m_len <= PPP_HDRLEN + MPPE_OVHD) {
 +      if (state->debug)
 +          aprint_error("mppe_decompress[%d]: short pkt (%d)\n",
-+                 state->unit, isize);
++                 state->unit, mp->m_len);
        return DECOMP_ERROR;
      }
 -    osize = isize - MPPE_OVHD - 2;    /* assume no PFC */