commit 747d6e783b60d67e6f83d3681fe523b2ecb01ed3
Author: David Lamparter <equinox@diac24.net>
Date:   Thu Apr 11 17:18:54 2013 +0200

    release: 0.99.22.1
    
    * configure.ac: Bump to 0.99.22.1

commit d7803b42ab7f1db9c5ce478bf39d933a5ff52f53
Author: Christian Franke <chris@opensourcerouting.org>
Date:   Wed Mar 20 15:28:46 2013 +0000

    ospfd: restore nexthop IP for p2p interfaces
    
    commit c81ee5c... "ospfd: Optimize and improve SPF nexthop calculation"
    subtly changed semantics of routes calculated over pointopoint links by
    removing the nexthop IP address and instead using an ifindex route.
    
    This breaks calculation of AS-Ext routes with a forwarding address since
    in ospf_ase_complete_direct_routes() this will be hit:
        if (op->nexthop.s_addr == 0)
          op->nexthop.s_addr = nexthop.s_addr;
    thus turning the route unusable by having an invalid nexthop.
    
    Fix by restoring the nexthop IP on routes over PtP links.  This also
    allows running multi-access (Ethernet) interfaces in PtP mode again.
    
    This bug is a regression against 0.99.21 and only present in 0.99.22.
    
    Signed-off-by: Christian Franke <chris@opensourcerouting.org>
    [patch description and code comments rewritten]
    Acked-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
    Acked-by: James Li <jli@cumulusnetworks.com>
    Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
    (cherry picked from commit f2b53dac4c72811c06779c596c6162b994eb427a)

