From 217d3e2e5c7e3e7387edd56e07272c556e72a67b Mon Sep 17 00:00:00 2001 From: maxv Date: Thu, 6 Sep 2018 19:07:13 +0000 Subject: [PATCH] Remove netinet6/ipsec.h. --- distrib/sets/lists/comp/mi | 4 ++-- sys/netinet6/Makefile | 3 +-- sys/netinet6/ipsec.h | 34 ---------------------------------- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 sys/netinet6/ipsec.h diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 8695fb9a80e6..e9dddefbc397 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2226 2018/09/06 06:41:59 maxv Exp $ +# $NetBSD: mi,v 1.2227 2018/09/06 19:07:13 maxv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.comp comp-sys-root @@ -2453,7 +2453,7 @@ ./usr/include/netinet6/ip6_var.h comp-c-include ./usr/include/netinet6/ip6protosw.h comp-c-include ./usr/include/netinet6/ipcomp.h comp-obsolete obsolete -./usr/include/netinet6/ipsec.h comp-c-include +./usr/include/netinet6/ipsec.h comp-obsolete obsolete ./usr/include/netinet6/mld6_var.h comp-c-include ./usr/include/netinet6/nd6.h comp-c-include ./usr/include/netinet6/pim6.h comp-c-include diff --git a/sys/netinet6/Makefile b/sys/netinet6/Makefile index b973ed3dccdd..e3af45f77d70 100644 --- a/sys/netinet6/Makefile +++ b/sys/netinet6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2017/02/16 08:12:44 knakahara Exp $ +# $NetBSD: Makefile,v 1.10 2018/09/06 19:07:13 maxv Exp $ INCSDIR= /usr/include/netinet6 @@ -6,6 +6,5 @@ INCS= in6.h in6_gif.h in6_l2tp.h in6_ifattach.h in6_pcb.h \ in6_var.h ip6_mroute.h ip6_var.h ip6protosw.h \ mld6_var.h nd6.h pim6.h pim6_var.h \ raw_ip6.h udp6.h udp6_var.h -INCS+= ipsec.h .include diff --git a/sys/netinet6/ipsec.h b/sys/netinet6/ipsec.h deleted file mode 100644 index 14d488b7c6b8..000000000000 --- a/sys/netinet6/ipsec.h +++ /dev/null @@ -1,34 +0,0 @@ -/* $NetBSD: ipsec.h,v 1.54 2012/03/22 20:34:41 drochner Exp $ */ -/* $KAME: ipsec.h,v 1.51 2001/08/05 04:52:58 itojun Exp $ */ - -/* - * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. - * 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. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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 PROJECT 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. - */ - -/* this file exists for userland API compatibility only */ -#include