packages: quagga/quagga.spec, quagga/quagga-blackhole.patch - readded black...

[gotar]

Author: gotar                        Date: Mon Mar 22 23:03:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- readded blackholing patch (see http://lists.quagga.net/pipermail/quagga-users/2004-October/002892.html)

---- Files affected:
packages/quagga:
   quagga.spec (1.67 -> 1.68) , quagga-blackhole.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/quagga/quagga.spec
diff -u packages/quagga/quagga.spec:1.67 packages/quagga/quagga.spec:1.68
--- packages/quagga/quagga.spec:1.67	Thu Mar 11 10:39:57 2010
+++ packages/quagga/quagga.spec	Tue Mar 23 00:03:04 2010
@@ -36,6 +36,7 @@
 Patch3:		%{name}-link.patch
 Patch4:		%{name}-readline.patch
 Patch5:		%{name}-fix-ipremove.patch
+Patch5:		%{name}-blackhole.patch
 URL:		http://www.quagga.net/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -200,6 +201,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -487,6 +489,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2010/03/22 23:03:04  gotar
+- readded blackholing patch (see http://lists.quagga.net/pipermail/quagga-users/2004-October/002892.html)
+
 Revision 1.67  2010/03/11 09:39:57  lisu
 - updated to 0.99.16
 - GPL v2+ license

================================================================
Index: packages/quagga/quagga-blackhole.patch
diff -u /dev/null packages/quagga/quagga-blackhole.patch:1.3
--- /dev/null	Tue Mar 23 00:03:13 2010
+++ packages/quagga/quagga-blackhole.patch	Tue Mar 23 00:03:04 2010
@@ -0,0 +1,11 @@
+--- quagga-0.98.3/zebra/zebra_rib.c~	2009-12-21 11:40:24.000000000 +0100
++++ quagga-0.98.3/zebra/zebra_rib.c	2010-03-23 00:00:00.000000000 +0100
+@@ -384,6 +384,8 @@ nexthop_active_ipv4 (struct rib *rib, st
+ 		      {
+ 			SET_FLAG (nexthop->flags, NEXTHOP_FLAG_RECURSIVE);
+ 			nexthop->rtype = newhop->type;
++			if (newhop->type == NEXTHOP_TYPE_BLACKHOLE)
++			    nexthop_blackhole_add (rib);
+ 			if (newhop->type == NEXTHOP_TYPE_IPV4 ||
+ 			    newhop->type == NEXTHOP_TYPE_IPV4_IFINDEX)
+ 			  nexthop->rgate.ipv4 = newhop->gate.ipv4;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/quagga/quagga.spec?r1=1.67&r2=1.68&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/quagga/quagga-blackhole.patch?r1=1.2&r2=1.3&f=u