diff options
| author | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
|---|---|---|
| committer | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
| commit | 10b8b99e48384b4470cac1330080c12d2ade01de (patch) | |
| tree | 7bb4ad6cd94a2c9a960fd9a4532d123eee5151d5 /main/opennhrp | |
| parent | 9252f1cfd78299b137400ed8169a79f7f833daac (diff) | |
| parent | c6c0b6f9dbde1244e7b31f74c703178a867e873f (diff) | |
| download | aports-to-upstream.tar.bz2 aports-to-upstream.tar.xz | |
Merge remote branch 'upstream/master' into to-upstreamto-upstream
Diffstat (limited to 'main/opennhrp')
| -rw-r--r-- | main/opennhrp/APKBUILD | 8 | ||||
| -rw-r--r-- | main/opennhrp/opennhrp-script-timeout.patch | 13 |
2 files changed, 20 insertions, 1 deletions
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD index 2f0823f0..164b6ccb 100644 --- a/main/opennhrp/APKBUILD +++ b/main/opennhrp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=opennhrp pkgver=0.11.5 -pkgrel=0 +pkgrel=2 pkgdesc="NBMA Next Hop Resolution Protocol daemon" url="http://sourceforge.net/projects/opennhrp" license="GPL-3" @@ -10,6 +10,7 @@ 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-script-timeout.patch $pkgname.initd $pkgname.confd " @@ -23,11 +24,16 @@ build() { sed -i -e 's/-Werror//' Make.rules make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install install -Dm755 "$srcdir"/opennhrp.initd "$pkgdir"/etc/init.d/opennhrp install -Dm644 "$srcdir"/opennhrp.confd "$pkgdir"/etc/conf.d/opennhrp } md5sums="0982ce7c39bd760f0b58161f0883d4ec opennhrp-0.11.5.tar.bz2 f81539fc92800bb79668dda119a97d1d opennhrp-0.9.3-peer-up-bgp.patch +0178b95cba207156263096487b34f4ba opennhrp-script-timeout.patch ae65f88ccf849ef882669a8b4f0c7fc0 opennhrp.initd 8eee86233728dc0d156bbfee6d98f338 opennhrp.confd" diff --git a/main/opennhrp/opennhrp-script-timeout.patch b/main/opennhrp/opennhrp-script-timeout.patch new file mode 100644 index 00000000..f28e01db --- /dev/null +++ b/main/opennhrp/opennhrp-script-timeout.patch @@ -0,0 +1,13 @@ +diff --git a/nhrp/nhrp_peer.c b/nhrp/nhrp_peer.c +index 4bcdd75..fb6c81c 100644 +--- a/nhrp/nhrp_peer.c ++++ b/nhrp/nhrp_peer.c +@@ -21,7 +21,7 @@ + #include "nhrp_peer.h" + #include "nhrp_interface.h" + +-#define NHRP_SCRIPT_TIMEOUT 20 ++#define NHRP_SCRIPT_TIMEOUT 120 + #define NHRP_PEER_FORMAT_LEN 128 + #define NHRP_NEGATIVE_CACHE_TIME (3*60) + #define NHRP_EXPIRY_TIME (5*60) |