summaryrefslogtreecommitdiff
path: root/community/quagga
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-06-23 00:01:51 +0000
committerroot <root@rshg054.dnsready.net>2012-06-23 00:01:51 +0000
commit11357a5ab02a7d536375fb8333b2fb67278b4a36 (patch)
treed7fcdafef9843eb4e64b1edb25c5ccbc0cffe8db /community/quagga
parentfb930f28bff4a4b4b37444e3f570904d6db3d06e (diff)
Sat Jun 23 00:01:50 UTC 2012
Diffstat (limited to 'community/quagga')
-rw-r--r--community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch30
-rw-r--r--community/quagga/PKGBUILD13
2 files changed, 38 insertions, 5 deletions
diff --git a/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch b/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
new file mode 100644
index 000000000..dda3c48c4
--- /dev/null
+++ b/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
@@ -0,0 +1,30 @@
+From a47c5838e9f445ab887ad927706b11ccbb181364 Mon Sep 17 00:00:00 2001
+From: David Lamparter <equinox@opensourcerouting.org>
+Date: Thu, 21 Jun 2012 09:55:38 +0200
+Subject: [PATCH] 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 <seblu@seblu.net>
+Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
+---
+ isisd/isis_lsp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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);
+--
+1.7.11
+
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index 0e4ead5f6..68590da61 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 70110 2012-04-29 20:23:17Z seblu $
+# $Id: PKGBUILD 72737 2012-06-21 19:55:00Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
pkgname=quagga
-pkgver=0.99.20.1
+pkgver=0.99.21
pkgrel=1
pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
arch=('i686' 'x86_64')
@@ -14,13 +14,16 @@ backup=()
install=quagga.install
source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
'quagga.rc'
- 'quagga.conf')
-md5sums=('270ddd464407f8ce6fa8ada8bc1abbd7'
+ 'quagga.conf'
+ '0001-isisd-fix-typo-in-topology-generator-BZ-731.patch')
+md5sums=('99840adbe57047c90dfba6b6ed9aec7f'
'71d474228a1e02d698cd24e9fd55ca38'
- '0c4f2dd13c7dac1b73de923d1d5e4e17')
+ '0c4f2dd13c7dac1b73de923d1d5e4e17'
+ 'c80174f7bdd32cd84550d52451e8f495')
build() {
cd $pkgname-$pkgver
+ patch -p 1 -i "$srcdir/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch"
./configure --prefix=/usr --sysconfdir=/etc/quagga --localstatedir=/run/quagga \
--enable-exampledir=/usr/share/doc/quagga/examples \
--enable-vtysh \