Merge branch 'unbound' into next

diff --combined config/rootfiles/common/i586/initscripts
index ee5a4ab6f250a346a07ee800fa0e821c80b786f2,2e50c113a8de38ff2159efa78d24528b7e4b328a..2053bd97a99bc5fc67ebf726e43868755da902fb
--- 1/config/rootfiles/common/i586/initscripts
--- 2/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@@ -27,7 -27,6 +27,6 @@@ etc/rc.d/init.d/consol
  etc/rc.d/init.d/dhcp
  etc/rc.d/init.d/dhcrelay
  #etc/rc.d/init.d/dnsdist
- etc/rc.d/init.d/dnsmasq
  etc/rc.d/init.d/fcron
  #etc/rc.d/init.d/fetchmail
  etc/rc.d/init.d/fireinfo
@@@ -78,7 -77,7 +77,7 @@@ etc/rc.d/init.d/networking/gree
  etc/rc.d/init.d/networking/orange
  etc/rc.d/init.d/networking/red
  #etc/rc.d/init.d/networking/red.down
- etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
+ etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders
  etc/rc.d/init.d/networking/red.down/10-ipsec
  etc/rc.d/init.d/networking/red.down/10-miniupnpd
  etc/rc.d/init.d/networking/red.down/10-ovpn
@@@ -86,7 -85,7 +85,7 @@@ etc/rc.d/init.d/networking/red.down/10-
  etc/rc.d/init.d/networking/red.down/20-firewall
  #etc/rc.d/init.d/networking/red.up
  etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
- etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
+ etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
  etc/rc.d/init.d/networking/red.up/10-miniupnpd
  etc/rc.d/init.d/networking/red.up/10-multicast
  etc/rc.d/init.d/networking/red.up/10-static-routes
@@@ -141,7 -140,6 +140,7 @@@ etc/rc.d/init.d/udev_retr
  etc/rc.d/init.d/upnpd
  #etc/rc.d/init.d/vdr
  #etc/rc.d/init.d/vdradmin
 +#etc/rc.d/init.d/virtlogd
  etc/rc.d/init.d/vnstat
  #etc/rc.d/init.d/vsftpd
  etc/rc.d/init.d/waitdrives

diff --combined config/rootfiles/common/x86_64/initscripts
index ee5a4ab6f250a346a07ee800fa0e821c80b786f2,2e50c113a8de38ff2159efa78d24528b7e4b328a..2053bd97a99bc5fc67ebf726e43868755da902fb
--- 1/config/rootfiles/common/x86_64/initscripts
--- 2/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@@ -27,7 -27,6 +27,6 @@@ etc/rc.d/init.d/consol
  etc/rc.d/init.d/dhcp
  etc/rc.d/init.d/dhcrelay
  #etc/rc.d/init.d/dnsdist
- etc/rc.d/init.d/dnsmasq
  etc/rc.d/init.d/fcron
  #etc/rc.d/init.d/fetchmail
  etc/rc.d/init.d/fireinfo
@@@ -78,7 -77,7 +77,7 @@@ etc/rc.d/init.d/networking/gree
  etc/rc.d/init.d/networking/orange
  etc/rc.d/init.d/networking/red
  #etc/rc.d/init.d/networking/red.down
- etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
+ etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders
  etc/rc.d/init.d/networking/red.down/10-ipsec
  etc/rc.d/init.d/networking/red.down/10-miniupnpd
  etc/rc.d/init.d/networking/red.down/10-ovpn
@@@ -86,7 -85,7 +85,7 @@@ etc/rc.d/init.d/networking/red.down/10-
  etc/rc.d/init.d/networking/red.down/20-firewall
  #etc/rc.d/init.d/networking/red.up
  etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
- etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
+ etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
  etc/rc.d/init.d/networking/red.up/10-miniupnpd
  etc/rc.d/init.d/networking/red.up/10-multicast
  etc/rc.d/init.d/networking/red.up/10-static-routes
@@@ -141,7 -140,6 +140,7 @@@ etc/rc.d/init.d/udev_retr
  etc/rc.d/init.d/upnpd
  #etc/rc.d/init.d/vdr
  #etc/rc.d/init.d/vdradmin
 +#etc/rc.d/init.d/virtlogd
  etc/rc.d/init.d/vnstat
  #etc/rc.d/init.d/vsftpd
  etc/rc.d/init.d/waitdrives

diff --combined lfs/unbound
index 7a11061dae2609de8ba07b6e00834f30dcff32d7,536a4fbe3975b30fc31937e31dcc16ffd1f6cf39..9c8589367d2f8b8979ca4ed01c2bf1f04095d9c3
--- 1/lfs/dnsmasq
--- 2/lfs/unbound
+++ b/lfs/unbound
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
 -# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
 +# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@@ -24,17 -24,14 +24,14 @@@
  
  include Config
  
- VER        = 2.76
+ VER        = 1.5.9
  
- THISAPP    = dnsmasq-$(VER)
- DL_FILE    = $(THISAPP).tar.xz
+ THISAPP    = unbound-$(VER)
+ DL_FILE    = $(THISAPP).tar.gz
  DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  
- # We cannot use INOTIFY because our ISC reader code does not support that
- COPTS      = -DHAVE_ISC_READER -DNO_INOTIFY
- 
  ###############################################################################
  # Top-level Rules
  ###############################################################################
