From f260e94a2315106a72fd9da2d5eacf68a5d6b8d9 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 11 Oct 2004 10:55:34 +0000 Subject: [PATCH] for [2004100510485632448] git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4532 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../tsa/zebra/00zebra-0.93b-bgpd-hash.patch | 70 ----- .../10zebra-0.93b-ospfd-md5-buffer.patch | 54 ---- .../20zebra-0.93b-ospfd-md5auth-seqnum.patch | 43 --- .../30zebra-0.93b-ospfd-oi_write_q.patch | 34 --- .../tsa/zebra/40zebra-0.93b-ospfd-olsa.patch | 48 ---- package/tsa/zebra/50zebra-0.91a-netlink.patch | 71 ----- .../tsa/zebra/60zebra-0.91a-remote_dos.patch | 23 -- .../zebra/70zebra-0.93b-doc-path-fixes.patch | 263 ------------------ package/tsa/zebra/bgpd.init | 44 --- package/tsa/zebra/ospf6d.init | 43 --- package/tsa/zebra/ospfd.init | 44 --- package/tsa/zebra/ripd.init | 44 --- package/tsa/zebra/ripngd.init | 44 --- package/tsa/zebra/zebra.cache | 36 --- package/tsa/zebra/zebra.conf | 40 --- package/tsa/zebra/zebra.desc | 47 ---- package/tsa/zebra/zebra.init | 44 --- 17 files changed, 992 deletions(-) delete mode 100644 package/tsa/zebra/00zebra-0.93b-bgpd-hash.patch delete mode 100644 package/tsa/zebra/10zebra-0.93b-ospfd-md5-buffer.patch delete mode 100644 package/tsa/zebra/20zebra-0.93b-ospfd-md5auth-seqnum.patch delete mode 100644 package/tsa/zebra/30zebra-0.93b-ospfd-oi_write_q.patch delete mode 100644 package/tsa/zebra/40zebra-0.93b-ospfd-olsa.patch delete mode 100644 package/tsa/zebra/50zebra-0.91a-netlink.patch delete mode 100644 package/tsa/zebra/60zebra-0.91a-remote_dos.patch delete mode 100644 package/tsa/zebra/70zebra-0.93b-doc-path-fixes.patch delete mode 100644 package/tsa/zebra/bgpd.init delete mode 100644 package/tsa/zebra/ospf6d.init delete mode 100644 package/tsa/zebra/ospfd.init delete mode 100644 package/tsa/zebra/ripd.init delete mode 100644 package/tsa/zebra/ripngd.init delete mode 100644 package/tsa/zebra/zebra.cache delete mode 100644 package/tsa/zebra/zebra.conf delete mode 100644 package/tsa/zebra/zebra.desc delete mode 100644 package/tsa/zebra/zebra.init diff --git a/package/tsa/zebra/00zebra-0.93b-bgpd-hash.patch b/package/tsa/zebra/00zebra-0.93b-bgpd-hash.patch deleted file mode 100644 index 71b097f46..000000000 --- a/package/tsa/zebra/00zebra-0.93b-bgpd-hash.patch +++ /dev/null @@ -1,70 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/zebra/00zebra-0.93b-bgpd-hash.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./bgpd/bgp_aspath.c Wed Jun 19 12:24:24 2002 -+++ ./bgpd/bgp_aspath.c Tue Aug 6 11:21:29 2002 -@@ -1111,19 +1111,22 @@ - return aspath; - } - --/* Make hash value by raw aspath data. */ -+/* Make hash value by raw aspath data. Produces a 16-19 bit hash */ - unsigned int - aspath_key_make (struct aspath *aspath) - { - unsigned int key = 0; - int length; -- caddr_t pnt; -+ unsigned short *pnt; - -- length = aspath->length; -- pnt = aspath->data; -+ length = aspath->length / 2; -+ pnt = (unsigned short *) aspath->data; - - while (length) -- key += pnt[--length]; -+ { -+ key += *pnt++; -+ length--; -+ } - - return key; - } -@@ -1143,7 +1146,7 @@ - void - aspath_init () - { -- ashash = hash_create (aspath_key_make, aspath_cmp); -+ ashash = hash_create_size (131072, aspath_key_make, aspath_cmp); - } - - /* return and as path value */ -@@ -1167,7 +1170,7 @@ - - as = (struct aspath *) backet->data; - -- vty_out (vty, "[%p:%d] (%ld) ", backet, backet->key, as->refcnt); -+ vty_out (vty, "[%p:%u] (%ld) ", backet, backet->key, as->refcnt); - vty_out (vty, "%s%s", as->str, VTY_NEWLINE); - } - diff --git a/package/tsa/zebra/10zebra-0.93b-ospfd-md5-buffer.patch b/package/tsa/zebra/10zebra-0.93b-ospfd-md5-buffer.patch deleted file mode 100644 index 0c2af781b..000000000 --- a/package/tsa/zebra/10zebra-0.93b-ospfd-md5-buffer.patch +++ /dev/null @@ -1,54 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/zebra/10zebra-0.93b-ospfd-md5-buffer.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./ospfd/ospf_packet.c.orig Mon Aug 12 08:49:16 2002 -+++ ./ospfd/ospf_packet.c Fri Oct 11 12:28:36 2002 -@@ -226,7 +226,13 @@ - { - struct ospf_packet *new; - -- new = ospf_packet_new (op->length); -+ if (stream_get_endp(op->s) != op->length) { -+ zlog_warn ("ospf_packet_dup stream %d ospf_packet %d size mismatch", -+ STREAM_SIZE(op->s), op->length); -+ } -+ -+ /* Reserve space for MD5 authentication that may be added later. */ -+ new = ospf_packet_new (stream_get_endp(op->s) + OSPF_AUTH_MD5_SIZE); - ospf_stream_copy (new->s, op->s); - - new->dst = op->dst; -@@ -341,7 +347,12 @@ - stream_set_putp (op->s, oldputp); - - /* We do *NOT* increment the OSPF header length. */ -- op->length += OSPF_AUTH_MD5_SIZE; -+ op->length = ntohs (ospfh->length) + OSPF_AUTH_MD5_SIZE; -+ -+ if (stream_get_endp(op->s) != op->length) { -+ zlog_warn("ospf_make_md5_digest: length mismatch stream %d ospf_packet %d", -+ stream_get_endp(op->s), op->length); -+ } - - return OSPF_AUTH_MD5_SIZE; - } - diff --git a/package/tsa/zebra/20zebra-0.93b-ospfd-md5auth-seqnum.patch b/package/tsa/zebra/20zebra-0.93b-ospfd-md5auth-seqnum.patch deleted file mode 100644 index e29c0f8fb..000000000 --- a/package/tsa/zebra/20zebra-0.93b-ospfd-md5auth-seqnum.patch +++ /dev/null @@ -1,43 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/zebra/20zebra-0.93b-ospfd-md5auth-seqnum.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./ospfd/ospf_packet.c Thu Jul 25 19:06:00 2002 -+++ ./ospfd/ospf_packet.c Tue Oct 8 08:34:59 2002 -@@ -306,6 +306,7 @@ - struct md5_ctx ctx; - void *ibuf; - unsigned long oldputp; -+ u_int32_t t; - struct crypt_key *ck; - char *auth_key; - -@@ -317,7 +318,9 @@ - - /* We do this here so when we dup a packet, we don't have to - waste CPU rewriting other headers. */ -- ospfh->u.crypt.crypt_seqnum = htonl (oi->crypt_seqnum++); -+ t = (time(NULL) & 0xFFFFFFFF); -+ oi->crypt_seqnum = ( t > oi->crypt_seqnum ? t : oi->crypt_seqnum++); -+ ospfh->u.crypt.crypt_seqnum = htonl (oi->crypt_seqnum); - - /* Get MD5 Authentication key from auth_key list. */ - if (list_isempty (OSPF_IF_PARAM (oi, auth_crypt))) diff --git a/package/tsa/zebra/30zebra-0.93b-ospfd-oi_write_q.patch b/package/tsa/zebra/30zebra-0.93b-ospfd-oi_write_q.patch deleted file mode 100644 index d38e6bb1f..000000000 --- a/package/tsa/zebra/30zebra-0.93b-ospfd-oi_write_q.patch +++ /dev/null @@ -1,34 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/zebra/30zebra-0.93b-ospfd-oi_write_q.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./ospfd/ospf_interface.c Mon Sep 2 11:42:18 2002 -+++ ./ospfd/ospf_interface.c Tue Oct 1 11:29:59 2002 -@@ -429,6 +429,8 @@ - if (oi->on_write_q) - { - listnode_delete (ospf_top->oi_write_q, oi); -+ if (list_isempty(ospf_top->oi_write_q)) -+ OSPF_TIMER_OFF (ospf_top->t_write); - oi->on_write_q = 0; - } - } - diff --git a/package/tsa/zebra/40zebra-0.93b-ospfd-olsa.patch b/package/tsa/zebra/40zebra-0.93b-ospfd-olsa.patch deleted file mode 100644 index 0f5cb9492..000000000 --- a/package/tsa/zebra/40zebra-0.93b-ospfd-olsa.patch +++ /dev/null @@ -1,48 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/zebra/40zebra-0.93b-ospfd-olsa.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./ospfd/ospf_vty.c Thu Jul 25 19:06:00 2002 -+++ ./ospfd/ospf_vty.c Sat Aug 24 19:37:43 2002 -@@ -3764,9 +3764,9 @@ - #ifdef HAVE_OPAQUE_LSA - else if (strncmp (argv[0], "opaque-l", 8) == 0) - type = OSPF_OPAQUE_LINK_LSA; -- else if (strncmp (argv[0], "opaque-a", 8) == 0) -+ else if (strncmp (argv[0], "opaque-ar", 9) == 0) - type = OSPF_OPAQUE_AREA_LSA; -- else if (strncmp (argv[0], "opaque-e", 8) == 0) -+ else if (strncmp (argv[0], "opaque-as", 9) == 0) - type = OSPF_OPAQUE_AS_LSA; - #endif /* HAVE_OPAQUE_LSA */ - else -@@ -3888,9 +3888,9 @@ - #ifdef HAVE_OPAQUE_LSA - else if (strncmp (argv[0], "opaque-l", 8) == 0) - type = OSPF_OPAQUE_LINK_LSA; -- else if (strncmp (argv[0], "opaque-a", 8) == 0) -+ else if (strncmp (argv[0], "opaque-ar", 9) == 0) - type = OSPF_OPAQUE_AREA_LSA; -- else if (strncmp (argv[0], "opaque-e", 8) == 0) -+ else if (strncmp (argv[0], "opaque-as", 9) == 0) - type = OSPF_OPAQUE_AS_LSA; - #endif /* HAVE_OPAQUE_LSA */ - else diff --git a/package/tsa/zebra/50zebra-0.91a-netlink.patch b/package/tsa/zebra/50zebra-0.91a-netlink.patch deleted file mode 100644 index 10a340aa7..000000000 --- a/package/tsa/zebra/50zebra-0.91a-netlink.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- zebra-0.91a/zebra/rt_netlink.c.netlink Tue Jan 23 03:10:04 2001 -+++ zebra-0.91a/zebra/rt_netlink.c Wed Oct 29 22:46:44 2003 -@@ -46,9 +46,8 @@ - int seq; - struct sockaddr_nl snl; - char *name; --} netlink = { -1, 0, {0}, "netlink-listen" }, /* kernel messages */ -- netlink_cmd = { -1, 0, {0}, "netlink-cmd" }, /* command channel */ -- netlink_addr = {-1, 0, {0}, "netlink-addr" }; /* address channel */ -+} netlink_sock ={ -1, 0, {0}, "netlink-listen" }, /* kernel messages */ -+ netlink_cmd = { -1, 0, {0}, "netlink-cmd" }; /* command channel */ - - struct message nlmsg_str[] = - { -@@ -206,6 +205,13 @@ - return -1; - } - -+ /* JF: Ignore messages that aren't from the kernel */ -+ if ( snl.nl_pid != 0 ) -+ { -+ zlog ( NULL, LOG_ERR, "Ignoring message from pid %u", snl.nl_pid ); -+ continue; -+ } -+ - for (h = (struct nlmsghdr *) buf; NLMSG_OK (h, status); - h = NLMSG_NEXT (h, status)) - { -@@ -1052,7 +1058,7 @@ - snl.nl_family = AF_NETLINK; - - /* Talk to netlink socket. */ -- ret = netlink_talk (&req.n, &netlink); -+ ret = netlink_talk (&req.n, &netlink_sock); - if (ret < 0) - return -1; - -@@ -1270,7 +1276,7 @@ - if (family == AF_INET) - nl = &netlink_cmd; - else -- nl = &netlink; -+ nl = &netlink_sock; - - /* Talk to netlink socket. */ - return netlink_talk (&req.n, nl); -@@ -1384,8 +1390,8 @@ - int sock; - - sock = THREAD_FD (thread); -- ret = netlink_parse_info (netlink_information_fetch, &netlink); -- thread_add_read (master, kernel_read, NULL, netlink.sock); -+ ret = netlink_parse_info (netlink_information_fetch, &netlink_sock); -+ thread_add_read (master, kernel_read, NULL, netlink_sock.sock); - - return 0; - } -@@ -1401,10 +1407,10 @@ - #ifdef HAVE_IPV6 - groups |= RTMGRP_IPV6_ROUTE|RTMGRP_IPV6_IFADDR; - #endif /* HAVE_IPV6 */ -- netlink_socket (&netlink, groups); -+ netlink_socket (&netlink_sock, groups); - netlink_socket (&netlink_cmd, 0); - - /* Register kernel socket. */ -- if (netlink.sock > 0) -- thread_add_read (master, kernel_read, NULL, netlink.sock); -+ if (netlink_sock.sock > 0) -+ thread_add_read (master, kernel_read, NULL, netlink_sock.sock); - } diff --git a/package/tsa/zebra/60zebra-0.91a-remote_dos.patch b/package/tsa/zebra/60zebra-0.91a-remote_dos.patch deleted file mode 100644 index 6b8ccccd4..000000000 --- a/package/tsa/zebra/60zebra-0.91a-remote_dos.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- zebra-0.91a/lib/vty.c.orig Thu Feb 1 02:18:05 2001 -+++ zebra-0.91a/lib/vty.c Wed Oct 15 19:50:34 2003 -@@ -1103,13 +1103,16 @@ - break; - case SE: - { -- char *buffer = (char *)vty->sb_buffer->head->data; -- int length = vty->sb_buffer->length; -+ char *buffer; -+ int length; - -- if (buffer == NULL) -+ if (!vty->iac_sb_in_progress) - return 0; - -- if (!vty->iac_sb_in_progress) -+ buffer = (char *)vty->sb_buffer->head->data; -+ length = vty->sb_buffer->length; -+ -+ if (buffer == NULL) - return 0; - - if (buffer[0] == '\0') diff --git a/package/tsa/zebra/70zebra-0.93b-doc-path-fixes.patch b/package/tsa/zebra/70zebra-0.93b-doc-path-fixes.patch deleted file mode 100644 index 52d47e30f..000000000 --- a/package/tsa/zebra/70zebra-0.93b-doc-path-fixes.patch +++ /dev/null @@ -1,263 +0,0 @@ -diff -Nur zebra-0.93b.orig/doc/basic.texi zebra-0.93b/doc/basic.texi ---- zebra-0.93b.orig/doc/basic.texi 2002-06-30 10:41:05.000000000 +0200 -+++ zebra-0.93b/doc/basic.texi 2003-11-17 22:36:32.000000000 +0100 -@@ -90,7 +90,7 @@ - If you want to log into a file please specify @code{filename} as - follows. - @example --log file /usr/local/etc/bgpd.log -+log file /var/log/zebra/bgpd.log - @end example - @end deffn - -diff -Nur zebra-0.93b.orig/doc/bgpd.8 zebra-0.93b/doc/bgpd.8 ---- zebra-0.93b.orig/doc/bgpd.8 2002-06-21 23:14:39.000000000 +0200 -+++ zebra-0.93b/doc/bgpd.8 2003-11-17 22:31:39.000000000 +0100 -@@ -40,7 +40,7 @@ - .TP - \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR - Specifies the config file to use for startup. If not specified this --option will likely default to \fB\fI/usr/local/etc/bgpd.conf\fR. -+option will likely default to \fB\fI/etc/zebra/bgpd.conf\fR. - - .TP - \fB\-h\fR, \fB\-\-help\fR -@@ -121,13 +121,13 @@ - .SH FILES - - .TP --.BI /usr/local/sbin/bgpd -+.BI /usr/sbin/bgpd - The default location of the - .B bgpd - binary. - - .TP --.BI /usr/local/etc/bgpd.conf -+.BI /etc/zebra/bgpd.conf - The default location of the - .B bgpd - config file. -diff -Nur zebra-0.93b.orig/doc/ospf6d.8 zebra-0.93b/doc/ospf6d.8 ---- zebra-0.93b.orig/doc/ospf6d.8 2002-06-21 23:14:39.000000000 +0200 -+++ zebra-0.93b/doc/ospf6d.8 2003-11-17 22:33:03.000000000 +0100 -@@ -35,7 +35,7 @@ - .TP - \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR - Specifies the config file to use for startup. If not specified this --option will likely default to \fB\fI/usr/local/etc/ospf6d.conf\fR. -+option will likely default to \fB\fI/etc/zebra/ospf6d.conf\fR. - - .TP - \fB\-h\fR, \fB\-\-help\fR -@@ -79,13 +79,13 @@ - .SH FILES - - .TP --.BI /usr/local/sbin/ospf6d -+.BI /usr/sbin/ospf6d - The default location of the - .B ospf6d - binary. - - .TP --.BI /usr/local/etc/ospf6d.conf -+.BI /etc/zebra/ospf6d.conf - The default location of the - .B ospf6d - config file. -diff -Nur zebra-0.93b.orig/doc/ospfd.8 zebra-0.93b/doc/ospfd.8 ---- zebra-0.93b.orig/doc/ospfd.8 2002-06-21 23:14:39.000000000 +0200 -+++ zebra-0.93b/doc/ospfd.8 2003-11-17 22:30:17.000000000 +0100 -@@ -34,7 +34,7 @@ - .TP - \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR - Specifies the config file to use for startup. If not specified this --option will likely default to \fB\fI/usr/local/etc/ospfd.conf\fR. -+option will likely default to \fB\fI/etc/zebra/ospfd.conf\fR. - - .TP - \fB\-h\fR, \fB\-\-help\fR -@@ -83,13 +83,13 @@ - .SH FILES - - .TP --.BI /usr/local/sbin/ospfd -+.BI /usr/sbin/ospfd - The default location of the - .B ospfd - binary. - - .TP --.BI /usr/local/etc/ospfd.conf -+.BI /etc/zebra/ospfd.conf - The default location of the - .B ospfd - config file. -diff -Nur zebra-0.93b.orig/doc/ripd.8 zebra-0.93b/doc/ripd.8 ---- zebra-0.93b.orig/doc/ripd.8 2002-06-21 23:14:39.000000000 +0200 -+++ zebra-0.93b/doc/ripd.8 2003-11-17 22:31:07.000000000 +0100 -@@ -35,7 +35,7 @@ - - .TP - \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR --Specifies the config file to use for startup. If not specified this option will likely default to \fB\fI/usr/local/etc/ripd.conf\fR. -+Specifies the config file to use for startup. If not specified this option will likely default to \fB\fI/etc/zebra/ripd.conf\fR. - - .TP - \fB\-h\fR, \fB\-\-help\fR -@@ -166,13 +166,13 @@ - .SH FILES - - .TP --.BI /usr/local/sbin/ripd -+.BI /usr/sbin/ripd - The default location of the - .B ripd - binary. - - .TP --.BI /usr/local/etc/ripd.conf -+.BI /etc/zebra/ripd.conf - The default location of the - .B ripd - config file. -diff -Nur zebra-0.93b.orig/doc/ripngd.8 zebra-0.93b/doc/ripngd.8 ---- zebra-0.93b.orig/doc/ripngd.8 2002-06-21 23:14:39.000000000 +0200 -+++ zebra-0.93b/doc/ripngd.8 2003-11-17 22:32:37.000000000 +0100 -@@ -35,7 +35,7 @@ - .TP - \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR - Specifies the config file to use for startup. If not specified this --option will likely default to \fB\fI/usr/local/etc/ripngd.conf\fR. -+option will likely default to \fB\fI/etc/zebra/ripngd.conf\fR. - - .TP - \fB\-h\fR, \fB\-\-help\fR -@@ -96,13 +96,13 @@ - .SH FILES - - .TP --.BI /usr/local/sbin/ripngd -+.BI /usr/sbin/ripngd - The default location of the - .B ripngd - binary. - - .TP --.BI /usr/local/etc/ripngd.conf -+.BI /etc/zebra/ripngd.conf - The default location of the - .B ripngd - config file. -diff -Nur zebra-0.93b.orig/doc/vtysh.1 zebra-0.93b/doc/vtysh.1 ---- zebra-0.93b.orig/doc/vtysh.1 2000-07-04 18:11:37.000000000 +0200 -+++ zebra-0.93b/doc/vtysh.1 2003-11-17 22:34:16.000000000 +0100 -@@ -39,7 +39,7 @@ - .SH FILES - - .TP --.BI /usr/local/etc/Zebra.conf -+.BI /etc/zebra/vtysh.conf - The default location of the - .B vtysh - config file. -diff -Nur zebra-0.93b.orig/doc/zebra.8 zebra-0.93b/doc/zebra.8 ---- zebra-0.93b.orig/doc/zebra.8 2002-06-21 23:14:39.000000000 +0200 -+++ zebra-0.93b/doc/zebra.8 2003-11-17 22:32:09.000000000 +0100 -@@ -39,7 +39,7 @@ - - .TP - \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR --Specifies the config file to use for startup. If not specified this option will likely default to \fB\fI/usr/local/etc/zebra.conf\fR. -+Specifies the config file to use for startup. If not specified this option will likely default to \fB\fI/etc/zebra/zebra.conf\fR. - - .TP - \fB\-h\fR, \fB\-\-help\fR -@@ -99,13 +99,13 @@ - .SH FILES - - .TP --.BI /usr/local/sbin/zebra -+.BI /usr/sbin/zebra - The default location of the - .B zebra - binary. - - .TP --.BI /usr/local/etc/zebra.conf -+.BI /etc/zebra/zebra.conf - The default location of the - .B zebra - config file. -diff -Nur zebra-0.93b.orig/doc/zebra.info-1 zebra-0.93b/doc/zebra.info-1 ---- zebra-0.93b.orig/doc/zebra.info-1 2002-09-13 08:58:24.000000000 +0200 -+++ zebra-0.93b/doc/zebra.info-1 2003-11-17 22:38:51.000000000 +0100 -@@ -572,7 +572,7 @@ - a port number when starting the daemon, these entries may not be needed. - - You may need to make changes to the config files in --`/usr/local/etc/*.conf'. *Note Config Commands::. -+`/etc/zebra/*.conf'. *Note Config Commands::. - -  - File: zebra.info, Node: Basic commands, Next: Zebra, Prev: Installation, Up: Top -@@ -616,12 +616,12 @@ - - Config files are generally found in: - -- `/usr/local/etc/*.conf' -+ `/etc/zebra/*.conf' - - Each of the daemons has its own config file. For example, zebra's - default config file name is: - -- `/usr/local/etc/zebra.conf' -+ `/etc/zebra/zebra.conf' - - The daemon name plus `.conf' is the default config file name. You - can specify a config file using the `-f' or `--config-file' options -@@ -650,7 +650,7 @@ - - Command: log file FILENAME - If you want to log into a file please specify `filename' as - follows. -- log file /usr/local/etc/bgpd.log -+ log file /var/log/zebra/bgpd.log - - - Command: log syslog - - Command: no log syslog -@@ -1188,7 +1188,7 @@ - ========================== - - The default configuration file name of `ripd''s is `ripd.conf'. --When invocation `ripd' searches directory /usr/local/etc. If -+When invocation `ripd' searches directory /etc/zebra. If - `ripd.conf' is not there next search current directory. - - RIP uses UDP port 521 to send and receive RIP packets. So the user -diff -Nur zebra-0.93b.orig/doc/zebra.info-3 zebra-0.93b/doc/zebra.info-3 ---- zebra-0.93b.orig/doc/zebra.info-3 2002-09-13 08:58:24.000000000 +0200 -+++ zebra-0.93b/doc/zebra.info-3 2003-11-17 22:40:01.000000000 +0100 -@@ -619,7 +619,7 @@ - To use vtysh please specify --enable-vtysh to configure script. To - use PAM for authentication use --with-libpam option to configure script. - -- vtysh only searches /usr/local/etc path for vtysh.conf which is the -+ vtysh only searches /etc/zebra path for vtysh.conf which is the - vtysh configuration file. Vtysh does not search current directory for - configuration file because the file includes user authentication - settings. -diff -Nur zebra-0.93b.orig/doc/zebra.texi zebra-0.93b/doc/zebra.texi ---- zebra-0.93b.orig/doc/zebra.texi 2002-09-13 08:56:23.000000000 +0200 -+++ zebra-0.93b/doc/zebra.texi 2003-11-17 22:40:38.000000000 +0100 -@@ -14,8 +14,8 @@ - @set UPDATED-MONTH September 2002 - - @c These may vary with installation environment. --@set INSTALL_PREFIX_ETC /usr/local/etc --@set INSTALL_PREFIX_SBIN /usr/local/sbin -+@set INSTALL_PREFIX_ETC /etc/zebra -+@set INSTALL_PREFIX_SBIN /usr/sbin - - @c Info entry - @dircategory Routing Software: diff --git a/package/tsa/zebra/bgpd.init b/package/tsa/zebra/bgpd.init deleted file mode 100644 index a9d7523e8..000000000 --- a/package/tsa/zebra/bgpd.init +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/zebra/bgpd.init -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- -# -# Desc: BGP daemon -# -# Runlevel: 25 rcX -# - -main_begin - - block_begin(start, `Starting bgpd.') - check(`D_prefix/sbin/bgpd -d') - block_end - - block_begin(stop, `Stopping bgpd.') - check(`killall -15 D_prefix/sbin/bgpd') - block_end - - block_begin(restart, `Restarting bgpd.') - check(`killall -1 D_prefix/sbin/bgpd') - block_end - -main_end diff --git a/package/tsa/zebra/ospf6d.init b/package/tsa/zebra/ospf6d.init deleted file mode 100644 index c5be4d1ee..000000000 --- a/package/tsa/zebra/ospf6d.init +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/zebra/ospf6d.init -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- -# Desc: OSPF daemon for IPv6 -# -# Runlevel: 25 rcX -# - -main_begin - - block_begin(start, `Starting ospf6d.') - check(`D_prefix/sbin/ospf6d -d') - block_end - - block_begin(stop, `Stopping ospf6d.') - check(`killall -15 D_prefix/sbin/ospf6d') - block_end - - block_begin(restart, `Restarting ospf6d.') - check(`killall -1 D_prefix/sbin/ospf6d') - block_end - -main_end diff --git a/package/tsa/zebra/ospfd.init b/package/tsa/zebra/ospfd.init deleted file mode 100644 index 0dbcb2122..000000000 --- a/package/tsa/zebra/ospfd.init +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/zebra/ospfd.init -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- -# -# Desc: OSPF daemon -# -# Runlevel: 25 rcX -# - -main_begin - - block_begin(start, `Starting ospfd.') - check(`D_prefix/sbin/ospfd -d') - block_end - - block_begin(stop, `Stopping ospfd.') - check(`killall -15 D_prefix/sbin/ospfd') - block_end - - block_begin(restart, `Restarting ospfd.') - check(`killall -1 D_prefix/sbin/ospfd') - block_end - -main_end diff --git a/package/tsa/zebra/ripd.init b/package/tsa/zebra/ripd.init deleted file mode 100644 index b8b2232f5..000000000 --- a/package/tsa/zebra/ripd.init +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/zebra/ripd.init -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- -# -# Desc: RIP daemon -# -# Runlevel: 25 rcX -# - -main_begin - - block_begin(start, `Starting ripd.') - check(`D_prefix/sbin/ripd -d') - block_end - - block_begin(stop, `Stopping ripd.') - check(`killall -15 D_prefix/sbin/ripd') - block_end - - block_begin(restart, `Restarting ripd.') - check(`killall -1 D_prefix/sbin/ripd') - block_end - -main_end diff --git a/package/tsa/zebra/ripngd.init b/package/tsa/zebra/ripngd.init deleted file mode 100644 index 455efccab..000000000 --- a/package/tsa/zebra/ripngd.init +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/zebra/ripngd.init -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- -# -# Desc: RIP "next generation" daemon -# -# Runlevel: 25 rcX -# - -main_begin - - block_begin(start, `Starting ripngd.') - check(`D_prefix/sbin/ripngd -d') - block_end - - block_begin(stop, `Stopping ripngd.') - check(`killall -15 D_prefix/sbin/ripngd') - block_end - - block_begin(restart, `Restarting ripngd.') - check(`killall -1 D_prefix/sbin/ripngd') - block_end - -main_end diff --git a/package/tsa/zebra/zebra.cache b/package/tsa/zebra/zebra.cache deleted file mode 100644 index cc72c8874..000000000 --- a/package/tsa/zebra/zebra.cache +++ /dev/null @@ -1,36 +0,0 @@ -[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- -[COPY] -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] Please add additional copyright information _after_ the line containing -[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -[COPY] -[COPY] ROCK Linux: rock-src/package/tsa/zebra/zebra.cache -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; either version 2 of the License, or -[COPY] (at your option) any later version. A copy of the GNU General Public -[COPY] License can be found at Documentation/COPYING. -[COPY] -[COPY] Many people helped and are helping developing ROCK Linux. Please -[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM -[COPY] file for details. -[COPY] -[COPY] --- ROCK-COPYRIGHT-NOTE-END --- - -[TIMESTAMP] 1097016921 Wed Oct 6 00:55:21 2004 -[CONFIG-ID] 2.1.0-DEV-x86-reference-expert -[ROCKVER] 2.1.0-DEV - -[LOGS] 3-zebra.log 5-zebra.log - -[BUILDTIME] 9059 (5) -[SIZE] 2.33 MB, 42 files - -[DEP] 00-dirtree bash2 binutils bzip2 coreutils diffutils findutils gawk -[DEP] gcc34 gcc34:dev glibc23 glibc23:dev grep linux24-header:dev m4 make -[DEP] mktemp ncurses:dev net-tools pam pam:dev patch readline readline:dev -[DEP] sed sysfiles tar texinfo util-linux - diff --git a/package/tsa/zebra/zebra.conf b/package/tsa/zebra/zebra.conf deleted file mode 100644 index f946b38b9..000000000 --- a/package/tsa/zebra/zebra.conf +++ /dev/null @@ -1,40 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/zebra/zebra.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -var_append confopt ' ' '--enable-netlink' -var_append confopt ' ' '--enable-vtysh' -var_append confopt ' ' '--enable-nssa' -var_append confopt ' ' '--enable-opaque-lsa' -var_append confopt ' ' '--enable-ospf-te' -var_append confopt ' ' '--sysconfdir=/etc/zebra' - -install_init_scripts() { - - install_init zebra $confdir/zebra.init - install_init ospfd $confdir/ospfd.init - install_init ospf6d $confdir/ospf6d.init - install_init bgpd $confdir/bgpd.init - install_init ripd $confdir/ripd.init - install_init ripngd $confdir/ripngd.init -} - -postmake=install_init_scripts diff --git a/package/tsa/zebra/zebra.desc b/package/tsa/zebra/zebra.desc deleted file mode 100644 index 2f07823b1..000000000 --- a/package/tsa/zebra/zebra.desc +++ /dev/null @@ -1,47 +0,0 @@ - -[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- -[COPY] -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] Please add additional copyright information _after_ the line containing -[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -[COPY] -[COPY] ROCK Linux: rock-src/package/tsa/zebra/zebra.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; either version 2 of the License, or -[COPY] (at your option) any later version. A copy of the GNU General Public -[COPY] License can be found at Documentation/COPYING. -[COPY] -[COPY] Many people helped and are helping developing ROCK Linux. Please -[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM -[COPY] file for details. -[COPY] -[COPY] --- ROCK-COPYRIGHT-NOTE-END --- - -[I] GNU Zebra manages TCP/IP based routing protocols - -[T] GNU Zebra is free software (distributed under GNU Generic Public License) -[T] that manages TCP/IP based routing protocols. It supports BGP-4 protocol as -[T] described in RFC1771 (A Border Gateway Protocol 4) as well as RIPv1, RIPv2 -[T] and OSPFv2. Unlike traditional, Gated based, monolithic architectures and -[T] even the so-called "new modular architectures" that remove the burden of -[T] processing routing functions from the cpu and utilize special ASIC chips -[T] instead, Zebra software offers true modularity. - -[U] http://www.zebra.org - -[A] Kunihiro Ishiguro -[M] Sebastian Jaenicke - -[C] extra/network - -[L] GPL -[S] Stable -[V] 0.93b -[P] X -?-3-5---9 116.200 - -[D] 4293145785 zebra-0.93b.tar.gz ftp://ftp.zebra.org/pub/zebra/ - diff --git a/package/tsa/zebra/zebra.init b/package/tsa/zebra/zebra.init deleted file mode 100644 index 728e489fc..000000000 --- a/package/tsa/zebra/zebra.init +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/zebra/zebra.init -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- -# -# Desc: zebra routing daemon -# -# Runlevel: 25 rcX -# - -main_begin - - block_begin(start, `Starting zebra.') - check(`D_prefix/sbin/zebra -d') - block_end - - block_begin(stop, `Stopping zebra.') - check(`killall -15 D_prefix/sbin/zebra') - block_end - - block_begin(restart, `Restarting zebra.') - check(`killall -1 D_prefix/sbin/zebra') - block_end - -main_end