Version bump (bug #311865), remove old non-stable ebuilds as they are vulnerable (bug #334303). Take co-maintainership of the package; change the libcap patch (sent upstream) and avoid using a tarball for the patches for now; the other two feature, optional patches are fetched from their respective websites if the flags are enabled; rewrite init scripts almost from scratch so that they recreate their state directory if missing, and make all the services, beside zebra, share the same init script file, drop --quiet, make sure that s-s-d knows about the pidfile as well; install sample files in the documentation directory and not /etc; only use libpcre if not using glibc (could actually be unneeded on other systems as well); don't add /usr/lib/quagga to the library path (the build system will take care of using rpath; if the libraries have to be linked against from third parties, open a bug as they should be in /usr/lib directly).

Package-Manager: portage-2.2_rc75/cvs/Linux x86_64

11 files changed, 354 insertions, 360 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index a8a2ba9bffff..9a554e0774b2 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -1,8 +1,29 @@
 # ChangeLog for net-misc/quagga
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Copyright 2003-2004 DataCore GmbH
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.85 2009/08/30 08:13:41 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.86 2010/09/05 17:09:36 flameeyes Exp $
+
+*quagga-0.99.17 (05 Sep 2010)
+
+  05 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -quagga-0.99.13.ebuild, -quagga-0.99.14.ebuild,
+  +files/quagga-0.99.14-fix-ipremove.patch, -quagga-0.99.15.ebuild,
+  +quagga-0.99.17.ebuild, +files/quagga-0.99.17-libcap.patch,
+  +files/quagga-services.init, +files/zebra.init.2, metadata.xml:
+  Version bump (bug #311865), remove old non-stable ebuilds as they are
+  vulnerable (bug #334303). Take co-maintainership of the package; change
+  the libcap patch (sent upstream) and avoid using a tarball for the patches
+  for now; the other two feature, optional patches are fetched from their
+  respective websites if the flags are enabled; rewrite init scripts almost
+  from scratch so that they recreate their state directory if missing, and
+  make all the services, beside zebra, share the same init script file, drop
+  --quiet, make sure that s-s-d knows about the pidfile as well; install
+  sample files in the documentation directory and not /etc; only use libpcre
+  if not using glibc (could actually be unneeded on other systems as well);
+  don't add /usr/lib/quagga to the library path (the build system will take
+  care of using rpath; if the libraries have to be linked against from third
+  parties, open a bug as they should be in /usr/lib directly).
 
 *quagga-0.99.15 (30 Aug 2009)
 
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index be9f9b830b84..9bb86cba3b3c 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -4,30 +4,29 @@ Hash: SHA1
 AUX bgpd.init 900 RMD160 1047341d9f582a946f5460d2a60450fe0fef4463 SHA1 4e7323c366c2bfe5287e132bf8e1e7f7e79b8e43 SHA256 0625c171ec51e58175dbb59892964b5958179374947755678b2c344d98222bac
 AUX ospf6d.init 919 RMD160 91c936a210daf94e3742bbbd6f77484afe4c4cb5 SHA1 6448dcb15084b9ac7663cf0e7fd95f4602430c93 SHA256 13be35acbad48120fca1e39fd9ad6e99894280f47bc516396147051329704891
 AUX ospfd.init 910 RMD160 4863d2a89ce0450efed37458b432f8d4ec8e33a5 SHA1 512cddcda3b6813f92778f44e07552ae483e78a5 SHA256 b20cf9046f5c9687aeda2be4f7160d1f1f941c63d865b767f156d1b8471d8c59
+AUX quagga-0.99.14-fix-ipremove.patch 650 RMD160 65341030d33814ae07f1f9a6e46354bb45bf5834 SHA1 19ab17ce9437453ad1a6dac63da06fa855c717c9 SHA256 ef3ef36f792169f68d5d76c6d8a78f08d11c534d4e966fed2a433e456963d346
+AUX quagga-0.99.17-libcap.patch 1935 RMD160 da2299aa1da64508e36cbf0fc104d6993fda9cb2 SHA1 bbae789c9006c1b7c23408f3c5b37d71e600c397 SHA256 3bf6204ebc25dff39961d16e908cbfba6406ce260dc801625696d82725ba2824
+AUX quagga-services.init 1189 RMD160 38979c189e97a7b278f96018bfb12de9dbff14c0 SHA1 74adb27caa9065af58f56f1ff43e8f8cc6875f28 SHA256 298f2ea5310e79ef88a5f7c512e273c5be43aee5f6fc31847c0ad10668734319
 AUX quagga.env 25 RMD160 2ea6666fbacfdcc125283dcd4a5f6bae089f5392 SHA1 42aad9b84a949f13bfb708659290ec1f0de6eff4 SHA256 12aeda71c607c4830fda6042daf19353a9187e062a8ad998e5a2bd3e52773297
 AUX quagga.pam 975 RMD160 df2433b76a16f2c8747f9569e88ed90c9c1f2bae SHA1 bfcd1bbbd4162fd70541f0d754a0e5a818025bc9 SHA256 aa68ac97d7a951324bc3c4124a1c70f6fa88a45da860f636ac01cbcbfa36db70
 AUX ripd.init 900 RMD160 ef99fa34951c47a29b1147a9b1226692f239ec8b SHA1 b89e411a64013e88cfcd2f898025f66a9593445a SHA256 6212f0bb45d849087fdb6c0d4cbc3b0f3e651907cb844576c17d161dbf10fda5
 AUX ripngd.init 920 RMD160 7d484a8342cc1142fd8ee88080f8f9281fde3461 SHA1 5c31e1fecdea1a55461ea3550702bfd225b2101c SHA256 7183b0bbf9ab9144635fada4e03f73dd58bac246600ee7f007f06150db48d044
 AUX zebra.conf 84 RMD160 7846ce226c2d0081e27b64131104eacf51e2e4de SHA1 cb258fc8f0980401c5b991b0a8b37f12236956ca SHA256 c7fb777e480fcfbcf9aa9c931bf5f8b6d13d3b2dbe8478cba1a4571aa5baa586
 AUX zebra.init 1013 RMD160 1cb01c0b95fd8a49d442b2a0c1d900e1cee7d477 SHA1 462d7e255f01fb9615f99526976cef209ea332e7 SHA256 7eac27ca9661fb453a93b131bfbf69e409a06f65c2cedb83cdd55869d6871236
+AUX zebra.init.2 1270 RMD160 458104f078189634c0115369e55dd8d1fdcc3560 SHA1 491defcce3a689061281c7658faf72118aa9a39d SHA256 392d52a4b43cd7c07856861f1b3e87199e685e585e33b2dd4a28d2b20fb27554
+DIST ht-20040304-classless-bgp.patch 1581 RMD160 e08f18b725d2f899f0c4abe7df37dc6608e88baf SHA1 5216bfbcb0f0c42846d56afe7ab778895197a039 SHA256 39993890f9e31d662ed0564c732fb22392a901beb45b64261ffeadd9edf27887
 DIST quagga-0.98.6-patches-20080708.tar.gz 21295 RMD160 d88c25bcc8e96e9b101638c1faf99cdad61baaa3 SHA1 24226a1a5b305b1e8b983831366eb65f81da090f SHA256 7b6dca8f58cb3f54a76a4d02c63505fa60b9554e03a58b8b9674f90b63dcefbe
 DIST quagga-0.98.6.tar.gz 2019992 RMD160 e15cd93b5d321660d7e29fc27174352967342879 SHA1 2234d1235f504e9dc5865cc8d5fd4e250bf43ed5 SHA256 a84e1aac4e666929abd1942fa8958d9ef0d0bbf605f47d5c2a09f6be716987a1
-DIST quagga-0.99.13-patches-20090623.tar.gz 13284 RMD160 55f2401d15d59323e4109b8bd5a1b03e66d6a452 SHA1 b0ddd6edbd7104b47a1e77042102bb1ba4387e76 SHA256 771916e70b2382badcc157317aaf132e0d8a0e0e3bc6e1801344ec5c20ced3a1
-DIST quagga-0.99.13.tar.gz 2172551 RMD160 8f647b0babb9c547cd8d7ce5cdc23c171d11d18c SHA1 41f51de2f068d39f504440ce72321096c5eb79a6 SHA256 da986f2c9ee550c1a9fd76a06bae708cb5988ea468a7fb8c73c3f5f055bd8d9f
-DIST quagga-0.99.14-patches-20090816.tar.gz 13326 RMD160 f0bfb2167aee71620e7359168ae5cf096eca2c8b SHA1 8b25d650c918382c7590bce92e98bd6abec01d60 SHA256 cd062845e14f3d0232e5193250f53b5b80d3db5965eb1bcd2a52cb7738c20e39
-DIST quagga-0.99.14.tar.gz 2185686 RMD160 48ab35063c91c1e8e180f791ec2db65a9b10c53c SHA1 5c182a70987957b968b92251ab81b886647292a4 SHA256 3f637fa1b49d335c00e78602754977d22455ba6e4a82ce4183c4da50667067e5
-DIST quagga-0.99.15-patches-20090830.tar.gz 13244 RMD160 5406ec5e33b9200d42f85eadc9f819aa6d911bd7 SHA1 b0fe9b7f6b54efbe26cb92b4bf8466445a858350 SHA256 10ed87d1e76ce1e8524fb6963566a102589c2033c47da670c57896319addd737
-DIST quagga-0.99.15.tar.gz 2191159 RMD160 0490641930841d7d6d9f01b1daee7f9b2d09a34b SHA1 705fd45a4d6098f436f58a730da23ba2d8b59079 SHA256 c86e8818b67cb0381c1821df4fd14ca92696d8b9d67d1c2b35b57b95cf53cdc2
+DIST quagga-0.99.14-realms-test2.diff 56183 RMD160 aed1425ba99ba633df7c879641cb365811e4caba SHA1 1e5ee9262ac5df1421a4f293713d7d3cb33a2d4d SHA256 20091855d46b441a3f0b39b1be06c84f846d8508de96e09504c3736bc2b6a3b6
+DIST quagga-0.99.17.tar.gz 2202151 RMD160 f00bf01930f781ae0de9fe9981c74e7bae0798b5 SHA1 31f42fa9f4d96aadf1bf97c3d9bf3308eb0d56c1 SHA256 1d77df121a334e9504b45e489ee7ce35bf478e27d33cd2793a23280b59d9efd4
 EBUILD quagga-0.98.6-r4.ebuild 5384 RMD160 b13750f47c0e0452958a57de6e8547b493ef8a7f SHA1 76504c11179ec546161a2da58ddd884a48b27628 SHA256 f156a7931080ee9d9f0ad8dd4322144e9e2db780b072ae6e2820f51eff393d2c
-EBUILD quagga-0.99.13.ebuild 3638 RMD160 dc7390e17c00df4e83f189758979ddcd819a4e1c SHA1 edb4fd772fb46e6685c2243dfb86029471880fbe SHA256 a81d86992b96f35b43ab69b34d98e699c811860496e638bf375cafdf025258dc
-EBUILD quagga-0.99.14.ebuild 3662 RMD160 67d5dd3adc5cd50a083ad16f89a934050f90e3b4 SHA1 51caae20cf9136c638deeffe92d35095a52e8afa SHA256 2b6ce0cead257800ba53619c91bc9d3eaf291159f194f3fb0bee64238524879b
-EBUILD quagga-0.99.15.ebuild 3662 RMD160 1097401201f3a688a197ce615fa7b136fb68a608 SHA1 d722e0e03502f8132a27e6576e5edac2d7f4c640 SHA256 6dafaddcbe4079f7508c0fbef7052acf9310765948f28f898ae3f4868acac4dc
-MISC ChangeLog 19079 RMD160 a7b254447993bc5c171a0e031eb3b3da6114e324 SHA1 1e8fcc46e855b72f5d699484b38cef1be5004a87 SHA256 911374ddd65110b0d08fc329890fce330adfaf643f232a4c7eec107c0d49b6f8
-MISC metadata.xml 2073 RMD160 99bbbceb932054aa49aaf09566c1ba0ab7acc216 SHA1 bea36155bab6b90d49ed782be2670733c245e4fc SHA256 0c4297ffd73ddc23d96ff5f0a34f1ac45daf4d22367572ef2466312387c62406
+EBUILD quagga-0.99.17.ebuild 3444 RMD160 e850e96c4dab79f87d72ad8d89e6a31333179c23 SHA1 a67b40c98cfa0583f2036216f827472f43ce6baf SHA256 e0a27b04dce21c2c334be6f2e1f743e5711732ebce18d91a5ec059b1b161e2c3
+MISC ChangeLog 20383 RMD160 63ffae61ca7cae28a0ef04ad87df223cc387bb71 SHA1 657598d34f8dfba37e9fbfac175977f8b3dbac08 SHA256 0ed9b525953f020af81a3241894d1e008ab42af84d7c951f65b55ad93a33eadc
+MISC metadata.xml 2523 RMD160 d7d3c0e34c27f6fb5dfca485e0d34c7099300225 SHA1 eeb044bea48af0e57e460bd057364495e77f74ad SHA256 01bec77e345330f76d72db1a2797eb9f2bbdd930de1ae3d3ba2fba93f71022ff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkqaNMAACgkQ9A5kJBGSrsv1KQCfXCCbHkk1VQfFdMl6sr+Lji7c
-Gl0AnRwNmj++EMqh4ty3OMwxahJOfj5j
-=sBwv
+iEYEARECAAYFAkyDztkACgkQAiZjviIA2XiYcQCfdwx1DJ6dv/p7vZxL6SqDKytM
+jBEAni8AjyJ063MddRvEmwKvEJViAd4y
+=55E6
 -----END PGP SIGNATURE-----
diff --git a/net-misc/quagga/files/quagga-0.99.14-fix-ipremove.patch b/net-misc/quagga/files/quagga-0.99.14-fix-ipremove.patch
new file mode 100644
index 000000000000..9f2dd01c6605
--- /dev/null
+++ b/net-misc/quagga/files/quagga-0.99.14-fix-ipremove.patch
@@ -0,0 +1,23 @@
+diff -ur quagga-0.99.14/zebra/interface.c quagga-0.99.14-fix-ipremove/zebra/interface.c
+--- quagga-0.99.14/zebra/interface.c	2009-07-21 13:11:21.000000000 +0100
++++ quagga-0.99.14-fix-ipremove/zebra/interface.c	2009-08-12 17:04:14.000000000 +0100
+@@ -1293,17 +1293,17 @@
+       return CMD_WARNING;
+     }
+ 
+-#if 0
+   /* Redistribute this information. */
+   zebra_interface_address_delete_update (ifp, ifc);
+ 
+   /* Remove connected route. */
+   connected_down_ipv4 (ifp, ifc);
+ 
++  if_subnet_delete(ifp, ifc);
++
+   /* Free address information. */
+   listnode_delete (ifp->connected, ifc);
+   connected_free (ifc);
+-#endif
+ 
+   return CMD_SUCCESS;
+ }
diff --git a/net-misc/quagga/files/quagga-0.99.17-libcap.patch b/net-misc/quagga/files/quagga-0.99.17-libcap.patch
new file mode 100644
index 000000000000..789197cd3585
--- /dev/null
+++ b/net-misc/quagga/files/quagga-0.99.17-libcap.patch
@@ -0,0 +1,60 @@
+From 63e97633d01908da6d3776ac61e4033e6fa91e5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Sun, 5 Sep 2010 18:19:09 +0200
+Subject: [PATCH] build: fix linking position for libcap
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+ * lib/Makefile.am: link libzebra to libcap, since it uses symbols
+   from there.
+ * zebra/Makefile.am: no need to link libcap here now, since it's not
+   used directly (libtool with apply transitive dependencies for
+   static linking).
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
+---
+ lib/Makefile.am   |    2 +-
+ zebra/Makefile.am |    5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 315e919..6e69993 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -18,7 +18,7 @@ BUILT_SOURCES = memtypes.h route_types.h
+ 
+ libzebra_la_DEPENDENCIES = @LIB_REGEX@
+ 
+-libzebra_la_LIBADD = @LIB_REGEX@
++libzebra_la_LIBADD = @LIB_REGEX@ $(LIBCAP)
+ 
+ pkginclude_HEADERS = \
+ 	buffer.h checksum.h command.h filter.h getopt.h hash.h \
+diff --git a/zebra/Makefile.am b/zebra/Makefile.am
+index 542f36f..d09a209 100644
+--- a/zebra/Makefile.am
++++ b/zebra/Makefile.am
+@@ -5,7 +5,6 @@ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
+ INSTALL_SDATA=@INSTALL@ -m 600
+ 
+ LIB_IPV6 = @LIB_IPV6@
+-LIBCAP = @LIBCAP@
+ 
+ ipforward = @IPFORWARD@
+ if_method = @IF_METHOD@
+@@ -39,9 +38,9 @@ noinst_HEADERS = \
+ 	connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \
+ 	interface.h ipforward.h irdp.h router-id.h kernel_socket.h
+ 
+-zebra_LDADD = $(otherobj) $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la
++zebra_LDADD = $(otherobj) ../lib/libzebra.la $(LIB_IPV6)
+ 
+-testzebra_LDADD = $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la
++testzebra_LDADD = ../lib/libzebra.la $(LIB_IPV6)
+ 
+ zebra_DEPENDENCIES = $(otherobj)
+ 
+-- 
+1.7.2.2
+
diff --git a/net-misc/quagga/files/quagga-services.init b/net-misc/quagga/files/quagga-services.init
new file mode 100644
index 000000000000..0e5aff1d5b3c
--- /dev/null
+++ b/net-misc/quagga/files/quagga-services.init
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/quagga-services.init,v 1.1 2010/09/05 17:09:37 flameeyes Exp $
+
+depend() {
+    need zebra
+}
+
+start() {
+    if [ ! -e /etc/quagga/${SVCNAME}.conf ] ; then
+        eerror "Before starting ${SVCNAME} you have to configure it, by creating"
+        eerror "a /etc/quagga/${SVCNAME}.conf file."
+        eerror ""
+        eerror "A sample file has been installed in `ls /usr/share/doc/quagga-*/samples/${SVCNAME}.conf.sample`"
+        return 1
+    fi
+
+    if [ ! -d /var/run/quagga ] ; then
+        mkdir -p /var/run/quagga
+        chown quagga:quagga /var/run/quagga
+        chmod 0750 /var/run/quagga
+    fi
+
+    ebegin "Starting ${SVCNAME}"
+    start-stop-daemon \
+        --start --exec /usr/sbin/${SVCNAME} \
+        --pidfile /var/run/quagga/${SVCNAME}.pid \
+	-- -d -f /etc/quagga/${SVCNAME}.conf ${EXTRA_OPTS} \
+	--pid_file /var/run/quagga/${SVCNAME}.pid
+
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${SVCNAME}"
+    start-stop-daemon --stop \
+        --pidfile /var/run/quagga/${SVCNAME}.pid
+    eend $?
+}
diff --git a/net-misc/quagga/files/zebra.init.2 b/net-misc/quagga/files/zebra.init.2
new file mode 100644
index 000000000000..bdc9cc886fd9
--- /dev/null
+++ b/net-misc/quagga/files/zebra.init.2
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/zebra.init.2,v 1.1 2010/09/05 17:09:37 flameeyes Exp $
+
+depend() {
+    need net
+}
+
+start() {
+    if [ ! -e /etc/quagga/${SVCNAME}.conf ] ; then
+        eerror "Before starting ${SVCNAME} you have to configure it, by creating"
+        eerror "a /etc/quagga/${SVCNAME}.conf file."
+        eerror ""
+        eerror "A sample file has been installed in `ls /usr/share/doc/quagga-*/samples/${SVCNAME}.conf.sample`"
+        return 1
+    fi
+
+    if [ ! -d /var/run/quagga ] ; then
+        mkdir -p /var/run/quagga
+        chown quagga:quagga /var/run/quagga
+        chmod 0750 /var/run/quagga
+    fi
+
+    ebegin "Cleaning up stale zebra routes..."
+    ip route flush proto zebra
+    eend $?
+
+    ebegin "Starting ${SVCNAME}"
+    start-stop-daemon \
+        --start --exec /usr/sbin/${SVCNAME} \
+        --pidfile /var/run/quagga/${SVCNAME}.pid \
+	-- -d -f /etc/quagga/${SVCNAME}.conf ${EXTRA_OPTS} \
+	--pid_file /var/run/quagga/${SVCNAME}.pid
+
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${SVCNAME}"
+    start-stop-daemon --stop \
+        --pidfile /var/run/quagga/${SVCNAME}.pid
+    eend $?
+}
diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml
index c3ffc9a3a2bc..d856f92661f4 100644
--- a/net-misc/quagga/metadata.xml
+++ b/net-misc/quagga/metadata.xml
@@ -6,14 +6,47 @@
     <email>mrness@gentoo.org</email>
     <description>Primary Maintainer (until Amir returns...)</description>
   </maintainer>
