Bug#699047: unblock: quagga/0.99.21-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package quagga
(see changelog below)
bye,
-christian-
-=(~/debian/quagga)$ debdiff quagga_0.99.21-3.dsc quagga_0.99.21-4.dsc
diff -Nru quagga-0.99.21/debian/changelog quagga-0.99.21/debian/changelog
--- quagga-0.99.21/debian/changelog 2012-06-08 01:29:47.000000000 +0200
+++ quagga-0.99.21/debian/changelog 2013-01-06 15:58:00.000000000 +0100
@@ -1,3 +1,12 @@
+quagga (0.99.21-4) unstable; urgency=medium
+
+ * Fixed regression bug that caused OSPF "distribute-list" statements to be
+ silently ignored. The patch has already been applied upstream but there
+ has been no new Quagga release since then.
+ Thanks to Hans van Kranenburg for reporting. Closes: #697240
+
+ -- Christian Hammers <ch@debian.org> Sun, 06 Jan 2013 15:50:32 +0100
+
quagga (0.99.21-3) unstable; urgency=high
* SECURITY:
diff -Nru quagga-0.99.21/debian/patches/99_distribute_list.diff quagga-0.99.21/debian/patches/99_distribute_list.diff
--- quagga-0.99.21/debian/patches/99_distribute_list.diff 1970-01-01 01:00:00.000000000 +0100
+++ quagga-0.99.21/debian/patches/99_distribute_list.diff 2013-01-06 15:30:27.000000000 +0100
@@ -0,0 +1,35 @@
+From 1e47fb668d0125cbb6d53f73469093e744164a47 Mon Sep 17 00:00:00 2001
+From: Christian Franke <chris@opensourcerouting.org>
+Date: Tue, 04 Dec 2012 19:31:16 +0000
+Subject: ospfd: fix argument parsing for distribute-list
+
+Use the correct argument for the protocol lookup in
+ospf distribute-list commands.
+
+Signed-off-by: Christian Franke <chris@opensourcerouting.org>
+Signed-off-by: Scott Feldman <sfeldma@cumulusnetworks.com>
+---
+diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
+index 3655cfe..862ef95 100644
+--- a/ospfd/ospf_vty.c
++++ b/ospfd/ospf_vty.c
+@@ -6042,7 +6042,7 @@ DEFUN (ospf_distribute_list_out,
+ int source;
+
+ /* Get distribute source. */
+- source = proto_redistnum(AFI_IP, argv[0]);
++ source = proto_redistnum(AFI_IP, argv[1]);
+ if (source < 0 || source == ZEBRA_ROUTE_OSPF)
+ return CMD_WARNING;
+
+@@ -6061,7 +6061,7 @@ DEFUN (no_ospf_distribute_list_out,
+ struct ospf *ospf = vty->index;
+ int source;
+
+- source = proto_redistnum(AFI_IP, argv[0]);
++ source = proto_redistnum(AFI_IP, argv[1]);
+ if (source < 0 || source == ZEBRA_ROUTE_OSPF)
+ return CMD_WARNING;
+
+--
+cgit v0.9.0.2
diff -Nru quagga-0.99.21/debian/patches/series quagga-0.99.21/debian/patches/series
--- quagga-0.99.21/debian/patches/series 2012-06-08 01:15:26.000000000 +0200
+++ quagga-0.99.21/debian/patches/series 2013-01-06 15:45:54.000000000 +0100
@@ -6,3 +6,4 @@
50_vtysh__vtysh.conf.sample.diff
10_doc__Makefiles__makeinfo-force.diff
99_CVE-2012-1820_bgp_capability_orf.diff
+99_distribute_list.diff
unblock quagga/0.99.21-4
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Reply to: