Source-Changes-HG archive

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

[src/trunk]: src remove pim6[sd]d from the tree. the software had a restrict...



details:   https://anonhg.NetBSD.org/src/rev/e1cc48998ba9
branches:  trunk
changeset: 510584:e1cc48998ba9
user:      itojun <itojun%NetBSD.org@localhost>
date:      Sat Jun 02 00:34:00 2001 +0000

description:
remove pim6[sd]d from the tree.  the software had a restrictive license
than we can handle.  hope to re-enable it as pkgsrc, or to re-enable it
into basesrc if license updates.

diffstat:

 distrib/sets/lists/base/mi          |     5 +-
 distrib/sets/lists/base/obsolete.mi |     5 +-
 distrib/sets/lists/man/mi           |    12 +-
 distrib/sets/lists/man/obsolete.mi  |    12 +-
 usr.sbin/Makefile                   |     4 +-
 usr.sbin/pim6dd/LICENSE.mrouted     |    48 -
 usr.sbin/pim6dd/LICENSE.pimd        |    47 -
 usr.sbin/pim6dd/Makefile            |    11 -
 usr.sbin/pim6dd/VERSION             |     1 -
 usr.sbin/pim6dd/callout.c           |   257 --
 usr.sbin/pim6dd/config.c            |   792 ------
 usr.sbin/pim6dd/debug.c             |   565 ----
 usr.sbin/pim6dd/debug.h             |   121 -
 usr.sbin/pim6dd/defs.h              |   605 ----
 usr.sbin/pim6dd/inet6.c             |   289 --
 usr.sbin/pim6dd/kern.c              |   415 ---
 usr.sbin/pim6dd/main.c              |   719 -----
 usr.sbin/pim6dd/mld6.c              |   548 ----
 usr.sbin/pim6dd/mld6.h              |    49 -
 usr.sbin/pim6dd/mld6_proto.c        |   523 ----
 usr.sbin/pim6dd/mrt.c               |   803 ------
 usr.sbin/pim6dd/mrt.h               |   228 -
 usr.sbin/pim6dd/pathnames.h         |    63 -
 usr.sbin/pim6dd/pim6.c              |   441 ---
 usr.sbin/pim6dd/pim6_proto.c        |  1596 -------------
 usr.sbin/pim6dd/pim6dd.8            |   123 -
 usr.sbin/pim6dd/pim6dd.conf.5       |   160 -
 usr.sbin/pim6dd/pimdd.h             |   553 ----
 usr.sbin/pim6dd/route.c             |   659 -----
 usr.sbin/pim6dd/routesock.c         |   373 ---
 usr.sbin/pim6dd/timer.c             |   336 --
 usr.sbin/pim6dd/trace.c             |   540 ----
 usr.sbin/pim6dd/trace.h             |   204 -
 usr.sbin/pim6dd/vers.c              |     4 -
 usr.sbin/pim6dd/vif.c               |   535 ----
 usr.sbin/pim6dd/vif.h               |   292 --
 usr.sbin/pim6sd/BUGS.TODO           |   125 -
 usr.sbin/pim6sd/BUGS.V6             |     8 -
 usr.sbin/pim6sd/LICENSE.mrouted     |    48 -
 usr.sbin/pim6sd/LICENSE.pim6dd      |    30 -
 usr.sbin/pim6sd/LICENSE.pim6sd      |    46 -
 usr.sbin/pim6sd/LICENSE.pimd        |    48 -
 usr.sbin/pim6sd/Makefile            |    18 -
 usr.sbin/pim6sd/README              |    84 -
 usr.sbin/pim6sd/README.first        |    13 -
 usr.sbin/pim6sd/callout.c           |   320 --
 usr.sbin/pim6sd/callout.h           |    62 -
 usr.sbin/pim6sd/cfparse.h           |    56 -
 usr.sbin/pim6sd/cfparse.y           |  1032 --------
 usr.sbin/pim6sd/cftoken.l           |   672 -----
 usr.sbin/pim6sd/config.c            |   507 ----
 usr.sbin/pim6sd/config.h            |    75 -
 usr.sbin/pim6sd/crc.c               |   105 -
 usr.sbin/pim6sd/crc.h               |    49 -
 usr.sbin/pim6sd/debug.c             |  1026 --------
 usr.sbin/pim6sd/debug.h             |   153 -
 usr.sbin/pim6sd/defs.h              |    81 -
 usr.sbin/pim6sd/inet6.c             |   300 --
 usr.sbin/pim6sd/inet6.h             |    77 -
 usr.sbin/pim6sd/kern.c              |   421 ---
 usr.sbin/pim6sd/kern.h              |    77 -
 usr.sbin/pim6sd/main.c              |   787 ------
 usr.sbin/pim6sd/mld6.c              |   574 ----
 usr.sbin/pim6sd/mld6.h              |    89 -
 usr.sbin/pim6sd/mld6_proto.c        |   627 -----
 usr.sbin/pim6sd/mld6_proto.h        |    71 -
 usr.sbin/pim6sd/mrt.c               |  1511 ------------
 usr.sbin/pim6sd/mrt.h               |   330 --
 usr.sbin/pim6sd/pathnames.h         |    82 -
 usr.sbin/pim6sd/pim6.c              |   526 ----
 usr.sbin/pim6sd/pim6.h              |    63 -
 usr.sbin/pim6sd/pim6_proto.c        |  4286 -----------------------------------
 usr.sbin/pim6sd/pim6_proto.h        |   101 -
 usr.sbin/pim6sd/pim6sd.8            |   162 -
 usr.sbin/pim6sd/pim6sd.conf.5       |   336 --
 usr.sbin/pim6sd/pim6sd.conf.sample  |   105 -
 usr.sbin/pim6sd/pim6stat            |    87 -
 usr.sbin/pim6sd/pim6stat.1          |    91 -
 usr.sbin/pim6sd/pimd.h              |   526 ----
 usr.sbin/pim6sd/route.c             |  1194 ---------
 usr.sbin/pim6sd/route.h             |    84 -
 usr.sbin/pim6sd/routesock.c         |   434 ---
 usr.sbin/pim6sd/routesock.h         |    58 -
 usr.sbin/pim6sd/rp.c                |  1219 ---------
 usr.sbin/pim6sd/rp.h                |   121 -
 usr.sbin/pim6sd/timer.c             |  1316 ----------
 usr.sbin/pim6sd/timer.h             |   103 -
 usr.sbin/pim6sd/trace.c             |   561 ----
 usr.sbin/pim6sd/trace.h             |   210 -
 usr.sbin/pim6sd/var.h               |    60 -
 usr.sbin/pim6sd/vers.c              |     4 -
 usr.sbin/pim6sd/vif.c               |   834 ------
 usr.sbin/pim6sd/vif.h               |   268 --
 usr.sbin/pim6sd/vmbuf.h             |    49 -
 94 files changed, 19 insertions(+), 34221 deletions(-)

