Hello community, here is the log from the commit of package quagga for openSUSE:Factory checked in at 2012-08-12 15:28:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quagga (Old) and /work/SRC/openSUSE:Factory/.quagga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quagga", Maintainer is "boy...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/quagga/quagga.changes 2012-01-09 15:21:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.quagga.new/quagga.changes 2012-08-12 15:28:09.000000000 +0200 @@ -1,0 +2,35 @@ +Thu Aug 9 11:30:56 UTC 2012 - mrueck...@suse.de + +- Update to 0.99.21 + There are some major user-visible changes: + [bgpd] BGP multipath support has been merged + [bgpd] SAFI (Multicast topology) support has been extended to + propagate the topology to zebra. + [bgpd] AS path limit functionality has been removed + [babeld] a new routing daemon implementing the BABEL ad-hoc mesh + routing protocol has been merged. + [isisd] a major overhaul has been picked up. Please note that + isisd is STILL NOT SUITABLE FOR PRODUCTION USE. + [*] a lot of bugs have been fixed, please refer to the git log + The number of bugfixes and changes in this release is quite large + at 446 commits, though some commits are counted twice due to a + merge of Denis + Ovsienko's RE branch some time ago. (Previous releases had around + 50 commits each.) +- additional changes from 0.99.20.1 + This is a security-fix release that addresses 3 pending CVEs, one + in bgpd and two in ospfd. The CVEs will be linked once released. +- added quagga-0.99.21_isis_undefined_operations.patch: + fix compiler warning about undefined operations +- a47c5838e9f445ab887ad927706b11ccbb181364.patch + Fix typo in isis topology code. Taken from git. +- drop quagga-0.99.20-fix-bgpd-attr-memleak.patch: + Included upstream +- added options to build tcp-zebra, irdp and pcre: + all enabled by default + pcre change might cause problems in edge cases with bgp + new buildrequires: pcre-devel +- added option to build with isis and isis-topology: + disabled by default + +------------------------------------------------------------------- Old: ---- quagga-0.99.20-fix-bgpd-attr-memleak.patch quagga-0.99.20.tar.gz New: ---- a47c5838e9f445ab887ad927706b11ccbb181364.patch quagga-0.99.21.tar.gz quagga-0.99.21_isis_undefined_operations.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quagga.spec ++++++ --- /var/tmp/diff_new_pack.p7h6EE/_old 2012-08-12 15:28:11.000000000 +0200 +++ /var/tmp/diff_new_pack.p7h6EE/_new 2012-08-12 15:28:11.000000000 +0200 @@ -15,10 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +%bcond_without tcp_zebra +%bcond_without irdp +%bcond_with isis +%bcond_with isis_topology +%bcond_without pcre Name: quagga -Version: 0.99.20 +Version: 0.99.21 Release: 1 License: LGPL-2.1+ Summary: Free Routing Software (for BGP, OSPF and RIP, for example) @@ -27,13 +31,16 @@ Source: http://www.quagga.net/download/%{name}-%{version}.tar.gz Source1: %{name}-SUSE.tar.bz2 Source2: %{name}.pam -#this patch will be in a future version, so if we increase version, we don't want this -Patch0: %{name}-%{version}-fix-bgpd-attr-memleak.patch Patch1: %{name}-add-ospf6_main-return-value.patch +Patch2: quagga-0.99.21_isis_undefined_operations.patch +Patch3: a47c5838e9f445ab887ad927706b11ccbb181364.patch BuildRequires: libtool BuildRequires: net-snmp-devel BuildRequires: pam-devel BuildRequires: readline-devel +%if %{with pcre} +BuildRequires: pcre-devel +%endif PreReq: %fillup_prereq PreReq: %insserv_prereq PreReq: %install_info_prereq @@ -68,8 +75,9 @@ %prep %setup -q -a 1 -%patch0 -p 1 %patch1 -p 1 +%patch2 +%patch3 -p 1 %build if ! ls /proc/net/{dev,route,snmp} >/dev/null; then @@ -86,6 +94,21 @@ --enable-ipv6 \ --with-libpam \ --enable-netlink \ + %if %{with isis} + --enable-isisd \ + %endif + %if %{with isis_topology} + --enable-isis-topology \ + %endif + %if %{with tcp_zebra} + --enable-tcp-zebra \ + %endif + %if %{with irdp} + --enable-irdp \ + %endif + %if %{with pcre} + --enable-pcreposix \ + %endif --sysconfdir=%{_sysconfdir}/quagga \ --localstatedir=%{_localstatedir}/run/quagga \ --enable-multipath=0 ++++++ a47c5838e9f445ab887ad927706b11ccbb181364.patch ++++++ commit a47c5838e9f445ab887ad927706b11ccbb181364 Author: David Lamparter <equi...@opensourcerouting.org> Date: Thu Jun 21 09:55:38 2012 +0200 isisd: fix typo in topology generator (BZ#731) There was a "lsp->" missing before "level" in line 2416. (introduced by git commit e38e0df) Reported-by: Seblu <se...@seblu.net> Signed-off-by: David Lamparter <equi...@opensourcerouting.org> diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c index 5c1e993..082e9dc 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c @@ -2413,7 +2413,7 @@ top_lsp_refresh (struct thread *thread) isis_dynhn_insert (lsp->lsp_header->lsp_id, lsp->tlv_data.hostname, IS_LEVEL_1); - lsp->lsp_header->lsp_bits = lsp_bits_generate (level, + lsp->lsp_header->lsp_bits = lsp_bits_generate (lsp->level, lsp->area->overload_bit); rem_lifetime = lsp_rem_lifetime (lsp->area, IS_LEVEL_1); lsp->lsp_header->rem_lifetime = htons (rem_lifetime); ++++++ quagga-0.99.20.tar.gz -> quagga-0.99.21.tar.gz ++++++ ++++ 73858 lines of diff (skipped) ++++++ quagga-0.99.21_isis_undefined_operations.patch ++++++ Index: isisd/isis_routemap.c =================================================================== --- isisd/isis_routemap.c.orig +++ isisd/isis_routemap.c @@ -68,7 +68,7 @@ isis_route_map_upd (const char *name) for (i = 0; i <= ZEBRA_ROUTE_MAX; i++) { if (isis->rmap[i].name) - isis->rmap[i].map = isis->rmap[i].map = + isis->rmap[i].map = route_map_lookup_by_name (isis->rmap[i].name); else isis->rmap[i].map = NULL; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
