From 7f8512d9af81072a3a604755df3e8ff877f268e4 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Fri, 20 Jan 2017 00:07:02 +0700 Subject: [PATCH 1/7] Solaris Package files: Rename Quagga to FRR Signed-off-by: Martin Winter --- solaris/Makefile.am | 18 +-- solaris/README.txt | 144 ++++++++++++------------ solaris/depend.daemons.in | 2 +- solaris/depend.dev.in | 2 +- solaris/depend.libs.in | 4 +- solaris/depend.smf.in | 2 +- solaris/{quagga.init.in => frr.init.in} | 62 +++++----- solaris/{quagga.xml.in => frr.xml.in} | 120 ++++++++++---------- solaris/pkginfo.daemons.tmpl.in | 2 +- solaris/pkginfo.dev.tmpl.in | 2 +- solaris/pkginfo.doc.tmpl.in | 2 +- solaris/pkginfo.libs.tmpl.in | 2 +- solaris/pkginfo.smf.tmpl.in | 2 +- solaris/pkginfo.tmpl.in | 4 +- solaris/prototype.daemons.in | 2 +- solaris/prototype.dev.in | 94 ++++++++-------- solaris/prototype.doc.in | 2 +- solaris/prototype.smf.in | 4 +- 18 files changed, 234 insertions(+), 236 deletions(-) rename solaris/{quagga.init.in => frr.init.in} (79%) rename solaris/{quagga.xml.in => frr.xml.in} (88%) diff --git a/solaris/Makefile.am b/solaris/Makefile.am index dcee240c62..5633991d1a 100644 --- a/solaris/Makefile.am +++ b/solaris/Makefile.am @@ -7,13 +7,13 @@ # the names of the various subpackages, and some convenient # derived variables. pkg_names = daemons dev doc libs smf -pkg_quagga_daemons = zebra bgpd ospfd ospf6d ripd ripngd +pkg_frr_daemons = zebra bgpd ospfd ospf6d ripd ripngd pkg_name_rev = @PACKAGE_VERSION@-@CONFDATE@-@target_os@-@target_cpu@ pkg_depends = $(pkg_names:%=depend.%) pkg_packages = $(pkg_names:%=@PACKAGE_TARNAME@-%-$(pkg_name_rev).pkg) pkg_pkginfos = $(pkg_names:%=pkginfo.%.full) pkg_prototypes = $(pkg_names:%=prototype.%) -pkg_manifests = quagga.xml +pkg_manifests = frr.xml # pkgmk variable substitutions wont grok ${variable} in prototype # file, so we cant let autoconf generate the file sadly @@ -35,7 +35,7 @@ edit = $(SED) \ -e 's,@enable_user\@,$(enable_user),g' \ -e 's,@enable_group\@,$(enable_group),g' \ -e 's,@enable_vty_group\@,$(enable_vty_group),g' \ - -e 's,@quagga_statedir\@,$(quagga_statedir),g' \ + -e 's,@frr_statedir\@,$(frr_statedir),g' \ -e 's,[@]PACKAGE_NAME[@],@PACKAGE_NAME@,g' \ -e 's,[@]PACKAGE_TARNAME[@],@PACKAGE_TARNAME@,g' \ -e 's,[@]PACKAGE_VERSION[@],@PACKAGE_VERSION@,g' \ @@ -90,15 +90,15 @@ depend.%: $(srcdir)/depend.%.in Makefile $(edit) $< > $@ # method file (bit like init script) -quagga.init: $(srcdir)/quagga.init.in Makefile +frr.init: $(srcdir)/frr.init.in Makefile rm -f $@ $(edit) $< > $@ # construct the pkg @PACKAGE_TARNAME@-%-$(pkg_name_rev).pkg: prototype.% \ - depend.% quagga.init pkginfo.%.full + depend.% frr.init pkginfo.%.full ($(pkg_make) && \ - $(pkg_trans) "QUAGGA$*") + $(pkg_trans) "FRR$*") %.pkg.gz : %.pkg (gzip -c $< > $@) @@ -107,17 +107,17 @@ quagga.init: $(srcdir)/quagga.init.in Makefile #BUILT_SOURCES = pkginfo.daemons pkginfo.dev pkginfo.doc pkginfo.libs \ # prototype.daemons prototype.dev prototype.doc prototype.libs BUILT_SOURCES = $(pkg_pkginfos) pkginfo.tmpl $(pkg_prototypes) \ - $(pkg_manifests) $(pkg_depends) quagga.init + $(pkg_manifests) $(pkg_depends) frr.init CLEANFILES = $(BUILT_SOURCES) $(pkg_packages) EXTRA_DIST = $(pkg_manifests:%=%.in) $(pkg_prototypes:%=%.in) \ $(pkg_names:%=pkginfo.%.tmpl.in) $(srcdir)/pkginfo.tmpl.in \ - $(pkg_depends:%=%.in) quagga.init.in README.txt + $(pkg_depends:%=%.in) frr.init.in README.txt pkg-root-install: (cd $(top_builddir) && \ - $(MAKE) DESTDIR=$(abs_builddir)/quagga-root install) + $(MAKE) DESTDIR=$(abs_builddir)/frr-root install) packages: $(pkg_packages) diff --git a/solaris/README.txt b/solaris/README.txt index 811e9d0fd4..01f725b8fa 100644 --- a/solaris/README.txt +++ b/solaris/README.txt @@ -15,21 +15,20 @@ Requirements: i.manifest must be at least version 1.5. Place these scripts in this directory if you are using Solaris 10 GA (which does not ship with - these scripts), or in the solaris/ directory in the Quagga source. + these scripts), or in the solaris/ directory in the FreeRangeRouting source. Package creation instructions: ------------------------------ -1. Configure and build Quagga in the top level build directory as per -normal, eg: +1. Configure and build FreeRangeRouting (frr) in the top level build directory as per normal, eg: - ./configure --prefix=/usr/local/quagga \ - --localstatedir=/var/run/quagga + ./configure --prefix=/usr/local/frr \ + --localstatedir=/var/run/frr \ --enable-gcc-rdynamic --enable-opaque-lsa --enable-ospf-te \ - --enable-multipath=64 --enable-user=quagga \ + --enable-multipath=64 --enable-user=frr \ --enable-ospfclient=yes --enable-ospfapi=yes \ - --enable-group=quagga --enable-nssa --enable-opaque-lsa + --enable-group=frr --enable-nssa --enable-opaque-lsa You will need /usr/sfw/bin and /usr/ccs/bin in your path. @@ -45,13 +44,13 @@ appropriate, eg: This should result in 4 packages being created: - quagga-libs-...-$ARCH.pkg - QUAGGAlibs - quagga-daemons-...-$ARCH.pkg - QUAGGAdaemons - quagga-doc-...-$ARCH.pkg - QUAGGAdoc - quagga-dev-...-$ARCH.pkg - QUAGGAdev - quagga-smf-...-$ARCH.pkg - QUAGGAsmf + frr-libs-...-$ARCH.pkg - FRRlibs + frr-daemons-...-$ARCH.pkg - FRRdaemons + frr-doc-...-$ARCH.pkg - FRRdoc + frr-dev-...-$ARCH.pkg - FRRdev + frr-smf-...-$ARCH.pkg - FRRsmf -QUAGGAlibs and QUAGGAdaemons are needed for daemon runtime. QUAGGAsmf +FRRlibs and FRRdaemons are needed for daemon runtime. FRRsmf provides the required bits for Solaris 10+ SMF support. @@ -59,7 +58,7 @@ Install and post-install configuration notes: --------------------------------------------- - If you specified a user/group which does not exist per default on Solaris - (eg quagga/quagga) you *must* create these before installing these on a + (eg frr/frr) you *must* create these before installing these on a system. The packages do *not* create the users. - The configuration files are not created. You must create the configuration @@ -69,107 +68,107 @@ Install and post-install configuration notes: password whatever - The user which quagga runs as must have write permissions on this file, no + The user which frr runs as must have write permissions on this file, no other user should have read permissions, and you would also have to enable the telnet interface (see below). - SMF notes: - - QUAGGAsmf installs a svc:/network/routing/quagga service, with an + - FRRsmf installs a svc:/network/routing/frr service, with an instance for each daemon - - The state of all instances of quagga service can be inspected with: + - The state of all instances of frr service can be inspected with: - svcs -l svc:/network/routing/quagga + svcs -l svc:/network/routing/frr - or typically just with a shortcut of 'quagga': + or typically just with a shortcut of 'frr': - svcs -l quagga + svcs -l frr - - A specific instance of the quagga service can be inspected by specifying - the daemon name as the instance, ie quagga:: + - A specific instance of the frr service can be inspected by specifying + the daemon name as the instance, ie frr:: - svcs -l svc:/network/routing/quagga:zebra - svcs -l svc:/network/routing/quagga:ospfd + svcs -l svc:/network/routing/frr:zebra + svcs -l svc:/network/routing/frr:ospfd - or typically just with the shortcut of 'quagga:' or even + or typically just with the shortcut of 'frr:' or even : - svcs -l quagga:zebra + svcs -l frr:zebra svcs -l ospfd Eg: # # svcs -l ripd - fmri svc:/network/routing/quagga:ripd - name Quagga: ripd, RIPv1/2 IPv4 routing protocol daemon. + fmri svc:/network/routing/frr:ripd + name FreeRangeRouting: ripd, RIPv1/2 IPv4 routing protocol daemon. enabled true state online next_state none state_time Wed Jun 15 16:21:02 2005 - logfile /var/svc/log/network-routing-quagga:ripd.log + logfile /var/svc/log/network-routing-frr:ripd.log restarter svc:/system/svc/restarter:default contract_id 93 - dependency require_all/restart svc:/network/routing/quagga:zebra (online) - dependency require_all/restart file://localhost//usr/local/quagga/etc/ripd.conf (online) + dependency require_all/restart svc:/network/routing/frr:zebra (online) + dependency require_all/restart file://localhost//usr/local/frr/etc/ripd.conf (online) dependency require_all/none svc:/system/filesystem/usr:default (online) dependency require_all/none svc:/network/loopback (online) - Configuration of startup options is by way of SMF properties in a - property group named 'quagga'. The defaults should automatically be - inline with how you configured Quagga in Step 1 above. + property group named 'frr'. The defaults should automatically be + inline with how you configured FreeRangeRouting in Step 1 above. - By default the VTY interface is disabled. To change this, see below for - how to set the 'quagga/vty_port' property as appropriate for + how to set the 'frr/vty_port' property as appropriate for /each/ service. Also, the VTY is set to listen only to localhost by - default, you may change the 'quagga/vty_addr' property as appropriate - for both of the 'quagga' service and specific individual instances of - the 'quagga' service (ie quagga:zebra, quagga:ospfd, etc..). + default, you may change the 'frr/vty_addr' property as appropriate + for both of the 'frr' service and specific individual instances of + the 'frr' service (ie frr:zebra, frr:ospfd, etc..). - - Properties belonging to the 'quagga' service are inherited by all + - Properties belonging to the 'frr' service are inherited by all instances. Eg: - # svcprop -p quagga svc:/network/routing/quagga - quagga/group astring root - quagga/retain boolean false - quagga/user astring root - quagga/vty_addr astring 127.1 - quagga/vty_port integer 0 + # svcprop -p frr svc:/network/routing/frr + frr/group astring root + frr/retain boolean false + frr/user astring root + frr/vty_addr astring 127.1 + frr/vty_port integer 0 - # svcprop -p quagga svc:/network/routing/quagga:ospfd - quagga/retain_routes boolean false - quagga/group astring root - quagga/retain boolean false - quagga/user astring root - quagga/vty_addr astring 127.1 - quagga/vty_port integer 0 + # svcprop -p frr svc:/network/routing/frr:ospfd + frr/retain_routes boolean false + frr/group astring root + frr/retain boolean false + frr/user astring root + frr/vty_addr astring 127.1 + frr/vty_port integer 0 All instances will inherit these properties, unless the instance itself overrides these defaults. This also implies one can modify properties of - the 'quagga' service and have them apply to all daemons. + the 'frr' service and have them apply to all daemons. - # svccfg -s svc:/network/routing/quagga \ - setprop quagga/vty_addr = astring: ::1 + # svccfg -s svc:/network/routing/frr \ + setprop frr/vty_addr = astring: ::1 - # svcprop -p quagga svc:/network/routing/quagga - quagga/group astring root - quagga/retain boolean false - quagga/user astring root - quagga/vty_port integer 0 - quagga/vty_addr astring ::1 + # svcprop -p frr svc:/network/routing/frr + frr/group astring root + frr/retain boolean false + frr/user astring root + frr/vty_port integer 0 + frr/vty_addr astring ::1 # # You *must* refresh instances to have the property change # # take affect for the 'running snapshot' of service state. - # svcadm refresh quagga:ospfd + # svcadm refresh frr:ospfd - # svcprop -p quagga svc:/network/routing/quagga:ospfd - quagga/retain_routes boolean false - quagga/group astring root - quagga/retain boolean false - quagga/user astring root - quagga/vty_port integer 0 - quagga/vty_addr astring ::1 + # svcprop -p frr svc:/network/routing/frr:ospfd + frr/retain_routes boolean false + frr/group astring root + frr/retain boolean false + frr/user astring root + frr/vty_port integer 0 + frr/vty_addr astring ::1 Other daemon-specific options/properties may be available, however they are not yet honoured/used (eg ospfd/apiserver on svc:/network/ospf). @@ -177,12 +176,11 @@ Install and post-install configuration notes: - As SMF is dependency aware, restarting network/zebra will restart all the other daemons. - - To upgrade from one set of Quagga packages to a newer release, one must - first pkgrm the installed packages. When one pkgrm's QUAGGAsmf all + - To upgrade from one set of FreeRangeRouting packages to a newer release, + one must first pkgrm the installed packages. When one pkgrm's FRRsmf all property configuration will be lost, and any customisations will have to - redone after installing the updated QUAGGAsmf package. + redone after installing the updated FRRsmf package. - These packages are not supported by Sun Microsystems, report bugs via the - usual Quagga channels, ie Bugzilla. Improvements/contributions of course - would be greatly appreciated. + usual FreeRangeRouting channels, ie Issue Tracker. Improvements/contributions of course would be greatly appreciated. diff --git a/solaris/depend.daemons.in b/solaris/depend.daemons.in index 3430e8c964..64fb03ac19 100644 --- a/solaris/depend.daemons.in +++ b/solaris/depend.daemons.in @@ -1,4 +1,4 @@ -P QUAGGAlibs Quagga common runtime libraries +P FRRlibs FreeRangeRouting common runtime libraries @PACKAGE_VERSION@,REV=@CONFDATE@ P SUNWcsu Core Solaris, (Usr) P SUNWcsr Core Solaris Libraries (Root) diff --git a/solaris/depend.dev.in b/solaris/depend.dev.in index 8f234826b2..5d8bf16ed6 100644 --- a/solaris/depend.dev.in +++ b/solaris/depend.dev.in @@ -1,2 +1,2 @@ -P QUAGGAlibs Quagga common runtime libraries +P FRRlibs FreeRangeRouting common runtime libraries @PACKAGE_VERSION@,REV=@CONFDATE@ diff --git a/solaris/depend.libs.in b/solaris/depend.libs.in index 41859770a8..6ead0b2867 100644 --- a/solaris/depend.libs.in +++ b/solaris/depend.libs.in @@ -1,5 +1,5 @@ P SUNWcslr Core Solaris Libraries (Root) P SUNWcsl Core Solaris, (Shared Libs) P SUNWlibmsr Math & Microtasking Libraries (Root) -R QUAGGAdaemons Quagga daemons -R QUAGGAdev +R FRRdaemons FreeRangeRouting daemons +R FRRdev diff --git a/solaris/depend.smf.in b/solaris/depend.smf.in index 6d928d2df7..66b11eba2a 100644 --- a/solaris/depend.smf.in +++ b/solaris/depend.smf.in @@ -1,4 +1,4 @@ -P QUAGGAdaemons Quagga daemons +P FRRaemons FreeRangeRouting daemons @PACKAGE_VERSION@,REV=@CONFDATE@ P SUNWcsu Core Solaris, (Usr) P SUNWcsr Core Solaris Libraries (Root) diff --git a/solaris/quagga.init.in b/solaris/frr.init.in similarity index 79% rename from solaris/quagga.init.in rename to solaris/frr.init.in index ee3a987f33..580fd9b35c 100755 --- a/solaris/quagga.init.in +++ b/solaris/frr.init.in @@ -3,22 +3,22 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# This file is part of Quagga. +# This file is part of FreeRangeRouting. # -# Quagga is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the +# FreeRangeRouting 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, or (at your option) any # later version. # -# Quagga is distributed in the hope that it will be useful, but +# FreeRangeRouting is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Quagga; see the file COPYING. If not, write to the Free -# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with FreeRangeRouting; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. # # Starts/stops the given daemon @@ -74,36 +74,36 @@ handle_routeadm_upgrade () { upgrade_config () { DAEMON=$1 - # handle upgrade of SUNWzebra to Quagga - if [ -d "/etc/quagga" -a ! -f "/etc/quagga/${DAEMON}.conf" ] ; then + # handle upgrade of SUNWzebra to FreeRangeRouting + if [ -d "/etc/frr" -a ! -f "/etc/frr/${DAEMON}.conf" ] ; then if [ -f "/etc/sfw/zebra/${DAEMON}.conf" ] ; then cp "/etc/sfw/zebra/${DAEMON}.conf" \ - "/etc/quagga/${DAEMON}.conf.upgrade" \ + "/etc/frr/${DAEMON}.conf.upgrade" \ || exit $SMF_EXIT_ERR_FATAL - chown "${USER}:${GROUP}" "/etc/quagga/${DAEMON}.conf.upgrade" \ + chown "${USER}:${GROUP}" "/etc/frr/${DAEMON}.conf.upgrade" \ || exit $SMF_EXIT_ERR_FATAL - chmod 0600 "/etc/quagga/${DAEMON}.conf.upgrade" \ + chmod 0600 "/etc/frr/${DAEMON}.conf.upgrade" \ || exit $SMF_EXIT_ERR_FATAL - mv "/etc/quagga/${DAEMON}.conf.upgrade" "/etc/quagga/${DAEMON}.conf" \ + mv "/etc/frr/${DAEMON}.conf.upgrade" "/etc/frr/${DAEMON}.conf" \ || exit $SMF_EXIT_ERR_FATAL fi fi - if [ ! -f "/etc/quagga/${DAEMON}.conf" ] ; then - touch "/etc/quagga/${DAEMON}.conf.new" \ + if [ ! -f "/etc/frr/${DAEMON}.conf" ] ; then + touch "/etc/frr/${DAEMON}.conf.new" \ || exit $SMF_EXIT_ERR_FATAL - chown "${USER}:${GROUP}" "/etc/quagga/${DAEMON}.conf.new" \ + chown "${USER}:${GROUP}" "/etc/frr/${DAEMON}.conf.new" \ || exit $SMF_EXIT_ERR_FATAL - chmod 0600 "/etc/quagga/${DAEMON}.conf.new" \ + chmod 0600 "/etc/frr/${DAEMON}.conf.new" \ || exit $SMF_EXIT_ERR_FATAL - mv "/etc/quagga/${DAEMON}.conf.new" "/etc/quagga/${DAEMON}.conf" \ + mv "/etc/frr/${DAEMON}.conf.new" "/etc/frr/${DAEMON}.conf" \ || exit $SMF_EXIT_ERR_FATAL fi } # Relevant to S10+ -quagga_is_globalzone () { - if [ "${QUAGGA_INIT_ZONENAME:=`/sbin/zonename`}" = "global" \ +frr_is_globalzone () { + if [ "${FRR_INIT_ZONENAME:=`/sbin/zonename`}" = "global" \ -o `/sbin/zonename -t` = "exclusive" ]; then return 0 else @@ -188,9 +188,9 @@ case $1 in esac if smf_present ; then - QUAGGA_METHOD="start" + FRR_METHOD="start" else - QUAGGA_METHOD="$1" + FRR_METHOD="$1" shift; fi @@ -208,7 +208,7 @@ case "${DAEMON}" in bgpd) ;; zebra | ospfd | ospf6d | ripd | ripngd ) - quagga_is_globalzone || exit $SMF_EXIT_OK + frr_is_globalzone || exit $SMF_EXIT_OK ;; *) usage @@ -216,7 +216,7 @@ case "${DAEMON}" in ;; esac -# Older Quagga SMF packages pass daemon args on the commandline +# Older FreeRangeRouting SMF packages pass daemon args on the commandline # Newer SMF routeadm model uses properties for each argument # so we must handle that. if [ smf_present -a -f "$ROUTEADMINCLUDE" ]; then @@ -236,14 +236,14 @@ if [ ! -f "@sysconfdir@/${DAEMON}.conf" ] ; then exit $SMF_EXIT_ERR_CONFIG fi -# we need @quagga_statedir@ to exist, it probably is on tmpfs. -if [ ! -d @quagga_statedir@ ] ; then - mkdir -p @quagga_statedir@ - chown @enable_user@:@enable_group@ @quagga_statedir@ - chmod 751 @quagga_statedir@ +# we need @frr_statedir@ to exist, it probably is on tmpfs. +if [ ! -d @frr_statedir@ ] ; then + mkdir -p @frr_statedir@ + chown @enable_user@:@enable_group@ @frr_statedir@ + chmod 751 @frr_statedir@ fi -PIDFILE="@quagga_statedir@/${DAEMON}.pid" +PIDFILE="@frr_statedir@/${DAEMON}.pid" start () { if [ ! -x "$DAEMON_PATH/$DAEMON" ] ; then @@ -259,7 +259,7 @@ stop_by_pidfile () { fi } -case "$QUAGGA_METHOD" in +case "$FRR_METHOD" in 'start') start ;; diff --git a/solaris/quagga.xml.in b/solaris/frr.xml.in similarity index 88% rename from solaris/quagga.xml.in rename to solaris/frr.xml.in index 60427b06e9..5ac7e52721 100644 --- a/solaris/quagga.xml.in +++ b/solaris/frr.xml.in @@ -1,32 +1,32 @@ - + - + - + option name, consult FreeRangeRouting documentation --> + @frr_statedir@ --> @@ -142,14 +142,14 @@ @@ -161,7 +161,7 @@ type='service' version='1'> - + - + - + + @frr_statedir@ --> @@ -273,14 +273,14 @@ @@ -292,7 +292,7 @@ type='service' version='1'> - + - + - + + @frr_statedir@ --> @@ -402,14 +402,14 @@ @@ -421,7 +421,7 @@ type='service' version='1'> - + - + - + + @frr_statedir@ --> @@ -533,14 +533,14 @@ @@ -552,7 +552,7 @@ type='service' version='1'> - + - + - + + @frr_statedir@ --> @@ -659,14 +659,14 @@ @@ -679,7 +679,7 @@ type='service' version='1'> - + - + - + + @frr_statedir@ --> @@ -812,14 +812,14 @@ diff --git a/solaris/pkginfo.daemons.tmpl.in b/solaris/pkginfo.daemons.tmpl.in index cab0e3c231..7070d6dc97 100644 --- a/solaris/pkginfo.daemons.tmpl.in +++ b/solaris/pkginfo.daemons.tmpl.in @@ -1,2 +1,2 @@ -PKG="QUAGGAdaemons" +PKG="FRRdaemons" NAME="@PACKAGE_NAME@ - @PACKAGE_NAME@ daemons" diff --git a/solaris/pkginfo.dev.tmpl.in b/solaris/pkginfo.dev.tmpl.in index 9c5d23e28b..23796ba226 100644 --- a/solaris/pkginfo.dev.tmpl.in +++ b/solaris/pkginfo.dev.tmpl.in @@ -1,3 +1,3 @@ -PKG=QUAGGAdev +PKG=FRRdev NAME="@PACKAGE_NAME@ - @PACKAGE_NAME@ development files" diff --git a/solaris/pkginfo.doc.tmpl.in b/solaris/pkginfo.doc.tmpl.in index 809ec77518..727fbb526f 100644 --- a/solaris/pkginfo.doc.tmpl.in +++ b/solaris/pkginfo.doc.tmpl.in @@ -1,2 +1,2 @@ -PKG=QUAGGAdoc +PKG=FRRdoc NAME="@PACKAGE_NAME@ - @PACKAGE_NAME@ documentation" diff --git a/solaris/pkginfo.libs.tmpl.in b/solaris/pkginfo.libs.tmpl.in index 42adc6e1b7..adf945862c 100644 --- a/solaris/pkginfo.libs.tmpl.in +++ b/solaris/pkginfo.libs.tmpl.in @@ -1,2 +1,2 @@ -PKG=QUAGGAlibs +PKG=FRRlibs NAME="@PACKAGE_NAME@ - @PACKAGE_NAME@ common runtime libraries" diff --git a/solaris/pkginfo.smf.tmpl.in b/solaris/pkginfo.smf.tmpl.in index 4aa03936e4..a90cb1bdee 100644 --- a/solaris/pkginfo.smf.tmpl.in +++ b/solaris/pkginfo.smf.tmpl.in @@ -1,2 +1,2 @@ -PKG="QUAGGAsmf" +PKG="FRRsmf" NAME="@PACKAGE_NAME@ - @PACKAGE_NAME@ SMF support" diff --git a/solaris/pkginfo.tmpl.in b/solaris/pkginfo.tmpl.in index 2dd27fd2cf..02abb0f96b 100644 --- a/solaris/pkginfo.tmpl.in +++ b/solaris/pkginfo.tmpl.in @@ -1,9 +1,9 @@ ARCH="@target_cpu@" CATEGORY="system" VERSION="@PACKAGE_VERSION@,REV=@CONFDATE@" -VENDOR="http://www.quagga.net/" +VENDOR="http://www.freerangerouting.org/" HOTLINE="@PACKAGE_BUGREPORT@" -EMAIL=paul@quagga.net +EMAIL=maintainers@freerangerouting.org DESC="@PACKAGE_NAME@ Routing Protocols" MAXINST=1 CLASSES="none preserve renamenew manifest" diff --git a/solaris/prototype.daemons.in b/solaris/prototype.daemons.in index 8a906c9d0a..9af275a17f 100644 --- a/solaris/prototype.daemons.in +++ b/solaris/prototype.daemons.in @@ -17,4 +17,4 @@ f none @sysconfdir@/ripd.conf.sample=$DESTDIR/@sysconfdir@/ripd.conf.sample 0644 f none @sysconfdir@/ripngd.conf.sample=$DESTDIR/@sysconfdir@/ripngd.conf.sample 0644 root bin f none @sysconfdir@/ospfd.conf.sample=$DESTDIR/@sysconfdir@/ospfd.conf.sample 0644 root bin f none @sysconfdir@/ospf6d.conf.sample=$DESTDIR/@sysconfdir@/ospf6d.conf.sample 0644 root bin -d none @quagga_statedir@=$DESTDIR/@quagga_statedir@ 0711 @enable_user@ @enable_group@ +d none @frr_statedir@=$DESTDIR/@frr_statedir@ 0711 @enable_user@ @enable_group@ diff --git a/solaris/prototype.dev.in b/solaris/prototype.dev.in index 2ad937b78a..dd3ae399ae 100644 --- a/solaris/prototype.dev.in +++ b/solaris/prototype.dev.in @@ -8,50 +8,50 @@ f none @libdir@/libospf.a=$DESTDIR/@libdir@/libospf.a 0644 root bin f none @libdir@/libospfapiclient.la=$DESTDIR/@libdir@/libospfapiclient.la 0755 root bin f none @libdir@/libospfapiclient.a=$DESTDIR/@libdir@/libospfapiclient.a 0644 root bin d none @includedir@=$DESTDIR/@includedir@ 0755 root bin -d none @includedir@/quagga=$DESTDIR/@includedir@/quagga 0755 root bin -d none @includedir@/quagga/ospfd=$DESTDIR/@includedir@/quagga/ospfd 0755 root bin -f none @includedir@/quagga/ospfd/ospf_api.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_api.h 0644 root bin -f none @includedir@/quagga/ospfd/ospf_asbr.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_asbr.h 0644 root bin -f none @includedir@/quagga/ospfd/ospf_dump.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_dump.h 0644 root bin -f none @includedir@/quagga/ospfd/ospf_lsa.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_lsa.h 0644 root bin -f none @includedir@/quagga/ospfd/ospf_lsdb.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_lsdb.h 0644 root bin -f none @includedir@/quagga/ospfd/ospf_nsm.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_nsm.h 0644 root bin -f none @includedir@/quagga/ospfd/ospf_ism.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_ism.h 0644 root bin -f none @includedir@/quagga/ospfd/ospf_opaque.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_opaque.h 0644 root bin -f none @includedir@/quagga/ospfd/ospfd.h=$DESTDIR/@includedir@/quagga/ospfd/ospfd.h 0644 root bin -f none @includedir@/quagga/buffer.h=$DESTDIR/@includedir@/quagga/buffer.h 0644 root bin -f none @includedir@/quagga/command.h=$DESTDIR/@includedir@/quagga/command.h 0644 root bin -f none @includedir@/quagga/filter.h=$DESTDIR/@includedir@/quagga/filter.h 0644 root bin -f none @includedir@/quagga/getopt.h=$DESTDIR/@includedir@/quagga/getopt.h 0644 root bin -f none @includedir@/quagga/hash.h=$DESTDIR/@includedir@/quagga/hash.h 0644 root bin -f none @includedir@/quagga/if.h=$DESTDIR/@includedir@/quagga/if.h 0644 root bin -f none @includedir@/quagga/linklist.h=$DESTDIR/@includedir@/quagga/linklist.h 0644 root bin -f none @includedir@/quagga/log.h=$DESTDIR/@includedir@/quagga/log.h 0644 root bin -f none @includedir@/quagga/memory.h=$DESTDIR/@includedir@/quagga/memory.h 0644 root bin -f none @includedir@/quagga/network.h=$DESTDIR/@includedir@/quagga/network.h 0644 root bin -f none @includedir@/quagga/prefix.h=$DESTDIR/@includedir@/quagga/prefix.h 0644 root bin -f none @includedir@/quagga/routemap.h=$DESTDIR/@includedir@/quagga/routemap.h 0644 root bin -f none @includedir@/quagga/distribute.h=$DESTDIR/@includedir@/quagga/distribute.h 0644 root bin -f none @includedir@/quagga/sockunion.h=$DESTDIR/@includedir@/quagga/sockunion.h 0644 root bin -f none @includedir@/quagga/str.h=$DESTDIR/@includedir@/quagga/str.h 0644 root bin -f none @includedir@/quagga/stream.h=$DESTDIR/@includedir@/quagga/stream.h 0644 root bin -f none @includedir@/quagga/table.h=$DESTDIR/@includedir@/quagga/table.h 0644 root bin -f none @includedir@/quagga/thread.h=$DESTDIR/@includedir@/quagga/thread.h 0644 root bin -f none @includedir@/quagga/vector.h=$DESTDIR/@includedir@/quagga/vector.h 0644 root bin -f none @includedir@/quagga/version.h=$DESTDIR/@includedir@/quagga/version.h 0644 root bin -f none @includedir@/quagga/vty.h=$DESTDIR/@includedir@/quagga/vty.h 0644 root bin -f none @includedir@/quagga/zebra.h=$DESTDIR/@includedir@/quagga/zebra.h 0644 root bin -f none @includedir@/quagga/plist.h=$DESTDIR/@includedir@/quagga/plist.h 0644 root bin -f none @includedir@/quagga/zclient.h=$DESTDIR/@includedir@/quagga/zclient.h 0644 root bin -f none @includedir@/quagga/sockopt.h=$DESTDIR/@includedir@/quagga/sockopt.h 0644 root bin -f none @includedir@/quagga/smux.h=$DESTDIR/@includedir@/quagga/smux.h 0644 root bin -f none @includedir@/quagga/md5.h=$DESTDIR/@includedir@/quagga/md5.h 0644 root bin -f none @includedir@/quagga/if_rmap.h=$DESTDIR/@includedir@/quagga/if_rmap.h 0644 root bin -f none @includedir@/quagga/keychain.h=$DESTDIR/@includedir@/quagga/keychain.h 0644 root bin -f none @includedir@/quagga/privs.h=$DESTDIR/@includedir@/quagga/privs.h 0644 root bin -f none @includedir@/quagga/sigevent.h=$DESTDIR/@includedir@/quagga/sigevent.h 0644 root bin -f none @includedir@/quagga/pqueue.h=$DESTDIR/@includedir@/quagga/pqueue.h 0644 root bin -f none @includedir@/quagga/jhash.h=$DESTDIR/@includedir@/quagga/jhash.h 0644 root bin -f none @includedir@/quagga/zassert.h=$DESTDIR/@includedir@/quagga/zassert.h 0644 root bin -d none @includedir@/quagga/ospfapi=$DESTDIR/@includedir@/quagga/ospfapi 0755 root bin -f none @includedir@/quagga/ospfapi/ospf_apiclient.h=$DESTDIR/@includedir@/quagga/ospfapi/ospf_apiclient.h 0644 root bin +d none @includedir@/frr=$DESTDIR/@includedir@/frr 0755 root bin +d none @includedir@/frr/ospfd=$DESTDIR/@includedir@/frr/ospfd 0755 root bin +f none @includedir@/frr/ospfd/ospf_api.h=$DESTDIR/@includedir@/frr/ospfd/ospf_api.h 0644 root bin +f none @includedir@/frr/ospfd/ospf_asbr.h=$DESTDIR/@includedir@/frr/ospfd/ospf_asbr.h 0644 root bin +f none @includedir@/frr/ospfd/ospf_dump.h=$DESTDIR/@includedir@/frr/ospfd/ospf_dump.h 0644 root bin +f none @includedir@/frr/ospfd/ospf_lsa.h=$DESTDIR/@includedir@/frr/ospfd/ospf_lsa.h 0644 root bin +f none @includedir@/frr/ospfd/ospf_lsdb.h=$DESTDIR/@includedir@/frr/ospfd/ospf_lsdb.h 0644 root bin +f none @includedir@/frr/ospfd/ospf_nsm.h=$DESTDIR/@includedir@/frr/ospfd/ospf_nsm.h 0644 root bin +f none @includedir@/frr/ospfd/ospf_ism.h=$DESTDIR/@includedir@/frr/ospfd/ospf_ism.h 0644 root bin +f none @includedir@/frr/ospfd/ospf_opaque.h=$DESTDIR/@includedir@/frr/ospfd/ospf_opaque.h 0644 root bin +f none @includedir@/frr/ospfd/ospfd.h=$DESTDIR/@includedir@/frr/ospfd/ospfd.h 0644 root bin +f none @includedir@/frr/buffer.h=$DESTDIR/@includedir@/frr/buffer.h 0644 root bin +f none @includedir@/frr/command.h=$DESTDIR/@includedir@/frr/command.h 0644 root bin +f none @includedir@/frr/filter.h=$DESTDIR/@includedir@/frr/filter.h 0644 root bin +f none @includedir@/frr/getopt.h=$DESTDIR/@includedir@/frr/getopt.h 0644 root bin +f none @includedir@/frr/hash.h=$DESTDIR/@includedir@/frr/hash.h 0644 root bin +f none @includedir@/frr/if.h=$DESTDIR/@includedir@/frr/if.h 0644 root bin +f none @includedir@/frr/linklist.h=$DESTDIR/@includedir@/frr/linklist.h 0644 root bin +f none @includedir@/frr/log.h=$DESTDIR/@includedir@/frr/log.h 0644 root bin +f none @includedir@/frr/memory.h=$DESTDIR/@includedir@/frr/memory.h 0644 root bin +f none @includedir@/frr/network.h=$DESTDIR/@includedir@/frr/network.h 0644 root bin +f none @includedir@/frr/prefix.h=$DESTDIR/@includedir@/frr/prefix.h 0644 root bin +f none @includedir@/frr/routemap.h=$DESTDIR/@includedir@/frr/routemap.h 0644 root bin +f none @includedir@/frr/distribute.h=$DESTDIR/@includedir@/frr/distribute.h 0644 root bin +f none @includedir@/frr/sockunion.h=$DESTDIR/@includedir@/frr/sockunion.h 0644 root bin +f none @includedir@/frr/str.h=$DESTDIR/@includedir@/frr/str.h 0644 root bin +f none @includedir@/frr/stream.h=$DESTDIR/@includedir@/frr/stream.h 0644 root bin +f none @includedir@/frr/table.h=$DESTDIR/@includedir@/frr/table.h 0644 root bin +f none @includedir@/frr/thread.h=$DESTDIR/@includedir@/frr/thread.h 0644 root bin +f none @includedir@/frr/vector.h=$DESTDIR/@includedir@/frr/vector.h 0644 root bin +f none @includedir@/frr/version.h=$DESTDIR/@includedir@/frr/version.h 0644 root bin +f none @includedir@/frr/vty.h=$DESTDIR/@includedir@/frr/vty.h 0644 root bin +f none @includedir@/frr/zebra.h=$DESTDIR/@includedir@/frr/zebra.h 0644 root bin +f none @includedir@/frr/plist.h=$DESTDIR/@includedir@/frr/plist.h 0644 root bin +f none @includedir@/frr/zclient.h=$DESTDIR/@includedir@/frr/zclient.h 0644 root bin +f none @includedir@/frr/sockopt.h=$DESTDIR/@includedir@/frr/sockopt.h 0644 root bin +f none @includedir@/frr/smux.h=$DESTDIR/@includedir@/frr/smux.h 0644 root bin +f none @includedir@/frr/md5.h=$DESTDIR/@includedir@/frr/md5.h 0644 root bin +f none @includedir@/frr/if_rmap.h=$DESTDIR/@includedir@/frr/if_rmap.h 0644 root bin +f none @includedir@/frr/keychain.h=$DESTDIR/@includedir@/frr/keychain.h 0644 root bin +f none @includedir@/frr/privs.h=$DESTDIR/@includedir@/frr/privs.h 0644 root bin +f none @includedir@/frr/sigevent.h=$DESTDIR/@includedir@/frr/sigevent.h 0644 root bin +f none @includedir@/frr/pqueue.h=$DESTDIR/@includedir@/frr/pqueue.h 0644 root bin +f none @includedir@/frr/jhash.h=$DESTDIR/@includedir@/frr/jhash.h 0644 root bin +f none @includedir@/frr/zassert.h=$DESTDIR/@includedir@/frr/zassert.h 0644 root bin +d none @includedir@/frr/ospfapi=$DESTDIR/@includedir@/frr/ospfapi 0755 root bin +f none @includedir@/frr/ospfapi/ospf_apiclient.h=$DESTDIR/@includedir@/frr/ospfapi/ospf_apiclient.h 0644 root bin diff --git a/solaris/prototype.doc.in b/solaris/prototype.doc.in index 42b076d0ec..a8644b3145 100644 --- a/solaris/prototype.doc.in +++ b/solaris/prototype.doc.in @@ -3,7 +3,7 @@ i depend=$abs_builddir/depend.doc i copying=$abs_top_srcdir/COPYING d none @infodir@=$DESTDIR/@infodir@ 0755 root bin #f none @infodir@/dir=$DESTDIR/@infodir@/dir 0644 root bin -f none @infodir@/quagga.info=$DESTDIR/@infodir@/quagga.info 0644 root bin +f none @infodir@/frr.info=$DESTDIR/@infodir@/frr.info 0644 root bin d none @mandir@=$DESTDIR/@mandir@ 0755 root bin d none @mandir@/man1=$DESTDIR/@mandir@/man1 0755 root bin f none @mandir@/man1/vtysh.1=$DESTDIR/@mandir@/man1/vtysh.1 0644 root bin diff --git a/solaris/prototype.smf.in b/solaris/prototype.smf.in index 3c80f39b1e..5755a8827d 100644 --- a/solaris/prototype.smf.in +++ b/solaris/prototype.smf.in @@ -3,6 +3,6 @@ i depend=$abs_builddir/depend.smf i copying=$abs_top_srcdir/COPYING i i.manifest i r.manifest -f manifest var/svc/manifest/network/quagga.xml 0444 root bin +f manifest var/svc/manifest/network/frr.xml 0444 root bin #f none var/svc/profile/@PACKAGE_TARNAME@_options.xml=$abs_builddir/options.xml 0755 root sys -f none lib/svc/method/quagga=$abs_builddir/quagga.init 0755 root bin +f none lib/svc/method/frr=$abs_builddir/frr.init 0755 root bin From f89f4f108e43b4bd29e3e2b006994322419e750c Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Fri, 20 Jan 2017 00:10:48 +0700 Subject: [PATCH 2/7] redhat: Fix spec file changelog to use automatic version for last entry Signed-off-by: Martin Winter --- redhat/frr.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index a815e151df..c53e8459c9 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -570,10 +570,10 @@ rm -rf %{buildroot} %endif %changelog -* Fri Jan 6 2017 Martin Winter +* Fri Jan 6 2017 Martin Winter - %{version} - Renamed to frr for FreeRangeRouting fork of Quagga -* Thu Feb 11 2016 Paul Jakma - %{version} +* Thu Feb 11 2016 Paul Jakma - remove with_ipv6 conditionals, always build v6 - Fix UTF-8 char in spec changelog - remove quagga.pam.stack, long deprecated. From b189cfb3c9d51fd971464e9ee8d9072f47ee86c0 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Fri, 20 Jan 2017 00:31:01 +0700 Subject: [PATCH 3/7] Doc: Update Bug Reporting instructions to FreeRangeRouting and Github Issue Tracker Signed-off-by: Martin Winter --- REPORTING-BUGS | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/REPORTING-BUGS b/REPORTING-BUGS index 83f4eb990a..ea36ff5eed 100644 --- a/REPORTING-BUGS +++ b/REPORTING-BUGS @@ -1,5 +1,5 @@ -This file describes the procedure for reporting Quagga bugs. You are not -obliged to follow this format, but it would be great help for Quagga developers +This file describes the procedure for reporting FreeRangeRouting bugs. You are not +obliged to follow this format, but it would be great help for FreeRangeRouting developers if you report a bug as described below. Bugs submitted with woefully incomplete information may be summarily @@ -9,23 +9,24 @@ additional information. Bugs may be closed after 30 days of non-response to requests to reconfirm or supply additional information. -Report bugs http://bugzilla.quagga.net +Report bugs on Github Issue Tracker at + https://github.com/freerangerouting/frr/issues Please supply the following information: -1. Your Quagga version or if it is from git then the commit reference. +1. Your FreeRangeRouting version or if it is from git then the commit reference. Please try to report bugs against git master or the latest release. -2. Quagga daemons you run e.g. bgpd or ripd and full name of your OS. Any +2. FRR daemons you run e.g. bgpd or ripd and full name of your OS. Any specific options you compiled Quagga with. 3. Problem description. Copy and paste relative commands and their output to describe your network setup e.g. "zebra>show ip route". Please, also give your simple network layout and output of relative OS commands (e.g., ifconfig (BSD) or ip (Linux)). -4. All Quagga configuration files you use. If you don't want to publish your +4. All FRR configuration files you use. If you don't want to publish your network numbers change 2 middle bytes in IPv4 address to be XXX (e.g. 192.XXX.XXX.32/24). Similar could be done with IPv6. -5. If any Quagga daemon core dumped, please, supply stack trace using the +5. If any FRR daemon core dumped, please, supply stack trace using the following commands: host> gdb exec_file core_file , (gdb) bt . -6. Run all Quagga daemons with full debugging on (see documentation on +6. Run all FRR daemons with full debugging on (see documentation on debugging) and send _only_ part of logs which are relative to your problem. 7. If the problem is difficult to reproduce please send a shell script to reproduce it. From 89ebfbb49d0b07b737b907d0b8f44502c1475041 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Fri, 20 Jan 2017 00:34:03 +0700 Subject: [PATCH 4/7] Doc: Update URL to freerangerouting.org Signed-off-by: Martin Winter --- ChangeLog | 4 ++-- debian/README.Debian | 2 +- debian/copyright | 4 ++-- doc/frr.texi | 12 ++++++------ doc/overview.texi | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ed5061be4..a201bb6819 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -ChangeLog information for Quagga is now recorded in our source-code +ChangeLog information for FreeRangeRouting is for now recorded in source-code management system. Please see: - http://www.quagga.net/devel.php + http://www.freerangerouting.org/ diff --git a/debian/README.Debian b/debian/README.Debian index fb481eb456..f21c10742d 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -14,7 +14,7 @@ available forcing you to explicitly type "apt-get install frr" to upgrade it. * What is frr? ================= -http://www.freerangerouting.net/ +http://www.freerangerouting.org/ > Frr is a routing software suite, providing implementations of OSPFv2, > OSPFv3, RIP v1 and v2, RIPv3 and BGPv4 for Unix platforms, particularly > FreeBSD and Linux and also NetBSD, to mention a few. Frr is a fork of GNU diff --git a/debian/copyright b/debian/copyright index ab392027c8..6a5ed98f91 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Frr -Upstream-Contact: maintainers@freerangerouting.net, security@freerangerouting.net -Source: http://www.freerangerouting.net/ +Upstream-Contact: maintainers@freerangerouting.org, security@freerangerouting.org +Source: http://www.freerangerouting.org/ Files: * Copyright: 1996-2003 by the original Zebra authors: diff --git a/doc/frr.texi b/doc/frr.texi index 360acebe16..d4a78b7b81 100644 --- a/doc/frr.texi +++ b/doc/frr.texi @@ -7,7 +7,7 @@ @setfilename frr.info @c Set variables - sourced from defines.texi @include defines.texi -@settitle @uref{http://www.freerangerouting.net,,@value{PACKAGE_NAME}} +@settitle @uref{http://www.freerangerouting.org,,@value{PACKAGE_NAME}} @c %**end of header @c automake will automatically generate version.texi @@ -48,16 +48,16 @@ This file documents the Frr Software Routing Suite which manages common TCP/IP routing protocols. This is Edition @value{EDITION}, last updated @value{UPDATED} of -@cite{The Frr Manual}, for @uref{http://www.freerangerouting.net/,,@value{PACKAGE_NAME}} +@cite{The Frr Manual}, for @uref{http://www.freerangerouting.org/,,@value{PACKAGE_NAME}} Version @value{VERSION}. @insertcopying @end ifinfo @titlepage -@title @uref{http://www.freerangerouting.net,,Frr} +@title @uref{http://www.freerangerouting.org,,Frr} @subtitle A routing software package for TCP/IP networks -@subtitle @uref{http://www.freerangerouting.net,,@value{PACKAGE_NAME}} @value{VERSION} +@subtitle @uref{http://www.freerangerouting.org,,@value{PACKAGE_NAME}} @value{VERSION} @subtitle @value{UPDATED-MONTH} @author @value{AUTHORS} @@ -72,9 +72,9 @@ Version @value{VERSION}. @node Top @top Frr -- With Virtual Network Control -@uref{http://www.freerangerouting.net,,Frr} is an advanced routing software package +@uref{http://www.freerangerouting.org,,Frr} is an advanced routing software package that provides a suite of TCP/IP based routing protocols. This is the Manual -for @value{PACKAGE_STRING}. @uref{http://www.freerangerouting.net,,Frr} is a fork of +for @value{PACKAGE_STRING}. @uref{http://www.freerangerouting.org,,Frr} is a fork of @uref{http://www.quagga.net,,Quagga}. @insertcopying diff --git a/doc/overview.texi b/doc/overview.texi index d1e8ea48b2..370ada3f8a 100644 --- a/doc/overview.texi +++ b/doc/overview.texi @@ -2,7 +2,7 @@ @chapter Overview @cindex Overview - @uref{http://www.freerangerouting.net,,Frr} is a routing software package that + @uref{http://www.freerangerouting.org,,Frr} is a routing software package that provides TCP/IP based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, IS-IS, BGP-4, and BGP-4+ (@pxref{Supported RFCs}). Frr also supports special BGP Route Reflector and Route Server @@ -275,12 +275,12 @@ November 1995.} The official Frr web-site is located at: -@uref{http://www.freerangerouting.net/} +@uref{http://www.freerangerouting.org/} and contains further information, as well as links to additional resources. -@uref{http://www.freerangerouting.net/,Frr} is a fork of Quagga, whose +@uref{http://www.freerangerouting.org/,Frr} is a fork of Quagga, whose web-site is located at: @uref{http://www.quagga.net/}. @@ -298,7 +298,7 @@ comments or suggestions to Frr, please subscribe to: @uref{http://lists.nox.tf/listinfo/frr-users}. -The @uref{http://www.freerangerouting.net/,,Frr} site has further information on +The @uref{http://www.freerangerouting.org/,,Frr} site has further information on the available mailing lists, see: @uref{http://lists.nox.tf/lists.php} From 555d1e3a4e0c08fe46d963b49a32fe45ac438cd2 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Fri, 20 Jan 2017 00:36:29 +0700 Subject: [PATCH 5/7] buildtest.sh: Change name from quagga to frr Signed-off-by: Martin Winter --- buildtest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtest.sh b/buildtest.sh index eafd57dbf3..cbe6962a43 100755 --- a/buildtest.sh +++ b/buildtest.sh @@ -4,7 +4,7 @@ # builds some git commit of Quagga in some different configurations # usage: buildtest.sh [commit [configurations...]] -basecfg="--prefix=/usr --enable-user=quagga --enable-group=quagga --enable-vty-group=quagga --enable-configfile-mask=0660 --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc/quagga --enable-exampledir=/etc/quagga/samples --localstatedir=/var/run/quagga --libdir=/usr/lib64/quagga --enable-rtadv --disable-static --enable-isisd --enable-multipath=0 --enable-pimd --enable-werror" +basecfg="--prefix=/usr --enable-user=frr --enable-group=frr --enable-vty-group=frr --enable-configfile-mask=0660 --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc/frr --enable-exampledir=/etc/frr/samples --localstatedir=/var/run/frr --libdir=/usr/lib64/frr --enable-rtadv --disable-static --enable-isisd --enable-multipath=0 --enable-pimd --enable-werror" configs_base="gcc|$basecfg" @@ -36,7 +36,7 @@ trap errfunc ERR COMMITREF="$1" COMMITISH="`git rev-list --max-count=1 ${COMMITREF:-HEAD}`" -TEMP="`mktemp -t -d quaggabuild.XXXXXX`" +TEMP="`mktemp -t -d frrbuild.XXXXXX`" BASE="`pwd`" CONFIGS="$2" From 63a79ae1c223ad01d29a19c093da564952904f5b Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Fri, 20 Jan 2017 02:53:21 +0700 Subject: [PATCH 6/7] Debian/Doc: Fix correct reference about FRR fork from Quagga Signed-off-by: Martin Winter --- debian/README.Debian | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index f21c10742d..893c1decaa 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -15,38 +15,25 @@ available forcing you to explicitly type "apt-get install frr" to upgrade it. ================= http://www.freerangerouting.org/ -> Frr is a routing software suite, providing implementations of OSPFv2, -> OSPFv3, RIP v1 and v2, RIPv3 and BGPv4 for Unix platforms, particularly -> FreeBSD and Linux and also NetBSD, to mention a few. Frr is a fork of GNU -> Zebra which was developed by Kunihiro Ishiguro. Development of GNU Zebra -> slowed dramatically to the point where eventually GNU Zebra was forked into -> Frr. - -> The Frr tree is an attempt to provide a zebra tree with at least the -> bug-fixes, which have accumulated, applied, while tracking any significant -> changes made to the zebra.org tree. Ultimately, this tree hopes to revitalise -> development of this code base. - -I packaged zebra-pj which was then renamed to frr to get people used to it -and offer Debian users the choice which versions they like to use. I hope this -brings frr some feedback and helps it evolving to a good successor of the -orphaned zebra. - - -- Christian Hammers , Jul/Aug 2003 +FRR is a routing software suite, providing implementations of OSPFv2, +OSPFv3, RIP v1 and v2, RIPng, ISIS, PIM, BGP and LDP for Unix platforms, particularly +FreeBSD and Linux and also NetBSD, to mention a few. FRR is a fork of Quagga +which itself is a fork of Zebra. +Zebra was developed by Kunihiro Ishiguro. * Why has SNMP support been disabled? ===================================== -Frr used to link against the NetSNMP libraries to provide SNMP +FRR used to link against the NetSNMP libraries to provide SNMP support. Those libraries sadly link against the OpenSSL libraries to provide crypto support for SNMPv3 among others. OpenSSL now is not compatible with the GNU GENERAL PUBLIC LICENSE (GPL) -licence that Frr is distributed under. For more explanation read: +licence that FRR is distributed under. For more explanation read: http://www.gnome.org/~markmc/openssl-and-the-gpl.html http://www.gnu.org/licenses/gpl-faq.html#GPLIncompatibleLibs Updating the licence to explecitly allow linking against OpenSSL would requite the affirmation of all people that ever contributed -a significant part to Zebra or Frr and thus are the collective +a significant part to Zebra / Quagga or FRR and thus are the collective "copyright holder". That's too much work. Using a shrinked down version of NetSNMP without OpenSSL or convincing the NetSNMP people to change to GnuTLS are maybe good solutions but not reachable @@ -55,7 +42,7 @@ during the last days before the Sarge release :-( *BUT* It is allowed by the used licence mix that you fetch the sources and -build Frr yourself with SNMP with +build FRR yourself with SNMP with # export WANT_SNMP=1 # apt-get -b source frr @@ -73,9 +60,9 @@ Default is not to start anything, since it can hose your system's routing table if not set up properly. Priorities were suggested by Dancer . -They're used to start the Frr daemons in more than one step +They're used to start the FRR daemons in more than one step (for example start one or two at network initialization and the -rest later). The number of Frr daemons being small, priorities +rest later). The number of FRR daemons being small, priorities must be between 1 and 9, inclusive (or the initscript has to be changed). /etc/init.d/frr then can be started as @@ -99,7 +86,7 @@ If this message occurs the receive buffer should be increased by adding the following to /etc/sysctl.conf and "--nl-bufsize" to /etc/frr/debian.conf. > net.core.rmem_default = 262144 > net.core.rmem_max = 262144 -See message #4525 from 2005-05-09 in the frr-users mailing list. +See message #4525 from 2005-05-09 in the quagga-users mailing list. * vtysh immediately exists: From fc5300bdbc9dba3221ad8f1e3d1beeb99a94bed6 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Fri, 20 Jan 2017 02:58:55 +0700 Subject: [PATCH 7/7] Protobuf: Update library name to reflect name change to FRR Signed-off-by: Martin Winter --- common.am | 4 ++-- qpb/Makefile.am | 8 ++++---- qpb/README.txt | 2 +- qpb/qpb.proto | 2 +- qpb/qpb_allocator.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common.am b/common.am index ac7a3230da..c6da3d75e8 100644 --- a/common.am +++ b/common.am @@ -30,9 +30,9 @@ Q_PROTOBUF_SRCS = $(Q_PROTOBUF_CFILES) $(Q_PROTOBUF_HFILES) # # Information about how to link to various libraries. # -Q_QUAGGA_PB_CLIENT_LDOPTS = $(top_srcdir)/qpb/libquagga_pb.la $(Q_PROTOBUF_C_CLIENT_LDOPTS) +Q_FRR_PB_CLIENT_LDOPTS = $(top_srcdir)/qpb/libfrr_pb.la $(Q_PROTOBUF_C_CLIENT_LDOPTS) -Q_FPM_PB_CLIENT_LDOPTS = $(top_srcdir)/fpm/libfpm_pb.la $(Q_QUAGGA_PB_CLIENT_LDOPTS) +Q_FPM_PB_CLIENT_LDOPTS = $(top_srcdir)/fpm/libfpm_pb.la $(Q_FRR_PB_CLIENT_LDOPTS) endif # HAVE_PROTOBUF diff --git a/qpb/Makefile.am b/qpb/Makefile.am index 0fbda61f3c..e5951b2be9 100644 --- a/qpb/Makefile.am +++ b/qpb/Makefile.am @@ -5,8 +5,8 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib $(Q PROTOBUF_INCLUDES=-I$(top_srcdir) PROTOBUF_PACKAGE = qpb -lib_LTLIBRARIES = libquagga_pb.la -libquagga_pb_la_LDFLAGS = -version-info 0:0:0 +lib_LTLIBRARIES = libfrr_pb.la +libfrr_pb_la_LDFLAGS = -version-info 0:0:0 if HAVE_PROTOBUF protobuf_srcs = \ @@ -16,14 +16,14 @@ protobuf_srcs_nodist = \ qpb.pb-c.c endif -libquagga_pb_la_SOURCES = \ +libfrr_pb_la_SOURCES = \ linear_allocator.h \ qpb.h \ qpb.c \ qpb_allocator.h \ $(protobuf_srcs) -nodist_libquagga_pb_la_SOURCES = $(protobuf_srcs_nodist) +nodist_libfrr_pb_la_SOURCES = $(protobuf_srcs_nodist) CLEANFILES = $(Q_CLEANFILES) BUILT_SOURCES = $(Q_PROTOBUF_SRCS) diff --git a/qpb/README.txt b/qpb/README.txt index 99ccd05511..7a09452c6f 100644 --- a/qpb/README.txt +++ b/qpb/README.txt @@ -1 +1 @@ -Protobuf definitions and code that is applicable to all of quagga. +Protobuf definitions and code that is applicable to all of Quagga/FRR. diff --git a/qpb/qpb.proto b/qpb/qpb.proto index 8323d3ed73..a1595a9abd 100644 --- a/qpb/qpb.proto +++ b/qpb/qpb.proto @@ -21,7 +21,7 @@ */ /* - * Protobuf definitions pertaining to the Quagga Protobuf component. + * Protobuf definitions pertaining to the Quagga/FRR Protobuf component. */ package qpb; diff --git a/qpb/qpb_allocator.h b/qpb/qpb_allocator.h index 83ddf56cbc..bb7dcf38f3 100644 --- a/qpb/qpb_allocator.h +++ b/qpb/qpb_allocator.h @@ -24,7 +24,7 @@ */ /* - * Header file for quagga protobuf memory management code. + * Header file for Quagga/FRR protobuf memory management code. */ #ifndef _QPB_ALLOCATOR_H_