From 3887d23e1dbd27f50d9851c63d3fb74573592527 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 8 Jul 2014 11:08:00 +0200
Subject: [PATCH] core80: Ship DNSSEC-enabled dnsmasq

http://wishlist.ipfire.org/wish/integration-of-a-dnssec-validating-dns-proxy
---
 config/rootfiles/common/nettle             | 8 ++++----
 config/rootfiles/core/80/filelists/bind    | 1 +
 config/rootfiles/core/80/filelists/dnsmasq | 1 +
 config/rootfiles/core/80/filelists/files   | 1 +
 config/rootfiles/core/80/filelists/nettle  | 1 +
 config/rootfiles/core/80/update.sh         | 1 +
 6 files changed, 9 insertions(+), 4 deletions(-)
 create mode 120000 config/rootfiles/core/80/filelists/bind
 create mode 120000 config/rootfiles/core/80/filelists/dnsmasq
 create mode 120000 config/rootfiles/core/80/filelists/nettle

diff --git a/config/rootfiles/common/nettle b/config/rootfiles/common/nettle
index 53185e662c..e6e4552959 100644
--- a/config/rootfiles/common/nettle
+++ b/config/rootfiles/common/nettle
@@ -60,12 +60,12 @@
 #usr/include/nettle/yarrow.h
 #usr/lib/libhogweed.a
 #usr/lib/libhogweed.so
-#usr/lib/libhogweed.so.3
-#usr/lib/libhogweed.so.3.0
+usr/lib/libhogweed.so.3
+usr/lib/libhogweed.so.3.0
 #usr/lib/libnettle.a
 #usr/lib/libnettle.so
-#usr/lib/libnettle.so.5
-#usr/lib/libnettle.so.5.0
+usr/lib/libnettle.so.5
+usr/lib/libnettle.so.5.0
 #usr/lib/pkgconfig/hogweed.pc
 #usr/lib/pkgconfig/nettle.pc
 #usr/share/info/nettle.info
diff --git a/config/rootfiles/core/80/filelists/bind b/config/rootfiles/core/80/filelists/bind
new file mode 120000
index 0000000000..48a0ebaefd
--- /dev/null
+++ b/config/rootfiles/core/80/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/80/filelists/dnsmasq b/config/rootfiles/core/80/filelists/dnsmasq
new file mode 120000
index 0000000000..d469c74631
--- /dev/null
+++ b/config/rootfiles/core/80/filelists/dnsmasq
@@ -0,0 +1 @@
+../../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files
index 3ea7ee2b6b..2c38e1ea75 100644
--- a/config/rootfiles/core/80/filelists/files
+++ b/config/rootfiles/core/80/filelists/files
@@ -1,6 +1,7 @@
 etc/system-release
 etc/issue
 etc/rc.d/init.d/dhcrelay
+etc/rc.d/init.d/dnsmasq
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/routing.cgi
 usr/local/bin/setddns.pl
diff --git a/config/rootfiles/core/80/filelists/nettle b/config/rootfiles/core/80/filelists/nettle
new file mode 120000
index 0000000000..f0dba7ac81
--- /dev/null
+++ b/config/rootfiles/core/80/filelists/nettle
@@ -0,0 +1 @@
+../../../common/nettle
\ No newline at end of file
diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh
index 67f8c3ace2..8032dccf17 100644
--- a/config/rootfiles/core/80/update.sh
+++ b/config/rootfiles/core/80/update.sh
@@ -37,6 +37,7 @@ done
 extract_files
 
 # Start services
+/etc/init.d/dnsmasq restart
 
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-- 
2.39.2