aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-09-25 08:43:28 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-09-25 08:45:03 +0000
commit3ef17d0a9a9dd934634a83426a1abeb8cf76711a (patch)
tree651669066df05d5a8a0571d05371c239eeb092e7
parent050e7af13e12b166050838451dac0960e009465d (diff)
downloadaports-3ef17d0a9a9dd934634a83426a1abeb8cf76711a.tar.bz2
aports-3ef17d0a9a9dd934634a83426a1abeb8cf76711a.tar.xz
main/opennhrp: upgrade to 0.11.2
-rw-r--r--main/opennhrp/APKBUILD8
-rw-r--r--main/opennhrp/opennhrp-0.11.1-fix.patch58
2 files changed, 3 insertions, 63 deletions
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index 38ae36d69c..26a2bb1275 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=opennhrp
-pkgver=0.11.1
-pkgrel=2
+pkgver=0.11.2
+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
- opennhrp-0.11.1-fix.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="9cc1e99de2b132591d685eb5f9d70630 opennhrp-0.11.1.tar.bz2
+md5sums="3aace509ac79acbde3bb3e44e88798d5 opennhrp-0.11.2.tar.bz2
f81539fc92800bb79668dda119a97d1d opennhrp-0.9.3-peer-up-bgp.patch
-0e6defecbb3f54814bc3580bb41b0e3f opennhrp-0.11.1-fix.patch
42b7507d5c0025525fd97cd8951f693b opennhrp.initd
8eee86233728dc0d156bbfee6d98f338 opennhrp.confd"
diff --git a/main/opennhrp/opennhrp-0.11.1-fix.patch b/main/opennhrp/opennhrp-0.11.1-fix.patch
deleted file mode 100644
index 0f838a2c34..0000000000
--- a/main/opennhrp/opennhrp-0.11.1-fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-commit c24f2cf55eee9a5aefe27bcb34822a5737f170cf
-Author: Timo Teras <timo.teras@iki.fi>
-Date: Mon Sep 14 08:25:09 2009 +0300
-
- peer: reset both events when script triggers
-
- otherwise we can get same callback twice.
-
-diff --git a/nhrp/nhrp_peer.c b/nhrp/nhrp_peer.c
-index b447784..e5721a5 100644
---- a/nhrp/nhrp_peer.c
-+++ b/nhrp/nhrp_peer.c
-@@ -308,14 +308,16 @@ struct nhrp_peer *nhrp_peer_from_event(union nhrp_peer_event e, int revents)
-
- if (revents & EV_CHILD) {
- peer = container_of(e.child, struct nhrp_peer, child);
-- ev_timer_stop(&peer->timer);
- } else if (revents & EV_TIMEOUT) {
- peer = container_of(e.timer, struct nhrp_peer, timer);
-- ev_child_stop(&peer->child);
- } else {
- NHRP_BUG_ON(revents != 0);
- peer = container_of(e.child, struct nhrp_peer, child);
- }
-+
-+ ev_child_stop(&peer->child);
-+ ev_timer_stop(&peer->timer);
-+
- return peer;
- }
-
-diff --git a/nhrp/nhrp_server.c b/nhrp/nhrp_server.c
-index d928886..ad6e292 100644
---- a/nhrp/nhrp_server.c
-+++ b/nhrp/nhrp_server.c
-@@ -195,13 +195,18 @@ static void nhrp_server_finish_reg(struct nhrp_pending_request *pr)
-
- static void nhrp_server_finish_cie_reg_cb(union nhrp_peer_event e, int revents)
- {
-- struct nhrp_peer *peer = nhrp_peer_from_event(e, revents);
-- struct nhrp_pending_request *pr = peer->request;
-- struct nhrp_packet *packet = pr->packet;
-- struct nhrp_cie *cie = pr->cie;
-+ struct nhrp_peer *peer;
-+ struct nhrp_pending_request *pr;
-+ struct nhrp_packet *packet;
-+ struct nhrp_cie *cie;
- struct nhrp_peer_selector sel;
- char tmp[64], reason[32];
-
-+ peer = nhrp_peer_from_event(e, revents);
-+ pr = peer->request;
-+ packet = pr->packet;
-+ cie = pr->cie;
-+
- peer->request = NULL;
- nhrp_address_format(&peer->protocol_address, sizeof(tmp), tmp);
- if (revents != 0 && nhrp_peer_event_ok(e, revents)) {