diffs (truncated from 34695 to 300 lines):

diff -r e01b60988472 -r e1cc48998ba9 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Sat Jun 02 00:01:04 2001 +0000
+++ b/distrib/sets/lists/base/mi        Sat Jun 02 00:34:00 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.261 2001/05/27 21:18:01 wiz Exp $
+# $NetBSD: mi,v 1.262 2001/06/02 00:34:00 itojun Exp $
 .                      base-sys-root
 ./altroot              base-sys-root
 ./bin                  base-sys-root
@@ -684,9 +684,6 @@
 ./usr/sbin/ntptimeset          base-ntp-bin
 ./usr/sbin/ntptrace            base-ntp-bin
 ./usr/sbin/pac                 base-sysutil-bin
-./usr/sbin/pim6dd              base-router-bin
-./usr/sbin/pim6sd              base-router-bin
-./usr/sbin/pim6stat            base-router-bin
 ./usr/sbin/pkg_add             base-pkgutil-bin
 ./usr/sbin/pkg_admin           base-pkgutil-bin
 ./usr/sbin/pkg_create          base-pkgutil-bin
diff -r e01b60988472 -r e1cc48998ba9 distrib/sets/lists/base/obsolete.mi
--- a/distrib/sets/lists/base/obsolete.mi       Sat Jun 02 00:01:04 2001 +0000
+++ b/distrib/sets/lists/base/obsolete.mi       Sat Jun 02 00:34:00 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mi,v 1.28 2001/05/26 01:03:07 wiz Exp $
+# $NetBSD: obsolete.mi,v 1.29 2001/06/02 00:34:01 itojun Exp $
 /bin/rcorder
 /dev/log
 /etc/disklabels
@@ -130,3 +130,6 @@
 /usr/share/zoneinfo/GMT9
 /usr/share/zoneinfo/Moscow
 /var/games/save
+/usr/sbin/pim6dd
+/usr/sbin/pim6sd
+/usr/sbin/pim6stat
diff -r e01b60988472 -r e1cc48998ba9 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Sat Jun 02 00:01:04 2001 +0000
+++ b/distrib/sets/lists/man/mi Sat Jun 02 00:34:00 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.358 2001/06/01 16:59:12 thorpej Exp $
+# $NetBSD: mi,v 1.359 2001/06/02 00:34:01 itojun Exp $
 ./usr/share/info/am-utils.info                 man-amd-info
 ./usr/share/info/as.info                       man-computil-info
 ./usr/share/info/awk.info                      man-util-info
@@ -266,7 +266,6 @@
 ./usr/share/man/cat1/patch.0                   man-util-catman
 ./usr/share/man/cat1/pawd.0                    man-amd-catman
 ./usr/share/man/cat1/pax.0                     man-util-catman
-./usr/share/man/cat1/pim6stat.0                        man-router-catman
 ./usr/share/man/cat1/pkg_add.0                 man-pkgutil-catman
 ./usr/share/man/cat1/pkg_admin.0               man-pkgutil-catman
 ./usr/share/man/cat1/pkg_create.0              man-pkgutil-catman
@@ -1033,8 +1032,6 @@
 ./usr/share/man/cat5/passwd.conf.0             man-sys-catman
 ./usr/share/man/cat5/pcre_table.0              man-postfix-catman
 ./usr/share/man/cat5/phones.0                  man-uucp-catman
-./usr/share/man/cat5/pim6dd.conf.0             man-router-catman
-./usr/share/man/cat5/pim6sd.conf.0             man-router-catman
 ./usr/share/man/cat5/printcap.0                        man-lpr-catman
 ./usr/share/man/cat5/protocols.0               man-net-catman
 ./usr/share/man/cat5/racoon.conf.0             man-netutil-catman
@@ -1357,8 +1354,6 @@
 ./usr/share/man/cat8/pcnfsd.0                  man-nfsserver-catman
 ./usr/share/man/cat8/peace.0                   man-sys-catman
 ./usr/share/man/cat8/pickup.0                  man-postfix-catman
-./usr/share/man/cat8/pim6dd.0                  man-router-catman
-./usr/share/man/cat8/pim6sd.0                  man-router-catman
 ./usr/share/man/cat8/ping.0                    man-netutil-catman
 ./usr/share/man/cat8/ping6.0                   man-netutil-catman
 ./usr/share/man/cat8/pipe.0                    man-postfix-catman
@@ -1781,7 +1776,6 @@
 ./usr/share/man/man1/patch.1                   man-util-man
 ./usr/share/man/man1/pawd.1                    man-amd-man
 ./usr/share/man/man1/pax.1                     man-util-man
-./usr/share/man/man1/pim6stat.1                        man-router-man
 ./usr/share/man/man1/pkg_add.1                 man-pkgutil-man
 ./usr/share/man/man1/pkg_admin.1               man-pkgutil-man
 ./usr/share/man/man1/pkg_create.1              man-pkgutil-man
@@ -2548,8 +2542,6 @@
 ./usr/share/man/man5/passwd.conf.5             man-sys-man
 ./usr/share/man/man5/pcre_table.5              man-postfix-man
 ./usr/share/man/man5/phones.5                  man-uucp-man
-./usr/share/man/man5/pim6dd.conf.5             man-router-man
-./usr/share/man/man5/pim6sd.conf.5             man-router-man
 ./usr/share/man/man5/printcap.5                        man-lpr-man
 ./usr/share/man/man5/protocols.5               man-net-man
 ./usr/share/man/man5/racoon.conf.5             man-netutil-man
@@ -2872,8 +2864,6 @@
 ./usr/share/man/man8/pcnfsd.8                  man-nfsserver-man
 ./usr/share/man/man8/peace.8                   man-sys-man
 ./usr/share/man/man8/pickup.8                  man-postfix-man
-./usr/share/man/man8/pim6dd.8                  man-router-man
-./usr/share/man/man8/pim6sd.8                  man-router-man
 ./usr/share/man/man8/ping.8                    man-netutil-man
 ./usr/share/man/man8/ping6.8                   man-netutil-man
 ./usr/share/man/man8/pipe.8                    man-postfix-man
diff -r e01b60988472 -r e1cc48998ba9 distrib/sets/lists/man/obsolete.mi
--- a/distrib/sets/lists/man/obsolete.mi        Sat Jun 02 00:01:04 2001 +0000
+++ b/distrib/sets/lists/man/obsolete.mi        Sat Jun 02 00:34:00 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mi,v 1.27 2001/05/26 00:55:35 wiz Exp $
+# $NetBSD: obsolete.mi,v 1.28 2001/06/02 00:34:01 itojun Exp $
 /usr/share/man/cat1/amq.0
 /usr/share/man/cat1/i386
 /usr/share/man/cat1/i386/cursor.0
