From c61197d935044c9a0a638695a4b118b32214082c Mon Sep 17 00:00:00 2001
From: Jiri Skala <jskala@fedoraproject.org>
Date: Wed, 20 May 2009 12:38:58 +0000
Subject: [PATCH] - update to latest upstream version - fix #499960 - BGPd in
 Quagga prior to 0.99.12 has a serious assert     problem crashing with ASN4's

---
 .cvsignore                 |  2 +-
 quagga-0.99.11-asn32.patch | 12 ------------
 quagga.spec                | 10 ++++++----
 sources                    |  2 +-
 4 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 quagga-0.99.11-asn32.patch

diff --git a/.cvsignore b/.cvsignore
index 60bbfb0..958a3db 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-quagga-0.99.11.tar.gz
+quagga-0.99.12.tar.gz
diff --git a/quagga-0.99.11-asn32.patch b/quagga-0.99.11-asn32.patch
deleted file mode 100644
index cbdf9ff..0000000
--- a/quagga-0.99.11-asn32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up quagga-0.99.11/bgpd/bgp_aspath.c.asn32 quagga-0.99.11/bgpd/bgp_aspath.c
---- quagga-0.99.11/bgpd/bgp_aspath.c.asn32	2009-05-04 14:52:13.000000000 +0200
-+++ quagga-0.99.11/bgpd/bgp_aspath.c	2009-05-04 14:52:24.000000000 +0200
-@@ -549,7 +549,7 @@ aspath_make_str_count (struct aspath *as
-    * With 32bit ASNs, this range will increase, but only worth changing
-    * once there are significant numbers of ASN >= 100000
-    */
--#define ASN_STR_LEN (5 + 1)
-+#define ASN_STR_LEN (10 + 1)
-   str_size = MAX (assegment_count_asns (seg, 0) * ASN_STR_LEN + 2 + 1,
-                   ASPATH_STR_DEFAULT_LEN);
-   str_buf = XMALLOC (MTYPE_AS_STR, str_size);
diff --git a/quagga.spec b/quagga.spec
index 63fe364..39856b5 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -31,8 +31,8 @@
 
 Summary:    Routing daemon
 Name:		quagga
-Version:	0.99.11
-Release:    3%{?dist}
+Version:	0.99.12
+Release:    1%{?dist}
 Epoch:      0
 License:	GPLv2+
 Group:      System Environment/Daemons
@@ -40,7 +40,6 @@ Source0:	http://www.quagga.net/download/%{name}-%{version}.tar.gz
 Source1:    quagga-filter-perl-requires.sh
 Patch2:		quagga-0.96.5-nostart.patch
 Patch7:		quagga-0.99.9-initscript.patch
-Patch8: quagga-0.99.11-asn32.patch
 
 URL:		http://www.quagga.net
 %if %with_snmp
@@ -96,7 +95,6 @@ developing OSPF-API and quagga applications.
 %patch2 -p1 -b .nostart
 # This creates a .diff file that we apply after configuring
 %patch7 -p1 -b .initscript
-%patch8 -p1 -b .asn32
 
 %build
 # FC5+ automatic -fstack-protector-all switch
@@ -347,6 +345,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed May 20 2009 Jiri Skala <jskala@redhat.com> - 0.99.12-1
+- update to latest upstream version
+- fix #499960 - BGPd in Quagga prior to 0.99.12 has a serious assert problem crashing with ASN4's
+
 * Mon May 04 2009 Jiri Skala <jskala@redhat.com> - 0.99.11-3
 - fix #498832 - bgpd crashes on as paths containing more 6 digit as numbers
 - corrected release number
diff --git a/sources b/sources
index a529c6d..234ce1b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-903e40c744730ad4d62bee872eeb813b  quagga-0.99.11.tar.gz
+d2bb513f4ac113dbb300c15a0bd0a241  quagga-0.99.12.tar.gz