diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2011-12-25 10:48:08 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2011-12-25 10:48:08 +0200 |
| commit | d44b11bae2080fe72cd6081686f9d157699b0201 (patch) | |
| tree | e3f85cd71b6fbf788cfa9cef5ec4ece3728272e5 /main/opennhrp | |
| parent | ce19f4d4cd5878a1951d6fd5f636a6739bcac3e9 (diff) | |
| download | aports-d44b11bae2080fe72cd6081686f9d157699b0201.tar.bz2 aports-d44b11bae2080fe72cd6081686f9d157699b0201.tar.xz | |
main/opennhrp: upgrade to 0.13
Diffstat (limited to 'main/opennhrp')
| -rw-r--r-- | main/opennhrp/0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch | 39 | ||||
| -rw-r--r-- | main/opennhrp/APKBUILD | 8 |
2 files changed, 3 insertions, 44 deletions
diff --git a/main/opennhrp/0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch b/main/opennhrp/0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch deleted file mode 100644 index da1e8ffefa..0000000000 --- a/main/opennhrp/0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3554acce7fec0ce6e7560444c5e3975affb78260 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Tue, 18 Oct 2011 10:56:16 -0400 -Subject: [PATCH] config: really fix holding-time to apply to shortcut-target - -commit 94d1a7d4884346a5ba830ac209e1b746d23ec0c1 was supposed to -fix it, but it didn't fix resetting of the peer variable properly. ---- - nhrp/opennhrp.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/nhrp/opennhrp.c b/nhrp/opennhrp.c -index f2ecd44..0ff34ea 100644 ---- a/nhrp/opennhrp.c -+++ b/nhrp/opennhrp.c -@@ -243,15 +243,16 @@ static int load_config(const char *config_file) - NEED_PEER(); - peer->flags |= NHRP_PEER_FLAG_CISCO; - } else if (strcmp(word, "holding-time") == 0) { -- peer = NULL; - read_word(in, &lineno, sizeof(word), word); - if (peer != NULL && -- peer->type == NHRP_PEER_TYPE_LOCAL_ADDR) -+ peer->type == NHRP_PEER_TYPE_LOCAL_ADDR) { - peer->holding_time = atoi(word); -- else if (iface != NULL) -+ } else if (iface != NULL) { - iface->holding_time = atoi(word); -- else -+ peer = NULL; -+ } else { - rc = 7; -+ } - } else if (strcmp(word, "cisco-authentication") == 0) { - struct nhrp_buffer *buf; - struct nhrp_cisco_authentication_extension *auth; --- -1.7.4.1 - diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD index b2daec0530..9d371354db 100644 --- a/main/opennhrp/APKBUILD +++ b/main/opennhrp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=opennhrp -pkgver=0.12.3 -pkgrel=1 +pkgver=0.13 +pkgrel=0 pkgdesc="NBMA Next Hop Resolution Protocol daemon" url="http://sourceforge.net/projects/opennhrp" arch="all" @@ -11,7 +11,6 @@ makedepends="c-ares-dev" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 opennhrp-0.9.3-peer-up-bgp.patch - 0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch $pkgname.initd $pkgname.confd " @@ -33,8 +32,7 @@ package() { install -Dm755 "$srcdir"/opennhrp.initd "$pkgdir"/etc/init.d/opennhrp install -Dm644 "$srcdir"/opennhrp.confd "$pkgdir"/etc/conf.d/opennhrp } -md5sums="4d0ec7c0282e181ecca4d78e52067da3 opennhrp-0.12.3.tar.bz2 +md5sums="1569a337c5c7dce2d8c117244e9c56a9 opennhrp-0.13.tar.bz2 f81539fc92800bb79668dda119a97d1d opennhrp-0.9.3-peer-up-bgp.patch -884c085eedace7eab4d65ae3a47c4bde 0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch ae65f88ccf849ef882669a8b4f0c7fc0 opennhrp.initd 8eee86233728dc0d156bbfee6d98f338 opennhrp.confd" |