@@ -150,3 +150,13 @@
 /usr/share/man/man8/xntpd.8
 /usr/share/man/man8/xntpdc.8
 /usr/share/man/man9/boot.9
+/usr/share/man/cat1/pim6stat.0
+/usr/share/man/cat5/pim6dd.conf.0
+/usr/share/man/cat5/pim6sd.conf.0
+/usr/share/man/cat8/pim6dd.0
+/usr/share/man/cat8/pim6sd.0
+/usr/share/man/man1/pim6stat.1
+/usr/share/man/man5/pim6dd.conf.5
+/usr/share/man/man5/pim6sd.conf.5
+/usr/share/man/man8/pim6dd.8
+/usr/share/man/man8/pim6sd.8
diff -r e01b60988472 -r e1cc48998ba9 usr.sbin/Makefile
--- a/usr.sbin/Makefile Sat Jun 02 00:01:04 2001 +0000
+++ b/usr.sbin/Makefile Sat Jun 02 00:34:00 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.157 2001/05/22 14:50:31 fredette Exp $
+#      $NetBSD: Makefile,v 1.158 2001/06/02 00:34:00 itojun Exp $
 #      from: @(#)Makefile      5.20 (Berkeley) 6/12/93
 
 .include <bsd.own.mk>
@@ -21,7 +21,7 @@
        wsfontload ypbind yppoll ypserv ypset zdump zic
 
 # IPv6
-SUBDIR+=faithd ifmcstat mld6query mtrace6 ndp pim6dd pim6sd \
+SUBDIR+=faithd ifmcstat mld6query mtrace6 ndp \
        rip6query route6d rtadvd traceroute6 rtsold
 
 # ATM PVC
