debian: Convert Quagga -> Frr

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

34 files changed, 181 insertions, 181 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 7bec53230..fb481eb45 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,34 +2,34 @@
 ==================
 
 Please consider setting this package "on hold" by typing
-    echo "quagga hold" | dpkg --set-selections
+    echo "frr hold" | dpkg --set-selections
 and verifying this using
     dpkg --get-selections | grep 'hold$'
 
 Setting a package "on hold" means that it will not automatically be upgraded.
 Instead apt-get only displays a warning saying that a new version would be
-available forcing you to explicitly type "apt-get install quagga" to upgrade it.
+available forcing you to explicitly type "apt-get install frr" to upgrade it.
 
 
-* What is quagga?
+* What is frr?
 =================
 
-http://www.quagga.net/
-> Quagga is a routing software suite, providing implementations of OSPFv2,
+http://www.freerangerouting.net/
+> 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. Quagga is a fork of GNU
+> 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
-> Quagga.
+> Frr.
 
-> The Quagga tree is an attempt to provide a zebra tree with at least the
+> 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 quagga to get people used to it
+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 quagga some feedback and helps it evolving to a good successor of the
+brings frr some feedback and helps it evolving to a good successor of the
 orphaned zebra.
 
  -- Christian Hammers <ch@debian.org>, Jul/Aug 2003
@@ -37,16 +37,16 @@ orphaned zebra.
 
 * Why has SNMP support been disabled?
 =====================================
