[notify] dnsmasq: build with DNSSEC support, new dependency nettle

5 files changed, 29 insertions, 27 deletions

diff --git a/dnsmasq/.footprint b/dnsmasq/.footprint
index c2683986f..4a41553f9 100644
--- a/dnsmasq/.footprint
+++ b/dnsmasq/.footprint
@@ -6,6 +6,8 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/dnsmasq
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/dnsmasq/
+-rw-r--r--	root/root	usr/share/dnsmasq/trust-anchors.conf
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/dnsmasq.8.gz
diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum
index 736c95422..415adc805 100644
--- a/dnsmasq/.md5sum
+++ b/dnsmasq/.md5sum
@@ -1,3 +1,3 @@
 cf2b6cff8356ce9da3f6da7dfa0e588b  dnsmasq
 64010c9734f5e275eb591374a6dad924  dnsmasq-2.79.tar.xz
-21befd927fdef41cb6cb920e910ae258  dnsmasq-config.patch
+45d15e18de066eee51829b59e89ffaff  dnsmasq-config.patch
diff --git a/dnsmasq/.signature b/dnsmasq/.signature
index a2971aadb..bcebc820d 100644
--- a/dnsmasq/.signature
+++ b/dnsmasq/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Smya1rJeKYLw8sGuc9RoFn2iB/h/cTqrIB1NqOjQ0DCQR3tKwzn4uEx1DMx5M+tdBjcV+w4h0RuMbEo7ncITAE=
-SHA256 (Pkgfile) = 3f238835c17201301648d332858bb18b6bedf9bcbba4fb7fe10159018a00d933
-SHA256 (.footprint) = 0a67922c7b59eb4a638cf4582f91ea285eb9876696d5a0829a7c70a9c9cb9804
+RWSE3ohX2g5d/U7P0ZIOCl2XzD3nMDWl0C9wfO/2TMRmYaJvaApTgaDYZiRQnPFx6FFqhKbPuJaS+KXerYVPxZIFRxwWzTn/ew4=
+SHA256 (Pkgfile) = 82409ad4c0241c3a66bf3d37e309994e6ed32f542accba3546b010543888ec02
+SHA256 (.footprint) = a9b2926c49f21dee91cc4b4186a4abc2494b610a40941467c281573e2f9c76d9
 SHA256 (dnsmasq-2.79.tar.xz) = 78ad74f5ca14fd85a8bac93f764cd9d60b27579e90eabd3687ca7b030e67861f
-SHA256 (dnsmasq-config.patch) = 79f524d34e7a77dfc59138a78d0df59504c0570ecceb23c06a1af97d34a4861c
+SHA256 (dnsmasq-config.patch) = be6179b484cd8f37f6bdcdb14c119bcc2ff31901c0e5a22eab8f5feffedf542f
 SHA256 (dnsmasq) = 1550a45a85219d7e286f6c50d72d4794da27e7b78e6b482b8414f4cf8a4dbd7b
diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile
index 7516efdfb..260a062ec 100644
--- a/dnsmasq/Pkgfile
+++ b/dnsmasq/Pkgfile
@@ -1,10 +1,11 @@
 # Description: Caching DNS forwarder and DHCP/TFTP server 
 # URL:         http://www.thekelleys.org.uk/dnsmasq/doc.html
 # Maintainer:  Juergen Daubert, jue at crux dot nu
+# Depends on:  nettle
 
 name=dnsmasq
 version=2.79
-release=1
+release=2
 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \
         $name-config.patch dnsmasq)
 