diff -r e01b60988472 -r e1cc48998ba9 usr.sbin/pim6dd/LICENSE.mrouted
--- a/usr.sbin/pim6dd/LICENSE.mrouted   Sat Jun 02 00:01:04 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-
-The mrouted program is covered by the following license.  Use of the
-mrouted program represents acceptance of these terms and conditions.
-
-1. STANFORD grants to LICENSEE a nonexclusive and nontransferable license
-to use, copy and modify the computer software ``mrouted'' (hereinafter
-called the ``Program''), upon the terms and conditions hereinafter set
-out and until Licensee discontinues use of the Licensed Program.
-
-2. LICENSEE acknowledges that the Program is a research tool still in
-the development state, that it is being supplied ``as is,'' without any
-accompanying services from STANFORD, and that this license is entered
-into in order to encourage scientific collaboration aimed at further
-development and application of the Program.
-
-3. LICENSEE may copy the Program and may sublicense others to use object
-code copies of the Program or any derivative version of the Program.
-All copies must contain all copyright and other proprietary notices found
-in the Program as provided by STANFORD.  Title to copyright to the
-Program remains with STANFORD.
-
-4. LICENSEE may create derivative versions of the Program.  LICENSEE
-hereby grants STANFORD a royalty-free license to use, copy, modify,
-distribute and sublicense any such derivative works.  At the time
-LICENSEE provides a copy of a derivative version of the Program to a
-third party, LICENSEE shall provide STANFORD with one copy of the source
-code of the derivative version at no charge to STANFORD.
-
-5. STANFORD MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.
-By way of example, but not limitation, STANFORD MAKES NO REPRESENTATION
-OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR
-THAT THE USE OF THE LICENSED PROGRAM WILL NOT INFRINGE ANY PATENTS,
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. STANFORD shall not be held liable
-for any liability nor for any direct, indirect or consequential damages
-with respect to any claim by LICENSEE or any third party on account of or
-arising from this Agreement or use of the Program.
-
-6. This agreement shall be construed, interpreted and applied in
-accordance with the State of California and any legal action arising
-out of this Agreement or use of the Program shall be filed in a court
-in the State of California.
-
-7. Nothing in this Agreement shall be construed as conferring rights to
-use in advertising, publicity or otherwise any trademark or the name
-of ``Stanford''.
-
-The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
-Leland Stanford Junior University.
diff -r e01b60988472 -r e1cc48998ba9 usr.sbin/pim6dd/LICENSE.pimd
--- a/usr.sbin/pim6dd/LICENSE.pimd      Sat Jun 02 00:01:04 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 1998 by the University of Southern California.
- *  All rights reserved.
- *
- *  Permission to use, copy, modify, and distribute this software and
- *  its documentation in source and binary forms for lawful
- *  purposes and without fee is hereby granted, provided
- *  that the above copyright notice appear in all copies and that both
- *  the copyright notice and this permission notice appear in supporting
- *  documentation, and that any documentation, advertising materials,
- *  and other materials related to such distribution and use acknowledge
- *  that the software was developed by the University of Southern
- *  California and/or Information Sciences Institute.
- *  The name of the University of Southern California may not
- *  be used to endorse or promote products derived from this software
- *  without specific prior written permission.
- *
- *  THE UNIVERSITY OF SOUTHERN CALIFORNIA DOES NOT MAKE ANY REPRESENTATIONS
- *  ABOUT THE SUITABILITY OF THIS SOFTWARE FOR ANY PURPOSE.  THIS SOFTWARE IS
- *  PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
- *  INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND 
- *  NON-INFRINGEMENT.
- *
- *  IN NO EVENT SHALL USC, OR ANY OTHER CONTRIBUTOR BE LIABLE FOR ANY
- *  SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES, WHETHER IN CONTRACT,
- *  TORT, OR OTHER FORM OF ACTION, ARISING OUT OF OR IN CONNECTION WITH,
- *  THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- *  Other copyrights might apply to parts of this software and are so
- *  noted when applicable.
- */
-/*
- *  Questions concerning this software should be directed to 
- *  Pavlin Ivanov Radoslavov (pavlin%catarina.usc.edu@localhost)
- *
- *  KAME Id: LICENSE.pimd,v 1.1.1.1 1999/08/08 23:30:50 itojun Exp
- */
-/*
- * Part of this program has been derived from mrouted.
- * The mrouted program is covered by the license in the accompanying file
- * named "LICENSE.mrouted".
- *
- * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
- * Leland Stanford Junior University.
- *
- */
diff -r e01b60988472 -r e1cc48998ba9 usr.sbin/pim6dd/Makefile
--- a/usr.sbin/pim6dd/Makefile  Sat Jun 02 00:01:04 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2000/02/25 06:30:54 itojun Exp $
-
-PROG=  pim6dd
-SRCS=  mld6.c mld6_proto.c \
-       inet6.c kern.c main.c config.c debug.c routesock.c vers.c callout.c \
-       route.c vif.c timer.c mrt.c pim6.c pim6_proto.c trace.c
-MAN=   pim6dd.8 pim6dd.conf.5
-
-CPPFLAGS+=-DINET6 -DPIM -DIOCTL_OK_ON_RAW_SOCKET -DHAVE_GETIFADDRS
-
-.include <bsd.prog.mk>
diff -r e01b60988472 -r e1cc48998ba9 usr.sbin/pim6dd/VERSION
--- a/usr.sbin/pim6dd/VERSION   Sat Jun 02 00:01:04 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-0.2.1.0-alpha15
diff -r e01b60988472 -r e1cc48998ba9 usr.sbin/pim6dd/callout.c
--- a/usr.sbin/pim6dd/callout.c Sat Jun 02 00:01:04 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,257 +0,0 @@
-/*     $NetBSD: callout.c,v 1.2 2000/12/04 07:05:47 itojun Exp $       */
-/*     $KAME: callout.c,v 1.2 2000/12/04 06:33:09 itojun Exp $ */
-
-/*
- * The mrouted program is covered by the license in the accompanying file
- * named "LICENSE.mrouted". Use of the mrouted program represents acceptance
- * of the terms and conditions listed in that file.
- *
- * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
- * Leland Stanford Junior University.
- *
- *
- * callout.c,v 3.8.4.5 1997/05/16 20:18:25 fenner Exp
- */
-
-#include "defs.h"
-
-/* the code below implements a callout queue */
-static int id = 0;
-static struct timeout_q  *Q = 0; /* pointer to the beginning of timeout queue */
-
-struct timeout_q {
-    struct timeout_q *next;            /* next event */
-    int                     id;  
-    cfunc_t          func;             /* function to call */
-    void            *data;             /* func's data */
-    int              time;             /* time offset to next event*/
-};
-
-#ifdef CALLOUT_DEBUG
-static void print_Q __P((void));
-#else
-#define        print_Q()       
-#endif
-
-void



Home | Main Index | Thread Index | Old Index