Merge pull request #1150 from hansmi/master

Update net/unbound to version 1.5.3

net/unbound/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2014 OpenWrt.org
+# Copyright (C) 2010-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=unbound
-PKG_VERSION:=1.5.1
+PKG_VERSION:=1.5.3
 PKG_RELEASE:=1
 
 PKG_LICENSE:=BSD-3-Clause
@@ -17,7 +17,7 @@ PKG_MAINTAINER:=Michael Hanselmann <public@hansmi.ch>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.unbound.net/downloads
-PKG_MD5SUM:=ed4c46476dcfb8a507cc08b1ba12a8f1
+PKG_MD5SUM:=1e95fdcbaaf5dc87432d898006a5eb13
 
 PKG_BUILD_DEPENDS:=libexpat
 PKG_BUILD_PARALLEL:=1

net/unbound/patches/001-conf.patch

@@ -1,3 +1,5 @@
+diff --git a/doc/example.conf.in b/doc/example.conf.in
+index 60ed5c8..abd85f9 100644
 --- a/doc/example.conf.in
 +++ b/doc/example.conf.in
 @@ -38,6 +38,8 @@ server:
@@ -66,7 +68,7 @@
  
  	# the time to live (TTL) value lower bound, in seconds. Default 0.
  	# If more than an hour could easily give trouble due to stale data.
-@@ -143,9 +154,11 @@ server:
+@@ -146,9 +157,11 @@ server:
  	# the number of slabs must be a power of 2.
  	# more slabs reduce lock contention, but fragment memory usage.
  	# infra-cache-slabs: 4
@@ -78,7 +80,7 @@
  
  	# Enable IPv4, "yes" or "no".
  	# do-ip4: yes
-@@ -178,6 +191,8 @@ server:
+@@ -181,6 +194,8 @@ server:
  	# access-control: ::0/0 refuse
  	# access-control: ::1 allow
  	# access-control: ::ffff:127.0.0.1 allow
@@ -87,7 +89,7 @@
  
  	# if given, a chroot(2) is done to the given directory.
  	# i.e. you can chroot to the working directory, for example,
-@@ -208,6 +223,7 @@ server:
+@@ -211,6 +226,7 @@ server:
  	# and the given username is assumed. Default is user "unbound".
  	# If you give "" no privileges are dropped.
  	# username: "@UNBOUND_USERNAME@"
@@ -95,7 +97,7 @@
  
  	# the working directory. The relative files in this config are 
  	# relative to this directory. If you give "" the working directory
-@@ -230,10 +246,12 @@ server:
+@@ -233,10 +249,12 @@ server:
  
  	# the pid file. Can be an absolute path outside of chroot/work dir.
  	# pidfile: "@UNBOUND_PIDFILE@"
@@ -108,7 +110,7 @@
  
  	# enable to not answer id.server and hostname.bind queries.
  	# hide-identity: no
-@@ -256,12 +274,15 @@ server:
+@@ -259,12 +277,15 @@ server:
  	#	positive value: fetch that many targets opportunistically.
  	# Enclose the list of numbers between quotes ("").
  	# target-fetch-policy: "3 2 1 0 0"
@@ -124,7 +126,7 @@
  
  	# Harden against out of zone rrsets, to avoid spoofing attempts. 
  	# harden-glue: yes
-@@ -342,7 +363,7 @@ server:
+@@ -345,7 +366,7 @@ server:
  	# you start unbound (i.e. in the system boot scripts).  And enable:
  	# Please note usage of unbound-anchor root anchor is at your own risk
  	# and under the terms of our LICENSE (see that file in the source).
@@ -133,7 +135,7 @@
  
  	# File with DLV trusted keys. Same format as trust-anchor-file.
  	# There can be only one DLV configured, it is trusted from root down.
-@@ -428,15 +449,18 @@ server:
+@@ -431,15 +452,18 @@ server:
  	# the amount of memory to use for the key cache.
  	# plain value in bytes or you can append k, m or G. default is "4Mb". 
  	# key-cache-size: 4m
@@ -149,6 +151,6 @@
  	# plain value in bytes or you can append k, m or G. default is "1Mb". 
  	# neg-cache-size: 1m
 +	neg-cache-size: 10k
- 	
+ 
  	# By default, for a number of zones a small default 'nothing here'
  	# reply is built-in.  Query traffic is thus blocked.  If you