commit 7422182868a70d73661e9d8cb33f017c3578d337
Author: Christian Franke <chris@opensourcerouting.org>
Date:   Wed Feb 27 13:47:23 2013 +0000

    lib/vty: register vtysh socket in server socket vector (BZ#754)
    
    Register the vtysh socket in Vvty_serv_thread so it will be
    correctly closed on vty_reset instead of being leaked.
    
    Signed-off-by: Christian Franke <chris@opensourcerouting.org>
    Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
    (cherry picked from commit 677bcbbf153fe73e57cb44f668977cbd26661fd4)

commit 6e266a97ab226b650640909480c19805c0fcc38f
Author: David Lamparter <equinox@opensourcerouting.org>
Date:   Thu Feb 28 22:17:00 2013 +0100

    ripd: correctly redistribute ifindex routes (BZ#664)
    
    ripd had a check to restrict metric 0 to only directly connected routes.
    This check was implemented by checking against Connected as route type.
    This is, however, incorrect -- all routes that directly use an interface
    without a nexthop should be treated as directly connected and passed off
    with metric 0.
    
    ripngd does not posess such a check and was not touched.
    
    Reported-by: Sean Fulton <sean@gcnpublishing.com>
    Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
    (cherry picked from commit b68da446e977f8069fb72bce73402e2234ffc1d9)

commit 55673241bd7fc6368c20e3efbed8fdbef76f2756
Author: David Lamparter <equinox@opensourcerouting.org>
Date:   Fri Mar 1 12:03:58 2013 +0100

    build: reference libcap from libzebra (BZ#393,626)
    
    While the actual build failures have been fixed independently by
    d1d3ac9 "build: reorder libraries to address linker error", libzebra
    still does not reference libcap.  This will lead to more build failures
    if someone else tries to use libzebra and doesn't add libcap.
    
    Let's just add libcap here and be done with it.
    
    I've not added libcap to the _DEPENDENCIES variable above since libcap
    is a system library.  Actually, the whole _DEPENDENCIES thing is rather
    fishy; automake automatically sets _DEPENDENCIES from _LIBADD.  For the
    sake of not breaking stuff that works (especially since most autotools
    stuff is arcane magic), I'm leaving it alone...
    
    Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
    (cherry picked from commit 8df55970b64984e5071afd510caad5e778569bc1)

commit a2b7164836b693758178d1fe81f0c0f79099c812
Author: Christian Franke <chris@opensourcerouting.org>
Date:   Wed Feb 20 10:00:53 2013 +0000

    ospfd: fix LSA initialization for build without opaque LSA
    
    If configured without opaque LSA support, the old code would incorrectly
    associate type 5 LSAs with an area.
    
    Signed-off-by: Christian Franke <chris@opensourcerouting.org>
    Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
    (cherry picked from commit 58952492d2eedd4b7974274a578a1fa9707125bb)

commit 96ba925b2937687448d3a94a7189f68f9f3b4072
Author: David Lamparter <equinox@opensourcerouting.org>
Date:   Sat Feb 23 22:17:21 2013 +0100

    tests: make --disable-bgpd kill bgpd tests too
    
    bgpd tests don't compile or run with --disable-bgpd, let's catch this in
    the Makefile.
    
    Reported-by: Joachim Nilsson <troglobit@gmail.com>
    Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
    (cherry picked from commit c095185c26f72bff14238ca1209ef6b2d7a8b935)

commit 0fb0ed63d895e1b720ac297d654f09b78d2b81e3
Author: David Lamparter <equinox@opensourcerouting.org>
Date:   Wed Feb 27 11:24:24 2013 +0100

    build: fix minimal mixup in gitinfo suffix
    
    the original version of this had issues with tagless repositories; to
    fix that I removed the "-g" part from one of the regexes.  I then failed
    to add those 2 characters back, leading to version numbers like
    "0.99.220123456" instead of "0.99.22-ga123456".  Let's put the "-g"
    back...
    
    Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
    (cherry picked from commit 4a014580ff85428aa41b28503554b2ce982805be)

commit 283304601eec112935be36219622ff8e5c612f02
Author: Timo Teräs <timo.teras@iki.fi>
Date:   Fri Mar 22 08:54:44 2013 +0000

    doc: fix makeinfo errors and one warning
    
    commit 4afa50b added few lines that are syntactically incorrect
    with leading plus sign.
    
    Cc: Denis Ovsienko <infrastation@yandex.ru>
    Signed-off-by: Timo Teräs <timo.teras@iki.fi>
    Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
    (cherry picked from commit b58c90807c9d0bfa9601704c7490a16070906004)

commit 2b4d147e0900877150fab49effce1dfb1d646902
Author: Matti-Oskari Leppänen <mongrelx@gmail.com>
Date:   Fri Feb 15 10:12:55 2013 +0000

    build: update quagga.spec.in
    
    both Quagga and RPM have moved a bit since this was last touched.
    Should now work again on CentOS 5 and 6.
    
    Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
    (cherry picked from commit fa75585d3cac97616de4ea7c6805d91f709456eb)

commit f9b04f43471bc1cbbf28871788e7704ab32a7594
Author: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date:   Sat Feb 23 19:38:37 2013 +0100

    vtysh: fix false lib path matching in extract.pl.in
    
    The if ($file =~ /lib/) path matching logic is supposed to
    match Quagga's lib directory only but will match all path
    having lib in it such as /var/lib/jenkins/quagga/...
    
    Fix by matching both lib and file: lib/keychain.c etc.
    
    Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
    Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
    (cherry picked from commit 844ee10416c42debbfbc4d470eb2fe328e060977)

commit b7a8bdcf047c10ccebccda005bbd696497fd25fb
Author: Roman Hoog Antink <rha@open.ch>
Date:   Fri Jan 18 13:52:03 2013 +0100

    bgpd: fix lost passwords of grouped neighbors
    
    This patch resolves the significance of order of group and password
    statements.
    
    It prevents passwords from being lost in cases where all
    three conditions apply:
      1. the peer is member of a group with or without group password
      2. the peer has an individual password set
      3. the peer is added to a group within an address-family ipv6
         section
    
    In addition this patch prevents the same issue in cases, where an IPv4
    peer's password is set first and the peer is added to a group
    afterwards.
    
    Adding a peer to a group cancels his individual password. Without ipv6
    this is not a problem, because choosing the right order of config
    statements will do (set password only after adding peer to group).
    
    When adding the peer to a group within the address-family
    section, his password is definitely lost. The same workaround (ie.
    setting the password after the address-family section) can not be used,
    because "show run" will print the configuration statements in the wrong
    order.
    
    Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
    (cherry picked from commit 0e4303d3173ecc264b3ec39a863174670bbe2900)