@@@ -43,7 -40,7 +40,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
- $(DL_FILE)_MD5 = 00f5ee66b4e4b7f14538bf62ae3c9461
+ $(DL_FILE)_MD5 = 0cefa62c1690b4db18583db84bff00e3
  
  install : $(TARGET)
  
@@@ -73,32 -70,40 +70,40 @@@ $(subst %,%_MD5,$(objects)) 
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/001-Calculate_length_of_TFTP_error_reply_correctly.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/002-Zero_newly_malloc_ed_memory.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/003-Check_return_of_expand_always.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/004-Fix_editing_error_on_man_page.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/005-Manpage_typo.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/006-Fix_bad_behaviour_with_some_DHCP_option_arrangements.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/007-Fix_logic_error_in_Linux_netlink_code.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/008-Fix_problem_with_--dnssec-timestamp.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/009-malloc_memset_calloc_for_efficiency.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/010-Zero_packet_buffers_before_building_output_to_reduce_risk_of_information_leakage.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/011-Dont_reset_packet_length_on_transmission_in_case_of_retransmission.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/012-Compile-time_check_on_buffer_sizes_for_leasefile_parsing_code.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/013-auth-zone_allow_to_exclude_ip_addresses_from_answer.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/014-Bump_auth_zone_serial_when_reloading_etc_hosts_and_friends.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/015-Handle_v4-mapped_IPv6_addresses_sanely_for_--synth-domain.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/016-Refactor_openBSD_pftables_code_to_remove_blatant_copyright_violation.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch
- 
-       cd $(DIR_APP) && sed -i src/config.h \
-               -e 's|/\* #define HAVE_IDN \*/|#define HAVE_IDN|g' \
-               -e 's|/\* #define HAVE_DNSSEC \*/|#define HAVE_DNSSEC|g' \
-               -e 's|#define HAVE_DHCP|//#define HAVE_DHCP|g' \
-               -e 's|#define HAVE_DHCP6|//#define HAVE_DHCP6|g' \
-               -e 's|#define HAVE_TFTP|//#define HAVE_TFTP|g'
- 
-       cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" COPTS="$(COPTS)" \
-               PREFIX=/usr all install
+       cd $(DIR_APP) && \
+               ./configure \
+                       --prefix=/usr \
+                       --sysconfdir=/etc \
+                       --with-pidfile=/var/run/unbound.pid \
+                       --with-rootkey-file=/var/lib/unbound/root.key \
+                       --disable-static \
+                       --with-libevent
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+ 
+       # Install configuration
+       install -v -m 644 $(DIR_SRC)/config/unbound/unbound.conf \
+               /etc/unbound/unbound.conf
+       touch /etc/unbound/{dhcp-leases,forward}.conf
+       -mkdir -pv /etc/unbound/local.d
+ 
+       # Install root hints
+       install -v -m 644 $(DIR_SRC)/config/unbound/root.hints \
+               /etc/unbound/root.hints
+ 
+       # Install DHCP leases bridge
+       install -v -m 755 $(DIR_SRC)/config/unbound/unbound-dhcp-leases-bridge \
+               /usr/sbin/unbound-dhcp-leases-bridge
+ 
+       # Install key
+       -mkdir -pv /var/lib/unbound
+       install -v -m 644 $(DIR_SRC)/config/unbound/root.key \
+               /var/lib/unbound/root.key
+       chown -Rv nobody.nobody /var/lib/unbound
+ 
+       # Ship ICANN's certificates to validate DNS trust anchors
+       install -v -m 644 $(DIR_SRC)/config/unbound/icannbundle.pem \
+               /etc/unbound/icannbundle.pem
+ 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --combined make.sh
index 1c832d016fd8757fd722cc2a5addb81a0b3f4d42,4b94189867c3190cc5dd34cf55a57e59e3a24139..73feacb37d4945a4292099103c17497c2768d765
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -26,7 -26,7 +26,7 @@@ NAME="IPFire"                                                 # Software nam
  SNAME="ipfire"                                                        # Short name
  VERSION="2.19"                                                        # Version number
  CORE="104"                                                    # Core Level (Filename)
 -PAKFIRE_CORE="103"                                            # Core Level (PAKFIRE)
 +PAKFIRE_CORE="104"                                            # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -537,7 -537,9 +537,9 @@@ buildipfire() 
    ipfiremake beep
    ipfiremake dvdrtools
    ipfiremake nettle
-   ipfiremake dnsmasq
+   ipfiremake libevent
+   ipfiremake libevent2
+   ipfiremake unbound
    ipfiremake dosfstools
    ipfiremake reiserfsprogs
    ipfiremake xfsprogs
@@@ -603,6 -605,9 +605,9 @@@
    ipfiremake python-mechanize
    ipfiremake python-feedparser
    ipfiremake python-rssdler
+   ipfiremake python-inotify
+   ipfiremake python-docutils
+   ipfiremake python-daemon
    ipfiremake glib
    ipfiremake GeoIP
    ipfiremake fwhits
@@@ -678,8 -683,6 +683,6 @@@
    ipfiremake gnump3d
    ipfiremake rsync
    ipfiremake tcpwrapper
-   ipfiremake libevent
-   ipfiremake libevent2
    ipfiremake libtirpc
    ipfiremake rpcbind
    ipfiremake nfs
@@@ -708,7 -711,6 +711,7 @@@
    ipfiremake spice-protocol
    ipfiremake spice
    ipfiremake sdl
 +  ipfiremake libusbredir
    ipfiremake qemu
    ipfiremake sane
    ipfiremake netpbm