-  <longdescription>Quagga is a modern fork of Zebra. Quagga is a routing software package that provides TCP/IP based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, BGP-4, and BGP-4+ (*note Supported RFC::). Quagga also supports special BGP Route Reflector and Route Server behavior.  In addition to traditional IPv4 routing protocols, Quagga also supports IPv6 routing protocols. With SNMP daemon which supports SMUX protocol, Quagga provides routing protocol MIBs (*note SNMP Support::). Furthermore Quagga supports OSPFAPI (*note OSPFAPI Support::), a API interface to the OSPF LSDB. It supports inspection as well as injection of normal and opaque OSPF LSAs. Applications like SRRD - The Service Rounting Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF routing domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood service state information into the routing domain.</longdescription>
+  <maintainer>
+    <email>flameeyes@gmail.com</email>
+  </maintainer>
+  <longdescription>
+    Quagga is a modern fork of Zebra. Quagga is a routing software package that provides TCP/IP
+    based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2,
+    OSPFv3, BGP-4, and BGP-4+ (*note Supported RFC::). Quagga also supports special BGP Route
+    Reflector and Route Server behavior.  In addition to traditional IPv4 routing protocols, Quagga
+    also supports IPv6 routing protocols. With SNMP daemon which supports SMUX protocol, Quagga
+    provides routing protocol MIBs (*note SNMP Support::). Furthermore Quagga supports OSPFAPI
+    (*note OSPFAPI Support::), a API interface to the OSPF LSDB. It supports inspection as well as
+    injection of normal and opaque OSPF LSAs. Applications like SRRD - The Service Rounting
+    Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF routing
+    domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood service
+    state information into the routing domain.
+  </longdescription>
   <use>
