From 7aec564399e6b94d84a043ac90dc6e2be2689e0a Mon Sep 17 00:00:00 2001
From: Martin Nagy <mnagy@fedoraproject.org>
Date: Mar 05 2008 20:36:43 +0000
Subject: - fix bpgd IPv6 advertisements, patch from upstream (#429448)


---

diff --git a/quagga-0.99.9-ipv6_advert.patch b/quagga-0.99.9-ipv6_advert.patch
new file mode 100644
index 0000000..6a6a705
--- /dev/null
+++ b/quagga-0.99.9-ipv6_advert.patch
@@ -0,0 +1,12 @@
+diff -up quagga-0.99.9/bgpd/bgp_open.c.ipv6_advert quagga-0.99.9/bgpd/bgp_open.c
+--- quagga-0.99.9/bgpd/bgp_open.c.ipv6_advert	2008-03-05 20:44:20.000000000 +0100
++++ quagga-0.99.9/bgpd/bgp_open.c	2008-03-05 20:44:59.000000000 +0100
+@@ -177,7 +177,7 @@ bgp_capability_mp (struct peer *peer, st
+   peer->afc_recv[mpc.afi][mpc.safi] = 1;
+   
+   if (peer->afc[mpc.afi][mpc.safi])
+-    peer->afc_nego[mpc.safi][mpc.safi] = 1;
++    peer->afc_nego[mpc.afi][mpc.safi] = 1;
+   else 
+     return -1;
+ 
diff --git a/quagga.spec b/quagga.spec
index 7ab7593..a6dc8b4 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -32,7 +32,7 @@
 Summary:    Routing daemon
 Name:		quagga
 Version:	0.99.9
-Release:    3%{?dist}
+Release:    4%{?dist}
 Epoch:      0
 License:	GPL
 Group:      System Environment/Daemons
@@ -41,6 +41,7 @@ Source1:    quagga-filter-perl-requires.sh
 Patch2:		quagga-0.96.5-nostart.patch
 #Patch6:		quagga-0.98.5-pie.patch
 Patch7:		quagga-0.99.9-initscript.patch
+Patch8:		quagga-0.99.9-ipv6_advert.patch
 
 URL:		http://www.quagga.net
 %if %with_snmp
@@ -98,6 +99,7 @@ developing OSPF-API and quagga applications.
 # This creates a .diff file that we apply after configuring
 #%patch6 -p1
 %patch7 -p1 -b .initscript
+%patch8 -p1 -b .ipv6_advert
 
 %build
 # FC5+ automatic -fstack-protector-all switch
@@ -347,6 +349,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Mar 05 2008 Martin Nagy <mnagy@redhat.com> - 0.99.9-6
+- fix bpgd IPv6 advertisements, patch from upstream (#429448)
+
 * Mon Nov 12 2007 Martin Bacovsky <mbacovsk@redhat.com> - 0.99.9-3
 - resolves: #376821: ospfd init script looks for ospf6 configuration and lock file
 - resolves: #376841: Usage string in ospf6d init script incorrect