aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-11-02 08:46:37 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-11-02 08:46:37 +0000
commit20522c451759ae7fa6ed68bd2fd3ba25cfac4846 (patch)
tree019d5a5f99a7750aa8bfac9e4d4b8d80d6c80630
parent792c777b949dee1c43b140da4b11c9b4d7848435 (diff)
downloadaports-20522c451759ae7fa6ed68bd2fd3ba25cfac4846.tar.bz2
aports-20522c451759ae7fa6ed68bd2fd3ba25cfac4846.tar.xz
main/opennhrp: upgrade to 0.11.3
-rw-r--r--main/opennhrp/0001-peer-handle-dns-lookup-failure-properly.patch42
-rw-r--r--main/opennhrp/APKBUILD8
2 files changed, 3 insertions, 47 deletions
diff --git a/main/opennhrp/0001-peer-handle-dns-lookup-failure-properly.patch b/main/opennhrp/0001-peer-handle-dns-lookup-failure-properly.patch
deleted file mode 100644
index c816d2d91e..0000000000
--- a/main/opennhrp/0001-peer-handle-dns-lookup-failure-properly.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 10a70c0fabdc3a90840a3ede5ef47480b82ce425 Mon Sep 17 00:00:00 2001
-From: Timo Teras <timo.teras@iki.fi>
-Date: Wed, 14 Oct 2009 13:21:39 +0300
-Subject: [PATCH] peer: handle dns lookup failure properly
-
----
- nhrp/nhrp_peer.c | 16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/nhrp/nhrp_peer.c b/nhrp/nhrp_peer.c
-index fdeef17..aee2906 100644
---- a/nhrp/nhrp_peer.c
-+++ b/nhrp/nhrp_peer.c
-@@ -679,17 +679,17 @@ static void nhrp_peer_address_query_cb(struct nhrp_address_query *query,
- address_query);
- char host[64];
-
-- if (num_addr <= 0) {
-+ if (num_addr > 0) {
-+ nhrp_info("Resolved '%s' as %s",
-+ peer->nbma_hostname,
-+ nhrp_address_format(&addrs[0], sizeof(host), host));
-+ peer->next_hop_address = addrs[0];
-+ peer->afnum = nhrp_afnum_from_pf(peer->next_hop_address.type);
-+ nhrp_peer_run_up_script(peer);
-+ } else {
- nhrp_error("Failed to resolve '%s'", peer->nbma_hostname);
- nhrp_peer_restart_error(peer);
- }
--
-- nhrp_info("Resolved '%s' as %s",
-- peer->nbma_hostname,
-- nhrp_address_format(&addrs[0], sizeof(host), host));
-- peer->next_hop_address = addrs[0];
-- peer->afnum = nhrp_afnum_from_pf(peer->next_hop_address.type);
-- nhrp_peer_run_up_script(peer);
- }
-
- static void nhrp_peer_restart_cb(struct ev_timer *w, int revents)
---
-1.6.5
-
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index 6fedf05fdb..968de7866f 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=opennhrp
-pkgver=0.11.2
-pkgrel=3
+pkgver=0.11.3
+pkgrel=0
pkgdesc="NBMA Next Hop Resolution Protocol daemon"
url="http://sourceforge.net/projects/opennhrp"
license="GPL-3"
@@ -10,7 +10,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-peer-handle-dns-lookup-failure-properly.patch
$pkgname.initd
$pkgname.confd
"
@@ -28,8 +27,7 @@ build() {
install -Dm755 "$srcdir"/opennhrp.initd "$pkgdir"/etc/init.d/opennhrp
install -Dm644 "$srcdir"/opennhrp.confd "$pkgdir"/etc/conf.d/opennhrp
}
-md5sums="3aace509ac79acbde3bb3e44e88798d5 opennhrp-0.11.2.tar.bz2
+md5sums="6f6f8571ccc0a9f97e52c6240fe9002a opennhrp-0.11.3.tar.bz2
f81539fc92800bb79668dda119a97d1d opennhrp-0.9.3-peer-up-bgp.patch
-7d4c31dbde10340eb0e053ae7804bf1e 0001-peer-handle-dns-lookup-failure-properly.patch
ae65f88ccf849ef882669a8b4f0c7fc0 opennhrp.initd
8eee86233728dc0d156bbfee6d98f338 opennhrp.confd"