[src/trunk]: src Remove netkey/.

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0c39b325101b
branches:  trunk
changeset: 433303:0c39b325101b
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu Sep 06 19:19:44 2018 +0000

description:
Remove netkey/.

diffstat:

 distrib/sets/lists/base/mi |   4 ++--
 distrib/sets/lists/comp/mi |   4 ++--
 etc/mtree/NetBSD.dist.base |   3 +--
 sys/Makefile               |   4 ++--
 sys/netkey/Makefile        |   7 -------
 sys/netkey/keysock.h       |  34 ----------------------------------
 6 files changed, 7 insertions(+), 49 deletions(-)

diffs (118 lines):

diff -r d7ae0dd1d792 -r 0c39b325101b distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Thu Sep 06 19:07:13 2018 +0000
+++ b/distrib/sets/lists/base/mi        Thu Sep 06 19:19:44 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1184 2018/09/06 06:41:59 maxv Exp $
+# $NetBSD: mi,v 1.1185 2018/09/06 19:19:44 maxv Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -1215,7 +1215,7 @@
 ./usr/include/netipsec                         base-c-usr
 ./usr/include/netisdn                          base-c-usr
 ./usr/include/netiso                           base-obsolete           obsolete
-./usr/include/netkey                           base-c-usr
+./usr/include/netkey                           base-obsolete           obsolete
 ./usr/include/netmpls                          base-c-usr
 ./usr/include/netnatm                          base-obsolete           obsolete
 ./usr/include/netns                            base-obsolete           obsolete
diff -r d7ae0dd1d792 -r 0c39b325101b distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Thu Sep 06 19:07:13 2018 +0000
+++ b/distrib/sets/lists/comp/mi        Thu Sep 06 19:19:44 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.2227 2018/09/06 19:07:13 maxv Exp $
+#      $NetBSD: mi,v 1.2228 2018/09/06 19:19:44 maxv Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp                           comp-sys-root
@@ -2510,7 +2510,7 @@
 ./usr/include/netkey/key_debug.h               comp-obsolete           obsolete
 ./usr/include/netkey/key_var.h                 comp-obsolete           obsolete
 ./usr/include/netkey/keydb.h                   comp-obsolete           obsolete
-./usr/include/netkey/keysock.h                 comp-c-include
+./usr/include/netkey/keysock.h                 comp-obsolete           obsolete
 ./usr/include/netkey/keyv2.h                   comp-obsolete           obsolete
 ./usr/include/netmpls/mpls.h                   comp-c-include
 ./usr/include/netnatm/natm.h                   comp-obsolete           obsolete
diff -r d7ae0dd1d792 -r 0c39b325101b etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base        Thu Sep 06 19:07:13 2018 +0000
+++ b/etc/mtree/NetBSD.dist.base        Thu Sep 06 19:19:44 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.base,v 1.172 2018/09/06 09:31:06 maxv Exp $
+#      $NetBSD: NetBSD.dist.base,v 1.173 2018/09/06 19:19:44 maxv Exp $
 #      @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -220,7 +220,6 @@
 ./usr/include/netinet6
 ./usr/include/netipsec
 ./usr/include/netisdn
-./usr/include/netkey
 ./usr/include/netpgp
 ./usr/include/netsmb
 ./usr/include/nfs
diff -r d7ae0dd1d792 -r 0c39b325101b sys/Makefile
--- a/sys/Makefile      Thu Sep 06 19:07:13 2018 +0000
+++ b/sys/Makefile      Thu Sep 06 19:19:44 2018 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.81 2018/09/06 09:13:42 martin Exp $
+#      $NetBSD: Makefile,v 1.82 2018/09/06 19:19:44 maxv Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=        altq arch compat dev fs miscfs \
        net net80211 netatalk netbt netcan netipsec netinet netinet6 \
-        netisdn netkey netmpls netsmb \
+        netisdn netmpls netsmb \
        nfs opencrypto sys ufs uvm
 
 # interrupt implementation depends on the kernel within the port
diff -r d7ae0dd1d792 -r 0c39b325101b sys/netkey/Makefile
--- a/sys/netkey/Makefile       Thu Sep 06 19:07:13 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#      $NetBSD: Makefile,v 1.5 2012/01/06 14:17:11 drochner Exp $
-
-INCSDIR= /usr/include/netkey
-
-INCS=  keysock.h
-
-.include <bsd.kinc.mk>
diff -r d7ae0dd1d792 -r 0c39b325101b sys/netkey/keysock.h
--- a/sys/netkey/keysock.h      Thu Sep 06 19:07:13 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*     $NetBSD: keysock.h,v 1.17 2012/03/22 20:34:43 drochner Exp $    */
-/*     $KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa 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 <netipsec/keysock.h>