-Quagga 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 Quagga 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 Quagga and thus are the collective
+a significant part to Zebra 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,17 +55,17 @@ during the last days before the Sarge release :-(
         *BUT*
 
 It is allowed by the used licence mix that you fetch the sources and
-build Quagga yourself with SNMP with
-	<remove the "grep ^smux" block at the end of debian/quagga.preinst>
+build Frr yourself with SNMP with
+	<remove the "grep ^smux" block at the end of debian/frr.preinst>
         # export WANT_SNMP=1
-        # apt-get -b source quagga
+        # apt-get -b source frr
 Just distributing it in binary form, linked against OpenSSL, is forbidden.
 
 
 * Daemon selection:
 ===================
 
-The Debian package uses /etc/quagga/daemons to tell the
+The Debian package uses /etc/frr/daemons to tell the
 initscript which daemons to start. It's in the format
 <daemon>=<yes|no|priority>
 with no spaces (it's simply source-d into the initscript).
@@ -73,13 +73,13 @@ 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 <dancer@zeor.simegen.com>.
-They're used to start the Quagga 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 Quagga 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/quagga then can be started as
+changed). /etc/init.d/frr then can be started as
 
-/etc/init.d/quagga <start|stop|restart|<priority>>
+/etc/init.d/frr <start|stop|restart|<priority>>
 
 where priority 0 is the same as 'stop', priority 10 or 'start'
 means 'start all'
@@ -96,15 +96,15 @@ into the kernel.
 =====================================================================
 
 If this message occurs the receive buffer should be increased by adding the
-following to /etc/sysctl.conf and "--nl-bufsize" to /etc/quagga/debian.conf.
+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 quagga-users mailing list.
+See message #4525 from 2005-05-09 in the frr-users mailing list.
 
 
 * vtysh immediately exists:
 ===========================
 
-Check /etc/pam.d/quagga, it probably denies access to your user. The passwords
-configured in /etc/quagga/Quagga.conf are only for telnet access.
+Check /etc/pam.d/frr, it probably denies access to your user. The passwords
+configured in /etc/frr/Frr.conf are only for telnet access.
 
diff --git a/debian/README.Maintainer b/debian/README.Maintainer
index b0b1e62b3..aa8ac0cf3 100644
--- a/debian/README.Maintainer
+++ b/debian/README.Maintainer
@@ -4,19 +4,19 @@
 for i in debian/patches/*.diff; do echo -e "#\n# $i\n#"; patch --fuzz=3 --dry-run -p1 < $i; done
 
 #
-# Filename transition from zebra to quagga
+# Filename transition from zebra to frr
 #
 
 Files that keep their names
 	/usr/bin/vtysh
 
 Files that got an -pj suffix
-	/etc/default/zebra	-> /etc/quagga/debian.conf
-	/etc/init.d/zebra	-> /etc/init.d/quagga
-	/etc/zebra/		-> /etc/quagga/
-	/usr/share/doc/zebra/	-> /usr/share/doc/quagga/
-	/var/log/zebra/		-> /var/log/quagga/
-	/var/run/ 		-> /var/run/quagga/
+	/etc/default/zebra	-> /etc/frr/debian.conf
+	/etc/init.d/zebra	-> /etc/init.d/frr
+	/etc/zebra/		-> /etc/frr/
+	/usr/share/doc/zebra/	-> /usr/share/doc/frr/
+	/var/log/zebra/		-> /var/log/frr/
+	/var/run/ 		-> /var/run/frr/
 
 Files that were moved
-	/usr/sbin/*		-> /usr/lib/quagga/
+	/usr/sbin/*		-> /usr/lib/frr/
diff --git a/debian/changelog b/debian/changelog
index f17f89eaf..ef019b4d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,7 @@
+frr (2.0) Released; urgency=medium
+
+  * Switchover to FRR
+
 quagga (0.99.24+cl3u5) RELEASED; urgency=medium
 
   * Closes: CM-12846 - Resolve Memory leaks in 'show ip bgp neighbor json'
diff --git a/debian/control b/debian/control
index dd0013e82..578795d99 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
-Source: quagga
+Source: frr
 Section: net
 Priority: optional
 Maintainer: Christian Hammers <ch@debian.org>
 Uploaders: Florian Weimer <fw@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, po-debconf, autotools-dev, hardening-wrapper, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson0, libjson0-dev, dh-systemd, libsystemd-dev, python-ipaddr
 Standards-Version: 3.9.6
-Homepage: http://www.quagga.net/
+Homepage: http://www.frr.net/
 XS-Testsuite: autopkgtest
 
-Package: quagga
+Package: frr
 Architecture: any
 Depends: ${shlibs:Depends}, logrotate (>= 3.2-11), iproute, ${misc:Depends}
 Pre-Depends: adduser
@@ -16,37 +16,33 @@ Conflicts: zebra, zebra-pj
 Replaces: zebra, zebra-pj
 Suggests: snmpd
 Description: BGP/OSPF/RIP routing daemon
- GNU Quagga is free software which manages TCP/IP based routing protocols.
+ Frr is free software which manages TCP/IP based routing protocols.
  It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, and RIPng as
  well as the IPv6 versions of these.
  .
- As the precessor Zebra has been considered orphaned, the Quagga project
- has been formed by members of the zebra mailing list and the former
- zebra-pj project to continue developing.
- .
- Quagga uses threading if the kernel supports it, but can also run on
+ Frr uses threading if the kernel supports it, but can also run on
  kernels that do not support threading. Each protocol has its own daemon.
  .
  It is more than a routed replacement, it can be used as a Route Server and
  a Route Reflector.
 
-Package: quagga-dbg
+Package: frr-dbg
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, quagga (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, frr (= ${binary:Version})
 Priority: extra
 Section: debug
 Description: BGP/OSPF/RIP routing daemon (debug symbols)
  This package provides debugging symbols for all binary packages built from                                                                                                                                                                    
- quagga source package. It's highly recommended to have this package installed                                                                                                                                                                 
- before reporting any Quagga crashes to either Quagga developers or Debian                                                                                                                                                                     
+ frr source package. It's highly recommended to have this package installed                                                                                                                                                                 
+ before reporting any Frr crashes to either Frr developers or Debian                                                                                                                                                                     
  package maintainers.
 
-Package: quagga-doc
+Package: frr-doc
 Section: net
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: quagga
-Description: documentation files for quagga
- This package includes info files for quagga, a free software which manages
+Suggests: frr
+Description: documentation files for frr
+ This package includes info files for frr, a free software which manages
  TCP/IP based routing protocols.  It supports BGP4, BGP4+, OSPFv2, OSPFv3,
  IS-IS, RIPv1, RIPv2, and RIPng as well as the IPv6 versions of these.
diff --git a/debian/copyright b/debian/copyright
index 22434fb25..ab392027c 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: Quagga
-Upstream-Contact: maintainers@quagga.net, security@quagga.net
-Source: http://www.quagga.net/
+Upstream-Name: Frr
+Upstream-Contact: maintainers@freerangerouting.net, security@freerangerouting.net
+Source: http://www.freerangerouting.net/
 
 Files: *
 Copyright: 1996-2003 by the original Zebra authors:
diff --git a/debian/quagga-doc.docs b/debian/frr-doc.docs
index a0776fd68..a0776fd68 100644
--- a/debian/quagga-doc.docs
+++ b/debian/frr-doc.docs
diff --git a/debian/frr-doc.info b/debian/frr-doc.info
new file mode 100644
index 000000000..c4f181cdb
--- /dev/null
+++ b/debian/frr-doc.info
@@ -0,0 +1 @@
+doc/frr.info*
diff --git a/debian/quagga-doc.install b/debian/frr-doc.install
index d2d3f1bbd..d2d3f1bbd 100644
--- a/debian/quagga-doc.install
+++ b/debian/frr-doc.install
diff --git a/debian/frr-doc.lintian-overrides b/debian/frr-doc.lintian-overrides
new file mode 100644
index 000000000..1fe64ffd5
--- /dev/null
+++ b/debian/frr-doc.lintian-overrides
@@ -0,0 +1 @@
+frr-doc: wrong-section-according-to-package-name frr-doc => doc
diff --git a/debian/frr.conf b/debian/frr.conf
new file mode 100644
index 000000000..dee3cd849
--- /dev/null
+++ b/debian/frr.conf
@@ -0,0 +1,2 @@
+# Create the /run/frr directory at boot or from systemd-tmpfiles on install
+d /run/frr 0755 frr frr
diff --git a/debian/quagga.config b/debian/frr.config
index f642bea1d..f642bea1d 100644
--- a/debian/quagga.config
+++ b/debian/frr.config
diff --git a/debian/frr.dirs b/debian/frr.dirs
new file mode 100644
index 000000000..58290080d
--- /dev/null
+++ b/debian/frr.dirs
@@ -0,0 +1,7 @@
+etc/logrotate.d/
+etc/frr/
+usr/share/doc/frr/
+usr/share/doc/frr/examples/
+usr/share/lintian/overrides/
+usr/share/snmp/mibs/
+var/log/frr/
diff --git a/debian/quagga.docs b/debian/frr.docs
index f72aae196..f72aae196 100644
--- a/debian/quagga.docs
+++ b/debian/frr.docs
diff --git a/debian/quagga.install b/debian/frr.install
index 022bd94ec..45b3b973b 100644
--- a/debian/quagga.install
+++ b/debian/frr.install
@@ -1,12 +1,12 @@
-etc/quagga/
+etc/frr/
 usr/bin/vtysh
-usr/include/quagga/
+usr/include/frr/
 usr/lib/
-tools/quagga-reload.py usr/lib/quagga/
-tools/quagga usr/lib/quagga
-usr/share/doc/quagga/
+tools/frr-reload.py usr/lib/frr/
+tools/frr usr/lib/frr
+usr/share/doc/frr/
 usr/share/man/man1/vtysh.1
-usr/share/man/man1/quagga.1
+usr/share/man/man1/frr.1
 usr/share/man/man8
 usr/share/man/man8/bgpd.8
 usr/share/man/man8/ospf6d.8
@@ -19,4 +19,4 @@ usr/share/man/man8/watchfrr.8
 usr/share/snmp/mibs/
 cumulus/etc/* etc/
 tools/*.service    lib/systemd/system
-debian/quagga.conf  usr/lib/tmpfiles.d
+debian/frr.conf  usr/lib/tmpfiles.d
diff --git a/debian/frr.lintian-overrides b/debian/frr.lintian-overrides
new file mode 100644
index 000000000..42a51b5e6
--- /dev/null
+++ b/debian/frr.lintian-overrides
@@ -0,0 +1,4 @@
+frr: non-dev-pkg-with-shlib-symlink usr/lib/libospfapiclient.so.0.0.0 usr/lib/libospfapiclient.so
+frr: non-dev-pkg-with-shlib-symlink usr/lib/libospf.so.0.0.0 usr/lib/libospf.so
+frr: non-dev-pkg-with-shlib-symlink usr/lib/libzebra.so.0.0.0 usr/lib/libzebra.so
+frr: package-name-doesnt-match-sonames libospf0 libospfapiclient0 libzebra0
diff --git a/debian/quagga.logrotate b/debian/frr.logrotate
index 77e015d72..0dd68fb25 100644
--- a/debian/quagga.logrotate
+++ b/debian/frr.logrotate
@@ -1,15 +1,15 @@
-/var/log/quagga/*.log {
+/var/log/frr/*.log {
         size 500k
         sharedscripts
         missingok
         compress
         rotate 14
-        create 640 quagga quaggavty
+        create 640 frr frrvty
 
         postrotate
 		for i in zebra bgpd ripd ospfd ripngd ospf6d isisd pimd; do
-                        if [ -e /var/run/quagga/$i.pid ] ; then
-				kill -USR1 `cat /var/run/quagga/$i.pid`
+                        if [ -e /var/run/frr/$i.pid ] ; then
+				kill -USR1 `cat /var/run/frr/$i.pid`
                         fi
 
                 done
diff --git a/debian/quagga.manpages b/debian/frr.manpages
index 17a128b7e..17a128b7e 100644
--- a/debian/quagga.manpages
+++ b/debian/frr.manpages
diff --git a/debian/quagga.pam b/debian/frr.pam
index 093e17294..2b106d43b 100644
--- a/debian/quagga.pam
+++ b/debian/frr.pam
@@ -1,3 +1,3 @@
-# Any user may call vtysh but only those belonging to the group quaggavty can
+# Any user may call vtysh but only those belonging to the group frrvty can
 # actually connect to the socket and use the program.
 auth	sufficient	pam_permit.so
diff --git a/debian/frr.postinst b/debian/frr.postinst
new file mode 100644
index 000000000..43d3ffa9e
--- /dev/null
+++ b/debian/frr.postinst
@@ -0,0 +1,41 @@
+#!/bin/bash -e
+
+######################
+PASSWDFILE=/etc/passwd
+GROUPFILE=/etc/group
+
+frruid=`egrep "^frr:" $PASSWDFILE | awk -F ":" '{ print $3 }'`
+frrgid=`egrep "^frr:" $GROUPFILE | awk -F ":" '{ print $3 }'`
+frrvtygid=`egrep "^frrvty:" $GROUPFILE | awk -F ":" '{ print $3 }'`
+
+[ -n ${frruid} ]    || (echo "No uid for frr in ${PASSWDFILE}"   && /bin/false)
+[ -n ${frrgid} ]    || (echo "No gid for frr in ${GROUPFILE}"    && /bin/false)
+[ -n ${frrVTYgid} ] || (echo "No gid for frrvty in ${GROUPFILE}" && /bin/false)
+
+chown -R ${frruid}:${frrgid} /etc/frr
+touch /etc/frr/vtysh.conf
+chgrp ${frrvtygid} /etc/frr/vtysh*
+chmod 440 /etc/sudoers.d/frr_sudoers
+chmod 644 /etc/frr/*
+
+ENVIRONMENTFILE=/etc/environment
+if ! grep --quiet VTYSH_PAGER=/bin/cat ${ENVIRONMENTFILE}; then
+    echo "VTYSH_PAGER=/bin/cat"  >> ${ENVIRONMENTFILE}
+fi
+##################################################
+
+if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
+${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*"}
+
+# This is most likely due to the answer "no" to the "really stop the server"
+# question in the prerm script.
+if [ "$1" = "abort-upgrade" ]; then
+  exit 0
+fi
+
+. /usr/share/debconf/confmodule
+
+db_stop
+
+#DEBHELPER#
+
diff --git a/debian/quagga.postrm b/debian/frr.postrm
index 1c69e4899..26576fd13 100644
--- a/debian/quagga.postrm
+++ b/debian/frr.postrm
@@ -5,8 +5,8 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*"}
 # set -u	not because of debhelper
 
 if [ "$1" = "purge" ]; then
-	rm -rf /etc/quagga /var/run/quagga /var/log/quagga
-  	userdel quagga >/dev/null 2>&1 || true
+	rm -rf /etc/frr /var/run/frr /var/log/frr
+  	userdel frr >/dev/null 2>&1 || true
 fi
 
 #DEBHELPER#
diff --git a/debian/quagga.preinst b/debian/frr.preinst
index 1af0b5ba6..abdaa7277 100644
--- a/debian/quagga.preinst
+++ b/debian/frr.preinst
@@ -5,73 +5,73 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*"}
 set -e
 set -u
 
-# creating quaggavty group if it isn't already there
-if ! getent group quaggavty >/dev/null; then
-        addgroup --system quaggavty >/dev/null
+# creating frrvty group if it isn't already there
+if ! getent group frrvty >/dev/null; then
+        addgroup --system frrvty >/dev/null
 fi
 
-# creating quagga group if it isn't already there
-if ! getent group quagga >/dev/null; then
-        addgroup --system quagga >/dev/null
+# creating frr group if it isn't already there
+if ! getent group frr >/dev/null; then
+        addgroup --system frr >/dev/null
 fi
 
-# creating quagga user if he isn't already there
-if ! getent passwd quagga >/dev/null; then
+# creating frr user if he isn't already there
+if ! getent passwd frr >/dev/null; then
         adduser \
           --system \
-          --ingroup quagga \
-          --home /var/run/quagga/ \
-          --gecos "Quagga routing suite" \
+          --ingroup frr \
+          --home /var/run/frr/ \
+          --gecos "Frr routing suite" \
           --shell /bin/false \
-          quagga  >/dev/null
+          frr  >/dev/null
 fi
 
 # We may be installing over an older version of
-# quagga and as such we need to intelligently
-# check to see if the quagga user is in the quaggavty
+# frr and as such we need to intelligently
+# check to see if the frr user is in the frrvty
 # group.
-if ! /usr/bin/id quagga | grep &>/dev/null 'quaggavty'; then
-    usermod -a -G quaggavty quagga >/dev/null
+if ! /usr/bin/id frr | grep &>/dev/null 'frrvty'; then
+    usermod -a -G frrvty frr >/dev/null
 fi
 
 # Do not change permissions when upgrading as it would violate policy.
 if [ "$1" = "install" ]; then
-  # Logfiles are group readable in case users were put into the quagga group.
-  d=/var/log/quagga/
+  # Logfiles are group readable in case users were put into the frr group.
+  d=/var/log/frr/
     mkdir -p $d
-    chown -R quagga:quagga $d
+    chown -R frr:frr $d
     chmod u=rwx,go=rx $d
     find $d -type f -print0 | xargs -0 --no-run-if-empty   chmod u=rw,g=r,o=
 
   # Strict permissions for the sockets.
-  d=/var/run/quagga/
+  d=/var/run/frr/
     mkdir -p $d
-    chown -R quagga:quagga $d
+    chown -R frr:frr $d
     chmod u=rwx,go=rx $d
     find $d -type f -print0 | xargs -0 --no-run-if-empty   chmod u=rw,go=
 
   # Config files. Vtysh does not have access to the individual daemons config file
-  d=/etc/quagga/
+  d=/etc/frr/
     mkdir -p $d
-    chown quagga:quaggavty $d
+    chown frr:frrvty $d
     chmod ug=rwx,o=rx $d
-    find $d -type f -print0 | xargs -0 --no-run-if-empty   chown quagga:quagga
+    find $d -type f -print0 | xargs -0 --no-run-if-empty   chown frr:frr
     find $d -type f -print0 | xargs -0 --no-run-if-empty   chmod u=rw,g=r,o=
 
     # Exceptions for vtysh.
     f=$d/vtysh.conf
     if [ -f $f ]; then
-      chown quagga:quaggavty $f
+      chown frr:frrvty $f
       chmod u=rw,g=r,o= $f
     fi
 
     # Exceptions for vtysh.
-    f=$d/Quagga.conf
+    f=$d/Frr.conf
     if [ -f $d/Zebra.conf ]; then
       mv $d/Zebra.conf $f
     fi
     if [ -f $f ]; then
-      chown quagga:quaggavty $f
+      chown frr:frrvty $f
       chmod u=rw,g=r,o= $f
     fi
 fi
diff --git a/debian/quagga.prerm b/debian/frr.prerm
index 977541225..e0df24e10 100644
--- a/debian/quagga.prerm
+++ b/debian/frr.prerm
@@ -15,7 +15,7 @@ case $1 in
 	;;
 
   failed-upgrade)
-	# If quagga/really_stop was negated then this script exits with return
+	# If frr/really_stop was negated then this script exits with return
 	# code 1 and is called again with "failed-upgrade". Well, exit again.
 	exit 1
 	;;
diff --git a/debian/quagga-doc.info b/debian/quagga-doc.info
deleted file mode 100644
index c9ff0f55f..000000000
--- a/debian/quagga-doc.info
+++ /dev/null
@@ -1 +0,0 @@
-doc/quagga.info*
diff --git a/debian/quagga-doc.lintian-overrides b/debian/quagga-doc.lintian-overrides
deleted file mode 100644
index afa3c64ad..000000000
--- a/debian/quagga-doc.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-quagga-doc: wrong-section-according-to-package-name quagga-doc => doc
diff --git a/debian/quagga.conf b/debian/quagga.conf
deleted file mode 100644
index 04d8eea57..000000000
--- a/debian/quagga.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Create the /run/quagga directory at boot or from systemd-tmpfiles on install
-d /run/quagga 0755 quagga quagga
diff --git a/debian/quagga.dirs b/debian/quagga.dirs
deleted file mode 100644
index 581074f8f..000000000
--- a/debian/quagga.dirs
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/logrotate.d/
-etc/quagga/
-usr/share/doc/quagga/
-usr/share/doc/quagga/examples/
-usr/share/lintian/overrides/
-usr/share/snmp/mibs/
-var/log/quagga/
diff --git a/debian/quagga.lintian-overrides b/debian/quagga.lintian-overrides
deleted file mode 100644
index aee52a1eb..000000000
--- a/debian/quagga.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-quagga: non-dev-pkg-with-shlib-symlink usr/lib/libospfapiclient.so.0.0.0 usr/lib/libospfapiclient.so
-quagga: non-dev-pkg-with-shlib-symlink usr/lib/libospf.so.0.0.0 usr/lib/libospf.so
-quagga: non-dev-pkg-with-shlib-symlink usr/lib/libzebra.so.0.0.0 usr/lib/libzebra.so
-quagga: package-name-doesnt-match-sonames libospf0 libospfapiclient0 libzebra0
diff --git a/debian/quagga.postinst b/debian/quagga.postinst
deleted file mode 100644
index 4611313c1..000000000
--- a/debian/quagga.postinst
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash -e
-
-######################
-PASSWDFILE=/etc/passwd
-GROUPFILE=/etc/group
-
-quaggauid=`egrep "^quagga:" $PASSWDFILE | awk -F ":" '{ print $3 }'`
-quaggagid=`egrep "^quagga:" $GROUPFILE | awk -F ":" '{ print $3 }'`
-quaggavtygid=`egrep "^quaggavty:" $GROUPFILE | awk -F ":" '{ print $3 }'`
-
-[ -n ${quaggauid} ]    || (echo "No uid for quagga in ${PASSWDFILE}"   && /bin/false)
-[ -n ${quaggagid} ]    || (echo "No gid for quagga in ${GROUPFILE}"    && /bin/false)
-[ -n ${quaggaVTYgid} ] || (echo "No gid for quaggavty in ${GROUPFILE}" && /bin/false)
-
-chown -R ${quaggauid}:${quaggagid} /etc/quagga
-touch /etc/quagga/vtysh.conf
-chgrp ${quaggavtygid} /etc/quagga/vtysh*
-chmod 440 /etc/sudoers.d/quagga_sudoers
-chmod 644 /etc/quagga/*
-
-ENVIRONMENTFILE=/etc/environment
-if ! grep --quiet VTYSH_PAGER=/bin/cat ${ENVIRONMENTFILE}; then
-    echo "VTYSH_PAGER=/bin/cat"  >> ${ENVIRONMENTFILE}
-fi
-##################################################
-
-if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
-${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*"}
-
-# This is most likely due to the answer "no" to the "really stop the server"
-# question in the prerm script.
-if [ "$1" = "abort-upgrade" ]; then
-  exit 0
-fi
-
-. /usr/share/debconf/confmodule
-
-db_stop
-
-#DEBHELPER#
-
diff --git a/debian/rules b/debian/rules
index b10081318..42c0d5f63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,10 +20,10 @@ MAKEFLAGS += -j$(DEBIAN_JOBS)
 endif
 
 %:
-	dh $@ --with=systemd,autoreconf --parallel --dbg-package=quagga-dbg --list-missing
+	dh $@ --with=systemd,autoreconf --parallel --dbg-package=frr-dbg --list-missing
 
 override_dh_auto_configure:
-	# Quagga needs /proc to check some BSD vs Linux specific stuff.
+	# Frr needs /proc to check some BSD vs Linux specific stuff.
 	# Else it fails with an obscure error message pointing out that
 	# IPCTL_FORWARDING is an undefined symbol which is not very helpful.
 	@if ! [ -d /proc/1 ]; then \
@@ -33,18 +33,18 @@ override_dh_auto_configure:
 
 	if ! [ -e config.status ]; then \
 	dh_auto_configure -- \
-		--enable-exampledir=/usr/share/doc/quagga/examples/ \
-		--localstatedir=/var/run/quagga \
-		--sbindir=/usr/lib/quagga \
-		--sysconfdir=/etc/quagga \
+		--enable-exampledir=/usr/share/doc/frr/examples/ \
+		--localstatedir=/var/run/frr \
+		--sbindir=/usr/lib/frr \
+		--sysconfdir=/etc/frr \
 		$(USE_SNMP) \
 		--enable-ospfapi=yes \
 		--enable-vtysh=yes \
 		--enable-isisd=yes \
 		--enable-multipath=256 \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quaggavty \
+		--enable-user=frr \
+		--enable-group=frr \
+		--enable-vty-group=frrvty \
 		--enable-configfile-mask=0640 \
 		--enable-logfile-mask=0640 \
 		--enable-werror \
@@ -53,7 +53,7 @@ override_dh_auto_configure:
 		--enable-systemd=yes \
 		--enable-poll=yes \
 		--enable-cumulus=yes \
-		--enable-pimd=no \
+		--enable-pimd=yes \
 		--enable-dependency-tracking \
 		--enable-bgp-vnc=no; \
 	fi
@@ -66,11 +66,11 @@ override_dh_auto_build:
 
 	# doc/ is a bit crazy
 ifeq ($(GENERATE_PDF), 1)
-	dh_auto_build -- -C doc quagga.pdf || true # pdfetex fails with exit code 1 but still produces a good looking .pdf
+	dh_auto_build -- -C doc frr.pdf || true # pdfetex fails with exit code 1 but still produces a good looking .pdf
 endif
-	rm -vf doc/quagga.info
-	dh_auto_build -- -C doc quagga.info
-	rm -vf doc/quagga.info.html*
+	rm -vf doc/frr.info
+	dh_auto_build -- -C doc frr.info
+	rm -vf doc/frr.info.html*
 
 override_dh_auto_test:
 
@@ -81,18 +81,18 @@ override_dh_auto_install:
 	rm -f debian/tmp/usr/share/info/dir*
 
 	# install config files
-	mkdir -p debian/tmp/etc/quagga/
-	perl -pi -e 's#^!log file #!log file /var/log/quagga/#' debian/tmp/usr/share/doc/quagga/examples/*sample*
+	mkdir -p debian/tmp/etc/frr/
+	perl -pi -e 's#^!log file #!log file /var/log/frr/#' debian/tmp/usr/share/doc/frr/examples/*sample*
 
-	# installing the Quagga specific SNMP MIB
+	# installing the Frr specific SNMP MIB
 	install -D -m 644 ./zebra/GNOME-PRODUCT-ZEBRA-MIB debian/tmp/usr/share/snmp/mibs/GNOME-PRODUCT-ZEBRA-MIB
 
 	# cleaning .la files
 	sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/*.la
 
 override_dh_systemd_start:
-	dh_systemd_start quagga.service
+	dh_systemd_start frr.service
 
 override_dh_systemd_enable:
-	dh_systemd_enable quagga.service
+	dh_systemd_enable frr.service
 
diff --git a/debian/tests/control b/debian/tests/control
index 1993e371f..53fd537e2 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: daemons
-Depends: quagga
+Depends: frr
 Restrictions: needs-root
diff --git a/debian/tests/daemons b/debian/tests/daemons
index 52c156a1d..ac35ecd95 100644
--- a/debian/tests/daemons
+++ b/debian/tests/daemons
@@ -1,21 +1,21 @@
 #!/bin/bash
 #---------------
-# Testing quagga
+# Testing frr
 #---------------
 set -e
 
 # modify config file to enable all daemons and copy config files
-CONFIG_FILE=/etc/quagga/daemons
+CONFIG_FILE=/etc/frr/daemons
 DAEMONS=("zebra" "bgpd" "ospfd" "ospf6d" "ripd" "ripngd" "isisd" "pimd")
 
 for daemon in "${DAEMONS[@]}"
 do
     sed -i -e "s/${daemon}=no/${daemon}=yes/g" $CONFIG_FILE
-    cp /usr/share/doc/quagga/examples/${daemon}.conf.sample /etc/quagga/${daemon}.conf
+    cp /usr/share/doc/frr/examples/${daemon}.conf.sample /etc/frr/${daemon}.conf
 done
 
-# reload quagga
-/etc/init.d/quagga restart > /dev/null 2>&1
+# reload frr
+/etc/init.d/frr restart > /dev/null 2>&1
 
 # check daemons
 for daemon in "${DAEMONS[@]}"
diff --git a/debian/watch b/debian/watch
index bc6d91dab..46ff1c7da 100644
--- a/debian/watch
+++ b/debian/watch
@@ -4,5 +4,5 @@
 # Site		Directory		Pattern			Version	Script
 version=3
 opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
-    http://download.savannah.gnu.org/releases/quagga/quagga-(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz))
+    http://download.savannah.gnu.org/releases/frr/quagga-(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz))
 # Bart Martens <bartm@debian.org>  Fri, 25 Jan 2013 06:38:53 +0000
diff --git a/debian/watchfrr.rc b/debian/watchfrr.rc
new file mode 100644
index 000000000..4110b8639
--- /dev/null
+++ b/debian/watchfrr.rc
@@ -0,0 +1,4 @@
+check process watchfrr with pidfile /var/run/frr/watchfrr.pid
+        start program = "/etc/init.d/frr start watchfrr" with timeout 120 seconds
+        stop program = "/etc/init.d/frr stop watchfrr"
+        if 3 restarts within 10 cycles then timeout
diff --git a/debian/watchquagga.rc b/debian/watchquagga.rc
deleted file mode 100644
index 81a00393d..000000000
--- a/debian/watchquagga.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-check process watchfrr with pidfile /var/run/quagga/watchfrr.pid
-        start program = "/etc/init.d/quagga start watchfrr" with timeout 120 seconds
-        stop program = "/etc/init.d/quagga stop watchfrr"
-        if 3 restarts within 10 cycles then timeout