- upgraded to 0.99.12

Changed files:
    quagga-0.99.11-BGP-4-byte-ASN-bug-fixes.patch -> 1.3
    quagga.spec -> 1.58

diff --git a/quagga-0.99.11-BGP-4-byte-ASN-bug-fixes.patch b/quagga-0.99.11-BGP-4-byte-ASN-bug-fixes.patch
deleted file mode 100644 (file)
index 7ed4b1c..0000000
--- a/quagga-0.99.11-BGP-4-byte-ASN-bug-fixes.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- quagga-0.99.10-stock/bgpd/bgp_aspath.c     2008-04-10 11:47:45.000000000 +0000
-+++ quagga-0.99.10/bgpd/bgp_aspath.c   2009-04-30 20:12:22.000000000 +0000
-@@ -393,25 +393,6 @@ aspath_delimiter_char (u_char type, u_ch
-   return ' ';
- }
- 
--/* countup asns from this segment and index onward */
--static int
--assegment_count_asns (struct assegment *seg, int from)
--{
--  int count = 0;
--  while (seg)
--    {
--      if (!from)
--        count += seg->length;
--      else
--        {
--          count += (seg->length - from);
--          from = 0;
--        }
--      seg = seg->next;
--    }
--  return count;
--}
--
- unsigned int
- aspath_count_confeds (struct aspath *aspath)
- {
-@@ -521,13 +502,23 @@ aspath_count_numas (struct aspath *aspat
-   return num;
- }
- 
-+static char *
-+aspath_expand (char *path,
-+             size_t *space,
-+             size_t needed)
-+{
-+  while (*space < needed)
-+    *space *= 2;
-+  return XREALLOC (MTYPE_AS_STR, path, *space);
-+}
-+
- /* Convert aspath structure to string expression. */
- static char *
- aspath_make_str_count (struct aspath *as)
- {
-   struct assegment *seg;
--  int str_size;
--  int len = 0;
-+  size_t str_size;
-+  size_t len = 0;
-   char *str_buf;
- 
-   /* Empty aspath. */
-@@ -540,18 +531,7 @@ aspath_make_str_count (struct aspath *as
-   
-   seg = as->segments;
-   
--  /* ASN takes 5 chars at least, plus seperator, see below.
--   * If there is one differing segment type, we need an additional
--   * 2 chars for segment delimiters, and the final '\0'.
--   * Hopefully this is large enough to avoid hitting the realloc
--   * code below for most common sequences.
--   *
--   * 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)
--  str_size = MAX (assegment_count_asns (seg, 0) * ASN_STR_LEN + 2 + 1,
--                  ASPATH_STR_DEFAULT_LEN);
-+  str_size = ASPATH_STR_DEFAULT_LEN;
-   str_buf = XMALLOC (MTYPE_AS_STR, str_size);
- 
-   while (seg)
-@@ -575,32 +555,25 @@ aspath_make_str_count (struct aspath *as
-             return NULL;
-         }
-       
--      /* We might need to increase str_buf, particularly if path has
--       * differing segments types, our initial guesstimate above will
--       * have been wrong.  need 5 chars for ASN, a seperator each and
--       * potentially two segment delimiters, plus a space between each
--       * segment and trailing zero.
--       *
--       * This may need to revised if/when significant numbers of
--       * ASNs >= 100000 are assigned and in-use on the internet...
--       */
--#define SEGMENT_STR_LEN(X) (((X)->length * ASN_STR_LEN) + 2 + 1 + 1)
--      if ( (len + SEGMENT_STR_LEN(seg)) > str_size)
--        {
--          str_size = len + SEGMENT_STR_LEN(seg);
--          str_buf = XREALLOC (MTYPE_AS_STR, str_buf, str_size);
--        }
--#undef ASN_STR_LEN
--#undef SEGMENT_STR_LEN
--      
-       if (seg->type != AS_SEQUENCE)
--        len += snprintf (str_buf + len, str_size - len, 
--                       "%c", 
--                         aspath_delimiter_char (seg->type, AS_SEG_START));
-+      {
-+        str_buf = aspath_expand (str_buf,
-+                                 &str_size,
-+                                 len + 2); /* %c + '\0' */
-+        len += snprintf (str_buf + len, str_size - len, 
-+                         "%c", 
-+                         aspath_delimiter_char (seg->type, AS_SEG_START));
-+      }
-       
-       /* write out the ASNs, with their seperators, bar the last one*/
-       for (i = 0; i < seg->length; i++)
-         {
-+#define APPROX_DIGIT_COUNT(x) (x < 100000U ? 5 : 10)
-+        /* %u + %c + %c + " " + '\0' (last two are below loop) */
-+        str_buf = aspath_expand (str_buf,
-+                                 &str_size,
-+                                 len + APPROX_DIGIT_COUNT(seg->as[i]) + 4);
-+                                 
-           len += snprintf (str_buf + len, str_size - len, "%u", seg->as[i]);
-           
-           if (i < (seg->length - 1))

diff --git a/quagga.spec b/quagga.spec
index 2a7801ce3eb5829a0ae5e491903f23e3927fc9d0..dc0f36bed99686957b3459caf6063613df9adabf 100644 (file)
--- a/quagga.spec
+++ b/quagga.spec
@@ -1,12 +1,12 @@
 Summary:       Routing Software Suite
 Summary(pl.UTF-8):     Zestaw oprogramowania do routingu
 Name:          quagga
-Version:       0.99.11
-Release:       3
+Version:       0.99.12
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://www.quagga.net/download/%{name}-%{version}.tar.gz
-# Source0-md5: 903e40c744730ad4d62bee872eeb813b
+# Source0-md5: d2bb513f4ac113dbb300c15a0bd0a241
 Source1:       %{name}.pam
 Source10:      %{name}-zebra.init
 Source11:      %{name}-bgpd.init
@@ -39,7 +39,6 @@ Patch6:               %{name}-largefile.patch
 Patch7:                %{name}-link.patch
 Patch8:                %{name}-view_commands.patch
 Patch9:                %{name}-save_history.patch
-Patch10:       %{name}-0.99.11-BGP-4-byte-ASN-bug-fixes.patch
 Patch11:       %{name}-readline.patch
 URL:           http://www.quagga.net/
 BuildRequires: autoconf >= 2.53
@@ -209,7 +208,6 @@ Statyczne wersje bibliotek quagga.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 %patch11 -p1
 
 %build