From 09fcb6aadec5eaf2743e97e5892078cb13dabafe Mon Sep 17 00:00:00 2001 From: Sebastian Jaenicke Date: Mon, 17 Nov 2003 22:07:06 +0000 Subject: [PATCH] Sebastian Jaenicke : Fixes for absolute path entries in the documentation. git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1789 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + .../zebra/70zebra-0.93b-doc-path-fixes.patch | 263 ++++++++++++++++++ 2 files changed, 264 insertions(+) create mode 100644 package/tsa/zebra/70zebra-0.93b-doc-path-fixes.patch diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 58d66e39b..0667498d6 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -4,6 +4,7 @@ - updated blender (2.30) - Andreas V. Meier: fixed esden/wavemon - Dimitar Zhekov: updated the xfce repository + - Sebastian Jaenicke: zebra man-page path fixes *) 2003-11-16 (2.0.0-rc2 - 2.0.0-rc3) diff --git a/package/tsa/zebra/70zebra-0.93b-doc-path-fixes.patch b/package/tsa/zebra/70zebra-0.93b-doc-path-fixes.patch new file mode 100644 index 000000000..52d47e30f --- /dev/null +++ b/package/tsa/zebra/70zebra-0.93b-doc-path-fixes.patch @@ -0,0 +1,263 @@ +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: