pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net/mppe-lkm Remove mppe-lkm.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/845e1dbb70d2
branches:  trunk
changeset: 382607:845e1dbb70d2
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Jul 07 12:36:54 2018 +0000

description:
Remove mppe-lkm.

It does not work on NetBSD 6+, and there are some doubts that it works on 5.
We don't support versions older than 6. So there.

diffstat:

 net/mppe-lkm/DESCR            |    4 -
 net/mppe-lkm/MESSAGE          |    9 -
 net/mppe-lkm/Makefile         |   30 -
 net/mppe-lkm/PLIST            |    2 -
 net/mppe-lkm/distinfo         |    7 -
 net/mppe-lkm/files/Makefile   |    8 -
 net/mppe-lkm/files/lkm_mppe.c |  114 -------
 net/mppe-lkm/patches/patch-aa |  653 ------------------------------------------
 8 files changed, 0 insertions(+), 827 deletions(-)

diffs (truncated from 859 to 300 lines):

diff -r a13c99260254 -r 845e1dbb70d2 net/mppe-lkm/DESCR
--- a/net/mppe-lkm/DESCR        Sat Jul 07 12:19:19 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-To get encryption over a PPTP connection, you need the kernel to support the
-MPPE algorithm.  It is used as a PPP compression module, and the mppe-lkm
-package provides a LKM (Loadable Kernel Module) that will install the
-functionality into your NetBSD kernel.
diff -r a13c99260254 -r 845e1dbb70d2 net/mppe-lkm/MESSAGE
--- a/net/mppe-lkm/MESSAGE      Sat Jul 07 12:19:19 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/02/16 22:04:07 cube Exp $
-
-This LKM requires attribute ``arc4'' to be compiled in the kernel.  The
-only drivers that get it compiled are the WiFi ones, such as wi(4).  An
-instance of that driver in the kernel configuration file is enough to
-pull the arc4 functions in the resulting kernel.
-
-===========================================================================
diff -r a13c99260254 -r 845e1dbb70d2 net/mppe-lkm/Makefile
--- a/net/mppe-lkm/Makefile     Sat Jul 07 12:19:19 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2013/06/01 22:42:49 dholland Exp $
-
-DISTNAME=      kernel_ppp_mppe-0.0.4-src
-PKGNAME=       mppe-lkm-0.0.4
-PKGREVISION=   2
-CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=poptop/}
-EXTRACT_SUFX=  .tgz
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       NetBSD kernel module for MPPE compression with PPP
-
-PKG_DESTDIR_SUPPORT=   destdir
-
-NO_CONFIGURE=  yes
-
-ONLY_FOR_PLATFORM=     NetBSD-[12345]*-*
-MAKE_ENV+=     KMODDIR=${PREFIX}/lkm
-WRKSRC=                ${WRKDIR}/mppe-lkm
-KPM_SRC=       ${WRKDIR}/${DISTNAME:C/-src$//}
-
-INSTALLATION_DIRS=     lkm
-
-post-extract:
-       @${CP} -R ${FILESDIR} ${WRKSRC}
-       @${CHMOD} -R u+w ${KPM_SRC}
-       @${CP} -p ${KPM_SRC}/ppp-comp-local.h ${KPM_SRC}/ppp_mppe_compress.c \
-               ${WRKSRC}
-
-.include "../../mk/bsd.pkg.mk"
diff -r a13c99260254 -r 845e1dbb70d2 net/mppe-lkm/PLIST
--- a/net/mppe-lkm/PLIST        Sat Jul 07 12:19:19 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/02 02:52:56 cube Exp $
-lkm/mppe.o
diff -r a13c99260254 -r 845e1dbb70d2 net/mppe-lkm/distinfo
--- a/net/mppe-lkm/distinfo     Sat Jul 07 12:19:19 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 00:35:12 agc Exp $
-
-SHA1 (kernel_ppp_mppe-0.0.4-src.tgz) = 37dc2487c760a78eb02585690bd6a1708d8dbaa2
-RMD160 (kernel_ppp_mppe-0.0.4-src.tgz) = 37ebac9263da2cc5e90844d7cc823d0fbcb3baf4
-SHA512 (kernel_ppp_mppe-0.0.4-src.tgz) = 03940460ef62a345065ca7c6c91730c1fc12c5df2734114436f04e04c0b03695214241096d50a730f9ffe258690220e16bc4d33ada6779172b5dc97b8e1afa24
-Size (kernel_ppp_mppe-0.0.4-src.tgz) = 54194 bytes
-SHA1 (patch-aa) = 9b1571fe86611f09b0eba290649fd6b91c6cb961
diff -r a13c99260254 -r 845e1dbb70d2 net/mppe-lkm/files/Makefile
--- a/net/mppe-lkm/files/Makefile       Sat Jul 07 12:19:19 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KMOD=  mppe
-SRCS=  ppp_mppe_compress.c lkm_mppe.c
-MKMAN= no
-
-# We set LDFLAGS because bsd.pkg.mk will put cc specific flags in it.
-LDFLAGS=
-
-.include <bsd.kmod.mk>
diff -r a13c99260254 -r 845e1dbb70d2 net/mppe-lkm/files/lkm_mppe.c
--- a/net/mppe-lkm/files/lkm_mppe.c     Sat Jul 07 12:19:19 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*     NetBSD  */
-/*
- * Copyright (c) 1999 Darrin B. Jewell
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Darrin B. Jewell
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/exec.h>
-#include <sys/lkm.h>
-
-#include <sys/tty.h>
-#include <sys/ttycom.h>
-
-MOD_MISC("mppe");
-
-extern struct compressor ppp_mppe;
-extern struct compressor *ppp_compressors[];
-extern int mppe_in_use;
-
-int    mppe_lkmentry __P((struct lkm_table *, int, int));
-int    mppe_lkm_load __P((struct lkm_table *, int));
-
-int
-mppe_lkm_load(lkmtp, cmd)
-               struct lkm_table *lkmtp;
-               int cmd;
-{
-       int i;
-       for(i=0;i<7;i++) {
-               if (ppp_compressors[i] == NULL) {
-                       ppp_compressors[i] = &ppp_mppe;
-                       ppp_compressors[i+1] = NULL;
-                       break;
-               }
-       }
-       if (i==7) {
-               printf("MPPE: no free compressor slots\n");
-               return ENODEV;
-       }
-
-       printf("MPPE: loaded into ppp at slot %d\n",i);
-
-       return 0;
-}
-
-int
-mppe_lkm_unload(lkmtp, cmd)
-               struct lkm_table *lkmtp;
-               int cmd;
-{
-       int i;
-       if (mppe_in_use) {
-               printf("MPPE: cannot unload lkm while in use (count=%d)\n",
-                       mppe_in_use);
-               return EBUSY;
-       }
-       for(i=0;ppp_compressors[i];i++) {
-               if (ppp_compressors[i] == &ppp_mppe) break;
-       }
-       if (ppp_compressors[i] == NULL) {
-               printf("MPPE: cannot find mppe in ppp compressor slots\n");
-               return ENODEV;
-       }
-       printf("MPPE: unloaded from ppp at slot %d\n",i);
-       do {
-               ppp_compressors[i] = ppp_compressors[i+1];
-       } while(ppp_compressors[i++]);
-
-       return 0;
-}
-
-int
-mppe_lkm_stat(lkmtp, cmd)
-               struct lkm_table *lkmtp;
-               int cmd;
-{
-       printf("MPPE: use count %d\n",mppe_in_use);
-       return 0;
-}
-
-int
-mppe_lkmentry(lkmtp, cmd, ver)
-       struct lkm_table *lkmtp;
-       int cmd, ver;
-{
-       DISPATCH(lkmtp, cmd, ver, mppe_lkm_load,mppe_lkm_unload,mppe_lkm_stat);
-}
diff -r a13c99260254 -r 845e1dbb70d2 net/mppe-lkm/patches/patch-aa
--- a/net/mppe-lkm/patches/patch-aa     Sat Jul 07 12:19:19 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,653 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/04/29 11:41:29 cube Exp $
-
---- ppp_mppe_compress.c.orig   2004-05-31 07:31:51.000000000 +0200
-+++ ppp_mppe_compress.c
-@@ -5,6 +5,8 @@
-  * By Frank Cusack <frank%google.com@localhost>.
-  * Copyright (c) 2002,2003,2004 Google, Inc.
-  * All rights reserved.
-+ * Copyright (c) 1999 Darrin B. Jewell <dbj%NetBSD.org@localhost>
-+ * Copyright (c) 2004, 2005 Quentin Garnier <cube%NetBSD.org@localhost>
-  *
-  * Permission to use, copy, modify, and distribute this software and its
-  * documentation is hereby granted, provided that the above copyright
-@@ -18,19 +20,35 @@
-  *                    deprecated in 2.6
-  */
- 
--#include <linux/module.h>
--#include <linux/kernel.h>
--#include <linux/version.h>
--#include <linux/init.h>
--#include <linux/types.h>
--#include <linux/slab.h>
--#include <linux/string.h>
-+#include <sys/cdefs.h>
-+#include <sys/param.h>
-+#include <sys/types.h>
-+#include <sys/systm.h>
-+#include <sys/malloc.h>
-+#include <sys/mbuf.h>
-+
-+#define PACKETPTR     struct mbuf *
-+
-+#include <net/ppp_defs.h>
-+#include <net/ppp-comp.h>
-+
-+#include <sys/sha1.h>
-+#include <crypto/arc4/arc4.h>
-+
-+#if __NetBSD_Version__ < 299001600
-+/* MPPE definitions were included into the kernel source */
-+#include "ppp-comp-local.h"
-+#endif
- 
--#include <linux/ppp_defs.h>
--#include <linux/ppp-comp.h>
-+int mppe_in_use;
-+#define MOD_INC_USE_COUNT     mppe_in_use++
-+#define MOD_DEC_USE_COUNT     mppe_in_use--
- 
--#include "arcfour.h"
--#include "sha1.h"
-+#ifdef MPPE_DEBUG
-+#define DPRINTF(x)    aprint_normal x
-+#else
-+#define DPRINTF(x)
-+#endif
- 
- /*
-  * State for an MPPE (de)compressor.
-@@ -38,8 +56,8 @@
- typedef struct ppp_mppe_state {
-     unsigned char     master_key[MPPE_MAX_KEY_LEN];
-     unsigned char     session_key[MPPE_MAX_KEY_LEN];
--    arcfour_context   arcfour_context; /* encryption state */
--    unsigned          keylen;         /* key length in bytes             */
-+    void              *arcfour_context; /* encryption state */
-+    unsigned          keylen;         /* key length in bytes             */
-                                       /* NB: 128-bit == 16, 40-bit == 8! */
-                                       /* If we want to support 56-bit,   */
-                                       /* the unit has to change to bits  */
-@@ -84,12 +102,12 @@ static int        mppe_comp_init __P((void *sta
- static int    mppe_decomp_init __P((void *state, unsigned char *options,
-                                     int optlen, int unit,
-                                     int hdrlen, int mru, int debug));
--static int    mppe_compress __P((void *state, unsigned char *ibuf,
--                                 unsigned char *obuf,
-+static int    mppe_compress __P((void *state, struct mbuf **opkt,
-+                                 struct mbuf *ipkt,
-                                  int isize, int osize));
--static void   mppe_incomp __P((void *state, unsigned char *ibuf, int icnt));
--static int    mppe_decompress __P((void *state, unsigned char *ibuf,
--                                   int isize, unsigned char *obuf,int osize));
-+static void   mppe_incomp __P((void *state, struct mbuf *mp));
-+static int    mppe_decompress __P((void *state, struct mbuf *ipkt,
-+                                   struct mbuf **opkt));
- static void   mppe_comp_reset __P((void *state));
- static void   mppe_decomp_reset __P((void *state));
- static void   mppe_comp_stats __P((void *state, struct compstat *stats));
-@@ -104,7 +122,7 @@ GetNewKeyFromSHA(unsigned char *MasterKe
-                unsigned SessionKeyLength, unsigned char *InterimKey)
- {
-     SHA1_CTX Context;
--    unsigned char Digest[SHA1_SIGNATURE_SIZE];



Home | Main Index | Thread Index | Old Index