main/opennhrp: upgrade to 0.12

2 files changed, 3 insertions, 18 deletions

diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index 164b6ccb83..bd4b40d3bc 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=2
+pkgver=0.12
+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-script-timeout.patch
         $pkgname.initd
         $pkgname.confd
         "
@@ -32,8 +31,7 @@ package() {
         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
+md5sums="864e4253a0673bb6dcd6dd60ae5d69df  opennhrp-0.12.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
deleted file mode 100644
index f28e01db2d..0000000000
--- a/main/opennhrp/opennhrp-script-timeout.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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)