From 01e95707f489bfb491c097d09f4d0155b9679aa6 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 24 Feb 2017 13:50:12 +0000
Subject: [PATCH] community/unbound to 1.6.1-1

---
 community/unbound/PKGBUILD | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index 3db9391af..01733f993 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -7,10 +7,10 @@
 #  - disable LTO (--disable-flto)
 
 pkgname=unbound
-pkgver=1.6.0
-pkgrel=3
+pkgver=1.6.1
+pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
-url='http://unbound.net/'
+url='https://unbound.net/'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
 makedepends=('expat')
@@ -18,12 +18,11 @@ optdepends=('expat: unbound-anchor')
 depends=('openssl' 'ldns' 'libevent' 'dnssec-anchors')
 backup=('etc/unbound/unbound.conf')
 validpgpkeys=('EDFAA3F2CA4E6EB05681AF8E9F6F1C2D7E045F8D')
-source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"{,.asc}
+source=("https://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"{,.asc}
         'service'
         'hook'
         'conf')
-sha1sums=('9b7606b016b447dc837efc108cee94f3fecf4ede'
-          'SKIP'
+sha1sums=('41369fcfd37844b02b7293b37ec78e69f0db34c7' 'SKIP'
           'b543ae6f8b87423bec095fca6b335a9ee43739a8'
           '098d680a06e730330e3ccbdd58234d07ad1837dc'
           '98515708441cb831890a0b6d1986fd40649646c0')
@@ -33,18 +32,22 @@ install=install
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
+	# Build against embedded flex instead of system one, see:
+	# https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=1223
+	export LEX=:
+
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--sbindir=/usr/bin \
 		--disable-rpath \
-		--with-libevent \
-		--with-rootkey-file=/etc/trusted-key.key \
+		--enable-pie \
+		--enable-relro-now \
 		--with-conf-file=/etc/unbound/unbound.conf \
 		--with-pidfile=/run/unbound.pid \
-		--enable-relro-now \
-		--enable-pie \
+		--with-rootkey-file=/etc/trusted-key.key \
+		--with-libevent \
 		--disable-flto
 
 	make