pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net Remove net/netbsd-tap. NetBSD 2.0 is just too old...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5cdea045b4db
branches: trunk
changeset: 555046:5cdea045b4db
user: cube <cube%pkgsrc.org@localhost>
date: Mon Feb 23 23:19:22 2009 +0000
description:
Remove net/netbsd-tap. NetBSD 2.0 is just too old; later versions of
NetBSD have tap(4) in the kernel.
diffstat:
net/Makefile | 3 +-
net/netbsd-tap/DESCR | 18 -
net/netbsd-tap/MESSAGE | 14 -
net/netbsd-tap/Makefile | 50 -
net/netbsd-tap/PLIST | 7 -
net/netbsd-tap/buildlink3.mk | 19 -
net/netbsd-tap/builtin.mk | 48 -
net/netbsd-tap/files/Makefile | 26 -
net/netbsd-tap/files/if_tap.c | 1397 -------------------------------
net/netbsd-tap/files/if_tap.h | 33 -
net/netbsd-tap/files/if_tap_lkm.c | 190 ----
net/netbsd-tap/files/if_tap_stub.c | 61 -
net/netbsd-tap/files/if_tap_stub.h | 26 -
net/netbsd-tap/files/tap.4 | 198 ----
net/netbsd-tap/files/tap_postinstall.sh | 8 -
net/netbsd-tap/options.mk | 15 -
16 files changed, 1 insertions(+), 2112 deletions(-)
diffs (truncated from 2187 to 300 lines):
diff -r 094afdd43062 -r 5cdea045b4db net/Makefile
--- a/net/Makefile Mon Feb 23 23:13:11 2009 +0000
+++ b/net/Makefile Mon Feb 23 23:19:22 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.764 2009/02/22 07:35:56 taca Exp $
+# $NetBSD: Makefile,v 1.765 2009/02/23 23:19:22 cube Exp $
#
COMMENT= Networking tools
@@ -264,7 +264,6 @@
SUBDIR+= net-snmp
SUBDIR+= net6
SUBDIR+= netatalk
-SUBDIR+= netbsd-tap
SUBDIR+= netcat
SUBDIR+= netcat6
SUBDIR+= netdisco
diff -r 094afdd43062 -r 5cdea045b4db net/netbsd-tap/DESCR
--- a/net/netbsd-tap/DESCR Mon Feb 23 23:13:11 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-tap(4) is a virtual Ethernet device driver. Each tap(4) device appears as a
-regular Ethernet NIC to the kernel, with a MAC address and a set of media
-interfaces. It is a clonable network interface, which means any number of
-such devices can be created by the administrator.
-
-Just like tun(4), tap(4) offers a TTY interface to each of its devices which
-allows an application to read and inject Ethernet frames into the network
-stack. tap(4) devices can be created and used individually for system-wide
-configurations, but an application can also use a special clonable device
-node to create interfaces on demand.
-
-As a LKM must be compiled with the same environment as the kernel with respect
-to a handful of definition (DEBUG, DIAGNOSTIC, MULTIPROCESSOR, LOCKDEBUG and
-MALLOCLOG), the package provides a variable, TAP_KERNEL_ENV, to hold the
-correct addition to the compilation command line. For example, you might want
-to define it the following way in mk.conf:
-
- TAP_KERNEL_ENV= -DDIAGNOSTIC -DMULTIPROCESSOR
diff -r 094afdd43062 -r 5cdea045b4db net/netbsd-tap/MESSAGE
--- a/net/netbsd-tap/MESSAGE Mon Feb 23 23:13:11 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/10/07 12:16:17 rillig Exp $
-
-To have the tap(4) module automatically loaded at boot time, add the
-following to /etc/lkm.conf:
-
-${PREFIX}/lkm/tap.o - - ${PREFIX}/sbin/tap_postinstall - -
-
-And then add 'lkm=YES' to /etc/rc.conf. Refer to lkm.conf(5) for
-additional details.
-
-The script ${PREFIX}/sbin/tap_postinstall creates the relevant device
-nodes in /dev, and can be used independently.
-===========================================================================
diff -r 094afdd43062 -r 5cdea045b4db net/netbsd-tap/Makefile
--- a/net/netbsd-tap/Makefile Mon Feb 23 23:13:11 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/06/10 15:06:33 cube Exp $
-
-# This package relies on a correct configuration of pkgsrc WRT NetBSD
-# source directory information, otherwise the build will fail in a non-
-# obvious way.
-#
-# If /usr/src doesn't point to your NetBSD source tree, then you should
-# (generally speaking, it covers more than pkgsrc) define the variable
-# named NETBSDSRCDIR to the place where that NetBSD source tree is.
-#
-# Setting NETBSDSRCDIR in mk.conf will do the right thing when, for
-# example, you compile a LKM by hand. However, it will not be
-# sufficient in pkgsrc, as the Makefiles of the packages are called
-# with MAKECONF=/dev/null in the environment by default, and therefore
-# won't pick up the value for NETBSDSRCDIR.
-#
-# So additionally you will have to define PKGMAKECONF in mk.conf, and
-# make it point to a mk.conf-like file that will contain your wished
-# NETBSDSRCDIR, COPTS, CPUFLAGS and friends value.
-#
-# It is perfectly acceptable to set PKGMAKECONF to /etc/mk.conf, but be
-# aware that it can lead to some confusion of pkgsrc, which is why
-# MAKECONF was set to /dev/null in the first place.
-
-DISTNAME= netbsd-tap-20050610
-CATEGORIES= net
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= cube%NetBSD.org@localhost
-COMMENT= NetBSD kernel module for virtual Ethernet devices
-
-NO_CONFIGURE= yes
-NO_CHECKSUM= yes
-INSTALL_TARGET= includes install
-
-ONLY_FOR_PLATFORM= NetBSD-[2-9]*-*
-INSTALLATION_DIRS= lkm
-
-.include "options.mk"
-
-SUBST_CLASSES+= tap_postinstall
-SUBST_STAGE.tap_postinstall= post-build
-SUBST_FILES.tap_postinstall= tap_postinstall.sh
-SUBST_SED.tap_postinstall= -e s,@SH@,${SH:Q},
-
-do-extract:
- @${CP} -R ${FILESDIR} ${WRKSRC}
-
-.include "../../mk/bsd.pkg.mk"
diff -r 094afdd43062 -r 5cdea045b4db net/netbsd-tap/PLIST
--- a/net/netbsd-tap/PLIST Mon Feb 23 23:13:11 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/20 18:02:39 cube Exp $
-include/net/if_tap.h
-lkm/tap.o
-man/cat4/tap.0
-man/man4/tap.4
-sbin/tap_postinstall
-@unexec ${RMDIR} %D/include/net || ${TRUE}
diff -r 094afdd43062 -r 5cdea045b4db net/netbsd-tap/buildlink3.mk
--- a/net/netbsd-tap/buildlink3.mk Mon Feb 23 23:13:11 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-NETBSD_TAP_BUILDLINK3_MK:= ${NETBSD_TAP_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= netbsd-tap
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnetbsd-tap}
-BUILDLINK_PACKAGES+= netbsd-tap
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}netbsd-tap
-
-.if !empty(NETBSD_TAP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.netbsd-tap+= netbsd-tap>=20050120
-BUILDLINK_PKGSRCDIR.netbsd-tap?= ../../net/netbsd-tap
-.endif # NETBSD_TAP_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 094afdd43062 -r 5cdea045b4db net/netbsd-tap/builtin.mk
--- a/net/netbsd-tap/builtin.mk Mon Feb 23 23:13:11 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:34 reed Exp $
-
-BUILTIN_PKG:= netbsd-tap
-
-BUILTIN_FIND_FILES_VAR:= H_NETBSD_TAP
-BUILTIN_FIND_FILES.H_NETBSD_TAP= /usr/include/net/if_tap.h
-
-.include "../../mk/buildlink3/bsd.builtin.mk"
-
-###
-### Determine if there is a built-in implementation of the package and
-### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
-###
-.if !defined(IS_BUILTIN.netbsd-tap)
-IS_BUILTIN.netbsd-tap= no
-. if empty(H_NETBSD_TAP:M__nonexistent__) && \
- empty(H_NETBSD_TAP:M${LOCALBASE}/*)
-IS_BUILTIN.netbsd-tap= yes
-. endif
-.endif
-MAKEVARS+= IS_BUILTIN.netbsd-tap
-
-###
-### Determine whether we should use the built-in implementation if it
-### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
-###
-.if !defined(USE_BUILTIN.netbsd-tap)
-. if ${PREFER.netbsd-tap} == "pkgsrc"
-USE_BUILTIN.netbsd-tap= no
-. else
-USE_BUILTIN.netbsd-tap= ${IS_BUILTIN.netbsd-tap}
-. if defined(BUILTIN_PKG.netbsd-tap) && \
- !empty(IS_BUILTIN.netbsd-tap:M[yY][eE][sS])
-USE_BUILTIN.netbsd-tap= yes
-. for _dep_ in ${BUILDLINK_API_DEPENDS.netbsd-tap}
-. if !empty(USE_BUILTIN.netbsd-tap:M[yY][eE][sS])
-USE_BUILTIN.netbsd-tap!= \
- if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.netbsd-tap:Q}; then \
- ${ECHO} yes; \
- else \
- ${ECHO} no; \
- fi
-. endif
-. endfor
-. endif
-. endif # PREFER.netbsd-tap
-.endif
-MAKEVARS+= USE_BUILTIN.netbsd-tap
diff -r 094afdd43062 -r 5cdea045b4db net/netbsd-tap/files/Makefile
--- a/net/netbsd-tap/files/Makefile Mon Feb 23 23:13:11 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2005/02/20 21:50:57 cube Exp $
-
-SRCS= if_tap_lkm.c if_tap.c if_tap_stub.c
-KMOD= tap
-WARNS= 3
-
-INCSDIR= ${PREFIX}/include/net
-INCS= if_tap.h
-
-KMODDIR= ${PREFIX}/lkm
-MANDIR= ${PREFIX}/man
-
-.if defined(USE_BPF) && !empty(USE_BPF:M[Yy][Ee][Ss])
-CPPFLAGS+= -DNBPFILTER=1
-.endif
-.if defined(TAP_KERNEL_ENV) && !empty(TAP_KERNEL_ENV)
-CPPFLAGS+= ${TAP_KERNEL_ENV}
-.endif
-
-install: install-postinstall
-
-install-postinstall:
- ${BSD_INSTALL_SCRIPT} tap_postinstall.sh ${PREFIX}/sbin/tap_postinstall
-
-.include <bsd.kinc.mk>
-.include <bsd.kmod.mk>
diff -r 094afdd43062 -r 5cdea045b4db net/netbsd-tap/files/if_tap.c
--- a/net/netbsd-tap/files/if_tap.c Mon Feb 23 23:13:11 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1397 +0,0 @@
-/* $NetBSD: if_tap.c,v 1.8 2008/04/29 05:46:09 martin Exp $ */
-
-/*
- * Copyright (c) 2003, 2004 The NetBSD Foundation.
- * All rights reserved.
- *
- * This code is derived from software contributed to the NetBSD Foundation
- * by Quentin Garnier.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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 FOUNDATION OR CONTRIBUTORS
- * 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.
- */
-
-/*
- * tap(4) is a virtual Ethernet interface. It appears as a real Ethernet
- * device to the system, but can also be accessed by userland through a
- * character device interface, which allows reading and injecting frames.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.8 2008/04/29 05:46:09 martin Exp $");
-
-#if defined(_KERNEL_OPT)
-#include "bpfilter.h"
-#endif
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/file.h>
-#include <sys/filedesc.h>
-#include <sys/ksyms.h>
-#include <sys/poll.h>
-#include <sys/select.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_ether.h>
-#include <net/if_media.h>
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
-#include "if_tap.h"
-#include "if_tap_stub.h"
-
Home |
Main Index |
Thread Index |
Old Index