-    <flag name="bgpclassless">Enable classless prefixes for BGP</flag>
-    <flag name="fix-connected-rt">Remove interface connected routes from kernel table on link loss so that no packets get routed to downed interface</flag>
-    <flag name="multipath">Enable multipath routes support for any number of routes</flag>
-    <flag name="ospfapi">Enable OSPFAPI support for client applications accessing the OSPF link state database</flag>
-    <flag name="realms">Enable realms support (see http://vcalinus.gemenii.ro/quaggarealms.html)</flag>
-    <flag name="tcpmd5">Enable TCP MD5 checksumming</flag>
-    <flag name="tcp-zebra">Enable TCP zserv interface on port 2600 for Zebra/protocol-daemon communication. Unix domain sockets are chosen otherwise.</flag>
+    <flag name="bgpclassless">
+      Apply unofficial patch to enable classless prefixes for BGP. Patch and information to be found
+      at http://hasso.linux.ee/doku.php/english:network:quagga
+    </flag>
+    <flag name="fix-connected-rt">
+      Remove interface connected routes from kernel table on link loss so that no packets get routed
+      to downed interface
+    </flag>
+    <flag name="multipath">
+      Enable multipath routes support for any number of routes
+    </flag>
+    <flag name="ospfapi">
+      Enable OSPFAPI support for client applications accessing the OSPF link state database
+    </flag>
+    <flag name="realms">
+      Apply unofficial patch to enable realms support. Patch and information to be found at
+      http://vcalinus.gemenii.ro/quaggarealms.html and http://linux.mantech.ro/quagga+realm_en.php
+    </flag>
+    <flag name="tcpmd5">
+      Enable TCP MD5 checksumming
+    </flag>
+    <flag name="tcp-zebra">
+      Enable TCP zserv interface on port 2600 for Zebra/protocol-daemon communication. Unix domain
+      sockets are chosen otherwise.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/net-misc/quagga/quagga-0.99.13.ebuild b/net-misc/quagga/quagga-0.99.13.ebuild
deleted file mode 100644
index e21650a93543..000000000000
--- a/net-misc/quagga/quagga-0.99.13.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.13.ebuild,v 1.1 2009/06/23 21:12:04 mrness Exp $
-
-EAPI="2"
-
-inherit eutils multilib autotools
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
-HOMEPAGE="http://quagga.net/"
-SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20090623.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
-IUSE="caps ipv6 snmp pam pcre bgpclassless ospfapi realms multipath tcp-zebra"
-RESTRICT="userpriv"
-
-COMMON_DEPEND="sys-libs/readline
-	caps? ( sys-libs/libcap )
-	snmp? ( net-analyzer/net-snmp )
-	pam? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/libtool-2.2.4"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2"
-
-src_prepare() {
-	epatch "${WORKDIR}/patch/${P}-ipaddr-bug486.diff"
-	epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
-	epatch "${WORKDIR}/patch/${P}-libpcre.patch"
-
-	# Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
-	use bgpclassless && epatch "${WORKDIR}/patch/ht-20040304-classless-bgp_adapted.patch"
-
-	# Realms support (Calin Velea) - http://vcalinus.gemenii.ro/quaggarealms.html
-	use realms && epatch "${WORKDIR}/patch/${P}-realms.diff"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--disable-static \
-		$(use_enable caps capabilities) \
-		$(use_enable snmp) \
-		$(use_with pam libpam) \
-		$(use_enable pcre pcreposix) \
-		$(use_enable tcp-zebra)"
-	use ipv6 \
-			&& myconf="${myconf} --enable-ipv6 --enable-ripngd --enable-ospf6d --enable-rtadv" \
-			|| myconf="${myconf} --disable-ipv6 --disable-ripngd --disable-ospf6d"
-	use ospfapi \
-			&& myconf="${myconf} --enable-opaque-lsa --enable-ospf-te --enable-ospfclient"
-	use realms && myconf="${myconf} --enable-realms"
-	use multipath && myconf="${myconf} --enable-multipath=0"
-
-	econf \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quagga \
-		--with-cflags="${CFLAGS}" \
-		--enable-vtysh \
-		--sysconfdir=/etc/quagga \
-		--enable-exampledir=/etc/quagga/samples \
-		--localstatedir=/var/run/quagga \
-		--libdir=/usr/$(get_libdir)/quagga \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_install() {
-	einstall \
-		localstatedir="${D}/var/run/quagga" \
-		sysconfdir="${D}/etc/quagga" \
-		exampledir="${D}/etc/quagga/samples" \
-		libdir="${D}/usr/$(get_libdir)/quagga" || die "make install failed"
-
-	dodir /var/run/quagga || die "failed to install /var/run/quagga"
-
-	local i MY_SERVICES_LIST="zebra ripd ospfd bgpd"
-	use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d"
-	for i in ${MY_SERVICES_LIST} ; do
-		newinitd "${FILESDIR}/${i}.init" ${i} || die "failed to install ${i} init.d script"
-	done
-	newconfd "${FILESDIR}/zebra.conf" zebra || die "failed to install zebra conf.d script"
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/quagga.pam" quagga || die "failed to install pam.d file"
-	fi
-
-	newenvd "${FILESDIR}/quagga.env" 99quagga || die "failed to install env file"
-}
-
-pkg_preinst() {
-	enewgroup quagga
-	enewuser quagga -1 -1 /var/empty quagga
-}
-
-pkg_postinst() {
-	# empty dir for pid files for the new priv separation auth
-	#set proper owner/group/perms even if dir already existed
-	install -d -m0770 -o root -g quagga "${ROOT}/etc/quagga"
-	install -d -m0755 -o quagga -g quagga "${ROOT}/var/run/quagga"
-
-	einfo "Sample configuration files can be found in /etc/quagga/samples."
-	einfo "You have to create config files in /etc/quagga before"
-	einfo "starting one of the daemons."
-}
diff --git a/net-misc/quagga/quagga-0.99.14.ebuild b/net-misc/quagga/quagga-0.99.14.ebuild
deleted file mode 100644
index 73a941727c2d..000000000000
--- a/net-misc/quagga/quagga-0.99.14.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.14.ebuild,v 1.1 2009/08/16 12:10:11 mrness Exp $
-
-EAPI="2"
-
-inherit eutils multilib autotools
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
-HOMEPAGE="http://quagga.net/"
-SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20090816.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
-IUSE="caps doc ipv6 snmp pam pcre bgpclassless ospfapi realms multipath tcp-zebra"
-RESTRICT="userpriv"
-
-COMMON_DEPEND="sys-libs/readline
-	caps? ( sys-libs/libcap )
-	snmp? ( net-analyzer/net-snmp )
-	pam? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/libtool-2.2.4"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2"
-
-src_prepare() {
-	epatch "${WORKDIR}/patch/${P}-ipaddr-bug486.diff"
-	epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
-	epatch "${WORKDIR}/patch/${P}-libpcre.patch"
-
-	# Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
-	use bgpclassless && epatch "${WORKDIR}/patch/ht-20040304-classless-bgp_adapted.patch"
-
-	# Realms support (Calin Velea) - http://vcalinus.gemenii.ro/quaggarealms.html
-	use realms && epatch "${WORKDIR}/patch/${P}-realms.diff"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--disable-static \
-		$(use_enable caps capabilities) \
-		$(use_enable snmp) \
-		$(use_with pam libpam) \
-		$(use_enable pcre pcreposix) \
-		$(use_enable tcp-zebra)
-		$(use_enable doc)"
-	use ipv6 \
-			&& myconf="${myconf} --enable-ipv6 --enable-ripngd --enable-ospf6d --enable-rtadv" \
-			|| myconf="${myconf} --disable-ipv6 --disable-ripngd --disable-ospf6d"
-	use ospfapi \
-			&& myconf="${myconf} --enable-opaque-lsa --enable-ospf-te --enable-ospfclient"
-	use realms && myconf="${myconf} --enable-realms"
-	use multipath && myconf="${myconf} --enable-multipath=0"
-
-	econf \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quagga \
-		--with-cflags="${CFLAGS}" \
-		--enable-vtysh \
-		--sysconfdir=/etc/quagga \
-		--enable-exampledir=/etc/quagga/samples \
-		--localstatedir=/var/run/quagga \
-		--libdir=/usr/$(get_libdir)/quagga \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_install() {
-	einstall \
-		localstatedir="${D}/var/run/quagga" \
-		sysconfdir="${D}/etc/quagga" \
-		exampledir="${D}/etc/quagga/samples" \
-		libdir="${D}/usr/$(get_libdir)/quagga" || die "make install failed"
-
-	dodir /var/run/quagga || die "failed to install /var/run/quagga"
-
-	local i MY_SERVICES_LIST="zebra ripd ospfd bgpd"
-	use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d"
-	for i in ${MY_SERVICES_LIST} ; do
-		newinitd "${FILESDIR}/${i}.init" ${i} || die "failed to install ${i} init.d script"
-	done
-	newconfd "${FILESDIR}/zebra.conf" zebra || die "failed to install zebra conf.d script"
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/quagga.pam" quagga || die "failed to install pam.d file"
-	fi
-
-	newenvd "${FILESDIR}/quagga.env" 99quagga || die "failed to install env file"
-}
-
-pkg_preinst() {
-	enewgroup quagga
-	enewuser quagga -1 -1 /var/empty quagga
-}
-
-pkg_postinst() {
-	# empty dir for pid files for the new priv separation auth
-	#set proper owner/group/perms even if dir already existed
-	install -d -m0770 -o root -g quagga "${ROOT}/etc/quagga"
-	install -d -m0755 -o quagga -g quagga "${ROOT}/var/run/quagga"
-
-	einfo "Sample configuration files can be found in /etc/quagga/samples."
-	einfo "You have to create config files in /etc/quagga before"
-	einfo "starting one of the daemons."
-}
diff --git a/net-misc/quagga/quagga-0.99.15.ebuild b/net-misc/quagga/quagga-0.99.15.ebuild
deleted file mode 100644
index 0e962f4adaa3..000000000000
--- a/net-misc/quagga/quagga-0.99.15.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.15.ebuild,v 1.1 2009/08/30 08:13:41 mrness Exp $
-
-EAPI="2"
-
-inherit eutils multilib autotools
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
-HOMEPAGE="http://quagga.net/"
-SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20090830.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
-IUSE="caps doc ipv6 snmp pam pcre bgpclassless ospfapi realms multipath tcp-zebra"
-RESTRICT="userpriv"
-
-COMMON_DEPEND="sys-libs/readline
-	caps? ( sys-libs/libcap )
-	snmp? ( net-analyzer/net-snmp )
-	pam? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/libtool-2.2.4"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2"
-
-src_prepare() {
-	epatch "${WORKDIR}/patch/${P}-ipaddr-bug486.diff"
-	epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
-	epatch "${WORKDIR}/patch/${P}-libpcre.patch"
-
-	# Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
-	use bgpclassless && epatch "${WORKDIR}/patch/ht-20040304-classless-bgp_adapted.patch"
-
-	# Realms support (Calin Velea) - http://vcalinus.gemenii.ro/quaggarealms.html
-	use realms && epatch "${WORKDIR}/patch/${P}-realms.diff"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--disable-static \
-		$(use_enable caps capabilities) \
-		$(use_enable snmp) \
-		$(use_with pam libpam) \
-		$(use_enable pcre pcreposix) \
-		$(use_enable tcp-zebra)
-		$(use_enable doc)"
-	use ipv6 \
-			&& myconf="${myconf} --enable-ipv6 --enable-ripngd --enable-ospf6d --enable-rtadv" \
-			|| myconf="${myconf} --disable-ipv6 --disable-ripngd --disable-ospf6d"
-	use ospfapi \
-			&& myconf="${myconf} --enable-opaque-lsa --enable-ospf-te --enable-ospfclient"
-	use realms && myconf="${myconf} --enable-realms"
-	use multipath && myconf="${myconf} --enable-multipath=0"
-
-	econf \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quagga \
-		--with-cflags="${CFLAGS}" \
-		--enable-vtysh \
-		--sysconfdir=/etc/quagga \
-		--enable-exampledir=/etc/quagga/samples \
-		--localstatedir=/var/run/quagga \
-		--libdir=/usr/$(get_libdir)/quagga \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_install() {
-	einstall \
-		localstatedir="${D}/var/run/quagga" \
-		sysconfdir="${D}/etc/quagga" \
-		exampledir="${D}/etc/quagga/samples" \
-		libdir="${D}/usr/$(get_libdir)/quagga" || die "make install failed"
-
-	dodir /var/run/quagga || die "failed to install /var/run/quagga"
-
-	local i MY_SERVICES_LIST="zebra ripd ospfd bgpd"
-	use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d"
-	for i in ${MY_SERVICES_LIST} ; do
-		newinitd "${FILESDIR}/${i}.init" ${i} || die "failed to install ${i} init.d script"
-	done
-	newconfd "${FILESDIR}/zebra.conf" zebra || die "failed to install zebra conf.d script"
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/quagga.pam" quagga || die "failed to install pam.d file"
-	fi
-
-	newenvd "${FILESDIR}/quagga.env" 99quagga || die "failed to install env file"
-}
-
-pkg_preinst() {
-	enewgroup quagga
-	enewuser quagga -1 -1 /var/empty quagga
-}
-
-pkg_postinst() {
-	# empty dir for pid files for the new priv separation auth
-	#set proper owner/group/perms even if dir already existed
-	install -d -m0770 -o root -g quagga "${ROOT}/etc/quagga"
-	install -d -m0755 -o quagga -g quagga "${ROOT}/var/run/quagga"
-
-	einfo "Sample configuration files can be found in /etc/quagga/samples."
-	einfo "You have to create config files in /etc/quagga before"
-	einfo "starting one of the daemons."
-}
diff --git a/net-misc/quagga/quagga-0.99.17.ebuild b/net-misc/quagga/quagga-0.99.17.ebuild
new file mode 100644
index 000000000000..b0f90ba92b1a
--- /dev/null
+++ b/net-misc/quagga/quagga-0.99.17.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.17.ebuild,v 1.1 2010/09/05 17:09:36 flameeyes Exp $
+
+EAPI="2"
+
+CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
+REALMS_PATCH=quagga-0.99.14-realms-test2.diff
+
+inherit eutils multilib autotools pam
+
+DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
+HOMEPAGE="http://quagga.net/"
+SRC_URI="http://www.quagga.net/download/${P}.tar.gz
+	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )
+	realms? ( http://linux.mantech.ro/download/quagga/${REALMS_PATCH} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+IUSE="caps doc ipv6 snmp pam bgpclassless ospfapi realms multipath tcp-zebra elibc_glibc"
+
+COMMON_DEPEND="sys-libs/readline
+	caps? ( sys-libs/libcap )
+	snmp? ( net-analyzer/net-snmp )
+	pam? ( sys-libs/pam )
+	!elibc_glibc? ( dev-libs/libpcre )"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/libtool-2.2.4"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2"
+
+pkg_setup() {
+	enewgroup quagga
+	enewuser quagga -1 -1 /var/empty quagga
+}
+
+src_prepare() {
+	# https://bugzilla.quagga.net/show_bug.cgi?id=486
+	epatch "${FILESDIR}/${PN}-0.99.14-fix-ipremove.patch"
+
+	epatch "${FILESDIR}/${P}-libcap.patch"
+
+	# Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
+	use bgpclassless && epatch "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
+
+	# Realms support (Calin Velea) - http://vcalinus.gemenii.ro/quaggarealms.html
+	use realms && epatch "${DISTDIR}/${REALMS_PATCH}"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--disable-static \
+		$(use_enable caps capabilities) \
+		$(use_enable snmp) \
+		$(use_with pam libpam) \
+		$(use_enable !elibc_glibc pcreposix) \
+		$(use_enable tcp-zebra)
+		$(use_enable doc)"
+	use ipv6 \
+			&& myconf="${myconf} --enable-ipv6 --enable-ripngd --enable-ospf6d --enable-rtadv" \
+			|| myconf="${myconf} --disable-ipv6 --disable-ripngd --disable-ospf6d"
+	use ospfapi \
+			&& myconf="${myconf} --enable-opaque-lsa --enable-ospf-te --enable-ospfclient"
+	use realms && myconf="${myconf} --enable-realms"
+	use multipath && myconf="${myconf} --enable-multipath=0"
+
+	econf \
+		--enable-user=quagga \
+		--enable-group=quagga \
+		--enable-vty-group=quagga \
+		--with-cflags="${CFLAGS}" \
+		--enable-vtysh \
+		--sysconfdir=/etc/quagga \
+		--enable-exampledir=/usr/share/doc/${PF}/samples \
+		--localstatedir=/var/run/quagga \
+		--libdir=/usr/$(get_libdir)/quagga \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	keepdir /etc/quagga || die
+	fowners root:quagga /etc/quagga || die
+	fperms 0770 /etc/quagga || die
+
+	newinitd "${FILESDIR}"/zebra.init.2 zebra || die
+
+	# install ripd as a file, symlink the rest
+	newinitd "${FILESDIR}"/quagga-services.init ripd || die
+
+	for service in ospfd bgpd $(use ipv6 && echo ripngd ospf6d); do
+		ln -s ripd "${D}"/etc/init.d/${service} || die
+	done
+
+	newpamd "${FILESDIR}/quagga.pam" quagga
+}
+
+pkg_postinst() {
+	elog "Sample configuration files can be found in /usr/share/doc/${PF}/samples"
+	elog "You have to create config files in /etc/quagga before"
+	elog "starting one of the daemons."
+	elog ""
+	elog "You can pass additional options to the daemon by setting the EXTRA_OPTS"
+	elog "variable in their respective file in /etc/conf.d"
+}