@@ -13,10 +14,12 @@ build () {
 
     patch -p1 -i $SRC/$name-config.patch
     
-    make
-    make PREFIX=$PKG/usr install
+    make COPTS="-DHAVE_DNSSEC" CFLAGS="$CFLAGS -Wall -W"
+    make COPTS="-DHAVE_DNSSEC" PREFIX=$PKG/usr install
 
-    install -D -m 755 $SRC/dnsmasq $PKG/etc/rc.d/dnsmasq
+    install -d  $PKG/{var/lib/dhcp,etc/rc.d,usr/share/dnsmasq}
+
+    install -m 755 $SRC/dnsmasq $PKG/etc/rc.d/
     install -m 644 dnsmasq.conf.example $PKG/etc/dnsmasq.conf
-    install -d  $PKG/var/lib/dhcp
+    install -m 644 trust-anchors.conf $PKG/usr/share/dnsmasq
 }
diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch
index 377b6afc7..31fe58072 100644
--- a/dnsmasq/dnsmasq-config.patch
+++ b/dnsmasq/dnsmasq-config.patch
@@ -1,18 +1,15 @@
-diff -Nru dnsmasq-2.79.orig/Makefile dnsmasq-2.79/Makefile
---- dnsmasq-2.79.orig/Makefile	2018-03-18 18:32:53.591375434 +0100
-+++ dnsmasq-2.79/Makefile	2018-03-18 18:33:16.974452841 +0100
-@@ -24,7 +24,7 @@
- LOCALEDIR     = $(PREFIX)/share/locale
- BUILDDIR      = $(SRC)
- DESTDIR       = 
--CFLAGS        = -Wall -W -O2
-+CFLAGS        += -Wall -W
- LDFLAGS       = 
- COPTS         = 
- RPM_OPT_FLAGS = 
 diff -Nru dnsmasq-2.79.orig/dnsmasq.conf.example dnsmasq-2.79/dnsmasq.conf.example
---- dnsmasq-2.79.orig/dnsmasq.conf.example	2018-03-18 18:32:53.591375434 +0100
-+++ dnsmasq-2.79/dnsmasq.conf.example	2018-03-18 18:33:16.974452841 +0100
+--- dnsmasq-2.79.orig/dnsmasq.conf.example	2018-04-04 12:11:55.871714531 +0200
++++ dnsmasq-2.79/dnsmasq.conf.example	2018-04-04 12:14:52.416900426 +0200
+@@ -22,7 +22,7 @@
+ 
+ # Uncomment these to enable DNSSEC validation and caching:
+ # (Requires dnsmasq to be built with DNSSEC option.)
+-#conf-file=%%PREFIX%%/share/dnsmasq/trust-anchors.conf
++#conf-file=/usr/share/dnsmasq/trust-anchors.conf
+ #dnssec
+ 
+ # Replies which are not DNSSEC signed may be legitimate, because the domain
 @@ -96,8 +96,8 @@
  
  # If you want dnsmasq to change uid and gid to something other
@@ -29,13 +26,13 @@ diff -Nru dnsmasq-2.79.orig/dnsmasq.conf.example dnsmasq-2.79/dnsmasq.conf.examp
  # This defaults to a sane location, but if you want to change it, use
  # the line below.
 -#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
-+# dhcp-leasefile=/var/lib/dhcp/dnsmasq.leases
++#dhcp-leasefile=/var/lib/dhcp/dnsmasq.leases
  
  # Set the DHCP server to authoritative mode. In this mode it will barge in
  # and take over the lease for any client which broadcasts on the network,
 diff -Nru dnsmasq-2.79.orig/src/config.h dnsmasq-2.79/src/config.h
---- dnsmasq-2.79.orig/src/config.h	2018-03-18 18:32:53.591375434 +0100
-+++ dnsmasq-2.79/src/config.h	2018-03-18 18:33:16.974452841 +0100
+--- dnsmasq-2.79.orig/src/config.h	2018-04-04 12:11:55.868381226 +0200
++++ dnsmasq-2.79/src/config.h	2018-04-04 12:12:12.708240101 +0200
 @@ -44,7 +44,7 @@
  #define ETHERSFILE "/etc/ethers"
  #define DEFLEASE 3600 /* default lease time, 1 hour */